Attempt fix for bloody asp GT5u

13 files changed, 24 insertions, 36 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index 59c68e4aab..adcaccdcb1 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -69,8 +69,6 @@ public class TecTech {
             Module_AdminErrorLogs = new IngameErrorLog();
         }
 
-        proxy.addTexturePage(tectechTexturePage1);
-
         GTCustomLoader = new MainLoader();
 
         TecTech.Logger.info("Added Atom Overrider");
diff --git a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
index 783f508454..52c584d788 100644
--- a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
@@ -37,7 +37,7 @@ public class BloodyRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 ItemList.Circuit_Parts_GlassFiber.get(8, o),
                 GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Silver, 8)
-        }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1, o), 200, 30720, true);
+        }, Materials.Polytetrafluoroethylene.getMolten(144), CustomItemList.DATApipe.get(1, o), 200, 30720);
 
         //endregion
 
@@ -77,7 +77,7 @@ public class BloodyRecipeLoader implements Runnable {
                 GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Cobalt, 64),
                 GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 64),
                 GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Superconductor, 4)
-        }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1, o), 200, 122880, true);
+        }, Materials.Iridium.getMolten(1296), CustomItemList.eM_Computer_Bus.get(1, o), 200, 122880);
 
         //Molecular Casing
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
@@ -126,14 +126,14 @@ public class BloodyRecipeLoader implements Runnable {
                 ItemList.Hatch_Input_Bus_LuV.get(1, o),
                 ItemList.Circuit_Crystalcomputer.get(1, o),
                 CustomItemList.DATApipe.get(2, o)
-        }, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1, o), 200, 122880, true);
+        }, Materials.Iridium.getMolten(1296), CustomItemList.dataIn_Hatch.get(1, o), 200, 122880);
         //Data Output
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 CustomItemList.eM_Computer_Casing.get(1, o),
                 ItemList.Hatch_Output_Bus_LuV.get(1, o),
                 ItemList.Circuit_Crystalcomputer.get(1, o),
                 CustomItemList.DATApipe.get(2, o)
-        }, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1, o), 200, 122880, true);
+        }, Materials.Iridium.getMolten(1296), CustomItemList.dataOut_Hatch.get(1, o), 200, 122880);
 
         //Rack
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
@@ -141,7 +141,7 @@ public class BloodyRecipeLoader implements Runnable {
                 ItemList.Hatch_Input_Bus_ZPM.get(1, o),
                 ItemList.Circuit_Crystalcomputer.get(2, o),
                 CustomItemList.DATApipe.get(4, o)
-        }, Materials.Iridium.getMolten(1296), CustomItemList.rack_Hatch.get(1, o), 800, 122880, true);
+        }, Materials.Iridium.getMolten(1296), CustomItemList.rack_Hatch.get(1, o), 800, 122880);
 
         //Object Holder
         GT_Values.RA.addAssemblylineRecipe(ItemList.Hatch_Input_Bus_ZPM.get(1), 10000, new ItemStack[]{
@@ -175,7 +175,7 @@ public class BloodyRecipeLoader implements Runnable {
                 CustomItemList.DATApipe.get(16, o),
                 ItemList.Cover_Screen.get(1, o ),
                 new ItemStack(Blocks.stone_button, 16),
-        }, Materials.Iridium.getMolten(2592), CustomItemList.Uncertainty_Hatch.get(1, o), 1200, 122880, true);
+        }, Materials.Iridium.getMolten(2592), CustomItemList.Uncertainty_Hatch.get(1, o), 1200, 122880);
 
         //Elemental Input
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
@@ -183,21 +183,21 @@ public class BloodyRecipeLoader implements Runnable {
                 ItemList.Hatch_Input_UV.get(1, o),
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2),
                 ItemList.Sensor_UV.get(1, o)
-        }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_in_UV.get(1, o), 800, 500000, true);
+        }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_in_UV.get(1, o), 800, 500000);
         //Elemental Output
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 CustomItemList.eM_Containment.get(1, o),
                 ItemList.Hatch_Output_UV.get(1, o),
                 GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Naquadah, 2),
                 ItemList.Emitter_UV.get(1, o)
-        }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_out_UV.get(1, o), 800, 500000, true);
+        }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_out_UV.get(1, o), 800, 500000);
         //Overflow
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{
                 CustomItemList.eM_Containment.get(1, o),
                 ItemList.Hatch_Muffler_UV.get(1, o),
                 GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Naquadah, 1),
                 ItemList.Field_Generator_UV.get(1, o)
-        }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_muffler_UV.get(1, o), 800, 500000, true);
+        }, Materials.Osmiridium.getMolten(1296), CustomItemList.eM_muffler_UV.get(1, o), 800, 500000);
 
         //endregion
 
@@ -218,7 +218,7 @@ public class BloodyRecipeLoader implements Runnable {
                 ItemList.Transformer_ZPM_LuV.get(16, o),
                 ItemList.Circuit_Board_Elite.get(1, o),//?
                 GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Superconductor, 16),
-                ItemList.Circuit_Chip_UHPIC.get(2, o),
+                ItemList.Circuit_Chip_HPIC.get(2, o),
         }, Materials.TungstenSteel.getMolten(576), CustomItemList.Machine_Multi_Transformer.get(1, o), 400, 30720);
 
         //Network Switch
diff --git a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
index 51f49d0bf9..fdbfc1cda5 100644
--- a/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ElementalLoader.java
@@ -4,8 +4,8 @@ import com.github.technus.tectech.compatibility.thaumcraft.definitions.dComplexA
 import com.github.technus.tectech.compatibility.thaumcraft.definitions.ePrimalAspectDefinition;
 import com.github.technus.tectech.elementalMatter.core.templates.cElementalPrimitive;
 import com.github.technus.tectech.elementalMatter.definitions.complex.atom.dAtomDefinition;
