From d75dbd66c9e17a7c8354101aef93ddf5d3682f74 Mon Sep 17 00:00:00 2001
From: bruberu <80226372+bruberu@users.noreply.github.com>
Date: Fri, 26 Jul 2024 23:27:29 -0500
Subject: [PATCH] fix: JEI pages + GUI scaling

---
 .../jei/basic/CoolantCategory.java            | 38 +---------------
 .../integration/jei/basic/CoolantInfo.java    | 45 +++++++++++++++++++
 .../jei/basic/FissionFuelCategory.java        | 28 ------------
 .../jei/basic/FissionFuelInfo.java            | 41 +++++++++++++++++
 4 files changed, 88 insertions(+), 64 deletions(-)

diff --git a/src/main/java/gregtech/integration/jei/basic/CoolantCategory.java b/src/main/java/gregtech/integration/jei/basic/CoolantCategory.java
index 37a2f4282f0..2e1b6a1c66c 100644
--- a/src/main/java/gregtech/integration/jei/basic/CoolantCategory.java
+++ b/src/main/java/gregtech/integration/jei/basic/CoolantCategory.java
@@ -21,11 +21,6 @@ public class CoolantCategory extends BasicRecipeCategory<CoolantInfo, CoolantInf
     private final IDrawable icon;
     protected final IDrawable slot;
     private final IDrawable arrow;
