Merge pull request #295 from MCTian-mi/storage-scanner

Dep cleanup && Stop storage scanners from recognizing item pipes as inventories

Author: bruberu

dependencies.gradle

@@ -55,11 +55,11 @@ dependencies {
     implementation rfg.deobf("curse.maven:modularui-624243:5153413")
 
     compileOnly rfg.deobf("curse.maven:ynet-an-xnet-fork-999559:5243319") // XNet-1.8.3-ynet
-    implementation rfg.deobf("curse.maven:rftools-224641:2861573") // RFTools 7.73
-    implementation rfg.deobf("curse.maven:mcjtylib-233105:2745846")
+    compileOnly rfg.deobf("curse.maven:rftools-224641:2861573") // RFTools 7.73
+    compileOnly rfg.deobf("curse.maven:mcjtylib-233105:2745846")
     compileOnly rfg.deobf("curse.maven:redstone-flux-270789:2920436")
     compileOnly rfg.deobf("curse.maven:tesla-244651:2487959")
     compileOnly rfg.deobf("curse.maven:hwyla-253449:2568751")
 
-    implementation rfg.deobf("curse.maven:barrels-drums-storage-more-319404:2708193")
+    compileOnly rfg.deobf("curse.maven:barrels-drums-storage-more-319404:2708193")
 }

src/main/java/supersymmetry/Supersymmetry.java

@@ -20,7 +20,6 @@
 import supersymmetry.common.covers.SuSyCoverBehaviors;
 import supersymmetry.common.item.SuSyMetaItems;
 import supersymmetry.common.metatileentities.SuSyMetaTileEntities;
-import supersymmetry.integration.bdsandm.BDSAndMModule;
 import supersymmetry.loaders.SuSyIRLoader;
 
 @Mod(name = Supersymmetry.NAME, modid = Supersymmetry.MODID, version = Tags.VERSION, dependencies = GTInternalTags.DEP_VERSION_STRING + ";required-after:gcym;after:immersiverailroading")
