From 589d5f420ff3b62af17d2d4e11dd3d066a2495e5 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Fri, 27 Jun 2014 19:42:26 +0100 Subject: [PATCH] Recommit update changes that were seemingly lost in a rebase-pull. --- build.properties | 4 ++-- src/main/java/mekanism/client/render/RenderTickHandler.java | 2 +- src/main/java/mekanism/common/voice/VoiceConnection.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.properties b/build.properties index a709473a3..a28a7eee3 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ -minecraft_version=1.7.2 -forge_version=10.12.2.1147 +minecraft_version=1.7.10 +forge_version=10.13.0.1152 FMP_version=1.1.0.288 CCLIB_version=1.1.1.88 NEI_version=1.0.1 diff --git a/src/main/java/mekanism/client/render/RenderTickHandler.java b/src/main/java/mekanism/client/render/RenderTickHandler.java index 586537b8b..0232a461d 100644 --- a/src/main/java/mekanism/client/render/RenderTickHandler.java +++ b/src/main/java/mekanism/client/render/RenderTickHandler.java @@ -81,7 +81,7 @@ public class RenderTickHandler { ItemStack stack = player.getEquipmentInSlot(3); - ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight); int x = scaledresolution.getScaledWidth(); int y = scaledresolution.getScaledHeight(); diff --git a/src/main/java/mekanism/common/voice/VoiceConnection.java b/src/main/java/mekanism/common/voice/VoiceConnection.java index 4e16f9d0a..a68ab4acc 100644 --- a/src/main/java/mekanism/common/voice/VoiceConnection.java +++ b/src/main/java/mekanism/common/voice/VoiceConnection.java @@ -198,6 +198,6 @@ public class VoiceConnection extends Thread public EntityPlayerMP getPlayer() { - return server.getConfigurationManager().getPlayerForUsername(username); + return server.getConfigurationManager().func_152612_a(username); //TODO getPlayerForUsername } }