Make Data bank work

10 files changed, 70 insertions, 27 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
index 502268c888..28d617a502 100644
--- a/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MachineLoader.java
@@ -272,8 +272,8 @@ public class MachineLoader implements Runnable {
 
         dataIn_Hatch.set(new GT_MetaTileEntity_Hatch_InputData(15440, "hatch.datain.tier.07", "Optical Slave Connector", 7).getStackForm(1L));
         dataOut_Hatch.set(new GT_MetaTileEntity_Hatch_OutputData(15441, "hatch.dataout.tier.07", "Optical Master Connector", 7).getStackForm(1L));
-        dataInAcc_Hatch.set(new GT_MetaTileEntity_Hatch_InputDataAccess(15442, "hatch.datainass.tier.07", "Assembly line Slave Connector", 7).getStackForm(1L));
-        dataOutAcc_Hatch.set(new GT_MetaTileEntity_Hatch_OutputDataAccess(15443, "hatch.dataoutass.tier.07", "Data Bank Master Connector", 7).getStackForm(1L));
+        dataInAcc_Hatch.set(new GT_MetaTileEntity_Hatch_InputDataItems(15442, "hatch.datainass.tier.07", "Assembly line Slave Connector", 7).getStackForm(1L));
+        dataOutAcc_Hatch.set(new GT_MetaTileEntity_Hatch_OutputDataItems(15443, "hatch.dataoutass.tier.07", "Data Bank Master Connector", 7).getStackForm(1L));
 
         rack_Hatch.set(new GT_MetaTileEntity_Hatch_Rack(15450, "hatch.rack.tier.08", "Computer Rack", 8, "4 Slot Rack").getStackForm(1L));
         holder_Hatch.set(new GT_MetaTileEntity_Hatch_Holder(15451, "hatch.holder.tier.09", "Object Holder", 8, "For Research Station").getStackForm(1L));
diff --git a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
index e95c5bd28f..9ff9bb7ed5 100644
--- a/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/RecipeLoader.java
@@ -77,6 +77,10 @@ public class RecipeLoader implements Runnable {
                         'S', OrePrefixes.circuit.get(Materials.Elite),
                         'E', ItemList.Hull_IV});
 
+        //Data Bank
+        //RA.addAssemblylineRecipe(ItemList.Machine_Multi_Assemblyline.get(1),5000,,,,500,)
+        //CustomItemList.Machine_Multi_DataBank
+
         if (Loader.isModLoaded("dreamcraft")) {
             new DreamCraftRecipeLoader().run();//init recipes for GTNH version
         } else {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
index 51a46c5892..623d5c95c5 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DataConnector.java
@@ -144,10 +144,10 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket
     @Override
     public String[] getInfoData() {
         if (id > 0) {
-            return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "Computation: " + EnumChatFormatting.AQUA + (q != null ? q.getContentString() : 0), "PacketHistory: " + EnumChatFormatting.RED + (q != null ? q.getTraceSize() : 0),};
+            return new String[]{"ID: " + EnumChatFormatting.AQUA + id, "Content: " + EnumChatFormatting.AQUA + (q != null ? q.getContentString() : 0), "PacketHistory: " + EnumChatFormatting.RED + (q != null ? q.getTraceSize() : 0),};
         }
         return new String[]{
-                "Computation: " + EnumChatFormatting.AQUA + (q != null ? q.getContentString() : 0),
+                "Content: " + EnumChatFormatting.AQUA + (q != null ? q.getContentString() : 0),
                 "PacketHistory: " + EnumChatFormatting.RED + (q != null ? q.getTraceSize() : 0),
         };
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java
index f239344b6c..c441efcf1f 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputData.java
@@ -37,6 +37,11 @@ public class GT_MetaTileEntity_Hatch_InputData extends GT_MetaTileEntity_Hatch_D
     }
 
     @Override
