Fixed GL11 reference to GlStateManager

Author: Abastro

src/main/java/stellarapi/feature/gui/overlay/OverlayContainer.java

@@ -5,6 +5,7 @@
 import com.google.common.collect.ImmutableList;
 
 import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.renderer.GlStateManager;
 import stellarapi.api.gui.overlay.EnumOverlayMode;
 import stellarapi.api.gui.overlay.IOverlayElement;
 import stellarapi.api.gui.overlay.IRawOverlayElement;
@@ -159,19 +160,19 @@ public void render(int mouseX, int mouseY, float partialTicks) {
 			scaledMouseX -= animationOffsetX;
 			scaledMouseY -= animationOffsetY;
 
-			GL11.glPushMatrix();
-			GL11.glTranslatef((pos.getHorizontalPos().getOffset(this.width, width) + animationOffsetX),
+			GlStateManager.pushMatrix();
+			GlStateManager.translate((pos.getHorizontalPos().getOffset(this.width, width) + animationOffsetX),
 					(pos.getVerticalPos().getOffset(this.height, height) + animationOffsetY), 0.0f);
 
 			element.render(scaledMouseX, scaledMouseY, partialTicks);
-			GL11.glPopMatrix();
+			GlStateManager.popMatrix();
 
 			if (delegate.getHandler() != null)
 				delegate.getHandler().render(mouseX, mouseY, partialTicks);
 		}
 
 		// Refreshes color for next elements to be rendered correctly.
-		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+		GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
 	}
 
 	public int getWidth() {

src/main/java/stellarapi/feature/gui/overlay/configurator/OverlayConfiguratorHandler.java

@@ -6,6 +6,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
+import net.minecraft.client.renderer.GlStateManager;
 import stellarapi.api.gui.overlay.EnumOverlayMode;
 import stellarapi.api.gui.overlay.IOverlayManager;
 import stellarapi.api.gui.overlay.IRawHandler;
@@ -153,10 +154,10 @@ public void render(int mouseX, int mouseY, float partialTicks) {
 						possible ? 0xff00ff00 : 0xffff0000);
 				GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
 
-				GL11.glDisable(GL11.GL_ALPHA_TEST);
+				GlStateManager.disableAlpha();
 				Gui.drawRect(offsetX + 1, offsetY + 1, offsetX + elementWidth - 1, offsetY + elementHeight - 1,
 						possible ? 0x0f00ff00 : 0x0fff0000);
-				GL11.glEnable(GL11.GL_ALPHA_TEST);
+				GlStateManager.enableAlpha();
 			} else if (this.eventButton == 1) {
 				boolean contain = mainOverlay.doesContain(this.currentSelected);
 
@@ -165,10 +166,10 @@ public void render(int mouseX, int mouseY, float partialTicks) {
 						!contain ? 0xff0066ff : 0xffff0000);
 				GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
 
-				GL11.glDisable(GL11.GL_ALPHA_TEST);
+				GlStateManager.disableAlpha();
 				Gui.drawRect(offsetX + 3, offsetY + 3, offsetX + elementWidth - 3, offsetY + elementHeight - 3,
 						!contain ? 0x0f0099ff : 0x0fff0000);
-				GL11.glEnable(GL11.GL_ALPHA_TEST);
+				GlStateManager.enableAlpha();
 
 				if (!contain)
 					Gui.drawRect(offsetX + elementWidth / 2 - 1, offsetY + elementHeight / 2 - 8,
@@ -199,9 +200,9 @@ public void render(int mouseX, int mouseY, float partialTicks) {
 			Gui.drawRect(offsetX + 3, offsetY + 3, offsetX + elementWidth - 3, offsetY + elementHeight - 3, 0xff0000ff);
 			GL11.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL);
 
-			GL11.glDisable(GL11.GL_ALPHA_TEST);
+			GlStateManager.disableAlpha();
 			Gui.drawRect(offsetX + 3, offsetY + 3, offsetX + elementWidth - 3, offsetY + elementHeight - 3, 0x0f0000ff);
-			GL11.glEnable(GL11.GL_ALPHA_TEST);
+			GlStateManager.enableAlpha();
 		}
 	}
 

src/main/java/stellarapi/lib/gui/GuiRenderer.java

@@ -9,6 +9,7 @@
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureManager;
 import stellarapi.StellarAPI;
@@ -108,8 +109,8 @@ public void render(String info, IRectangleBound totalBound, IRectangleBound clip
 		float centerX = totalBound.getMainX(0.5f);
 		float centerY = totalBound.getMainY(0.5f);
 
-		GL11.glPushMatrix();
-		GL11.glTranslatef(centerX, centerY, 0.0f);
+		GlStateManager.pushMatrix();
+		GlStateManager.translate(centerX, centerY, 0.0f);
 
 		for (IMatrixTransformation trans : this.transformation)
 			trans.doTransform();
@@ -128,7 +129,7 @@ public void render(String info, IRectangleBound totalBound, IRectangleBound clip
 
 		currentModel.renderModel(info, this.temp, this.tempClip, this.tessellator, this.worldRenderer,
 				this.textureManager, this.currentColor);
-		GL11.glPopMatrix();
+		GlStateManager.popMatrix();
 
 		if (this.matrixPushedTillNextRender) {
 			innerTrans.clear();
@@ -148,7 +149,7 @@ public void endRender() {
 		transformation.clear();
 		innerTrans.clear();
 		this.currentModel = null;
-		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+		GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
 	}
 
 	private interface IMatrixTransformation {
@@ -166,7 +167,7 @@ public Translation(float x, float y) {
 
 		@Override
 		public void doTransform() {
-			GL11.glTranslatef(x, y, 0.0f);
+			GlStateManager.translate(x, y, 0.0f);
 		}
 	}
 
@@ -181,7 +182,7 @@ public Scale(float x, float y) {
 
 		@Override
 		public void doTransform() {
-			GL11.glScalef(x, y, 1.0f);
+			GlStateManager.scale(x, y, 1.0f);
 		}
 	}
 
@@ -198,7 +199,7 @@ public Rotation(float angle, float x, float y, float z) {
 
 		@Override
 		public void doTransform() {
-			GL11.glRotatef(angle, x, y, z);
+			GlStateManager.rotate(angle, x, y, z);
 		}
 	}
 
@@ -214,6 +215,6 @@ public void preRender(float partialTicks) {
 
 	@Override
 	public void postRender(float partialTicks) {
-		GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+		GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f);
 	}
 }

src/main/java/stellarapi/lib/gui/model/font/WrappedFontRenderer.java

@@ -1,9 +1,8 @@
 package stellarapi.lib.gui.model.font;
 
-import org.lwjgl.opengl.GL11;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
 
@@ -69,7 +68,7 @@ public int drawString(String str, float posX, float posY, int color, boolean dro
 
 	@Override
 	protected void setColor(float r, float g, float b, float a) {
-		GL11.glColor4f(this.redWrapped * r, this.greenWrapped * g, this.blueWrapped * b, this.alphaWrapped * a);
+		GlStateManager.color(this.redWrapped * r, this.greenWrapped * g, this.blueWrapped * b, this.alphaWrapped * a);
 	}
 
 }