1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Commit Graph

5353 Commits

Author SHA1 Message Date
terslenk
7e3774ecd1 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:32:54 +03:00
terslenk
75b298ed18 adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:20:35 +03:00
terslenk
af9c61904d adding gravity_affected_blocks.json and adding "GRAVITY_AFFECTED_BLOCKS" into SlimefunTag.java 2021-10-10 14:06:49 +03:00
Daniel Walsh
c18ce123c0
Add "disable" to tab complete 2021-10-09 18:02:22 +01:00
Daniel Walsh
4444fc6ec2
Changes 2021-10-09 17:57:38 +01:00
TheBusyBiscuit
e42700dc98
Merge pull request #3307 from svr333/AdjustSolarGenerator
Solar Generators - Return night energy in non overworld dimensions
2021-10-09 18:08:11 +02:00
Daniel Walsh
cea2ec194f
Merge branch 'feature/debug-command' of github.com:Slimefun/Slimefun4 into feature/debug-command 2021-10-09 16:35:39 +01:00
Daniel Walsh
b3ee9628b5
Add perm to plugin.yml 2021-10-09 16:35:30 +01:00
Daniel Walsh
ccd4d5bf65
Apply suggestions from code review
Co-authored-by: svr333 <vanrompaey.senne@protonmail.com>
2021-10-09 16:19:30 +01:00
Senne
b0544ee79b
Add as setting 2021-10-09 16:09:25 +02:00
Senne
42e647020f
Remove redundant line 2021-10-09 12:42:56 +02:00
Daniel Walsh
ecc0d6bb69
Added some comments 2021-10-09 10:13:27 +01:00
Daniel Walsh
1d27adabd4
Missing author tags 2021-10-09 10:06:05 +01:00
Daniel Walsh
b2590ddd42
Lots of docs and stuff 2021-10-09 10:05:09 +01:00
TheBusyBiscuit
9c3465e80f
Merge pull request #3298 from qwertyuioplkjhgfd/shift-lumber-axe
Check for sneaking when breaking logs on lumber axe
2021-10-08 19:32:40 +02:00
Daniel Walsh
421545111e
da hecl 2021-10-07 19:20:01 +01:00
Daniel Walsh
fd148f9d8e
Another log 2021-10-07 19:14:08 +01:00
Daniel Walsh
f0d4b57a47
Fix bug 2021-10-07 19:12:16 +01:00
Daniel Walsh
3284604160
Implement the ability for debug logging 2021-10-07 13:51:31 +01:00
TweepCoding
48d01f9aae Removed unnecesary runSync() calls 2021-10-06 10:57:34 -05:00
Senne
ef3db81157
Return night energy in other dimensions 2021-10-06 16:03:41 +02:00
Senne
8b037f9310
Fix logic 2021-10-06 14:38:21 +02:00
svr333
cacb0a82e3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-06 14:37:31 +02:00
Senne
da988c981f
Use correct if 2021-10-06 14:30:40 +02:00
Senne
d3c9bbdcac
Improve Right Click in Cheat Menu
On right click it will check if the user is holding shift, if so it will give a full stack.
2021-10-06 11:14:08 +02:00
qwertyuioplkjhgfd
36912f517f check for sneaking on lumber axe 2021-10-02 20:03:03 -07:00
Sfiguz7
fe9d11d879
Fix explosive bow knockback being way too high if close to the entity (#3295)
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-10-02 23:38:50 +01:00
Senne
e1a0ade124
Finish wiki.json 2021-10-02 17:13:59 +02:00
Senne
1aa2260cf0
wiki.json until Talisman category 2021-10-02 15:32:46 +02:00
Senne
96382a1a4b
Add wiki.json pages 2021-10-02 00:05:08 +02:00
Daniel Walsh
3b31431ab1
[CI Skip] Merge pull request #3292 from Sfiguz7/fix/solargen-ischargeable 2021-09-30 16:15:01 +01:00
Sfiguz7
e5c58b2493 Removed useless overriding 2021-09-30 16:30:20 +02:00
Daniel Walsh
e2d2ec60de
Merge pull request #3279 from variananora/fix/3265 2021-09-28 15:13:58 +01:00
Sfiguz7
215ac668e0 Added capaciy to solargens 2021-09-26 14:45:30 +02:00
Sfiguz7
a1cd40998b Removed unneeded final: added in a fix, limits extensibility 2021-09-26 14:32:08 +02:00
TheBusyBiscuit
36c6d15421
Merge pull request #3252 from Sefiraat/smithing-table-listener
Smithing table listener
2021-09-25 21:15:26 +02:00
TheBusyBiscuit
2d34d61d9a
Merge pull request #3274 from variananora/fix/3273
Fixes #3273
2021-09-25 20:59:29 +02:00
Varian Anora
1da20d0846 Better formatting 2021-09-23 18:37:06 +07:00
Varian Anora
eec5d2d66b Merge remote-tracking branch 'upstream/master' into fix/3265 2021-09-23 18:05:49 +07:00
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