+    public boolean isDataInputFacing(byte side) {
+        return isInputFacing(side);
+    }
+
+    @Override
     public boolean isOutputFacing(byte aSide) {
         return false;
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataAccess.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java
index 760fc53330..229ddc863b 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataAccess.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_InputDataItems.java
@@ -23,17 +23,17 @@ import static com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileE
 import static com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_DataConnector.EM_D_SIDES;
 import static gregtech.api.enums.Dyes.MACHINE_METAL;
 
-public class GT_MetaTileEntity_Hatch_InputDataAccess extends GT_MetaTileEntity_Hatch_DataAccess implements iConnectsToDataPipe {
+public class GT_MetaTileEntity_Hatch_InputDataItems extends GT_MetaTileEntity_Hatch_DataAccess implements iConnectsToDataPipe {
     private final String mDescription;
     public boolean delDelay = true;
     private ItemStack[] stacks;
 
-    public GT_MetaTileEntity_Hatch_InputDataAccess(int aID, String aName, String aNameRegional, int aTier) {
+    public GT_MetaTileEntity_Hatch_InputDataItems(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier);
         mDescription="ItemStack Data Input for Multiblocks";
     }
 
-    public GT_MetaTileEntity_Hatch_InputDataAccess(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_Hatch_InputDataItems(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
         mDescription=aDescription;
     }
@@ -60,7 +60,7 @@ public class GT_MetaTileEntity_Hatch_InputDataAccess extends GT_MetaTileEntity_H
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_InputDataAccess(this.mName, this.mTier, mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Hatch_InputDataItems(this.mName, this.mTier, mDescription, this.mTextures);
     }
 
     @Override
@@ -109,6 +109,11 @@ public class GT_MetaTileEntity_Hatch_InputDataAccess extends GT_MetaTileEntity_H
     }
 
     @Override
+    public boolean isDataInputFacing(byte side) {
+        return isInputFacing(side);
+    }
+
+    @Override
     public boolean canConnect(byte side) {
         return isInputFacing(side);
     }
@@ -132,6 +137,11 @@ public class GT_MetaTileEntity_Hatch_InputDataAccess extends GT_MetaTileEntity_H
     }
 
     @Override
+    public void onRemoval() {
+        stacks=null;
+    }
+
+    @Override
     public void saveNBTData(NBTTagCompound aNBT) {
         super.saveNBTData(aNBT);
         NBTTagCompound stacksTag=new NBTTagCompound();
@@ -182,6 +192,7 @@ public class GT_MetaTileEntity_Hatch_InputDataAccess extends GT_MetaTileEntity_H
             } else {
                 setContents(null);
             }
+            aBaseMetaTileEntity.setActive(stacks!=null && stacks.length>0);
         }
     }
 
@@ -194,4 +205,11 @@ public class GT_MetaTileEntity_Hatch_InputDataAccess extends GT_MetaTileEntity_H
                 EnumChatFormatting.AQUA + "Must be painted to work"
         };
     }
+
+    @Override
+    public String[] getInfoData() {
+        return new String[]{
+                "Content: Stack Count: "+(stacks==null?0:stacks.length)
+        };
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java
index 25449160b1..f53826667d 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputData.java
@@ -43,6 +43,11 @@ public class GT_MetaTileEntity_Hatch_OutputData extends GT_MetaTileEntity_Hatch_
     }
 
     @Override
