More refactor

10 files changed, 22 insertions, 25 deletions

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 ad1517adb2..9a1e1be66c 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -8,7 +8,7 @@ import com.github.technus.tectech.magicAddon.definitions.AspectDefinitionCompatE
 import com.github.technus.tectech.thing.CustomItemList;
 import com.github.technus.tectech.thing.block.QuantumGlassBlock;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.item.ConstructibleTriggerItem;
+import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
 import com.github.technus.tectech.thing.item.DebugContainer_EM;
 import com.github.technus.tectech.thing.item.ParametrizerMemoryCard;
 import cpw.mods.fml.common.ProgressManager;
@@ -118,7 +118,7 @@ public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft
         TT_Container_Casings.sBlockCasingsTT.setCreativeTab(mainTab);
         TT_Container_Casings.sHintCasingsTT.setCreativeTab(mainTab);
         DebugContainer_EM.INSTANCE.setCreativeTab(mainTab);
-        ConstructibleTriggerItem.INSTANCE.setCreativeTab(mainTab);
+        ConstructableTriggerItem.INSTANCE.setCreativeTab(mainTab);
         ParametrizerMemoryCard.INSTANCE.setCreativeTab(mainTab);
     }
 
diff --git a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
index a92a5a663d..7411bc9335 100644
--- a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
@@ -6,7 +6,7 @@ import com.github.technus.tectech.thing.block.QuantumStuffBlock;
 import com.github.technus.tectech.thing.casing.GT_Block_CasingsTT;
 import com.github.technus.tectech.thing.casing.GT_Block_HintTT;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
-import com.github.technus.tectech.thing.item.ConstructibleTriggerItem;
+import com.github.technus.tectech.thing.item.ConstructableTriggerItem;
 import com.github.technus.tectech.thing.item.DebugContainer_EM;
 import com.github.technus.tectech.thing.item.DefinitionContainer_EM;
 import com.github.technus.tectech.thing.item.ParametrizerMemoryCard;
@@ -37,7 +37,7 @@ public class ThingsLoader implements Runnable {
             TecTech.Logger.info("TurretBaseEM registered");
         }
 
-        ConstructibleTriggerItem.run();
+        ConstructableTriggerItem.run();
         ParametrizerMemoryCard.run();
         TecTech.Logger.info("Useful item registered");
 
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
index ceeeadbf5a..18e7962f41 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ConstructibleTriggerItem.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ConstructableTriggerItem.java
@@ -31,12 +31,12 @@ import static gregtech.api.GregTech_API.sBlockCasings1;
 /**
  * Created by Tec on 15.03.2017.
  */
