diff --git a/dependencies.gradle b/dependencies.gradle index 8c6ac78..4583eea 100644 --- a/dependencies.gradle +++ b/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") } diff --git a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java b/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java index 7b548cc..6faefae 100644 --- a/src/main/java/mcp/mobius/waila/addons/vanillamc/HUDHandlerFurnace.java +++ b/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); } diff --git a/src/main/java/mcp/mobius/waila/utils/ColorUtils.java b/src/main/java/mcp/mobius/waila/utils/ColorUtils.java new file mode 100644 index 0000000..191fe4c --- /dev/null +++ b/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 + +}