Remove terrastorage from sophiscated UIs

build.gradle

@@ -37,6 +37,7 @@ subprojects {
         // for more information about repositories.
         maven { url = "https://maven.wispforest.io/" }
         maven { url = "https://maven.impactdev.net/repository/development/" }
+        maven { url = "https://maven.bawnorton.com/releases" }
         exclusiveContent {
             forRepository {
                 maven {

common/build.gradle

@@ -28,4 +28,6 @@ dependencies {
     modImplementation files("jars/solara_dimension-0.1A-fabric-1.20.1.jar")
     modImplementation files("jars/Corgilib-Fabric-1.20.1-4.0.3.3.jar")
     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")
 }

common/src/main/java/abeshutt/staracademy/StarAcademyMod.java

@@ -3,7 +3,7 @@
 import abeshutt.staracademy.event.CommonEvents;
 import abeshutt.staracademy.init.ModConfigs;
 import abeshutt.staracademy.init.ModRegistries;
-import abeshutt.staracademy.modsupport.enhancedcelestials.EnhancedCelestialsCompat;
+import abeshutt.staracademy.compat.enhancedcelestials.EnhancedCelestialsCompat;
 import abeshutt.staracademy.world.random.JavaRandom;
 import com.cobblemon.mod.common.Cobblemon;
 import com.cobblemon.mod.common.CobblemonItems;

common/src/main/java/abeshutt/staracademy/modsupport/enhancedcelestials/EnhancedCelestialsCompat.java → common/src/main/java/abeshutt/staracademy/compat/enhancedcelestials/EnhancedCelestialsCompat.java

@@ -1,4 +1,4 @@
-package abeshutt.staracademy.modsupport.enhancedcelestials;
+package abeshutt.staracademy.compat.enhancedcelestials;
 
 import abeshutt.staracademy.StarAcademyMod;
 import abeshutt.staracademy.init.ModConfigs;

common/src/main/java/abeshutt/staracademy/compat/terrastorage/TerraStorageCompat.java

@@ -0,0 +1,12 @@
+package abeshutt.staracademy.compat.terrastorage;
+
+import net.p3pp3rf1y.sophisticatedbackpacks.client.gui.BackpackScreen;
+import net.p3pp3rf1y.sophisticatedstorage.client.gui.StorageScreen;
+
+public class TerraStorageCompat {
+
+    public static boolean shouldBlock(Object object) {
+        return object instanceof BackpackScreen || object instanceof StorageScreen;
+    }
+
+}

common/src/main/resources/academy-common.mixins.json

@@ -28,8 +28,8 @@
     "MixinMobEntity",
     "MixinPlayerScreenHandler",
     "MixinStructureTemplate",
-    "cloudboots.MixinGoldenFeatherTrinket",
     "bountiful.MixinBountyItem",
+    "cloudboots.MixinGoldenFeatherTrinket",
     "cobblemon.MixinPokeBallItem",
     "mythsandlegends.MixinFormAndAspectUtils",
     "mythsandlegends.MixinPlayerEvents",

fabric/build.gradle

@@ -34,6 +34,8 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
     modImplementation "net.fabricmc.fabric-api:fabric-api:$rootProject.fabric_api_version"
     modImplementation "dev.architectury:architectury-fabric:$rootProject.architectury_api_version"
+    include(implementation(annotationProcessor("com.github.bawnorton.mixinsquared:mixinsquared-fabric:0.2.0")))
+
     modImplementation "com.cobblemon:fabric:1.5.2+1.20.1"
     //modImplementation "maven.modrinth:enhanced-celestials:6.0.1.3-fabric"
     //modImplementation "maven.modrinth:corgilib:1.20.1-4.0.3.3-fabric"

fabric/src/main/java/abeshutt/staracademy/fabric/StarAcademyFabricMod.java

@@ -1,9 +1,7 @@
 package abeshutt.staracademy.fabric;
 
 import abeshutt.staracademy.StarAcademyMod;
-import abeshutt.staracademy.modsupport.enhancedcelestials.EnhancedCelestialsCompat;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.loader.api.FabricLoader;
 
 public final class StarAcademyFabricMod implements ModInitializer {
 

fabric/src/main/java/abeshutt/staracademy/fabric/mixin/terrastorage/MixinHandledScreenMixin.java

@@ -0,0 +1,22 @@
+package abeshutt.staracademy.fabric.mixin.terrastorage;
+
+import abeshutt.staracademy.compat.terrastorage.TerraStorageCompat;
+import com.bawnorton.mixinsquared.TargetHandler;
+import net.minecraft.client.gui.screen.ingame.HandledScreen;
+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;
+
+@Mixin(value = HandledScreen.class, priority = 1500)
+public class MixinHandledScreenMixin {
+
+    @TargetHandler(mixin = "me.timvinci.mixin.client.HandledScreenMixin", name = "onInit")
+    @Inject(method = "@MixinSquared:Handler", at = @At("HEAD"))
+    public void onInit(CallbackInfo oci, CallbackInfo ci) {
+        if(TerraStorageCompat.shouldBlock(this)) {
+            oci.cancel();
+        }
+    }
+
+}

fabric/src/main/java/abeshutt/staracademy/fabric/mixin/terrastorage/MixinInventoryScreenMixin.java

@@ -0,0 +1,22 @@
+package abeshutt.staracademy.fabric.mixin.terrastorage;
+
+import abeshutt.staracademy.compat.terrastorage.TerraStorageCompat;
+import com.bawnorton.mixinsquared.TargetHandler;
+import net.minecraft.client.gui.screen.ingame.InventoryScreen;
+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;
+
+@Mixin(value = InventoryScreen.class, priority = 1500)
+public class MixinInventoryScreenMixin {
+
+    @TargetHandler(mixin = "me.timvinci.mixin.client.InventoryScreenMixin", name = "onInit")
+    @Inject(method = "@MixinSquared:Handler", at = @At("HEAD"))
+    public void onInit(CallbackInfo oci, CallbackInfo ci) {
+        if(TerraStorageCompat.shouldBlock(this)) {
+            oci.cancel();
+        }
+    }
+
+}

fabric/src/main/resources/academy-fabric.mixins.json

@@ -0,0 +1,15 @@
+{
+  "required": true,
+  "package": "abeshutt.staracademy.fabric.mixin",
+  "compatibilityLevel": "JAVA_17",
+  "minVersion": "0.8",
+  "client": [
+    "terrastorage.MixinHandledScreenMixin",
+    "terrastorage.MixinInventoryScreenMixin"
+  ],
+  "mixins": [
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

fabric/src/main/resources/fabric.mod.json

@@ -19,7 +19,8 @@
     ]
   },
   "mixins": [
-    "academy-common.mixins.json"
+    "academy-common.mixins.json",
+    "academy-fabric.mixins.json"
   ],
   "depends": {
   },