From 6d27a6f758e0b897be93fe0e2649cb5f6002ef3b Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 11 Sep 2016 00:01:38 +1000 Subject: [1.4.6.5-release] % Cleaned up fluid duplicates. % Cleaned up handling of GT Meta-Tools. % Changed tone of my latest Fluid Cell icons, now it's darker and more defined. - Removed some dead classes that have no use. --- src/Java/gtPlusPlus/core/common/CommonProxy.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'src/Java/gtPlusPlus/core/common') diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index f3ed741bf0..c6dc1b0b73 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -42,16 +42,19 @@ public class CommonProxy { else { Utils.LOG_INFO("We're using Gregtech 5.08 or an equivalent fork."); } + handleGtIntegrationInit(); } - if (LoadedMods.Gregtech){ - for (String tOreName : OreDictionary.getOreNames()) { - ItemStack tOreStack; - for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); Meta_GT_Proxy.registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { - Utils.LOG_INFO("Iterating Material"); - tOreStack = (ItemStack) i$.next(); - } + } + private static void handleGtIntegrationInit(){ + Utils.LOG_INFO("Setting up our own GT_Proxy."); + Meta_GT_Proxy GtProxy = new Meta_GT_Proxy(); + for (String tOreName : OreDictionary.getOreNames()) { + ItemStack tOreStack; + Utils.LOG_INFO("Iterating list of GT materials for custom tool parts."); + for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); GtProxy.registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { + Utils.LOG_INFO("Iterating Material"); + tOreStack = (ItemStack) i$.next(); } - new Meta_GT_Proxy(); } } -- cgit