diff --git a/gradle.properties b/gradle.properties index 266f12eea..ab9d1f9aa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ mcversion=1.7.10 forgeversion=10.13.4.1566-1.7.10 version_major=4 version_minor=2 -version_patch=4 +version_patch=5 diff --git a/src/main/java/forestry/core/TickHandlerCoreClient.java b/src/main/java/forestry/core/TickHandlerCoreClient.java index 723648008..7646361b8 100755 --- a/src/main/java/forestry/core/TickHandlerCoreClient.java +++ b/src/main/java/forestry/core/TickHandlerCoreClient.java @@ -10,13 +10,14 @@ ******************************************************************************/ package forestry.core; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderGlobal; import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.common.gameevent.TickEvent; import cpw.mods.fml.common.gameevent.TickEvent.Phase; -import cpw.mods.fml.common.gameevent.TickEvent.PlayerTickEvent; -import forestry.core.proxy.Proxies; import forestry.core.utils.GeneticsUtil; public class TickHandlerCoreClient { @@ -24,18 +25,30 @@ public class TickHandlerCoreClient { private boolean hasNaturalistEye; @SubscribeEvent - public void onPlayerTick(PlayerTickEvent event) { + public void onClientTick(TickEvent.ClientTickEvent event) { if (event.phase != Phase.END) { return; } - EntityPlayer player = event.player; + Minecraft minecraft = Minecraft.getMinecraft(); + if (minecraft == null) { + return; + } + + EntityPlayer player = minecraft.thePlayer; + if (player == null) { + return; + } + boolean hasNaturalistEye = GeneticsUtil.hasNaturalistEye(player); if (this.hasNaturalistEye != hasNaturalistEye) { this.hasNaturalistEye = hasNaturalistEye; - Proxies.common.getClientInstance().renderGlobal.markBlockRangeForRenderUpdate( - (int) player.posX - 32, (int) player.posY - 32, (int) player.posZ - 32, - (int) player.posX + 32, (int) player.posY + 32, (int) player.posZ + 32); + RenderGlobal renderGlobal = minecraft.renderGlobal; + if (renderGlobal != null) { + renderGlobal.markBlockRangeForRenderUpdate( + (int) player.posX - 32, (int) player.posY - 32, (int) player.posZ - 32, + (int) player.posX + 32, (int) player.posY + 32, (int) player.posZ + 32); + } } } }