Merge pull request #151 from zeng-github01/unlock-mode

Add support for crafting lock

Author: GlodBlock

build.gradle

@@ -50,7 +50,7 @@ dependencies {
     deobfCompile 'curse.maven:modular-machinery-270790:2761302' // 1.11.1
     deobfCompile 'curse.maven:codechicken-lib-1-8-242818:2779848' //ccl
     deobfCompile 'curse.maven:gregtech-ce-unofficial-557242:3784798' // gt
-    deobfCompile 'curse.maven:ae2-extended-life-570458:5028606' //pae2
+    deobfCompile 'curse.maven:ae2-extended-life-570458:5147702' //pae2
     deobfCompile 'curse.maven:dynamistics-383632:3056455' // dy
     deobfCompile 'curse.maven:baubles-227083:2518667' //baubles
     compileOnly 'curse.maven:opencomputers-223008:4630537' //oc

src/main/java/com/glodblock/github/client/GuiItemDualInterface.java

@@ -40,11 +40,11 @@ protected void addButtons() {
         ItemStack icon = AEApi.instance().definitions().blocks().fluidIface().maybeStack(1).orElse(ItemStack.EMPTY);
         switchInterface = new GuiTabButton(guiLeft + 133, guiTop, icon, icon.getDisplayName(), itemRender);
         buttonList.add(switchInterface);
-        fluidPacketBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 44, "SEND_MODE", "REAL_FLUID");
+        fluidPacketBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 62, "SEND_MODE", "REAL_FLUID");
         buttonList.add(fluidPacketBtn);
-        splittingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 62, "SPLITTING", "ALLOW");
+        splittingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 80, "SPLITTING", "ALLOW");
         buttonList.add(splittingBtn);
-        blockingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 80, "BLOCK", "ALL");
+        blockingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 98, "BLOCK", "ALL");
         buttonList.add(blockingBtn);
         priorityBtn = Ae2ReflectClient.getPriorityButton(this);
     }

src/main/java/com/glodblock/github/client/client/gui/GuiWrapInterface.java

@@ -31,11 +31,11 @@ public GuiWrapInterface(final InventoryPlayer inventoryPlayer, final IInterfaceH
     @Override
     protected void addButtons() {
         super.addButtons();
-        fluidPacketBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 44, "SEND_MODE", "REAL_FLUID");
+        fluidPacketBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 62, "SEND_MODE", "REAL_FLUID");
         buttonList.add(fluidPacketBtn);
-        splittingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 62, "SPLITTING", "ALLOW");
+        splittingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 80, "SPLITTING", "ALLOW");
         buttonList.add(splittingBtn);
-        blockingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 80, "BLOCK", "ALL");
+        blockingBtn = new GuiFCImgButton(this.guiLeft - 18, this.guiTop + 98, "BLOCK", "ALL");
         buttonList.add(blockingBtn);
     }
 

src/main/java/com/glodblock/github/common/block/BlockDualInterface.java

@@ -2,10 +2,12 @@
 
 import appeng.api.util.IOrientable;
 import appeng.block.AEBaseTileBlock;
+import appeng.tile.misc.TileInterface;
 import appeng.util.Platform;
 import com.glodblock.github.common.tile.TileDualInterface;
 import com.glodblock.github.inventory.GuiType;
 import com.glodblock.github.inventory.InventoryHandler;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.properties.PropertyBool;
@@ -14,6 +16,7 @@
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
@@ -82,4 +85,11 @@ protected void customRotateBlock(final IOrientable rotatable, final EnumFacing a
         }
     }
 
+    @Override
+    public void neighborChanged(IBlockState state, World worldIn, BlockPos pos, Block blockIn, BlockPos fromPos) {
+        TileEntity tileEntity = this.getTileEntity(worldIn, pos);
+        if (tileEntity instanceof TileDualInterface) {
+            ((TileDualInterface) tileEntity).getInterfaceDuality().updateRedstoneState();
+        }
+    }
 }

src/main/java/com/glodblock/github/common/part/PartDualInterface.java

