aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-09-24 02:45:00 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-09-24 02:45:00 +1000
commit6a95a11b16cfa38e7789418d93e70b1dc12b19c7 (patch)
tree804082ad6b8db511851872e4fbfd05b235f25601 /src/Java/gtPlusPlus
parent0ce3668bdc5e2f5dd0754525878f933178ffe023 (diff)
downloadGT5-Unofficial-6a95a11b16cfa38e7789418d93e70b1dc12b19c7.tar.gz
GT5-Unofficial-6a95a11b16cfa38e7789418d93e70b1dc12b19c7.tar.bz2
GT5-Unofficial-6a95a11b16cfa38e7789418d93e70b1dc12b19c7.zip
$ Fixed dumb shit I did, not using proxies.
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java11
-rw-r--r--src/Java/gtPlusPlus/core/proxy/ClientProxy.java3
2 files changed, 5 insertions, 9 deletions
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