render the hud using RenderGameOverlayEvent to benefit from HUD caching

Co-authored-by: Martin Robertz <[email protected]>

.github/workflows/build-and-test.yml

@@ -3,9 +3,9 @@ name: Build and test
 
 on:
   pull_request:
-    branches: [ master, main ]
+    branches: [ master, main, release/** ]
   push:
-    branches: [ master, main ]
+    branches: [ master, main, release/** ]
 
 jobs:
   build-and-test:

dependencies.gradle

@@ -20,5 +20,5 @@ dependencies {
     runtimeOnlyNonPublishable(deobfCurse('thermal-expansion-69163:2388759'))
     runtimeOnlyNonPublishable(deobfCurse('thermal-dynamics-227443:2388756'))
     implementation(deobfCurse('cofh-core-69162:2388751'))
-    api("com.github.GTNewHorizons:GTNHLib:0.9.54:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.11.37:dev")
 }

src/main/java/mcp/mobius/waila/Waila.java

@@ -68,7 +68,9 @@ public class Waila {
         if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
             MinecraftForge.EVENT_BUS.register(new DecoratorRenderer());
             FMLCommonHandler.instance().bus().register(new KeyEvent());
-            FMLCommonHandler.instance().bus().register(new WailaTickHandler());
+            WailaTickHandler tickHandler = new WailaTickHandler();
+            FMLCommonHandler.instance().bus().register(tickHandler);
+            MinecraftForge.EVENT_BUS.register(tickHandler);
         }
         FMLCommonHandler.instance().bus().register(new NetworkHandler());
     }

src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java

@@ -19,6 +19,7 @@ import mcp.mobius.waila.api.impl.ModuleRegistrar;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderBar;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderProgressBar;
 import mcp.mobius.waila.overlay.tooltiprenderers.TTRenderStack;
+import mcp.mobius.waila.utils.ColorUtils;
 
 public class HUDHandlerFurnace implements IWailaDataProvider {
 
@@ -69,8 +70,8 @@ public class HUDHandlerFurnace implements IWailaDataProvider {
         if (fuelProgress > 0) {
             String fuelBar = TTRenderBar.create(
                     String.format("Fuel %ds / %ds", (maxFuelTime - fuelTime) / 20, maxFuelTime / 20),
-                    0xFFFF0000,
-                    0xFFCC0000,
+                    ColorUtils.fuelFurnaceBarTop.getColor(),
+                    ColorUtils.fuelFurnaceBarBottom.getColor(),
                     1.0 - fuelProgress);
             currenttip.add(fuelBar);
         }
@@ -78,8 +79,8 @@ public class HUDHandlerFurnace implements IWailaDataProvider {
         if (smeltProgress > 0) {
             String cookBar = TTRenderBar.create(
                     String.format("Smelt %ds / %ds", smeltTime / 20, 200 / 20),
-                    0xFFFF8800,
-                    0xFFFFCC00,
+                    ColorUtils.progressBarTop.getColor(),
+                    ColorUtils.progressBarBottom.getColor(),
                     smeltProgress);
             currenttip.add(cookBar);
         }

src/main/java/mcp/mobius/waila/overlay/WailaTickHandler.java

@@ -10,6 +10,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.common.config.Configuration;
 
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -27,8 +28,8 @@ public class WailaTickHandler {
     private final MetaDataProvider handler = new MetaDataProvider();
 
     @SubscribeEvent
-    public void tickRender(TickEvent.RenderTickEvent event) {
-        if (event.phase == TickEvent.Phase.END) {
+    public void onRenderOverlay(RenderGameOverlayEvent.Post event) {
+        if (event.type == RenderGameOverlayEvent.ElementType.ALL) {
             OverlayRenderer.renderOverlay(tooltip);
         }
     }

src/main/java/mcp/mobius/waila/overlay/tooltiprenderers/TTRenderStack.java

@@ -44,7 +44,7 @@ public class TTRenderStack implements IWailaTooltipRenderer {
             GL11.glEnable(GL12.GL_RESCALE_NORMAL);
             GL11.glScaled(scale, scale, 1.0f);
 
-            DisplayUtil.renderStack(0, 0, stack);
+            DisplayUtil.renderStack(0, -1, stack);
 
             GL11.glDisable(GL12.GL_RESCALE_NORMAL);
             GL11.glPopMatrix();

src/main/java/mcp/mobius/waila/utils/ColorUtils.java

@@ -0,0 +1,17 @@
+package mcp.mobius.waila.utils;
+
+import com.gtnewhorizon.gtnhlib.color.ColorResource;
+
+public class ColorUtils {
+
+    private static final ColorResource.Factory color = new ColorResource.Factory("waila");
+
+    public static final ColorResource
+    // spotless:off
+            fuelFurnaceBarTop       = color.argb("fuelFurnaceBarTop",    "0xFFFF8800"),
+            fuelFurnaceBarBottom    = color.argb("fuelFurnaceBarBottom", "0xFFFFCC00"),
+            progressBarTop          = color.argb("progressBarTop",       "0xFFFF0000"),
+            progressBarBottom       = color.argb("progressBarBottom",    "0xFF8B0000");
+    // spotless:on
+
+}