From 205a6feab5ea757f835a40025e4dac5ca87c0818 Mon Sep 17 00:00:00 2001 From: "Aidan C. Brady" Date: Thu, 26 Jun 2014 23:43:35 -0400 Subject: [PATCH] Revert "Update to 1.7.10. Thanks for getting the API stuff set up, @unpairedbracket, I'm using Forge 1152 now." This reverts commit 604f138f716ec9166854b6590328b81d0f9dd1aa. --- 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 897d04169..5d630b540 100644 --- a/build.properties +++ b/build.properties @@ -1,5 +1,5 @@ -minecraft_version=1.7.10 -forge_version=10.13.0.1152 +minecraft_version=1.7.2 +forge_version=10.12.2.1121 FMP_version=1.1.0.288 CCLIB_version=1.1.1.87 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 0232a461d..586537b8b 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, mc.displayWidth, mc.displayHeight); + ScaledResolution scaledresolution = new ScaledResolution(mc.gameSettings, 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 5f55026f2..4e16f9d0a 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().func_152612_a(username); //getPlayerForUsername TODO + return server.getConfigurationManager().getPlayerForUsername(username); } }