aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-09-24 00:45:56 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-09-24 01:05:58 +1000
commit481684bf5a0d89d5de467eec29f02b987d7e184e (patch)
tree9b4b78ecdfb9ec75936ef498eae37682fe4e33d4 /src
parenteb094625ec78d7d70706a4ea8b50b2a04b350a65 (diff)
downloadGT5-Unofficial-481684bf5a0d89d5de467eec29f02b987d7e184e.tar.gz
GT5-Unofficial-481684bf5a0d89d5de467eec29f02b987d7e184e.tar.bz2
GT5-Unofficial-481684bf5a0d89d5de467eec29f02b987d7e184e.zip
[1.4.8.2-PreRelease]
$ Fixed an Issue where client side texture related code was called on the server. % Bumped Version.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java10
-rw-r--r--src/Java/gtPlusPlus/core/lib/CORE.java2
-rw-r--r--src/resources/mcmod.info2
3 files changed, 11 insertions, 3 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index caa293fbed..afdfaacd18 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -40,6 +40,8 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.event.FMLServerStoppingEvent;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
@Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;")
public class GTplusplus
@@ -113,10 +115,16 @@ implements ActionListener
//Do this weird things for textures.
- Utils.LOG_WARNING("Processing texture: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
+ loadTextures();
}
+
+ @SideOnly(value=Side.CLIENT)
+ private 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/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index cb76e9b94a..d8798f707b 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -21,7 +21,7 @@ public class CORE {
public static final String name = "GT++";
public static final String MODID = "miscutils";
- public static final String VERSION = "1.4.8-prerelease";
+ public static final String VERSION = "1.4.8.2-prerelease";
public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
public static boolean isModUpToDate = Utils.isModUpToDate();
public static boolean DEBUG = false;
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 134affddca..79dc5cc795 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
"description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
"credits": "",
"logoFile": "",
- "version": "1.4.8-prerelease",
+ "version": "1.4.8.2-prerelease",
"mcversion": "1.7.10",
"url": "https://github.com/draknyte1/MiscUtilities/wiki",
"updateUrl": "https://github.com/draknyte1/MiscUtilities/tree/master/build/libs",