From e918b5692c25323faf44d8ab9fe62172791f2a63 Mon Sep 17 00:00:00 2001
From: WayofTime <wtime@live.ca>
Date: Thu, 24 Dec 2015 20:28:39 -0500
Subject: [PATCH] Fix #514

---
 .../AlchemyCircleRenderer.java                | 65 +++++++++----------
 1 file changed, 29 insertions(+), 36 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java
index 66414218..81d68ef4 100644
--- a/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java
+++ b/src/main/java/WayofTime/bloodmagic/api/alchemyCrafting/AlchemyCircleRenderer.java
@@ -1,6 +1,7 @@
 package WayofTime.bloodmagic.api.alchemyCrafting;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -38,7 +39,7 @@ public class AlchemyCircleRenderer {
 	}
 
 	public float getSizeModifier(float craftTime) {
-		if (craftTime >= 150) {
+		if (craftTime >= 150 && craftTime <= 250) {
 			return (200 - craftTime) / 50f;
 		}
 		return 1.0f;
@@ -59,7 +60,7 @@ public class AlchemyCircleRenderer {
 		Tessellator tessellator = Tessellator.getInstance();
 		WorldRenderer wr = tessellator.getWorldRenderer();
 
-		GL11.glPushMatrix();
+		GlStateManager.pushMatrix();
 		// float rot = (float)(this.worldObj.provider.getWorldTime() % (360 /
 		// this.rotationspeed) * this.rotationspeed) + this.rotationspeed * f;
 		float rot = getRotation(craftTime);
@@ -70,76 +71,68 @@ public class AlchemyCircleRenderer {
 		// Bind the texture to the circle
 		Minecraft.getMinecraft().renderEngine.bindTexture(arrayResource);
 
-		GL11.glTexParameterf(3553, 10242, 10497.0F);
-		GL11.glTexParameterf(3553, 10243, 10497.0F);
+		GlStateManager.disableCull();
+		GlStateManager.enableBlend();
+		GlStateManager.blendFunc(770, 1);
 
-		GL11.glDisable(2884);
-
-		GL11.glEnable(3042);
-		GL11.glBlendFunc(770, 1);
-
-		GL11.glTranslated(x, y, z);
+		GlStateManager.translate(x, y, z);
 
 		EnumFacing sideHit = EnumFacing.UP; // Specify which face this "circle"
 											// is located on
-		GL11.glTranslatef(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY()
+		GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY()
 				* offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace);
 
 		switch (sideHit) {
 		case DOWN:
-			GL11.glTranslatef(0, 0, 1);
-			GL11.glRotatef(-90.0f, 1, 0, 0);
+			GlStateManager.translate(0, 0, 1);
+			GlStateManager.rotate(-90.0f, 1, 0, 0);
 			break;
 		case EAST:
-			GL11.glRotatef(-90.0f, 0, 1, 0);
-			GL11.glTranslatef(0, 0, -1);
+			GlStateManager.rotate(-90.0f, 0, 1, 0);
+			GlStateManager.translate(0, 0, -1);
 			break;
 		case NORTH:
 			break;
 		case SOUTH:
-			GL11.glRotatef(180.0f, 0, 1, 0);
-			GL11.glTranslatef(-1, 0, -1);
+			GlStateManager.rotate(180.0f, 0, 1, 0);
+			GlStateManager.translate(-1, 0, -1);
 			break;
 		case UP:
-			GL11.glTranslatef(0, 1, 0);
-			GL11.glRotatef(90.0f, 1, 0, 0);
+			GlStateManager.translate(0, 1, 0);
+			GlStateManager.rotate(90.0f, 1, 0, 0);
 			break;
 		case WEST:
-			GL11.glTranslatef(0, 0, 1);
-			GL11.glRotatef(90.0f, 0, 1, 0);
+			GlStateManager.translate(0, 0, 1);
+			GlStateManager.rotate(90.0f, 0, 1, 0);
 			break;
 		}
 
-		GL11.glPushMatrix();
-		GL11.glTranslatef(0.5f, 0.5f, getVerticalOffset(craftTime));
-		GL11.glRotatef(rot, 0, 0, 1);
-		GL11.glRotatef(secondaryRot, 1, 0, 0);
-		GL11.glRotatef(secondaryRot * 0.45812f, 0, 0, 1);
+		GlStateManager.pushMatrix();
+		GlStateManager.translate(0.5f, 0.5f, getVerticalOffset(craftTime));
+		GlStateManager.rotate(rot, 0, 0, 1);
+		GlStateManager.rotate(secondaryRot, 1, 0, 0);
+		GlStateManager.rotate(secondaryRot * 0.45812f, 0, 0, 1);
 		double var31 = 0.0D;
 		double var33 = 1.0D;
 		double var35 = 0;
 		double var37 = 1;
 
-		// GL11.glRotatef(60.0F, 0.0F, 1.0F, 0.0F);
-		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		GlStateManager.color(0.5f, 1f, 1f, 1f);
 		wr.begin(7, DefaultVertexFormats.POSITION_TEX);
 		// wr.setBrightness(200);
-		// wr.putColorRGB_F(1, 1, 1, 1);
-		// wr.putColorMultiplier(1, 1, 1, 1);
 		wr.pos(size / 2f, size / 2f, 0.0D).tex(var33, var37).endVertex();
 		wr.pos(size / 2f, -size / 2f, 0.0D).tex(var33, var35).endVertex();
 		wr.pos(-size / 2f, -size / 2f, 0.0D).tex(var31, var35).endVertex();
 		wr.pos(-size / 2f, size / 2f, 0.0D).tex(var31, var37).endVertex();
-		// wr.putColorMultiplier(0.5f, 1, 1, 7);
 		tessellator.draw();
 
-		GL11.glPopMatrix();
+		GlStateManager.popMatrix();
 
-		GL11.glDepthMask(true);
-		GL11.glDisable(3042);
-		GL11.glEnable(2884);
+		// GlStateManager.depthMask(true);
+		GlStateManager.disableBlend();
+		GlStateManager.enableCull();
 		// GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 
-		GL11.glPopMatrix();
+		GlStateManager.popMatrix();
 	}
 }
\ No newline at end of file