Merge branch 'BassAddons'

6 files changed, 157 insertions, 11 deletions

diff --git a/build.gradle b/build.gradle
index 9040ae0d8a..7c1298fc49 100644
--- a/build.gradle
+++ b/build.gradle
@@ -116,6 +116,7 @@ dependencies {
 	compile "micdoodle8.mods:GalacticraftCore:${config.galacticraft.version}:Dev"
 	compile "micdoodle8.mods:Galacticraft-Planets:${config.galacticraft.version}:Dev"
 	compile "micdoodle8.mods:Galacticraft:${config.galacticraft.version}:API"
+	compile "com.mod-buildcraft:buildcraft:${config.buildcraft.version}:dev"
 	//Ivy
 	compile name: 'CoFHCore', version: config.cofhcore.version, ext: 'jar'
 }
@@ -172,6 +173,15 @@ processResources
             }
         }
 
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+}
+
+artifacts {
+    archives devJar
+}
+
 task signJar(dependsOn: 'reobf') {
     doLast {
         ant.signjar(
@@ -185,4 +195,4 @@ task signJar(dependsOn: 'reobf') {
                 verbose: true
         )
     }
-}
\ No newline at end of file
+}
diff --git a/build.properties b/build.properties
index 817ae15210..dc9a4492a5 100644
--- a/build.properties
+++ b/build.properties
@@ -19,3 +19,4 @@ forestry.version=4.2.16.64
 enderio.version=2.3.0.429_beta
 endercore.version=0.2.0.39_beta
 waila.version=1.5.10
+buildcraft.version=7.1.23
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index d7d23d7461..7e9a90961e 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -323,6 +323,7 @@ public final class MainLoader {
                 "DraconicEvolution",
                 "IC2NuclearControl",
                 "IronChest",
+                "irontank",
                 "opensecurity",
                 "openmodularturrets",
                 "Railcraft",
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 74564a7a57..6d0706971d 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
@@ -114,7 +114,6 @@ public abstract class GT_MetaTileEntity_Hatch_DataConnector<T extends DataPacket
         } catch (Exception e) {
             clientLocale = "en_US";
         }
-        aBaseMetaTileEntity.openGUI(aPlayer);
         return true;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java
new file mode 100644
index 0000000000..9466d9df46
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_proccessingStack.java
@@ -0,0 +1,142 @@
+package com.github.technus.tectech.thing.metaTileEntity.multi;
+
+import com.github.technus.tectech.CommonValues;
+import com.github.technus.tectech.Reference;
+import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.*;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.render.TT_RenderedTexture;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.block.Block;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.item.EntityItem;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.EnumChatFormatting;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+import static com.github.technus.tectech.Util.StructureBuilderExtreme;
+import static com.github.technus.tectech.loader.MainLoader.microwaving;
+import static com.github.technus.tectech.recipe.TT_recipeAdder.nullItem;
+import static com.github.technus.tectech.thing.metaTileEntity.multi.base.LedStatus.*;
+import static gregtech.api.GregTech_API.sBlockCasings4;
+import static net.minecraft.util.StatCollector.translateToLocal;
+
+public class GT_MetaTileEntity_TM_proccessingStack extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable {
+    //region variables
+    private boolean hasBeenPausedThisCycle = false;
+    //endregion
+
+    //region structure
+    //use multi A energy inputs, use less power the longer it runs
+    private static final String[][] base = new String[][]{
+            {"   ",},
+            {" 0 ",},
+            {"   ",},
+    };
+    private static final String[][] slice = new String[][]{
+            {"111",},
+            {"101",},
+            {"111",},
+    };
+    private static final String[][] cap = new String[][]{
+            {"   ",},
+            {" 0 ",},
+            {"   ",},
+    };
+    private static final Block[] blockType = new Block[]{sBlockCasings4};
+    private static final byte[] blockMeta = new byte[]{1};
+
+    private final IHatchAdder[] addingMethods = new IHatchAdder[]{this::addClassicToMachineList};
+    private static final short[] casingTextures = new short[]{49};
+    private static final Block[] blockTypeFallback = new Block[]{sBlockCasings4};
+    private static final byte[] blockMetaFallback = new byte[]{1};
+    private static final String[] description = new String[]{
+            EnumChatFormatting.AQUA + translateToLocal("tt.keyphrase.Hint_Details") + ":",
+            translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.hint.0"),
+            translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.hint.1"),
+    };
+    //endregion
+
+    public GT_MetaTileEntity_TM_proccessingStack(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional);
+    }
+
+    public GT_MetaTileEntity_TM_proccessingStack(String aName) {
+        super(aName);
+    }
+
+    @Override
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_TM_proccessingStack(mName);
+    }
+
+    @Override
+    public boolean checkMachine_EM(IGregTechTileEntity iGregTechTileEntity, ItemStack itemStack) {
+        return false;
+        //return structureCheck_EM(shape, blockType, blockMeta, addingMethods, casingTextures, blockTypeFallback, blockMetaFallback, 1, 0, 0);
+    }
+
+    @Override
+    public boolean checkRecipe_EM(ItemStack itemStack) {
+        return true;
+    }
+
+    @Override
+    public void outputAfterRecipe_EM() {
+
+    }
+
+    @Override
+    public String[] getDescription() {
+        return new String[]{
+                CommonValues.BASS_MARK,
+                translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.0"),
+                EnumChatFormatting.AQUA.toString() + EnumChatFormatting.BOLD + translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.1"),
+                EnumChatFormatting.BLUE + translateToLocal("gt.blockmachines.multimachine.tm.proccessingStack.desc.2"),
+        };
+    }
+
+    @Override
+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_Container_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, false, true, true);
+    }
+
+    @Override
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_MultiMachineEM(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "EMDisplay.png", false, true, true);
+    }
+
+    @Override
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        if (aSide == aFacing) {
+            return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[49], new TT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ELECTRIC_BLAST_FURNACE)};
+        } else if (aSide == GT_Utility.getOppositeSide(aFacing)) {
+            return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[49], aActive ? Textures.BlockIcons.CASING_BLOCKS[52] : Textures.BlockIcons.CASING_BLOCKS[53]};
+        }
+        return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[49]};
+    }
+
+    @Override
+    public boolean onRunningTick(ItemStack aStack) {
+        return true;
+    }
+
+    @Override
+    public void construct(int stackSize, boolean hintsOnly) {
+        //StructureBuilderExtreme(shape, blockType, blockMeta, 2, 2, 0, getBaseMetaTileEntity(), this, hintsOnly);
+    }
+
+    @Override
+    public String[] getStructureDescription(int stackSize) {
+        return description;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index 13b9e72070..9fb7193dd8 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -442,19 +442,12 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
     @Override
     public void onRemoval() {
+        super.onRemoval();
         for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) {
-            try {
+            if (GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) {
                 cap.getBaseMetaTileEntity().setActive(false);
-            } catch (Exception e) {
-                if (DEBUG_MODE) {
-                    e.printStackTrace();
-                }
             }
         }
-        super.onRemoval();
-        for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) {
-            cap.getBaseMetaTileEntity().setActive(false);
-        }
     }
 
     @Override