mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
7,667 Commits 1 Branch 0 Tags 64 MiB
9f4cb828cb
Commit Graph

5503 Commits

Author SHA1 Message Date
Daniel Walsh
fbc3f9ee92
Improves item comparison performance 
There are a lot of situations where SF items are CraftItemStacks not SlimefunItemStacks

This is most obvious with cargo and has been a big bottleneck there (~60%).

This PR addresses the cargo specific point but will probably carry over to other parts of the code here and in addons.

In Cargo we wrap the items being used for comparison, these items can still be SF items just, they look like regular Bukkit items. So, the is item similar check should account for this.

With this change it will check if it's wrapped and if it has item meta, if it does then it will try and get IDs to compare. Otherwise, fall back to usual item meta comparison. This improves cargo performance by about 60% when filtering SF items.
 2021-09-15 11:22:19 +01:00
ybw0014
e9b5ea5e81
add break to switch default 2021-09-14 18:11:18 +08:00
ybw0014
2c8a40cb26
add default to switch 2021-09-14 18:10:08 +08:00
Sefiraat
5d6b7e6ace
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-09-14 10:05:55 +01:00
Sefiraat
002a0e3e46
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/crafting/SmithingTableListener.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-09-14 07:07:58 +01:00
ybw0014
fbc6253175
move imports 2021-09-14 02:20:31 +08:00
ybw0014
cc0add1137
Hercules' Pickaxe now supports 1.17 deepslate ores and copper 2021-09-14 02:16:55 +08:00
Sefiraat
83a4d1b65d Comment to show it's the Material/Netherite slot 2021-09-13 14:42:50 +01:00
Sefiraat
153f33a72b Message indentation and remove random && 2021-09-13 14:36:17 +01:00
Sefiraat
20beabcc3b
Apply suggestions from code review 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-09-13 14:13:27 +01:00
Sefiraat
13db44011b Slight wording change 2021-09-13 14:02:09 +01:00
Sefiraat
206e205d1b Deny using Slimefun Netherite in the SmithingTable + Tests 2021-09-13 13:26:35 +01:00
TheBusyBiscuit
79c6c139c6 Fixed #3241 2021-09-09 13:54:48 +02:00
TheBusyBiscuit
68e32cb358 Fixed #3218 2021-09-09 12:58:57 +02:00
TheBusyBiscuit
fc207b6a83
Merge pull request #3232 from svr333/FixCategoryNaming 
Rename category -> itemGroup
 2021-09-06 14:40:19 +02:00
Daniel Walsh
4d94c043d5
Fix metrics not being able to download 
We used REPO_NAME in quite a few places which I didn't expect but here we are. Anyway, this fixes that.
 2021-09-06 13:25:38 +01:00
Senne
ed89b2346c
Update naming in tests 2021-09-06 13:18:29 +02:00
Senne
fd2b8d0578
Rename category to itemgroup in messages.yml 2021-09-06 13:17:11 +02:00
Daniel Walsh
bafcd536f7
Update repo 2021-09-06 11:04:24 +01:00
Senne
f7f2c62ef7
Un-rename android category 2021-09-05 13:24:14 +02:00
Senne
8995005915
Replace category -> itemGroup 2021-09-04 12:52:29 +02:00
TheBusyBiscuit
6951251394 Some additional cleanup 2021-09-03 14:01:55 +02:00
TheBusyBiscuit
9451e256e5
Merge pull request #3229 from Bencey/patch-1 
Fixed ender lump guide entry
 2021-09-03 13:43:01 +02:00
Benjamin Durham
50b6377d5d
Fixed broken import 2021-09-03 11:16:45 +12:00
Daniel Walsh
02cc920109
Fix the other instances of Inventory#isEmpty 2021-09-02 16:14:12 +01:00
Daniel Walsh
ffdf9c8ea6
Forgot the util class reee 2021-09-02 16:08:55 +01:00
Daniel Walsh
42d6d259a8
Merge master 2021-09-02 16:07:35 +01:00
Daniel Walsh
8a0587a111
Merge pull request #3228 from Slimefun/fix/issue-3206 
Fixes #3206
 2021-09-02 16:06:38 +01:00
Daniel Walsh
535c7f47f9
Fixes #3206 2021-09-02 14:07:38 +01:00
Daniel Walsh
39d0080fe7
Fix compilation 2021-09-02 13:41:33 +01:00
Daniel Walsh
2519e884fa
Merge branch 'master' of github.com:Slimefun/Slimefun4 into breaking-changes/class-relocation 2021-09-02 13:39:54 +01:00
Daniel Walsh
f95dd9a6e3
Merge pull request #3227 from variananora/add-1.17-blocks-to-electric-press 
Add some new 1.17 blocks to electric press
 2021-09-02 13:39:26 +01:00
