Self destruct. (FStorage bus, FImport/Export bus, and more) (#81)

firenoo · web-flow · commit fb658ec80686 · 2023-03-11T23:36:08.000+01:00
* Update dependencies.gradle

Use latest AE2 and add AE2FC for testing

* Add AE2FC integration.

- Caches AE2FC IDs when IDs are remapped

- Adds some utility methods for NBT conversion

* Deprecate Fluid storage, import, and export buses

Now they will automatically replace themselves with AE2FC variants,
if AE2FC is detected.

* Deprecate Fluid Level Emitter

Convert the EC2 Fluid Level Emitter to AE2FC's variant

* Deprecate Fluid Storage Monitor

Fluid Storage Monitor now converts to AE2FC variant

* Deprecate Fluid Conversion Monitor

And it's gone. If AE2FC exists, that is.

* Deprecate Fluid Interface

Converts them to Dual Interfaces...
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,8 +1,8 @@
 // Add your dependencies here
 
 dependencies {
-    compile('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-118-GTNH:dev')
-
+    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-175-GTNH:dev')
+    api('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.0.92-gtnh:dev')
     compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.2.12-GTNH:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.3.16-GTNH:dev') {transitive=false}
     compileOnly('com.github.GTNewHorizons:CodeChickenLib:1.1.5.3:dev') {transitive=false}
diff --git a/src/main/scala/extracells/Extracells.scala b/src/main/scala/extracells/Extracells.scala
@@ -5,12 +5,14 @@ import cpw.mods.fml.client.registry.RenderingRegistry
 import cpw.mods.fml.common.Mod.EventHandler
 import cpw.mods.fml.common.event.{
   FMLInitializationEvent,
+  FMLModIdMappingEvent,
   FMLPostInitializationEvent,
   FMLPreInitializationEvent
 }
 import cpw.mods.fml.common.network.NetworkRegistry
 import cpw.mods.fml.common.{FMLCommonHandler, Loader, Mod, SidedProxy}
 import extracells.integration.Integration
+import extracells.integration.ae2fc.FluidCraft
 import extracells.network.{ChannelHandler, GuiHandler}
 import extracells.proxy.CommonProxy
 import extracells.registries.ItemEnum
@@ -144,4 +146,11 @@ object Extracells {
     proxy.registerBlocks()
     integration.preInit()
   }
+
+  @EventHandler
+  def handleRemap(event: FMLModIdMappingEvent): Unit = {
+    if (Integration.Mods.FLUIDCRAFT.isEnabled) {
+      FluidCraft.onRemapEvent(event)
+    }
+  }
 }
diff --git a/src/main/scala/extracells/integration/Integration.java b/src/main/scala/extracells/integration/Integration.java
@@ -25,7 +25,8 @@ public enum Mods {
         IGW("IGWMod", "IngameWikiMod", Side.CLIENT),
         THAUMATICENERGISTICS("thaumicenergistics", "Thaumatic Energistics"),
         MEKANISM("Mekanism"),
-        WIRELESSCRAFTING("ae2wct", "AE2 Wireless Crafting Terminal");
+        WIRELESSCRAFTING("ae2wct", "AE2 Wireless Crafting Terminal"),
+        FLUIDCRAFT("ae2fc", "Fluid Craft For AE2");
 
         private final String modID;
 
@@ -43,6 +44,8 @@ private Mods(String modid, String modName, Side side) {
             this.modID = modid;
             this.name = modName;
             this.side = side;
+            this.enabled = (Loader.isModLoaded(getModID()) && shouldLoad && correctSide())
+                    || (ModAPIManager.INSTANCE.hasAPI(getModID()) && shouldLoad && correctSide());
         }
 
         private Mods(String modid, String modName) {
@@ -69,15 +72,16 @@ public boolean isOnServer() {
             return side != Side.CLIENT;
         }
 
+        private final boolean enabled;
+
         public void loadConfig(Configuration config) {
             shouldLoad = config
                     .get("Integration", "enable" + getModName(), true, "Enable " + getModName() + " Integration.")
                     .getBoolean(true);
         }
 
         public boolean isEnabled() {
-            return (Loader.isModLoaded(getModID()) && shouldLoad && correctSide())
-                    || (ModAPIManager.INSTANCE.hasAPI(getModID()) && shouldLoad && correctSide());
+            return enabled;
         }
 
         private boolean correctSide() {
diff --git a/src/main/scala/extracells/integration/ae2fc/FluidCraft.java b/src/main/scala/extracells/integration/ae2fc/FluidCraft.java
@@ -0,0 +1,88 @@
+package extracells.integration.ae2fc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import appeng.api.storage.data.IAEItemStack;
+import appeng.util.item.AEItemStack;
+
+import com.glodblock.github.util.NameConst;
+
+import cpw.mods.fml.common.Optional;
+import cpw.mods.fml.common.event.FMLModIdMappingEvent;
+import cpw.mods.fml.common.registry.GameRegistry;
+import extracells.registries.PartEnum;
+
+public final class FluidCraft {
+
+    private final static Map<PartEnum, Short> REPLACER = new HashMap<>(16);
+
+    @Optional.Method(modid = "ae2fc")
+    public static void onRemapEvent(FMLModIdMappingEvent event) {
+        REPLACER.put(
+                PartEnum.FLUIDEXPORT,
+                (short) Item.getIdFromItem(GameRegistry.findItem("ae2fc", NameConst.ITEM_PART_FLUID_EXPORT)));
+        REPLACER.put(
+                PartEnum.FLUIDIMPORT,
+                (short) Item.getIdFromItem(GameRegistry.findItem("ae2fc", NameConst.ITEM_PART_FLUID_IMPORT)));
+        REPLACER.put(
+                PartEnum.FLUIDSTORAGE,
+                (short) Item.getIdFromItem(GameRegistry.findItem("ae2fc", NameConst.ITEM_PART_FLUID_STORAGE_BUS)));
+        REPLACER.put(
+                PartEnum.FLUIDLEVELEMITTER,
+                (short) Item.getIdFromItem(GameRegistry.findItem("ae2fc", NameConst.ITEM_PART_FLUID_LEVEL_EMITTER)));
+        REPLACER.put(
+                PartEnum.FLUIDMONITOR,
+                (short) Item.getIdFromItem(GameRegistry.findItem("ae2fc", NameConst.ITEM_PART_FLUID_STORAGE_MONITOR)));
+        REPLACER.put(
+                PartEnum.FLUIDCONVERSIONMONITOR,
+                (short) Item
+                        .getIdFromItem(GameRegistry.findItem("ae2fc", NameConst.ITEM_PART_FLUID_CONVERSION_MONITOR)));
+        REPLACER.put(
+                PartEnum.INTERFACE,
+                (short) Item.getIdFromItem(GameRegistry.findItem("ae2fc", NameConst.ITEM_PART_FLUID_INTERFACE)));
+    }
+
+    public static void replace(NBTTagCompound def, PartEnum part) {
+        def.setShort("id", REPLACER.getOrDefault(part, (short) 0));
+        def.setShort("Damage", (short) 0);
+    }
+
+    @Optional.Method(modid = "ae2fc")
+    public static NBTTagCompound createFluidDisplay(String fluidName) {
+        NBTTagCompound fluidDisplay = new NBTTagCompound();
+        Fluid fluid = FluidRegistry.getFluid(fluidName);
+        if (fluid != null) {
+            ItemStack fluidPacket = new ItemStack(GameRegistry.findItem("ae2fc", "fluid_packet"), 1, 0);
+            NBTTagCompound fluidPacketTag = new NBTTagCompound();
+            // FluidStack
+            FluidStack fluidStack = new FluidStack(fluid, 1000);
+            NBTTagCompound fluidStackNbt = new NBTTagCompound();
+            fluidStack.writeToNBT(fluidStackNbt);
+            fluidPacketTag.setTag("FluidStack", fluidStackNbt);
+            // FluidPacket
+            fluidPacketTag.setBoolean("DisplayOnly", true);
+            fluidPacket.setTagCompound(fluidPacketTag);
+            // Final Item
+            IAEItemStack aeStack = AEItemStack.create(fluidPacket);
+            aeStack.writeToNBT(fluidDisplay);
+        }
+        return fluidDisplay;
+    }
+
+    public static NBTTagCompound createFluidNBT(String fluidName, long amount) {
+        NBTTagCompound fluid = new NBTTagCompound();
+        fluid.setString("FluidName", fluidName);
+        fluid.setBoolean("Craft", false);
+        fluid.setLong("Req", 0);
+        fluid.setLong("Cnt", amount);
+        return fluid;
+    }
+}
diff --git a/src/main/scala/extracells/part/PartFluidConversionMonitor.java b/src/main/scala/extracells/part/PartFluidConversionMonitor.java
@@ -4,6 +4,7 @@
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.Vec3;
@@ -21,6 +22,9 @@
 import appeng.api.util.AEColor;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import extracells.integration.Integration;
+import extracells.integration.ae2fc.FluidCraft;
+import extracells.registries.PartEnum;
 import extracells.render.TextureManager;
 import extracells.util.FluidUtil;
 
@@ -135,4 +139,12 @@ public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks
         renderBackPanel(x, y, z, rh, renderer);
         renderPowerStatus(x, y, z, rh, renderer);
     }
+
+    @Override
+    public NBTTagCompound transformPart(NBTTagCompound def) {
+        if (Integration.Mods.FLUIDCRAFT.isEnabled()) {
+            FluidCraft.replace(def, PartEnum.FLUIDCONVERSIONMONITOR);
+        }
+        return def;
+    }
 }
diff --git a/src/main/scala/extracells/part/PartFluidExport.java b/src/main/scala/extracells/part/PartFluidExport.java
@@ -6,6 +6,7 @@
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.Vec3;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -25,6 +26,9 @@
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import extracells.integration.Integration;
+import extracells.integration.ae2fc.FluidCraft;
+import extracells.registries.PartEnum;
 import extracells.render.TextureManager;
 import extracells.util.PermissionUtil;
 
@@ -173,4 +177,12 @@ public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks
         rh.setBounds(6, 6, 11, 10, 10, 12);
         renderStaticBusLights(x, y, z, rh, renderer);
     }
+
+    @Override
+    public NBTTagCompound transformPart(NBTTagCompound def) {
+        if (Integration.Mods.FLUIDCRAFT.isEnabled()) {
+            FluidCraft.replace(def, PartEnum.FLUIDEXPORT);
+        }
+        return def;
+    }
 }
