Fix crash when opening terminal: replace removed drawSlotText with inlined GuiGraphicsExtractor calls

Agent-Logs-Url: https://github.com/CyclopsMC/IntegratedTerminals/sessions/9cc5d25d-d22a-49c1-a9ee-2fcd472e5264

Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>

Author: Copilot

gradle.properties

@@ -29,7 +29,7 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Dependencies
-cyclopscore_version=1.25.5-974
+cyclopscore_version=1.29.0-984
 integrateddynamics_version=1.24.1-1707
 integratedterminalscompat_version=1.0.0-162
 integratedcrafting_version=1.1.13-545

src/main/java/org/cyclops/integratedterminals/capability/ingredient/IngredientComponentTerminalStorageHandlerEnergyClient.java

@@ -6,7 +6,6 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.renderer.RenderPipelines;
 import net.minecraft.network.chat.Component;
-import org.cyclops.cyclopscore.client.gui.GuiGraphicsExtended;
 import org.cyclops.cyclopscore.helper.IGuiHelpers;
 import org.cyclops.cyclopscore.helper.IModHelpers;
 import org.cyclops.integratedterminals.api.ingredient.IIngredientComponentTerminalStorageHandlerClient;
@@ -53,8 +52,12 @@ public void drawInstance(GuiGraphicsExtractor guiGraphics, Long instance, long m
                         16, 240, IGuiHelpers.ProgressDirection.UP, progressScaled, progressMaxScaled);
 
                 // Draw amount
-                GuiGraphicsExtended renderItem = new GuiGraphicsExtended(guiGraphics);
-                renderItem.drawSlotText(Minecraft.getInstance().font, label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance), x, y);
+                float scale = 0.5f;
+                guiGraphics.pose().pushMatrix();
+                guiGraphics.pose().scale(scale, scale);
+                String amountLabel = label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance);
+                guiGraphics.text(Minecraft.getInstance().font, amountLabel, (int) ((x + 17) / scale - Minecraft.getInstance().font.width(amountLabel)), (int) ((y + 12) / scale), -1, true);
+                guiGraphics.pose().popMatrix();
             } else {
                 IModHelpers.get().getGuiHelpers().renderTooltip(gui, guiGraphics, x, y, IModHelpers.get().getGuiHelpers().getSlotSizeInner(), IModHelpers.get().getGuiHelpers().getSlotSizeInner(),
                         mouseX, mouseY, () -> {

src/main/java/org/cyclops/integratedterminals/capability/ingredient/IngredientComponentTerminalStorageHandlerFluidStackClient.java

@@ -9,7 +9,6 @@
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.network.chat.Style;
 import net.neoforged.neoforge.fluids.FluidStack;
-import org.cyclops.cyclopscore.client.gui.GuiGraphicsExtended;
 import org.cyclops.cyclopscore.helper.IModHelpers;
 import org.cyclops.cyclopscore.helper.IModHelpersNeoForge;
 import org.cyclops.integratedterminals.api.ingredient.IIngredientComponentTerminalStorageHandlerClient;
@@ -43,8 +42,12 @@ public void drawInstance(GuiGraphicsExtractor guiGraphics, FluidStack instance,
                 IModHelpersNeoForge.get().getGuiHelpers().renderFluidSlot(guiGraphics, instance, x, y);
 
                 // Draw amount
-                GuiGraphicsExtended renderItem = new GuiGraphicsExtended(guiGraphics);
-                renderItem.drawSlotText(Minecraft.getInstance().font, label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance.getAmount()), x, y);
+                float scale = 0.5f;
+                guiGraphics.pose().pushMatrix();
+                guiGraphics.pose().scale(scale, scale);
+                String amountLabel = label != null ? label : IModHelpers.get().getGuiHelpers().quantityToScaledString(instance.getAmount());
+                guiGraphics.text(Minecraft.getInstance().font, amountLabel, (int) ((x + 17) / scale - Minecraft.getInstance().font.width(amountLabel)), (int) ((y + 12) / scale), -1, true);
+                guiGraphics.pose().popMatrix();
             } else {
                 IModHelpers.get().getGuiHelpers().renderTooltip(gui, guiGraphics, x, y, IModHelpers.get().getGuiHelpers().getSlotSizeInner(), IModHelpers.get().getGuiHelpers().getSlotSizeInner(), mouseX, mouseY, () -> {
                     List<Component> lines = Lists.newArrayList();

src/main/java/org/cyclops/integratedterminals/core/terminalstorage/slot/TerminalStorageSlotIngredientCraftingOption.java

@@ -8,7 +8,6 @@
 import net.minecraft.network.chat.Component;
 import org.cyclops.commoncapabilities.api.ingredient.IIngredientMatcher;
 import org.cyclops.commoncapabilities.api.ingredient.IngredientComponent;
-import org.cyclops.cyclopscore.client.gui.GuiGraphicsExtended;
 import org.cyclops.cyclopscore.helper.IModHelpers;
 import org.cyclops.integratedterminals.api.ingredient.IIngredientComponentTerminalStorageHandler;
 import org.cyclops.integratedterminals.api.terminalstorage.ITerminalStorageTabClient;
@@ -72,8 +71,12 @@ public HandlerWrappedTerminalCraftingOption<T> getCraftingOption() {
     }
 
     private void drawCraftLabel(GuiGraphicsExtractor guiGraphics, int x, int y) {
-        new GuiGraphicsExtended(guiGraphics).drawSlotText(Minecraft.getInstance().font,
-                ChatFormatting.GOLD + IModHelpers.get().getL10NHelpers().localize("gui.integratedterminals.terminal_storage.craft"), x, y - 11);
+        String text = ChatFormatting.GOLD + IModHelpers.get().getL10NHelpers().localize("gui.integratedterminals.terminal_storage.craft");
+        float scale = 0.5f;
+        guiGraphics.pose().pushMatrix();
+        guiGraphics.pose().scale(scale, scale);
+        guiGraphics.text(Minecraft.getInstance().font, text, (int) ((x + 17) / scale - Minecraft.getInstance().font.width(text)), (int) ((y + 1) / scale), -1, true);
+        guiGraphics.pose().popMatrix();
     }
 
 }