From aaf540127f2c5cdd97628afdcf04199f1f32b892 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 3 Nov 2015 22:04:41 +0000 Subject: [PATCH] Fixed the Lexica Botania Quick Lookup time being dependant on fps, also made it 1 second rather than 1.5. --- .../core/handler/ClientTickHandler.java | 22 +++++++++++++------ .../TooltipAdditionDisplayHandler.java | 2 +- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java index 5b83bb424..570cec57a 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ClientTickHandler.java @@ -38,16 +38,22 @@ public class ClientTickHandler { public static int ticksInGame = 0; public static float partialTicks = 0; public static float delta = 0; + public static float total = 0; + private void calcDelta() { + float oldTotal = total; + total = ticksInGame + partialTicks; + delta = total - oldTotal; + } + @SubscribeEvent public void renderTick(RenderTickEvent event) { - if(event.phase == Phase.START) { - float newPartialTicks = event.renderTickTime; - float newTotalTime = ticksInGame + newPartialTicks; - float oldTotalTime = ticksInGame + partialTicks; - delta = Math.abs(newTotalTime - oldTotalTime); - partialTicks = newPartialTicks; - } else TooltipAdditionDisplayHandler.render(); + if(event.phase == Phase.START) + partialTicks = event.renderTickTime; + else { + TooltipAdditionDisplayHandler.render(); + calcDelta(); + } } @SubscribeEvent @@ -100,6 +106,8 @@ public class ClientTickHandler { ticksWithLexicaOpen--; } } + + calcDelta(); } } diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 9c261db50..17eee9cd9 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -110,7 +110,7 @@ public final class TooltipAdditionDisplayHandler { int cx = x + 8; int cy = y + 8; float r = 12; - float time = 30F; + float time = 20F; float angles = lexiconLookupTime / time * 360F; GL11.glDisable(GL11.GL_LIGHTING);