diff --git a/src/main/scala/extracells/part/PartFluidIO.java b/src/main/scala/extracells/part/PartFluidIO.java
@@ -1,5 +1,7 @@
 package extracells.part;
 
+import static net.minecraftforge.common.util.Constants.NBT.TAG_COMPOUND;
+
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
@@ -8,6 +10,7 @@
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.NBTTagList;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.Vec3;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -21,13 +24,16 @@
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPartCollisionHelper;
+import appeng.api.parts.IPartDeprecated;
 import appeng.api.parts.IPartHost;
 import appeng.api.parts.IPartRenderHelper;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import extracells.Extracells;
 import extracells.container.ContainerBusFluidIO;
 import extracells.gui.GuiBusFluidIO;
+import extracells.integration.Integration;
+import extracells.integration.ae2fc.FluidCraft;
 import extracells.item.ItemPartECBase;
 import extracells.network.packet.other.IFluidSlotPartOrBlock;
 import extracells.network.packet.other.PacketFluidSlot;
@@ -37,7 +43,7 @@
 import io.netty.buffer.ByteBuf;
 
 public abstract class PartFluidIO extends PartECBase
-        implements IGridTickable, IInventoryUpdateReceiver, IFluidSlotPartOrBlock {
+        implements IGridTickable, IInventoryUpdateReceiver, IFluidSlotPartOrBlock, IPartDeprecated {
 
     public Fluid[] filterFluids = new Fluid[9];
     private RedstoneMode redstoneMode = RedstoneMode.IGNORE;
@@ -181,6 +187,16 @@ public void onNeighborChanged() {
         this.lastRedstone = redstonePowered;
     }
 
+    /**
+     * Map for converting slots from bus EC2 -> AE2FC
+     */
+    private static int[] FILTER_MAP = null;
+    static {
+        if (Integration.Mods.FLUIDCRAFT.isEnabled()) {
+            FILTER_MAP = new int[] { 5, 3, 6, 1, 0, 2, 7, 4, 8 };
+        }
+    }
+
     @Override
     public final void readFromNBT(NBTTagCompound data) {
         super.readFromNBT(data);
@@ -192,6 +208,57 @@ public final void readFromNBT(NBTTagCompound data) {
         onInventoryChanged();
     }
 
+    @Override
+    public NBTTagCompound transformNBT(NBTTagCompound extra) {
+        if (Integration.Mods.FLUIDCRAFT.isEnabled()) {
+            // Transform NBT in place
+            // Fluid Filter
+            NBTTagCompound fluidFilterNew = new NBTTagCompound();
+            for (int slot = 0; slot < 9; ++slot) {
+                String oldFilterName = "FilterFluid#" + slot;
+                fluidFilterNew
+                        .setTag("#" + FILTER_MAP[slot], FluidCraft.createFluidDisplay(extra.getString(oldFilterName)));
+                extra.removeTag(oldFilterName);
+            }
+            extra.setTag("config", fluidFilterNew);
+            // Upgrades
+            NBTTagList upgrades = extra.getTagList("upgradeInventory", TAG_COMPOUND);
+            NBTTagCompound upgradesNew = new NBTTagCompound();
+            for (int i = 0; i < 4; ++i) {
+                NBTTagCompound upgrade = upgrades.getCompoundTagAt(i);
+                upgrade.removeTag("Slot");
+                upgradesNew.setTag("#" + i, upgrade);
+            }
+            extra.removeTag("upgradeInventory");
+            extra.setTag("upgrades", upgradesNew);
+            // Redstone mode
+            RedstoneMode redstoneMode = RedstoneMode.values()[extra.getInteger("redstoneMode")];
+            switch (redstoneMode) {
+                case LOW_SIGNAL:
+                    extra.setString("REDSTONE_CONTROLLED", "LOW_SIGNAL");
+                    break;
+                case HIGH_SIGNAL:
+                    extra.setString("REDSTONE_CONTROLLED", "HIGH_SIGNAL");
+                    break;
+                case SIGNAL_PULSE:
+                    extra.setString("REDSTONE_CONTROLLED", "SIGNAL_PULSE");
+                    break;
+                default:
+                    extra.setString("REDSTONE_CONTROLLED", "IGNORE");
+                    break;
+            }
+            extra.removeTag("redstoneMode");
+            // Part data
+            extra.setTag("part", extra.getCompoundTag("node").getCompoundTag("node0"));
+            extra.removeTag("node");
+            // Extra tags
+            extra.setString("CRAFT_ONLY", "NO");
+            extra.setString("FUZZY_MODE", "IGNORE_ALL");
+            extra.setString("SCHEDULING_MODE", "DEFAULT");
+        }
+        return extra;
+    }
+
     @Override
     public final boolean readFromStream(ByteBuf data) throws IOException {
         return super.readFromStream(data);
diff --git a/src/main/scala/extracells/part/PartFluidImport.java b/src/main/scala/extracells/part/PartFluidImport.java
@@ -6,6 +6,7 @@
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.Vec3;
 import net.minecraftforge.common.util.ForgeDirection;
@@ -28,6 +29,9 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import extracells.Extracells;
+import extracells.integration.Integration;
+import extracells.integration.ae2fc.FluidCraft;
+import extracells.registries.PartEnum;
 import extracells.render.TextureManager;
 import extracells.util.PermissionUtil;
 
@@ -239,4 +243,12 @@ public void renderStatic(int x, int y, int z, IPartRenderHelper rh, RenderBlocks
         rh.setBounds(6, 6, 11, 10, 10, 12);
         renderStaticBusLights(x, y, z, rh, renderer);
     }
+
+    @Override
+    public NBTTagCompound transformPart(NBTTagCompound def) {
+        if (Integration.Mods.FLUIDCRAFT.isEnabled()) {
+            FluidCraft.replace(def, PartEnum.FLUIDIMPORT);
+        }
+        return def;
+    }
 }
diff --git a/src/main/scala/extracells/part/PartFluidInterface.java b/src/main/scala/extracells/part/PartFluidInterface.java
diff --git a/src/main/scala/extracells/part/PartFluidLevelEmitter.java b/src/main/scala/extracells/part/PartFluidLevelEmitter.java
diff --git a/src/main/scala/extracells/part/PartFluidStorage.java b/src/main/scala/extracells/part/PartFluidStorage.java
diff --git a/src/main/scala/extracells/part/PartFluidStorageMonitor.java b/src/main/scala/extracells/part/PartFluidStorageMonitor.java