Varian Anora
7b37663f47 Add new 1.17 blocks to electric press 
Added 4 Amethyst Shard -> Amethyst Block
Added 9 Copper Ingot -> Copper Block
Added 9 Raw Iron -> Raw Iron Block
Added 9 Raw Gold -> Raw Gold Block
Added 9 Raw Copper -> Raw Copper Block
 2021-09-02 12:40:25 +07:00
Daniel Walsh
1513b01f85
Fix tests 2021-09-01 21:15:42 +01:00
Daniel Walsh
0841e1ef14
Fix naming of setCategory -> setItemGroup 2021-09-01 21:14:25 +01:00
Daniel Walsh
aa9e7a49d9
Fix compilation 2021-09-01 21:13:58 +01:00
Daniel Walsh
d64f2bba3f
Merge branch 'master' into breaking-changes/class-relocation 2021-09-01 21:03:22 +01:00
Daniel Walsh
72573eebcd
Remove unused var 2021-09-01 19:05:50 +01:00
Daniel Walsh
1ba0062ab2
Fixes #3225 and chunk data not being saved on shutdown 
We had a `chunksLoaded` boolean, not sure why this was here but removing it did not cause any unexpected changes.

We have a world name check so this in theory should not be required. If there was a reason which is still valid, we will find out soon and should do a proper fix rather than this.

I also fixed the chunk data not saving on normal shutdown
 2021-09-01 19:03:19 +01:00
Benjamin Durham
832da8f146
Guide shows wrong machine 
Enderlump 1 is made with grindstone not the enhanced crafting table
 2021-09-01 17:16:01 +12:00
Daniel Walsh
d6be483a32
Merge pull request #3196 from ItchyDitchy/master 2021-08-30 12:43:15 +01:00
Daniel Walsh
3b1a5d02e2
Merge pull request #3200 from svr333/ChangeSfGuideMsg 
Update message to show category
 2021-08-24 08:45:36 +01:00
The Busy Bot
35895f4e26
[CI skip] New locale updates from Crowdin 2021-08-20 23:49:33 +02:00
Daniel Walsh
e187d87828
Merge pull request #3204 from Slimefun/fix/pickup-delay 2021-08-17 13:52:04 +01:00
Daniel Walsh
54efbe9625
Update comment 2021-08-17 12:19:50 +01:00
The Busy Bot
a8081c3eee
[CI skip] New locale updates from Crowdin 2021-08-17 11:16:06 +02:00
WalshyDev
afda035689
remove log 2021-08-17 06:56:25 +01:00
WalshyDev
4a65941e00
Fixes #3203 2021-08-17 06:52:25 +01:00
svr333
5daa0fa5fe
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java 2021-08-13 11:16:54 +02:00
svr333
a6474b92f5
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:50 +02:00
svr333
2fce1e527e
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:45 +02:00
svr333
9da4e5d43a
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/MinerAndroid.java 2021-08-13 11:15:40 +02:00
ItchyDitchy
e56fa84754
Code Format 
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
 2021-08-13 09:45:31 +08:00
svr333
fef3b745ca
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java 2021-08-12 23:35:05 +02:00
Senne
7b29813385
Update message to show category 2021-08-12 16:28:24 +02:00
ItchyDitchy
c0a4ef4946
Shorter Code 
Title says it all
 2021-08-08 19:09:08 +08:00
ItchyDitchy
1a08f1a36d
Move Support 
Just noticed that an android may move in a border, so this is a fix for it.
 2021-08-08 19:02:58 +08:00
ItchyDitchy
60df36975c
Code Format Fix 2021-08-06 21:40:41 +08:00
ItchyDitchy
dee4bc97e8
Code format 2021-08-06 21:39:22 +08:00
ItchyDitchy
6d632d1ad6
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java 
Code Style Fix

Co-authored-by: Martin Brom <16322387+martinbrom@users.noreply.github.com>
 2021-08-06 21:34:40 +08:00
ItchyDitchy
8da16ce0a7
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java 
Code Style Fix

Co-authored-by: Martin Brom <16322387+martinbrom@users.noreply.github.com>
 2021-08-06 21:34:13 +08:00
ItchyDitchy
6ca3360db9 WorldBorder Support 
Androids can go past and do stuff outside the world border.

This is a fix.
 2021-08-06 14:26:04 +08:00
TheBusyBiscuit
c0f25ba5ec Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/LimitedUseItem.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/ProgrammableAndroid.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/ElectricSmeltery.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/reactors/Reactor.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/geo/GEOMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/EnhancedFurnaceListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/IntegrationsManager.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/McMMOIntegration.java
	src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java
 2021-08-05 15:08:54 +02:00
TheBusyBiscuit
0df4694a63
Merge pull request #3192 from guizhanss/feature/raw-metals-luck-multiplier 
Add Enhanced furnaces' luck multiplier for raw ores in 1.17, resolves #3190
 2021-08-05 10:05:13 +02:00
