From f5d6175bc309fd7466fdf7f4de1697dcb7ee8f97 Mon Sep 17 00:00:00 2001 From: inyourwalls Date: Thu, 11 Jul 2024 16:56:37 -0400 Subject: fix overlapping text & wrong values --- build.gradle.kts | 2 +- src/main/java/net/inyourwalls/frank/ScreenEventHandler.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a37f91c..d06009b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } val minecraftVersion = "1.21" -version = "1.0.1+$minecraftVersion" +version = "1.0.2+$minecraftVersion" group = "net.inyourwalls" repositories { diff --git a/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java b/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java index cc12575..11c6514 100644 --- a/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java +++ b/src/main/java/net/inyourwalls/frank/ScreenEventHandler.java @@ -50,7 +50,7 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent case ITEMS_SMELTABLE_FIRST -> { renderItemsSmeltable(drawContext, x, y); - renderTimeLeft(drawContext, secondsLeft, x, y); + renderTimeLeft(drawContext, secondsLeft, x, y + 10); } case ITEMS_SMELTABLE_ONLY -> { @@ -90,8 +90,8 @@ public class ScreenEventHandler implements ScreenEvents.AfterRender, ScreenEvent if (availableFuelTicks == null) availableFuelTicks = 0; availableFuelTicks *= fuel.getCount(); int remainingFuelTicks = availableFuelTicks + (this.screenHandler.isBurning() ? this.screenHandler.getRemainingFuelTicks() : 0); - int totalCookingTicks = this.screenHandler.getTotalCookingTicks() <= 0 ? 200 : this.screenHandler.getTotalCookingTicks(); - this.itemsSmeltable = remainingFuelTicks / totalCookingTicks; + // forcibly divide by 200gt when not cooking to avoid wrong count + this.itemsSmeltable = remainingFuelTicks / (this.screenHandler.isBurning() ? this.screenHandler.getTotalCookingTicks() : 200); int totalTicks = this.screenHandler.getSlot(CRAFTING_SLOT_INDEX).getStack().getCount() * this.screenHandler.getTotalCookingTicks(); this.ticksLeft = totalTicks - this.screenHandler.getCurrentCookingTicks(); -- cgit v1.3.1