Merge pull request #64 from mayabyte/latest

Support 1.20.4
KrisCris · Jan 21, 2024 · 3ff2aef · 3ff2aef
2 parents 8329247 + f27138c
commit 3ff2aef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -2,10 +2,10 @@
 	org.gradle.jvmargs=-Xmx1G
 
 #Fabric
-	minecraft_version=1.20.2
-	yarn_mappings=1.20.2+build.4
-	loader_version=0.15.0
-	fabric_version=0.91.1+1.20.2
+	minecraft_version=1.20.4
+	yarn_mappings=1.20.4+build.3
+	loader_version=0.15.6
+	fabric_version=0.94.1+1.20.4
 
 # Mod Properties
 	mod_version = 2.0.0

diff --git a/src/main/java/online/connlost/allstackable/mixin/MixinCauldronBlock.java b/src/main/java/online/connlost/allstackable/mixin/MixinCauldronBlock.java
@@ -17,13 +17,11 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import java.util.Map;
-
 @Mixin(AbstractCauldronBlock.class)
 public class MixinCauldronBlock {
 
     @Shadow
-    Map<Item, CauldronBehavior> behaviorMap;
+    CauldronBehavior.CauldronBehaviorMap behaviorMap;
 
 
     CauldronBehavior CLEAN_STACKED_SHULKER_BOX = (state, world, pos, player, hand, stack) -> {
@@ -50,7 +48,7 @@ public class MixinCauldronBlock {
     private void cleanStackedShulkerBox(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit, CallbackInfoReturnable<ActionResult> cir){
         ItemStack itemStack = player.getStackInHand(hand);
         if (ItemsHelper.isModified(itemStack) && itemStack.getCount() > 1) {
-            if(behaviorMap.get(itemStack.getItem()) == CauldronBehavior.CLEAN_SHULKER_BOX){
+            if(behaviorMap.map().get(itemStack.getItem()) == CauldronBehavior.CLEAN_SHULKER_BOX){
                 cir.setReturnValue(CLEAN_STACKED_SHULKER_BOX.interact(state, world, pos, player, hand, itemStack));
             }
         }