ybw0014
bb147e26ab rename the new tag 2021-08-04 20:46:30 +08:00
ybw0014
bced5ba4b1 add a new tag for luck multiplier 2021-08-03 18:26:34 +08:00
ybw0014
7021df8a54 remove unnecessary codes 2021-08-03 17:58:59 +08:00
ybw0014
dfd6d372cd use slimefun tag 2021-08-02 12:20:13 +08:00
ybw0014
33ce8ecff6 enhanced furnaces' luck multiplier for raw ores in 1.17 2021-08-02 03:13:32 +08:00
ybw0014
30cfcfa292 missed one 2021-08-02 02:44:26 +08:00
ybw0014
9574227783 use ChestMenuUtils to support CustomModelData and update docs in Reactor 2021-08-02 02:22:02 +08:00
TheBusyBiscuit
707b219e18 [CI skip] Reduced technical debt 2021-08-01 14:24:52 +02:00
TheBusyBiscuit
157890aebe
Merge pull request #3186 from Apeiros-46B/master 
Added sneaking check to ExplosiveTool
 2021-08-01 10:24:59 +02:00
TheBusyBiscuit
5a0414aca9
[CI skip] Merge pull request #3179 from hwang-pku/fix-bug 
Fix a flaky test
 2021-08-01 10:23:58 +02:00
TheBusyBiscuit
4b43cd6eaa Fixed Auto-Disenchanter exploit using mcMMO's "super ability" tools 2021-07-31 12:27:42 +02:00
Apeiros-46B
fcee14cb0c Added sneaking check to ExplosiveTool 2021-07-30 21:54:41 -07:00
TheBusyBiscuit
708aa17340 Bump dough-api to 1.0.2 2021-07-28 14:33:44 +02:00
TheBusyBiscuit
633a736016 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/FlexCategory.java
	src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/MultiCategory.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
 2021-07-28 14:32:27 +02:00
TheBusyBiscuit
0262830ef5
Merge pull request #3107 from martinbrom/fix/flex-category-visibility 
FlexCategories can now be made visible in CheatSheet and Survival SlimefunGuide
 2021-07-26 20:57:59 +02:00
TheBusyBiscuit
65e50ea81c
Merge pull request #3109 from Slimefun/Thehrz/master 
Fixes #2677
 2021-07-26 17:33:39 +02:00
TheBusyBiscuit
1f4a97aa5c
Merge pull request #3134 from NgLoader/master 
Intregation: Orebfuscator
 2021-07-26 12:51:31 +02:00
hwang-pku
c390803d27
clean formatting issues 2021-07-25 21:17:55 -07:00
hwang-pku
ac539063e6
clean formatting issues 2021-07-25 21:17:27 -07:00
Hao Wang
3c20a9fae6 Merge branch 'fix-bug' of https://github.com/hwang-pku/Slimefun4 into fix-bug 
fix a flaky test
 2021-07-25 21:14:01 -07:00
Hao Wang
61b1bf4602 fix a flaky test 2021-07-25 21:13:42 -07:00
TheBusyBiscuit
1fbfa63507 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/IgnitionChamber.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Smeltery.java
 2021-07-26 00:12:45 +02:00
TheBusyBiscuit
55bbe05961 Fixed unbreakable Flint and Steel still being damaged in Smeltery 2021-07-25 23:41:47 +02:00
TheBusyBiscuit
c46cfa6686
Merge pull request #3181 from Phoenix-Starlight/patch-1 
Update wiki.json
 2021-07-25 23:40:34 +02:00
TheBusyBiscuit
e31ea4f404 Fixed #3177 2021-07-25 15:03:32 +02:00
Phoenix-Starlight
af765c23f0
Update wiki.json 2021-07-24 23:21:50 -07:00
Phoenix-Starlight
07e6fceb22
Update wiki.json 
Alphabetical sorting.
 2021-07-24 22:35:45 -07:00
NgLoader
74e18c98ed
Update src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-24 19:14:19 +02:00
NgLoader
c1b373fc83
Revert "feat: added MultiBlockBreakEvent" 
This reverts commit bd85eab39c.
 2021-07-24 03:21:51 +02:00
NgLoader
73e757212e
Revert "fix: fixed tab" 
This reverts commit 5aeb3e8c84.
 2021-07-24 03:21:38 +02:00
hwang-pku
788744c21e
Merge branch 'Slimefun:master' into fix-bug 2021-07-24 02:24:54 +08:00
Daniel Walsh
b0611c694a
Merge pull request #3167 from martinbrom/fix/ancient-pedestal-renamed-item 
Fix renamed items turning into valid-ish items for crafting purposes
 2021-07-23 09:22:15 +01:00
