diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index 975d0aa3e..2c09f10ac 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -70,9 +70,11 @@ public class Botania { @EventHandler public void preInit(FMLPreInitializationEvent event) { try { - if ("1.10".equals(Loader.MC_VERSION)) { + if ("Minecraft 1.10".equals(Loader.instance().getMCVersionString())) { + Botania.LOGGER.info("Enabling proxy for Minecraft 1.10"); crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_110").newInstance(); - } else if ("1.9.4".equals(Loader.MC_VERSION)) { + } else if ("Minecraft 1.9.4".equals(Loader.instance().getMCVersionString())) { + Botania.LOGGER.info("Enabling proxy for Minecraft 1.9.4"); crossVersionProxy = (ICrossVersionProxy) Class.forName("vazkii.botania.common.core.proxy.CrossVersionProxy_19").newInstance(); } else { throw new IllegalStateException("Botania couldn't find a cross version proxy!"); diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java index 05b505de3..17ebd45ac 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_110.java @@ -29,8 +29,9 @@ public class CrossVersionProxy_110 implements ICrossVersionProxy { public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { try { Class gameTypeClazz = Class.forName("net.minecraft.world.GameType"); - Object gameType = from.getCurrentGameType(); - Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); + Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "getCurrentGameType", "func_178889_l", "l" }); + Object gameType = m.invoke(from); + m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); m.invoke(to, gameType); } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} } diff --git a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java index 378b3f3d0..cccf9d8b5 100644 --- a/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java +++ b/src/main/java/vazkii/botania/common/core/proxy/CrossVersionProxy_19.java @@ -29,8 +29,9 @@ public class CrossVersionProxy_19 implements ICrossVersionProxy { public void copyGameType(PlayerControllerMP from, BotaniaPlayerController to) { try { Class gameTypeClazz = Class.forName("net.minecraft.world.WorldSettings.GameType"); - Object gameType = from.getCurrentGameType(); - Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); + Method m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "getCurrentGameType", "func_178889_l", "l" }); + Object gameType = m.invoke(from); + m = ReflectionHelper.findMethod(PlayerControllerMP.class, null, new String[]{ "setGameType", "func_78746_a", "a" }, gameTypeClazz); m.invoke(to, gameType); } catch (IllegalAccessException | InvocationTargetException | ClassNotFoundException ignored) {} }