-public class ConstructibleTriggerItem extends Item {
-    public static ConstructibleTriggerItem INSTANCE;
+public class ConstructableTriggerItem extends Item {
+    public static ConstructableTriggerItem INSTANCE;
 
     public static HashMap<String,MultiblockInfoContainer> multiblockMap= new HashMap<>();
 
-    private ConstructibleTriggerItem() {
+    private ConstructableTriggerItem() {
         super();
         setUnlocalizedName("em.debugBuilder");
         setTextureName(MODID + ":itemDebugBuilder");
@@ -118,7 +118,7 @@ public class ConstructibleTriggerItem extends Item {
     }
 
     public static void run() {
-        INSTANCE = new ConstructibleTriggerItem();
+        INSTANCE = new ConstructableTriggerItem();
         GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
 
         multiblockMap.put(GT_MetaTileEntity_ElectricBlastFurnace.class.getCanonicalName(), new MultiblockInfoContainer() {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
index c384552c25..ef0b9ddfb1 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Param.java
@@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
 
 import java.util.Iterator;
 
-public final class GT_Container_Param extends GT_ContainerMetaTile_Machine {
+public class GT_Container_Param extends GT_ContainerMetaTile_Machine {
     public int exponent = 0;
     public int value2 = 0;
     public int value1 = 0;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java
index 68b4f9268b..8db5fc1aa4 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Uncertainty.java
@@ -14,7 +14,7 @@ import net.minecraft.item.ItemStack;
 
 import java.util.Iterator;
 
-public final class GT_Container_Uncertainty extends GT_ContainerMetaTile_Machine {
+public class GT_Container_Uncertainty extends GT_ContainerMetaTile_Machine {
     public short[] matrix = new short[]{500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500, 500};
     public byte selection = -1, mode = 0, status = -128;
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
index c272e67fdc..d883cb3332 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_Param.java
@@ -7,7 +7,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import static com.github.technus.tectech.TecTech.proxy;
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 
-public final class GT_GUIContainer_Param extends GT_GUIContainerMetaTile_Machine {
+public class GT_GUIContainer_Param extends GT_GUIContainerMetaTile_Machine {
     public GT_GUIContainer_Param(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(new GT_Container_Param(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "Parametrizer.png");
     }
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java
index eebf48debb..d6a0b14f34 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_GUIContainer_UncertaintyAdv.java
@@ -9,7 +9,7 @@ import static com.github.technus.tectech.TecTech.proxy;
 import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
 import static org.lwjgl.opengl.GL11.*;
 
-public final class GT_GUIContainer_UncertaintyAdv extends GT_GUIContainerMetaTile_Machine {
+public class GT_GUIContainer_UncertaintyAdv extends GT_GUIContainerMetaTile_Machine {
     protected static final short sX = 52, sY = 33, bU = 0, rU = 70, fU = 192, V = 210, Vs = 216;
 
     public GT_GUIContainer_UncertaintyAdv(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java
index 595d280c18..08f97832dd 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/gui/GT_GUIContainer_MultiMachineEM.java
@@ -28,11 +28,11 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach
             if ((((GT_Container_MultiMachineEM) mContainer).mDisplayErrorCode & 1) != 0)
                 fontRendererObj.drawString("Pipe is loose.", 10, -10, 16448255);
             if ((((GT_Container_MultiMachineEM) mContainer).mDisplayErrorCode & 2) != 0)
-                fontRendererObj.drawString("Screws are missing.", 10, -2, 16448255);
+                fontRendererObj.drawString("Screws are loose.", 10, -2, 16448255);
             if ((((GT_Container_MultiMachineEM) mContainer).mDisplayErrorCode & 4) != 0)
                 fontRendererObj.drawString("Something is stuck.", 10, 6, 16448255);
             if ((((GT_Container_MultiMachineEM) mContainer).mDisplayErrorCode & 8) != 0)
-                fontRendererObj.drawString("Platings are dented.", 10, 14, 16448255);
+                fontRendererObj.drawString("Plating is dented.", 10, 14, 16448255);
             if ((((GT_Container_MultiMachineEM) mContainer).mDisplayErrorCode & 16) != 0)
                 fontRendererObj.drawString("Circuitry burned out.", 10, 22, 16448255);
             if ((((GT_Container_MultiMachineEM) mContainer).mDisplayErrorCode & 32) != 0)
@@ -46,7 +46,7 @@ public class GT_GUIContainer_MultiMachineEM extends GT_GUIContainerMetaTile_Mach
 
             if (((GT_Container_MultiMachineEM) mContainer).mDisplayErrorCode == 0) {
                 if (((GT_Container_MultiMachineEM) mContainer).mActive == 0) {
-                    fontRendererObj.drawString("Hit with Soft Hammer", 10, -10, 16448255);
+                    fontRendererObj.drawString("Soft Hammer or press Button", 10, -10, 16448255);
                     fontRendererObj.drawString("to (re-)start the Machine", 10, -2, 16448255);
                     fontRendererObj.drawString("if it doesn't start.", 10, 6, 16448255);
                 } else {
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 c8ba4dbc1e..d495c7e9f2 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
@@ -32,7 +32,7 @@ import static gregtech.api.enums.Dyes.MACHINE_METAL;
  */
 public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConnectsToDataPipe {
     private static Textures.BlockIcons.CustomIcon EMpipe;
-    private static Textures.BlockIcons.CustomIcon EMcandy;
+    private static Textures.BlockIcons.CustomIcon EMbar;
     public byte connectionCount = 0;
 
     public GT_MetaTileEntity_Pipe_Data(int aID, String aName, String aNameRegional) {
@@ -52,13 +52,13 @@ public class GT_MetaTileEntity_Pipe_Data extends MetaPipeEntity implements iConn
     @SideOnly(Side.CLIENT)
     public void registerIcons(IIconRegister aBlockIconRegister) {
         EMpipe = new Textures.BlockIcons.CustomIcon("iconsets/EM_DATA");
-        EMcandy = new Textures.BlockIcons.CustomIcon("iconsets/EM_BAR");
+        EMbar = new Textures.BlockIcons.CustomIcon("iconsets/EM_BAR");
         super.registerIcons(aBlockIconRegister);
     }
 
     @Override
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aConnections, byte aColorIndex, boolean aConnected, boolean aRedstone) {
-        return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(EMcandy, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))};
+        return new ITexture[]{new GT_RenderedTexture(EMpipe), new GT_RenderedTexture(EMbar, Dyes.getModulation(aColorIndex, MACHINE_METAL.getRGBA()))};
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
index 4ea525acd2..f300b3e432 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugStructureWriter.java
@@ -20,7 +20,6 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
 import static com.github.technus.tectech.Util.StructureWriter;
-import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
 
 /**
  * Created by Tec on 23.03.2017.
@@ -104,9 +103,8 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         if (aBaseMetaTileEntity.isAllowedToWork()) {
             result = StructureWriter(this.getBaseMetaTileEntity(), numbers[0], numbers[1], numbers[2], numbers[3], numbers[4], numbers[5], false);
-            if (DEBUG_MODE)
-                for (String s : result)
-                    TecTech.Logger.info(s);
+            for (String s : result)
+                TecTech.Logger.info(s);
             aBaseMetaTileEntity.disableWorking();
         }
     }
@@ -114,9 +112,8 @@ public class GT_MetaTileEntity_DebugStructureWriter extends GT_MetaTileEntity_Ti
     @Override
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         result = StructureWriter(this.getBaseMetaTileEntity(), numbers[0], numbers[1], numbers[2], numbers[3], numbers[4], numbers[5], true);
-        if (DEBUG_MODE)
-            for (String s : result)
-                TecTech.Logger.info(s);
+        for (String s : result)
+            TecTech.Logger.info(s);
     }
 
     @Override