Senne
40635c7bd5
Move to var 2021-07-20 21:25:47 +02:00
Hao Wang
077cd22b99 fix a flaky test 2021-07-18 21:20:38 -07:00
TheBusyBiscuit
9c0d28e64b Updated to CommonPatterns 2021-07-17 19:24:29 +02:00
TheBusyBiscuit
a2a42a7b62 Fixed PatternUtils 2021-07-17 19:19:40 +02:00
TheBusyBiscuit
c8c9a35b6a Fixed Table Saw 2021-07-17 19:18:53 +02:00
TheBusyBiscuit
5ff71c4f71 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/StormStaff.java
 2021-07-17 19:15:04 +02:00
TheBusyBiscuit
8c0ef8a97f
Merge pull request #3138 from EpicPlayerA10/master 
Fixed #3136 disappearing items with output chest by machines
 2021-07-17 19:07:55 +02:00
TheBusyBiscuit
13b7f05fd9
Merge pull request #3171 from StarWishsama/fix/talisman-anvil-offhand 
Fixes Talisman of anvil break main hand item in special case
 2021-07-17 19:06:43 +02:00
TheBusyBiscuit
53413747f2
Merge pull request #3117 from martinbrom/chore/limited-use-item 
Add LimitedUseItem - base class for items with limited uses
 2021-07-17 18:54:16 +02:00
TheBusyBiscuit
ddd2d21245 Finished first transition to dough 2021-07-15 14:24:24 +02:00
TheBusyBiscuit
cdf379ab49 Fixed UpdaterService 2021-07-15 13:03:39 +02:00
StarWishsama
03ab985033
refactor: optimize slot check 2021-07-15 16:43:13 +08:00
TheBusyBiscuit
3a302217bf Fixed locale implementation 2021-07-14 17:25:21 +02:00
TheBusyBiscuit
5abab2ef7a More dough implementations 2021-07-14 17:14:55 +02:00
TheBusyBiscuit
6de1fe821c More progress on dough implementation 2021-07-14 16:58:10 +02:00
TheBusyBiscuit
51b5d1c020 Fixed unit test imports 2021-07-14 16:51:50 +02:00
TheBusyBiscuit
0cc9bd91de Progress towards dough 2021-07-14 16:47:41 +02:00
TheBusyBiscuit
e40222f2fc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNetworkTask.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/ChristmasPresent.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/EasterEgg.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GoldPan.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfContainment.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AutoCrafterListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
 2021-07-14 14:51:18 +02:00
StarWishsama
17d7521115
chore: revert order change 2021-07-14 11:10:25 +08:00
StarWishsama
22155edd71
refactor: optimize check method 2021-07-14 11:08:59 +08:00
StarWishsama
a0e6628acc
fix(talisman): use correct slot number 2021-07-13 11:10:06 +08:00
StarWishsama
0d4502e739
fix(talisman): add validate for offhand to avoid fix wrong item 2021-07-13 10:57:39 +08:00
EpicPlayerA10
df25a9e6f6
Improve performance 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-12 17:41:24 +02:00
EpicPlayerA10
407d5de6e7 Delete unused imports 2021-07-12 16:17:59 +02:00
EpicPlayerA10
35e3b1be8c Merge remote-tracking branch 'origin/master' 2021-07-12 16:12:27 +02:00
EpicPlayerA10
5bf0b5ee74 Some fixing 2021-07-12 16:12:07 +02:00
Daniel Walsh
6392af004f
Merge pull request #3168 from guizhanss/feature/more-in-ore-crusher 
Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher
 2021-07-12 11:43:41 +01:00
EpicPlayerA10
881beebacf
Merge branch 'Slimefun:master' into master 2021-07-12 11:22:42 +02:00
EpicPlayerA10
b9420da407 Some optimizations 2021-07-12 11:05:34 +02:00
ybw0014
2085e92410 restore comment 2021-07-12 04:04:24 +08:00
ybw0014
f9e84b65ba remove duplicated codes 2021-07-12 00:26:46 +08:00
ybw0014
ba80281210 Change format 2021-07-11 23:01:10 +08:00
ybw0014
ab6da98697 Changes outcomes for industrial miner 2021-07-11 22:25:07 +08:00
ybw0014
6be06f07f6 Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher 2021-07-11 22:22:56 +08:00
EpicPlayerA10
962833b50f Typo 2021-07-10 11:22:37 +02:00
Martin Brom
138394e5a0 Resolves #3164 2021-07-10 10:40:36 +02:00
Martin Brom
11ba156bb3 Change the default value for canMineDeepslateOres to true 2021-07-10 09:07:53 +02:00
Martin Brom
8e13b41a34 Reorder conditions to prevent a possible version error 2021-07-10 00:18:03 +02:00
Martin Brom
7285277707 Add the option to prevent IndustrialMiner from mining deepslate ores 2021-07-09 23:59:27 +02:00
TheBusyBiscuit
e58a6219ff
Merge pull request #3151 from Apeiros-46B/master 
Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone
 2021-07-09 12:13:38 +02:00
