Fix broken hsb calculation because mojang's function is broken. Also fix upstream issue 1672

This commit is contained in:
Vincent Lee committed 2016-06-17 19:41:59 -05:00
1 parent 6b10ada28a
commit 9fef518968
9 files changed
+11 -11

No files matched your search

@@ -42,7 +42,7 @@ public final class BoundTileRenderer {
@SubscribeEvent
public void onWorldRenderLast(RenderWorldLastEvent event) {
GlStateManager.pushMatrix();
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
GlStateManager.disableDepth();
GlStateManager.disableTexture2D();
GlStateManager.enableBlend();
@@ -56,7 +56,7 @@ public final class ColorHandler {
public int colorMultiplier(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos, int tintIndex) {
if (state.getValue(BotaniaStateProps.POOL_VARIANT) == PoolVariant.FABULOUS) {
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
return MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F);
return Color.HSBtoRGB(time * 0.005F, 0.6F, 1F);
} else {
return state.getValue(BotaniaStateProps.COLOR).getMapColor().colorValue;
}
@@ -73,7 +73,7 @@ public final class ColorHandler {
if(state.getValue(BotaniaStateProps.SPREADER_VARIANT) != SpreaderVariant.GAIA)
return 0xFFFFFF;
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
return MathHelper.hsvToRGB((time * 5) % 360 / 360F, 0.4F, 0.9F);
return Color.HSBtoRGB((time * 5) % 360 / 360F, 0.4F, 0.9F);
}
},
ModBlocks.spreader
@@ -100,7 +100,7 @@ public final class MultiblockRenderHandler {
BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos();
GlStateManager.pushMatrix();
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.disableLighting();
@@ -37,7 +37,7 @@ public final class RedStringRenderer {
GlStateManager.pushMatrix();
GlStateManager.disableTexture2D();
GlStateManager.enableBlend();
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
GlStateManager.disableLighting();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GlStateManager.color(1F, 0F, 0F, sizeAlpha);
@@ -64,7 +64,7 @@ public final class SubTileRadiusRenderHandler {
GlStateManager.pushMatrix();
GlStateManager.disableTexture2D();
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
GlStateManager.disableLighting();
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -187,8 +187,8 @@ public final class TooltipAdditionDisplayHandler {
String rank = I18n.format("botania.rank" + level).replaceAll("&", "\u00a7");
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glDisable(GL11.GL_LIGHTING);
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
GlStateManager.disableLighting();
font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF);
if(!ss) {
rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7");
@@ -32,7 +32,7 @@ public final class ParticleRenderDispatcher {
Profiler profiler = Minecraft.getMinecraft().mcProfiler;
GL11.glPushAttrib(GL11.GL_LIGHTING);
GL11.glPushAttrib(GL11.GL_LIGHTING_BIT);
GlStateManager.depthMask(false);
GlStateManager.enableBlend();
GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
@@ -66,7 +66,7 @@ public class ModelHourglass extends ModelBase {
base2.render(f);
Color c = new Color(color);
GL11.glColor3ub((byte) c.getRed(), (byte) c.getGreen(), (byte) c.getBlue());
GL11.glPushAttrib(GL11.GL_NORMALIZE);
GL11.glPushAttrib(GL11.GL_TRANSFORM_BIT);
GlStateManager.enableNormalize();
if(fract1 > 0) {
@@ -69,7 +69,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
if(pool != null)
time += new Random(pool.getPos().getX() ^ pool.getPos().getY() ^ pool.getPos().getZ()).nextInt(100000);
color = MathHelper.hsvToRGB(time * 0.005F, 0.6F, 1F);
color = Color.HSBtoRGB(time * 0.005F, 0.6F, 1F);
}
if (fab || forceManaNumber > -1) {