1.20 port fix null font in widgets

build.gradle

@@ -79,7 +79,7 @@ dependencies {
     compileOnly fg.deobf("top.theillusivec4.curios:curios-forge:${curios_version}:api")
 
 	// optional compat: guidebook
-	//RIP patchouli i will miss you please stop being dead soon 
+	//TODO: enable after it ports
   //  compileOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}:api")
   //  runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}")
 
@@ -120,8 +120,8 @@ def replaceProperties = [
         minecraft_version: minecraft_version, minecraft_version_range: minecraft_version_range,
         forge_version: forge_version, forge_version_range: forge_version_range,
         loader_version_range: loader_version_range,
-        mod_id: mod_id, mod_name: mod_name, mod_license: mod_license, mod_version: mod_version,
-        mod_authors: mod_authors, mod_description: mod_description
+        mod_id: mod_id,  mod_version: mod_version
+
 ]
 processResources {
     inputs.properties replaceProperties

gradle.properties

@@ -14,7 +14,7 @@ mod_authors=Lothrazar
 mod_description=stuff
 mod_group_id=com.lothrazar.cyclic
 curse_id=239286
-mod_version=1.10.0
+mod_version=1.11.0
 
 minecraft_version=1.20
 mc_version=1.20

src/main/java/com/lothrazar/cyclic/block/anvil/ScreenAnvil.java

@@ -15,12 +15,12 @@ public class ScreenAnvil extends ScreenBase<ContainerAnvil> {
 
   public ScreenAnvil(ContainerAnvil screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileAnvilAuto.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileAnvilAuto.MAX);
     energy.visible = TileAnvilAuto.POWERCONF.get() > 0;
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/anvilmagma/ScreenAnvilMagma.java

@@ -15,12 +15,12 @@ public class ScreenAnvilMagma extends ScreenBase<ContainerAnvilMagma> {
 
   public ScreenAnvilMagma(ContainerAnvilMagma screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    fluid = new FluidBar(this.font, 152, 8, TileAnvilMagma.CAPACITY);
   }
 
   @Override
   public void init() {
     super.init();
+    fluid = new FluidBar(this.font, 152, 8, TileAnvilMagma.CAPACITY);
     int x, y;
     fluid.guiLeft = leftPos;
     fluid.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/anvilvoid/ScreenAnvilVoid.java

@@ -16,13 +16,13 @@ public class ScreenAnvilVoid extends ScreenBase<ContainerAnvilVoid> {
 
   public ScreenAnvilVoid(ContainerAnvilVoid screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    fluid = new FluidBar(this.font, 152, 8, TileAnvilVoid.CAPACITY);
-    fluid.emtpyTooltip = "0 " + ChatUtil.lang("fluid.cyclic.xpjuice");
   }
 
   @Override
   public void init() {
     super.init();
+    fluid = new FluidBar(this.font, 152, 8, TileAnvilVoid.CAPACITY);
+    fluid.emtpyTooltip = "0 " + ChatUtil.lang("fluid.cyclic.xpjuice");
     fluid.guiLeft = leftPos;
     fluid.guiTop = topPos;
     int x, y;

src/main/java/com/lothrazar/cyclic/block/battery/ScreenBattery.java

@@ -26,12 +26,12 @@ public class ScreenBattery extends ScreenBase<ContainerBattery> {
 
   public ScreenBattery(ContainerBattery screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileBattery.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileBattery.MAX);
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;
     int x = leftPos + 132, y = topPos + 8;

src/main/java/com/lothrazar/cyclic/block/batteryclay/ClayBattery.java

@@ -34,7 +34,7 @@ public void registerClient() {
   }
 
   @Override
-  public List<ItemStack> getDrops(BlockState state,LootParams.Builder builder) {
+  public List<ItemStack> getDrops(BlockState state, LootParams.Builder builder) {
     //because harvestBlock manually forces a drop  
     return new ArrayList<>();
   }

src/main/java/com/lothrazar/cyclic/block/batteryclay/ScreenClayBattery.java

@@ -13,12 +13,12 @@ public class ScreenClayBattery extends ScreenBase<ContainerClayBattery> {
 
   public ScreenClayBattery(ContainerClayBattery screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileClayBattery.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileClayBattery.MAX);
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;
   }

src/main/java/com/lothrazar/cyclic/block/beaconpotion/ScreenPotion.java

@@ -20,12 +20,12 @@ public class ScreenPotion extends ScreenBase<ContainerPotion> {
 
   public ScreenPotion(ContainerPotion screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    energy = new EnergyBar(this.font, TilePotionBeacon.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    energy = new EnergyBar(this.font, TilePotionBeacon.MAX);
     int x, y;
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/collectfluid/ScreenFluidCollect.java

@@ -21,13 +21,13 @@ public class ScreenFluidCollect extends ScreenBase<ContainerFluidCollect> {
 
   public ScreenFluidCollect(ContainerFluidCollect screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    fluid = new FluidBar(this.font, TileFluidCollect.CAPACITY);
-    energy = new EnergyBar(this.font, TileFluidCollect.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    fluid = new FluidBar(this.font, TileFluidCollect.CAPACITY);
+    energy = new EnergyBar(this.font, TileFluidCollect.MAX);
     energy.guiLeft = fluid.guiLeft = leftPos;
     energy.guiTop = fluid.guiTop = topPos;
     energy.visible = TileFluidCollect.POWERCONF.get() > 0;

src/main/java/com/lothrazar/cyclic/block/conveyor/ConveyorItemEntity.java

@@ -42,15 +42,14 @@ public float getSpin(float partialTicks) {
 
   @Override
   public void tick() {
-
     if (!(level().getBlockState(this.blockPosition()).getBlock() instanceof BlockConveyor)) {
       this.spawnRegularStack();
     }
     super.tick();
   }
 
   private void spawnRegularStack() {
-    ItemEntity e = new ItemEntity(this.level() ,this.getX(), this.getY(), this.getZ(), this.getItem());
+    ItemEntity e = new ItemEntity(this.level(), this.getX(), this.getY(), this.getZ(), this.getItem());
     this.level().addFreshEntity(e);
     this.setItem(ItemStack.EMPTY);
     this.remove(RemovalReason.DISCARDED);

src/main/java/com/lothrazar/cyclic/block/crafter/ScreenCrafter.java

@@ -42,16 +42,16 @@ public class ScreenCrafter extends ScreenBase<ContainerCrafter> {
   public ScreenCrafter(ContainerCrafter screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
     this.imageHeight = 256;
-    this.energy = new EnergyBar(this.font, TileCrafter.MAX);
-    this.energy.setHeight(120);
-    this.progress = new TexturedProgress(this.font, ContainerCrafter.PREVIEW_START_X - 3, ContainerCrafter.PREVIEW_START_Y + Const.SQ, 24, 17, TextureRegistry.ARROW);
-    this.progress.max = TileCrafter.TIMER_FULL;
-    this.progress.setTopDown(false);
   }
 
   @Override
   protected void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileCrafter.MAX);
+    this.energy.setHeight(120);
+    this.progress = new TexturedProgress(this.font, ContainerCrafter.PREVIEW_START_X - 3, ContainerCrafter.PREVIEW_START_Y + Const.SQ, 24, 17, TextureRegistry.ARROW);
+    this.progress.max = TileCrafter.TIMER_FULL;
+    this.progress.setTopDown(false);
     int x, y;
     energy.guiLeft = progress.guiLeft = leftPos;
     energy.guiTop = progress.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/crusher/ScreenCrusher.java

@@ -17,13 +17,13 @@ public class ScreenCrusher extends ScreenBase<ContainerCrusher> {
 
   public ScreenCrusher(ContainerCrusher screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileCrusher.MAX);
-    this.progress = new TexturedProgress(this.font, 78, 40, TextureRegistry.SAW);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileCrusher.MAX);
+    this.progress = new TexturedProgress(this.font, 78, 40, TextureRegistry.SAW);
     progress.guiLeft = energy.guiLeft = leftPos;
     progress.guiTop = energy.guiTop = topPos;
     int x, y;

src/main/java/com/lothrazar/cyclic/block/disenchant/ScreenDisenchant.java

@@ -18,14 +18,14 @@ public class ScreenDisenchant extends ScreenBase<ContainerDisenchant> {
 
   public ScreenDisenchant(ContainerDisenchant screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    energy = new EnergyBar(this.font, TileDisenchant.MAX);
-    fluid = new FluidBar(this.font, 134, 8, TileDisenchant.CAPACITY);
-    fluid.emtpyTooltip = "0 " + ChatUtil.lang("fluid.cyclic.xpjuice");
   }
 
   @Override
   public void init() {
     super.init();
+    energy = new EnergyBar(this.font, TileDisenchant.MAX);
+    fluid = new FluidBar(this.font, 134, 8, TileDisenchant.CAPACITY);
+    fluid.emtpyTooltip = "0 " + ChatUtil.lang("fluid.cyclic.xpjuice");
     fluid.guiLeft = energy.guiLeft = leftPos;
     fluid.guiTop = energy.guiTop = topPos;
     int x, y;

src/main/java/com/lothrazar/cyclic/block/dropper/ScreenDropper.java

@@ -18,12 +18,12 @@ public class ScreenDropper extends ScreenBase<ContainerDropper> {
 
   public ScreenDropper(ContainerDropper screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileDropper.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileDropper.MAX);
     int x, y, w, h;
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/expcollect/ScreenExpPylon.java

@@ -16,12 +16,12 @@ public class ScreenExpPylon extends ScreenBase<ContainerExpPylon> {
 
   public ScreenExpPylon(ContainerExpPylon screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    fluid = new FluidBar(this.font, 150, 8, TileExpPylon.CAPACITY);
   }
 
   @Override
   public void init() {
     super.init();
+    fluid = new FluidBar(this.font, 150, 8, TileExpPylon.CAPACITY);
     fluid.guiLeft = leftPos;
     fluid.guiTop = topPos;
     int x, y;

src/main/java/com/lothrazar/cyclic/block/forester/ScreenForester.java

@@ -20,12 +20,12 @@ public class ScreenForester extends ScreenBase<ContainerForester> {
 
   public ScreenForester(ContainerForester screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileForester.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileForester.MAX);
     int x, y;
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/generatorfluid/ScreenGeneratorFluid.java

@@ -27,14 +27,14 @@ public class ScreenGeneratorFluid extends ScreenBase<ContainerGeneratorFluid> {
 
   public ScreenGeneratorFluid(ContainerGeneratorFluid screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileGeneratorFluid.MAX);
-    this.progress = new TexturedProgress(this.font, 76, 60, TextureRegistry.LAVA_PROG);
-    fluid = new FluidBar(this.font, 39, 57, TileGeneratorFluid.CAPACITY);
   }
 
   @Override
   public void init() {
     super.init();
+    energy = new EnergyBar(this.font, TileGeneratorFluid.MAX);
+    progress = new TexturedProgress(this.font, 76, 60, TextureRegistry.LAVA_PROG);
+    fluid = new FluidBar(this.font, 39, 57, TileGeneratorFluid.CAPACITY);
     energy.visible = true;
     fluid.guiLeft = progress.guiLeft = energy.guiLeft = leftPos;
     fluid.guiTop = progress.guiTop = energy.guiTop = topPos;
@@ -60,7 +60,7 @@ public void render(GuiGraphics gg, int mouseX, int mouseY, float partialTicks) {
     progress.renderHoveredToolTip(gg, mouseX, mouseY, menu.tile.getField(TileGeneratorFluid.Fields.TIMER.ordinal()));
     fluid.renderHoveredToolTip(gg, mouseX, mouseY, menu.tile.getFluid());
     btnRedstone.onValueUpdate(menu.tile);
-    var pose=gg.pose();
+    var pose = gg.pose();
     pose.pushPose();
     pose.translate(this.width / 2, this.height / 2, 0);
     pose.mulPose(Axis.ZP.rotationDegrees(-90));
@@ -90,7 +90,7 @@ protected void renderBg(GuiGraphics gg, float partialTicks, int mouseX, int mous
     energy.draw(gg, menu.tile.getEnergy());
     progress.max = menu.tile.getField(TileGeneratorFluid.Fields.BURNMAX.ordinal());
     progress.draw(gg, menu.tile.getField(TileGeneratorFluid.Fields.TIMER.ordinal()));
-    var pose=gg.pose();
+    var pose = gg.pose();
     pose.pushPose();
     pose.translate(this.width / 2, this.height / 2, 0);
     pose.mulPose(Axis.ZP.rotationDegrees(90));

src/main/java/com/lothrazar/cyclic/block/generatorfood/ScreenGeneratorFood.java

@@ -23,13 +23,13 @@ public class ScreenGeneratorFood extends ScreenBase<ContainerGeneratorFood> {
 
   public ScreenGeneratorFood(ContainerGeneratorFood screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileGeneratorFood.MAX);
-    this.progress = new TexturedProgress(this.font, 76, 60, TextureRegistry.FOOD_PROG);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileGeneratorFood.MAX);
+    this.progress = new TexturedProgress(this.font, 76, 60, TextureRegistry.FOOD_PROG);
     energy.visible = true;
     progress.guiLeft = energy.guiLeft = leftPos;
     progress.guiTop = energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/generatorfuel/ScreenGeneratorFuel.java

@@ -23,13 +23,13 @@ public class ScreenGeneratorFuel extends ScreenBase<ContainerGeneratorFuel> {
 
   public ScreenGeneratorFuel(ContainerGeneratorFuel screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileGeneratorFuel.MAX);
-    this.progress = new TexturedProgress(this.font    , 76, 60, TextureRegistry.FUEL_PROG);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileGeneratorFuel.MAX);
+    this.progress = new TexturedProgress(this.font, 76, 60, TextureRegistry.FUEL_PROG);
     energy.visible = true;
     progress.guiLeft = energy.guiLeft = leftPos;
     progress.guiTop = energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/generatoritem/ScreenGeneratorDrops.java

@@ -23,13 +23,13 @@ public class ScreenGeneratorDrops extends ScreenBase<ContainerGeneratorDrops> {
 
   public ScreenGeneratorDrops(ContainerGeneratorDrops screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileGeneratorDrops.MAX);
-    this.progress = new TexturedProgress(this.font, 76, 60, TextureRegistry.MAT_PROG);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileGeneratorDrops.MAX);
+    this.progress = new TexturedProgress(this.font, 76, 60, TextureRegistry.MAT_PROG);
     energy.visible = true; //TileGeneratorFuel.POWERCONF.get() > 0;
     progress.guiLeft = energy.guiLeft = leftPos;
     progress.guiTop = energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/generatorsolar/ScreenGeneratorSolar.java

@@ -13,12 +13,12 @@ public class ScreenGeneratorSolar extends ScreenBase<ContainerGeneratorSolar> {
 
   public ScreenGeneratorSolar(ContainerGeneratorSolar screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileGeneratorSolar.MAX);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileGeneratorSolar.MAX);
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;
   }

src/main/java/com/lothrazar/cyclic/block/harvester/ScreenHarvester.java

@@ -21,12 +21,12 @@ public class ScreenHarvester extends ScreenBase<ContainerHarvester> {
 
   public ScreenHarvester(ContainerHarvester screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    this.energy = new EnergyBar(this.font, TileHarvester.MAX_ENERGY);
   }
 
   @Override
   public void init() {
     super.init();
+    this.energy = new EnergyBar(this.font, TileHarvester.MAX_ENERGY);
     int x, y;
     energy.guiLeft = leftPos;
     energy.guiTop = topPos;

src/main/java/com/lothrazar/cyclic/block/melter/ScreenMelter.java

@@ -17,15 +17,15 @@ public class ScreenMelter extends ScreenBase<ContainerMelter> {
 
   public ScreenMelter(ContainerMelter screenContainer, Inventory inv, Component titleIn) {
     super(screenContainer, inv, titleIn);
-    energy = new EnergyBar(this.font, TileMelter.MAX);
-    fluid = new FluidBar(this.font, 132, 8, TileMelter.CAPACITY);
-    this.progress = new TexturedProgress(this.font, 68, 37, 24, 17, TextureRegistry.ARROW);
-    this.progress.setTopDown(false);
   }
 
   @Override
   public void init() {
     super.init();
+    energy = new EnergyBar(this.font, TileMelter.MAX);
+    fluid = new FluidBar(this.font, 132, 8, TileMelter.CAPACITY);
+    this.progress = new TexturedProgress(this.font, 68, 37, 24, 17, TextureRegistry.ARROW);
+    this.progress.setTopDown(false);
     progress.guiLeft = fluid.guiLeft = energy.guiLeft = leftPos;
     progress.guiTop = fluid.guiTop = energy.guiTop = topPos;
   }