Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SlimefunItemStack reimplementation #4251

Open
wants to merge 53 commits into
base: walshy/mc-1.21
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
6f2f30d
Fix tests
Intybyte Oct 22, 2024
a62ecff
Use delegation... this is gonna be a long pr
Intybyte Oct 22, 2024
75d9c75
Address review
Intybyte Oct 23, 2024
c8efc79
Refactor some more stuff
Intybyte Oct 23, 2024
70c96e0
More fixed, most notably ChestMenuUtils
Intybyte Oct 25, 2024
e7aefc6
More refactoring
Intybyte Oct 25, 2024
b646376
Refactor getDelegate to item, and some small changes
Intybyte Nov 4, 2024
787851c
Merge branch 'refs/heads/walshy/mc-1.21' into walshy/mc-1.21-sfi
Intybyte Nov 9, 2024
35396d0
Small error on merge
Intybyte Nov 9, 2024
dfa4e94
Merge fixes + more fixes
Intybyte Nov 9, 2024
3435390
GrindStone fix
Intybyte Nov 9, 2024
3512cd3
MagicEyeOfEnder fix
Intybyte Nov 9, 2024
af27545
NetherStarReactor fix
Intybyte Nov 9, 2024
1b73f98
NuclearReactor fix
Intybyte Nov 9, 2024
1f28097
OilPump fix
Intybyte Nov 9, 2024
cc45f7d
OreCrusher fix
Intybyte Nov 9, 2024
5e25492
OrganicFertilizer fix
Intybyte Nov 9, 2024
8969397
OrganicFood fix
Intybyte Nov 9, 2024
3497af0
TreeGrowthAccelerator fix
Intybyte Nov 9, 2024
7749d43
Add method for SlimefunItemStack
Intybyte Nov 9, 2024
69ecf93
Smeltery Fix
Intybyte Nov 9, 2024
810ad17
Smeltery Fix
Intybyte Nov 9, 2024
a5094b1
SlimefunItemInteractListener Fix
Intybyte Nov 9, 2024
5d1952d
SaltResource Fix
Intybyte Nov 9, 2024
e10da88
Yes. I wrote a parser just for this.
Intybyte Nov 10, 2024
8c25fff
Couldn't write a parser for the finishing touches tho...
Intybyte Nov 10, 2024
a85442f
Fix slimefunItem + TODO
Intybyte Nov 12, 2024
e94b355
Fix RecipeType
Intybyte Nov 12, 2024
64c5e67
Fix AncientAltarListener
Intybyte Nov 12, 2024
e0e850b
Fix ArmorTask
Intybyte Nov 12, 2024
81c600d
Fix DeathpointListener
Intybyte Nov 12, 2024
8d940bd
Fix DefaultItemGroups
Intybyte Nov 12, 2024
45d3231
Fix GadgetsListener
Intybyte Nov 12, 2024
0cd88ca
Fix Resources
Intybyte Nov 12, 2024
e141d41
Fix Resources 2
Intybyte Nov 12, 2024
eec08ce
Fix SlimefunUtils
Intybyte Nov 12, 2024
ff3b5ec
Fix Some tests to call .item();
Intybyte Nov 12, 2024
b013127
Ok lets fire those tests
Intybyte Nov 12, 2024
f409400
Forgot those
Intybyte Nov 12, 2024
2683be5
Looks like there is no reason to keep that there
Intybyte Nov 12, 2024
f4c0864
TODOs
Intybyte Nov 12, 2024
861d303
SlimefunItemStack can't be casted to ItemStack anymore
Intybyte Nov 12, 2024
26b5a43
Fix null throwing
Intybyte Nov 12, 2024
60f183b
Fix init
Intybyte Nov 12, 2024
9ff36e5
Delombok, convert to equivalent without new dependency
Intybyte Nov 16, 2024
16260d6
Fixed soulbound testing
Intybyte Nov 16, 2024
415f690
Use cloneItem here
Intybyte Nov 16, 2024
3c1d8fd
.item() and getItem() now creates a defensive copy
Intybyte Nov 16, 2024
52c80c8
Fix RecipeType
Intybyte Nov 23, 2024
8214370
Merge branch 'refs/heads/walshy/mc-1.21' into walshy/mc-1.21-sfi
Intybyte Nov 23, 2024
c8f9181
Remove unused code
Intybyte Nov 25, 2024
25da22e
1.21.3 Bundles aren't allowed
Intybyte Nov 30, 2024
84a5bbc
Required false
Intybyte Nov 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix GadgetsListener
  • Loading branch information
Intybyte committed Nov 12, 2024
commit 45d3231fcc503ccf625736bbf0c67aa92e6f7056
Original file line number Diff line number Diff line change
@@ -55,7 +55,7 @@ public void onToggleSneak(PlayerToggleSneakEvent e) {
handleBoots(p, boots);
}

if (SlimefunUtils.containsSimilarItem(p.getInventory(), SlimefunItems.INFUSED_MAGNET, true)) {
if (SlimefunUtils.containsSimilarItem(p.getInventory(), SlimefunItems.INFUSED_MAGNET.item(), true)) {
InfusedMagnet magnet = (InfusedMagnet) SlimefunItems.INFUSED_MAGNET.getItem();

if (magnet.canUse(p, true)) {