From e8ab5c6ab311a36614720dad33ffc3e9b1e1a0c1 Mon Sep 17 00:00:00 2001 From: unix-supremacist <100294596+unix-supremacist@users.noreply.github.com> Date: Tue, 10 Feb 2026 16:49:14 -0600 Subject: [PATCH 1/2] remove cofhcore dep --- dependencies.gradle | 2 +- .../java/com/glodblock/github/FluidCraft.java | 2 +- .../github/client/gui/GuiLevelMaintainer.java | 76 ++++++++++++++----- 3 files changed, 60 insertions(+), 20 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 513ed1d5e..6c53b4488 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -36,7 +36,7 @@ dependencies { api('com.github.GTNewHorizons:NotEnoughItems:2.8.60-GTNH:dev') api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-817-GTNH:dev') - api('curse.maven:cofh-core-69162:2388751') + api('curse.maven:cofh-lib-220333:2388747') api('com.github.GTNewHorizons:waila:1.19.21:dev') api("com.github.GTNewHorizons:GTNHLib:0.9.10:dev") diff --git a/src/main/java/com/glodblock/github/FluidCraft.java b/src/main/java/com/glodblock/github/FluidCraft.java index 90d7aaa69..1728a0c70 100644 --- a/src/main/java/com/glodblock/github/FluidCraft.java +++ b/src/main/java/com/glodblock/github/FluidCraft.java @@ -24,7 +24,7 @@ modid = FluidCraft.MODID, version = FluidCraft.VERSION, name = FluidCraft.MODNAME, - dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);required-after:CoFHCore;after:waila;after:thaumicenergistics;after:ae2wct") + dependencies = "required-after:appliedenergistics2@[rv3-beta-238,);after:waila;after:thaumicenergistics;after:ae2wct") public class FluidCraft { public static final String MODID = "ae2fc"; diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java index f5c78a3fe..8ad286a1e 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -1,10 +1,12 @@ package com.glodblock.github.client.gui; +import java.lang.reflect.Method; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.util.ResourceLocation; @@ -30,7 +32,6 @@ import appeng.client.gui.widgets.GuiTabButton; import appeng.util.calculators.ArithHelper; import appeng.util.calculators.Calculator; -import cofh.core.render.CoFHFontRenderer; public class GuiLevelMaintainer extends GuiSub { @@ -39,14 +40,14 @@ public class GuiLevelMaintainer extends GuiSub { private final Component[] component = new Component[TileLevelMaintainer.REQ_COUNT]; private final MouseRegionManager mouseRegions = new MouseRegionManager(this); private Widget focusedWidget; - private final CoFHFontRenderer render; + private final FontRenderer render; public GuiLevelMaintainer(InventoryPlayer ipl, TileLevelMaintainer tile) { super(new ContainerLevelMaintainer(ipl, tile)); this.cont = (ContainerLevelMaintainer) inventorySlots; this.xSize = 195; this.ySize = 214; - this.render = new CoFHFontRenderer( + this.render = new FontRenderer( Minecraft.getMinecraft().gameSettings, TEX_BG, Minecraft.getMinecraft().getTextureManager(), @@ -366,8 +367,20 @@ public void draw() { } else { message.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE)); } - this.line.setMessage( - render.wrapFormattedStringToWidth(String.join("\n", message), (int) Math.floor(xSize * 0.8))); + try { + Method m; + try { + m = FontRenderer.class.getDeclaredMethod("wrapFormattedStringToWidth", String.class, int.class); + } catch (NoSuchMethodException e) { + m = FontRenderer.class.getDeclaredMethod("func_78280_d", String.class, int.class); + } + + m.setAccessible(true); + this.line.setMessage( + (String) m.invoke(render, String.join("\n", message), (int) Math.floor(xSize * 0.8))); + } catch (Exception e) { + e.printStackTrace(); + } this.line.drawTextBox(); if (this.isEnable) { this.enable.visible = true; @@ -408,20 +421,47 @@ public void draw() { + "\n" : ""; if (isShiftKeyDown()) { - this.setTooltip( - render.wrapFormattedStringToWidth( - StatCollector.translateToLocal(this.tooltip) + "\n" - + current - + "\n" - + StatCollector.translateToLocal(this.tooltip + ".hint"), - xSize / 2)); + try { + Method m; + try { + m = FontRenderer.class.getDeclaredMethod("wrapFormattedStringToWidth", String.class, int.class); + } catch (NoSuchMethodException e) { + m = FontRenderer.class.getDeclaredMethod("func_78280_d", String.class, int.class); + } + + m.setAccessible(true); + this.setTooltip( + (String) m.invoke( + render, + StatCollector.translateToLocal(this.tooltip) + "\n" + + current + + "\n" + + StatCollector.translateToLocal(this.tooltip + ".hint"), + xSize / 2)); + + } catch (Exception e) { + e.printStackTrace(); + } } else { - this.setTooltip( - render.wrapFormattedStringToWidth( - NameConst.i18n(this.tooltip, "\n", false) + "\n" - + current - + NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE), - (int) Math.floor(xSize * 0.8))); + try { + Method m; + try { + m = FontRenderer.class.getDeclaredMethod("wrapFormattedStringToWidth", String.class, int.class); + } catch (NoSuchMethodException e) { + m = FontRenderer.class.getDeclaredMethod("func_78280_d", String.class, int.class); + } + + m.setAccessible(true); + this.setTooltip( + (String) m.invoke( + render, + NameConst.i18n(this.tooltip, "\n", false) + "\n" + + current + + NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE), + (int) Math.floor(xSize * 0.8))); + } catch (Exception e) { + e.printStackTrace(); + } } this.textField.drawTextBox(); } From fbc5d9b3c99d091fec3efc0699bb7be3d39804d4 Mon Sep 17 00:00:00 2001 From: unix-supremacist <100294596+unix-supremacist@users.noreply.github.com> Date: Sat, 21 Feb 2026 14:03:56 -0600 Subject: [PATCH 2/2] move from reflection to an AT --- .../github/client/gui/GuiLevelMaintainer.java | 70 ++++--------------- src/main/resources/META-INF/ae2fc_at.cfg | 2 + 2 files changed, 17 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java index 8ad286a1e..95d4d126d 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -1,6 +1,5 @@ package com.glodblock.github.client.gui; -import java.lang.reflect.Method; import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; @@ -367,20 +366,8 @@ public void draw() { } else { message.add(NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE)); } - try { - Method m; - try { - m = FontRenderer.class.getDeclaredMethod("wrapFormattedStringToWidth", String.class, int.class); - } catch (NoSuchMethodException e) { - m = FontRenderer.class.getDeclaredMethod("func_78280_d", String.class, int.class); - } - - m.setAccessible(true); - this.line.setMessage( - (String) m.invoke(render, String.join("\n", message), (int) Math.floor(xSize * 0.8))); - } catch (Exception e) { - e.printStackTrace(); - } + this.line.setMessage( + render.wrapFormattedStringToWidth(String.join("\n", message), (int) Math.floor(xSize * 0.8))); this.line.drawTextBox(); if (this.isEnable) { this.enable.visible = true; @@ -421,47 +408,20 @@ public void draw() { + "\n" : ""; if (isShiftKeyDown()) { - try { - Method m; - try { - m = FontRenderer.class.getDeclaredMethod("wrapFormattedStringToWidth", String.class, int.class); - } catch (NoSuchMethodException e) { - m = FontRenderer.class.getDeclaredMethod("func_78280_d", String.class, int.class); - } - - m.setAccessible(true); - this.setTooltip( - (String) m.invoke( - render, - StatCollector.translateToLocal(this.tooltip) + "\n" - + current - + "\n" - + StatCollector.translateToLocal(this.tooltip + ".hint"), - xSize / 2)); - - } catch (Exception e) { - e.printStackTrace(); - } + this.setTooltip( + render.wrapFormattedStringToWidth( + StatCollector.translateToLocal(this.tooltip) + "\n" + + current + + "\n" + + StatCollector.translateToLocal(this.tooltip + ".hint"), + xSize / 2)); } else { - try { - Method m; - try { - m = FontRenderer.class.getDeclaredMethod("wrapFormattedStringToWidth", String.class, int.class); - } catch (NoSuchMethodException e) { - m = FontRenderer.class.getDeclaredMethod("func_78280_d", String.class, int.class); - } - - m.setAccessible(true); - this.setTooltip( - (String) m.invoke( - render, - NameConst.i18n(this.tooltip, "\n", false) + "\n" - + current - + NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE), - (int) Math.floor(xSize * 0.8))); - } catch (Exception e) { - e.printStackTrace(); - } + this.setTooltip( + render.wrapFormattedStringToWidth( + NameConst.i18n(this.tooltip, "\n", false) + "\n" + + current + + NameConst.i18n(NameConst.TT_SHIFT_FOR_MORE), + (int) Math.floor(xSize * 0.8))); } this.textField.drawTextBox(); } diff --git a/src/main/resources/META-INF/ae2fc_at.cfg b/src/main/resources/META-INF/ae2fc_at.cfg index cd2223758..734558d03 100644 --- a/src/main/resources/META-INF/ae2fc_at.cfg +++ b/src/main/resources/META-INF/ae2fc_at.cfg @@ -9,3 +9,5 @@ public net.minecraft.client.gui.inventory.GuiContainer field_147006_u #theSlot public net.minecraft.client.renderer.texture.TextureMap field_110574_e # mapRegisteredSprites protected net.minecraft.client.gui.inventory.GuiContainer func_146975_c(II)Lnet.minecraft.inventory.Slot; # getSlotAtPosition + +public net.minecraft.client.gui.FontRenderer func_78280_d(Ljava/lang/String;I)Ljava/lang/String;