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

7643 Commits

Author SHA1 Message Date
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
GuizhanCraft
270e3f4dce
Merge branch 'Slimefun:master' into feature/hercules-pickaxe-update 2021-09-14 23:33:01 +08: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
TheBusyBiscuit
7ae0128ff6
[CI skip] Merge pull request #3250 from Slimefun/renovate/junit5-monorepo
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0
2021-09-14 11:53:50 +02:00
TheBusyBiscuit
1f12693691
[CI skip] Merge pull request #3249 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.13.0
2021-09-14 11:53:30 +02:00
TheBusyBiscuit
c90b666fe5
[CI skip] Merge pull request #3245 from Slimefun/renovate/thollander-actions-comment-pull-request-1.x
Update thollander/actions-comment-pull-request action to v1.0.4
2021-09-14 11:53:13 +02: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
Renovate Bot
3310897403
Update dependency org.junit.jupiter:junit-jupiter to v5.8.0 2021-09-12 19:30:37 +00:00
Renovate Bot
dcfb399b3d
Update dependency com.konghq:unirest-java to v3.13.0 2021-09-12 16:17:39 +00:00
Renovate Bot
08e9e86ac7
Update thollander/actions-comment-pull-request action to v1.0.4 2021-09-11 20:12:20 +00: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
1e5c32cf52
[CI skip] Merge pull request #3242 from Slimefun/renovate/org.apache.maven.plugins-maven-javadoc-plugin-3.x
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1
2021-09-09 12:37:23 +02:00
TheBusyBiscuit
9a88b9fbcf
[CI skip] Merge pull request #3244 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.12.0
2021-09-09 12:37:02 +02:00
Renovate Bot
312db84e47
Update dependency com.konghq:unirest-java to v3.12.0 2021-09-08 21:39:58 +00:00
Renovate Bot
8913e2e3b1
Update dependency org.apache.maven.plugins:maven-javadoc-plugin to v3.3.1 2021-09-07 19:20:33 +00:00
TheBusyBiscuit
ab8f20f09f
Damn, we need a new RC 2021-09-06 15:05:10 +02:00
TheBusyBiscuit
fc207b6a83
Merge pull request #3232 from svr333/FixCategoryNaming
Rename category -> itemGroup
2021-09-06 14:40:19 +02:00
TheBusyBiscuit
3450019643
Merge pull request #3238 from Slimefun/fix/metrics-download
Fix metrics not being able to download
2021-09-06 14:27:10 +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
TheBusyBiscuit
a45888a07e
Merge pull request #3237 from Slimefun/fix/metrics-awkwardness-fuck-my-life
Update repo
2021-09-06 12:41:18 +02:00
Daniel Walsh
bafcd536f7
Update repo 2021-09-06 11:04:24 +01:00
TheBusyBiscuit
6a72807998
Merge pull request #3236 from Slimefun/renovate/io.github.baked-libs-dough-api-1.x
Update dependency io.github.baked-libs:dough-api to v1.0.3
2021-09-06 11:09:01 +02:00
Renovate Bot
94da02e0e6
Update dependency io.github.baked-libs:dough-api to v1.0.3 2021-09-06 08:57:32 +00:00
Senne
f7f2c62ef7
Un-rename android category 2021-09-05 13:24:14 +02:00
TheBusyBiscuit
6e65d653ea
Merge pull request #3230 from Slimefun/renovate/pascalgn-automerge-action-0.x
Update pascalgn/automerge-action action to v0.14.3
2021-09-05 10:13:46 +02:00
TheBusyBiscuit
488d83fcd6
Merge pull request #3234 from Slimefun/renovate/thollander-actions-comment-pull-request-1.x
Update thollander/actions-comment-pull-request action to v1.0.3
2021-09-05 10:13:36 +02:00
Renovate Bot
798b5b8b47
Update thollander/actions-comment-pull-request action to v1.0.3 2021-09-04 22:00:12 +00:00
Senne
8995005915
Replace category -> itemGroup 2021-09-04 12:52:29 +02:00
Renovate Bot
b7b24dca44
Update pascalgn/automerge-action action to v0.14.3 2021-09-03 20:20:49 +00:00
TheBusyBiscuit
3fbb6884fb New changelog cycle 2021-09-03 14:05:20 +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
TheBusyBiscuit
7b4c9d93fa
Merge pull request #3139 from Slimefun/breaking-changes/class-relocation
⚠️ BREAKING CHANGES ⚠️ - Relocation of important API classes.
2021-09-03 13:42:33 +02:00