en_us localisation, icon

4 files changed, 11 insertions, 3 deletions

diff --git a/README.md b/README.md
index 6e5e068..dffb0ee 100644
--- a/README.md
+++ b/README.md
@@ -5,4 +5,3 @@ Simple Minecraft mod that displays a bit of extra information in furnaces.
 ## Features
 
 * Displays time remaining and total items smeltable in the furnace UI.
-* Displays the number of items a fuel item can smelt in its tooltip.
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);
diff --git a/src/main/resources/assets/frank/icon.png b/src/main/resources/assets/frank/icon.png
new file mode 100644
index 0000000..78c10d7
--- /dev/null
+++ b/src/main/resources/assets/frank/icon.png
diff --git a/src/main/resources/assets/frank/lang/en_us.json b/src/main/resources/assets/frank/lang/en_us.json
new file mode 100644
index 0000000..9303bff
--- /dev/null
+++ b/src/main/resources/assets/frank/lang/en_us.json
@@ -0,0 +1,4 @@
+{
+  "ui.frank.time_left": "Time remaining: %sm %ss",
+  "ui.frank.smeltable": "Items smeltable: %s"
+}