diff --git a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java index a92cd4585..784a4cb53 100755 --- a/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java +++ b/src/main/java/forestry/apiculture/gui/GuiHabitatLocator.java @@ -20,14 +20,13 @@ import java.util.EnumSet; import java.util.List; import java.util.Set; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.StatCollector; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.BiomeDictionary; -import org.lwjgl.opengl.GL11; - import forestry.apiculture.gui.widgets.HabitatSlot; import forestry.apiculture.inventory.ItemInventoryHabitatLocator; import forestry.core.config.Constants; @@ -101,7 +100,7 @@ public class GuiHabitatLocator extends GuiForestry boolean researched = breedingTracker.isResearched(combination); if (researched) { fontRendererObj.drawString("+", x + 9, y + 1, 0); - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); } } @@ -345,7 +344,7 @@ public abstract class GuiAlyzer extends GuiForestry String text = "(" + toleranceAllele.getName() + ")"; // Enable correct lighting. - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); switch (tolerance) { case BOTH_1: @@ -401,7 +400,7 @@ public abstract class GuiAlyzer extends GuiForestry protected void drawFertilityInfo(int fertility, int x, int textColor, int texOffset) { // Enable correct lighting. - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); String fertilityString = Integer.toString(fertility) + " x"; diff --git a/src/main/java/forestry/core/gui/GuiEscritoire.java b/src/main/java/forestry/core/gui/GuiEscritoire.java index b8eacebf4..7acfd619b 100755 --- a/src/main/java/forestry/core/gui/GuiEscritoire.java +++ b/src/main/java/forestry/core/gui/GuiEscritoire.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.gui; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import org.lwjgl.opengl.GL11; - import forestry.core.config.Constants; import forestry.core.gui.widgets.GameTokenWidget; import forestry.core.gui.widgets.ProbeButton; @@ -87,8 +86,8 @@ public class GuiEscritoire extends GuiForestry ext int y = (height - ySize) / 2; drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); + RenderHelper.enableGUIStandardItemLighting(); + GlStateManager.disableLighting(); + GlStateManager.enableRescaleNormal(); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.pushMatrix(); { - RenderHelper.enableGUIStandardItemLighting(); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glPushMatrix(); - { - GL11.glTranslatef(guiLeft, guiTop, 0.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240 / 1.0F, 240 / 1.0F); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - drawWidgets(); - } - GL11.glPopMatrix(); + GlStateManager.translate(guiLeft, guiTop, 0.0F); + drawWidgets(); } - GL11.glPopAttrib(); + GlStateManager.popMatrix(); bindTexture(textureFile); } @@ -229,7 +218,7 @@ public abstract class GuiForestry ext } protected void bindTexture(ResourceLocation texturePath) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); Proxies.render.bindTexture(texturePath); } diff --git a/src/main/java/forestry/core/gui/GuiUtil.java b/src/main/java/forestry/core/gui/GuiUtil.java index 3dfba325f..24cb69128 100644 --- a/src/main/java/forestry/core/gui/GuiUtil.java +++ b/src/main/java/forestry/core/gui/GuiUtil.java @@ -16,27 +16,16 @@ import java.util.List; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.item.ItemStack; import net.minecraftforge.fml.client.config.GuiUtils; -import org.lwjgl.opengl.GL11; - import forestry.core.gui.tooltips.IToolTipProvider; import forestry.core.gui.tooltips.ToolTip; public class GuiUtil { public static void drawItemStack(GuiForestry gui, ItemStack stack, int xPos, int yPos) { - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - RenderHelper.enableGUIStandardItemLighting(); - - RenderItem itemRender = GuiForestry.getItemRenderer(); - - GL11.glTranslatef(0.0F, 0.0F, 32.0F); - gui.setZLevel(100.0F); - itemRender.zLevel = 100.0F; FontRenderer font = null; if (stack != null) { font = stack.getItem().getFontRenderer(stack); @@ -44,13 +33,10 @@ public class GuiUtil { if (font == null) { font = gui.getFontRenderer(); } - itemRender.renderItemAndEffectIntoGUI(stack, xPos, yPos); - itemRender.renderItemOverlayIntoGUI(font, stack, xPos, yPos, ""); - gui.setZLevel(0.0F); - itemRender.zLevel = 0.0F; - RenderHelper.disableStandardItemLighting(); - GL11.glPopAttrib(); + RenderItem itemRender = GuiForestry.getItemRenderer(); + itemRender.renderItemAndEffectIntoGUI(stack, xPos, yPos); + itemRender.renderItemOverlayIntoGUI(font, stack, xPos, yPos, null); } public static void drawToolTips(GuiForestry gui, ToolTip toolTips, int mouseX, int mouseY) { diff --git a/src/main/java/forestry/core/gui/TextLayoutHelper.java b/src/main/java/forestry/core/gui/TextLayoutHelper.java index 18dcab11d..ca9643755 100644 --- a/src/main/java/forestry/core/gui/TextLayoutHelper.java +++ b/src/main/java/forestry/core/gui/TextLayoutHelper.java @@ -11,8 +11,7 @@ package forestry.core.gui; import net.minecraft.client.gui.FontRenderer; - -import org.lwjgl.opengl.GL11; +import net.minecraft.client.renderer.GlStateManager; import forestry.core.render.FontColour; @@ -39,7 +38,7 @@ public class TextLayoutHelper { public void startPage() { line = LINE_HEIGHT; - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); } public void startPage(int column0, int column1, int column2) { @@ -68,7 +67,7 @@ public class TextLayoutHelper { } public void endPage() { - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } public void drawRow(String text0, String text1, String text2, int colour0, int colour1, int colour2) { diff --git a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java index 13bb208e9..752857316 100755 --- a/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java +++ b/src/main/java/forestry/core/gui/buttons/GuiBetterButton.java @@ -13,13 +13,12 @@ package forestry.core.gui.buttons; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import org.lwjgl.opengl.GL11; - import forestry.core.config.Constants; import forestry.core.gui.tooltips.IToolTipProvider; import forestry.core.gui.tooltips.ToolTip; @@ -95,7 +94,7 @@ public class GuiBetterButton extends GuiButton implements IToolTipProvider { } FontRenderer fontrenderer = minecraft.fontRendererObj; bindButtonTextures(minecraft); - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); int xOffset = texture.getX(); int yOffset = texture.getY(); int h = texture.getHeight(); diff --git a/src/main/java/forestry/core/gui/ledgers/Ledger.java b/src/main/java/forestry/core/gui/ledgers/Ledger.java index f27f04203..bdbd06379 100644 --- a/src/main/java/forestry/core/gui/ledgers/Ledger.java +++ b/src/main/java/forestry/core/gui/ledgers/Ledger.java @@ -14,12 +14,11 @@ import java.awt.Rectangle; import java.util.List; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.config.SessionVars; @@ -198,7 +197,7 @@ public abstract class Ledger { float colorG = (overlayColor >> 8 & 255) / 255.0F; float colorB = (overlayColor & 255) / 255.0F; - GL11.glColor4f(colorR, colorG, colorB, 1.0F); + GlStateManager.color(colorR, colorG, colorB, 1.0F); Proxies.render.bindTexture(texture); @@ -211,12 +210,12 @@ public abstract class Ledger { manager.gui.drawTexturedModalRect(x + 4, y + 4, 256 - width + 4, 256 - height + 4, width - 4, height - 4); // body + bottom + right - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0F); } protected void drawSprite(TextureAtlasSprite sprite, int x, int y) { if (sprite != null) { - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0F); Proxies.render.bindTexture(TextureMap.locationBlocksTexture); manager.gui.drawTexturedModalRect(x, y, sprite, 16, 16); } diff --git a/src/main/java/forestry/core/gui/ledgers/LedgerManager.java b/src/main/java/forestry/core/gui/ledgers/LedgerManager.java index a373f3d11..39e16d15f 100644 --- a/src/main/java/forestry/core/gui/ledgers/LedgerManager.java +++ b/src/main/java/forestry/core/gui/ledgers/LedgerManager.java @@ -15,7 +15,7 @@ import java.awt.Rectangle; import java.util.ArrayList; import java.util.List; -import org.lwjgl.opengl.GL11; +import net.minecraft.client.renderer.GlStateManager; import forestry.api.core.IErrorSource; import forestry.api.core.IErrorState; @@ -133,7 +133,7 @@ public class LedgerManager { continue; } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); ledger.setPosition(gui.getSizeX(), yPos); ledger.draw(); yPos += ledger.getHeight(); @@ -156,7 +156,7 @@ public class LedgerManager { continue; } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); errorLedger.draw(-errorLedger.getWidth(), yPos); yPos += errorLedger.getHeight(); } diff --git a/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java b/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java index 2e11576fc..3505983bd 100644 --- a/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java +++ b/src/main/java/forestry/core/gui/widgets/GameTokenWidget.java @@ -10,14 +10,12 @@ ******************************************************************************/ package forestry.core.gui.widgets; -import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import org.lwjgl.opengl.GL11; - import forestry.core.gui.GuiUtil; import forestry.core.gui.tooltips.ToolTip; import forestry.core.network.packets.PacketGuiSelectRequest; @@ -58,9 +56,10 @@ public class GameTokenWidget extends Widget { Proxies.render.bindTexture(manager.gui.textureFile); - GL11.glColor4f(colorR, colorG, colorB, 1.0F); + GlStateManager.enableDepth(); + GlStateManager.color(colorR, colorG, colorB); manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, 228, 0, 22, 22); - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); + GlStateManager.color(1.0f, 1.0f, 1.0f); ItemStack tokenStack = HIDDEN_TOKEN; if (token.isVisible()) { @@ -69,15 +68,13 @@ public class GameTokenWidget extends Widget { GuiUtil.drawItemStack(manager.gui, tokenStack, startX + xPos + 3, startY + yPos + 3); - manager.gui.setZLevel(150f); + GlStateManager.disableDepth(); for (String ident : getToken().getOverlayIcons()) { - RenderHelper.enableGUIStandardItemLighting(); Proxies.render.bindTexture(TextureMap.locationBlocksTexture); TextureAtlasSprite icon = TextureManager.getInstance().getDefault(ident); manager.gui.drawTexturedModalRect(startX + xPos + 3, startY + yPos + 3, icon, 16, 16); - RenderHelper.disableStandardItemLighting(); } - manager.gui.setZLevel(0f); + GlStateManager.enableDepth(); } @Override diff --git a/src/main/java/forestry/core/gui/widgets/ProbeButton.java b/src/main/java/forestry/core/gui/widgets/ProbeButton.java index cd238511c..90a49fb3f 100644 --- a/src/main/java/forestry/core/gui/widgets/ProbeButton.java +++ b/src/main/java/forestry/core/gui/widgets/ProbeButton.java @@ -10,7 +10,7 @@ ******************************************************************************/ package forestry.core.gui.widgets; -import org.lwjgl.opengl.GL11; +import net.minecraft.client.renderer.GlStateManager; import forestry.core.gui.GuiEscritoire; import forestry.core.gui.tooltips.ToolTip; @@ -32,7 +32,7 @@ public class ProbeButton extends Widget { @Override public void draw(int startX, int startY) { - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0F); Proxies.render.bindTexture(manager.gui.textureFile); manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, 228, pressed ? 47 : 22, width, height); } diff --git a/src/main/java/forestry/core/gui/widgets/TankWidget.java b/src/main/java/forestry/core/gui/widgets/TankWidget.java index 8c1cb67ea..90af30e4b 100755 --- a/src/main/java/forestry/core/gui/widgets/TankWidget.java +++ b/src/main/java/forestry/core/gui/widgets/TankWidget.java @@ -132,8 +132,10 @@ public class TankWidget extends Widget { } if (drawOverlay) { + GlStateManager.disableDepth(); Proxies.render.bindTexture(manager.gui.textureFile); manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, overlayTexX, overlayTexY, 16, 60); + GlStateManager.enableDepth(); } GlStateManager.color(1, 1, 1, 1); diff --git a/src/main/java/forestry/core/gui/widgets/WidgetManager.java b/src/main/java/forestry/core/gui/widgets/WidgetManager.java index 96c306cc2..b5953a724 100644 --- a/src/main/java/forestry/core/gui/widgets/WidgetManager.java +++ b/src/main/java/forestry/core/gui/widgets/WidgetManager.java @@ -15,8 +15,6 @@ import java.util.List; import net.minecraft.client.Minecraft; -import org.lwjgl.opengl.GL11; - import forestry.core.gui.GuiForestry; import forestry.core.proxy.Proxies; @@ -58,15 +56,9 @@ public class WidgetManager { } public void drawWidgets() { - gui.setZLevel(100.0F); - GuiForestry.getItemRenderer().zLevel = 100.0F; for (Widget slot : widgets) { - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); slot.draw(0, 0); } - gui.setZLevel(0.0F); - GuiForestry.getItemRenderer().zLevel = 0.0F; - } public void handleMouseClicked(int mouseX, int mouseY, int mouseButton) { diff --git a/src/main/java/forestry/core/render/RenderAnalyzer.java b/src/main/java/forestry/core/render/RenderAnalyzer.java index 2df2be52f..18aea58cb 100755 --- a/src/main/java/forestry/core/render/RenderAnalyzer.java +++ b/src/main/java/forestry/core/render/RenderAnalyzer.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.core.render; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.entity.item.EntityItem; @@ -17,8 +18,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.world.World; -import org.lwjgl.opengl.GL11; - import forestry.apiculture.render.ModelAnalyzer; import forestry.core.proxy.Proxies; import forestry.core.tiles.TileAnalyzer; @@ -55,10 +54,10 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer { } float renderScale = 1.0f; - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - GL11.glTranslatef(0.5f, 0.2f, 0.5f); - GL11.glScalef(renderScale, renderScale, renderScale); + GlStateManager.pushMatrix(); + GlStateManager.translate((float) x, (float) y, (float) z); + GlStateManager.translate(0.5f, 0.2f, 0.5f); + GlStateManager.scale(renderScale, renderScale, renderScale); dummyEntityItem.setEntityItemStack(itemstack); if (world.getTotalWorldTime() != lastTick) { @@ -68,7 +67,7 @@ public class RenderAnalyzer extends TileEntitySpecialRenderer { RenderManager rendermanager = Proxies.common.getClientInstance().getRenderManager(); rendermanager.renderEntityWithPosYaw(dummyEntityItem, 0.0D, 0.0D, 0.0D, 0.0F, 0.0F); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } diff --git a/src/main/java/forestry/core/render/RenderEscritoire.java b/src/main/java/forestry/core/render/RenderEscritoire.java index 9e3dcba8a..dfc5acb10 100755 --- a/src/main/java/forestry/core/render/RenderEscritoire.java +++ b/src/main/java/forestry/core/render/RenderEscritoire.java @@ -10,13 +10,12 @@ ******************************************************************************/ package forestry.core.render; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import forestry.core.config.Constants; import forestry.core.inventory.InventoryEscritoire; import forestry.core.models.ModelEscritoire; @@ -48,8 +47,8 @@ public class RenderEscritoire extends TileEntitySpecialRenderer private void render(ItemStack itemstack, EnumFacing orientation, double x, double y, double z) { float factor = (float) (1.0 / 16.0); - GL11.glPushMatrix(); - GL11.glTranslatef((float) x + 0.5f, (float) y + 0.875f, (float) z + 0.5f); + GlStateManager.pushMatrix(); + GlStateManager.translate((float) x + 0.5f, (float) y + 0.875f, (float) z + 0.5f); float[] angle = {(float) Math.PI, 0, 0}; @@ -74,23 +73,23 @@ public class RenderEscritoire extends TileEntitySpecialRenderer Proxies.render.bindTexture(texture); modelEscritoire.render(null, angle[0], angle[1], angle[2], 0f, 0f, factor); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); /* if(itemstack != null) { float renderScale = 1.0f; - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); - GL11.glTranslatef(0.6f, 0.8f, 0.5f); - GL11.glRotatef(90.0f, 1.0F, 0.0F, 0.0F); - GL11.glScalef(renderScale, renderScale, renderScale); + GlStateManager.pushMatrix(); + GlStateManager.translate((float) x, (float) y, (float) z); + GlStateManager.translate(0.6f, 0.8f, 0.5f); + GlStateManager.rotate(90.0f, 1.0F, 0.0F, 0.0F); + GlStateManager.scale(renderScale, renderScale, renderScale); RenderItem.renderInFrame = true; dummyEntityItem.setEntityItemStack(itemstack); customRenderItem.doRenderItem(dummyEntityItem, 0, 0, 0, 0, 0); RenderItem.renderInFrame = false; - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } */ diff --git a/src/main/java/forestry/core/render/RenderMachine.java b/src/main/java/forestry/core/render/RenderMachine.java index f1a621e27..ab8d804e0 100755 --- a/src/main/java/forestry/core/render/RenderMachine.java +++ b/src/main/java/forestry/core/render/RenderMachine.java @@ -16,12 +16,11 @@ import java.util.Locale; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import forestry.core.proxy.Proxies; import forestry.core.tiles.IRenderableTile; import forestry.core.tiles.TileBase; @@ -97,8 +96,8 @@ public class RenderMachine extends TileEntitySpecialRenderer { } private void render(TankRenderInfo resourceTankInfo, TankRenderInfo productTankInfo, EnumFacing orientation, double x, double y, double z) { - GL11.glPushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); + GlStateManager.pushMatrix(); + GlStateManager.translate((float) x, (float) y, (float) z); float[] angle = {0, 0, 0}; @@ -154,7 +153,7 @@ public class RenderMachine extends TileEntitySpecialRenderer { renderTank(resourceTank, textureResourceTank, resourceTankInfo, factor); renderTank(productTank, textureProductTank, productTankInfo, factor); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } private void renderTank(ModelRenderer tankModel, ResourceLocation textureBase, TankRenderInfo renderInfo, float factor) { @@ -169,12 +168,12 @@ public class RenderMachine extends TileEntitySpecialRenderer { Color primaryTankColor = renderInfo.getFluidColor(); float[] colors = new float[3]; primaryTankColor.getRGBColorComponents(colors); - GL11.glColor4f(colors[0], colors[1], colors[2], 1.0f); + GlStateManager.color(colors[0], colors[1], colors[2], 1.0f); Proxies.render.bindTexture(textureResourceTankLevel); tankModel.render(factor); - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0f); } private static class RenderModelBase extends ModelBase { diff --git a/src/main/java/forestry/core/render/RenderMill.java b/src/main/java/forestry/core/render/RenderMill.java index 8ae616edd..29fcc17e6 100755 --- a/src/main/java/forestry/core/render/RenderMill.java +++ b/src/main/java/forestry/core/render/RenderMill.java @@ -12,12 +12,11 @@ package forestry.core.render; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import forestry.core.proxy.Proxies; import forestry.core.tiles.TileMill; @@ -102,9 +101,9 @@ public class RenderMill extends TileEntitySpecialRenderer { private void render(float progress, int charge, EnumFacing orientation, double x, double y, double z) { - GL11.glPushMatrix(); + GlStateManager.pushMatrix(); - GL11.glTranslatef((float) x, (float) y, (float) z); + GlStateManager.translate((float) x, (float) y, (float) z); float step; @@ -181,17 +180,17 @@ public class RenderMill extends TileEntitySpecialRenderer { extension.render(factor); Proxies.render.bindTexture(textures[Textures.BLADE_1.ordinal()]); - GL11.glTranslatef(translate[0] * tfactor, translate[1] * tfactor, translate[2] * tfactor); + GlStateManager.translate(translate[0] * tfactor, translate[1] * tfactor, translate[2] * tfactor); blade1.render(factor); // Reset - GL11.glTranslatef(-translate[0] * tfactor, -translate[1] * tfactor, -translate[2] * tfactor); + GlStateManager.translate(-translate[0] * tfactor, -translate[1] * tfactor, -translate[2] * tfactor); Proxies.render.bindTexture(textures[Textures.BLADE_2.ordinal()]); - GL11.glTranslatef(-translate[0] * tfactor, translate[1] * tfactor, -translate[2] * tfactor); + GlStateManager.translate(-translate[0] * tfactor, translate[1] * tfactor, -translate[2] * tfactor); blade2.render(factor); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } diff --git a/src/main/java/forestry/core/render/RenderNaturalistChest.java b/src/main/java/forestry/core/render/RenderNaturalistChest.java index 2275aaffb..84417de27 100644 --- a/src/main/java/forestry/core/render/RenderNaturalistChest.java +++ b/src/main/java/forestry/core/render/RenderNaturalistChest.java @@ -11,12 +11,11 @@ package forestry.core.render; import net.minecraft.client.model.ModelChest; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import forestry.core.config.Constants; import forestry.core.tiles.TileNaturalistChest; @@ -42,12 +41,12 @@ public class RenderNaturalistChest extends TileEntitySpecialRenderer { private void render(TemperatureState state, float progress, EnumFacing orientation, double x, double y, double z) { - GL11.glPushMatrix(); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glDisable(GL11.GL_BLEND); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glColor3f(1, 1, 1); + GlStateManager.pushMatrix(); + GlStateManager.pushAttrib(); + GlStateManager.enableLighting(); + GlStateManager.disableBlend(); + GlStateManager.enableCull(); + GlStateManager.color(1, 1, 1); - GL11.glTranslatef((float) x, (float) y, (float) z); + GlStateManager.translate((float) x, (float) y, (float) z); float step; @@ -159,9 +158,9 @@ public class RenderEngine extends TileEntitySpecialRenderer { boiler.render(factor); Proxies.render.bindTexture(textures[Textures.PISTON.ordinal()]); - GL11.glTranslatef(translate[0] * tfactor, translate[1] * tfactor, translate[2] * tfactor); + GlStateManager.translate(translate[0] * tfactor, translate[1] * tfactor, translate[2] * tfactor); piston.render(factor); - GL11.glTranslatef(-translate[0] * tfactor, -translate[1] * tfactor, -translate[2] * tfactor); + GlStateManager.translate(-translate[0] * tfactor, -translate[1] * tfactor, -translate[2] * tfactor); ResourceLocation texture; @@ -193,12 +192,12 @@ public class RenderEngine extends TileEntitySpecialRenderer { if (step > 0) { for (int i = 0; i <= step + 2; i += 2) { extension.render(factor); - GL11.glTranslatef(translate[0] * chamberf, translate[1] * chamberf, translate[2] * chamberf); + GlStateManager.translate(translate[0] * chamberf, translate[1] * chamberf, translate[2] * chamberf); } } - GL11.glPopAttrib(); - GL11.glPopMatrix(); + GlStateManager.popAttrib(); + GlStateManager.popMatrix(); } private static class EngineModelBase extends ModelBase { diff --git a/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java b/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java index 021191f40..6330b1441 100644 --- a/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java +++ b/src/main/java/forestry/factory/gui/widgets/MemorizedRecipeSlot.java @@ -10,6 +10,7 @@ ******************************************************************************/ package forestry.factory.gui.widgets; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; @@ -43,19 +44,14 @@ public class MemorizedRecipeSlot extends ItemStackWidgetBase { public void draw(int startX, int startY) { super.draw(startX, startY); - GL11.glPushAttrib(GL11.GL_ENABLE_BIT); - GL11.glDisable(GL11.GL_DEPTH_TEST); - GL11.glEnable(GL11.GL_BLEND); - GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlStateManager.disableDepth(); if (recipeMemory.isLocked(slotNumber)) { - manager.gui.setZLevel(110f); Proxies.render.bindTexture(TextureMap.locationBlocksTexture); manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos, lockIcon, 16, 16); - manager.gui.setZLevel(0f); } - GL11.glPopAttrib(); + GlStateManager.enableDepth(); } @Override diff --git a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java index 05c528713..e57155d35 100755 --- a/src/main/java/forestry/lepidopterology/render/ModelButterfly.java +++ b/src/main/java/forestry/lepidopterology/render/ModelButterfly.java @@ -12,11 +12,10 @@ package forestry.lepidopterology.render; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.Entity; import net.minecraft.util.MathHelper; -import org.lwjgl.opengl.GL11; - public class ModelButterfly extends ModelBase { private final ModelRenderer wingRight; @@ -76,15 +75,15 @@ public class ModelButterfly extends ModelBase { wingRight.rotateAngleZ = MathHelper.cos(swing * 1.3F) * (float) Math.PI * 0.25F; wingLeft.rotateAngleZ = -wingRight.rotateAngleZ; - GL11.glPushMatrix(); - GL11.glScalef(scale, scale, scale); - GL11.glTranslatef(0.0F, 20.0f / scale * f5, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.scale(scale, scale, scale); + GlStateManager.translate(0.0F, 20.0f / scale * f5, 0.0F); wingRight.render(f5); eyeRight.render(f5); eyeLeft.render(f5); wingLeft.render(f5); body.render(f5); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } diff --git a/src/main/java/forestry/lepidopterology/render/RendererCocoon.java b/src/main/java/forestry/lepidopterology/render/RendererCocoon.java index f016f746e..34cf20967 100644 --- a/src/main/java/forestry/lepidopterology/render/RendererCocoon.java +++ b/src/main/java/forestry/lepidopterology/render/RendererCocoon.java @@ -10,7 +10,10 @@ ******************************************************************************/ package forestry.lepidopterology.render; -import org.lwjgl.opengl.GL11; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.util.ResourceLocation; import forestry.api.lepidopterology.IAlleleButterflySpecies; import forestry.api.lepidopterology.IButterfly; @@ -19,9 +22,6 @@ import forestry.lepidopterology.blocks.BlockCocoon; import forestry.lepidopterology.blocks.BlockSolidCocoon; import forestry.lepidopterology.genetics.MothDefinition; import forestry.lepidopterology.tiles.TileCocoon; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; -import net.minecraft.util.ResourceLocation; public class RendererCocoon extends TileEntitySpecialRenderer { @@ -46,13 +46,13 @@ public class RendererCocoon extends TileEntitySpecialRenderer { private static void render(IButterfly butterfly, int age, double x, double y, double z){ IAlleleButterflySpecies species = butterfly.getGenome().getPrimary(); - GL11.glPushMatrix(); - GL11.glTranslated((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); - GL11.glRotated(180, 0F, 0F, 1F); - GL11.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + GlStateManager.pushMatrix(); + GlStateManager.translate((float) x + 0.5F, (float) y + 1.5F, (float) z + 0.5F); + GlStateManager.rotate(180, 0F, 0F, 1F); + GlStateManager.rotate(180.0F, 0.0F, 1.0F, 0.0F); Proxies.render.bindTexture(new ResourceLocation(species.getModID(), butterfly.getGenome().getCocoon().getCocoonTexture(age))); modelCocoon.renderCucoon(age); - GL11.glPopMatrix(); + GlStateManager.popMatrix(); } } diff --git a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java index ac7414a19..62f6ce865 100755 --- a/src/main/java/forestry/mail/gui/GuiMailboxInfo.java +++ b/src/main/java/forestry/mail/gui/GuiMailboxInfo.java @@ -14,10 +14,9 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.ScaledResolution; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; - import forestry.core.config.Config; import forestry.core.config.Constants; import forestry.core.proxy.Proxies; @@ -63,7 +62,7 @@ public class GuiMailboxInfo extends Gui { y = scaledresolution.getScaledHeight() - HEIGHT; } - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); Proxies.render.bindTexture(textureAlert); this.drawTexturedModalRect(x, y, 0, 0, WIDTH, HEIGHT); diff --git a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java index 2228873e5..261b49644 100644 --- a/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java +++ b/src/main/java/forestry/mail/gui/widgets/AddresseeSlot.java @@ -10,10 +10,9 @@ ******************************************************************************/ package forestry.mail.gui.widgets; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.texture.TextureMap; -import org.lwjgl.opengl.GL11; - import forestry.api.mail.IPostalCarrier; import forestry.api.mail.PostManager; import forestry.core.gui.tooltips.ToolTip; @@ -38,7 +37,7 @@ public class AddresseeSlot extends Widget { public void draw(int startX, int startY) { IPostalCarrier carrier = PostManager.postRegistry.getCarrier(containerLetter.getCarrierType()); if (carrier != null) { - GL11.glColor4f(1.0f, 1.0f, 1.0f, 1.0F); + GlStateManager.color(1.0f, 1.0f, 1.0f, 1.0F); Proxies.render.bindTexture(TextureMap.locationBlocksTexture); manager.gui.drawTexturedModalRect(startX + xPos, startY + yPos - 5, carrier.getSprite(), 26, 26); }