backport 0.1.1 to 1.20.1

3 files changed, 14 insertions, 6 deletions

diff --git a/src/main/java/net/inyourwalls/frank/Frank.java b/src/main/java/net/inyourwalls/frank/Frank.java
index 1a0451a..3ac8f09 100644
--- a/src/main/java/net/inyourwalls/frank/Frank.java
+++ b/src/main/java/net/inyourwalls/frank/Frank.java
@@ -6,7 +6,6 @@ import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.registry.FuelRegistry;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.screen.ingame.AbstractFurnaceScreen;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.AbstractFurnaceScreenHandler;
@@ -31,7 +30,7 @@ public class Frank implements ClientModInitializer {
           AbstractFurnaceScreenHandler handler = (AbstractFurnaceScreenHandler) furnace.getScreenHandler();
           int speedMultiplier = (handler instanceof BlastFurnaceScreenHandler || handler instanceof SmokerScreenHandler) ? 2 : 1;
           renderInfoLines(
-            screen, 
+            furnace, 
             drawContext, 
             client.textRenderer, 
             handler.getSlot(CRAFTING_SLOT_INDEX).getStack().getCount(),
@@ -50,7 +49,7 @@ public class Frank implements ClientModInitializer {
   * Renders the info lines on the given screen.
   */
   private void renderInfoLines(
-    Screen screen, 
+    AbstractFurnaceScreen<?> screen,
     DrawContext context, 
     TextRenderer renderer, 
     int itemsInProgress,
@@ -62,6 +61,9 @@ public class Frank implements ClientModInitializer {
     // Determine where to start drawing the information.
     int infoX = screen.width / 2 + 90;
     int infoY = screen.height / 2 - 80;
+    if (screen.recipeBook.isOpen()) {
+      infoX += 77;
+    }
     
     int smeltingSpeed = 10 / speedMultiplier; // this code sucks, but i don't care.
     int secondsLeft = itemsInProgress * smeltingSpeed - (int)(cookProgress * smeltingSpeed);
diff --git a/src/main/resources/assets/frank/lang/en_us.json b/src/main/resources/assets/frank/lang/en_us.json
index 9303bff..ca2862d 100644
--- a/src/main/resources/assets/frank/lang/en_us.json
+++ b/src/main/resources/assets/frank/lang/en_us.json
@@ -1,4 +1,5 @@
 {
   "ui.frank.time_left": "Time remaining: %sm %ss",
-  "ui.frank.smeltable": "Items smeltable: %s"
+  "ui.frank.smeltable": "Items smeltable: %s",
+  "frank.matrix": "Matrix"
 }
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 255a414..047001e 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -27,10 +27,15 @@
     "minecraft": "1.20.1",
     "java": ">=17"
   },
+  "suggests": {},
   "custom": {
+    "modmenu": {
+      "links": {
+        "frank.matrix": "https://matrix.to/#/#mod-support:inyourwalls.net"
+      }
+    },
     "loom:injected_interfaces": {
       "net/minecraft/class_1720": ["net/inyourwalls/frank/FurnaceProgressPercentGetter"]
     }
-  },
-  "suggests": {}
+  }
 }