Fix some fluid textures (#1722)

GregTechCEu · May 6, 2023 · 3c6b02d · 3c6b02d
1 parent 20a8b4d
commit 3c6b02d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 1 deletion.
diff --git a/src/main/java/gregtech/api/fluids/MetaFluids.java b/src/main/java/gregtech/api/fluids/MetaFluids.java
@@ -152,6 +152,8 @@ private static void setCustomTextures() {
         setMaterialFluidTexture(Materials.Naquadria, FluidTypes.LIQUID);
         setMaterialFluidTexture(Materials.Ice, FluidTypes.LIQUID);
         setMaterialFluidTexture(Materials.UUMatter, FluidTypes.LIQUID);
+        setMaterialFluidTexture(Materials.Toluene, FluidTypes.LIQUID);
+        setMaterialFluidTexture(Materials.LiquidAir, FluidTypes.LIQUID);
     }
 
     /**

diff --git a/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/SecondDegreeMaterials.java
@@ -386,7 +386,6 @@ public static void register() {
 
         LiquidAir = new Material.Builder(2051, "liquid_air")
                 .fluid()
-                .color(0xA9D0F5)
                 .flags(DISABLE_DECOMPOSITION)
                 .components(Nitrogen, 70, Oxygen, 22, CarbonDioxide, 5, Helium, 2, Argon, 1, Ice, 1)
                 .fluidTemp(79)

diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_air.png b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_air.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_air.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.liquid_air.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}
diff --git a/...es/blocks/fluids/fluid.liquid_toluene.png → .../textures/blocks/fluids/fluid.toluene.png b/...es/blocks/fluids/fluid.liquid_toluene.png → .../textures/blocks/fluids/fluid.toluene.png
diff --git a/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.toluene.png.mcmeta b/src/main/resources/assets/gregtech/textures/blocks/fluids/fluid.toluene.png.mcmeta
@@ -0,0 +1,5 @@
+{
+  "animation": {
+    "frametime": 2
+  }
+}