GT++ ASM Cleanup (#3238)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

1 files changed, 7 insertions, 12 deletions

diff --git a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
index aa81a0378c..8395f7b3f7 100644
--- a/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
+++ b/src/main/java/gtPlusPlus/plugin/fixes/vanilla/VanillaBedHeightFix.java
@@ -9,11 +9,11 @@ import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
 
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
+import gregtech.asm.GTCorePlugin;
 import gtPlusPlus.api.interfaces.IPlugin;
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
 import gtPlusPlus.plugin.fixes.interfaces.IBugFix;
-import gtPlusPlus.preloader.PreloaderCore;
 
 // TODO move this as a mixin in hodgepodge
 public class VanillaBedHeightFix implements IBugFix {
@@ -23,17 +23,12 @@ public class VanillaBedHeightFix implements IBugFix {
 
     public VanillaBedHeightFix(IPlugin minstance) {
         mParent = minstance;
-        Method m;
-        if (!PreloaderCore.DEV_ENVIRONMENT) {
-            m = ReflectionUtils.getMethod(EntityPlayer.class, "func_71018_a", int.class, int.class, int.class);
-        } else {
-            m = ReflectionUtils.getMethod(
-                net.minecraft.entity.player.EntityPlayer.class,
-                "sleepInBedAt",
-                int.class,
-                int.class,
-                int.class);
-        }
+        Method m = ReflectionUtils.getMethod(
+            EntityPlayer.class,
+            GTCorePlugin.isDevEnv() ? "sleepInBedAt" : "func_71018_a",
+            int.class,
+            int.class,
+            int.class);
         if (m != null) {
             mSleepInBedAt = m;
             mParent.log("Registering Bed Height Fix.");