From 1f55def09f47a83388e0ec924af2d6db1c1b2e80 Mon Sep 17 00:00:00 2001
From: miozune <miozune@gmail.com>
Date: Mon, 28 Aug 2023 00:58:49 +0900
Subject: [PATCH] Revert fluid animation fix for Quartz Tank to mitigate FPS
 issue (#157)

---
 build.gradle                                         | 10 +++++-----
 .../github/client/render/tank/FluidTankRenderer.java | 12 +-----------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/build.gradle b/build.gradle
index 0e5ef830..b894d647 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1690907958
+//version: 1692122114
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -562,9 +562,6 @@ repositories {
     maven {
         name 'Overmind forge repo mirror'
         url 'https://gregtech.overminddl1.com/'
-        mavenContent {
-            excludeGroup("net.minecraftforge") // missing the `universal` artefact
-        }
     }
     maven {
         name = "GTNH Maven"
@@ -1152,7 +1149,10 @@ tasks.named("processIdeaSettings").configure {
 
 tasks.named("ideVirtualMainClasses").configure {
     // Make IntelliJ "Build project" build the mod jars
-    dependsOn("jar", "reobfJar", "spotlessCheck")
+    dependsOn("jar", "reobfJar")
+    if (!disableSpotless) {
+        dependsOn("spotlessCheck")
+    }
 }
 
 // workaround variable hiding in pom processing
diff --git a/src/main/java/com/glodblock/github/client/render/tank/FluidTankRenderer.java b/src/main/java/com/glodblock/github/client/render/tank/FluidTankRenderer.java
index 4f016740..47ff41f2 100644
--- a/src/main/java/com/glodblock/github/client/render/tank/FluidTankRenderer.java
+++ b/src/main/java/com/glodblock/github/client/render/tank/FluidTankRenderer.java
@@ -3,11 +3,8 @@ package com.glodblock.github.client.render.tank;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.annotation.Nonnull;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.init.Blocks;
 import net.minecraft.util.IIcon;
@@ -78,7 +75,7 @@ public class FluidTankRenderer {
             return null;
         }
         Map<Fluid, int[]> cache = flowing ? flowingRenderCache : stillRenderCache;
-        int[] diplayLists = getCachedData(fluid, cache);
+        int[] diplayLists = cache.get(fluid);
         if (diplayLists != null) {
             return diplayLists;
         }
@@ -122,11 +119,4 @@ public class FluidTankRenderer {
         return diplayLists;
     }
 
-    private static int[] getCachedData(@Nonnull Fluid fluid, Map<Fluid, int[]> cache) {
-        IIcon icon = fluid.getIcon();
-        if (icon instanceof TextureAtlasSprite sprite && sprite.hasAnimationMetadata()) {
-            return null;
-        }
-        return cache.get(fluid);
-    }
 }