diff --git a/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java index e5441fce9..11ef933fc 100755 --- a/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/gui/MainMenuEventHandler.java @@ -20,7 +20,7 @@ public class MainMenuEventHandler { GuiMainMenu mainMenu = (GuiMainMenu)event.gui; - BOPReflectionHelper.setPrivateFinalValue(GuiMainMenu.class, mainMenu, bopTitlePanoramaPaths, "titlePanoramaPaths", "titlePanoramaPaths"); + BOPReflectionHelper.setPrivateFinalValue(GuiMainMenu.class, mainMenu, bopTitlePanoramaPaths, "titlePanoramaPaths", "field_73978_o"); } } } diff --git a/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java b/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java index 43202489f..dc02c0f4d 100755 --- a/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java +++ b/src/main/java/biomesoplenty/common/helpers/BOPReflectionHelper.java @@ -8,37 +8,11 @@ import cpw.mods.fml.relauncher.CoreModManager; import cpw.mods.fml.relauncher.ReflectionHelper; public class BOPReflectionHelper -{ - public static boolean isDeobfuscated = ReflectionHelper.getPrivateValue(CoreModManager.class, null, "deobfuscatedEnvironment"); - - public static T getPrivateValue(Class classToAccess, E instance, String fieldName, String obfFieldName) - { - if (isDeobfuscated) - { - return ReflectionHelper.getPrivateValue(classToAccess, instance, fieldName); - } - else - { - return ObfuscationReflectionHelper.getPrivateValue(classToAccess, instance, obfFieldName); - } - } - - public static void setPrivateValue(Class classToAccess, T instance, E value, String fieldName, String obfFieldName) - { - if (isDeobfuscated) - { - ReflectionHelper.setPrivateValue(classToAccess, instance, value, fieldName); - } - else - { - ObfuscationReflectionHelper.setPrivateValue(classToAccess, instance, value, obfFieldName); - } - } - +{ public static void setPrivateFinalValue(Class classToAccess, T instance, E value, String... fieldNames) { Field field = ReflectionHelper.findField(classToAccess, ObfuscationReflectionHelper.remapFieldNames(classToAccess.getName(), fieldNames)); - + try { Field modifiersField = Field.class.getDeclaredField("modifiers");