Senne
3c31792532
Re-add imports
2021-05-25 22:31:06 +02:00
svr333
ba617a6ea6
Merge branch 'master' into api/machine-operations
2021-05-25 20:05:59 +02:00
TheBusyBiscuit
1be165ca44
Fixed recipe types showing missing string message
2021-05-25 11:04:59 +02:00
Riley
2e91ebe0d2
Made handler and listener
2021-05-24 20:14:12 -05:00
TheBusyBiscuit
709b329c78
Hotfix for addons using old ItemStackWrapper constructor
2021-05-25 01:34:55 +02:00
TheBusyBiscuit
fcfa164583
Bump recommended java versions notice to Java 16
2021-05-24 20:15:07 +02:00
TheBusyBiscuit
4ed9dd7e59
Fixed #3075
2021-05-24 20:07:03 +02:00
TheBusyBiscuit
3fc802ef8c
[CI skip] Formatting and code cleanup
2021-05-24 18:18:21 +02:00
TheBusyBiscuit
1111c809dd
[CI skip] Added Unit Test which makes sure Slimefun is spelled correctly
2021-05-24 17:40:35 +02:00
The Busy Bot
27013f5287
[CI skip] New locale updates from Crowdin
2021-05-24 17:21:28 +02:00
TheBusyBiscuit
8a3d5cedc4
Merge pull request #3048 from Slimefun/fix/improve-research-message
...
Add the item to the research message
2021-05-24 16:40:18 +02:00
TheBusyBiscuit
a6e3c460fd
Merge pull request #3068 from md5sha256/feature/optimized-cargo
...
Optimized use of ItemStackWrapper in the CargoNetworkTask
2021-05-24 14:24:24 +02:00
TheBusyBiscuit
c1de61d1c1
Merge branch 'fix/improve-research-message' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message
2021-05-24 13:09:57 +02:00
TheBusyBiscuit
3e4af70e10
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into fix/improve-research-message
2021-05-24 13:09:06 +02:00
TheBusyBiscuit
213c2b0e4d
Changed color to white now
2021-05-24 13:07:46 +02:00
TheBusyBiscuit
da6c909d3a
Update src/main/resources/languages/en/messages.yml
2021-05-24 13:06:54 +02:00
TheBusyBiscuit
31af8f3b25
Fixed #3053
2021-05-24 13:04:45 +02:00
TheBusyBiscuit
fd2d30a3ae
Validate progress arguments
2021-05-24 11:23:36 +02:00
TheBusyBiscuit
466990a03e
Switch to a Concurrent Map
2021-05-24 11:18:13 +02:00
TheBusyBiscuit
a249ca7848
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations
2021-05-24 11:09:52 +02:00
Andrew Wong
8fb1c7cdfb
Enforce nullability
2021-05-22 16:04:43 +02:00
Andrew Wong
5e94f454c8
Fix documentation for ItemStackAndInteger and tests for ItemStackWrapper
2021-05-21 13:29:45 +02:00
Andrew Wong
57b559e81d
Fix nullability and docs
2021-05-19 18:57:29 +02:00
Andrew Wong
7e43e68f68
Method renames, update docs and unit tests
2021-05-19 18:19:04 +02:00
TheBusyBiscuit
e4225d7aec
Fixed a permissions issue with /sf charge
2021-05-19 17:36:10 +02:00
TheBusyBiscuit
2e5bedc932
Merge pull request #3062 from martinbrom/feature/configurable-altar-speed
...
Add a configurable step delay to the Ancient Altar
2021-05-19 17:26:26 +02:00
TheBusyBiscuit
58fbc423af
Merge pull request #3052 from martinbrom/fix/woodcutter-android-stuck fixes #2964
...
Fix WoodcutterAndroid getting stuck while chopping a tree with full inventory
2021-05-19 17:25:50 +02:00
TheBusyBiscuit
eb34c01f86
Merge pull request #3058 from Mooy1/fix/block-menu-loading
...
Fixed menu loading issues and probably improved BlockStorage load times
2021-05-19 17:25:11 +02:00
TheBusyBiscuit
6353720d39
Merge pull request #3065 from martinbrom/fix/gold-pan-exception
...
Fixed an Exception when any GoldPan drops have zero chance of dropping
2021-05-19 14:03:08 +02:00
TheBusyBiscuit
593e0a08c9
[CI skip] Removed deprecated class
2021-05-19 10:45:30 +02:00
a
1e459693fb
Update BlockStorage.java
2021-05-18 11:45:01 -05:00
a
9db161569d
Update BlockStorage.java
2021-05-18 11:44:21 -05:00
Andrew Wong
3dfc83ac6a
Try to inject and use the ItemStackWrapper into frequently used CargoUtils methods
2021-05-18 14:12:28 +02:00
Andrew Wong
9e6aa5b39a
Actually use the wrapper in CargoNetTask#distributeItems
2021-05-18 13:40:10 +02:00
Andrew Wong
4704b9fa8f
Check for ItemStackWrappers in ItemStackAndInteger
2021-05-18 12:05:38 +02:00
Andrew Wong
6f042e60ad
Deprecate the public constructor of ItemStackWrapper(ItemStack). More docs and use #ofItem where possible
2021-05-17 21:46:59 +02:00
Andrew Wong
727c8d34b9
Add ItemStackWrapper#ofItem, try not to use duplicate ItemStackWrappers in CargoNet
2021-05-17 21:36:10 +02:00
TheBusyBiscuit
f822bdd12d
Merge pull request #3044 from martinbrom/feature/portable-teleporter
...
Add PortableTeleporter
2021-05-16 21:53:37 +02:00
Martin Brom
f2ee8a27f3
Add annotations and clarify naming for AncientAltar related classes
2021-05-16 12:04:44 +02:00
TheBusyBiscuit
f12e68dd72
[CI skip] Fixed some of the technical debt caused by recent PRs
2021-05-16 11:55:59 +02:00
Martin Brom
092808b847
Check for any GoldPan drops with zero chance
...
Resolves #3064
2021-05-16 10:18:18 +02:00
Martin Brom
2ac333b037
Add a configurable step delay to the Ancient Altar
2021-05-15 10:53:48 +02:00
Martin Brom
0cced1a8d0
IcyBow now takes shielded players into consideration
...
Resolves #3060
2021-05-14 22:57:38 +02:00
a
f0fc06fd15
Dont load chunks, menus, universal menus multiple times
2021-05-14 01:24:45 -05:00
Martin Brom
872ff0976e
Add Javadocs to DirtyChestMenu::pushItem
2021-05-13 14:06:39 +02:00
Martin Brom
c52d85035b
Remove redundant check for space in inventory
...
Revert changelog change
2021-05-13 13:51:08 +02:00
Martin Brom
1832cf4eff
Fix WoodcutterAndroid getting stuck while chopping a tree with full inventory
2021-05-13 12:55:31 +02:00
The Busy Bot
a4af25938e
[CI skip] New Crowdin updates ( #3050 )
...
* New translations messages.yml (German)
* New translations messages.yml (Latvian)
2021-05-13 10:57:02 +02:00
Daniel Walsh
4e731150cf
Add the item to the research message
2021-05-12 16:23:29 +01:00
Martin Brom
b1a70bfb9a
Tweak the cost of teleportation and capacity once more
2021-05-12 16:15:46 +02:00
TheBusyBiscuit
fa07d081e0
Merge pull request #2983 from martinbrom/feature/learning-animation-option
...
Add the option to disable learning animations server & client side
2021-05-12 12:39:53 +02:00
Daniel Walsh
b8dfa5908b
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/guide/options/LearningAnimationOption.java
2021-05-12 11:36:11 +01:00
Martin Brom
4995ab8227
Change cost of teleportation to int
...
Remove FloatRangeSetting
2021-05-12 10:39:14 +02:00
Martin Brom
18c36ab038
Add FloatRangeSetting
...
Add PortableTeleporter research
Add ItemSetting to PortableTeleporter to configure the cost of teleporting
Change default cost of teleporting to 5 J
Fix wrong word in PortableTeleporter lore
2021-05-12 10:28:42 +02:00
Martin Brom
5b5020f9cf
Add PortableTeleporter
...
Add TeleportationManager::openTeleporterGUI overload without network complexity parameter, which then gets calculated from the given ownerUUID
2021-05-11 23:58:49 +02:00
Martin Brom
4a6cfd9a85
Revert changes to FireworksOption
...
Change item in LearningAnimationOption to a map when enabled
2021-05-11 22:22:17 +02:00
Martin Brom
5817bf16fd
Change annotations to Nonnull
2021-05-11 22:01:29 +02:00
Martin Brom
d1aac2e291
Add enchantment to FireworksOption and LearningAnimationOption when enabled
...
Add minecraft alias
2021-05-11 21:54:33 +02:00
TheBusyBiscuit
9c05237af3
Merge pull request #3037 from StarWishsama/chore/auto-enchant-event
...
Introduced AsyncAutoEnchanterProcessEvent
2021-05-11 14:13:37 +02:00
Daniel Walsh
f01162cca1
Apply suggestions from code review
2021-05-11 13:10:11 +01:00
StarWishsama
ea96b9ed3c
chore: resolve suggestions
2021-05-11 12:26:19 +08:00
NatsuHana
ad86c88a94
chore: renane the event to adapt bukkit namestyle
2021-05-11 09:35:44 +08:00
TheBusyBiscuit
5620528c1d
[CI skip] Updated changelog and workflows
2021-05-10 23:18:36 +02:00
Daniel Walsh
a64597e129
Merge pull request #3038 from Mooy1/fix/explosive-pick-handler
2021-05-10 21:20:02 +01:00
a
41d0a93275
Update ExplosiveTool.java
2021-05-10 13:59:32 -05:00
TheBusyBiscuit
bcdda9ab03
Fixes #3041
2021-05-10 18:54:13 +02:00
TheBusyBiscuit
8a8b8ce577
Merge pull request #3015 from Slimefun/performance/networks
...
Improved memory usage of cargo/energy networks and fixed #3013
2021-05-10 18:44:01 +02:00
The Busy Bot
d2ab1cf81e
[CI skip] New locale updates from Crowdin
2021-05-10 18:41:43 +02:00
a
efd3d133f2
Update ExplosiveTool.java
2021-05-10 11:11:02 -05:00
TheBusyBiscuit
2ad96fe9dd
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into api/machine-operations
2021-05-10 10:51:50 +02:00
TheBusyBiscuit
1d58bca4d3
Made requested changes
2021-05-10 10:51:37 +02:00
TheBusyBiscuit
7a06dc3064
Merge pull request #3003 from Slimefun/fix/hologram-dupes
...
Potentially fixed #2927
2021-05-09 17:04:29 +02:00
Varian Anora
10e3df78b8
Merge branch 'master' into fix/auto-disenchanter-strict-slot-order
2021-05-09 19:00:30 +07:00
Varian Anora
f5d1d3a947
Revert swapping item and secondItem
2021-05-09 18:59:54 +07:00
StarWishsama
7fef9d6604
refactor: use async
2021-05-09 18:11:42 +08:00
StarWishsama
3bf8217059
feat: introduced AutoEnchantProcessEvent
2021-05-09 14:21:07 +08:00
StarWishsama
5577a4e965
feat: support retrieve auto-enchanter for enchanting
2021-05-09 13:27:18 +08:00
TheBusyBiscuit
27224c55eb
Updated default item models file
2021-05-08 19:24:16 +02:00
TheBusyBiscuit
81223004bf
Default values for item models are now read from a resource file.
2021-05-08 19:22:54 +02:00
TheBusyBiscuit
d81b25717f
Added an exclusion for unit tests
2021-05-08 18:59:06 +02:00
TheBusyBiscuit
a82a5d28f9
Implemented Walshy's suggestion to improve performance even further
2021-05-08 18:49:56 +02:00
a
d3527a1885
Update ExplosiveTool.java
2021-05-08 01:38:13 -05:00
StarWishsama
bebd89df30
chore: dont mess up import, idea
2021-05-08 13:44:05 +08:00
StarWishsama
6b62a4f86c
feat: support to get the enchant book for auto enchant
2021-05-08 13:39:32 +08:00
Varian Anora
8d3d24bc5f
Revert to EnchantmentStorageMeta
2021-05-08 12:08:56 +07:00
Varian Anora
716c384349
Merge branch 'master' into fix/auto-disenchanter-strict-slot-order
2021-05-08 12:06:55 +07:00
TheBusyBiscuit
dc34ec8dfc
Merge branch 'master' into performance/networks
2021-05-07 14:15:30 +02:00
TheBusyBiscuit
5194dbb1db
Merge pull request #3031 from variananora/fix/pickaxe-of-the-seeker-localization
...
Update Pickaxe of The Seeker Localization
2021-05-07 14:14:51 +02:00
TheBusyBiscuit
4e417a89a0
[CI skip] Merge pull request #3029 from Slimefun/crowdin/master
...
New Crowdin updates
2021-05-07 14:13:55 +02:00
Varian Anora
847bab7a86
Fixes #2978
...
Fix is stolen from #2982
2021-05-07 10:19:36 +07:00
Martin Brom
e7662dd04f
Add grinding of higher level lumps back into 4 lower level lumps
2021-05-06 18:40:19 +02:00
Martin Brom
8ac9160e37
Add unicode arrow to the message
2021-05-06 18:18:26 +02:00
Martin Brom
e7ae14beaf
Add locale message for learning animation option
...
Add helper function to get value of selected option in the survival guide
2021-05-06 18:18:26 +02:00
Martin Brom
fd12521a0a
Add requested changes
...
Revert change in research test
2021-05-06 18:18:26 +02:00
Martin Brom
227621906c
Add the option to disable learning animations server & client side
2021-05-06 18:18:26 +02:00
TheBusyBiscuit
a4aebf7bcd
[CI skip] Translators are now read from a json file.
...
Next step is writing a GitHub action that auto-populates that file via
the Crowdin API
2021-05-06 15:56:55 +02:00
Varian Anora
cc714b1722
Update Pickaxe of The Seeker Localization
...
Moved locale path to follow current styling
Added Pickaxe of The Seeker error message when no ores were found.
2021-05-06 20:02:35 +07:00
TheBusyBiscuit
3e01e24b12
Update src/main/resources/languages/lv/messages.yml
...
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-05-06 13:20:17 +02:00
The Busy Bot
e084cf0fff
New translations researches.yml (Czech)
2021-05-06 12:59:04 +02:00
The Busy Bot
3a1da2a131
New translations messages.yml (Latvian)
2021-05-06 12:52:15 +02:00
