Remove turbine texture reflection (#439)

* Remove turbine texture reflection

* yeet

9 files changed, 7 insertions, 84 deletions

diff --git a/src/main/java/gtPlusPlus/GTplusplus.java b/src/main/java/gtPlusPlus/GTplusplus.java
index caeafa99bf..7a6d34cf71 100644
--- a/src/main/java/gtPlusPlus/GTplusplus.java
+++ b/src/main/java/gtPlusPlus/GTplusplus.java
@@ -1,6 +1,5 @@
 package gtPlusPlus;
 
-import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableAnimatedTurbines;
 import static gtPlusPlus.core.lib.CORE.ConfigSwitches.enableCustomCapes;
 
 import cpw.mods.fml.common.Mod;
@@ -13,10 +12,11 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
-import gregtech.api.enums.Textures;
-import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.util.*;
+import gregtech.api.util.FishPondFakeRecipe;
+import gregtech.api.util.GTPP_Recipe;
+import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.SemiFluidFuelHandler;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.chunkloading.GTPP_ChunkManager;
 import gtPlusPlus.core.commands.CommandDebugChunks;
@@ -24,7 +24,9 @@ import gtPlusPlus.core.commands.CommandEnableDebugWhileRunning;
 import gtPlusPlus.core.commands.CommandMath;
 import gtPlusPlus.core.common.CommonProxy;
 import gtPlusPlus.core.config.ConfigHandler;
-import gtPlusPlus.core.handler.*;
+import gtPlusPlus.core.handler.BookHandler;
+import gtPlusPlus.core.handler.MobMentality;
+import gtPlusPlus.core.handler.PacketHandler;
 import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
 import gtPlusPlus.core.handler.events.BlockEventHandler;
 import gtPlusPlus.core.handler.events.LoginEventHandler;
@@ -38,7 +40,6 @@ import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.core.util.data.LocaleUtils;
 import gtPlusPlus.core.util.minecraft.HazmatUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.nei.NEI_IMC_Sender;
 import gtPlusPlus.plugin.manager.Core_Manager;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
@@ -56,7 +57,6 @@ import java.util.HashMap;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
 import net.minecraft.launchwrapper.Launch;
-import net.minecraft.util.IIcon;
 
 @MCVersion(value = "1.7.10")
 @Mod(
@@ -279,25 +279,6 @@ public class GTplusplus implements ActionListener {
         GTPP_Recipe.reInit();
     }
 
-    public static void tryPatchTurbineTextures() {
-        if (enableAnimatedTurbines) {
-            BlockIcons h = Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE;
-            BlockIcons h2 = Textures.BlockIcons.STEAM_TURBINE_SIDE_ACTIVE;
-            try {
-                Logger.INFO("Trying to patch GT textures to make Turbines animated.");
-                IIcon aIcon = TexturesGtBlock.Overlay_Machine_Turbine_Active.getIcon();
-                if (ReflectionUtils.setField(h, "mIcon", aIcon)) {
-                    Logger.INFO("Patched Gas Turbine Icon.");
-                }
-                if (ReflectionUtils.setField(h2, "mIcon", aIcon)) {
-                    Logger.INFO("Patched Steam Turbine Icon.");
-                }
-            } catch (Throwable e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
     protected void generateGregtechRecipeMaps() {
 
         int[] mValidCount = new int[] {0, 0, 0};
diff --git a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
index f2126417c7..d97fe6c0fc 100644
--- a/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
+++ b/src/main/java/gtPlusPlus/core/config/ConfigHandler.java
@@ -97,11 +97,6 @@ public class ConfigHandler {
                 "gregtech",
                 false,
                 "Adds GT6 recipes for Sulfuric Acid. Should remove all pre-existing recipes.");
-        enableAnimatedTurbines = config.getBoolean(
-                "enableAnimatedTurbines",
-                "gregtech",
-                true,
-                "Gives GT Gas/Steam turbines animated textures while running.");
         turbineCutoffBase = config.getInt(
                 "turbineCutoffBase",
                 "gregtech",
diff --git a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
index 074c03e75f..d917dfae83 100644
--- a/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
+++ b/src/main/java/gtPlusPlus/core/handler/events/GeneralTooltipEventHandler.java
@@ -3,7 +3,6 @@ package gtPlusPlus.core.handler.events;
 import advsolar.common.AdvancedSolarPanel;
 import cpw.mods.fml.common.Optional;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import gregtech.api.enums.ItemList;
 import gtPlusPlus.GTplusplus;
 import gtPlusPlus.GTplusplus.INIT_PHASE;
 import gtPlusPlus.core.block.ModBlocks;
@@ -11,7 +10,6 @@ import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.sys.KeyboardUtils;
 import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
 import net.minecraft.block.Block;
 import net.minecraft.item.Item;
@@ -96,45 +94,6 @@ public class GeneralTooltipEventHandler {
         if (LoadedMods.AdvancedSolarPanel) {
             molecularTransformer(event);
         }
-
-        if (CORE.ConfigSwitches.enableAnimatedTurbines) {
-            boolean shift = false;
-            try {
-
-                if (KeyboardUtils.isShiftKeyDown()) {
-                    shift = true;
-                    mTurbine = "Animated Turbines can be disabled in the GT++ config";
-                } else {
-                    mTurbine = EnumChatFormatting.ITALIC + "<Hold Shift>" + EnumChatFormatting.RESET;
-                }
-                for (int t = 0; t < 6; t++) {
-                    if (mGregtechTurbines[t] != null) {
-                        if (ItemStack.areItemStacksEqual(event.itemStack, mGregtechTurbines[t])) {
-                            event.toolTip.add(mTurbine);
-                            if (shift) {
-                                if (mExtra == null) {
-                                    mExtra = CORE.GT_Tooltip;
-                                }
-                                event.toolTip.add(mExtra);
-                            }
-                        }
-                    } else {
-                        mGregtechTurbines[t] = (t == 0
-                                ? ItemList.Generator_Steam_Turbine_LV.get(1)
-                                : (t == 1
-                                        ? ItemList.Generator_Steam_Turbine_MV.get(1)
-                                        : (t == 2
-                                                ? ItemList.Generator_Steam_Turbine_HV.get(1)
-                                                : (t == 3
-                                                        ? ItemList.Generator_Gas_Turbine_LV.get(1)
-                                                        : (t == 4
-                                                                ? ItemList.Generator_Gas_Turbine_MV.get(1)
-                                                                : (ItemList.Generator_Gas_Turbine_HV.get(1)))))));
-                    }
-                }
-            } catch (Throwable t) {
-            }
-        }
     }
 
     @Optional.Method(modid = "AdvancedSolarPanel")
diff --git a/src/main/java/gtPlusPlus/core/lib/CORE.java b/src/main/java/gtPlusPlus/core/lib/CORE.java
index 80a4efd515..afe36d8800 100644
--- a/src/main/java/gtPlusPlus/core/lib/CORE.java
+++ b/src/main/java/gtPlusPlus/core/lib/CORE.java
@@ -188,7 +188,6 @@ public class CORE {
         // GT Fixes
         public static boolean enableNitroFix = false;
         public static boolean enableSulfuricAcidFix = false;
-        public static boolean enableAnimatedTurbines = true;
         public static boolean enableHarderRecipesForHighTierCasings = true;
 
         // Single Block Machines
diff --git a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
index fbc057f472..2c7f4a64bc 100644
--- a/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
+++ b/src/main/java/gtPlusPlus/core/proxy/ClientProxy.java
@@ -239,7 +239,6 @@ public class ClientProxy extends CommonProxy implements Runnable {
 
     @Override
     public void onLoadComplete(FMLLoadCompleteEvent event) {
-        GTplusplus.tryPatchTurbineTextures();
         if (CORE.ConfigSwitches.hideUniversalCells) {
             hideUniversalCells();
         }
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png
deleted file mode 100644
index e1d4a0f009..0000000000
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png
+++ /dev/null
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta
deleted file mode 100644
index dfae8cae16..0000000000
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/GAS_TURBINE_SIDE_ACTIVE.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "animation":{
-      "frametime":1
-   }
-}
\ No newline at end of file
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png
deleted file mode 100644
index e1d4a0f009..0000000000
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png
+++ /dev/null
diff --git a/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta
deleted file mode 100644
index dfae8cae16..0000000000
--- a/src/main/resources/assets/gregtech/textures/blocks/iconsets/STEAM_TURBINE_SIDE_ACTIVE.png.mcmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-   "animation":{
-      "frametime":1
-   }
-}
\ No newline at end of file