From d365273ead1d228b47b944d179eedde58788a068 Mon Sep 17 00:00:00 2001 From: Hubry Date: Tue, 25 Feb 2020 00:17:12 +0100 Subject: [PATCH] Fix fabulous pool item render, move TE render color calc from awt --- .../java/vazkii/botania/client/core/handler/ColorHandler.java | 4 ++-- .../vazkii/botania/client/render/tile/RenderTilePool.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java index c2aa18de9..faea82eef 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -62,8 +62,8 @@ public final class ColorHandler { } } if (((BlockPool) state.getBlock()).variant == BlockPool.Variant.FABULOUS){ - float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - int fabulousColor = MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); + float time = (ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks) * 0.005F; + int fabulousColor = MathHelper.hsvToRGB(time - (int) time, 0.6F, 1F); return MathHelper.multiplyColor(fabulousColor, color); } return color; diff --git a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java index bfb18d7ce..c3642963f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -64,7 +64,8 @@ public class RenderTilePool extends TileEntityRenderer { if (fab) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); - int color = MathHelper.multiplyColor(Color.HSBtoRGB(time * 0.005F, 0.6F, 1F), pool.color.colorValue); + time *= 0.005F; + int color = MathHelper.multiplyColor(MathHelper.hsvToRGB(time - (int) time, 0.6F, 1F), pool.color.colorValue); int red = (color & 0xFF0000) >> 16; int green = (color & 0xFF00) >> 8;