@@ -14,6 +14,7 @@
 import appeng.api.networking.ticking.TickingRequest;
 import appeng.api.parts.IPartCollisionHelper;
 import appeng.api.parts.IPartModel;
+import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.AECableType;
 import appeng.api.util.IConfigManager;
@@ -25,13 +26,16 @@
 import appeng.items.parts.PartModels;
 import appeng.parts.PartBasicState;
 import appeng.parts.PartModel;
+import appeng.tile.misc.TileInterface;
 import appeng.util.Platform;
 import appeng.util.SettingsFrom;
 import appeng.util.inv.IAEAppEngInventory;
 import appeng.util.inv.IInventoryDestination;
 import appeng.util.inv.InvOperation;
 import com.glodblock.github.FluidCraft;
 import com.glodblock.github.common.component.DualityDualInterface;
+import com.glodblock.github.common.item.fake.FakeFluids;
+import com.glodblock.github.common.tile.TileDualInterface;
 import com.glodblock.github.interfaces.FCPriorityHost;
 import com.glodblock.github.inventory.GuiType;
 import com.glodblock.github.inventory.InventoryHandler;
@@ -45,7 +49,9 @@
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.IBlockAccess;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.items.IItemHandler;
 
@@ -172,6 +178,16 @@ public void onChangeInventory(final IItemHandler inv, final int slot, final InvO
         duality.onItemInventoryChange(inv, slot, mc, removedStack, newStack);
     }
 
+    @Override
+    public void onStackReturnNetwork(IAEFluidStack stack) {
+        this.duality.getItemInterface().onStackReturnedToNetwork(FakeFluids.packFluid2AEDrops(stack));
+    }
+
+    @Override
+    public void onStackReturnNetwork(IAEItemStack stack) {
+        this.duality.getItemInterface().onStackReturnedToNetwork(stack);
+    }
+
     @Override
     public DualityInterface getInterfaceDuality() {
         return duality.getItemInterface();
@@ -281,4 +297,11 @@ public void uploadSettings(SettingsFrom from, NBTTagCompound compound, EntityPla
         }
     }
 
+    @Override
+    public void onNeighborChanged(IBlockAccess w, BlockPos pos, BlockPos neighbor) {
+        TileEntity tileEntity = getTileEntity();
+        if (tileEntity instanceof TileDualInterface) {
+            ((TileDualInterface) tileEntity).getInterfaceDuality().updateRedstoneState();
+        }
+    }
 }

src/main/java/com/glodblock/github/common/tile/TileDualInterface.java

@@ -12,6 +12,7 @@
 import appeng.api.networking.ticking.IGridTickable;
 import appeng.api.networking.ticking.TickRateModulation;
 import appeng.api.networking.ticking.TickingRequest;
+import appeng.api.storage.data.IAEFluidStack;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.util.AECableType;
 import appeng.api.util.AEPartLocation;
@@ -27,6 +28,7 @@
 import appeng.util.inv.IInventoryDestination;
 import appeng.util.inv.InvOperation;
 import com.glodblock.github.common.component.DualityDualInterface;
+import com.glodblock.github.common.item.fake.FakeFluids;
 import com.glodblock.github.interfaces.FCPriorityHost;
 import com.glodblock.github.inventory.GuiType;
 import com.glodblock.github.loader.FCBlocks;
@@ -205,6 +207,16 @@ public void onChangeInventory(final IItemHandler inv, final int slot, final InvO
         duality.onItemInventoryChange(inv, slot, mc, removed, added);
     }
 
+    @Override
+    public void onStackReturnNetwork(IAEFluidStack stack) {
+        duality.getItemInterface().onStackReturnedToNetwork(FakeFluids.packFluid2AEDrops(stack));
+    }
+
+    @Override
+    public void onStackReturnNetwork(IAEItemStack stack) {
+        duality.getItemInterface().onStackReturnedToNetwork(stack);
+    }
+
     @Override
     public DualityInterface getInterfaceDuality() {
         return duality.getItemInterface();