Lil_BC
5fe8dff05e
Added My Minecraft Name 2021-07-08 11:54:04 -04:00
EpicPlayerA10
3e48012d8f Sort imports correctly 2021-07-08 12:36:34 +02:00
EpicPlayerA10
c148c8b4da Added SlimefunUtils.spawnItem instead of dropItemNaturally 2021-07-08 12:33:53 +02:00
EpicPlayerA10
dd343e8e73
Merge branch 'Slimefun:master' into master 2021-07-08 12:20:19 +02:00
TheBusyBiscuit
5a1442f13a Added SlimefunItemSpawnEvent and ItemSpawnReason 
This allows other plugins to provide compatibility in some places
 2021-07-08 11:17:56 +02:00
TheBusyBiscuit
e19f291904
Merge pull request #3145 from martinbrom/fix/mining-task-world-height 
Allow IndustrialMiner to mine when minWorldHeight is lower than 0
 2021-07-08 10:42:28 +02:00
EpicPlayerA10
e8c99044c5
Merge branch 'Slimefun:master' into master 2021-07-07 10:15:31 +02:00
The Busy Bot
2c55eacbe3
[CI skip] New locale updates from Crowdin 2021-07-07 09:58:43 +02:00
Apeiros-46B
214dc533a5 Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone 2021-07-06 02:49:22 -07:00
The Busy Bot
0fdd6edb00
[CI skip] New locale updates from Crowdin 2021-07-06 10:42:21 +02:00
LilBC
5ca97bcd09
Update src/main/resources/languages/en/messages.yml 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-05 08:52:24 -04:00
LilBC
55f777eb17
Merge branch 'Slimefun:master' into master 2021-07-04 21:40:23 -04:00
EpicPlayerA10
b6b83ca974 Changed doc 2021-07-04 12:30:17 +02:00
LilBC
564a1a0905
Update src/main/resources/languages/en/messages.yml 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-07-04 01:27:35 -04:00
LilBC
74fba2e1f5
Corrected Inverted Unlocked Recipe Check 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-04 00:35:19 -04:00
EpicPlayerA10
f56ef90dbf More cleanup 2021-07-03 22:02:00 +02:00
EpicPlayerA10
a2d38c3a05 Code Cleanup 2021-07-03 21:56:47 +02:00
EpicPlayerA10
26b897391a Change from Dispenser to Container 2021-07-03 21:54:16 +02:00
EpicPlayerA10
0128d57af0 Move code to superclass and call method in other machines 2021-07-03 21:36:15 +02:00
Martin Brom
c93dea06ed Allow IndustrialMiner to mine when minWorldHeight is lower than 0 2021-07-03 12:06:59 +02:00
LilBC
ebfb7904b7
Reordered Codes 2021-07-02 09:24:10 -04:00
LilBC
7a40027937
Made Error Message More Informative 2021-07-02 09:14:59 -04:00
LilBC
36894894be
Changed Naming 
Changed recipe-unavailable to recipe-unavailable.
 2021-07-02 09:02:19 -04:00
LilBC
680511ee11
Fix hasUnlockedRecipe and Bad Imports 2021-07-02 08:58:53 -04:00
The Busy Bot
101139bb2f
[CI skip] New locale updates from Crowdin 2021-07-02 14:09:11 +02:00
LilBC
0b2c3dba83
Add files via upload 2021-07-01 18:46:59 -04:00
LilBC
a922e2e8cc
Add files via upload 2021-07-01 18:16:13 -04:00
LilBC
28eec7b101
Add files via upload 2021-07-01 18:15:42 -04:00
LilBC
5a7a151a17
Add files via upload 2021-07-01 16:12:22 -04:00
LilBC
2f74d01312
Add files via upload 2021-07-01 15:10:19 -04:00
LilBC
013907900d
Add files via upload 2021-07-01 15:09:40 -04:00
LilBC
65070dc42e
Add files via upload 2021-07-01 14:34:27 -04:00
LilBC
b01b90d0d0
Add files via upload 2021-07-01 12:45:54 -04:00
LilBC
cbae3b9d73
Add files via upload 2021-07-01 12:44:23 -04:00
The Busy Bot
c31962565d
[CI skip] New locale updates from Crowdin 2021-07-01 12:55:05 +02:00
TheBusyBiscuit
51bfbbd653
Merge pull request #3119 from svr333/AddTridentCrafting 
Add Trident recipe
 2021-06-30 23:35:12 +02:00
Martin Brom
45ee78a0eb Code style 2021-06-30 18:27:57 +02:00
svr333
7109873c16
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-06-28 17:00:32 +02:00
Martin Brom
3bdd32b26d Fix regex to only match "Use" and "Uses", not "Usess..." 2021-06-28 12:33:59 +02:00
Martin Brom
9cab256e2b Add back singular version of "uses left" lore line 
Update regex to match both the plural and singular version
 2021-06-28 12:26:47 +02:00
