aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/net
diff options
context:
space:
mode:
authorinyourwalls <inyourwalls@tutanota.com>2023-11-08 00:02:55 -0500
committerinyourwalls <inyourwalls@tutanota.com>2023-11-08 00:02:55 -0500
commit23a2b48a1a5380968d7ddde05ef923a1ed7b53c6 (patch)
tree7deae1e52eeb67b57fbf9e95bd3566853bc3a6ef /src/main/java/net
parent14378dfd528ac0a77901b4d4b4427a43e3c6870a (diff)
en_us localisation, icon
Diffstat (limited to 'src/main/java/net')
-rw-r--r--src/main/java/net/inyourwalls/frank/Frank.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/main/java/net/inyourwalls/frank/Frank.java b/src/main/java/net/inyourwalls/frank/Frank.java
index 1bb03bc..5b5166d 100644
--- a/src/main/java/net/inyourwalls/frank/Frank.java
+++ b/src/main/java/net/inyourwalls/frank/Frank.java
@@ -38,11 +38,12 @@ public class Frank implements ClientModInitializer {
handler.getSlot(CRAFTING_SLOT_INDEX).getStack().getCount(),
handler.getCookProgress(),
handler.getSlot(FUEL_SLOT_INDEX).getStack(),
+ handler.getFuelProgress(),
1
);
});
} else if (screen instanceof BlastFurnaceScreen furnace) {
- ScreenEvents.afterRender(screen).register((_s, drawContext, mouseX, mouseY, tickDelta) -> {
+ ScreenEvents.afterRender(screen).register((_s, drawContext, mouseX, mouseY, tickDelta) -> { // bleh
BlastFurnaceScreenHandler handler = furnace.getScreenHandler();
renderInfoLines(
screen,
@@ -51,6 +52,7 @@ public class Frank implements ClientModInitializer {
handler.getSlot(CRAFTING_SLOT_INDEX).getStack().getCount(),
handler.getCookProgress(),
handler.getSlot(FUEL_SLOT_INDEX).getStack(),
+ handler.getFuelProgress(),
2
);
});
@@ -64,6 +66,7 @@ public class Frank implements ClientModInitializer {
handler.getSlot(CRAFTING_SLOT_INDEX).getStack().getCount(),
handler.getCookProgress(),
handler.getSlot(FUEL_SLOT_INDEX).getStack(),
+ handler.getFuelProgress(),
2
);
});
@@ -82,6 +85,7 @@ public class Frank implements ClientModInitializer {
int itemsInProgress,
float cookProgress,
ItemStack fuel,
+ float fuelProgress,
int speedMultiplier
) {
// Determine where to start drawing the information.
@@ -97,7 +101,8 @@ public class Frank implements ClientModInitializer {
Integer fuelTicks = FuelRegistry.INSTANCE.get(fuel.getItem());
// Avoid null pointer exception because Java is terrible.
if (fuelTicks == null) fuelTicks = 0;
- int itemsSmeltable = ((fuelTicks / 10) * fuelCount) / 20;
+ int burningFuel = (int)((float)(fuelTicks / 10) * fuelProgress);
+ int itemsSmeltable = (((fuelTicks / 10) * fuelCount) / 20) + (burningFuel / 20);
context.drawTextWithShadow(renderer, Text.translatable("ui.frank.time_left", minutesLeft, secondsLeft), infoX, infoY, WHITE);
context.drawTextWithShadow(renderer, Text.translatable("ui.frank.smeltable", itemsSmeltable), infoX, infoY + 10, WHITE);