-    private String temps;
-    private String heatCapacity;
-    private String heatTransfer;
-    private String moderation;
-    private String hydrogen;
 
     public CoolantCategory(IGuiHelper guiHelper) {
         super("coolant", "fission.coolant.name", guiHelper.createBlankDrawable(176, 90), guiHelper);
@@ -51,23 +46,6 @@ public void setRecipe(IRecipeLayout recipeLayout, CoolantInfo recipeWrapper, IIn
         fluidStackGroup.set(0, recipeWrapper.coolant);
         fluidStackGroup.init(1, true, 105, 9);
         fluidStackGroup.set(1, recipeWrapper.hotCoolant);
-
-        ICoolantStats coolant = CoolantRegistry.getCoolant(recipeWrapper.coolant.getFluid());
-
-        temps = I18n.format("gregtech.coolant.exit_temp",
-                coolant.getHotCoolant().getTemperature());
-        heatCapacity = I18n.format("gregtech.coolant.heat_capacity",
-                coolant.getSpecificHeatCapacity());
-        heatTransfer = I18n.format(I18n.format("gregtech.coolant.cooling_factor",
-                coolant.getCoolingFactor()));
-        moderation = I18n.format("gregtech.coolant.moderation_factor",
-                coolant.getModeratorFactor());
-
-        if (coolant.accumulatesHydrogen()) {
-            hydrogen = I18n.format("gregtech.coolant.accumulates_hydrogen");
-        } else {
-            hydrogen = "";
-        }
     }
 
     @Override
@@ -75,22 +53,10 @@ public void drawExtras(Minecraft minecraft) {
         slot.draw(minecraft, 54, 8);
         slot.draw(minecraft, 104, 8);
         arrow.draw(minecraft, 77, 6);
-
-        int start = 40;
-        int linesDrawn = 0;
-        minecraft.fontRenderer.drawString(temps, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        minecraft.fontRenderer.drawString(heatCapacity, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        minecraft.fontRenderer.drawString(heatTransfer, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        minecraft.fontRenderer.drawString(moderation, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        if (hydrogen.length() > 0) {
-            minecraft.fontRenderer.drawString(hydrogen, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        }
     }
 
+
+
     @Override
     public IRecipeWrapper getRecipeWrapper(CoolantInfo recipe) {
         return recipe;
diff --git a/src/main/java/gregtech/integration/jei/basic/CoolantInfo.java b/src/main/java/gregtech/integration/jei/basic/CoolantInfo.java
index 4985be53cb3..8bb84655131 100644
--- a/src/main/java/gregtech/integration/jei/basic/CoolantInfo.java
+++ b/src/main/java/gregtech/integration/jei/basic/CoolantInfo.java
@@ -1,5 +1,10 @@
 package gregtech.integration.jei.basic;
 
+import gregtech.api.nuclear.fission.CoolantRegistry;
+import gregtech.api.nuclear.fission.ICoolantStats;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -12,9 +17,29 @@ public class CoolantInfo implements IRecipeWrapper {
     public FluidStack coolant;
     public FluidStack hotCoolant;
 
+    private String temps;
+    private String heatCapacity;
+    private String heatTransfer;
+    private String moderation;
+    private String hydrogen;
+
     public CoolantInfo(Fluid coolant, Fluid hotCoolant) {
         this.coolant = new FluidStack(coolant, 1000);
         this.hotCoolant = new FluidStack(hotCoolant, 1000);
+
+        ICoolantStats stats = CoolantRegistry.getCoolant(this.coolant.getFluid());
+
+        temps = I18n.format("gregtech.coolant.exit_temp",
+                stats.getHotCoolant().getTemperature());
+        heatCapacity = I18n.format("gregtech.coolant.heat_capacity",
+                stats.getSpecificHeatCapacity());
+        heatTransfer = I18n.format(I18n.format("gregtech.coolant.cooling_factor",
+                stats.getCoolingFactor()));
+        moderation = I18n.format("gregtech.coolant.moderation_factor",
+                stats.getModeratorFactor());
+        if (stats.accumulatesHydrogen()) {
+            hydrogen = I18n.format("gregtech.coolant.accumulates_hydrogen");
+        }
     }
 
     @Override
@@ -22,4 +47,24 @@ public void getIngredients(IIngredients ingredients) {
         ingredients.setInput(VanillaTypes.FLUID, coolant);
         ingredients.setOutput(VanillaTypes.FLUID, hotCoolant);
     }
+
+    @Override
+    public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+        int fontHeight = Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT;
+
+        int start = 40;
+        int linesDrawn = 0;
+        minecraft.fontRenderer.drawString(temps, 0, fontHeight * linesDrawn + start, 0x111111);
+        linesDrawn++;
+        minecraft.fontRenderer.drawString(heatCapacity, 0, fontHeight * linesDrawn + start, 0x111111);
+        linesDrawn++;
+        minecraft.fontRenderer.drawString(heatTransfer, 0, fontHeight * linesDrawn + start, 0x111111);
+        linesDrawn++;
+        minecraft.fontRenderer.drawString(moderation, 0, fontHeight * linesDrawn + start, 0x111111);
+        linesDrawn++;
+
+        if (hydrogen != null) {
+            minecraft.fontRenderer.drawString(hydrogen, 0, fontHeight * linesDrawn + start, 0x111111);
+        }
+    }
 }
diff --git a/src/main/java/gregtech/integration/jei/basic/FissionFuelCategory.java b/src/main/java/gregtech/integration/jei/basic/FissionFuelCategory.java
index e91f7ebcd84..516e5165306 100644
--- a/src/main/java/gregtech/integration/jei/basic/FissionFuelCategory.java
+++ b/src/main/java/gregtech/integration/jei/basic/FissionFuelCategory.java
@@ -21,11 +21,6 @@ public class FissionFuelCategory extends BasicRecipeCategory<FissionFuelInfo, Fi
     private final IDrawable icon;
     protected final IDrawable slot;
     private final IDrawable arrow;
-    private String duration;
-    private String maxTemp;
-    private String crossSectionFast;
-    private String crossSectionSlow;
-    private String neutronGenerationTime;
 
     public FissionFuelCategory(IGuiHelper guiHelper) {
         super("fission_fuel", "fission.fuel.name", guiHelper.createBlankDrawable(176, 90), guiHelper);
@@ -51,18 +46,6 @@ public void setRecipe(IRecipeLayout recipeLayout, FissionFuelInfo recipeWrapper,
         itemStackGroup.set(0, recipeWrapper.rod);
         itemStackGroup.init(1, true, 104, 8);
         itemStackGroup.set(1, recipeWrapper.depletedRod);
-
-        IFissionFuelStats prop = FissionFuelRegistry.getFissionFuel(recipeWrapper.rod);
-
-        duration = I18n.format("metaitem.nuclear.tooltip.duration", prop.getDuration());
-        maxTemp = I18n.format("metaitem.nuclear.tooltip.temperature", prop.getMaxTemperature());
-        crossSectionFast = I18n.format("metaitem.nuclear.tooltip.cross_section_fast",
-                prop.getFastNeutronFissionCrossSection());
-        crossSectionSlow = I18n.format("metaitem.nuclear.tooltip.cross_section_slow",
-                prop.getSlowNeutronFissionCrossSection());
-        neutronGenerationTime = I18n.format(
-                "metaitem.nuclear.tooltip.neutron_time." + prop.getNeutronGenerationTimeCategory(),
-                prop.getNeutronGenerationTime());
     }
 
     @Override
@@ -71,17 +54,6 @@ public void drawExtras(Minecraft minecraft) {
         slot.draw(minecraft, 104, 8);
         arrow.draw(minecraft, 77, 6);
 
-        int start = 40;
-        int linesDrawn = 0;
-        minecraft.fontRenderer.drawString(duration, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        minecraft.fontRenderer.drawString(maxTemp, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        minecraft.fontRenderer.drawString(crossSectionFast, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        minecraft.fontRenderer.drawString(crossSectionSlow, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
-        linesDrawn++;
-        minecraft.fontRenderer.drawString(neutronGenerationTime, 0, FONT_HEIGHT * linesDrawn + start, 0x111111);
     }
 
     @Override
diff --git a/src/main/java/gregtech/integration/jei/basic/FissionFuelInfo.java b/src/main/java/gregtech/integration/jei/basic/FissionFuelInfo.java
index 9dc7e0d1b30..1d120e7902f 100644
--- a/src/main/java/gregtech/integration/jei/basic/FissionFuelInfo.java
+++ b/src/main/java/gregtech/integration/jei/basic/FissionFuelInfo.java
@@ -1,5 +1,10 @@
 package gregtech.integration.jei.basic;
 
+import gregtech.api.nuclear.fission.FissionFuelRegistry;
+import gregtech.api.nuclear.fission.IFissionFuelStats;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 
 import mezz.jei.api.ingredients.IIngredients;
@@ -11,9 +16,27 @@ public class FissionFuelInfo implements IRecipeWrapper {
     public ItemStack rod;
     public ItemStack depletedRod;
 
+    private String duration;
+    private String maxTemp;
+    private String crossSectionFast;
+    private String crossSectionSlow;
+    private String neutronGenerationTime;
+
     public FissionFuelInfo(ItemStack rod, ItemStack depletedRod) {
         this.rod = rod;
         this.depletedRod = depletedRod;
+
+        IFissionFuelStats prop = FissionFuelRegistry.getFissionFuel(rod);
+
+        duration = I18n.format("metaitem.nuclear.tooltip.duration", prop.getDuration());
+        maxTemp = I18n.format("metaitem.nuclear.tooltip.temperature", prop.getMaxTemperature());
+        crossSectionFast = I18n.format("metaitem.nuclear.tooltip.cross_section_fast",
+                prop.getFastNeutronFissionCrossSection());
+        crossSectionSlow = I18n.format("metaitem.nuclear.tooltip.cross_section_slow",
+                prop.getSlowNeutronFissionCrossSection());
+        neutronGenerationTime = I18n.format(
+                "metaitem.nuclear.tooltip.neutron_time." + prop.getNeutronGenerationTimeCategory(),
+                prop.getNeutronGenerationTime());
     }
 
     @Override
@@ -21,4 +44,22 @@ public void getIngredients(IIngredients ingredients) {
         ingredients.setInput(VanillaTypes.ITEM, rod);
         ingredients.setOutput(VanillaTypes.ITEM, depletedRod);
     }
+
+    @Override
+    public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) {
+        int fontHeight = Minecraft.getMinecraft().fontRenderer.FONT_HEIGHT;
+
+        int start = 40;
+        int linesDrawn = 0;
+        minecraft.fontRenderer.drawString(duration, 0, start, 0x111111);
+        linesDrawn++;
+        minecraft.fontRenderer.drawString(maxTemp, 0, fontHeight * linesDrawn + start, 0x111111);
+        linesDrawn++;
+        minecraft.fontRenderer.drawString(crossSectionFast, 0, fontHeight * linesDrawn + start, 0x111111);
+        linesDrawn++;
+        minecraft.fontRenderer.drawString(crossSectionSlow, 0, fontHeight * linesDrawn + start, 0x111111);
+        linesDrawn++;
+        minecraft.fontRenderer.drawString(neutronGenerationTime, 0, fontHeight * linesDrawn + start, 0x111111);
+
+    }
 }