Port changes to 1.18 & 1.19

aleksilassila · Dec 8, 2022 · a0bac3d · a0bac3d
1 parent fa3beaf
commit a0bac3d
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/v1_18/src/main/java/me/aleksilassila/litematica/printer/v1_18/mixin/AxeItemAccessor.java b/v1_18/src/main/java/me/aleksilassila/litematica/printer/v1_18/mixin/AxeItemAccessor.java
@@ -0,0 +1,20 @@
+package me.aleksilassila.litematica.printer.v1_18.mixin;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.AxeItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+/**
+ * This class apparently fixes an issue with Quilt.
+ */
+@Mixin(AxeItem.class)
+public interface AxeItemAccessor {
+    @Accessor("STRIPPED_BLOCKS")
+    static Map<Block, Block> getStrippedBlocks() {
+        throw new AssertionError("Untransformed @Accessor");
+    }
+
+}
diff --git a/v1_18/src/main/resources/litematica-printer.mixins.json b/v1_18/src/main/resources/litematica-printer.mixins.json
@@ -9,7 +9,8 @@
     "ConfigsMixin",
     "GuiConfigsMixin",
     "InputHandlerMixin",
-    "PlayerMoveC2SPacketMixin"
+    "PlayerMoveC2SPacketMixin",
+    "AxeItemAccessor"
   ],
   "injectors": {
     "defaultRequire": 1

diff --git a/v1_19/src/main/java/me/aleksilassila/litematica/printer/v1_19/mixin/AxeItemAccessor.java b/v1_19/src/main/java/me/aleksilassila/litematica/printer/v1_19/mixin/AxeItemAccessor.java
@@ -0,0 +1,20 @@
+package me.aleksilassila.litematica.printer.v1_19.mixin;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.AxeItem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+/**
+ * This class apparently fixes an issue with Quilt.
+ */
+@Mixin(AxeItem.class)
+public interface AxeItemAccessor {
+    @Accessor("STRIPPED_BLOCKS")
+    static Map<Block, Block> getStrippedBlocks() {
+        throw new AssertionError("Untransformed @Accessor");
+    }
+
+}
diff --git a/v1_19/src/main/resources/litematica-printer.mixins.json b/v1_19/src/main/resources/litematica-printer.mixins.json
@@ -9,7 +9,8 @@
     "ConfigsMixin",
     "GuiConfigsMixin",
     "InputHandlerMixin",
-    "PlayerMoveC2SPacketMixin"
+    "PlayerMoveC2SPacketMixin",
+    "AxeItemAccessor"
   ],
   "injectors": {
     "defaultRequire": 1