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 03821405c..eebce5624 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ColorHandler.java @@ -12,6 +12,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.MathHelper; import net.minecraft.world.IBlockAccess; import net.minecraftforge.fml.common.registry.RegistryDelegate; import net.minecraftforge.fml.relauncher.ReflectionHelper; @@ -55,7 +56,7 @@ public final class ColorHandler { public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess p_186720_2_, BlockPos pos, int tintIndex) { if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + return MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); } else { return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue; } @@ -72,7 +73,7 @@ public final class ColorHandler { if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA) return 0xFFFFFF; float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; - return Color.getHSBColor((time * 5) % 360 / 360F, 0.4F, 0.9F).hashCode(); + return MathHelper.hsvToRGB((time * 5) % 360 / 360F, 0.4F, 0.9F); } }, ModBlocks.spreader 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 06b07a256..ed31c275f 100644 --- a/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java +++ b/src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java @@ -19,6 +19,7 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.util.math.MathHelper; import org.lwjgl.opengl.GL11; import vazkii.botania.api.mana.IPoolOverlayProvider; import vazkii.botania.api.state.BotaniaStateProps; @@ -68,7 +69,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer { float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks; if(pool != null) time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000); - color = Color.getHSBColor(time * 0.005F, 0.6F, 1F).hashCode(); + color = MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F); } if (fab || forceManaNumber > -1) {