@@ -62,8 +61,6 @@ public void onPreInit(@NotNull FMLPreInitializationEvent event) {
     public void onInit(@NotNull FMLInitializationEvent event) {
         proxy.load();
         SuSyCoverBehaviors.init();
-
-        BDSAndMModule.init();
     }
 
     @Mod.EventHandler

src/main/java/supersymmetry/integration/bdsandm/BDSAndMModule.java

@@ -2,21 +2,32 @@
 
 import funwayguy.bdsandm.blocks.tiles.TileEntityBarrel;
 import funwayguy.bdsandm.core.BDSM;
+import gregtech.api.GTValues;
 import gregtech.api.cover.CoverRayTracer;
+import gregtech.api.modules.GregTechModule;
 import gregtech.common.items.tool.rotation.CustomBlockRotations;
 import gregtech.common.items.tool.rotation.ICustomRotationBehavior;
+import gregtech.integration.IntegrationSubmodule;
 import net.minecraft.block.BlockDirectional;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumFacing;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import supersymmetry.modules.SuSyModules;
 
 import java.util.Objects;
 
-public class BDSAndMModule {
+@GregTechModule(
+        moduleID = SuSyModules.MODULE_BDSAndM,
+        containerID = GTValues.MODID,
+        modDependencies = "bdsandm",
+        name = "SuSy BDSAndM Integration",
+        description = "BDSAndM Integration Module")
+public class BDSAndMModule extends IntegrationSubmodule {
 
     public static final ICustomRotationBehavior BDSAndM_BARREL_BEHAVIOR = (state, world, pos, hitResult) -> {
         EnumFacing gridSide = CoverRayTracer.determineGridSideHit(hitResult);
         if (gridSide == null) return false;
-        gridSide = gridSide.getOpposite(); // idk what's happening here, blame the original author
+        gridSide = gridSide.getOpposite(); // IDK what's happening here, blame the original author
         if (gridSide != state.getValue(BlockDirectional.FACING)) {
             TileEntityBarrel barrel = ((TileEntityBarrel) world.getTileEntity(pos));
             if (barrel != null) {
@@ -30,7 +41,9 @@ public class BDSAndMModule {
         return false;
     };
 
-    public static void init() {
+    @Override
+    public void init(FMLInitializationEvent event) {
+        getLogger().info("BDSAndM found. Enabling integration...");
         CustomBlockRotations.registerCustomRotation(BDSM.blockMetalBarrel, BDSAndM_BARREL_BEHAVIOR);
         CustomBlockRotations.registerCustomRotation(BDSM.blockWoodBarrel, BDSAndM_BARREL_BEHAVIOR);
     }

src/main/java/supersymmetry/mixins/SuSyLateMixinLoader.java

@@ -1,16 +1,28 @@
 package supersymmetry.mixins;
 
+import com.google.common.collect.ImmutableList;
+import net.minecraftforge.fml.common.Loader;
 import zone.rong.mixinbooter.ILateMixinLoader;
 
-import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
-@SuppressWarnings("unused")
 public class SuSyLateMixinLoader implements ILateMixinLoader {
 
+    public static final List<String> modMixins = ImmutableList.of("bdsandm", "gregtech", "mcjtylib_ng", "xnet");
+
     @Override
     public List<String> getMixinConfigs() {
-        String[] configs = {"mixins.susy.late.json"};
-        return Arrays.asList(configs);
+        return modMixins.stream().map(mod -> "mixins.susy." + mod + ".json").collect(Collectors.toList());
+    }
+
+    @Override
+    public boolean shouldMixinConfigQueue(String mixinConfig) {
+        String[] parts = mixinConfig.split("\\.");
+        return parts.length != 4 || shouldEnableModMixin(parts[2]);
+    }
+
+    public static boolean shouldEnableModMixin(String mod) {
+        return Loader.isModLoaded(mod);
     }
 }

src/main/java/supersymmetry/mixins/bdsandm/BlockBarrelBaseMixin.java

@@ -5,16 +5,14 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(BlockBarrelBase.class)
+@Mixin(value = BlockBarrelBase.class, remap = false)
 public class BlockBarrelBaseMixin {
 
     @Redirect(method = "withdrawItem",
-            remap = false,
-            at = @At(value = "INVOKE",
-                    target = "Ljava/lang/Math;min(II)I",
-                    ordinal = 0))
+              at = @At(value = "INVOKE",
+                       target = "Ljava/lang/Math;min(II)I",
+                       ordinal = 0))
     private int redirectMin(int a, int b) {
         return b;
     }
-
 }

src/main/java/supersymmetry/mixins/bdsandm/ItemBarrelMixin.java

@@ -12,9 +12,10 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-@Mixin(ItemBarrel.class)
+@Mixin(value = ItemBarrel.class, remap = false)
 public class ItemBarrelMixin extends ItemBlock {
-    //Need to extend ItemBlock to use super.getNBTShareTag
+
+    // Need to extend ItemBlock to use super.getNBTShareTag
     public ItemBarrelMixin(Block block) {
         super(block);
     }
@@ -28,14 +29,12 @@ public ItemBarrelMixin(Block block) {
     // fire from the network handler for a given player and kick them.
     // This hack reduces the scope of the bug to incorrect (not present) barrel metadata on the client.
     @Inject(method = "getNBTShareTag",
-            remap = false,
             at = @At(value = "INVOKE",
-                    target = "Lfunwayguy/bdsandm/inventory/capability/CapabilityBarrel;serializeNBT()Lnet/minecraft/nbt/NBTTagCompound;"),
+                     target = "Lfunwayguy/bdsandm/inventory/capability/CapabilityBarrel;serializeNBT()Lnet/minecraft/nbt/NBTTagCompound;"),
             cancellable = true)
     public void returnIfNull(ItemStack stack, CallbackInfoReturnable<NBTTagCompound> cir, @Local CapabilityBarrel barrel) {
         if (barrel == null) {
             cir.setReturnValue(super.getNBTShareTag(stack));
-            cir.cancel();
         }
     }
 }

src/main/java/supersymmetry/mixins/mcjtylib/InventoryHelperMixin.java

@@ -0,0 +1,25 @@
+package supersymmetry.mixins.mcjtylib;
+
+import gregtech.common.pipelike.itempipe.net.ItemNetHandler;
+import mcjty.lib.container.InventoryHelper;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+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.CallbackInfoReturnable;
+
+@Mixin(value = InventoryHelper.class, remap = false)
+public class InventoryHelperMixin {
+
+    @Inject(method = "isInventory",
+            at = @At(
+                     value = "RETURN",
+                     ordinal = 0),
+            cancellable = true)
+    private static void checkIsEmpty(TileEntity te, CallbackInfoReturnable<Boolean> cir) {
+        IItemHandler inventory = te.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+        cir.setReturnValue(inventory != null && !(inventory instanceof ItemNetHandler));
+    }
+}