mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
7,316 Commits 1 Branch 0 Tags 64 MiB
1f3d0f5c20
Commit Graph

5314 Commits

Author SHA1 Message Date
Varian Anora
cc018582a6 Fixed #3265 
Add checks for off hand items.
 2021-09-23 18:05:42 +07:00
Daniel Walsh
7e04117357
Merge pull request #3253 from guizhanss/feature/hercules-pickaxe-update 2021-09-23 11:52:26 +01:00
Varian Anora
fc8c02c777 Add missing recipes to Electrified Crucible 
This will make normal crucible and electrified crucible have the same recipe.
Fixes #3273
 2021-09-21 21:52:01 +07:00
TheBusyBiscuit
19c7e235ed Small improvements 2021-09-19 19:39:06 +02:00
TheBusyBiscuit
4727b2a5dd
Merge pull request #3258 from Slimefun/performance/improve-item-comparison-performance 
Improves item comparison performance
 2021-09-19 18:58:26 +02:00
TheBusyBiscuit
6a712696fc
Merge pull request #3259 from Sfiguz7/feature/auto-ench-lvl-override-config 
Fixes #3248
 2021-09-19 15:34:46 +02:00
TheBusyBiscuit
c83c84e61e [CI skip] Updated changelog 2021-09-19 15:34:30 +02:00
Sfiguz7
1a3a50120f Defaulted to fixed. Requested changes 2021-09-16 20:31:25 +02:00
Sfiguz7
7e98984547 Formatting... 2021-09-15 18:11:03 +02:00
Sfiguz7
d83d18819f Removed unused imports 2021-09-15 18:09:44 +02:00
Sfiguz7
ff58385063 Fixes 2021-09-15 18:07:24 +02:00
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