Change liquid rendering in tanks: Make liquids brighter, and don't dr…

…aw the flowing texture
SlimeKnights · Aug 24, 2014 · 1daf7fa · 1daf7fa
1 parent a270c30
commit 1daf7fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/main/java/tconstruct/client/BlockSkinRenderHelper.java b/src/main/java/tconstruct/client/BlockSkinRenderHelper.java
@@ -852,6 +852,11 @@ static boolean renderMetadataBlockWithColorMultiplier (Block block, int metadata
     }
 
     public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world)
+    {
+        return renderLiquidBlock(stillIcon, flowingIcon, x, y, z, renderer, world, false);
+    }
+
+    public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int x, int y, int z, RenderBlocks renderer, IBlockAccess world, boolean extraBright)
     {
         Block block = Blocks.stone;
         int var5 = block.colorMultiplier(world, x, y, z);
@@ -869,6 +874,12 @@ public static boolean renderLiquidBlock (IIcon stillIcon, IIcon flowingIcon, int
             var8 = var11;
         }
 
+        if(extraBright) {
+            var6 = Math.max(1.0f, var6 + 0.5f);
+            var7 = Math.max(1.0f, var7 + 0.5f);
+            var8 = Math.max(1.0f, var8 + 0.5f);
+        }
+
         // safety
         if(stillIcon == null) stillIcon = FluidRegistry.WATER.getStillIcon();
         if(flowingIcon == null) flowingIcon = FluidRegistry.WATER.getFlowingIcon();

diff --git a/src/main/java/tconstruct/smeltery/model/TankRender.java b/src/main/java/tconstruct/smeltery/model/TankRender.java
@@ -47,10 +47,7 @@ public boolean renderWorldBlock (IBlockAccess world, int x, int y, int z, Block
                     FluidStack liquid = logic.tank.getFluid();
                     renderer.setRenderBounds(0.001, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999);
                     Fluid fluid = liquid.getFluid();
-                    if (fluid.canBePlacedInWorld())
-                        BlockSkinRenderHelper.renderMetadataBlock(fluid.getBlock(), 0, x, y, z, renderer, world);
-                    else
-                        BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getFlowingIcon(), x, y, z, renderer, world);
+                    BlockSkinRenderHelper.renderLiquidBlock(fluid.getStillIcon(), fluid.getStillIcon(), x, y, z, renderer, world, true);
 
                     renderer.setRenderBounds(00, 0.001, 0.001, 0.999, logic.getFluidAmountScaled(), 0.999);
                 }