change texture load order

6 files changed, 32 insertions, 17 deletions

diff --git a/src/main/java/com/github/technus/tectech/TecTech.java b/src/main/java/com/github/technus/tectech/TecTech.java
index f1cb49f8c5..253cd616f7 100644
--- a/src/main/java/com/github/technus/tectech/TecTech.java
+++ b/src/main/java/com/github/technus/tectech/TecTech.java
@@ -7,6 +7,7 @@ import com.github.technus.tectech.elementalMatter.core.commands.ListEM;
 import com.github.technus.tectech.loader.MainLoader;
 import com.github.technus.tectech.loader.ModGuiHandler;
 import com.github.technus.tectech.proxy.CommonProxy;
+import com.github.technus.tectech.thing.metaTileEntity.Textures;
 import com.github.technus.tectech.thing.metaTileEntity.multi.base.network.RotationPacketDispatcher;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -31,6 +32,10 @@ import java.util.HashSet;
 
 import static com.github.technus.tectech.CommonValues.*;
 import static com.github.technus.tectech.auxiliary.TecTechConfig.DEBUG_MODE;
+import static gregtech.api.GregTech_API.sGTBlockIconload;
+import static gregtech.api.enums.Dyes.MACHINE_METAL;
+import static gregtech.api.enums.Dyes.dyeBlue;
+import static gregtech.api.enums.Dyes.dyeLightBlue;
 
 @Mod(modid = Reference.MODID, name = Reference.NAME, version = Reference.VERSION, dependencies = "required-after:Forge@[10.13.4.1614,);"
         + "required-after:YAMCore@[0.5.70,);" + "required-after:gregtech;" + "after:CoFHCore;" + "after:Thaumcraft;" + "after:dreamcraft;")
@@ -67,6 +72,27 @@ public class TecTech {
         }
         Logger.setDebugOutput(true);
 
+        dyeLightBlue.mRGBa[0]=96;
+        dyeLightBlue.mRGBa[1]=128;
+        dyeLightBlue.mRGBa[2]=255;
+        dyeBlue.mRGBa[0]=0;
+        dyeBlue.mRGBa[1]=32;
+        dyeBlue.mRGBa[2]=255;
+        MACHINE_METAL.mRGBa[0]=210;
+        MACHINE_METAL.mRGBa[1]=220;
+        MACHINE_METAL.mRGBa[2]=255;
+
+        try {
+            sGTBlockIconload.add(new Runnable() {
+                @Override
+                public void run() {
+                    new Textures();
+                }
+            });
+        }catch (Throwable t){
+            Logger.error("Loading textures...",t);
+        }
+
         ModConfig = new TecTechConfig(PreEvent.getModConfigurationDirectory(), Reference.COLLECTIONNAME,
                 Reference.MODID);
 
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/Textures.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
index 27531a0c71..71a51a50bf 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/Textures.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/Textures.java
@@ -1,4 +1,4 @@
-package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
+package com.github.technus.tectech.thing.metaTileEntity;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IIconContainer;
@@ -10,17 +10,6 @@ import static gregtech.api.enums.Dyes.*;
 import static gregtech.api.enums.Textures.BlockIcons.*;
 
 public class Textures {
-    static{
-        dyeLightBlue.mRGBa[0]=96;
-        dyeLightBlue.mRGBa[1]=128;
-        dyeLightBlue.mRGBa[2]=255;
-        dyeBlue.mRGBa[0]=0;
-        dyeBlue.mRGBa[1]=32;
-        dyeBlue.mRGBa[2]=255;
-        MACHINE_METAL.mRGBa[0]=210;
-        MACHINE_METAL.mRGBa[1]=220;
-        MACHINE_METAL.mRGBa[2]=255;
-    }
     private static IIconContainer OVERLAY_ENERGY_IN_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_IN_POWER");
     private static IIconContainer OVERLAY_ENERGY_OUT_POWER = new CustomIcon("iconsets/OVERLAY_ENERGY_OUT_POWER");
     private static IIconContainer MACHINE_UEV_SIDE = new CustomIcon("iconsets/MACHINE_UEV_SIDE");
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
index faaef4db64..2ad4593984 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_DynamoMulti.java
@@ -10,7 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 
 import static com.github.technus.tectech.CommonValues.V;
-import static com.github.technus.tectech.thing.metaTileEntity.hatch.gui.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
+import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
 
 /**
  * Created by danie_000 on 16.12.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
index 38a81c7c12..64dda8f84a 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_EnergyMulti.java
@@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import static com.github.technus.tectech.CommonValues.V;
-import static com.github.technus.tectech.thing.metaTileEntity.hatch.gui.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
+import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
 
 /**
  * Created by danie_000 on 16.12.2016.
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java
index 839f858588..92ac88b180 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_DebugPowerGenerator.java
@@ -19,8 +19,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
-import static com.github.technus.tectech.thing.metaTileEntity.hatch.gui.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
-import static com.github.technus.tectech.thing.metaTileEntity.hatch.gui.Textures.OVERLAYS_ENERGY_OUT_POWER_TT;
+import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_IN_POWER_TT;
+import static com.github.technus.tectech.thing.metaTileEntity.Textures.OVERLAYS_ENERGY_OUT_POWER_TT;
 import static gregtech.api.enums.Textures.BlockIcons.MACHINE_CASINGS;
 
 /**
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java
index d07e7d880a..f32fc270e9 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_WetTransformer.java
@@ -9,7 +9,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Transformer;
 
 import static com.github.technus.tectech.CommonValues.V;
-import static com.github.technus.tectech.thing.metaTileEntity.hatch.gui.Textures.*;
+import static com.github.technus.tectech.thing.metaTileEntity.Textures.*;
 
 public class GT_MetaTileEntity_WetTransformer extends GT_MetaTileEntity_Transformer {
     public GT_MetaTileEntity_WetTransformer(int aID, String aName, String aNameRegional, int aTier, String aDescription) {