Mixin into the mixin of the mixin

Abes-Hutt · Jan 13, 2025 · d2bd3f2 · d2bd3f2
1 parent 073fa50
commit d2bd3f2
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/common/build.gradle b/common/build.gradle
@@ -31,4 +31,5 @@ dependencies {
     modImplementation files("jars/Enhanced-Celestials-Fabric-1.20.1-5.0.1.0.jar")
     modImplementation files("jars/sophisticatedbackpacks-1.20.1-3.20.17.1.60.jar")
     modImplementation files("jars/sophisticatedstorage-1.20.1-0.11.3.1.73.jar")
+    modImplementation files("jars/terrastorageicons-1.0.0.jar")
 }
diff --git a/common/jars/terrastorageicons-1.0.0.jar b/common/jars/terrastorageicons-1.0.0.jar
diff --git a/common/src/main/java/abeshutt/staracademy/compat/terrastorage/TerraStorageCompat.java b/common/src/main/java/abeshutt/staracademy/compat/terrastorage/TerraStorageCompat.java
@@ -7,7 +7,7 @@
 public class TerraStorageCompat {
 
     public static boolean shouldBlock(Object object) {
-        return object instanceof BackpackScreen || object instanceof StorageScreen || object instanceof ShulkerBoxScreen;
+        return object instanceof BackpackScreen || object instanceof StorageScreen;
     }
 
 }
diff --git a/common/src/main/java/abeshutt/staracademy/mixin/terrastorage/MixinHandledScreenMixin.java b/common/src/main/java/abeshutt/staracademy/mixin/terrastorage/MixinHandledScreenMixin.java
@@ -3,19 +3,27 @@
 import abeshutt.staracademy.compat.terrastorage.TerraStorageCompat;
 import com.bawnorton.mixinsquared.TargetHandler;
 import net.minecraft.client.gui.screen.ingame.HandledScreen;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+@Debug(export = true)
 @Mixin(value = HandledScreen.class, priority = 15000)
 public class MixinHandledScreenMixin {
 
     @TargetHandler(mixin = "me.timvinci.mixin.client.HandledScreenMixin", name = "onInit")
     @Inject(method = "@MixinSquared:Handler", at = @At("HEAD"), cancellable = true)
-    public void onInit(CallbackInfo ci) {
-        System.out.println("==================== MIXIN THE MIXIN ====================");
+    public void onInit1(CallbackInfo ci) {
+        if(TerraStorageCompat.shouldBlock(this)) {
+            ci.cancel();
+        }
+    }
 
+    @TargetHandler(mixin = "jakesmythuk.terrastorageicons.mixin.client.HandledScreenMixin", name = "onInit")
+    @Inject(method = "@MixinSquared:Handler", at = @At("HEAD"), cancellable = true)
+    public void onInit2(CallbackInfo ci) {
         if(TerraStorageCompat.shouldBlock(this)) {
             ci.cancel();
         }

diff --git a/common/src/main/java/abeshutt/staracademy/mixin/terrastorage/MixinInventoryScreenMixin.java b/common/src/main/java/abeshutt/staracademy/mixin/terrastorage/MixinInventoryScreenMixin.java
@@ -3,22 +3,31 @@
 import abeshutt.staracademy.compat.terrastorage.TerraStorageCompat;
 import com.bawnorton.mixinsquared.TargetHandler;
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+import org.spongepowered.asm.mixin.Debug;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+@Debug(export = true)
 @Mixin(value = InventoryScreen.class, priority = 15000)
 public class MixinInventoryScreenMixin {
 
     @TargetHandler(mixin = "me.timvinci.mixin.client.InventoryScreenMixin", name = "onInit")
     @Inject(method = "@MixinSquared:Handler", at = @At("HEAD"), cancellable = true)
-    public void onInit(CallbackInfo ci) {
-        System.out.println("==================== MIXIN THE MIXIN ====================");
+    public void onInit1(CallbackInfo ci) {
+        if(TerraStorageCompat.shouldBlock(this)) {
+            ci.cancel();
+        }
+    }
 
+    @TargetHandler(mixin = "jakesmythuk.terrastorageicons.mixin.client.InventoryScreenMixin", name = "onInit")
+    @Inject(method = "@MixinSquared:Handler", at = @At("HEAD"), cancellable = true)
+    public void onInit2(CallbackInfo ci) {
         if(TerraStorageCompat.shouldBlock(this)) {
             ci.cancel();
         }
     }
 
+
 }