Merge remote-tracking branch 'origin/feature/p2p_di' into dev

GTNewHorizons · Jul 22, 2023 · 97699c7 · 97699c7
2 parents e8f0693 + b7289b6
commit 97699c7
Show file tree

Hide file tree

Showing 12 changed files with 609 additions and 4 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -2,7 +2,7 @@
 
 dependencies {
     api('com.github.GTNewHorizons:NotEnoughItems:2.3.50-GTNH:dev')
-    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-234-GTNH:dev')
+    api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-240-GTNH:dev')
     api('curse.maven:cofh-core-69162:2388751')
     api('com.github.GTNewHorizons:waila:1.6.0:dev')
     compileOnly('com.github.GTNewHorizons:Baubles:1.0.1.16:dev')

diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java
@@ -27,7 +27,7 @@
         modid = FluidCraft.MODID,
         version = FluidCraft.VERSION,
         name = FluidCraft.MODNAME,
-        dependencies = "required-after:appliedenergistics2;required-after:CoFHCore;required-after:Baubles;after:waila;after:thaumicenergistics;after:ae2wct")
+        dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);required-after:CoFHCore;required-after:Baubles;after:waila;after:thaumicenergistics;after:ae2wct")
 public class FluidCraft {
 
     public static final String MODID = "GRADLETOKEN_MODID";

diff --git a/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java b/src/main/java/com/glodblock/github/client/gui/GuiDualInterface.java
@@ -129,6 +129,7 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final
     protected String getBackground() {
         if (!ModAndClassUtil.isBigInterface) return "guis/interface.png";
         return switch (((ContainerInterface) this.cvb).getPatternCapacityCardsInstalled()) {
+            case -1 -> "guis/interfacenone.png";
             case 1 -> "guis/interface2.png";
             case 2 -> "guis/interface3.png";
             case 3 -> "guis/interface4.png";

diff --git a/src/main/java/com/glodblock/github/common/Config.java b/src/main/java/com/glodblock/github/common/Config.java
@@ -16,6 +16,7 @@ public class Config {
     public static boolean fluidIOBus;
     public static boolean removeRecipe;
     public static double portableCellBattery;
+    public static boolean fluidP2PInterface;
     public static int packetSize;
     public static int packetRate;
     public static boolean replaceEC2;
@@ -41,6 +42,11 @@ private static void loadProperty() {
                 "Fluid Craft for AE2",
                 true,
                 "Enable this to add Fluid Import/Export Bus like EC2's one.");
+        fluidP2PInterface = Config.getBoolean(
+                "fluidP2PInterface",
+                "Fluid Craft for AE2",
+                true,
+                "Enable the P2P Tunnel - ME Dual Interface feature.");
         removeRecipe = Config.getBoolean(
                 "Disable all recipes",
                 "Fluid Craft for AE2",

diff --git a/src/main/java/com/glodblock/github/common/item/ItemPartFluidP2PInterface.java b/src/main/java/com/glodblock/github/common/item/ItemPartFluidP2PInterface.java
@@ -0,0 +1,71 @@
+package com.glodblock.github.common.item;
+
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.glodblock.github.FluidCraft;
+import com.glodblock.github.common.Config;
+import com.glodblock.github.common.parts.PartFluidP2PInterface;
+import com.glodblock.github.common.tabs.FluidCraftingTabs;
+import com.glodblock.github.util.NameConst;
+
+import appeng.api.AEApi;
+import appeng.api.parts.IPart;
+import appeng.api.parts.IPartItem;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class ItemPartFluidP2PInterface extends FCBaseItem implements IPartItem {
+
+    private IIcon icon;
+
+    public ItemPartFluidP2PInterface() {
+        this.setMaxStackSize(64);
+        this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_P2P_INTERFACE);
+        AEApi.instance().partHelper().setItemBusRenderer(this);
+    }
+
+    @Nullable
+    @Override
+    public IPart createPartFromItemStack(ItemStack is) {
+        return new PartFluidP2PInterface(is);
+    }
+
+    @Override
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
+            float xOffset, float yOffset, float zOffset) {
+        return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
+    }
+
+    @Override
+    public ItemPartFluidP2PInterface register() {
+        if (!Config.fluidP2PInterface) return null;
+        GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_P2P_INTERFACE, FluidCraft.MODID);
+        setCreativeTab(FluidCraftingTabs.INSTANCE);
+        return this;
+    }
+
+    @Override
+    public IIcon getIconFromDamage(int dmg) {
+        return icon;
+    }
+
+    @Override
+    public void registerIcons(IIconRegister register) {
+        if (Config.fluidP2PInterface) {
+            this.icon = register.registerIcon("appliedenergistics2:ItemPart.P2PTunnel");
+        }
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public int getSpriteNumber() {
+        return 0;
+    }
+}