use hardcore parameter from own PostRender event

Terrails · Mar 18, 2024 · c9ac48d · c9ac48d
1 parent f87742d
commit c9ac48d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/common/src/main/java/terrails/colorfulhearts/compat/AppleSkinCompat.java b/common/src/main/java/terrails/colorfulhearts/compat/AppleSkinCompat.java
@@ -6,7 +6,6 @@
 import net.minecraft.util.Mth;
 import net.minecraft.util.RandomSource;
 import org.lwjgl.opengl.GL11;
-import terrails.colorfulhearts.LoaderExpectPlatform;
 import terrails.colorfulhearts.heart.CHeartType;
 import terrails.colorfulhearts.heart.Heart;
 
@@ -18,7 +17,7 @@ public class AppleSkinCompat {
     private int lastHealth, lastModifiedHealth;
     private Heart[] hearts;
 
-    public void drawHealthOverlay(GuiGraphics guiGraphics, int x, int y, int absorbing, int health, int modifiedHealth, float alpha) {
+    public void drawHealthOverlay(GuiGraphics guiGraphics, int x, int y, int absorbing, int health, int modifiedHealth, float alpha, boolean hardcore) {
         long tickCount = this.client.gui.getGuiTicks();
         // synchronize random with vanilla
         this.random.setSeed(tickCount * 312871);
@@ -33,8 +32,6 @@ public void drawHealthOverlay(GuiGraphics guiGraphics, int x, int y, int absorbi
         RenderSystem.setShaderColor(1.0f, 1.0f, 1.0f, alpha);
         RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 
-        boolean hardcore = LoaderExpectPlatform.forcedHardcoreHearts() || (client.level.getLevelData().isHardcore());
-
         for (int index = 0; index < this.hearts.length; index++) {
             Heart heart = this.hearts[index];
             int xPos = x + (index % 10) * 8;

diff --git a/fabric/src/main/java/terrails/colorfulhearts/fabric/compat/AppleSkinFabCompat.java b/fabric/src/main/java/terrails/colorfulhearts/fabric/compat/AppleSkinFabCompat.java
@@ -37,7 +37,7 @@ public void registerEvents() {
             // I'll leave this behaviour as is at it makes the differentiation easier
             float alpha = ((HUDOverlayHandlerAccessor) HUDOverlayHandler.INSTANCE).getFlashAlpha();
 
-            drawHealthOverlay(event.getGuiGraphics(), event.getX(), event.getY(), absorbing, health, modifiedHealth, alpha);
+            drawHealthOverlay(event.getGuiGraphics(), event.getX(), event.getY(), absorbing, health, modifiedHealth, alpha, event.isHardcore());
             // set value back to 0
             modifiedHealth = 0;
         });

diff --git a/forge/src/main/java/terrails/colorfulhearts/forge/compat/AppleSkinForgeCompat.java b/forge/src/main/java/terrails/colorfulhearts/forge/compat/AppleSkinForgeCompat.java
@@ -69,6 +69,6 @@ private void onPostRender(ForgeHeartRenderEvent.Post event) {
         // I'll leave this behaviour as is at it makes the differentiation easier
         float alpha = HUDOverlayHandlerAccessor.getFlashAlpha();
 
-        drawHealthOverlay(event.getGuiGraphics(), event.getX(), event.getY(), absorbing, health, modifiedHealth, alpha);
+        drawHealthOverlay(event.getGuiGraphics(), event.getX(), event.getY(), absorbing, health, modifiedHealth, alpha, event.isHardcore());
     }
 }
diff --git a/neoforge/src/main/java/terrails/colorfulhearts/neoforge/compat/AppleSkinForgeCompat.java b/neoforge/src/main/java/terrails/colorfulhearts/neoforge/compat/AppleSkinForgeCompat.java
@@ -69,6 +69,6 @@ private void onPostRender(ForgeHeartRenderEvent.Post event) {
         // I'll leave this behaviour as is at it makes the differentiation easier
         float alpha = HUDOverlayHandlerAccessor.getFlashAlpha();
 
-        drawHealthOverlay(event.getGuiGraphics(), event.getX(), event.getY(), absorbing, health, modifiedHealth, alpha);
+        drawHealthOverlay(event.getGuiGraphics(), event.getX(), event.getY(), absorbing, health, modifiedHealth, alpha, event.isHardcore());
     }
 }