-import com.github.technus.tectech.elementalMatter.definitions.complex.hadron.dHadronDefinition;
 import com.github.technus.tectech.elementalMatter.definitions.complex.atom.iaeaNuclide;
+import com.github.technus.tectech.elementalMatter.definitions.complex.hadron.dHadronDefinition;
 import com.github.technus.tectech.elementalMatter.definitions.primitive.*;
 
 /**
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 e42e8e8edc..8c1a0cad34 100644
--- a/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/ThingsLoader.java
@@ -9,14 +9,21 @@ 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.*;
 import cpw.mods.fml.common.Loader;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
 import openmodularturrets.blocks.turretbases.TurretBaseEM;
 import openmodularturrets.blocks.turretheads.TurretHeadEM;
 
+import static com.github.technus.tectech.TecTech.tectechTexturePage1;
+
 /**
  * Created by danie_000 on 16.11.2016.
  */
 public class ThingsLoader implements Runnable {
     public void run() {
+        if(Textures.BlockIcons.casingTexturePages[tectechTexturePage1]==null)
+            Textures.BlockIcons.casingTexturePages[tectechTexturePage1]=new ITexture[128];
+        TecTech.Logger.info("Added texture page if was null");
         TT_Container_Casings.sBlockCasingsTT = new GT_Block_CasingsTT();
         TecTech.Logger.info("Elemental Casing registered");
         TT_Container_Casings.sHintCasingsTT = new GT_Block_HintTT();
diff --git a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
index 9321a1b2bc..3c3ed9b845 100644
--- a/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/ClientProxy.java
@@ -9,8 +9,6 @@ import com.github.technus.tectech.thing.block.QuantumStuffRender;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.Loader;
-import gregtech.api.enums.Textures;
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
@@ -27,12 +25,6 @@ import org.lwjgl.opengl.GL11;
 
 public class ClientProxy extends CommonProxy {
     @Override
-    public void addTexturePage(byte page){
-        if(Textures.BlockIcons.casingTexturePages[page]==null)
-            Textures.BlockIcons.casingTexturePages[page]=new ITexture[128];
-    }
-
-    @Override
     public void registerRenderInfo() {
         QuantumGlassBlock.renderID = RenderingRegistry.getNextAvailableRenderId();
         RenderingRegistry.registerBlockHandler(QuantumGlassBlock.renderID, new QuantumGlassRender());
diff --git a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java
index 6bc3fb026e..2db569cd8e 100644
--- a/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java
+++ b/src/main/java/com/github/technus/tectech/proxy/CommonProxy.java
@@ -9,8 +9,6 @@ import net.minecraft.util.ChatComponentText;
 import net.minecraft.world.World;
 
 public class CommonProxy implements IGuiHandler {
-    public void addTexturePage(byte page){}
-
     public void registerRenderInfo() {}
 
     public void hint_particle(World world, int x, int y, int z, Block block, int meta){}
diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
index 3b307fb081..cd36cb44bf 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java
@@ -6,24 +6,21 @@ import com.github.technus.tectech.Util;
 import com.github.technus.tectech.elementalMatter.core.cElementalInstanceStackMap;
 import com.github.technus.tectech.loader.ModGuiHandler;
 import com.github.technus.tectech.thing.CustomItemList;
-import com.github.technus.tectech.thing.item.gui.ScanDisplayScreen;
 import cpw.mods.fml.common.registry.GameRegistry;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.*;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.IIcon;
 import net.minecraft.world.World;
 
-import java.util.Collections;
 import java.util.List;
 
 import static com.github.technus.tectech.auxiliary.Reference.MODID;
-import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
 
 /**
  * Created by Tec on 15.03.2017.
diff --git a/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java
index e7d3122872..69a3c395d4 100644
--- a/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java
+++ b/src/main/java/com/github/technus/tectech/thing/item/gui/ScanDisplayScreen.java
@@ -10,7 +10,6 @@ import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.GL11;
 
 import static org.lwjgl.opengl.GL11.*;
-import static org.lwjgl.opengl.GL11.GL_ONE_MINUS_SRC_ALPHA;
 
 /**
  * Created by danie_000 on 17.12.2017.
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
index 7789bfe213..0f27bd746e 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_infuser.java
@@ -4,9 +4,9 @@ import cofh.api.energy.IEnergyContainerItem;
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import ic2.api.item.ElectricItem;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
index c458f8d7f6..d286869a0c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_scanner.java
@@ -29,9 +29,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.common.util.ForgeDirection;
 
-import static com.github.technus.tectech.Util.StructureBuilder;
-import static com.github.technus.tectech.Util.V;
-import static com.github.technus.tectech.Util.VN;
+import static com.github.technus.tectech.Util.*;
 import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.elementalMatter.definitions.primitive.cPrimitiveDefinition.nbtE__;
 import static com.github.technus.tectech.recipe.TT_recipe.E_RECIPE_ID;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
index 1f7f0a6f2e..7285340215 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_transformer.java
@@ -2,9 +2,9 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
index cb131a6622..03ac34a3d3 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java
@@ -3,9 +3,9 @@ package com.github.technus.tectech.thing.metaTileEntity.multi;
 import com.github.technus.tectech.CommonValues;
 import com.github.technus.tectech.auxiliary.Reference;
 import com.github.technus.tectech.thing.metaTileEntity.IConstructable;
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_Container_MultiMachineEM;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_GUIContainer_MultiMachineEM;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java
index 5342c9bc51..3c86d4a0da 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_Container_MultiMachineEM.java
@@ -1,6 +1,5 @@
 package com.github.technus.tectech.thing.metaTileEntity.multi.base;
 
-import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.gui.GT_Slot_Holo;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;