Martin Brom
55683b15b3
Remove newline 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-06-28 12:12:36 +02:00
Senne
369efa6be3
Resolve merge conflict 2021-06-28 10:59:09 +02:00
Senne
c16e444995
Split up if statements 2021-06-28 10:57:17 +02:00
Pawel Lesiak
6a09b29764 Caching getInventory 2021-06-27 15:25:19 +02:00
Martin Brom
fc197ac1d1 Make the uses left suffix a constant 2021-06-26 22:21:37 +02:00
Martin Brom
ca1222c239 Forgot to remove unused imports... 2021-06-26 22:00:24 +02:00
Martin Brom
4fc940198d Use endsWith instead of regex 2021-06-26 21:56:13 +02:00
TheBusyBiscuit
add34089bc Renamed main class 2021-06-26 19:10:45 +02:00
TheBusyBiscuit
b4b19d53de More refactoring 2021-06-26 19:09:18 +02:00
Martin Brom
c95f9aed0a Move uses left lore regex into PatternUtils 
Make NamespacedKeys in LimitedUseItem and StormStaff non-static
 2021-06-26 16:42:14 +02:00
TheBusyBiscuit
18a944d31b Relocated researches package 2021-06-26 16:36:32 +02:00
TheBusyBiscuit
88fd3333c5 Renamed getByID to getById 2021-06-26 16:34:12 +02:00
TheBusyBiscuit
8055595d75 Formatting 2021-06-26 16:22:56 +02:00
TheBusyBiscuit
fc18546b5c Relocate RecipeType.java 2021-06-26 16:01:50 +02:00
TheBusyBiscuit
7714c50ab9 Renamed categories to item groups 2021-06-26 15:59:24 +02:00
TheBusyBiscuit
f6890f4c49 Relocated SlimefunItem.java 2021-06-26 15:56:34 +02:00
TheBusyBiscuit
0dd1356630 Relocated ItemHandler.java 2021-06-26 15:54:34 +02:00
TheBusyBiscuit
986c152c17 Relocated SlimefunItemStack.java 2021-06-26 15:54:16 +02:00
EpicPlayerA10
05c11a633a Added support for multiple output chests 2021-06-26 11:16:34 +02:00
EpicPlayerA10
66dc68ac5e Cleanup 2021-06-26 10:29:28 +02:00
EpicPlayerA10
be4a4df832
Merge branch 'master' into master 2021-06-26 10:12:56 +02:00
TheBusyBiscuit
25dea3daf6 Fixed #2966 
This fix was salvaged from PR #2968
 2021-06-26 00:21:01 +02:00
TheBusyBiscuit
b9f64bdebc Deepslate ores can now be doubled using an Ore Crusher 2021-06-26 00:05:43 +02:00
TheBusyBiscuit
65142d1204 [CI skip] Some code cleanup 2021-06-26 00:02:43 +02:00
EpicPlayerA10
0d5870296b Fix disappearing items with output chest 2021-06-25 20:53:03 +02:00
TheBusyBiscuit
f5b5fc2f4e
Merge pull request #3118 from svr333/AddDiamondGrinding 
Add diamond -> coal conversion
 2021-06-25 19:16:13 +02:00
TheBusyBiscuit
10764555d3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java 2021-06-25 19:12:23 +02:00
TheBusyBiscuit
155b6014e2 Fixed unit test 2021-06-25 19:07:16 +02:00
svr333
037747983c
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java 
Co-authored-by: Semisol <git@smileycreations15.com>
 2021-06-23 10:26:29 +02:00
NgLoader
5aeb3e8c84 fix: fixed tab 
chore: renamed MultiBlockBreakEvent to PlayerBlockBreakEvent
feat: added AndroidBlockBreakEvent
 2021-06-22 02:24:21 +02:00
NgLoader
bd85eab39c feat: added MultiBlockBreakEvent 2021-06-21 23:33:48 +02:00
NgLoader
1308f0c5a9 chore: updated EventHandler arguements 2021-06-21 21:56:41 +02:00
NgLoader
0e6d7604d7 fix: fixed tabs 2021-06-21 21:40:56 +02:00
NgLoader
e88cffde8c chore: added method description 2021-06-21 21:29:49 +02:00
NgLoader
9919549c7e Merge branch 'master' of github.com:NgLoader/Slimefun4 2021-06-21 21:15:38 +02:00
NgLoader
282f9e0e43 feat: added orebfuscator integration 2021-06-21 21:13:49 +02:00
Senne
7ed4441849
Add subconversion 2021-06-21 20:03:45 +02:00
Senne
60b803c64c
Make trident recipe expensive 2021-06-21 19:54:05 +02:00
Martin Brom
93de94d036 Use Regex to find the correct "Uses left" line 
Make LimitedUseItem::setMaxUseCount return LimitedUseItem
 2021-06-21 15:34:36 +02:00
