From e683c53e5ec8f461acb89a30629a2c0d8e80ced2 Mon Sep 17 00:00:00 2001 From: miozune Date: Sun, 7 May 2023 23:48:34 +0900 Subject: [PATCH] Fix fluid animation with Hodgepodge loaded --- dependencies.gradle | 1 + .../glodblock/github/client/render/ItemPacketRender.java | 6 ++++++ .../java/com/glodblock/github/util/ModAndClassUtil.java | 3 +++ 3 files changed, 10 insertions(+) diff --git a/dependencies.gradle b/dependencies.gradle index 6c1965b5..d8723d6b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -21,6 +21,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:OpenComputers:1.9.1-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.1-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:GTplusplus:1.8.42:dev') { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.2.10:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:KekzTech:0.7.8:dev') api('com.github.GTNewHorizons:Baubles:1.0.1.16:dev') diff --git a/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java b/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java index b4f7bb6d..ab95d81e 100644 --- a/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java +++ b/src/main/java/com/glodblock/github/client/render/ItemPacketRender.java @@ -13,7 +13,9 @@ import org.lwjgl.opengl.GL11; import com.glodblock.github.common.item.ItemFluidPacket; import com.glodblock.github.loader.ItemAndBlockHolder; +import com.glodblock.github.util.ModAndClassUtil; import com.glodblock.github.util.RenderUtil; +import com.mitchej123.hodgepodge.textures.IPatchedTextureAtlasSprite; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -50,6 +52,10 @@ public class ItemPacketRender implements IItemRenderer { } IIcon icon = fluid == null ? FluidRegistry.WATER.getStillIcon() : fluid.getFluid().getStillIcon(); + if (ModAndClassUtil.HODGEPODGE && icon instanceof IPatchedTextureAtlasSprite) { + ((IPatchedTextureAtlasSprite) icon).markNeedsAnimationUpdate(); + } + if (RGB != 0xFFFFFF) { GL11.glColor3f((RGB >> 16 & 0xFF) / 255.0F, (RGB >> 8 & 0xFF) / 255.0F, (RGB & 0xFF) / 255.0F); } diff --git a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java index 118c8fdc..6fbed950 100644 --- a/src/main/java/com/glodblock/github/util/ModAndClassUtil.java +++ b/src/main/java/com/glodblock/github/util/ModAndClassUtil.java @@ -26,6 +26,8 @@ public final class ModAndClassUtil { public static boolean GTPP = false; public static boolean WAILA = false; public static boolean AVARITIA = false; + public static boolean HODGEPODGE = false; + public static boolean isV2; public static boolean isTypeFilter; public static boolean isDoubleButton; @@ -140,5 +142,6 @@ public final class ModAndClassUtil { if (Loader.isModLoaded("miscutils")) GTPP = true; if (Loader.isModLoaded("Waila")) WAILA = true; if (Loader.isModLoaded("Avaritia")) AVARITIA = true; + if (Loader.isModLoaded("hodgepodge")) HODGEPODGE = true; } }