Remove turbine texture reflection (#439)

* Remove turbine texture reflection

* yeet

4 files changed, 0 insertions, 48 deletions

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();
         }