TheBusyBiscuit
57f7553f74
Merge pull request #3126 from Slimefun/chore/recommend-java-16 
Encourage Java 16 on older versions
 2021-06-21 14:30:10 +02:00
TheBusyBiscuit
334f311917 [CI skip] Reorganize test structure 2021-06-20 16:17:34 +02:00
EpicPlayerA10
fe9cdb3a77
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-06-18 17:24:17 +02:00
EpicPlayerA10
e14c63ce76 Add a freeze effect on the icy bow 2021-06-18 17:14:36 +02:00
EpicPlayerA10
31d0589733 Add a freeze effect on the icy bow 2021-06-18 17:14:21 +02:00
EpicPlayerA10
55d8d9fdcd Add a freeze effect on the icy bow 2021-06-18 17:13:21 +02:00
BuildTools
1c4d2db8ec Add a freeze effect on the icy bow 2021-06-18 16:59:51 +02:00
TheBusyBiscuit
96574bed6f Fixes #3116 2021-06-18 15:09:03 +02:00
TheBusyBiscuit
805c2eafcc Added a new feature to the debug fish 
SlimefunTag support
 2021-06-18 15:08:24 +02:00
TheBusyBiscuit
069896ff66
Switch to WARNING 2021-06-17 11:21:28 +02:00
TheBusyBiscuit
7fcb605d4d Encourage Java 16 on older versions 2021-06-17 10:53:38 +02:00
Senne
919166cb80
Replace 1 water rune with nether star 2021-06-15 16:34:58 +02:00
Martin Brom
04e99e7e64 Change LimitedUseItem count to use setters instead 
Fix annotations
 2021-06-15 12:06:59 +02:00
Senne
0e851f7be5
Add trident recipe 2021-06-14 14:56:48 +02:00
Senne
7865ad92fc
Add diamond -> 24 coal conversion 2021-06-14 14:29:58 +02:00
svr333
ffcb8d7146
Update src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-06-14 14:20:16 +02:00
Martin Brom
0cde52331e Add LimitedUseItem - base class for items with limited uses 
Update StormStaff to extend LimitedUseItem
Add 'usesLeft' function to LoreBuilder
 2021-06-13 13:27:38 +02:00
TheBusyBiscuit
59a548ef66
[CI skip] Make javadocs happy 2021-06-12 15:59:10 +02:00
TheBusyBiscuit
1d052bda9c Some formatting 2021-06-12 00:31:42 +02:00
TheBusyBiscuit
7008e36e68 Added new spawn eggs 2021-06-12 00:29:26 +02:00
TheBusyBiscuit
15da49392a Updated ore tags 2021-06-12 00:21:31 +02:00
Daniel Walsh
6b6883ca4e
Variable for minHeight 2021-06-11 16:10:26 +01:00
Daniel Walsh
8912ca1ea0
Improve loop in SeismicAxe 2021-06-11 15:58:38 +01:00
Daniel Walsh
ea98a3e5a3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/SeismicAxe.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-06-11 15:36:51 +01:00
Daniel Walsh
2513b71e6f
Final changes 2021-06-11 15:30:20 +01:00
Daniel Walsh
ede931cdcd
Create WorldUtils 2021-06-11 13:41:19 +01:00
Daniel Walsh
1e1889b66d
Goats can produce milk 2021-06-11 13:33:21 +01:00
Daniel Walsh
196c5d4e97
Fix tag for 1.17 (maybe??) 2021-06-11 11:44:48 +01:00
Daniel Walsh
408468ce6a
Add min y to elevator and seismic axe 2021-06-11 11:37:04 +01:00
Daniel Walsh
d065951b9f
1.17 recipes provided by martin 2021-06-11 11:24:09 +01:00
Daniel Walsh
eb4c6aa22b
1.17 support 2021-06-11 11:19:43 +01:00
Senne
e40f7996bf
Clean up equalsItemMeta() 2021-06-09 12:36:48 +02:00
Martin Brom
96ec2ba1f6 FlexCategories can now be made visible in CheatSheetSlimefunGuide 2021-06-06 20:31:24 +02:00
Martin Brom
f34cc35646 Hidden items are now not shown in the SlimefunGuide 
Resolves #3105
 2021-06-06 18:24:05 +02:00
TheBusyBiscuit
cc23211504 Added a startup warning for when CS-CoreLib is still installed 2021-06-06 11:49:44 +02:00
The Busy Bot
23c79c293a
[CI skip] New locale updates from Crowdin 2021-06-06 11:11:15 +02:00
TheBusyBiscuit
326a431151
Merge pull request #3102 from Slimefun/api/add-collectAverageTimings-for-timings 
Add collectAverageTimings to SlimefunProfiler
 2021-06-04 00:56:12 +02:00
Daniel Walsh
9696f8a22f
Requested changes 2021-06-03 22:35:18 +01:00
TheBusyBiscuit
448794fd74
Merge pull request #3077 from Mooy1/entity-hit-handler 
Added WeaponUseHandler
 2021-06-03 23:21:42 +02:00