+    public boolean isDataInputFacing(byte side) {
+        return isInputFacing(side);
+    }
+
+    @Override
     public boolean isSimpleMachine() {
         return true;
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataAccess.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java
index 5915dff18b..330c19d391 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataAccess.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_OutputDataItems.java
@@ -13,12 +13,12 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
-public class GT_MetaTileEntity_Hatch_OutputDataAccess extends GT_MetaTileEntity_Hatch_DataConnector<InventoryDataPacket> {
-    public GT_MetaTileEntity_Hatch_OutputDataAccess(int aID, String aName, String aNameRegional, int aTier) {
+public class GT_MetaTileEntity_Hatch_OutputDataItems extends GT_MetaTileEntity_Hatch_DataConnector<InventoryDataPacket> {
+    public GT_MetaTileEntity_Hatch_OutputDataItems(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, "ItemStack Data Output for Multiblocks");
     }
 
-    public GT_MetaTileEntity_Hatch_OutputDataAccess(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+    public GT_MetaTileEntity_Hatch_OutputDataItems(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
 
@@ -34,7 +34,7 @@ public class GT_MetaTileEntity_Hatch_OutputDataAccess extends GT_MetaTileEntity_
 
     @Override
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Hatch_OutputDataAccess(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Hatch_OutputDataItems(this.mName, this.mTier, this.mDescription, this.mTextures);
     }
 
     @Override
@@ -83,6 +83,11 @@ public class GT_MetaTileEntity_Hatch_OutputDataAccess extends GT_MetaTileEntity_
     }
 
     @Override
+    public boolean isDataInputFacing(byte side) {
+        return isInputFacing(side);
+    }
+
+    @Override
     public boolean canConnect(byte side) {
         return isOutputFacing(side);
     }
@@ -92,8 +97,8 @@ public class GT_MetaTileEntity_Hatch_OutputDataAccess extends GT_MetaTileEntity_
         iConnectsToDataPipe current = this, source = this, next;
         int range = 0;
         while ((next = current.getNext(source)) != null && range++ < 1000) {
-            if (next instanceof GT_MetaTileEntity_Hatch_InputDataAccess) {
-                ((GT_MetaTileEntity_Hatch_InputDataAccess) next).setContents(q);
+            if (next instanceof GT_MetaTileEntity_Hatch_InputDataItems) {
+                ((GT_MetaTileEntity_Hatch_InputDataItems) next).setContents(q);
                 break;
             }
             source = current;
@@ -115,7 +120,7 @@ public class GT_MetaTileEntity_Hatch_OutputDataAccess extends GT_MetaTileEntity_
         }
         IMetaTileEntity meta = next.getMetaTileEntity();
         if (meta instanceof iConnectsToDataPipe) {
-            if (meta instanceof GT_MetaTileEntity_Hatch_InputDataAccess
+            if (meta instanceof GT_MetaTileEntity_Hatch_InputDataItems
                     && GT_Utility.getOppositeSide(next.getFrontFacing()) == base.getFrontFacing()) {
                 return (iConnectsToDataPipe) meta;
             }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
index c66aa08c7f..1a6c776949 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_dataBank.java
@@ -5,8 +5,8 @@ import com.github.technus.tectech.auxiliary.Reference;
 import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.dataFramework.InventoryDataPacket;
 import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputDataAccess;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputDataAccess;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputDataItems;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_OutputDataItems;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedTexture;
 import cpw.mods.fml.relauncher.Side;
@@ -31,7 +31,7 @@ import static com.github.technus.tectech.thing.casing.GT_Block_CasingsTT.texture
 import static com.github.technus.tectech.thing.casing.TT_Container_Casings.sBlockCasingsTT;
 
 public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
-    private final ArrayList<GT_MetaTileEntity_Hatch_OutputDataAccess> eStacksDataOutputs = new ArrayList<>();
+    private final ArrayList<GT_MetaTileEntity_Hatch_OutputDataItems> eStacksDataOutputs = new ArrayList<>();
     private final ArrayList<GT_MetaTileEntity_Hatch_DataAccess> eDataAccessHatches = new ArrayList<>();
 
     //region Structure
@@ -125,11 +125,11 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB
         }
         if(stacks.size()>0){
             ItemStack[] arr=stacks.toArray(new ItemStack[0]);
-            for(GT_MetaTileEntity_Hatch_OutputDataAccess hatch:eStacksDataOutputs){
+            for(GT_MetaTileEntity_Hatch_OutputDataItems hatch:eStacksDataOutputs){
                 hatch.q=new InventoryDataPacket(arr);
             }
         }else{
-            for(GT_MetaTileEntity_Hatch_OutputDataAccess hatch:eStacksDataOutputs){
+            for(GT_MetaTileEntity_Hatch_OutputDataItems hatch:eStacksDataOutputs){
                 hatch.q=null;
             }
         }
@@ -153,10 +153,10 @@ public class GT_MetaTileEntity_EM_dataBank extends GT_MetaTileEntity_MultiblockB
         if (aMetaTileEntity == null) {
             return false;
         }
-        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputDataAccess) {
+        if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputDataItems) {
             ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
-            return eStacksDataOutputs.add((GT_MetaTileEntity_Hatch_OutputDataAccess) aMetaTileEntity);
-        }else if(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DataAccess && !(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputDataAccess)){
+            return eStacksDataOutputs.add((GT_MetaTileEntity_Hatch_OutputDataItems) aMetaTileEntity);
+        }else if(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_DataAccess && !(aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputDataItems)){
             ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex);
             return eDataAccessHatches.add((GT_MetaTileEntity_Hatch_DataAccess) aMetaTileEntity);
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
index ded80ee73e..4e50b7f4dc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/GT_MetaTileEntity_Pipe_Data.java
@@ -1,7 +1,6 @@
 package com.github.technus.tectech.thing.metaTileEntity.pipe;
 
 import com.github.technus.tectech.CommonValues;
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_InputData;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.GT_Mod;
@@ -172,13 +171,13 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConn
             }
             IMetaTileEntity meta = next.getMetaTileEntity();
             if (meta instanceof iConnectsToDataPipe && meta != source) {
-                if (meta instanceof GT_MetaTileEntity_Hatch_InputData) {
-                    return (iConnectsToDataPipe) meta;
-                }
                 if (meta instanceof GT_MetaTileEntity_Pipe_Data &&
                         ((GT_MetaTileEntity_Pipe_Data) meta).connectionCount == 2) {
                     return (iConnectsToDataPipe) meta;
                 }
+                if(((iConnectsToDataPipe) meta).isDataInputFacing(GT_Utility.getOppositeSide(b))){
+                    return (iConnectsToDataPipe) meta;
+                }
             }
         }
         return null;
@@ -231,4 +230,9 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConn
         }
         return 0.375f;
     }
+
+    @Override
+    public boolean isDataInputFacing(byte side) {
+        return true;
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/iConnectsToDataPipe.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/iConnectsToDataPipe.java
index 67db2ff5bb..95043b2ae1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/iConnectsToDataPipe.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/pipe/iConnectsToDataPipe.java
@@ -7,4 +7,6 @@ public interface iConnectsToDataPipe {
     boolean canConnect(byte side);
 
     iConnectsToDataPipe getNext(iConnectsToDataPipe source);
+
+    boolean isDataInputFacing(byte side);
 }