From 6a95a11b16cfa38e7789418d93e70b1dc12b19c7 Mon Sep 17 00:00:00 2001
From: Draknyte1 <Draknyte1@hotmail.com>
Date: Sat, 24 Sep 2016 02:45:00 +1000
Subject: $ Fixed dumb shit I did, not using proxies.

---
 src/Java/gtPlusPlus/GTplusplus.java             | 11 ++---------
 src/Java/gtPlusPlus/core/proxy/ClientProxy.java |  3 +++
 2 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 0d398d1443..537dc7963f 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -30,7 +30,6 @@ import java.awt.event.ActionListener;
 import java.io.File;
 import java.util.Collection;
 
-import net.minecraft.client.Minecraft;
 import net.minecraftforge.common.config.Configuration;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Mod;
@@ -112,19 +111,13 @@ implements ActionListener
 		//ItemStack a1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[a], 8);
 		//ItemStack b1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[b], 8);
 		//ItemStack c1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[c], 8);
-		//ItemStack d1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], 8);		
-
-		
-		//Do this weird things for textures.
-		if (Minecraft.getMinecraft().theWorld.isRemote){
-		loadTextures();
-		}
+		//ItemStack d1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], 8);	
 		
 		
 	}
 	
 	@SideOnly(value=Side.CLIENT)
-	private void loadTextures(){
+	public static void loadTextures(){
 		Utils.LOG_INFO("Loading some textures on the client.");
 		Utils.LOG_WARNING("Processing texture: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
 	}
diff --git a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
index 3b3c257ffa..06401f53ba 100644
--- a/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/Java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.proxy;
 
+import gtPlusPlus.GTplusplus;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.util.particles.EntityParticleFXMysterious;
 import net.minecraft.client.Minecraft;
@@ -17,6 +18,8 @@ public class ClientProxy extends CommonProxy{
 	public void preInit(FMLPreInitializationEvent e) {
 		// TODO Auto-generated method stub
 		super.preInit(e);
+		//Do this weird things for textures.
+		GTplusplus.loadTextures();		
 	}
 
 	@Override
-- 
cgit