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..95d4d126d 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiLevelMaintainer.java @@ -5,6 +5,7 @@ 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 +31,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 +39,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(), 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;