From abc2f6ab50f58d0eeb8571e882e65f3cdb109e1a Mon Sep 17 00:00:00 2001 From: Sen Date: Wed, 19 Mar 2025 23:31:33 +0100 Subject: [PATCH] OpenGL constants --- java/src/game/Game.java | 20 +- java/src/game/gui/Gui.java | 4 +- java/src/game/gui/element/GuiList.java | 2 +- java/src/game/renderer/Drawing.java | 10 +- java/src/game/renderer/EntityRenderer.java | 52 ++-- java/src/game/renderer/GlState.java | 266 +++--------------- java/src/game/renderer/ItemRenderer.java | 6 +- java/src/game/renderer/RenderGlobal.java | 28 +- java/src/game/renderer/entity/Render.java | 4 +- .../renderer/entity/RenderBlockEntity.java | 2 +- .../game/renderer/entity/RenderDragon.java | 14 +- .../renderer/entity/RenderEntityItem.java | 4 +- java/src/game/renderer/entity/RenderItem.java | 24 +- .../game/renderer/entity/RenderLightning.java | 4 +- .../renderer/entity/RenderTntMinecart.java | 2 +- .../game/renderer/entity/RenderTntPrimed.java | 2 +- .../renderer/entity/RendererLivingEntity.java | 6 +- java/src/game/renderer/layers/LayerArmor.java | 14 +- .../src/game/renderer/layers/LayerCharge.java | 10 +- .../renderer/layers/LayerEnderDragonEyes.java | 7 +- .../renderer/layers/LayerEntityBreak.java | 2 +- .../layers/LayerMooshroomMushroom.java | 4 +- .../game/renderer/layers/LayerSlimeGel.java | 4 +- java/src/game/renderer/model/ModelDragon.java | 4 +- .../renderer/particle/EffectRenderer.java | 8 +- .../renderer/particle/EntityFootStepFX.java | 4 +- .../tileentity/TileEntityChestRenderer.java | 14 +- .../TileEntityItemStackRenderer.java | 2 +- .../tileentity/TileEntityPistonRenderer.java | 2 +- .../tileentity/TileEntitySignRenderer.java | 8 +- .../tileentity/TileEntitySkullRenderer.java | 8 +- 31 files changed, 179 insertions(+), 362 deletions(-) diff --git a/java/src/game/Game.java b/java/src/game/Game.java index fd1e99f..54a8f42 100755 --- a/java/src/game/Game.java +++ b/java/src/game/Game.java @@ -470,16 +470,16 @@ public class Game implements IThreadListener { Colorizer.reload(); GlState.enableTexture2D(); GlState.shadeModel(GL11.GL_SMOOTH); - GlState.clearDepth(1.0D); + GL11.glClearDepth(1.0D); GlState.enableDepth(); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); GlState.enableAlpha(); - GlState.alphaFunc(516, 0.1F); - GlState.cullFace(1029); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); + GlState.cullFace(GL11.GL_BACK); GlState.enableCull(); - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); this.textureMap = new TextureMap(); this.textureManager.loadTexture(TextureMap.locationBlocksTexture, this.textureMap); this.textureManager.bindTexture(TextureMap.locationBlocksTexture); @@ -892,7 +892,7 @@ public class Game implements IThreadListener { GlState.enableRescaleNormal(); GlState.enableBlend(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); - // GlState.tryBlendFuncSeparate(770, 771, 1, 0); + // GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); ItemRenderer.enableGUIStandardItemLighting(); // this.getTextureManager().bindTexture("textures/gui/inventory.png"); GL11.glPushMatrix(); @@ -1993,10 +1993,10 @@ public class Game implements IThreadListener { GlState.setActiveTexture(GL13.GL_TEXTURE0); GlState.color(1.0f, 1.0f, 1.0f, 1.0f); GL11.glClear(256); - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); GL11.glOrtho(0.0D, (double)this.fb_x, (double)this.fb_y, 0.0D, 1000.0D, 3000.0D); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glLoadIdentity(); GL11.glTranslatef(0.0F, 0.0F, -2000.0F); } @@ -2989,7 +2989,7 @@ public class Game implements IThreadListener { private void renderWorldDirections(float partialTicks) { GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GL11.glLineWidth(1.0F); GlState.disableTexture2D(); GlState.depthMask(false); diff --git a/java/src/game/gui/Gui.java b/java/src/game/gui/Gui.java index 9a497c8..a57231a 100644 --- a/java/src/game/gui/Gui.java +++ b/java/src/game/gui/Gui.java @@ -242,7 +242,7 @@ public abstract class Gui { // RenderBuffer worldrenderer = Tessellator.getBuffer(); // GlState.enableBlend(); // GlState.disableTexture2D(); -// GlState.tryBlendFuncSeparate(770, 771, 1, 0); +// GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); // GlState.color(f, f1, f2, f3); // worldrenderer.begin(7, DefaultVertexFormats.POSITION); // worldrenderer.pos((double)left, (double)bottom, 0.0D).endVertex(); @@ -293,7 +293,7 @@ public abstract class Gui { // GlState.disableTexture2D(); // GlState.enableBlend(); // GlState.disableAlpha(); -// GlState.tryBlendFuncSeparate(770, 771, 1, 0); +// GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); // GlState.shadeModel(GL11.GL_SMOOTH); // RenderBuffer worldrenderer = Tessellator.getBuffer(); // worldrenderer.begin(7, DefaultVertexFormats.POSITION_COLOR); diff --git a/java/src/game/gui/element/GuiList.java b/java/src/game/gui/element/GuiList.java index 8c1bc9c..a120299 100755 --- a/java/src/game/gui/element/GuiList.java +++ b/java/src/game/gui/element/GuiList.java @@ -185,7 +185,7 @@ public abstract class GuiList extends Gui this.overlayBackground(this.bottom, this.height, 255, 255); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 0, 1); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ZERO, GL11.GL_ONE); GlState.disableAlpha(); GlState.shadeModel(GL11.GL_SMOOTH); GlState.disableTexture2D(); diff --git a/java/src/game/renderer/Drawing.java b/java/src/game/renderer/Drawing.java index 34bb21a..83c1cef 100644 --- a/java/src/game/renderer/Drawing.java +++ b/java/src/game/renderer/Drawing.java @@ -46,7 +46,7 @@ public abstract class Drawing { GlState.enableTexture2D(); GlState.enableBlend(); GlState.disableAlpha(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); GlState.color(1.0f, 1.0f, 1.0f, 1.0f); Font.bindTexture(); @@ -305,7 +305,7 @@ public abstract class Drawing { GlState.enableTexture2D(); GlState.enableBlend(); GlState.disableAlpha(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); GlState.color(1.0f, 1.0f, 1.0f, 1.0f); Font.bindTexture(); @@ -416,7 +416,7 @@ public abstract class Drawing { GlState.disableTexture2D(); GlState.enableBlend(); GlState.disableAlpha(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); RenderBuffer buf = Tessellator.getBuffer(); buf.begin(7, DefaultVertexFormats.POSITION_COLOR); @@ -436,7 +436,7 @@ public abstract class Drawing { GlState.disableTexture2D(); GlState.enableBlend(); GlState.disableAlpha(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); RenderBuffer buf = Tessellator.getBuffer(); buf.begin(7, DefaultVertexFormats.POSITION_COLOR); @@ -457,7 +457,7 @@ public abstract class Drawing { GlState.enableBlend(); GlState.disableAlpha(); GlState.disableTexture2D(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.shadeModel(GL11.GL_SMOOTH); GlState.color(color); rb.begin(7, DefaultVertexFormats.POSITION); diff --git a/java/src/game/renderer/EntityRenderer.java b/java/src/game/renderer/EntityRenderer.java index 29365e2..8005657 100755 --- a/java/src/game/renderer/EntityRenderer.java +++ b/java/src/game/renderer/EntityRenderer.java @@ -574,7 +574,7 @@ public class EntityRenderer { private void setupCameraTransform(float partialTicks) { this.farPlaneDistance = (float)(this.gm.renderDistance * 16); - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); float f = 0.07F; @@ -590,7 +590,7 @@ public class EntityRenderer { // } Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fb_x / (float)this.gm.fb_y, 0.05F, this.farPlaneDistance * SQRT_2); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glLoadIdentity(); // if (this.gm.anaglyph) @@ -658,7 +658,7 @@ public class EntityRenderer { { // if (!this.debugView) // { - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); float f = 0.07F; @@ -668,7 +668,7 @@ public class EntityRenderer { // } Project.gluPerspective(this.getFOVModifier(partialTicks, false), (float)this.gm.fb_x / (float)this.gm.fb_y, 0.05F, this.farPlaneDistance * 2.0F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glLoadIdentity(); // if (this.gm.anaglyph) @@ -718,12 +718,12 @@ public class EntityRenderer { public void enableLightmap() { GlState.setActiveTexture(GL13.GL_TEXTURE1); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glLoadIdentity(); float f = 0.00390625F; GL11.glScalef(f, f, f); GL11.glTranslatef(8.0F, 8.0F, 8.0F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); this.gm.getTextureManager().bindTexture(locationLightMap); GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR); GL11.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR); @@ -932,7 +932,7 @@ public class EntityRenderer { this.getMouseOver(partialTicks); GlState.enableDepth(); GlState.enableAlpha(); - GlState.alphaFunc(516, 0.5F); + GlState.alphaFunc(GL11.GL_GREATER, 0.5F); // if (this.gm.anaglyph) // { @@ -967,15 +967,15 @@ public class EntityRenderer { if (this.gm.renderDistance >= 4) { this.setupFog(-1, partialTicks); - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fb_x / (float)this.gm.fb_y, 0.05F, this.farPlaneDistance * 2.0F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); renderglobal.renderSky(partialTicks); - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fb_x / (float)this.gm.fb_y, 0.05F, this.farPlaneDistance * SQRT_2); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } this.setupFog(0, partialTicks); @@ -990,7 +990,7 @@ public class EntityRenderer { ItemRenderer.disableStandardItemLighting(); renderglobal.setupTerrain(entity, (double)partialTicks, this.frameCount++, this.gm.thePlayer.noclip); this.gm.renderGlobal.updateChunks(finishTimeNano); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glPushMatrix(); GlState.disableAlpha(); renderglobal.renderBlockLayer(BlockLayer.SOLID, (double)partialTicks, entity); @@ -1000,18 +1000,18 @@ public class EntityRenderer { renderglobal.renderBlockLayer(BlockLayer.CUTOUT, (double)partialTicks, entity); // this.gm.getTextureManager().getTexture(TextureMap.locationBlocksTexture).restoreLastMipmap(); GlState.shadeModel(GL11.GL_FLAT); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); // if (!this.debugView) // { - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glPopMatrix(); GL11.glPushMatrix(); ItemRenderer.enableStandardItemLighting(); renderglobal.renderEntities(entity, partialTicks); ItemRenderer.disableStandardItemLighting(); this.disableLightmap(); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glPopMatrix(); GL11.glPushMatrix(); @@ -1024,7 +1024,7 @@ public class EntityRenderer { } // } - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glPopMatrix(); if (flag && this.gm.pointed != null && !entity.isInsideOfLiquid()) @@ -1035,7 +1035,7 @@ public class EntityRenderer { GlState.enableAlpha(); } GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 1, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ZERO); // this.gm.getTextureManager().getTexture(TextureMap.locationBlocksTexture).unsetMipmap(); // Tessellator.getInstance(); renderglobal.drawBlockDamageTexture(Tessellator.getBuffer(), entity, partialTicks); @@ -1059,8 +1059,8 @@ public class EntityRenderer { // renderglobal.renderWorldBorder(entity, partialTicks); GlState.disableBlend(); GlState.enableCull(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); - GlState.alphaFunc(516, 0.1F); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); this.setupFog(0, partialTicks); GlState.enableBlend(); GlState.depthMask(false); @@ -1089,10 +1089,10 @@ public class EntityRenderer { { if (this.gm.renderDistance >= 4) { - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fb_x / (float)this.gm.fb_y, 0.05F, this.farPlaneDistance * 4.0F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GL11.glPushMatrix(); this.setupFog(0, partialTicks); // renderGlobalIn.renderClouds(partialTicks); @@ -1100,10 +1100,10 @@ public class EntityRenderer { renderGlobalIn.renderClouds(partialTicks); GlState.disableFog(); GL11.glPopMatrix(); - GL11.glMatrixMode(5889); + GL11.glMatrixMode(GL11.GL_PROJECTION); GL11.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fb_x / (float)this.gm.fb_y, 0.05F, this.farPlaneDistance * SQRT_2); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } } @@ -1225,8 +1225,8 @@ public class EntityRenderer { GlState.disableCull(); GL11.glNormal3f(0.0F, 1.0F, 0.0F); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); - GlState.alphaFunc(516, 0.1F); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); double d0 = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double)partialTicks; double d1 = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)partialTicks; double d2 = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double)partialTicks; @@ -1383,7 +1383,7 @@ public class EntityRenderer { worldrenderer.setTranslation(0.0D, 0.0D, 0.0D); GlState.enableCull(); GlState.disableBlend(); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); this.disableLightmap(); } } diff --git a/java/src/game/renderer/GlState.java b/java/src/game/renderer/GlState.java index e568310..569b0eb 100755 --- a/java/src/game/renderer/GlState.java +++ b/java/src/game/renderer/GlState.java @@ -7,23 +7,20 @@ import org.lwjgl.opengl.GL14; public class GlState { private static GlState.AlphaState alphaState = new GlState.AlphaState(); - private static GlState.BooleanState lightingState = new GlState.BooleanState(2896); - private static GlState.BooleanState[] lightState = new GlState.BooleanState[8]; + private static GlState.BooleanState lightingState = new GlState.BooleanState(GL11.GL_LIGHTING); + private static GlState.BooleanState[] lightState = new GlState.BooleanState[2]; private static GlState.ColorMaterialState colorMaterialState = new GlState.ColorMaterialState(); private static GlState.BlendState blendState = new GlState.BlendState(); private static GlState.DepthState depthState = new GlState.DepthState(); private static GlState.FogState fogState = new GlState.FogState(); private static GlState.CullState cullState = new GlState.CullState(); private static GlState.PolygonOffsetState polygonOffsetState = new GlState.PolygonOffsetState(); -// private static GlState.ColorLogicState colorLogicState = new GlState.ColorLogicState(); -// private static GlState.TexGenState texGenState = new GlState.TexGenState(); - private static GlState.ClearState clearState = new GlState.ClearState(); -// private static GlState.StencilState stencilState = new GlState.StencilState(); - private static GlState.BooleanState normalizeState = new GlState.BooleanState(2977); + private static GlState.Color clearState = new GlState.Color(); + private static GlState.BooleanState normalizeState = new GlState.BooleanState(GL11.GL_NORMALIZE); private static int activeTextureUnit = 0; - private static GlState.TextureState[] textureState = new GlState.TextureState[8]; - private static int activeShadeModel = 7425; - private static GlState.BooleanState rescaleNormalState = new GlState.BooleanState(32826); + private static GlState.TextureState[] textureState = new GlState.TextureState[2]; + private static int activeShadeModel = GL11.GL_SMOOTH; + private static GlState.BooleanState rescaleNormalState = new GlState.BooleanState(GL13.GL_RESCALE_NORMAL); private static GlState.ColorMask colorMaskState = new GlState.ColorMask(); private static GlState.Color colorState = new GlState.Color(); @@ -217,7 +214,7 @@ public class GlState cullState.cullFace.setDisabled(); } - public static boolean isCullEbabled() + public static boolean isCullEnabled() { return cullState.cullFace.currentState; } @@ -250,73 +247,7 @@ public class GlState GL11.glPolygonOffset(factor, units); } } - -// public static void enableColorLogic() -// { -// colorLogicState.colorLogicOp.setEnabled(); -// } -// -// public static void disableColorLogic() -// { -// colorLogicState.colorLogicOp.setDisabled(); -// } -// -// public static void colorLogicOp(int opcode) -// { -// if (opcode != colorLogicState.opcode) -// { -// colorLogicState.opcode = opcode; -// SKC.glLogicOp(opcode); -// } -// } - -// public static void enableTexGenCoord(GlState.TexGen p_179087_0_) -// { -// texGenCoord(p_179087_0_).textureGen.setEnabled(); -// } -// -// public static void disableTexGenCoord(GlState.TexGen p_179100_0_) -// { -// texGenCoord(p_179100_0_).textureGen.setDisabled(); -// } -// -// public static void texGen(GlState.TexGen texGen, int param) -// { -// GlState.TexGenCoord glstatemanager$texgencoord = texGenCoord(texGen); -// -// if (param != glstatemanager$texgencoord.param) -// { -// glstatemanager$texgencoord.param = param; -// SKC.glTexGeni(glstatemanager$texgencoord.coord, SKC.GL_TEXTURE_GEN_MODE, param); -// } -// } -// -// public static void texGen(GlState.TexGen p_179105_0_, int pname, FloatBuffer params) -// { -// SKC.glTexGen(texGenCoord(p_179105_0_).coord, pname, params); -// } -// -// private static GlState.TexGenCoord texGenCoord(GlState.TexGen p_179125_0_) -// { -// switch (p_179125_0_) -// { -// case S: -// return texGenState.s; -// -// case T: -// return texGenState.t; -// -// case R: -// return texGenState.r; -// -// case Q: -// return texGenState.q; -// -// default: -// return texGenState.s; -// } -// } - + public static void setActiveTexture(int texture) { if (activeTextureUnit != texture - GL13.GL_TEXTURE0) @@ -357,13 +288,7 @@ public class GlState GL11.glBindTexture(GL11.GL_TEXTURE_2D, texture); } } - - public static void resetTextures() - { - textureState[0].textureName = 0; - textureState[1].textureName = 0; - } - + public static void enableNormalize() { normalizeState.setEnabled(); @@ -404,24 +329,15 @@ public class GlState GL11.glColorMask(red, green, blue, alpha); } } - - public static void clearDepth(double depth) - { - if (depth != clearState.depth) - { - clearState.depth = depth; - GL11.glClearDepth(depth); - } - } - + public static void clearColor(float red, float green, float blue, float alpha) { - if (red != clearState.color.red || green != clearState.color.green || blue != clearState.color.blue || alpha != clearState.color.alpha) + if (red != clearState.red || green != clearState.green || blue != clearState.blue || alpha != clearState.alpha) { - clearState.color.red = red; - clearState.color.green = green; - clearState.color.blue = blue; - clearState.color.alpha = alpha; + clearState.red = red; + clearState.green = green; + clearState.blue = blue; + clearState.alpha = alpha; GL11.glClearColor(red, green, blue, alpha); } } @@ -450,20 +366,15 @@ public class GlState { colorState.red = colorState.green = colorState.blue = colorState.alpha = -1.0F; } - - public static void resetClear() - { - clearState.color.red = clearState.color.green = clearState.color.blue = clearState.color.alpha = -1.0F; - } - + static { - for (int i = 0; i < 8; ++i) + for (int i = 0; i < lightState.length; ++i) { - lightState[i] = new GlState.BooleanState(16384 + i); + lightState[i] = new GlState.BooleanState(GL11.GL_LIGHT0 + i); } - for (int j = 0; j < 8; ++j) + for (int j = 0; j < textureState.length; ++j) { textureState[j] = new GlState.TextureState(); } @@ -477,8 +388,8 @@ public class GlState private AlphaState() { - this.alphaTest = new GlState.BooleanState(3008); - this.func = 519; + this.alphaTest = new GlState.BooleanState(GL11.GL_ALPHA_TEST); + this.func = GL11.GL_ALWAYS; this.ref = -1.0F; } } @@ -493,11 +404,11 @@ public class GlState private BlendState() { - this.blend = new GlState.BooleanState(3042); - this.srcFactor = 1; - this.dstFactor = 0; - this.srcFactorAlpha = 1; - this.dstFactorAlpha = 0; + this.blend = new GlState.BooleanState(GL11.GL_BLEND); + this.srcFactor = GL11.GL_ONE; + this.dstFactor = GL11.GL_ZERO; + this.srcFactorAlpha = GL11.GL_ONE; + this.dstFactorAlpha = GL11.GL_ZERO; } } @@ -538,21 +449,7 @@ public class GlState } } } - - static class ClearState - { - public double depth; - public GlState.Color color; - public int field_179204_c; - - private ClearState() - { - this.depth = 1.0D; - this.color = new GlState.Color(0.0F, 0.0F, 0.0F, 0.0F); - this.field_179204_c = 0; - } - } - + static class Color { public float red = 1.0F; @@ -563,28 +460,8 @@ public class GlState public Color() { } - - public Color(float redIn, float greenIn, float blueIn, float alphaIn) - { - this.red = redIn; - this.green = greenIn; - this.blue = blueIn; - this.alpha = alphaIn; - } } - - static class ColorLogicState - { - public GlState.BooleanState colorLogicOp; - public int opcode; - - private ColorLogicState() - { - this.colorLogicOp = new GlState.BooleanState(3058); - this.opcode = 5379; - } - } - + static class ColorMask { public boolean red; @@ -622,8 +499,8 @@ public class GlState private CullState() { - this.cullFace = new GlState.BooleanState(2884); - this.mode = 1029; + this.cullFace = new GlState.BooleanState(GL11.GL_CULL_FACE); + this.mode = GL11.GL_BACK; } } @@ -635,9 +512,9 @@ public class GlState private DepthState() { - this.depthTest = new GlState.BooleanState(2929); + this.depthTest = new GlState.BooleanState(GL11.GL_DEPTH_TEST); this.maskEnabled = true; - this.depthFunc = 513; + this.depthFunc = GL11.GL_LESS; } } @@ -670,82 +547,13 @@ public class GlState private PolygonOffsetState() { - this.polygonOffsetFill = new GlState.BooleanState(32823); - this.polygonOffsetLine = new GlState.BooleanState(10754); + this.polygonOffsetFill = new GlState.BooleanState(GL11.GL_POLYGON_OFFSET_FILL); + this.polygonOffsetLine = new GlState.BooleanState(GL11.GL_POLYGON_OFFSET_LINE); this.factor = 0.0F; this.units = 0.0F; } } - - static class StencilFunc - { - public int field_179081_a; - public int field_179079_b; - public int field_179080_c; - - private StencilFunc() - { - this.field_179081_a = 519; - this.field_179079_b = 0; - this.field_179080_c = -1; - } - } - -// static class StencilState -// { -// public GlState.StencilFunc field_179078_a; -// public int field_179076_b; -// public int field_179077_c; -// public int field_179074_d; -// public int field_179075_e; -// -// private StencilState() -// { -// this.field_179078_a = new GlState.StencilFunc(); -// this.field_179076_b = -1; -// this.field_179077_c = 7680; -// this.field_179074_d = 7680; -// this.field_179075_e = 7680; -// } -// } - -// public static enum TexGen -// { -// S, -// T, -// R, -// Q; -// } - -// static class TexGenCoord -// { -// public GlState.BooleanState textureGen; -// public int coord; -// public int param = -1; -// -// public TexGenCoord(int p_i46254_1_, int p_i46254_2_) -// { -// this.coord = p_i46254_1_; -// this.textureGen = new GlState.BooleanState(p_i46254_2_); -// } -// } -// -// static class TexGenState -// { -// public GlState.TexGenCoord s; -// public GlState.TexGenCoord t; -// public GlState.TexGenCoord r; -// public GlState.TexGenCoord q; -// -// private TexGenState() -// { -// this.s = new GlState.TexGenCoord(8192, 3168); -// this.t = new GlState.TexGenCoord(8193, 3169); -// this.r = new GlState.TexGenCoord(8194, 3170); -// this.q = new GlState.TexGenCoord(8195, 3171); -// } -// } - + static class TextureState { public GlState.BooleanState texture2DState; @@ -753,7 +561,7 @@ public class GlState private TextureState() { - this.texture2DState = new GlState.BooleanState(3553); + this.texture2DState = new GlState.BooleanState(GL11.GL_TEXTURE_2D); this.textureName = 0; } } diff --git a/java/src/game/renderer/ItemRenderer.java b/java/src/game/renderer/ItemRenderer.java index 5085f73..b3c22e9 100755 --- a/java/src/game/renderer/ItemRenderer.java +++ b/java/src/game/renderer/ItemRenderer.java @@ -548,10 +548,10 @@ public class ItemRenderer // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); GlState.color(1.0F, 1.0F, 1.0F, 0.9F); - GlState.depthFunc(519); + GlState.depthFunc(GL11.GL_ALWAYS); GlState.depthMask(false); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); float f = 1.0F; for (int i = 0; i < 2; ++i) @@ -582,7 +582,7 @@ public class ItemRenderer GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.disableBlend(); GlState.depthMask(true); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); } public void updateEquippedItem() diff --git a/java/src/game/renderer/RenderGlobal.java b/java/src/game/renderer/RenderGlobal.java index e85021e..b90852e 100755 --- a/java/src/game/renderer/RenderGlobal.java +++ b/java/src/game/renderer/RenderGlobal.java @@ -521,11 +521,11 @@ public class RenderGlobal if (this.gm.tileOverlay) { - GlState.depthFunc(519); + GlState.depthFunc(GL11.GL_ALWAYS); GlState.disableFog(); ItemRenderer.disableStandardItemLighting(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GL11.glLineWidth(2.0F); GlState.disableTexture2D(); GlState.depthMask(false); @@ -554,18 +554,18 @@ public class RenderGlobal GlState.depthMask(true); GlState.enableFog(); GlState.enableColorMaterial(); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); GlState.enableDepth(); GlState.enableAlpha(); } if (this.gm.renderOutlines && this.gm.thePlayer != null) { - GlState.depthFunc(519); + GlState.depthFunc(GL11.GL_ALWAYS); GlState.disableFog(); ItemRenderer.disableStandardItemLighting(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GL11.glLineWidth(2.0F); GlState.disableTexture2D(); GlState.depthMask(false); @@ -593,7 +593,7 @@ public class RenderGlobal GlState.depthMask(true); GlState.enableFog(); GlState.enableColorMaterial(); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); GlState.enableDepth(); GlState.enableAlpha(); } @@ -1072,7 +1072,7 @@ public class RenderGlobal GlState.disableFog(); GlState.disableAlpha(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); ItemRenderer.disableStandardItemLighting(); GlState.depthMask(false); this.renderEngine.bindTexture(texture); @@ -1171,7 +1171,7 @@ public class RenderGlobal GlState.disableFog(); GlState.disableAlpha(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); ItemRenderer.disableStandardItemLighting(); float[] afloat = this.theWorld.dimension.getType().days ? @@ -1216,7 +1216,7 @@ public class RenderGlobal } GlState.enableTexture2D(); - GlState.tryBlendFuncSeparate(770, 1, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ZERO); GL11.glPushMatrix(); float f16 = 1.0F - Math.max(this.theWorld.getRainStrength(), this.theWorld.getFogStrength()); GlState.color(1.0F, 1.0F, 1.0F, f16); @@ -1333,7 +1333,7 @@ public class RenderGlobal d2 = d2 - (double)(j * 2048); this.renderEngine.bindTexture(this.gm.theWorld.dimension.getCloudTexture()); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); Vec3 vec3 = this.theWorld.getCloudColour(this.gm.getRenderViewEntity(), partialTicks); float f4 = (float)vec3.xCoord; float f5 = (float)vec3.yCoord; @@ -1502,12 +1502,12 @@ public class RenderGlobal private void preRenderDamagedBlocks() { - GlState.tryBlendFuncSeparate(774, 768, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_DST_COLOR, GL11.GL_SRC_COLOR, GL11.GL_ONE, GL11.GL_ZERO); GlState.enableBlend(); GlState.color(1.0F, 1.0F, 1.0F, 0.5F); GlState.doPolygonOffset(-3.0F, -3.0F); GlState.enablePolygonOffset(); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); GlState.enableAlpha(); GL11.glPushMatrix(); } @@ -1583,7 +1583,7 @@ public class RenderGlobal if (movingObjectPositionIn.type == HitPosition.ObjectType.BLOCK) { GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GlState.color(0.0F, 0.0F, 0.0F, 0.4F); GL11.glLineWidth(2.0F); GlState.disableTexture2D(); @@ -1797,7 +1797,7 @@ public class RenderGlobal // WCF.glDisableClientState(WCF.GL_VERTEX_ARRAY); GlState.disableAlpha(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 1, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ZERO); ItemRenderer.disableStandardItemLighting(); GlState.color((float)stars.xCoord, (float)stars.yCoord, (float)stars.zCoord, 1.0f); this.starVBO.bindBuffer(); diff --git a/java/src/game/renderer/entity/Render.java b/java/src/game/renderer/entity/Render.java index 09ff9a6..c213fb3 100755 --- a/java/src/game/renderer/entity/Render.java +++ b/java/src/game/renderer/entity/Render.java @@ -157,7 +157,7 @@ public abstract class Render // private void renderShadow(Entity entityIn, double x, double y, double z, float shadowAlpha, float partialTicks) // { // GlState.enableBlend(); -// GlState.blendFunc(770, 771); +// GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); // this.renderManager.renderEngine.bindTexture(shadowTextures); // World world = this.getWorldFromRenderManager(); // GlState.depthMask(false); @@ -336,7 +336,7 @@ public abstract class Render GlState.depthMask(false); // GlState.disableDepth(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); // int i = 0; diff --git a/java/src/game/renderer/entity/RenderBlockEntity.java b/java/src/game/renderer/entity/RenderBlockEntity.java index 2404593..93308da 100755 --- a/java/src/game/renderer/entity/RenderBlockEntity.java +++ b/java/src/game/renderer/entity/RenderBlockEntity.java @@ -53,7 +53,7 @@ public class RenderBlockEntity extends Render // GlStateManager.disableTexture2D(); // GlStateManager.disableLighting(); // GlStateManager.enableBlend(); -// GlStateManager.blendFunc(770, 772); +// GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); // GlStateManager.color(1.0F, 1.0F, 1.0F, f2); // GlStateManager.doPolygonOffset(-3.0F, -3.0F); // GlStateManager.enablePolygonOffset(); diff --git a/java/src/game/renderer/entity/RenderDragon.java b/java/src/game/renderer/entity/RenderDragon.java index 64ddc90..53453fe 100755 --- a/java/src/game/renderer/entity/RenderDragon.java +++ b/java/src/game/renderer/entity/RenderDragon.java @@ -54,13 +54,13 @@ public class RenderDragon extends RenderLiving // if (entitylivingbaseIn.deathTicks > 0) // { // float f = (float)entitylivingbaseIn.deathTicks / 200.0F; -// GlState.depthFunc(515); +// GlState.depthFunc(GL11.GL_LEQUAL); // GlState.enableAlpha(); -// GlState.alphaFunc(516, f); +// GlState.alphaFunc(GL11.GL_GREATER, f); // this.bindTexture(enderDragonExplodingTextures); // this.mainModel.render(entitylivingbaseIn, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, scaleFactor); -// GlState.alphaFunc(516, 0.1F); -// GlState.depthFunc(514); +// GlState.alphaFunc(GL11.GL_GREATER, 0.1F); +// GlState.depthFunc(GL11.GL_EQUAL); // } this.bindEntityTexture(entitylivingbaseIn); @@ -68,15 +68,15 @@ public class RenderDragon extends RenderLiving if (entitylivingbaseIn.hurtTime > 0) { - GlState.depthFunc(514); + GlState.depthFunc(GL11.GL_EQUAL); GlState.disableTexture2D(); GlState.enableBlend(); - GlState.blendFunc(770, 771); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlState.color(1.0F, 0.0F, 0.0F, 0.5F); this.mainModel.render(entitylivingbaseIn, p_77036_2_, p_77036_3_, p_77036_4_, p_77036_5_, p_77036_6_, scaleFactor); GlState.enableTexture2D(); GlState.disableBlend(); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); } } diff --git a/java/src/game/renderer/entity/RenderEntityItem.java b/java/src/game/renderer/entity/RenderEntityItem.java index 7bc19d0..6cb9bf3 100755 --- a/java/src/game/renderer/entity/RenderEntityItem.java +++ b/java/src/game/renderer/entity/RenderEntityItem.java @@ -104,9 +104,9 @@ public class RenderEntityItem extends Render // } GlState.enableRescaleNormal(); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GL11.glPushMatrix(); IBakedModel ibakedmodel = this.itemRenderer.getItemModelMesher().getItemModel(itemstack); int i = this.func_177077_a(entity, x, y, z, partialTicks, ibakedmodel); diff --git a/java/src/game/renderer/entity/RenderItem.java b/java/src/game/renderer/entity/RenderItem.java index d820026..6aa1251 100755 --- a/java/src/game/renderer/entity/RenderItem.java +++ b/java/src/game/renderer/entity/RenderItem.java @@ -117,11 +117,11 @@ public class RenderItem private void renderEffect(IBakedModel model) { GlState.depthMask(false); - GlState.depthFunc(514); + GlState.depthFunc(GL11.GL_EQUAL); GlState.disableLighting(); - GlState.blendFunc(768, 1); + GlState.blendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); this.textureManager.bindTexture(RES_ITEM_GLINT); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPushMatrix(); GL11.glScalef(8.0F, 8.0F, 8.0F); float f = (float)(System.currentTimeMillis() % 3000L) / 3000.0F / 8.0F; @@ -136,10 +136,10 @@ public class RenderItem GL11.glRotatef(10.0F, 0.0F, 0.0F, 1.0F); this.renderModel(model, -8372020); GL11.glPopMatrix(); - GL11.glMatrixMode(5888); - GlState.blendFunc(770, 771); + GL11.glMatrixMode(GL11.GL_MODELVIEW); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlState.enableLighting(); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); GlState.depthMask(true); this.textureManager.bindTexture(TextureMap.locationBlocksTexture); } @@ -266,20 +266,20 @@ public class RenderItem // this.textureManager.getTexture(TextureMap.locationBlocksTexture).unsetMipmap(); this.preTransform(stack); GlState.enableRescaleNormal(); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(770, 771, 1, 0); + GlState.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); GL11.glPushMatrix(); Transforms itemcameratransforms = model.getItemCameraTransforms(); itemcameratransforms.apply(cameraTransformType); if (this.isThereOneNegativeScale(itemcameratransforms.get(cameraTransformType))) { - GlState.cullFace(1028); + GlState.cullFace(GL11.GL_FRONT); } this.renderItem(stack, model); - GlState.cullFace(1029); + GlState.cullFace(GL11.GL_BACK); GL11.glPopMatrix(); GlState.disableRescaleNormal(); GlState.disableBlend(); @@ -305,9 +305,9 @@ public class RenderItem // this.textureManager.getTexture(TextureMap.locationBlocksTexture).unsetMipmap(); GlState.enableRescaleNormal(); GlState.enableAlpha(); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); GlState.enableBlend(); - GlState.blendFunc(770, 771); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); this.setupGuiTransform(x, y, ibakedmodel.isGui3d()); ibakedmodel.getItemCameraTransforms().apply(Transforms.Camera.GUI); diff --git a/java/src/game/renderer/entity/RenderLightning.java b/java/src/game/renderer/entity/RenderLightning.java index b7fab1d..0939427 100755 --- a/java/src/game/renderer/entity/RenderLightning.java +++ b/java/src/game/renderer/entity/RenderLightning.java @@ -1,5 +1,7 @@ package game.renderer.entity; +import org.lwjgl.opengl.GL11; + import game.entity.effect.EntityLightning; import game.renderer.DefaultVertexFormats; import game.renderer.GlState; @@ -25,7 +27,7 @@ public class RenderLightning extends Render GlState.disableTexture2D(); GlState.disableLighting(); GlState.enableBlend(); - GlState.blendFunc(770, 1); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); double[] adouble = new double[8]; double[] adouble1 = new double[8]; double d0 = 0.0D; diff --git a/java/src/game/renderer/entity/RenderTntMinecart.java b/java/src/game/renderer/entity/RenderTntMinecart.java index d09c9c2..f8ac46c 100755 --- a/java/src/game/renderer/entity/RenderTntMinecart.java +++ b/java/src/game/renderer/entity/RenderTntMinecart.java @@ -39,7 +39,7 @@ public class RenderTntMinecart extends RenderMinecart GlState.disableTexture2D(); GlState.disableLighting(); GlState.enableBlend(); - GlState.blendFunc(770, 772); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); GlState.color(1.0F, 1.0F, 1.0F, (1.0F - ((float)i - partialTicks + 1.0F) / 100.0F) * 0.8F); GL11.glPushMatrix(); blockrendererdispatcher.renderBlockBrightness(Blocks.tnt.getState(), 1.0F); diff --git a/java/src/game/renderer/entity/RenderTntPrimed.java b/java/src/game/renderer/entity/RenderTntPrimed.java index e597dc5..9ecee6e 100755 --- a/java/src/game/renderer/entity/RenderTntPrimed.java +++ b/java/src/game/renderer/entity/RenderTntPrimed.java @@ -50,7 +50,7 @@ public class RenderTntPrimed extends Render GlState.disableTexture2D(); GlState.disableLighting(); GlState.enableBlend(); - GlState.blendFunc(770, 772); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); GlState.color(1.0F, 1.0F, 1.0F, f2); GlState.doPolygonOffset(-3.0F, -3.0F); GlState.enablePolygonOffset(); diff --git a/java/src/game/renderer/entity/RendererLivingEntity.java b/java/src/game/renderer/entity/RendererLivingEntity.java index ef846f0..99befb3 100755 --- a/java/src/game/renderer/entity/RendererLivingEntity.java +++ b/java/src/game/renderer/entity/RendererLivingEntity.java @@ -262,8 +262,8 @@ public abstract class RendererLivingEntity extends Rende // GlState.color(entity.getRenderColor() | (vis ? 0x50000000 : 0x26000000)); GlState.depthMask(false); GlState.enableBlend(); - GlState.blendFunc(770, 771); - GlState.alphaFunc(516, 0.003921569F); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlState.alphaFunc(GL11.GL_GREATER, 0.003921569F); } if(entity.isGlowing()) @@ -276,7 +276,7 @@ public abstract class RendererLivingEntity extends Rende if (ghost) { GlState.disableBlend(); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); GL11.glPopMatrix(); GlState.depthMask(true); } diff --git a/java/src/game/renderer/layers/LayerArmor.java b/java/src/game/renderer/layers/LayerArmor.java index 0e694fc..7780453 100755 --- a/java/src/game/renderer/layers/LayerArmor.java +++ b/java/src/game/renderer/layers/LayerArmor.java @@ -107,7 +107,7 @@ public class LayerArmor implements LayerRenderer float f = (float)entitylivingbaseIn.ticksExisted + partialTicks; this.renderer.bindTexture(ENCHANTED_ITEM_GLINT_RES); GlState.enableBlend(); - GlState.depthFunc(514); + GlState.depthFunc(GL11.GL_EQUAL); GlState.depthMask(false); float f1 = 0.5F; GlState.color(f1, f1, f1, 1.0F); @@ -115,25 +115,25 @@ public class LayerArmor implements LayerRenderer for (int i = 0; i < 2; ++i) { GlState.disableLighting(); - GlState.blendFunc(768, 1); + GlState.blendFunc(GL11.GL_SRC_COLOR, GL11.GL_ONE); float f2 = 0.76F; GlState.color(0.5F * f2, 0.25F * f2, 0.8F * f2, 1.0F); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glLoadIdentity(); float f3 = 0.33333334F; GL11.glScalef(f3, f3, f3); GL11.glRotatef(30.0F - (float)i * 60.0F, 0.0F, 0.0F, 1.0F); GL11.glTranslatef(0.0F, f * (0.001F + (float)i * 0.003F) * 20.0F, 0.0F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); modelbaseIn.render(entitylivingbaseIn, p_177183_3_, p_177183_4_, p_177183_6_, p_177183_7_, p_177183_8_, scale); } - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glLoadIdentity(); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GlState.enableLighting(); GlState.depthMask(true); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); GlState.disableBlend(); } diff --git a/java/src/game/renderer/layers/LayerCharge.java b/java/src/game/renderer/layers/LayerCharge.java index b7a2797..80dcb6b 100755 --- a/java/src/game/renderer/layers/LayerCharge.java +++ b/java/src/game/renderer/layers/LayerCharge.java @@ -27,23 +27,23 @@ public class LayerCharge implements LayerRenderer // boolean flag = entitylivingbaseIn.isInvisible(); GlState.depthMask(true); this.main.bindTexture(LIGHTNING_TEXTURE); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glLoadIdentity(); float f = (float)entitylivingbaseIn.ticksExisted + partialTicks; GL11.glTranslatef(f * 0.01F, f * 0.01F, 0.0F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GlState.enableBlend(); float f1 = 0.5F; GlState.color(f1, f1, f1, 1.0F); GlState.disableLighting(); - GlState.blendFunc(1, 1); + GlState.blendFunc(GL11.GL_ONE, GL11.GL_ONE); this.charge.setModelAttributes(this.main.getMainModel()); GL11.glScalef(entitylivingbaseIn.height, entitylivingbaseIn.height, entitylivingbaseIn.height); GL11.glTranslatef(0.0f, -0.25f, 0.0f); this.charge.render(entitylivingbaseIn, p_177141_2_, p_177141_3_, p_177141_5_, p_177141_6_, p_177141_7_, scale); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glLoadIdentity(); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); GlState.enableLighting(); GlState.disableBlend(); GlState.depthMask(false); diff --git a/java/src/game/renderer/layers/LayerEnderDragonEyes.java b/java/src/game/renderer/layers/LayerEnderDragonEyes.java index cea5f23..2b3a528 100755 --- a/java/src/game/renderer/layers/LayerEnderDragonEyes.java +++ b/java/src/game/renderer/layers/LayerEnderDragonEyes.java @@ -1,5 +1,6 @@ package game.renderer.layers; +import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL13; import game.entity.animal.EntityDragon; @@ -22,9 +23,9 @@ public class LayerEnderDragonEyes implements LayerRenderer this.dragonRenderer.bindTexture(TEXTURE); GlState.enableBlend(); GlState.disableAlpha(); - GlState.blendFunc(1, 1); + GlState.blendFunc(GL11.GL_ONE, GL11.GL_ONE); GlState.disableLighting(); - GlState.depthFunc(514); + GlState.depthFunc(GL11.GL_EQUAL); int i = 61680; int j = i % 65536; int k = i / 65536; @@ -35,7 +36,7 @@ public class LayerEnderDragonEyes implements LayerRenderer this.dragonRenderer.setLightmap(entitylivingbaseIn, partialTicks); GlState.disableBlend(); GlState.enableAlpha(); - GlState.depthFunc(515); + GlState.depthFunc(GL11.GL_LEQUAL); } public boolean shouldCombineTextures() diff --git a/java/src/game/renderer/layers/LayerEntityBreak.java b/java/src/game/renderer/layers/LayerEntityBreak.java index b0edf92..a38eb77 100755 --- a/java/src/game/renderer/layers/LayerEntityBreak.java +++ b/java/src/game/renderer/layers/LayerEntityBreak.java @@ -31,7 +31,7 @@ public class LayerEntityBreak implements LayerRenderer GlState.disableTexture2D(); GlState.shadeModel(GL11.GL_SMOOTH); GlState.enableBlend(); - GlState.blendFunc(770, 1); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE); GlState.disableAlpha(); GlState.enableCull(); GlState.depthMask(false); diff --git a/java/src/game/renderer/layers/LayerMooshroomMushroom.java b/java/src/game/renderer/layers/LayerMooshroomMushroom.java index 4c87ffe..e6e421e 100755 --- a/java/src/game/renderer/layers/LayerMooshroomMushroom.java +++ b/java/src/game/renderer/layers/LayerMooshroomMushroom.java @@ -27,7 +27,7 @@ public class LayerMooshroomMushroom implements LayerRenderer BlockRenderer blockrendererdispatcher = Game.getGame().getBlockRendererDispatcher(); this.mooshroomRenderer.bindTexture(TextureMap.locationBlocksTexture); GlState.enableCull(); - GlState.cullFace(1028); + GlState.cullFace(GL11.GL_FRONT); GL11.glPushMatrix(); GL11.glScalef(1.0F, -1.0F, 1.0F); GL11.glTranslatef(0.2F, 0.35F, 0.5F); @@ -51,7 +51,7 @@ public class LayerMooshroomMushroom implements LayerRenderer GL11.glTranslatef(-0.5F, -0.5F, 0.5F); blockrendererdispatcher.renderBlockBrightness(Blocks.red_mushroom.getState(), 1.0F); GL11.glPopMatrix(); - GlState.cullFace(1029); + GlState.cullFace(GL11.GL_BACK); GlState.disableCull(); } } diff --git a/java/src/game/renderer/layers/LayerSlimeGel.java b/java/src/game/renderer/layers/LayerSlimeGel.java index e754840..aceaaf3 100755 --- a/java/src/game/renderer/layers/LayerSlimeGel.java +++ b/java/src/game/renderer/layers/LayerSlimeGel.java @@ -1,5 +1,7 @@ package game.renderer.layers; +import org.lwjgl.opengl.GL11; + import game.entity.npc.EntityNPC; import game.renderer.GlState; import game.renderer.entity.RenderSlime; @@ -23,7 +25,7 @@ public class LayerSlimeGel implements LayerRenderer GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.enableNormalize(); GlState.enableBlend(); - GlState.blendFunc(770, 771); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); this.slimeModel.setModelAttributes(this.slimeRenderer.getMainModel()); this.slimeModel.render(entitylivingbaseIn, p_177141_2_, p_177141_3_, p_177141_5_, p_177141_6_, p_177141_7_, scale); GlState.disableBlend(); diff --git a/java/src/game/renderer/model/ModelDragon.java b/java/src/game/renderer/model/ModelDragon.java index 4c6603c..45fb3b0 100755 --- a/java/src/game/renderer/model/ModelDragon.java +++ b/java/src/game/renderer/model/ModelDragon.java @@ -209,12 +209,12 @@ public class ModelDragon extends ModelBase if (j == 0) { - GlState.cullFace(1028); + GlState.cullFace(GL11.GL_FRONT); } } GL11.glPopMatrix(); - GlState.cullFace(1029); + GlState.cullFace(GL11.GL_BACK); GlState.disableCull(); float f10 = -((float)Math.sin((double)(f * (float)Math.PI * 2.0F))) * 0.0F; f8 = f * (float)Math.PI * 2.0F; diff --git a/java/src/game/renderer/particle/EffectRenderer.java b/java/src/game/renderer/particle/EffectRenderer.java index 26240b1..7e639bd 100755 --- a/java/src/game/renderer/particle/EffectRenderer.java +++ b/java/src/game/renderer/particle/EffectRenderer.java @@ -3,6 +3,8 @@ package game.renderer.particle; import java.util.List; import java.util.Map; +import org.lwjgl.opengl.GL11; + import com.google.common.collect.Lists; import com.google.common.collect.Maps; @@ -219,8 +221,8 @@ public class EffectRenderer EntityFX.interpPosY = entityIn.lastTickPosY + (entityIn.posY - entityIn.lastTickPosY) * (double)partialTicks; EntityFX.interpPosZ = entityIn.lastTickPosZ + (entityIn.posZ - entityIn.lastTickPosZ) * (double)partialTicks; GlState.enableBlend(); - GlState.blendFunc(770, 771); - GlState.alphaFunc(516, 0.003921569F); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); + GlState.alphaFunc(GL11.GL_GREATER, 0.003921569F); for (int i = 0; i < 3; ++i) { @@ -270,7 +272,7 @@ public class EffectRenderer GlState.depthMask(true); GlState.disableBlend(); - GlState.alphaFunc(516, 0.1F); + GlState.alphaFunc(GL11.GL_GREATER, 0.1F); } public void renderLitParticles(Entity entityIn, float partialTick) diff --git a/java/src/game/renderer/particle/EntityFootStepFX.java b/java/src/game/renderer/particle/EntityFootStepFX.java index c9f3161..4d7b828 100755 --- a/java/src/game/renderer/particle/EntityFootStepFX.java +++ b/java/src/game/renderer/particle/EntityFootStepFX.java @@ -1,5 +1,7 @@ package game.renderer.particle; +import org.lwjgl.opengl.GL11; + import game.Game; import game.entity.Entity; import game.renderer.DefaultVertexFormats; @@ -52,7 +54,7 @@ public class EntityFootStepFX extends EntityFX float f6 = this.worldObj.getLightBrightness(new BlockPos(this)); this.currentFootSteps.bindTexture(EffectRenderer.particleTextures); GlState.enableBlend(); - GlState.blendFunc(770, 771); + GlState.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); worldRendererIn.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); worldRendererIn.pos((double)(f3 - 0.125F), (double)f4, (double)(f5 + 0.125F)).tex(u1, u3).color(f6, f6, f6, f1).endVertex(); worldRendererIn.pos((double)(f3 + 0.125F), (double)f4, (double)(f5 + 0.125F)).tex(u1, u2).color(f6, f6, f6, f1).endVertex(); diff --git a/java/src/game/renderer/tileentity/TileEntityChestRenderer.java b/java/src/game/renderer/tileentity/TileEntityChestRenderer.java index 901cc33..0e1ca98 100755 --- a/java/src/game/renderer/tileentity/TileEntityChestRenderer.java +++ b/java/src/game/renderer/tileentity/TileEntityChestRenderer.java @@ -42,7 +42,7 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer= 0) { this.bindTexture(DESTROY_STAGES[destroyStage]); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPushMatrix(); GL11.glScalef(4.0F, 4.0F, 1.0F); GL11.glTranslatef(0.0625F, 0.0625F, 0.0625F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } // else if (this.isChristmas) // { @@ -101,11 +101,11 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer= 0) { this.bindTexture(DESTROY_STAGES[destroyStage]); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPushMatrix(); GL11.glScalef(8.0F, 4.0F, 1.0F); GL11.glTranslatef(0.0625F, 0.0625F, 0.0625F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } // else if (this.isChristmas) // { @@ -198,9 +198,9 @@ public class TileEntityChestRenderer extends TileEntitySpecialRenderer= 0) { - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPopMatrix(); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } } } diff --git a/java/src/game/renderer/tileentity/TileEntityItemStackRenderer.java b/java/src/game/renderer/tileentity/TileEntityItemStackRenderer.java index 845847f..08829fb 100755 --- a/java/src/game/renderer/tileentity/TileEntityItemStackRenderer.java +++ b/java/src/game/renderer/tileentity/TileEntityItemStackRenderer.java @@ -47,7 +47,7 @@ public class TileEntityItemStackRenderer GL11.glPushMatrix(); GL11.glTranslatef(-0.5F, 0.0F, -0.5F); GL11.glScalef(2.0F, 2.0F, 2.0F); - boolean flag = GlState.isCullEbabled(); + boolean flag = GlState.isCullEnabled(); GlState.disableCull(); TileEntitySkullRenderer.instance.renderSkull(0.0F, 0.0F, 0.0F, Facing.UP, 0.0F, -1); if(flag) diff --git a/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java b/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java index 9ee9d6f..d0655b8 100755 --- a/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java +++ b/java/src/game/renderer/tileentity/TileEntityPistonRenderer.java @@ -36,7 +36,7 @@ public class TileEntityPistonRenderer extends TileEntitySpecialRenderer= 0) { this.bindTexture(DESTROY_STAGES[destroyStage]); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPushMatrix(); GL11.glScalef(4.0F, 2.0F, 1.0F); GL11.glTranslatef(0.0625F, 0.0625F, 0.0625F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } else { @@ -116,9 +116,9 @@ public class TileEntitySignRenderer extends TileEntitySpecialRenderer= 0) { - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPopMatrix(); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } } diff --git a/java/src/game/renderer/tileentity/TileEntitySkullRenderer.java b/java/src/game/renderer/tileentity/TileEntitySkullRenderer.java index 236e2c7..7a6ef45 100755 --- a/java/src/game/renderer/tileentity/TileEntitySkullRenderer.java +++ b/java/src/game/renderer/tileentity/TileEntitySkullRenderer.java @@ -34,11 +34,11 @@ public class TileEntitySkullRenderer extends TileEntitySpecialRenderer= 0) { this.bindTexture(DESTROY_STAGES[destroyStage]); - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPushMatrix(); GL11.glScalef(4.0F, 2.0F, 1.0F); GL11.glTranslatef(0.0625F, 0.0625F, 0.0625F); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } else { @@ -116,9 +116,9 @@ public class TileEntitySkullRenderer extends TileEntitySpecialRenderer= 0) { - GL11.glMatrixMode(5890); + GL11.glMatrixMode(GL11.GL_TEXTURE); GL11.glPopMatrix(); - GL11.glMatrixMode(5888); + GL11.glMatrixMode(GL11.GL_MODELVIEW); } } }