Daniel Walsh
699be3584b
Correct message 2021-06-03 21:54:52 +01:00
Daniel Walsh
d6bcf17208
Add collectAverageTimings to SlimefunProfiler; 2021-06-03 21:26:39 +01:00
TheBusyBiscuit
5a1405014f [CI skip] Removed deprecated events and methods 2021-06-03 19:19:14 +02:00
TheBusyBiscuit
ce32681d1b
Merge pull request #3098 from Seggan/dev 
Add charcoal -> coal recipe
 2021-06-03 19:13:41 +02:00
TheBusyBiscuit
ee14c513ba
Merge pull request #3097 from Slimefun/chore/config-cleanup 
Change config for consistency and improvement
 2021-06-03 19:00:19 +02:00
TheBusyBiscuit
b7c6a431a5 [CI skip] Lock in RC-24 release date 2021-06-03 18:57:07 +02:00
TheBusyBiscuit
6071e1b952 [CI skip] Updated style preferences in contributing.md 2021-06-03 18:38:39 +02:00
Daniel Walsh
8de85ac315
Simplified 2021-06-03 15:24:14 +01:00
Daniel Walsh
cb22ab7eb7
Remove old compat change 2021-06-03 12:33:00 +01:00
Riley
8cda831ba1 Did changes 2021-06-02 11:07:06 -05:00
Seggan
09f0f07db4 Add charcoal -> carbon recipe 2021-06-01 11:42:18 -04:00
Daniel Walsh
11b20b2744
Disable backwards compat by default 
While we do have code which sets this to true if there is no data-storage dir there are many cases where that dir is copied however the config is not meaning it gets enabled.
 2021-05-31 18:50:51 +01:00
Daniel Walsh
b73063ef7b
Update config.yml 2021-05-31 18:49:14 +01:00
TheBusyBiscuit
0224f94edf
Merge pull request #3096 from martinbrom/fix/auto-brewer 
AutoBrewer fixes
 2021-05-31 15:05:57 +02:00
Martin Brom
33340d0dd0
Apply suggestions from code review 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-05-31 10:32:56 +02:00
TheBusyBiscuit
d39a5c1ba2 Fixed #3086 2021-05-31 10:26:42 +02:00
Martin Brom
bd6efaf632 Fix AutoBrewer stripping redstone/glowstone modifiers when fermenting a potion 
Resolves #3095
 2021-05-31 10:08:58 +02:00
Martin Brom
87b0812c2e Fix IllegalArgumentException when trying to brew invalid potions 
Resolves #3093
 2021-05-31 10:08:58 +02:00
Martin Brom
d23f1265b3
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-05-30 13:49:43 +02:00
Martin Brom
cda2228a7d Fix IllegalArgumentException when ChestTerminal is requesting items 
Resolves #3091
 2021-05-30 13:20:09 +02:00
TheBusyBiscuit
cf362f7c7a Fixed #3087 2021-05-29 10:35:41 +02:00
TheBusyBiscuit
ab2049d1d2 Fixed #3088 2021-05-29 10:31:38 +02:00
TheBusyBiscuit
477cad5487 Fixed #3085 2021-05-29 00:40:32 +02:00
TheBusyBiscuit
76dda9a439 Fixed #3084 2021-05-29 00:21:37 +02:00
Jeffrey Kosse
990cc48feb did requested changes 2021-05-28 19:38:22 +02:00
Jeffrey Kosse
1b2d3e683e removed redundant formatter 2021-05-28 18:30:35 +02:00
Jeffrey Kosse
ab534dc4f4 did requested changes 2021-05-28 18:28:49 +02:00
J3fftw
ba4767ae05
Update ErrorReport.java 2021-05-28 18:24:28 +02:00
J3fftw
3205d83e35
Update src/main/java/io/github/thebusybiscuit/slimefun4/api/ErrorReport.java 
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
 2021-05-28 18:23:17 +02:00
Jeffrey Kosse
8f6d9209c1 added time and date to error report 2021-05-28 18:16:24 +02:00
TheBusyBiscuit
a36f487fff Added back setters and getters for GEOMiner tier configuration 2021-05-28 15:10:55 +02:00
TheBusyBiscuit
6c9f8721be
Merge pull request #2779 from Slimefun/api/machine-operations 
Rewrote Machine Processing API
 2021-05-28 14:44:05 +02:00
Riley
4dad8a1589 Did changes 2021-05-27 10:00:22 -05:00
TheBusyBiscuit
3ff1197971
Merge pull request #3080 from Mooy1/slimefun-item-small-recipes 
Easier SlimefunItem creation with small recipe
 2021-05-27 13:14:11 +02:00
Riley
80a31b02fc Update SlimefunItem.java 2021-05-26 14:06:27 -05:00
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