From 02f3146aea9d846d3d8d0a89d298d23a8aab6358 Mon Sep 17 00:00:00 2001 From: Sen Date: Mon, 1 Sep 2025 09:38:58 +0200 Subject: [PATCH] revert some rendering changes, fix colored lighting --- client/src/main/java/client/Client.java | 145 +++-- client/src/main/java/client/gui/Font.java | 6 +- client/src/main/java/client/gui/Gui.java | 4 +- .../java/client/gui/character/GuiChar.java | 28 +- .../client/gui/container/GuiContainer.java | 22 +- .../client/gui/container/GuiMerchant.java | 6 +- .../main/java/client/gui/element/Element.java | 6 +- .../main/java/client/gui/element/Textbox.java | 6 +- .../java/client/gui/options/GuiGraphics.java | 17 +- .../main/java/client/renderer/Drawing.java | 48 +- .../java/client/renderer/EffectRenderer.java | 12 +- .../main/java/client/renderer/Frustum.java | 6 +- .../main/java/client/renderer/GlState.java | 96 +-- .../java/client/renderer/ItemRenderer.java | 152 ++--- .../java/client/renderer/MatrixState.java | 8 +- .../main/java/client/renderer/Project.java | 8 +- .../client/renderer/RegionRenderCache.java | 2 +- .../main/java/client/renderer/Renderer.java | 566 +++++++++--------- .../src/main/java/client/renderer/Shader.java | 86 +-- .../java/client/renderer/Tessellator.java | 36 +- .../java/client/renderer/VertexBuffer.java | 14 +- .../client/renderer/VertexFormatElement.java | 16 +- .../renderer/blockmodel/FaceBakery.java | 42 +- .../renderer/blockmodel/ModelBakery.java | 11 +- .../renderer/blockmodel/ModelBlock.java | 9 - .../client/renderer/chunk/RenderChunk.java | 18 +- .../renderer/entity/RenderArachnoid.java | 8 +- .../client/renderer/entity/RenderArrow.java | 34 +- .../client/renderer/entity/RenderBat.java | 8 +- .../renderer/entity/RenderBlockEntity.java | 12 +- .../client/renderer/entity/RenderBoat.java | 18 +- .../client/renderer/entity/RenderBullet.java | 32 +- .../client/renderer/entity/RenderCat.java | 4 +- .../client/renderer/entity/RenderCrystal.java | 8 +- .../client/renderer/entity/RenderDie.java | 12 +- .../client/renderer/entity/RenderEntity.java | 8 +- .../renderer/entity/RenderEntityItem.java | 30 +- .../renderer/entity/RenderFallingBlock.java | 12 +- .../renderer/entity/RenderFireball.java | 16 +- .../client/renderer/entity/RenderFish.java | 18 +- .../renderer/entity/RenderFlyingBox.java | 12 +- .../client/renderer/entity/RenderHorse.java | 4 +- .../renderer/entity/RenderHumanoid.java | 4 +- .../client/renderer/entity/RenderItem.java | 118 ++-- .../renderer/entity/RenderItemEntity.java | 14 +- .../renderer/entity/RenderLeashKnot.java | 10 +- .../renderer/entity/RenderLightning.java | 6 +- .../client/renderer/entity/RenderLiving.java | 8 +- .../client/renderer/entity/RenderManager.java | 36 +- .../renderer/entity/RenderMinecart.java | 30 +- .../client/renderer/entity/RenderSlime.java | 4 +- .../renderer/entity/RenderSpaceMarine.java | 4 +- .../renderer/entity/RenderTntMinecart.java | 10 +- .../renderer/entity/RenderTntPrimed.java | 16 +- .../java/client/renderer/entity/RenderXp.java | 18 +- .../renderer/entity/RendererLivingEntity.java | 62 +- .../client/renderer/layers/LayerArmor.java | 43 +- .../client/renderer/layers/LayerArrow.java | 8 +- .../client/renderer/layers/LayerCape.java | 18 +- .../client/renderer/layers/LayerCharge.java | 22 +- .../renderer/layers/LayerEntityBreak.java | 28 +- .../client/renderer/layers/LayerExtra.java | 46 +- .../client/renderer/layers/LayerHeldItem.java | 10 +- .../client/renderer/layers/LayerSlimeGel.java | 4 +- .../client/renderer/model/ModelArachnoid.java | 12 +- .../client/renderer/model/ModelBiped.java | 8 +- .../java/client/renderer/model/ModelCat.java | 18 +- .../client/renderer/model/ModelChicken.java | 16 +- .../client/renderer/model/ModelCrystal.java | 28 +- .../client/renderer/model/ModelDragon.java | 34 +- .../java/client/renderer/model/ModelFox.java | 16 +- .../client/renderer/model/ModelHorse.java | 28 +- .../client/renderer/model/ModelHumanoid.java | 8 +- .../client/renderer/model/ModelMouse.java | 10 +- .../client/renderer/model/ModelQuadruped.java | 16 +- .../client/renderer/model/ModelRabbit.java | 16 +- .../client/renderer/model/ModelRenderer.java | 70 +-- .../java/client/renderer/model/ModelWolf.java | 16 +- .../client/renderer/model/TexturedQuad.java | 4 +- .../java/client/renderer/texture/Texture.java | 4 +- .../client/renderer/texture/TextureMap.java | 8 +- .../client/renderer/texture/TextureUtil.java | 16 +- .../renderer/tileentity/DisplayRenderer.java | 14 +- .../renderer/tileentity/ItemPipeRenderer.java | 14 +- .../renderer/tileentity/SignRenderer.java | 30 +- .../renderer/tileentity/SpecialRenderer.java | 4 +- common/src/main/java/common/block/Block.java | 5 - .../common/block/artificial/BlockGlass.java | 5 - .../block/artificial/BlockMetalBlock.java | 5 - .../common/block/artificial/BlockPane.java | 5 - .../java/common/block/liquid/BlockLiquid.java | 5 - .../java/common/block/natural/BlockCyber.java | 5 - .../main/java/common/dimension/Dimension.java | 24 - .../main/java/common/init/BlockRegistry.java | 1 - common/src/main/java/common/init/Blocks.java | 1 - common/src/main/java/common/init/Items.java | 1 - common/src/main/java/common/world/Chunk.java | 4 +- .../java/server/init/UniverseRegistry.java | 4 +- 98 files changed, 1248 insertions(+), 1332 deletions(-) diff --git a/client/src/main/java/client/Client.java b/client/src/main/java/client/Client.java index 097f60cf..21feaf5b 100755 --- a/client/src/main/java/client/Client.java +++ b/client/src/main/java/client/Client.java @@ -30,7 +30,7 @@ import javax.imageio.ImageIO; import javax.swing.JFileChooser; import org.lwjgl.opengl.GL; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.audio.AudioInterface; import client.audio.MidiBank; @@ -317,6 +317,12 @@ public class Client implements IThreadListener { Client.CLIENT.updateTexture(); } } + + public static class LightFunction implements FloatFunction { + public void apply(FloatVar cv, float value) { + Client.CLIENT.renderer.loadRenderers(); + } + } private interface DebugRunner { void execute(Keysym key); @@ -485,6 +491,8 @@ public class Client implements IThreadListener { public boolean interrupted; public boolean freecam; public boolean servercam; + public boolean shaders; + public boolean mipmaps; private int leftClickCounter; private int rightClickTimer; @@ -701,12 +709,10 @@ public class Client implements IThreadListener { @Variable(name = "mid_visualizer", category = CVarCategory.SOUND, display = "Visualisation") public boolean midiVisualizer = true; - @Variable(name = "gl_light_blend", category = CVarCategory.RENDER, min = 0.0f, max = 1.0f, precision = 2, unit = "%", display = "Lichtüberdeckung") - public float lightBlend = 0.5f; @Variable(name = "gl_tex_mipmaps", category = CVarCategory.RENDER, display = "Mipmaps", callback = MipmapFunction.class) - private MipmapType mipmapType = MipmapType.LINEAR; + private MipmapType mipmapType = MipmapType.NONE; @Variable(name = "gl_use_shader", category = CVarCategory.RENDER, display = "Shader verwenden") - public boolean useShader = true; + public boolean useShader = false; public static final Client CLIENT = new Client(); @@ -843,7 +849,8 @@ public class Client implements IThreadListener { Font.unloadFonts(); Font.loadFonts(); Font.select(this.font); - Shader.loadShaders(); + if(this.shaders) + Shader.loadShaders(); this.textureManager.onReload(); this.modelManager.onReload(); this.renderItem.onReload(); @@ -859,19 +866,21 @@ public class Client implements IThreadListener { this.textureManager = new TextureManager(); this.textureManager.onReload(); this.soundManager = new SoundManager(this); - Log.RENDER.debug("Maximale Texturgröße: %d", GL46.glGetInteger(GL46.GL_MAX_TEXTURE_SIZE)); + Log.RENDER.debug("Maximale Texturgröße: %d", GL15.glGetInteger(GL15.GL_MAX_TEXTURE_SIZE)); + Log.RENDER.debug("Shader verfügbar: %s", (this.shaders = GL.getCapabilities().OpenGL20) ? "Ja (OpenGL 2.0+)" : "Nein (OpenGL 1.5)"); + Log.RENDER.debug("Mipmaps verfügbar: %s", (this.mipmaps = GL.getCapabilities().OpenGL30) ? "Ja (OpenGL 3.0+)" : "Nein (OpenGL 1.5-2.1)"); GlState.enableTexture2D(); - GlState.shadeModel(GL46.GL_SMOOTH); - GL46.glClearDepth(1.0D); + GlState.shadeModel(GL15.GL_SMOOTH); + GL15.glClearDepth(1.0D); GlState.enableDepth(); - GlState.depthFunc(GL46.GL_LEQUAL); + GlState.depthFunc(GL15.GL_LEQUAL); GlState.enableAlpha(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); - GlState.cullFace(GL46.GL_BACK); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); + GlState.cullFace(GL15.GL_BACK); GlState.enableCull(); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); this.textureMap = new TextureMap(); this.textureManager.loadTexture(TextureMap.BLOCKS, this.textureMap); this.updateTexture(); @@ -1000,7 +1009,7 @@ public class Client implements IThreadListener { { this.controller.update(); } - this.textureMap.update(); + this.textureMap.update(this.mipmaps && this.mipmapType != MipmapType.NONE); if (this.open != null) { this.open.updateScreen(); @@ -1100,13 +1109,13 @@ public class Client implements IThreadListener { } public void render() { - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA); GlState.enableDepth(); GlState.clearColor(0.0f, 0.0f, 0.0f, 1.0f); - GL46.glClear(GL46.GL_COLOR_BUFFER_BIT | GL46.GL_DEPTH_BUFFER_BIT); + GL15.glClear(GL15.GL_COLOR_BUFFER_BIT | GL15.GL_DEPTH_BUFFER_BIT); if(this.wireframe) { - GL46.glLineWidth(1.0f); - GL46.glPolygonMode(GL46.GL_FRONT_AND_BACK, GL46.GL_LINE); + GL15.glLineWidth(1.0f); + GL15.glPolygonMode(GL15.GL_FRONT_AND_BACK, GL15.GL_LINE); } if(this.open == null) { if(this.player != null && this.viewEntity == this.player) @@ -1119,18 +1128,18 @@ public class Client implements IThreadListener { this.soundManager.setListener(this.player, (float)this.tickFraction); if(this.player != null && (this.player.isEntityInsideOpaqueBlock() || this.viewEntity != this.player)) this.thirdPersonView = 0; - GL46.glPushMatrix(); - GL46.glClear(16640); + GL15.glPushMatrix(); + GL15.glClear(GL15.GL_COLOR_BUFFER_BIT | GL15.GL_DEPTH_BUFFER_BIT); GlState.enableTexture2D(); if(this.world != null) this.renderer.renderWorld((float)this.tickFraction, System.nanoTime() - this.tickStart); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.disableTexture2D(); GlState.disableCull(); GlState.enableBlend(); if(this.wireframe) - GL46.glPolygonMode(GL46.GL_FRONT_AND_BACK, GL46.GL_FILL); + GL15.glPolygonMode(GL15.GL_FRONT_AND_BACK, GL15.GL_FILL); } private int drawStat(int x, int y, String name, int value, int max, int color) { @@ -1327,17 +1336,17 @@ public class Client implements IThreadListener { } GlState.bindTexture(0); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.enableTexture2D(); if(this.world != null && this.open == null && this.player != null && this.viewEntity == this.player) { GlState.enableRescaleNormal(); GlState.enableBlend(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); ItemRenderer.enableGUIStandardItemLighting(); - GL46.glPushMatrix(); - GL46.glTranslatef(0.0f, (float)by, 0.0f); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0f, (float)by, 0.0f); if(this.scaleHotbar) - GL46.glScalef(2.0f, 2.0f, 2.0f); + GL15.glScalef(2.0f, 2.0f, 2.0f); int xPos = xoff; for(int index = 0; index < size; ++index) { @@ -1345,12 +1354,12 @@ public class Client implements IThreadListener { if(itemstack != null) { if(width < 20 && selected != index && selected != index + 1 && index != size - 1) { this.scissor(xPos * scale, this.fbY - (by + 16 * scale), (width - 1) * scale, 16 * scale); - GL46.glEnable(GL46.GL_SCISSOR_TEST); + GL15.glEnable(GL15.GL_SCISSOR_TEST); } GlState.enableDepth(); this.renderItem.renderItemAndEffectIntoGUI(itemstack, xPos, 0); if(width < 20 && selected != index && selected != index + 1 && index != size - 1) - GL46.glDisable(GL46.GL_SCISSOR_TEST); + GL15.glDisable(GL15.GL_SCISSOR_TEST); } xPos += width >= 20 || selected == index || selected == index + 1 ? 20 : width; } @@ -1362,16 +1371,16 @@ public class Client implements IThreadListener { else if(this.pointed != null && this.pointed.type == ObjectType.ENTITY && this.pointed.entity != null) item = this.pointed.entity.getItem(); if(item != null) { - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glTranslatef((float)(this.fbX / 2 - 180 + 4 + 1), (float)(this.hudMargin + 20 + 1), 0.0f); - GL46.glScalef(2.0f, 2.0f, 2.0f); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glTranslatef((float)(this.fbX / 2 - 180 + 4 + 1), (float)(this.hudMargin + 20 + 1), 0.0f); + GL15.glScalef(2.0f, 2.0f, 2.0f); GlState.enableDepth(); this.renderItem.renderItemAndEffectIntoGUI(new ItemStack(item), 0, 0); } } - GL46.glPopMatrix(); + GL15.glPopMatrix(); ItemRenderer.disableStandardItemLighting(); GlState.disableRescaleNormal(); GlState.disableBlend(); @@ -1440,8 +1449,8 @@ public class Client implements IThreadListener { "Tickrate: %s%.2f" + Color.RESET + " %s [" + Color.GREEN + "%.1f" + Color.RESET + "], %.3f ms, E %d ms" + "%s%s" , - GL46.glGetString(GL46.GL_VERSION), - GL46.glGetString(GL46.GL_RENDERER), GL46.glGetString(GL46.GL_VENDOR), + GL15.glGetString(GL15.GL_VERSION), + GL15.glGetString(GL15.GL_RENDERER), GL15.glGetString(GL15.GL_VENDOR), this.framecode(), this.framerate < 1.0f ? 1.0f / this.framerate : this.framerate, this.framerate < 1.0f ? "SPF" : "FPS", this.vsync ? Color.DARK_GRAY + "VSYNC" : (this.syncLimited ? Color.GREEN + "" + this.syncLimit : Color.RED + "UNL"), (float)PerfSection.getTotal(false) / 1000.0f, this.fbRawX, this.fbRawY, @@ -2125,7 +2134,7 @@ public class Client implements IThreadListener { } private void fbsize(int x, int y) { - GL46.glViewport(0, 0, x, y); + GL15.glViewport(0, 0, x, y); this.fbRawX = x; this.fbRawY = y; this.rescale(); @@ -2308,22 +2317,22 @@ public class Client implements IThreadListener { public void setupOverlay() { GlState.disableDepth(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ONE_MINUS_SRC_ALPHA); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ONE_MINUS_SRC_ALPHA); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.color(1.0f, 1.0f, 1.0f, 1.0f); - GL46.glClear(256); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); - GL46.glOrtho(0.0D, (double)this.fbRawX, (double)this.fbRawY, 0.0D, 1000.0D, 3000.0D); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glLoadIdentity(); - GL46.glTranslatef(0.0F, 0.0F, -2000.0F); + GL15.glClear(GL15.GL_DEPTH_BUFFER_BIT); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); + GL15.glOrtho(0.0D, (double)this.fbRawX, (double)this.fbRawY, 0.0D, 1000.0D, 3000.0D); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glLoadIdentity(); + GL15.glTranslatef(0.0F, 0.0F, -2000.0F); if(this.scale != 1) - GL46.glScalef((float)this.scale, (float)this.scale, 1.0f); + GL15.glScalef((float)this.scale, (float)this.scale, 1.0f); } public void scissor(int x, int y, int width, int height) { - GL46.glScissor(x * this.scale, y * this.scale, width * this.scale, height * this.scale); + GL15.glScissor(x * this.scale, y * this.scale, width * this.scale, height * this.scale); } private void addFrame(long runningTime) @@ -2363,13 +2372,13 @@ public class Client implements IThreadListener { if(!Window.createWindow(VERSION, System.getProperty("opengl.debug") != null)) System.exit(1); GL.createCapabilities(); - if(!GL.getCapabilities().OpenGL46) { + if(!GL.getCapabilities().OpenGL15) { Window.destroyWindow(); - Util.panic("Inkompatible OpenGL-Version", "OpenGL 4.6 oder höher ist erforderlich, um dieses Programm auszuführen."); + Util.panic("Inkompatible OpenGL-Version", "OpenGL 1.5 oder höher ist erforderlich, um dieses Programm auszuführen."); } - Log.SYSTEM.info("OpenGL %s", GL46.glGetString(GL46.GL_VERSION)); - Log.SYSTEM.info("GL_VENDOR: %s", GL46.glGetString(GL46.GL_VENDOR)); - Log.SYSTEM.info("GL_RENDERER: %s", GL46.glGetString(GL46.GL_RENDERER)); + Log.SYSTEM.info("OpenGL %s", GL15.glGetString(GL15.GL_VERSION)); + Log.SYSTEM.info("GL_VENDOR: %s", GL15.glGetString(GL15.GL_VENDOR)); + Log.SYSTEM.info("GL_RENDERER: %s", GL15.glGetString(GL15.GL_RENDERER)); Log.SYSTEM.info("Starte ..."); this.init(); @@ -2379,9 +2388,10 @@ public class Client implements IThreadListener { Font.loadFonts(); Font.select(this.font); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA); this.initConsole(); - Shader.loadShaders(); + if(this.shaders) + Shader.loadShaders(); this.startSound(true); this.vidMode = Window.getDisplayMode(); if(this.vidMode != null && (this.vidMode.width() < MIN_WIDTH || this.vidMode.height() < MIN_HEIGHT)) @@ -2410,7 +2420,7 @@ public class Client implements IThreadListener { Bind.updateBinds(); this.input(); Bind.enableInput(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.bindTexture(0); this.inputGui(); if(this.open != null) @@ -2427,7 +2437,7 @@ public class Client implements IThreadListener { this.finish(); PerfSection.SWAP.enter(); if(this.glFlush) - GL46.glFlush(); + GL15.glFlush(); Window.swapBuffers(); PerfSection.EVENTS.enter(); Log.flushLog(); @@ -2451,7 +2461,8 @@ public class Client implements IThreadListener { Log.flushLog(); this.save(); Font.unloadFonts(); - Shader.unloadShaders(); + if(this.shaders) + Shader.unloadShaders(); Window.destroyWindow(); Log.SYSTEM.info("Beendet."); } @@ -2522,7 +2533,7 @@ public class Client implements IThreadListener { this.saving = true; final int stride = ((this.fbRawX * 3) & 3) != 0 ? 4 + ((this.fbRawX * 3) & ~3) : (this.fbRawX * 3); final ByteBuffer data = ByteBuffer.allocateDirect(stride * this.fbRawY).order(ByteOrder.nativeOrder()); - GL46.glReadPixels(0, 0, this.fbRawX, this.fbRawY, GL46.GL_RGB, GL46.GL_UNSIGNED_BYTE, data); + GL15.glReadPixels(0, 0, this.fbRawX, this.fbRawY, GL15.GL_RGB, GL15.GL_UNSIGNED_BYTE, data); new Thread(new Runnable() { public void run() { byte[] pixels = new byte[stride * Client.this.fbRawY]; @@ -2710,7 +2721,9 @@ public class Client implements IThreadListener { if(Util.DEVMODE) this.registerDebug(Keysym.L, "Maximale Helligkeit umschalten", new DebugRunner() { public void execute(Keysym key) { - Client.this.logFeed("Maximale Helligkeit: %s", (Client.this.setGamma ^= true) ? "an" : "aus"); + Client.this.setGamma ^= true; + Client.this.renderer.loadRenderers(); + Client.this.logFeed("Maximale Helligkeit: %s", Client.this.setGamma ? "an" : "aus"); } }); this.registerDebug(Keysym.J, "JVM GC ausführen", new DebugRunner() { @@ -3262,17 +3275,17 @@ public class Client implements IThreadListener { private void renderWorldDirections(float partialTicks) { GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GL46.glLineWidth(1.0F); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GL15.glLineWidth(1.0F); GlState.disableTexture2D(); GlState.depthMask(false); - GL46.glPushMatrix(); - GL46.glTranslatef((float)(this.fbX / 2), (float)(this.fbY / 2), 0.0F); + GL15.glPushMatrix(); + GL15.glTranslatef((float)(this.fbX / 2), (float)(this.fbY / 2), 0.0F); this.renderer.rotateCamera(this.viewEntity, partialTicks, true); Renderer.drawOutlinedBoundingBox(new BoundingBox(0.0D, 0.0D, 0.0D, 24D, 1D, 1D), 255, 0, 0, 255); Renderer.drawOutlinedBoundingBox(new BoundingBox(0.0D, 0.0D, 0.0D, 1D, 1D, 24D), 0, 0, 255, 255); Renderer.drawOutlinedBoundingBox(new BoundingBox(0.0D, 0.0D, 0.0D, 1D, -20D, 1D), 0, 255, 0, 255); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.depthMask(true); GlState.enableTexture2D(); GlState.disableBlend(); diff --git a/client/src/main/java/client/gui/Font.java b/client/src/main/java/client/gui/Font.java index 7516f31a..1fc6f838 100644 --- a/client/src/main/java/client/gui/Font.java +++ b/client/src/main/java/client/gui/Font.java @@ -4,7 +4,7 @@ import java.awt.image.BufferedImage; import java.io.FileNotFoundException; import java.io.IOException; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.texture.TextureUtil; @@ -110,7 +110,7 @@ public enum Font implements Identifyable, Displayable { int[] data = new int[width * 16 * height * 16]; img.getRGB(0, 0, width * 16, height * 16, data, 0, width * 16); calculate(data, font.sizes, width, height, 0); - font.texture = GL46.glGenTextures(); + font.texture = GL15.glGenTextures(); TextureUtil.uploadImage(font.texture, img); Log.RENDER.debug("Font-Textur wurde mit ID #%d geladen", font.texture); } @@ -141,7 +141,7 @@ public enum Font implements Identifyable, Displayable { public static void unloadFonts() { for(Font font : values()) { if(font.texture != 0) { - GL46.glDeleteTextures(font.texture); + GL15.glDeleteTextures(font.texture); Log.RENDER.debug("Font-Textur mit ID #%d wurde gelöscht", font.texture); font.texture = 0; } diff --git a/client/src/main/java/client/gui/Gui.java b/client/src/main/java/client/gui/Gui.java index e9fc01da..2c3b9dc6 100644 --- a/client/src/main/java/client/gui/Gui.java +++ b/client/src/main/java/client/gui/Gui.java @@ -2,7 +2,7 @@ package client.gui; import java.util.List; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.gui.element.Dropdown; @@ -230,7 +230,7 @@ public abstract class Gui { if(this.gm.fbX != 0 && this.gm.fbY != 0) this.draw(); GlState.bindTexture(0); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.enableTexture2D(); GlState.disableDepth(); this.drawPost(); diff --git a/client/src/main/java/client/gui/character/GuiChar.java b/client/src/main/java/client/gui/character/GuiChar.java index c476178c..c679b2fc 100755 --- a/client/src/main/java/client/gui/character/GuiChar.java +++ b/client/src/main/java/client/gui/character/GuiChar.java @@ -12,7 +12,7 @@ import java.util.List; import javax.imageio.ImageIO; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.Client.FileMode; @@ -613,41 +613,41 @@ public class GuiChar extends GuiList GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.enableDepth(); GlState.enableColorMaterial(); - GL46.glPushMatrix(); - GL46.glTranslatef((float)posX, (float)posY, 200.0F); - GL46.glScalef(-scale, scale, scale); - GL46.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + GL15.glPushMatrix(); + GL15.glTranslatef((float)posX, (float)posY, 200.0F); + GL15.glScalef(-scale, scale, scale); + GL15.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); float f = ent.yawOffset; float f1 = ent.rotYaw; float f2 = ent.rotPitch; float f3 = ent.prevHeadYaw; float f4 = ent.headYaw; - GL46.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(135.0F, 0.0F, 1.0F, 0.0F); ItemRenderer.enableStandardItemLighting(); - GL46.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(0.0F, ent.height / 2, 0.0F); - GL46.glRotatef(-pitch, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.0F, ent.height / 2, 0.0F); + GL15.glRotatef(-pitch, 1.0F, 0.0F, 0.0F); ent.yawOffset = yaw; ent.rotYaw = yaw; ent.rotPitch = 0.0f; ent.headYaw = ent.rotYaw; ent.prevHeadYaw = ent.rotYaw; - GL46.glTranslatef(0.0F, -(ent.height / 2), 0.0F); + GL15.glTranslatef(0.0F, -(ent.height / 2), 0.0F); RenderManager rendermanager = Client.CLIENT.getRenderManager(); rendermanager.setPlayerViewY(180.0F); rendermanager.renderEntity(ent, 0.0D, 0.0D, 0.0D, 1.0F); -// GL46.glTranslatef(0.0F, 0.0F, 0.0F); +// GL15.glTranslatef(0.0F, 0.0F, 0.0F); ent.yawOffset = f; ent.rotYaw = f1; ent.rotPitch = f2; ent.prevHeadYaw = f3; ent.headYaw = f4; - GL46.glPopMatrix(); + GL15.glPopMatrix(); ItemRenderer.disableStandardItemLighting(); GlState.disableRescaleNormal(); - GlState.setActiveTexture(GL46.GL_TEXTURE1); + GlState.setActiveTexture(GL15.GL_TEXTURE1); GlState.disableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.disableDepth(); } } diff --git a/client/src/main/java/client/gui/container/GuiContainer.java b/client/src/main/java/client/gui/container/GuiContainer.java index f140c5c9..abf01676 100755 --- a/client/src/main/java/client/gui/container/GuiContainer.java +++ b/client/src/main/java/client/gui/container/GuiContainer.java @@ -7,7 +7,7 @@ import java.util.Map; import java.util.Set; import java.util.Map.Entry; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.gui.Font; @@ -332,10 +332,10 @@ public abstract class GuiContainer extends Gui } if(this.gm.itemCheat) { - GL46.glPushMatrix(); - GL46.glTranslatef(-(float)((this.gm.fbX - this.xSize * this.container_scale) / 2) * (1.0f / (float)this.container_scale), -(float)((this.gm.fbY - this.ySize * this.container_scale) / 2) * (1.0f / (float)this.container_scale), 0.0f); + GL15.glPushMatrix(); + GL15.glTranslatef(-(float)((this.gm.fbX - this.xSize * this.container_scale) / 2) * (1.0f / (float)this.container_scale), -(float)((this.gm.fbY - this.ySize * this.container_scale) / 2) * (1.0f / (float)this.container_scale), 0.0f); if(this.container_scale != 1) - GL46.glScalef(1.0f / (float)this.container_scale, 1.0f / (float)this.container_scale, 1.0f / (float)this.container_scale); + GL15.glScalef(1.0f / (float)this.container_scale, 1.0f / (float)this.container_scale, 1.0f / (float)this.container_scale); int i = (ITEM_LIST.size() + this.cheatWidth - 1) / this.cheatWidth - this.cheatHeight; int j = (int)((double)(this.currentScroll * (float)i) + 0.5D); @@ -366,7 +366,7 @@ public abstract class GuiContainer extends Gui { this.drawTab(tabs); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } @@ -421,7 +421,7 @@ public abstract class GuiContainer extends Gui this.theSlot = null; int k = 240; int l = 240; - GL46.glMultiTexCoord2f(GL46.GL_TEXTURE1, (float)k / 1.0F, (float)l / 1.0F); + GL15.glMultiTexCoord2f(GL15.GL_TEXTURE1, (float)k / 1.0F, (float)l / 1.0F); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); this.drawSlots(mouseX, mouseY); @@ -487,7 +487,7 @@ public abstract class GuiContainer extends Gui private void drawItemStack(ItemStack stack, int x, int y, String altText) { - GL46.glTranslatef(0.0F, 0.0F, 32.0F); + GL15.glTranslatef(0.0F, 0.0F, 32.0F); this.itemRender.zLevel = 200.0F; this.itemRender.renderItemAndEffectIntoGUI(stack, x, y); this.drawnOverlays.add(new Overlay(stack, x, y, altText)); @@ -526,12 +526,12 @@ public abstract class GuiContainer extends Gui } public void drawPost() { - GL46.glPushMatrix(); - GL46.glTranslatef((float)((this.gm.fbX - this.xSize * this.container_scale) / 2), (float)((this.gm.fbY - this.ySize * this.container_scale) / 2), 0.0f); + GL15.glPushMatrix(); + GL15.glTranslatef((float)((this.gm.fbX - this.xSize * this.container_scale) / 2), (float)((this.gm.fbY - this.ySize * this.container_scale) / 2), 0.0f); if(this.container_scale != 1) - GL46.glScalef((float)this.container_scale, (float)this.container_scale, (float)this.container_scale); + GL15.glScalef((float)this.container_scale, (float)this.container_scale, (float)this.container_scale); this.drawScreen((this.gm.mouseX - this.container_x) / this.container_scale, (this.gm.mouseY - this.container_y) / this.container_scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); ItemRenderer.disableStandardItemLighting(); } diff --git a/client/src/main/java/client/gui/container/GuiMerchant.java b/client/src/main/java/client/gui/container/GuiMerchant.java index 333df8da..a70ad62b 100755 --- a/client/src/main/java/client/gui/container/GuiMerchant.java +++ b/client/src/main/java/client/gui/container/GuiMerchant.java @@ -1,6 +1,6 @@ package client.gui.container; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.gui.element.ActButton; import client.gui.element.ButtonCallback; @@ -96,7 +96,7 @@ public class GuiMerchant extends GuiContainer implements ButtonCallback { ItemStack itemstack = merchantrecipe.first(); ItemStack itemstack1 = merchantrecipe.second(); ItemStack itemstack2 = merchantrecipe.result(); - GL46.glPushMatrix(); + GL15.glPushMatrix(); ItemRenderer.enableGUIStandardItemLighting(); GlState.disableLighting(); GlState.enableRescaleNormal(); @@ -123,7 +123,7 @@ public class GuiMerchant extends GuiContainer implements ButtonCallback { this.renderToolTip(itemstack2, mouseX, mouseY); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.enableLighting(); GlState.enableDepth(); ItemRenderer.enableStandardItemLighting(); diff --git a/client/src/main/java/client/gui/element/Element.java b/client/src/main/java/client/gui/element/Element.java index e4b437df..dd9267ca 100644 --- a/client/src/main/java/client/gui/element/Element.java +++ b/client/src/main/java/client/gui/element/Element.java @@ -1,6 +1,6 @@ package client.gui.element; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.gui.Formatter; @@ -222,7 +222,7 @@ public abstract class Element { int y2 = this.size_y - (this.margin_y1 + this.margin_y2); // if(elem.type == ElemType.FIELD) { this.gm.scissor(x1 < 0 ? 0 : x1, (this.gm.fbY - (y1 + y2)) < 0 ? 0 : (this.gm.fbY - (y1 + y2)), x2 < 0 ? 0 : x2, y2 < 0 ? 0 : y2); - GL46.glEnable(GL46.GL_SCISSOR_TEST); + GL15.glEnable(GL15.GL_SCISSOR_TEST); // } // if(this.type == ElemType.CUSTOM) // this.func(this, 1); @@ -230,7 +230,7 @@ public abstract class Element { this.drawForeground(x1, y1, x2, y2); // logd("DBG", "%d @ %d %d -> %d %d", elem.id, x1, y1, elem.pos_x + x2, elem.pos_y + y2); // if(elem.type == ElemType.FIELD) { - GL46.glDisable(GL46.GL_SCISSOR_TEST); + GL15.glDisable(GL15.GL_SCISSOR_TEST); // glScissor(0, 0, sys.fb_x, sys.fb_y); // } } diff --git a/client/src/main/java/client/gui/element/Textbox.java b/client/src/main/java/client/gui/element/Textbox.java index 3b78d555..4e473cf0 100644 --- a/client/src/main/java/client/gui/element/Textbox.java +++ b/client/src/main/java/client/gui/element/Textbox.java @@ -1,6 +1,6 @@ package client.gui.element; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.gui.Font; import client.renderer.Drawing; @@ -242,9 +242,9 @@ abstract class Textbox extends Element { int x2 = this.size_x - (this.margin_x1 + this.margin_x2); int y2 = this.size_y - (this.margin_y1 + this.margin_y2); this.gm.scissor(x1 < 0 ? 0 : x1, (this.gm.fbY - (y1 + y2)) < 0 ? 0 : (this.gm.fbY - (y1 + y2)), x2 < 0 ? 0 : x2, y2 < 0 ? 0 : y2); - GL46.glEnable(GL46.GL_SCISSOR_TEST); + GL15.glEnable(GL15.GL_SCISSOR_TEST); Drawing.drawRect(this.getCursorX(x1, x2), this.getCursorY(y1, y2), 1, Font.HEIGHT, 0xff000000 | (~Util.mixColor(this.gm.style.field_top, this.gm.style.field_btm))); - GL46.glDisable(GL46.GL_SCISSOR_TEST); + GL15.glDisable(GL15.GL_SCISSOR_TEST); } } diff --git a/client/src/main/java/client/gui/options/GuiGraphics.java b/client/src/main/java/client/gui/options/GuiGraphics.java index c9078d38..92fbc052 100644 --- a/client/src/main/java/client/gui/options/GuiGraphics.java +++ b/client/src/main/java/client/gui/options/GuiGraphics.java @@ -1,5 +1,8 @@ package client.gui.options; +import client.gui.element.Fill; +import common.util.Color; + public class GuiGraphics extends GuiOptions { protected GuiGraphics() { } @@ -20,11 +23,15 @@ public class GuiGraphics extends GuiOptions { this.addSelector("crosshair_color_target", 242, 100, 240, 0); this.addSelector("hud_margin", 0, 140, 240, 0); - - this.addSelector("gl_use_shader", 0, 180, 240, 0); - this.addSelector("gl_light_blend", 242, 180, 240, 0); - - this.addSelector("gl_tex_mipmaps", 242, 200, 240, 0); + + if(this.gm.shaders) + this.addSelector("gl_use_shader", 0, 180, 240, 0); + else + this.add(new Fill(0, 180, 240, 0, Color.RED + "Shader nicht unterstützt")); + if(this.gm.mipmaps) + this.addSelector("gl_tex_mipmaps", 242, 180, 240, 0); + else + this.add(new Fill(242, 180, 240, 0, Color.RED + "Mipmaps nicht unterstützt")); super.init(width, height); } diff --git a/client/src/main/java/client/renderer/Drawing.java b/client/src/main/java/client/renderer/Drawing.java index 1442bb41..da4ab7a1 100644 --- a/client/src/main/java/client/renderer/Drawing.java +++ b/client/src/main/java/client/renderer/Drawing.java @@ -1,6 +1,6 @@ package client.renderer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.gui.Font; @@ -33,12 +33,12 @@ public abstract class Drawing { GlState.enableTexture2D(); GlState.enableBlend(); GlState.disableAlpha(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GlState.shadeModel(GL46.GL_SMOOTH); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GlState.shadeModel(GL15.GL_SMOOTH); GlState.color(1.0f, 1.0f, 1.0f, 1.0f); Font.bindTexture(); RenderBuffer rb = Tessellator.getBuffer(); - rb.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + rb.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); int h = Font.HEIGHT; int tx, ty, u, v; FontChar glyph; @@ -79,7 +79,7 @@ public abstract class Drawing { x += u; } Tessellator.draw(); - GlState.shadeModel(GL46.GL_FLAT); + GlState.shadeModel(GL15.GL_FLAT); GlState.disableBlend(); GlState.enableAlpha(); GlState.enableTexture2D(); @@ -292,12 +292,12 @@ public abstract class Drawing { GlState.enableTexture2D(); GlState.enableBlend(); GlState.disableAlpha(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GlState.shadeModel(GL46.GL_SMOOTH); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GlState.shadeModel(GL15.GL_SMOOTH); GlState.color(1.0f, 1.0f, 1.0f, 1.0f); Font.bindTexture(); RenderBuffer rb = Tessellator.getBuffer(); - rb.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + rb.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); int ox = x; int ncolor = color; FontChar glyph; @@ -361,7 +361,7 @@ public abstract class Drawing { x += glyph.u + 3 - glyph.s; } Tessellator.draw(); - GlState.shadeModel(GL46.GL_FLAT); + GlState.shadeModel(GL15.GL_FLAT); GlState.disableBlend(); GlState.enableAlpha(); GlState.enableTexture2D(); @@ -403,16 +403,16 @@ public abstract class Drawing { GlState.disableTexture2D(); GlState.enableBlend(); GlState.disableAlpha(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GlState.shadeModel(GL46.GL_SMOOTH); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GlState.shadeModel(GL15.GL_SMOOTH); RenderBuffer buf = Tessellator.getBuffer(); - buf.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); + buf.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); buf.pos((double)(x + w), (double)y, 0.0).color(top).endVertex(); buf.pos((double)x, (double)y, 0.0).color(top).endVertex(); buf.pos((double)x, (double)(y + h), 0.0).color(bottom).endVertex(); buf.pos((double)(x + w), (double)(y + h), 0.0).color(bottom).endVertex(); Tessellator.draw(); - GlState.shadeModel(GL46.GL_FLAT); + GlState.shadeModel(GL15.GL_FLAT); GlState.disableBlend(); GlState.enableAlpha(); GlState.enableTexture2D(); @@ -423,16 +423,16 @@ public abstract class Drawing { // GlState.disableTexture2D(); // GlState.enableBlend(); // GlState.disableAlpha(); -// GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); -// GlState.shadeModel(GL46.GL_SMOOTH); +// GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); +// GlState.shadeModel(GL15.GL_SMOOTH); // RenderBuffer buf = Tessellator.getBuffer(); -// buf.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); +// buf.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); // buf.pos((double)(x + w), (double)y, 0.0).color(topright).endVertex(); // buf.pos((double)x, (double)y, 0.0).color(topleft).endVertex(); // buf.pos((double)x, (double)(y + h), 0.0).color(btmleft).endVertex(); // buf.pos((double)(x + w), (double)(y + h), 0.0).color(btmright).endVertex(); // Tessellator.draw(); -// GlState.shadeModel(GL46.GL_FLAT); +// GlState.shadeModel(GL15.GL_FLAT); // GlState.disableBlend(); // GlState.enableAlpha(); // GlState.enableTexture2D(); @@ -444,16 +444,16 @@ public abstract class Drawing { GlState.enableBlend(); GlState.disableAlpha(); GlState.disableTexture2D(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GlState.shadeModel(GL46.GL_SMOOTH); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GlState.shadeModel(GL15.GL_SMOOTH); GlState.color(color); - rb.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION); + rb.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION); rb.pos((double)x, (double)(y + h), 0.0D).endVertex(); rb.pos((double)(x + w), (double)(y + h), 0.0D).endVertex(); rb.pos((double)(x + w), (double)y, 0.0D).endVertex(); rb.pos((double)x, (double)y, 0.0D).endVertex(); Tessellator.draw(); - GlState.shadeModel(GL46.GL_FLAT); + GlState.shadeModel(GL15.GL_FLAT); GlState.enableTexture2D(); GlState.disableBlend(); GlState.enableAlpha(); @@ -575,7 +575,7 @@ public abstract class Drawing { gm.getTextureManager().bindTexture(texture); GlState.color(color); double scale = 32.0; - buf.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + buf.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); buf.pos((double)x, (double)y + (double)height, 0.0D).tex(0.0D, (double)height / scale).endVertex(); buf.pos((double)x + (double)width, (double)y + (double)height, 0.0D).tex((double)width / scale, (double)height / scale).endVertex(); buf.pos((double)x + (double)width, (double)y, 0.0D).tex((double)width / scale, 0.0).endVertex(); @@ -594,13 +594,13 @@ public abstract class Drawing { // GlState.color(color); float xs = 1.0f / (float)texWidth; // 0.00390625F; float ys = 1.0f / (float)texHeight; // 0.00390625F; - buf.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + buf.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); buf.pos((double)(x + 0), (double)(y + height), 0.0).tex((double)((float)(u + 0) * xs), (double)((float)(v + height) * ys)).endVertex(); buf.pos((double)(x + width), (double)(y + height), 0.0).tex((double)((float)(u + width) * xs), (double)((float)(v + height) * ys)).endVertex(); buf.pos((double)(x + width), (double)(y + 0), 0.0).tex((double)((float)(u + width) * xs), (double)((float)(v + 0) * ys)).endVertex(); buf.pos((double)(x + 0), (double)(y + 0), 0.0).tex((double)((float)(u + 0) * xs), (double)((float)(v + 0) * ys)).endVertex(); // double scale = 32.0; -// buf.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); +// buf.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); // buf.pos((double)x, (double)y + (double)height, 0.0D).tex(0.0D, (double)height / scale).endVertex(); // buf.pos((double)x + (double)width, (double)y + (double)height, 0.0D).tex((double)width / scale, (double)height / scale).endVertex(); // buf.pos((double)x + (double)width, (double)y, 0.0D).tex((double)width / scale, 0.0).endVertex(); diff --git a/client/src/main/java/client/renderer/EffectRenderer.java b/client/src/main/java/client/renderer/EffectRenderer.java index 0a14bb41..091ad541 100755 --- a/client/src/main/java/client/renderer/EffectRenderer.java +++ b/client/src/main/java/client/renderer/EffectRenderer.java @@ -3,7 +3,7 @@ package client.renderer; import java.util.List; import java.util.Map; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.texture.Sprite; @@ -815,7 +815,7 @@ public class EffectRenderer { GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.disableLighting(); ItemRenderer.disableStandardItemLighting(); - rb.begin(GL46.GL_QUADS, VERTEX_FORMAT); + rb.begin(GL15.GL_QUADS, VERTEX_FORMAT); rb.pos((double)(x - rotX * scale - rotXY * scale), (double)(y - rotZ * scale), (double)(z - rotYZ * scale - rotXZ * scale)) .tex((double)u2, (double)v2).color(this.brightness, this.brightness, this.brightness, 1.0F).lightmap(0, 240) .normal(0.0F, 1.0F, 0.0F).endVertex(); @@ -1002,8 +1002,8 @@ public class EffectRenderer { this.interpPosY = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)partial; this.interpPosZ = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double)partial; GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA); - GlState.alphaFunc(GL46.GL_GREATER, 0.003921569F); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA); + GlState.alphaFunc(GL15.GL_GREATER, 0.003921569F); for(int i = 0; i < 2; ++i) { if(!this.layers[i].isEmpty()) { @@ -1021,7 +1021,7 @@ public class EffectRenderer { GlState.color(1.0F, 1.0F, 1.0F, 1.0F); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); for(int k = 0; k < this.layers[i].size(); ++k) { this.layers[i].get(k).render(worldrenderer, partial, f, f4, f1, f2, f3); @@ -1033,7 +1033,7 @@ public class EffectRenderer { GlState.depthMask(true); GlState.disableBlend(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); } public void renderTextured(Entity entity, float partial) { diff --git a/client/src/main/java/client/renderer/Frustum.java b/client/src/main/java/client/renderer/Frustum.java index aca41c5e..a9c5cf87 100755 --- a/client/src/main/java/client/renderer/Frustum.java +++ b/client/src/main/java/client/renderer/Frustum.java @@ -4,7 +4,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.util.BoundingBox; import common.util.ExtMath; @@ -44,8 +44,8 @@ public class Frustum { public void init() { this.projection.clear(); this.modelview.clear(); - GL46.glGetFloatv(2983, this.projection); - GL46.glGetFloatv(2982, this.modelview); + GL15.glGetFloatv(2983, this.projection); + GL15.glGetFloatv(2982, this.modelview); float[] proj = this.projectionMat; float[] view = this.modelviewMat; this.projection.flip().limit(16); diff --git a/client/src/main/java/client/renderer/GlState.java b/client/src/main/java/client/renderer/GlState.java index 85742ff3..eb97d287 100755 --- a/client/src/main/java/client/renderer/GlState.java +++ b/client/src/main/java/client/renderer/GlState.java @@ -1,11 +1,11 @@ package client.renderer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; public class GlState { private static GlState.AlphaState alphaState = new GlState.AlphaState(); - private static GlState.BooleanState lightingState = new GlState.BooleanState(GL46.GL_LIGHTING); + private static GlState.BooleanState lightingState = new GlState.BooleanState(GL15.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(); @@ -14,11 +14,11 @@ public class GlState private static GlState.CullState cullState = new GlState.CullState(); private static GlState.PolygonOffsetState polygonOffsetState = new GlState.PolygonOffsetState(); private static GlState.Color clearState = new GlState.Color(); - private static GlState.BooleanState normalizeState = new GlState.BooleanState(GL46.GL_NORMALIZE); + private static GlState.BooleanState normalizeState = new GlState.BooleanState(GL15.GL_NORMALIZE); private static int activeTextureUnit = 0; private static GlState.TextureState[] textureState = new GlState.TextureState[2]; - private static int activeShadeModel = GL46.GL_SMOOTH; - private static GlState.BooleanState rescaleNormalState = new GlState.BooleanState(GL46.GL_RESCALE_NORMAL); + private static int activeShadeModel = GL15.GL_SMOOTH; + private static GlState.BooleanState rescaleNormalState = new GlState.BooleanState(GL15.GL_RESCALE_NORMAL); private static GlState.ColorMask colorMaskState = new GlState.ColorMask(); private static GlState.Color colorState = new GlState.Color(); @@ -38,7 +38,7 @@ public class GlState { alphaState.func = func; alphaState.ref = ref; - GL46.glAlphaFunc(func, ref); + GL15.glAlphaFunc(func, ref); } } @@ -78,7 +78,7 @@ public class GlState { colorMaterialState.face = face; colorMaterialState.mode = mode; - GL46.glColorMaterial(face, mode); + GL15.glColorMaterial(face, mode); } } @@ -97,7 +97,7 @@ public class GlState if (depthFunc != depthState.depthFunc) { depthState.depthFunc = depthFunc; - GL46.glDepthFunc(depthFunc); + GL15.glDepthFunc(depthFunc); } } @@ -106,7 +106,7 @@ public class GlState if (flagIn != depthState.maskEnabled) { depthState.maskEnabled = flagIn; - GL46.glDepthMask(flagIn); + GL15.glDepthMask(flagIn); } } @@ -126,7 +126,7 @@ public class GlState { blendState.srcFactor = srcFactor; blendState.dstFactor = dstFactor; - GL46.glBlendFunc(srcFactor, dstFactor); + GL15.glBlendFunc(srcFactor, dstFactor); } } @@ -138,7 +138,7 @@ public class GlState blendState.dstFactor = dstFactor; blendState.srcFactorAlpha = srcFactorAlpha; blendState.dstFactorAlpha = dstFactorAlpha; - GL46.glBlendFuncSeparate(srcFactor, dstFactor, srcFactorAlpha, dstFactorAlpha); + GL15.glBlendFuncSeparate(srcFactor, dstFactor, srcFactorAlpha, dstFactorAlpha); } } @@ -171,7 +171,7 @@ public class GlState if (param != fogState.mode) { fogState.mode = param; - GL46.glFogi(GL46.GL_FOG_MODE, param); + GL15.glFogi(GL15.GL_FOG_MODE, param); } } @@ -180,7 +180,7 @@ public class GlState if (param != fogState.density) { fogState.density = param; - GL46.glFogf(GL46.GL_FOG_DENSITY, param); + GL15.glFogf(GL15.GL_FOG_DENSITY, param); } } @@ -189,7 +189,7 @@ public class GlState if (param != fogState.start) { fogState.start = param; - GL46.glFogf(GL46.GL_FOG_START, param); + GL15.glFogf(GL15.GL_FOG_START, param); } } @@ -198,7 +198,7 @@ public class GlState if (param != fogState.end) { fogState.end = param; - GL46.glFogf(GL46.GL_FOG_END, param); + GL15.glFogf(GL15.GL_FOG_END, param); } } @@ -222,7 +222,7 @@ public class GlState if (mode != cullState.mode) { cullState.mode = mode; - GL46.glCullFace(mode); + GL15.glCullFace(mode); } } @@ -242,16 +242,16 @@ public class GlState { polygonOffsetState.factor = factor; polygonOffsetState.units = units; - GL46.glPolygonOffset(factor, units); + GL15.glPolygonOffset(factor, units); } } public static void setActiveTexture(int texture) { - if (activeTextureUnit != texture - GL46.GL_TEXTURE0) + if (activeTextureUnit != texture - GL15.GL_TEXTURE0) { - activeTextureUnit = texture - GL46.GL_TEXTURE0; - GL46.glActiveTexture(texture); + activeTextureUnit = texture - GL15.GL_TEXTURE0; + GL15.glActiveTexture(texture); } } @@ -267,7 +267,7 @@ public class GlState public static void deleteTexture(int texture) { - GL46.glDeleteTextures(texture); + GL15.glDeleteTextures(texture); for (GlState.TextureState glstatemanager$texturestate : textureState) { @@ -283,7 +283,7 @@ public class GlState if (texture != textureState[activeTextureUnit].textureName) { textureState[activeTextureUnit].textureName = texture; - GL46.glBindTexture(GL46.GL_TEXTURE_2D, texture); + GL15.glBindTexture(GL15.GL_TEXTURE_2D, texture); } } @@ -302,7 +302,7 @@ public class GlState if (mode != activeShadeModel) { activeShadeModel = mode; - GL46.glShadeModel(mode); + GL15.glShadeModel(mode); } } @@ -324,7 +324,7 @@ public class GlState colorMaskState.green = green; colorMaskState.blue = blue; colorMaskState.alpha = alpha; - GL46.glColorMask(red, green, blue, alpha); + GL15.glColorMask(red, green, blue, alpha); } } @@ -336,7 +336,7 @@ public class GlState clearState.green = green; clearState.blue = blue; clearState.alpha = alpha; - GL46.glClearColor(red, green, blue, alpha); + GL15.glClearColor(red, green, blue, alpha); } } @@ -348,7 +348,7 @@ public class GlState colorState.green = colorGreen; colorState.blue = colorBlue; colorState.alpha = colorAlpha; - GL46.glColor4f(colorRed, colorGreen, colorBlue, colorAlpha); + GL15.glColor4f(colorRed, colorGreen, colorBlue, colorAlpha); } } @@ -369,7 +369,7 @@ public class GlState { for (int i = 0; i < lightState.length; ++i) { - lightState[i] = new GlState.BooleanState(GL46.GL_LIGHT0 + i); + lightState[i] = new GlState.BooleanState(GL15.GL_LIGHT0 + i); } for (int j = 0; j < textureState.length; ++j) @@ -386,8 +386,8 @@ public class GlState private AlphaState() { - this.alphaTest = new GlState.BooleanState(GL46.GL_ALPHA_TEST); - this.func = GL46.GL_ALWAYS; + this.alphaTest = new GlState.BooleanState(GL15.GL_ALPHA_TEST); + this.func = GL15.GL_ALWAYS; this.ref = -1.0F; } } @@ -402,11 +402,11 @@ public class GlState private BlendState() { - this.blend = new GlState.BooleanState(GL46.GL_BLEND); - this.srcFactor = GL46.GL_ONE; - this.dstFactor = GL46.GL_ZERO; - this.srcFactorAlpha = GL46.GL_ONE; - this.dstFactorAlpha = GL46.GL_ZERO; + this.blend = new GlState.BooleanState(GL15.GL_BLEND); + this.srcFactor = GL15.GL_ONE; + this.dstFactor = GL15.GL_ZERO; + this.srcFactorAlpha = GL15.GL_ONE; + this.dstFactorAlpha = GL15.GL_ZERO; } } @@ -438,11 +438,11 @@ public class GlState if (state) { - GL46.glEnable(this.capability); + GL15.glEnable(this.capability); } else { - GL46.glDisable(this.capability); + GL15.glDisable(this.capability); } } } @@ -484,9 +484,9 @@ public class GlState private ColorMaterialState() { - this.colorMaterial = new GlState.BooleanState(GL46.GL_COLOR_MATERIAL); - this.face = GL46.GL_FRONT_AND_BACK; - this.mode = GL46.GL_AMBIENT_AND_DIFFUSE; + this.colorMaterial = new GlState.BooleanState(GL15.GL_COLOR_MATERIAL); + this.face = GL15.GL_FRONT_AND_BACK; + this.mode = GL15.GL_AMBIENT_AND_DIFFUSE; } } @@ -497,8 +497,8 @@ public class GlState private CullState() { - this.cullFace = new GlState.BooleanState(GL46.GL_CULL_FACE); - this.mode = GL46.GL_BACK; + this.cullFace = new GlState.BooleanState(GL15.GL_CULL_FACE); + this.mode = GL15.GL_BACK; } } @@ -510,9 +510,9 @@ public class GlState private DepthState() { - this.depthTest = new GlState.BooleanState(GL46.GL_DEPTH_TEST); + this.depthTest = new GlState.BooleanState(GL15.GL_DEPTH_TEST); this.maskEnabled = true; - this.depthFunc = GL46.GL_LESS; + this.depthFunc = GL15.GL_LESS; } } @@ -527,9 +527,9 @@ public class GlState private FogState() { - this.fog = new GlState.BooleanState(GL46.GL_FOG); + this.fog = new GlState.BooleanState(GL15.GL_FOG); this.enabled = true; - this.mode = GL46.GL_EXP; + this.mode = GL15.GL_EXP; this.density = 1.0F; this.start = 0.0F; this.end = 1.0F; @@ -545,8 +545,8 @@ public class GlState private PolygonOffsetState() { - this.polygonOffsetFill = new GlState.BooleanState(GL46.GL_POLYGON_OFFSET_FILL); - this.polygonOffsetLine = new GlState.BooleanState(GL46.GL_POLYGON_OFFSET_LINE); + this.polygonOffsetFill = new GlState.BooleanState(GL15.GL_POLYGON_OFFSET_FILL); + this.polygonOffsetLine = new GlState.BooleanState(GL15.GL_POLYGON_OFFSET_LINE); this.factor = 0.0F; this.units = 0.0F; } @@ -559,7 +559,7 @@ public class GlState private TextureState() { - this.texture2DState = new GlState.BooleanState(GL46.GL_TEXTURE_2D); + this.texture2DState = new GlState.BooleanState(GL15.GL_TEXTURE_2D); this.textureName = 0; } } diff --git a/client/src/main/java/client/renderer/ItemRenderer.java b/client/src/main/java/client/renderer/ItemRenderer.java index ead8de01..a996a795 100755 --- a/client/src/main/java/client/renderer/ItemRenderer.java +++ b/client/src/main/java/client/renderer/ItemRenderer.java @@ -4,7 +4,7 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.nio.FloatBuffer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.entity.RenderItem; @@ -50,11 +50,11 @@ public class ItemRenderer public static void enableGUIStandardItemLighting() { - GL46.glPushMatrix(); - GL46.glRotatef(-30.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(165.0F, 1.0F, 0.0F, 0.0F); + GL15.glPushMatrix(); + GL15.glRotatef(-30.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(165.0F, 1.0F, 0.0F, 0.0F); enableStandardItemLighting(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } public static void enableStandardItemLighting() @@ -63,22 +63,22 @@ public class ItemRenderer GlState.enableLight(0); GlState.enableLight(1); GlState.enableColorMaterial(); - GlState.colorMaterial(GL46.GL_FRONT_AND_BACK, GL46.GL_AMBIENT_AND_DIFFUSE); + GlState.colorMaterial(GL15.GL_FRONT_AND_BACK, GL15.GL_AMBIENT_AND_DIFFUSE); float f = 0.4F; float f1 = 0.6F; float f2 = 0.0F; - GL46.glLightfv(GL46.GL_LIGHT0, GL46.GL_POSITION, setColorBuffer( + GL15.glLightfv(GL15.GL_LIGHT0, GL15.GL_POSITION, setColorBuffer( (float)LIGHT0_POS.xCoord, (float)LIGHT0_POS.yCoord, (float)LIGHT0_POS.zCoord, 0.0f)); - GL46.glLightfv(GL46.GL_LIGHT0, GL46.GL_DIFFUSE, setColorBuffer(f1, f1, f1, 1.0F)); - GL46.glLightfv(GL46.GL_LIGHT0, GL46.GL_AMBIENT, setColorBuffer(0.0F, 0.0F, 0.0F, 1.0F)); - GL46.glLightfv(GL46.GL_LIGHT0, GL46.GL_SPECULAR, setColorBuffer(f2, f2, f2, 1.0F)); - GL46.glLightfv(GL46.GL_LIGHT1, GL46.GL_POSITION, setColorBuffer( + GL15.glLightfv(GL15.GL_LIGHT0, GL15.GL_DIFFUSE, setColorBuffer(f1, f1, f1, 1.0F)); + GL15.glLightfv(GL15.GL_LIGHT0, GL15.GL_AMBIENT, setColorBuffer(0.0F, 0.0F, 0.0F, 1.0F)); + GL15.glLightfv(GL15.GL_LIGHT0, GL15.GL_SPECULAR, setColorBuffer(f2, f2, f2, 1.0F)); + GL15.glLightfv(GL15.GL_LIGHT1, GL15.GL_POSITION, setColorBuffer( (float)LIGHT1_POS.xCoord, (float)LIGHT1_POS.yCoord, (float)LIGHT1_POS.zCoord, 0.0f)); - GL46.glLightfv(GL46.GL_LIGHT1, GL46.GL_DIFFUSE, setColorBuffer(f1, f1, f1, 1.0F)); - GL46.glLightfv(GL46.GL_LIGHT1, GL46.GL_AMBIENT, setColorBuffer(0.0F, 0.0F, 0.0F, 1.0F)); - GL46.glLightfv(GL46.GL_LIGHT1, GL46.GL_SPECULAR, setColorBuffer(f2, f2, f2, 1.0F)); - GlState.shadeModel(GL46.GL_FLAT); - GL46.glLightModelfv(GL46.GL_LIGHT_MODEL_AMBIENT, setColorBuffer(f, f, f, 1.0F)); + GL15.glLightfv(GL15.GL_LIGHT1, GL15.GL_DIFFUSE, setColorBuffer(f1, f1, f1, 1.0F)); + GL15.glLightfv(GL15.GL_LIGHT1, GL15.GL_AMBIENT, setColorBuffer(0.0F, 0.0F, 0.0F, 1.0F)); + GL15.glLightfv(GL15.GL_LIGHT1, GL15.GL_SPECULAR, setColorBuffer(f2, f2, f2, 1.0F)); + GlState.shadeModel(GL15.GL_FLAT); + GL15.glLightModelfv(GL15.GL_LIGHT_MODEL_AMBIENT, setColorBuffer(f, f, f, 1.0F)); } public static void disableStandardItemLighting() @@ -102,26 +102,26 @@ public class ItemRenderer { Item item = heldStack.getItem(); Block block = item.getBlock(); - GL46.glPushMatrix(); + GL15.glPushMatrix(); if (this.itemRenderer.shouldRenderItemIn3D(heldStack)) { - GL46.glScalef(2.0F, 2.0F, 2.0F); + GL15.glScalef(2.0F, 2.0F, 2.0F); } this.itemRenderer.renderItemForEntity(heldStack, entityIn, third); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } private void rotateArroundXAndY(float angle, float angleY) { - GL46.glPushMatrix(); - GL46.glRotatef(angle, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(angleY, 0.0F, 1.0F, 0.0F); + GL15.glPushMatrix(); + GL15.glRotatef(angle, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(angleY, 0.0F, 1.0F, 0.0F); ItemRenderer.enableStandardItemLighting(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } private void setLightMapFromPlayer(EntityNPC clientPlayer) @@ -129,15 +129,15 @@ public class ItemRenderer int i = this.gm.renderer.getCombinedBrightness(new BlockPos(clientPlayer.posX, clientPlayer.posY + (double)clientPlayer.getEyeHeight(), clientPlayer.posZ)); float f = (float)(i & 65535); float f1 = (float)(i >> 16); - GL46.glMultiTexCoord2f(GL46.GL_TEXTURE1, f, f1); + GL15.glMultiTexCoord2f(GL15.GL_TEXTURE1, f, f1); } private void rotateWithPlayerRotations(EntityNPC entityplayerspIn, float partialTicks) { float f = entityplayerspIn.prevRenderArmPitch + (entityplayerspIn.renderArmPitch - entityplayerspIn.prevRenderArmPitch) * partialTicks; float f1 = entityplayerspIn.prevRenderArmYaw + (entityplayerspIn.renderArmYaw - entityplayerspIn.prevRenderArmYaw) * partialTicks; - GL46.glRotatef((entityplayerspIn.rotPitch - f) * 0.1F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef((entityplayerspIn.rotYaw - f1) * 0.1F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef((entityplayerspIn.rotPitch - f) * 0.1F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef((entityplayerspIn.rotYaw - f1) * 0.1F, 0.0F, 1.0F, 0.0F); } private float getMapAngleFromPitch(float pitch) @@ -214,7 +214,7 @@ public class ItemRenderer //// Tessellator tessellator = Tessellator.getInstance(); // RenderBuffer worldrenderer = Tessellator.getBuffer(); // SKC.glNormal3f(0.0F, 0.0F, -1.0F); -// worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); +// worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); // worldrenderer.pos(-7.0D, 135.0D, 0.0D).tex(0.0D, 1.0D).endVertex(); // worldrenderer.pos(135.0D, 135.0D, 0.0D).tex(1.0D, 1.0D).endVertex(); // worldrenderer.pos(135.0D, -7.0D, 0.0D).tex(1.0D, 0.0D).endVertex(); @@ -233,21 +233,21 @@ public class ItemRenderer float f = -0.3F * ExtMath.sin(ExtMath.sqrtf(swingProgress) * (float)Math.PI); float f1 = 0.4F * ExtMath.sin(ExtMath.sqrtf(swingProgress) * (float)Math.PI * 2.0F); float f2 = -0.4F * ExtMath.sin(swingProgress * (float)Math.PI); - GL46.glTranslatef(f, f1, f2); - GL46.glTranslatef(0.64000005F, -0.6F, -0.71999997F); - GL46.glTranslatef(0.0F, equipProgress * -0.6F, 0.0F); - GL46.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(f, f1, f2); + GL15.glTranslatef(0.64000005F, -0.6F, -0.71999997F); + GL15.glTranslatef(0.0F, equipProgress * -0.6F, 0.0F); + GL15.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); float f3 = ExtMath.sin(swingProgress * swingProgress * (float)Math.PI); float f4 = ExtMath.sin(ExtMath.sqrtf(swingProgress) * (float)Math.PI); - GL46.glRotatef(f4 * 70.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(f3 * -20.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(f4 * 70.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(f3 * -20.0F, 0.0F, 0.0F, 1.0F); this.gm.getTextureManager().bindTexture(EntityTexManager.getSkin(clientPlayer)); - GL46.glTranslatef(-1.0F, 3.6F, 3.5F); - GL46.glRotatef(120.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(200.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); - GL46.glScalef(1.0F, 1.0F, 1.0F); - GL46.glTranslatef(5.6F, 0.0F, 0.0F); + GL15.glTranslatef(-1.0F, 3.6F, 3.5F); + GL15.glRotatef(120.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(200.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); + GL15.glScalef(1.0F, 1.0F, 1.0F); + GL15.glTranslatef(5.6F, 0.0F, 0.0F); RenderNpc render = this.renderManager.getRenderObject(this.gm.player.getModel()); GlState.disableCull(); render.renderPlayerArm(this.gm.player); @@ -259,7 +259,7 @@ public class ItemRenderer float f = -0.4F * ExtMath.sin(ExtMath.sqrtf(swingProgress) * (float)Math.PI); float f1 = 0.2F * ExtMath.sin(ExtMath.sqrtf(swingProgress) * (float)Math.PI * 2.0F); float f2 = -0.2F * ExtMath.sin(swingProgress * (float)Math.PI); - GL46.glTranslatef(f, f1, f2); + GL15.glTranslatef(f, f1, f2); } private void performDrinking(EntityNPC clientPlayer, float partialTicks) @@ -273,33 +273,33 @@ public class ItemRenderer f2 = 0.0F; } - GL46.glTranslatef(0.0F, f2, 0.0F); + GL15.glTranslatef(0.0F, f2, 0.0F); float f3 = 1.0F - (float)Math.pow((double)f1, 27.0D); - GL46.glTranslatef(f3 * 0.6F, f3 * -0.5F, f3 * 0.0F); - GL46.glRotatef(f3 * 90.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(f3 * 10.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(f3 * 30.0F, 0.0F, 0.0F, 1.0F); + GL15.glTranslatef(f3 * 0.6F, f3 * -0.5F, f3 * 0.0F); + GL15.glRotatef(f3 * 90.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(f3 * 10.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(f3 * 30.0F, 0.0F, 0.0F, 1.0F); } private void transformFirstPersonItem(float equipProgress, float swingProgress) { - GL46.glTranslatef(0.56F, -0.52F, -0.71999997F); - GL46.glTranslatef(0.0F, equipProgress * -0.6F, 0.0F); - GL46.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.56F, -0.52F, -0.71999997F); + GL15.glTranslatef(0.0F, equipProgress * -0.6F, 0.0F); + GL15.glRotatef(45.0F, 0.0F, 1.0F, 0.0F); float f = ExtMath.sin(swingProgress * swingProgress * (float)Math.PI); float f1 = ExtMath.sin(ExtMath.sqrtf(swingProgress) * (float)Math.PI); - GL46.glRotatef(f * -20.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(f1 * -20.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(f1 * -80.0F, 1.0F, 0.0F, 0.0F); - GL46.glScalef(0.4F, 0.4F, 0.4F); + GL15.glRotatef(f * -20.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(f1 * -20.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(f1 * -80.0F, 1.0F, 0.0F, 0.0F); + GL15.glScalef(0.4F, 0.4F, 0.4F); } private void doBowTransformations(float partialTicks, EntityNPC clientPlayer) { - GL46.glRotatef(-18.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(-12.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-8.0F, 1.0F, 0.0F, 0.0F); - GL46.glTranslatef(-0.9F, 0.2F, 0.0F); + GL15.glRotatef(-18.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(-12.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-8.0F, 1.0F, 0.0F, 0.0F); + GL15.glTranslatef(-0.9F, 0.2F, 0.0F); float f = (float)this.itemToRender.getMaxItemUseDuration() - ((float)clientPlayer.getItemInUseCount() - partialTicks + 1.0F); float f1 = f / 20.0F; f1 = (f1 * f1 + f1 * 2.0F) / 3.0F; @@ -314,19 +314,19 @@ public class ItemRenderer float f2 = ExtMath.sin((f - 0.1F) * 1.3F); float f3 = f1 - 0.1F; float f4 = f2 * f3; - GL46.glTranslatef(f4 * 0.0F, f4 * 0.01F, f4 * 0.0F); + GL15.glTranslatef(f4 * 0.0F, f4 * 0.01F, f4 * 0.0F); } - GL46.glTranslatef(f1 * 0.0F, f1 * 0.0F, f1 * 0.1F); - GL46.glScalef(1.0F, 1.0F, 1.0F + f1 * 0.2F); + GL15.glTranslatef(f1 * 0.0F, f1 * 0.0F, f1 * 0.1F); + GL15.glScalef(1.0F, 1.0F, 1.0F + f1 * 0.2F); } private void doBlockTransformations() { - GL46.glTranslatef(-0.5F, 0.2F, 0.0F); - GL46.glRotatef(30.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-80.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(60.0F, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(-0.5F, 0.2F, 0.0F); + GL15.glRotatef(30.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-80.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(60.0F, 0.0F, 1.0F, 0.0F); } public void renderItemInFirstPerson(float partialTicks) @@ -340,7 +340,7 @@ public class ItemRenderer this.setLightMapFromPlayer(clientplayer); this.rotateWithPlayerRotations(clientplayer, partialTicks); GlState.enableRescaleNormal(); - GL46.glPushMatrix(); + GL15.glPushMatrix(); if (this.itemToRender != null && (this.itemToRender.getItem().getWieldType() != null || (clientplayer.getItemInUseCount() > 0 && this.itemToRender.getItemUseAction() != ItemAction.NONE))) { @@ -383,7 +383,7 @@ public class ItemRenderer this.renderPlayerArm(clientplayer, f, f1); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.disableRescaleNormal(); ItemRenderer.disableStandardItemLighting(); } @@ -430,7 +430,7 @@ public class ItemRenderer RenderBuffer worldrenderer = Tessellator.getBuffer(); float f = 0.1F; GlState.color(0.1F, 0.1F, 0.1F, 0.5F); - GL46.glPushMatrix(); + GL15.glPushMatrix(); float f1 = -1.0F; float f2 = 1.0F; float f3 = -1.0F; @@ -440,13 +440,13 @@ public class ItemRenderer float f7 = atlas.getMaxU(); float f8 = atlas.getMinV(); float f9 = atlas.getMaxV(); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-1.0D, -1.0D, -0.5D).tex((double)f7, (double)f9).endVertex(); worldrenderer.pos(1.0D, -1.0D, -0.5D).tex((double)f6, (double)f9).endVertex(); worldrenderer.pos(1.0D, 1.0D, -0.5D).tex((double)f6, (double)f8).endVertex(); worldrenderer.pos(-1.0D, 1.0D, -0.5D).tex((double)f7, (double)f8).endVertex(); Tessellator.draw(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); } @@ -454,15 +454,15 @@ public class ItemRenderer { RenderBuffer worldrenderer = Tessellator.getBuffer(); GlState.color(1.0F, 1.0F, 1.0F, 0.9F); - GlState.depthFunc(GL46.GL_ALWAYS); + GlState.depthFunc(GL15.GL_ALWAYS); GlState.depthMask(false); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); float f = 1.0F; for (int i = 0; i < 2; ++i) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); Sprite textureatlassprite = this.gm.getTextureMapBlocks().getAtlasSprite("blocks/fire_layer_1"); this.gm.getTextureManager().bindTexture(TextureMap.BLOCKS); float f1 = textureatlassprite.getMinU(); @@ -474,21 +474,21 @@ public class ItemRenderer float f7 = 0.0F - f / 2.0F; float f8 = f7 + f; float f9 = -0.5F; - GL46.glTranslatef((float)(-(i * 2 - 1)) * 0.24F, -0.3F, 0.0F); - GL46.glRotatef((float)(i * 2 - 1) * 10.0F, 0.0F, 1.0F, 0.0F); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + GL15.glTranslatef((float)(-(i * 2 - 1)) * 0.24F, -0.3F, 0.0F); + GL15.glRotatef((float)(i * 2 - 1) * 10.0F, 0.0F, 1.0F, 0.0F); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos((double)f5, (double)f7, (double)f9).tex((double)f2, (double)f4).endVertex(); worldrenderer.pos((double)f6, (double)f7, (double)f9).tex((double)f1, (double)f4).endVertex(); worldrenderer.pos((double)f6, (double)f8, (double)f9).tex((double)f1, (double)f3).endVertex(); worldrenderer.pos((double)f5, (double)f8, (double)f9).tex((double)f2, (double)f3).endVertex(); Tessellator.draw(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.disableBlend(); GlState.depthMask(true); - GlState.depthFunc(GL46.GL_LEQUAL); + GlState.depthFunc(GL15.GL_LEQUAL); } public void update() diff --git a/client/src/main/java/client/renderer/MatrixState.java b/client/src/main/java/client/renderer/MatrixState.java index 42878823..800a0a64 100755 --- a/client/src/main/java/client/renderer/MatrixState.java +++ b/client/src/main/java/client/renderer/MatrixState.java @@ -5,7 +5,7 @@ import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.block.Block; import common.block.liquid.BlockLiquid; @@ -32,9 +32,9 @@ public class MatrixState { private static float rotationXY; public static void update(EntityNPC player, boolean flip) { - GL46.glGetFloatv(GL46.GL_MODELVIEW_MATRIX, MODELVIEW); - GL46.glGetFloatv(GL46.GL_PROJECTION_MATRIX, PROJECTION); - GL46.glGetIntegerv(GL46.GL_VIEWPORT, VIEWPORT); + GL15.glGetFloatv(GL15.GL_MODELVIEW_MATRIX, MODELVIEW); + GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, PROJECTION); + GL15.glGetIntegerv(GL15.GL_VIEWPORT, VIEWPORT); float x = (float)((VIEWPORT.get(0) + VIEWPORT.get(2)) / 2); float y = (float)((VIEWPORT.get(1) + VIEWPORT.get(3)) / 2); Project.gluUnProject(x, y, 0.0F, MODELVIEW, PROJECTION, VIEWPORT, OBJECTCOORDS); diff --git a/client/src/main/java/client/renderer/Project.java b/client/src/main/java/client/renderer/Project.java index d2aa0751..94ecaf78 100644 --- a/client/src/main/java/client/renderer/Project.java +++ b/client/src/main/java/client/renderer/Project.java @@ -36,7 +36,7 @@ import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.nio.IntBuffer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; // 11-jan-2004 Erik Duijs public class Project { @@ -201,7 +201,7 @@ public class Project { matrix.put(3 * 4 + 2, -2 * zNear * zFar / deltaZ); matrix.put(3 * 4 + 3, 0); - GL46.glMultMatrixf(matrix); + GL15.glMultMatrixf(matrix); } public static void gluLookAt( @@ -248,8 +248,8 @@ public class Project { matrix.put(1 * 4 + 2, -forward[1]); matrix.put(2 * 4 + 2, -forward[2]); - GL46.glMultMatrixf(matrix); - GL46.glTranslatef(-eyex, -eyey, -eyez); + GL15.glMultMatrixf(matrix); + GL15.glTranslatef(-eyex, -eyey, -eyez); } public static boolean gluProject( diff --git a/client/src/main/java/client/renderer/RegionRenderCache.java b/client/src/main/java/client/renderer/RegionRenderCache.java index f4651eda..b7c11362 100755 --- a/client/src/main/java/client/renderer/RegionRenderCache.java +++ b/client/src/main/java/client/renderer/RegionRenderCache.java @@ -154,7 +154,7 @@ public class RegionRenderCache implements IWorldAccess } } - return (r > 255 ? 255 : r) << 16 | (g > 255 ? 255 : g) << 16 | (b > 255 ? 255 : b); + return (r > 255 ? 255 : r) << 16 | (g > 255 ? 255 : g) << 8 | (b > 255 ? 255 : b); } else { diff --git a/client/src/main/java/client/renderer/Renderer.java b/client/src/main/java/client/renderer/Renderer.java index 41e2c561..847663f9 100755 --- a/client/src/main/java/client/renderer/Renderer.java +++ b/client/src/main/java/client/renderer/Renderer.java @@ -16,7 +16,8 @@ import java.util.Queue; import java.util.Set; import java.util.function.Predicate; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; +import org.lwjgl.opengl.GL20; import client.Client; import client.renderer.Shader.ShaderContext; @@ -543,7 +544,7 @@ public class Renderer { if (entitylivingbase.getHealth() <= 0) { float f1 = (float)entitylivingbase.deathTime + partialTicks; - GL46.glRotatef(40.0F - 8000.0F / (f1 + 200.0F), 0.0F, 0.0F, 1.0F); + GL15.glRotatef(40.0F - 8000.0F / (f1 + 200.0F), 0.0F, 0.0F, 1.0F); } if (f < 0.0F || entitylivingbase.hasEffect(Effect.STABILITY)) @@ -554,9 +555,9 @@ public class Renderer { f = f / (float)entitylivingbase.maxHurtTime; f = ExtMath.sin(f * f * f * f * (float)Math.PI); float f2 = entitylivingbase.attackedYaw; - GL46.glRotatef(-f2, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-f * 14.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(f2, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-f2, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-f * 14.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(f2, 0.0F, 1.0F, 0.0F); } } @@ -569,10 +570,10 @@ public class Renderer { float f1 = -(entityplayer.walkDistMod + f * partialTicks); float f2 = entityplayer.prevCameraYaw + (entityplayer.cameraYaw - entityplayer.prevCameraYaw) * partialTicks; float f3 = entityplayer.prevCamPitch + (entityplayer.camPitch - entityplayer.prevCamPitch) * partialTicks; - GL46.glTranslatef(ExtMath.sin(f1 * (float)Math.PI) * f2 * 0.5F, -Math.abs(ExtMath.cos(f1 * (float)Math.PI) * f2), 0.0F); - GL46.glRotatef(ExtMath.sin(f1 * (float)Math.PI) * f2 * 3.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(Math.abs(ExtMath.cos(f1 * (float)Math.PI - 0.2F) * f2) * 5.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(f3, 1.0F, 0.0F, 0.0F); + GL15.glTranslatef(ExtMath.sin(f1 * (float)Math.PI) * f2 * 0.5F, -Math.abs(ExtMath.cos(f1 * (float)Math.PI) * f2), 0.0F); + GL15.glRotatef(ExtMath.sin(f1 * (float)Math.PI) * f2 * 3.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(Math.abs(ExtMath.cos(f1 * (float)Math.PI - 0.2F) * f2) * 5.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(f3, 1.0F, 0.0F, 0.0F); } } @@ -612,7 +613,7 @@ public class Renderer { if (this.gm.debugCamEnable) { - GL46.glTranslatef(0.0F, 0.0F, (float)(-d3)); + GL15.glTranslatef(0.0F, 0.0F, (float)(-d3)); } else { @@ -651,19 +652,19 @@ public class Renderer { if (this.gm.thirdPersonView == 2) { - GL46.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); } - GL46.glRotatef(entity.rotPitch - f2, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(entity.rotYaw - f1, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(0.0F, 0.0F, (float)(-d3)); - GL46.glRotatef(f1 - entity.rotYaw, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(f2 - entity.rotPitch, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(entity.rotPitch - f2, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(entity.rotYaw - f1, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.0F, 0.0F, (float)(-d3)); + GL15.glRotatef(f1 - entity.rotYaw, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(f2 - entity.rotPitch, 1.0F, 0.0F, 0.0F); } } else { - GL46.glTranslatef(0.0F, 0.0F, -0.1F); + GL15.glTranslatef(0.0F, 0.0F, -0.1F); } if (!this.gm.debugCamEnable || this.gm.thirdPersonView == 0) @@ -671,29 +672,29 @@ public class Renderer { this.rotateCamera(entity, partialTicks, false); } - GL46.glTranslatef(0.0F, -f, 0.0F); + GL15.glTranslatef(0.0F, -f, 0.0F); } public void rotateCamera(Entity entity, float partialTicks, boolean invert) { if(invert) - GL46.glRotatef(360.0f - (entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(360.0f - (entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks), 1.0F, 0.0F, 0.0F); else - GL46.glRotatef(entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks, 1.0F, 0.0F, 0.0F); if(entity instanceof EntityAnimal) { EntityAnimal entityanimal = (EntityAnimal)entity; - GL46.glRotatef(entityanimal.prevHeadYaw + (entityanimal.headYaw - entityanimal.prevHeadYaw) * partialTicks + 180.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(entityanimal.prevHeadYaw + (entityanimal.headYaw - entityanimal.prevHeadYaw) * partialTicks + 180.0F, 0.0F, 1.0F, 0.0F); } else { - GL46.glRotatef(entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks + 180.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks + 180.0F, 0.0F, 1.0F, 0.0F); } } private void setupCameraTransform(float partialTicks) { this.farPlaneDistance = (float)(this.gm.renderDistance * 16); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); float f = 0.07F; // if (this.cameraZoom != 1.0D) @@ -703,8 +704,8 @@ public class Renderer { // } Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fbRawX / (float)this.gm.fbRawY, 0.05F, this.farPlaneDistance * SQRT_2); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glLoadIdentity(); this.hurtCameraEffect(partialTicks); @@ -763,15 +764,15 @@ public class Renderer { { // if (!this.debugView) // { - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); float f = 0.07F; Project.gluPerspective(this.getFOVModifier(partialTicks, false), (float)this.gm.fbRawX / (float)this.gm.fbRawY, 0.05F, this.farPlaneDistance * 2.0F); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glLoadIdentity(); - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.hurtCameraEffect(partialTicks); // if (this.gm.viewBobbing) @@ -788,7 +789,7 @@ public class Renderer { this.disableLightmap(); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); if (this.gm.thirdPersonView == 0) // && !flag) { @@ -805,28 +806,28 @@ public class Renderer { private void disableLightmap() { - GlState.setActiveTexture(GL46.GL_TEXTURE1); + GlState.setActiveTexture(GL15.GL_TEXTURE1); GlState.disableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); } private void enableLightmap() { - GlState.setActiveTexture(GL46.GL_TEXTURE1); - GL46.glMatrixMode(GL46.GL_TEXTURE); - GL46.glLoadIdentity(); + GlState.setActiveTexture(GL15.GL_TEXTURE1); + GL15.glMatrixMode(GL15.GL_TEXTURE); + GL15.glLoadIdentity(); float f = 0.00390625F; - GL46.glScalef(f, f, f); - GL46.glTranslatef(8.0F, 8.0F, 8.0F); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + GL15.glScalef(f, f, f); + GL15.glTranslatef(8.0F, 8.0F, 8.0F); + GL15.glMatrixMode(GL15.GL_MODELVIEW); this.gm.getTextureManager().bindTexture(TEX_LIGHTMAP); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_MIN_FILTER, GL46.GL_LINEAR); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_MAG_FILTER, GL46.GL_LINEAR); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_WRAP_S, GL46.GL_CLAMP); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_WRAP_T, GL46.GL_CLAMP); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_MIN_FILTER, GL15.GL_LINEAR); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_MAG_FILTER, GL15.GL_LINEAR); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_WRAP_S, GL15.GL_CLAMP); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_WRAP_T, GL15.GL_CLAMP); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.enableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); } private void updateTorchFlicker() @@ -994,21 +995,21 @@ public class Renderer { float sky = rsky * msun; float block = rblock * (this.torchFlickerX * 0.1F + 1.5F); - float sred = Math.max(sky * (sun * 0.65F + 0.35F), brightness); - float sgreen = Math.max(sky * (sun * 0.65F + 0.35F), brightness); - float sblue = Math.max(sky, brightness); + float red = Math.max(sky * (sun * 0.65F + 0.35F), brightness); + float green = Math.max(sky * (sun * 0.65F + 0.35F), brightness); + float blue = Math.max(sky, brightness); if (world.dimension.getLightColor() != 0xffffffff) { Vec3 lightColor = new Vec3(world.dimension.getLightColor()); float light = world.dimension.hasSkyLight() ? Math.max(sky, brightness) : 1.0f; - sred = (float)lightColor.xCoord * light; - sgreen = (float)lightColor.yCoord * light; - sblue = (float)lightColor.zCoord * light; + red = (float)lightColor.xCoord * light; + green = (float)lightColor.yCoord * light; + blue = (float)lightColor.zCoord * light; } if(space > 0.0f) { - sred = sred * (1.0F - space) + space; - sgreen = sgreen * (1.0F - space) + space; - sblue = sblue * (1.0F - space) + space; + red = red * (1.0F - space) + space; + green = green * (1.0F - space) + space; + blue = blue * (1.0F - space) + space; } if (this.lastLightning > 0) { @@ -1016,33 +1017,21 @@ public class Renderer { if(intens > 1.0F) intens = 1.0F; float light = world.dimension.hasSkyLight() ? rsky : 1.0f; - sred = sred * (1.0F - intens) + (float)this.lightColor.xCoord * light * intens; - sgreen = sgreen * (1.0F - intens) + (float)this.lightColor.yCoord * light * intens; - sblue = sblue * (1.0F - intens) + (float)this.lightColor.zCoord * light * intens; + red = red * (1.0F - intens) + (float)this.lightColor.xCoord * light * intens; + green = green * (1.0F - intens) + (float)this.lightColor.yCoord * light * intens; + blue = blue * (1.0F - intens) + (float)this.lightColor.zCoord * light * intens; } - float bred = block; - float bgreen = block * ((block * 0.6F + 0.4F) * 0.6F + 0.4F); - float bblue = block * (block * block * 0.6F + 0.4F); - if (world.dimension.getBlockColor() != 0xffffffff) - { - Vec3 lightColor = new Vec3(world.dimension.getBlockColor()); - float light = block; - if(light > 1.0F) - light = 1.0F; - bred = (float)lightColor.xCoord * light; - bgreen = (float)lightColor.yCoord * light; - bblue = (float)lightColor.zCoord * light; - if(world.dimension.isBlockLightSubtracted()) { - sred *= 1.0f - rblock; - sgreen *= 1.0f - rblock; - sblue *= 1.0f - rblock; - } - } - - float red = sred + bred; - float green = sgreen + bgreen; - float blue = sblue + bblue; + if(block > 1.0F) + block = 1.0F; +// if(world.dimension.isBlockLightSubtracted()) { +// sred *= 1.0f - rblock; +// sgreen *= 1.0f - rblock; +// sblue *= 1.0f - rblock; +// } + red += block; + green += block; + blue += block; red = red * 0.96F + 0.03F; green = green * 0.96F + 0.03F; @@ -1164,7 +1153,6 @@ public class Renderer { break; } } - this.skyLight = this.gm.world.dimension.hasSkyLight() && !this.gm.setGamma && !this.gm.xrayActive; this.moonLight = moon; this.updateLightmap(partialTicks); @@ -1176,11 +1164,12 @@ public class Renderer { this.getMouseOver(partialTicks); GlState.enableDepth(); GlState.enableAlpha(); - GlState.alphaFunc(GL46.GL_GREATER, 0.5F); + GlState.alphaFunc(GL15.GL_GREATER, 0.5F); + boolean flag = this.gm.getRenderViewEntity() != null && this.gm.getRenderViewEntity() == this.gm.player; GlState.enableCull(); this.updateFogColor(partialTicks); - GL46.glClear(16640); + GL15.glClear(GL15.GL_COLOR_BUFFER_BIT | GL15.GL_DEPTH_BUFFER_BIT); this.setupCameraTransform(partialTicks); MatrixState.update(this.gm.player, this.gm.thirdPersonView == 2); Entity entity = this.gm.getRenderViewEntity(); @@ -1191,19 +1180,19 @@ public class Renderer { if (this.gm.renderDistance >= 4) { this.setupFog(-1, partialTicks); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fbRawX / (float)this.gm.fbRawY, 0.05F, this.farPlaneDistance * 2.0F); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + GL15.glMatrixMode(GL15.GL_MODELVIEW); this.renderSky(partialTicks); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fbRawX / (float)this.gm.fbRawY, 0.05F, this.farPlaneDistance * SQRT_2); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + GL15.glMatrixMode(GL15.GL_MODELVIEW); } this.setupFog(0, partialTicks); - GlState.shadeModel(GL46.GL_SMOOTH); + GlState.shadeModel(GL15.GL_SMOOTH); if (entity.posY + (double)entity.getEyeHeight() < (double)this.gm.world.dimension.getCloudHeight()) { @@ -1214,29 +1203,41 @@ public class Renderer { ItemRenderer.disableStandardItemLighting(); this.setupTerrain(entity, (double)partialTicks, this.frameCount++, entity != this.gm.player || this.gm.player.noclip); this.updateChunks(finishTimeNano); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glPushMatrix(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glPushMatrix(); this.renderChunks(); - GlState.shadeModel(GL46.GL_FLAT); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.shadeModel(GL15.GL_FLAT); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); // if (!this.debugView) // { - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glPopMatrix(); - GL46.glPushMatrix(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glPopMatrix(); + GL15.glPushMatrix(); ItemRenderer.enableStandardItemLighting(); this.renderEntities(entity, partialTicks); ItemRenderer.disableStandardItemLighting(); this.disableLightmap(); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glPopMatrix(); - GL46.glPushMatrix(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glPopMatrix(); + GL15.glPushMatrix(); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glPopMatrix(); + if(flag && this.gm.pointed != null && entity.isInsideOfLiquid()) { + GlState.disableAlpha(); + this.drawSelectionBox(this.gm.player, this.gm.pointed, partialTicks); + GlState.enableAlpha(); + } - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ONE, GL46.GL_ZERO); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glPopMatrix(); + + if(flag && this.gm.pointed != null && !entity.isInsideOfLiquid()) { + GlState.disableAlpha(); + this.drawSelectionBox(this.gm.player, this.gm.pointed, partialTicks); + GlState.enableAlpha(); + } + + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ONE, GL15.GL_ZERO); GlState.disableBlend(); // if (!this.debugView) @@ -1256,15 +1257,15 @@ public class Renderer { // renderglobal.renderWorldBorder(entity, partialTicks); GlState.disableBlend(); GlState.enableCull(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); // this.setupFog(0, partialTicks); // GlState.enableBlend(); // GlState.depthMask(false); // this.gm.getTextureManager().bindTexture(TextureMap.BLOCKS); -// GlState.shadeModel(GL46.GL_SMOOTH); +// GlState.shadeModel(GL15.GL_SMOOTH); // this.renderBlockLayer(BlockLayer.TRANSLUCENT, (double)partialTicks, entity); -// GlState.shadeModel(GL46.GL_FLAT); +// GlState.shadeModel(GL15.GL_FLAT); // GlState.depthMask(true); // GlState.enableCull(); // GlState.disableBlend(); @@ -1277,7 +1278,7 @@ public class Renderer { if (entity == this.gm.player && !(this.gm.player instanceof EntityCameraHolder)) { - GL46.glClear(256); + GL15.glClear(GL15.GL_DEPTH_BUFFER_BIT); this.renderHand(partialTicks); } } @@ -1286,21 +1287,21 @@ public class Renderer { { if (this.gm.renderDistance >= 4) { - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fbRawX / (float)this.gm.fbRawY, 0.05F, this.farPlaneDistance * 4.0F); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glPushMatrix(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glPushMatrix(); this.setupFog(0, partialTicks); float alpha = 0.8F * (1.0f - this.getSpaceFactor()); if(this.gm.world.dimension.hasWeather() && alpha > 0.5f) this.renderClouds(alpha, partialTicks); GlState.disableFog(); - GL46.glPopMatrix(); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); + GL15.glPopMatrix(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); Project.gluPerspective(this.getFOVModifier(partialTicks, true), (float)this.gm.fbRawX / (float)this.gm.fbRawY, 0.05F, this.farPlaneDistance * SQRT_2); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + GL15.glMatrixMode(GL15.GL_MODELVIEW); } } @@ -1415,10 +1416,10 @@ public class Renderer { int ez = ExtMath.floord(entity.posZ); RenderBuffer buf = Tessellator.getBuffer(); GlState.disableCull(); - GL46.glNormal3f(0.0F, 1.0F, 0.0F); + GL15.glNormal3f(0.0F, 1.0F, 0.0F); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); double ax = entity.lastTickPosX + (entity.posX - entity.lastTickPosX) * (double)partial; double ay = entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * (double)partial; double az = entity.lastTickPosZ + (entity.posZ - entity.lastTickPosZ) * (double)partial; @@ -1468,7 +1469,7 @@ public class Renderer { mode = temp >= 194.0f ? 2 : (temp <= 5.0f ? 3 : 0); this.gm.getTextureManager() .bindTexture(temp >= 194.0f ? TEX_MOLTEN : (temp <= 5.0f ? TEX_HAIL : TEX_RAIN)); - buf.begin(GL46.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); + buf.begin(GL15.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); } double offset = ((double)(this.rendererUpdateCount + x * x * 3121 + x * 45238971 + z * z * 418711 + z * 13761 & 31) @@ -1496,7 +1497,7 @@ public class Renderer { Tessellator.draw(); mode = 1; this.gm.getTextureManager().bindTexture(TEX_SNOW); - buf.begin(GL46.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); + buf.begin(GL15.GL_QUADS, DefaultVertexFormats.PARTICLE_POSITION_TEX_COLOR_LMAP); } double offset = (double)(((float)(this.rendererUpdateCount & 511) + partial) / 512.0F); @@ -1528,7 +1529,7 @@ public class Renderer { buf.setTranslation(0.0D, 0.0D, 0.0D); GlState.enableCull(); GlState.disableBlend(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); this.disableLightmap(); } @@ -1678,8 +1679,8 @@ public class Renderer { float distance = Math.min(0.995f, Math.max(0.005f, FOG_DISTANCE - (0.3f * fog))); float density = 1.0f - Math.min(1.0f, FOG_DENSITY * (1.0f - fog * 0.1f)); - GL46.glFogfv(GL46.GL_FOG_COLOR, (FloatBuffer)this.setFogColorBuffer(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F)); - GL46.glNormal3f(0.0F, -1.0F, 0.0F); + GL15.glFogfv(GL15.GL_FOG_COLOR, (FloatBuffer)this.setFogColorBuffer(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 1.0F)); + GL15.glNormal3f(0.0F, -1.0F, 0.0F); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); Block block = MatrixState.getLookedBlock(this.gm.world, entity, partial); @@ -1696,7 +1697,7 @@ public class Renderer { far = 5.0F + (this.farPlaneDistance - 5.0F) * (1.0F - (float)effect / 20.0F); } - GlState.setFog(GL46.GL_LINEAR); + GlState.setFog(GL15.GL_LINEAR); if (start == -1) { @@ -1721,7 +1722,7 @@ public class Renderer { // } else if (block.getMaterial().isColdLiquid()) { - GlState.setFog(GL46.GL_EXP); + GlState.setFog(GL15.GL_EXP); // if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).hasEffect(Potion.waterBreathing)) // { @@ -1734,13 +1735,13 @@ public class Renderer { } else if (block.getMaterial().isHotLiquid()) { - GlState.setFog(GL46.GL_EXP); + GlState.setFog(GL15.GL_EXP); GlState.setFogDensity(2.0F); } else { float far = this.farPlaneDistance; - GlState.setFog(GL46.GL_LINEAR); + GlState.setFog(GL15.GL_LINEAR); if (start == -1) { @@ -1767,7 +1768,7 @@ public class Renderer { GlState.enableColorMaterial(); GlState.setFogEnabled(distance < 1.0f); - GlState.colorMaterial(GL46.GL_FRONT, GL46.GL_AMBIENT); + GlState.colorMaterial(GL15.GL_FRONT, GL15.GL_AMBIENT); } private FloatBuffer setFogColorBuffer(float red, float green, float blue, float alpha) @@ -1866,7 +1867,7 @@ public class Renderer { { int i = 64; int j = 6; - worldRendererIn.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION); + worldRendererIn.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION); for (int k = -384; k <= 384; k += 64) { @@ -1965,7 +1966,7 @@ public class Renderer { { max -= min; Random rand = new Random(seed); - rend.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION); + rend.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION); for (int n = 0; n < nstars; ++n) { @@ -2045,6 +2046,7 @@ public class Renderer { { if (this.theWorld != null) { + this.skyLight = this.theWorld.dimension.hasSkyLight() && !this.gm.setGamma && !this.gm.xrayActive; this.displayListEntitiesDirty = true; this.renderDistanceChunks = this.gm.renderDistance; @@ -2128,12 +2130,12 @@ public class Renderer { if (this.gm.tileOverlay) { - GlState.depthFunc(GL46.GL_ALWAYS); + GlState.depthFunc(GL15.GL_ALWAYS); GlState.disableFog(); ItemRenderer.disableStandardItemLighting(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GL46.glLineWidth(2.0F); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GL15.glLineWidth(2.0F); GlState.disableTexture2D(); GlState.depthMask(false); @@ -2161,19 +2163,19 @@ public class Renderer { GlState.depthMask(true); GlState.enableFog(); GlState.enableColorMaterial(); - GlState.depthFunc(GL46.GL_LEQUAL); + GlState.depthFunc(GL15.GL_LEQUAL); GlState.enableDepth(); GlState.enableAlpha(); } if (this.gm.renderOutlines && this.gm.player != null) { - GlState.depthFunc(GL46.GL_ALWAYS); + GlState.depthFunc(GL15.GL_ALWAYS); GlState.disableFog(); ItemRenderer.disableStandardItemLighting(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GL46.glLineWidth(2.0F); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GL15.glLineWidth(2.0F); GlState.disableTexture2D(); GlState.depthMask(false); @@ -2200,7 +2202,7 @@ public class Renderer { GlState.depthMask(true); GlState.enableFog(); GlState.enableColorMaterial(); - GlState.depthFunc(GL46.GL_LEQUAL); + GlState.depthFunc(GL15.GL_LEQUAL); GlState.enableDepth(); GlState.enableAlpha(); } @@ -2557,19 +2559,19 @@ public class Renderer { } } - if(this.gm.useShader && this.gm.dimensionName.equals("cyberspace")) { - GlState.setActiveTexture(GL46.GL_TEXTURE1); - GL46.glMatrixMode(GL46.GL_TEXTURE); - GL46.glLoadIdentity(); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + if(this.gm.shaders && this.gm.useShader && this.gm.dimensionName.equals("cyberspace")) { + GlState.setActiveTexture(GL15.GL_TEXTURE1); + GL15.glMatrixMode(GL15.GL_TEXTURE); + GL15.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); this.gm.getTextureManager().bindTexture(TEX_LIGHTMAP); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_MIN_FILTER, GL46.GL_LINEAR); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_MAG_FILTER, GL46.GL_LINEAR); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_WRAP_S, GL46.GL_CLAMP); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_WRAP_T, GL46.GL_CLAMP); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_MIN_FILTER, GL15.GL_LINEAR); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_MAG_FILTER, GL15.GL_LINEAR); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_WRAP_S, GL15.GL_CLAMP); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_WRAP_T, GL15.GL_CLAMP); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.enableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); if (this.initialized) { @@ -2587,25 +2589,25 @@ public class Renderer { vertexbuffer.bindBuffer(); - GL46.glVertexAttribPointer(0, 3, GL46.GL_FLOAT, false, 28, 0L); - GL46.glEnableVertexAttribArray(0); - GL46.glVertexAttribPointer(1, 4, GL46.GL_BYTE, true, 28, 12L); - GL46.glEnableVertexAttribArray(1); - GL46.glVertexAttribPointer(2, 2, GL46.GL_FLOAT, false, 28, 16L); - GL46.glEnableVertexAttribArray(2); - GL46.glVertexAttribPointer(3, 4, GL46.GL_UNSIGNED_BYTE, true, 28, 24L); - GL46.glEnableVertexAttribArray(3); + GL20.glVertexAttribPointer(0, 3, GL15.GL_FLOAT, false, 28, 0L); + GL20.glEnableVertexAttribArray(0); + GL20.glVertexAttribPointer(1, 4, GL15.GL_BYTE, true, 28, 12L); + GL20.glEnableVertexAttribArray(1); + GL20.glVertexAttribPointer(2, 2, GL15.GL_FLOAT, false, 28, 16L); + GL20.glEnableVertexAttribArray(2); + GL20.glVertexAttribPointer(3, 4, GL15.GL_UNSIGNED_BYTE, true, 28, 24L); + GL20.glEnableVertexAttribArray(3); - vertexbuffer.drawArrays(GL46.GL_QUADS); + vertexbuffer.drawArrays(GL15.GL_QUADS); - GL46.glDisableVertexAttribArray(0); - GL46.glDisableVertexAttribArray(1); - GL46.glDisableVertexAttribArray(2); - GL46.glDisableVertexAttribArray(3); + GL20.glDisableVertexAttribArray(0); + GL20.glDisableVertexAttribArray(1); + GL20.glDisableVertexAttribArray(2); + GL20.glDisableVertexAttribArray(3); } context.finish(); - GL46.glBindBuffer(GL46.GL_ARRAY_BUFFER, 0); + GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); GlState.resetColor(); this.renderChunks.clear(); } @@ -2613,29 +2615,29 @@ public class Renderer { else { this.gm.renderer.enableLightmap(); - GL46.glEnableClientState(GL46.GL_VERTEX_ARRAY); - GL46.glClientActiveTexture(GL46.GL_TEXTURE0); - GL46.glEnableClientState(GL46.GL_TEXTURE_COORD_ARRAY); - GL46.glClientActiveTexture(GL46.GL_TEXTURE1); - GL46.glEnableClientState(GL46.GL_TEXTURE_COORD_ARRAY); - GL46.glClientActiveTexture(GL46.GL_TEXTURE0); - GL46.glEnableClientState(GL46.GL_COLOR_ARRAY); + GL15.glEnableClientState(GL15.GL_VERTEX_ARRAY); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0); + GL15.glEnableClientState(GL15.GL_TEXTURE_COORD_ARRAY); + GL15.glClientActiveTexture(GL15.GL_TEXTURE1); + GL15.glEnableClientState(GL15.GL_TEXTURE_COORD_ARRAY); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0); + GL15.glEnableClientState(GL15.GL_COLOR_ARRAY); if (this.initialized) { for (RenderChunk renderchunk : this.renderChunks) { VertexBuffer vertexbuffer = renderchunk.getVertexBuffer(); - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.preRenderChunk(renderchunk); - GL46.glMultMatrixf(renderchunk.getModelviewMatrix()); + GL15.glMultMatrixf(renderchunk.getModelviewMatrix()); vertexbuffer.bindBuffer(); this.setupArrayPointers(); - vertexbuffer.drawArrays(GL46.GL_QUADS); - GL46.glPopMatrix(); + vertexbuffer.drawArrays(GL15.GL_QUADS); + GL15.glPopMatrix(); } - GL46.glBindBuffer(GL46.GL_ARRAY_BUFFER, 0); + GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); GlState.resetColor(); this.renderChunks.clear(); } @@ -2648,17 +2650,17 @@ public class Renderer { switch (vertexformatelement$enumusage) { case POSITION: - GL46.glDisableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glDisableClientState(GL15.GL_VERTEX_ARRAY); break; case UV: - GL46.glClientActiveTexture(GL46.GL_TEXTURE0 + s); - GL46.glDisableClientState(GL46.GL_TEXTURE_COORD_ARRAY); - GL46.glClientActiveTexture(GL46.GL_TEXTURE0); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0 + s); + GL15.glDisableClientState(GL15.GL_TEXTURE_COORD_ARRAY); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0); break; case COLOR: - GL46.glDisableClientState(GL46.GL_COLOR_ARRAY); + GL15.glDisableClientState(GL15.GL_COLOR_ARRAY); GlState.resetColor(); } } @@ -2670,28 +2672,28 @@ public class Renderer { // private void setupArrayPointers() // { -// GL46.nglVertexPointer(3, GL46.GL_FLOAT, 32, 0L); -// GL46.glTexCoordPointer(2, GL46.GL_FLOAT, 32, 16L); -// GL46.nglColorPointer(4, GL46.GL_UNSIGNED_BYTE, 32, 24L); -// GL46.glClientActiveTexture(GL46.GL_TEXTURE1); -// GL46.glTexCoordPointer(2, GL46.GL_SHORT, 32, 28L); -// GL46.glClientActiveTexture(GL46.GL_TEXTURE0); +// GL15.nglVertexPointer(3, GL15.GL_FLOAT, 32, 0L); +// GL15.glTexCoordPointer(2, GL15.GL_FLOAT, 32, 16L); +// GL15.nglColorPointer(4, GL15.GL_UNSIGNED_BYTE, 32, 24L); +// GL15.glClientActiveTexture(GL15.GL_TEXTURE1); +// GL15.glTexCoordPointer(2, GL15.GL_SHORT, 32, 28L); +// GL15.glClientActiveTexture(GL15.GL_TEXTURE0); // } private void setupArrayPointers() { - GL46.nglVertexPointer(3, GL46.GL_FLOAT, 28, 0L); - GL46.nglColorPointer(4, GL46.GL_UNSIGNED_BYTE, 28, 12L); - GL46.glTexCoordPointer(2, GL46.GL_FLOAT, 28, 16L); - GL46.glClientActiveTexture(GL46.GL_TEXTURE1); - GL46.glTexCoordPointer(2, GL46.GL_SHORT, 28, 24L); - GL46.glClientActiveTexture(GL46.GL_TEXTURE0); + GL15.nglVertexPointer(3, GL15.GL_FLOAT, 28, 0L); + GL15.nglColorPointer(4, GL15.GL_UNSIGNED_BYTE, 28, 12L); + GL15.glTexCoordPointer(2, GL15.GL_FLOAT, 28, 16L); + GL15.glClientActiveTexture(GL15.GL_TEXTURE1); + GL15.glTexCoordPointer(2, GL15.GL_SHORT, 28, 24L); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0); } private void preRenderChunk(RenderChunk renderChunkIn) { BlockPos blockpos = renderChunkIn.getPosition(); - GL46.glTranslatef((float)((double)blockpos.getX() - this.viewEntityX), (float)((double)blockpos.getY() - this.viewEntityY), (float)((double)blockpos.getZ() - this.viewEntityZ)); + GL15.glTranslatef((float)((double)blockpos.getX() - this.viewEntityX), (float)((double)blockpos.getY() - this.viewEntityY), (float)((double)blockpos.getZ() - this.viewEntityZ)); } private void renderSkyBox(String texture) @@ -2699,7 +2701,7 @@ public class Renderer { GlState.disableFog(); GlState.disableAlpha(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); ItemRenderer.disableStandardItemLighting(); GlState.depthMask(false); this.renderEngine.bindTexture(texture); @@ -2708,40 +2710,40 @@ public class Renderer { for (int i = 0; i < 6; ++i) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); if (i == 1) { - GL46.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); } if (i == 2) { - GL46.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(-90.0F, 1.0F, 0.0F, 0.0F); } if (i == 3) { - GL46.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); } if (i == 4) { - GL46.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); } if (i == 5) { - GL46.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(-90.0F, 0.0F, 0.0F, 1.0F); } - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldrenderer.pos(-100.0D, -100.0D, -100.0D).tex(0.0D, 0.0D).color(40, 40, 40, 255).endVertex(); worldrenderer.pos(-100.0D, -100.0D, 100.0D).tex(0.0D, 16.0D).color(40, 40, 40, 255).endVertex(); worldrenderer.pos(100.0D, -100.0D, 100.0D).tex(16.0D, 16.0D).color(40, 40, 40, 255).endVertex(); worldrenderer.pos(100.0D, -100.0D, -100.0D).tex(16.0D, 0.0D).color(40, 40, 40, 255).endVertex(); Tessellator.draw(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } GlState.depthMask(true); @@ -2784,11 +2786,11 @@ public class Renderer { // if (this.vboEnabled) // { this.skyVBO.bindBuffer(); - GL46.glEnableClientState(GL46.GL_VERTEX_ARRAY); - GL46.nglVertexPointer(3, GL46.GL_FLOAT, 12, 0L); - this.skyVBO.drawArrays(GL46.GL_QUADS); + GL15.glEnableClientState(GL15.GL_VERTEX_ARRAY); + GL15.nglVertexPointer(3, GL15.GL_FLOAT, 12, 0L); + this.skyVBO.drawArrays(GL15.GL_QUADS); this.skyVBO.unbindBuffer(); - GL46.glDisableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glDisableClientState(GL15.GL_VERTEX_ARRAY); // } // else // { @@ -2798,7 +2800,7 @@ public class Renderer { GlState.disableFog(); GlState.disableAlpha(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); ItemRenderer.disableStandardItemLighting(); float[] afloat = this.theWorld.dimension.hasDaylight() && !this.theWorld.dimension.isBaseDestroyed() ? @@ -2806,11 +2808,11 @@ public class Renderer { if (afloat != null) { GlState.disableTexture2D(); - GlState.shadeModel(GL46.GL_SMOOTH); - GL46.glPushMatrix(); - GL46.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(ExtMath.sin(this.getDayPhase(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); + GlState.shadeModel(GL15.GL_SMOOTH); + GL15.glPushMatrix(); + GL15.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(ExtMath.sin(this.getDayPhase(partialTicks)) < 0.0F ? 180.0F : 0.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(90.0F, 0.0F, 0.0F, 1.0F); float f6 = afloat[0]; float f7 = afloat[1]; float f8 = afloat[2]; @@ -2825,7 +2827,7 @@ public class Renderer { // f8 = f11; // } - worldrenderer.begin(GL46.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(0.0D, 100.0D, 0.0D).color(f6, f7, f8, afloat[3]).endVertex(); int j = 16; @@ -2838,16 +2840,16 @@ public class Renderer { } Tessellator.draw(); - GL46.glPopMatrix(); - GlState.shadeModel(GL46.GL_FLAT); + GL15.glPopMatrix(); + GlState.shadeModel(GL15.GL_FLAT); } GlState.enableTexture2D(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ONE, GL46.GL_ZERO); - GL46.glPushMatrix(); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ONE, GL15.GL_ZERO); + GL15.glPushMatrix(); float f16 = 1.0F - Math.max(this.theWorld.getRainStrength(), this.theWorld.getFogStrength()); - GL46.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(this.getCelestialAngle(partialTicks), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(-90.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(this.getCelestialAngle(partialTicks), 1.0F, 0.0F, 0.0F); if(this.gm.world.dimension.getType() == DimType.PLANET || this.gm.world.dimension.getType() == DimType.MOON) { float size = 30.0F; int color = this.gm.world.dimension.getSunColor(); @@ -2856,7 +2858,7 @@ public class Renderer { Vec3 ncolor = new Vec3(color); float mul = Math.min(1.0f / (float)ncolor.xCoord, Math.min(1.0f / (float)ncolor.yCoord, 1.0f / (float)ncolor.zCoord)); GlState.color((float)ncolor.xCoord * mul, (float)ncolor.yCoord * mul, (float)ncolor.zCoord * mul, f16); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos((double)(-size), 100.0D, (double)(-size)).tex(0.0D, 0.0D).endVertex(); worldrenderer.pos((double)size, 100.0D, (double)(-size)).tex(1.0D, 0.0D).endVertex(); worldrenderer.pos((double)size, 100.0D, (double)size).tex(1.0D, 1.0D).endVertex(); @@ -2881,7 +2883,7 @@ public class Renderer { float v1 = destroyed ? 0.0f : (float)(ty + 0) / 2.0F; float u2 = destroyed ? 1.0f : (float)(tx + 1) / 4.0F; float v2 = destroyed ? 1.0f : (float)(ty + 1) / 2.0F; - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos((double)(-size + mx), -100.0D, (double)(size + mz)).tex((double)u2, (double)v2).endVertex(); worldrenderer.pos((double)(size + mx), -100.0D, (double)(size + mz)).tex((double)u1, (double)v2).endVertex(); worldrenderer.pos((double)(size + mx), -100.0D, (double)(-size + mz)).tex((double)u1, (double)v1).endVertex(); @@ -2908,11 +2910,11 @@ public class Renderer { // if (this.vboEnabled) // { this.starVBO.bindBuffer(); - GL46.glEnableClientState(GL46.GL_VERTEX_ARRAY); - GL46.nglVertexPointer(3, GL46.GL_FLOAT, 12, 0L); - this.starVBO.drawArrays(GL46.GL_QUADS); + GL15.glEnableClientState(GL15.GL_VERTEX_ARRAY); + GL15.nglVertexPointer(3, GL15.GL_FLOAT, 12, 0L); + this.starVBO.drawArrays(GL15.GL_QUADS); this.starVBO.unbindBuffer(); - GL46.glDisableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glDisableClientState(GL15.GL_VERTEX_ARRAY); // } // else // { @@ -2935,11 +2937,11 @@ public class Renderer { // if (this.vboEnabled) // { this.dstarVBO.bindBuffer(); - GL46.glEnableClientState(GL46.GL_VERTEX_ARRAY); - GL46.nglVertexPointer(3, GL46.GL_FLOAT, 12, 0L); - this.dstarVBO.drawArrays(GL46.GL_QUADS); + GL15.glEnableClientState(GL15.GL_VERTEX_ARRAY); + GL15.nglVertexPointer(3, GL15.GL_FLOAT, 12, 0L); + this.dstarVBO.drawArrays(GL15.GL_QUADS); this.dstarVBO.unbindBuffer(); - GL46.glDisableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glDisableClientState(GL15.GL_VERTEX_ARRAY); // } // else // { @@ -2951,7 +2953,7 @@ public class Renderer { GlState.disableBlend(); GlState.enableAlpha(); GlState.enableFog(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.enableTexture2D(); GlState.depthMask(true); } @@ -2975,7 +2977,7 @@ public class Renderer { d2 = d2 - (double)(j * 2048); this.renderEngine.bindTexture(this.gm.world.dimension.getCloudTexture()); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); Vec3 vec3 = this.gm.renderer.getCloudColor(this.gm.getRenderViewEntity(), partialTicks); float f4 = (float)vec3.xCoord; float f5 = (float)vec3.yCoord; @@ -3008,7 +3010,7 @@ public class Renderer { int k = 8; int l = 4; float f21 = 9.765625E-4F; - GL46.glScalef(12.0F, 1.0F, 12.0F); + GL15.glScalef(12.0F, 1.0F, 12.0F); for (int i1 = 0; i1 < 2; ++i1) { @@ -3037,7 +3039,7 @@ public class Renderer { { for (int k1 = -3; k1 <= 4; ++k1) { - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); float f22 = (float)(j1 * 8); float f23 = (float)(k1 * 8); float f24 = f22 - f19; @@ -3142,25 +3144,52 @@ public class Renderer { } } + private void drawSelectionBox(EntityNPC player, HitPosition movingObjectPositionIn, float partialTicks) { + if(movingObjectPositionIn.type == HitPosition.ObjectType.BLOCK) { + GlState.enableBlend(); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GlState.color(0.0F, 0.0F, 0.0F, 0.4F); + GL15.glLineWidth(2.0F); + GlState.disableTexture2D(); + GlState.depthMask(false); + float f = 0.002F; + BlockPos blockpos = movingObjectPositionIn.block; + Block block = this.theWorld.getState(blockpos).getBlock(); + + if(block != Blocks.air) // && this.theWorld.getWorldBorder().contains(blockpos)) + { + block.setBlockBounds(this.theWorld, blockpos); + double d0 = player.lastTickPosX + (player.posX - player.lastTickPosX) * (double)partialTicks; + double d1 = player.lastTickPosY + (player.posY - player.lastTickPosY) * (double)partialTicks; + double d2 = player.lastTickPosZ + (player.posZ - player.lastTickPosZ) * (double)partialTicks; + drawSelectionBoundingBox(block.getSelectionBox(this.theWorld, blockpos).expand(0.0020000000949949026D, 0.0020000000949949026D, 0.0020000000949949026D).offset(-d0, -d1, -d2)); + } + + GlState.depthMask(true); + GlState.enableTexture2D(); + GlState.disableBlend(); + } + } + public static void drawSelectionBoundingBox(BoundingBox boundingBox) { // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(GL46.GL_LINE_STRIP, DefaultVertexFormats.POSITION); + worldrenderer.begin(GL15.GL_LINE_STRIP, DefaultVertexFormats.POSITION); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).endVertex(); Tessellator.draw(); - worldrenderer.begin(GL46.GL_LINE_STRIP, DefaultVertexFormats.POSITION); + worldrenderer.begin(GL15.GL_LINE_STRIP, DefaultVertexFormats.POSITION); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.maxZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).endVertex(); Tessellator.draw(); - worldrenderer.begin(GL46.GL_LINES, DefaultVertexFormats.POSITION); + worldrenderer.begin(GL15.GL_LINES, DefaultVertexFormats.POSITION); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).endVertex(); @@ -3176,21 +3205,21 @@ public class Renderer { { // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(GL46.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); Tessellator.draw(); - worldrenderer.begin(GL46.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.maxY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.maxZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); Tessellator.draw(); - worldrenderer.begin(GL46.GL_LINES, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_LINES, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(boundingBox.minX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.minX, boundingBox.maxY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); worldrenderer.pos(boundingBox.maxX, boundingBox.minY, boundingBox.minZ).color(red, green, blue, alpha).endVertex(); @@ -3240,18 +3269,18 @@ public class Renderer { Drawing.drawRect(0, 0, w, h, bg | 0xff000000); // Gui.drawRect(0, 0, w, h, bg | 0xff000000); for(int z = 0; z < 6; z++) { - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glLoadIdentity(); float shift = ticks % 30.0f - (float)z * 30.0f; int n = z + (int)(ticks / 30.0f); // WCF.glTranslatef(0.0f, 0.0f, (float)n * -30.0f); rand.setSeed((long)n * 8436723957L); - GL46.glRotatef(rand.floatv() * 360.0f, 0.0f, 0.0f, 1.0f); + GL15.glRotatef(rand.floatv() * 360.0f, 0.0f, 0.0f, 1.0f); float timer = (float)((double)(System.nanoTime() / 1000L) / 1000000.0) * 0.12f; // Project.gluLookAt(0.0f, 0.0f, shift, ExtMath.sin(timer), ExtMath.cos(timer * 2.0f), shift + ExtMath.cos(timer * 0.33f), 0.0f, ExtMath.sin(timer), ExtMath.cos(timer)); Project.gluLookAt(0.0f, 0.0f, shift, 0.0f, 0.0f, shift + 1.0f, 0.0f, 1.0f, 0.0f); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); Project.gluPerspective(90.0f, (float)w / (float)h, 0.05f, 1024.0f); // WCF.glTranslatef(w / 2.0f, h / 2.0f, 0.0f); // GlState.disableDepth(); @@ -3260,31 +3289,31 @@ public class Renderer { // this.skyVBO.bindBuffer(); // WCF.glEnableClientState(WCF.GL_VERTEX_ARRAY); // WCF.glVertexPointer(3, WCF.GL_FLOAT, 12, 0L); - // this.skyVBO.drawArrays(GL46.GL_QUADS); + // this.skyVBO.drawArrays(GL15.GL_QUADS); // this.skyVBO.unbindBuffer(); // WCF.glDisableClientState(WCF.GL_VERTEX_ARRAY); GlState.disableAlpha(); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ONE, GL46.GL_ZERO); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ONE, GL15.GL_ZERO); ItemRenderer.disableStandardItemLighting(); GlState.color((float)stars.xCoord, (float)stars.yCoord, (float)stars.zCoord, 1.0f); this.starVBO.bindBuffer(); - GL46.glEnableClientState(GL46.GL_VERTEX_ARRAY); - GL46.nglVertexPointer(3, GL46.GL_FLOAT, 12, 0L); - this.starVBO.drawArrays(GL46.GL_QUADS); + GL15.glEnableClientState(GL15.GL_VERTEX_ARRAY); + GL15.nglVertexPointer(3, GL15.GL_FLOAT, 12, 0L); + this.starVBO.drawArrays(GL15.GL_QUADS); this.starVBO.unbindBuffer(); - GL46.glDisableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glDisableClientState(GL15.GL_VERTEX_ARRAY); this.dstarVBO.bindBuffer(); - GL46.glEnableClientState(GL46.GL_VERTEX_ARRAY); - GL46.nglVertexPointer(3, GL46.GL_FLOAT, 12, 0L); - this.dstarVBO.drawArrays(GL46.GL_QUADS); + GL15.glEnableClientState(GL15.GL_VERTEX_ARRAY); + GL15.nglVertexPointer(3, GL15.GL_FLOAT, 12, 0L); + this.dstarVBO.drawArrays(GL15.GL_QUADS); this.dstarVBO.unbindBuffer(); - GL46.glDisableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glDisableClientState(GL15.GL_VERTEX_ARRAY); GlState.enableTexture2D(); - GL46.glMatrixMode(GL46.GL_PROJECTION); - GL46.glLoadIdentity(); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_PROJECTION); + GL15.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); + GL15.glLoadIdentity(); } GlState.enableCull(); this.gm.setupOverlay(); @@ -3318,7 +3347,7 @@ public class Renderer { int light = brightPos == null ? 0xffffffff : this.getLightColor(brightPos, null); IBakedModel model = this.manager.getModelForState(state); Block block = state.getBlock(); - GL46.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(90.0F, 0.0F, 1.0F, 0.0F); for (Facing enumfacing : Facing.values()) { @@ -3335,7 +3364,7 @@ public class Renderer { for (BakedQuad bakedquad : listQuads) { - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.ITEM); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.ITEM); worldrenderer.addVertexData(bakedquad.getVertexData()); worldrenderer.putColor4(light); Vec3i vec3i = bakedquad.getFace().getDirectionVec(); @@ -3349,7 +3378,7 @@ public class Renderer { float sky = this.skyLight ? pos.getY() < 0 ? 0.0f : (pos.getY() < 64 ? (float)pos.getY() / 64.0f : 1.0f) : 1.0f; float shading = side == null ? 1.0f : FaceBakery.getFaceBrightness(side); float max = (float)Math.max(Math.max((light >> 16) & 0xff, (light >> 8) & 0xff), light & 0xff) / 255.0f; - max = sky * (1.0f - max * this.gm.lightBlend); + max = sky * (1.0f - max); float directR = (float)(light >> 16 & 0xff) / 255.0f * shading + this.sunColorRed * max; float directG = (float)(light >> 8 & 0xff) / 255.0f * shading + this.sunColorGreen * max; float directB = (float)(light & 0xff) / 255.0f * shading + this.sunColorBlue * max; @@ -3361,11 +3390,11 @@ public class Renderer { return 0xff000000 | (int)(Math.min(directR, 1.0f) * 255.0f) << 16 | (int)(Math.min(directG, 1.0f) * 255.0f) << 8 | (int)(Math.min(directB, 1.0f) * 255.0f); } - public int getWorldColor(BlockPos pos, Facing side, int light, boolean flip) { + public int getVertexColor(BlockPos pos, Facing side, int light, boolean flip) { float sky = this.skyLight ? pos.getY() < 0 ? 0.0f : (pos.getY() < 64 ? (float)pos.getY() / 64.0f : 1.0f) : 1.0f; float shading = side == null ? 1.0f : FaceBakery.getFaceBrightness(side); float max = (float)Math.max(Math.max((light >> 16) & 0xff, (light >> 8) & 0xff), light & 0xff) / 255.0f; - max = sky * (1.0f - max * this.gm.lightBlend); + max = sky * (1.0f - max); float directR = ((float)(light >> 16 & 0xff) / 255.0f + max) * shading; float directG = ((float)(light >> 8 & 0xff) / 255.0f + max) * shading; float directB = ((float)(light & 0xff) / 255.0f + max) * shading; @@ -3375,10 +3404,9 @@ public class Renderer { public int getSkyBrightness(BlockPos pos) { int light = this.getCombinedLight(pos); float sky = this.skyLight ? pos.getY() < 0 ? 0.0f : (pos.getY() < 64 ? (float)pos.getY() / 64.0f : 1.0f) : 1.0f; - float max = (float)Math.max(Math.max((light >> 16) & 0xff, (light >> 8) & 0xff), light & 0xff) / 255.0f; - max = sky * (1.0f - max * this.gm.lightBlend); - light = (int)(max * 255.0f) / 16; - return light << 20 | 1 << 4; + float block = (float)Math.max(Math.max((light >> 16) & 0xff, (light >> 8) & 0xff), light & 0xff) / 255.0f; +// sky = sky * (1.0f - block * this.gm.lightBlend); + return ((int)(sky * 255.0f) / 16) << 20 | ((int)(block * 255.0f) / 16) << 4; } public int getCombinedBrightness(BlockPos pos) { @@ -3442,13 +3470,13 @@ public class Renderer { block = world.getState(pos).getBlock(); light = componentMax(world.getCombinedLight(pos), block.getLight()); } - return getWorldColor(pos, side, light, true); + return getVertexColor(pos, side, light, true); } private int getLightmapValueLiquid(IWorldAccess world, BlockPos pos, Facing side) { int light = world.getCombinedLight(pos); int up = world.getCombinedLight(pos.up()); - return getWorldColor(pos, side, componentMax(light, up), false); + return getVertexColor(pos, side, componentMax(light, up), false); } private void renderModelStandardQuads(IWorldAccess blockAccessIn, Block blockIn, BlockPos blockPosIn, Facing faceIn, int light, int sky, boolean ownLight, RenderBuffer worldRendererIn, List listQuadsIn, BitSet boundsFlags) @@ -3555,7 +3583,6 @@ public class Renderer { boolean up = blockliquid.canRender(blockAccess, blockPosIn.up(), Facing.UP); boolean down = blockliquid.canRender(blockAccess, blockPosIn.down(), Facing.DOWN); boolean[] aboolean = new boolean[] {blockliquid.canRender(blockAccess, blockPosIn.north(), Facing.NORTH), blockliquid.canRender(blockAccess, blockPosIn.south(), Facing.SOUTH), blockliquid.canRender(blockAccess, blockPosIn.west(), Facing.WEST), blockliquid.canRender(blockAccess, blockPosIn.east(), Facing.EAST)}; - float shine = blockliquid.getShinyness(); if (!up && !down && !aboolean[0] && !aboolean[1] && !aboolean[2] && !aboolean[3]) { @@ -3802,7 +3829,6 @@ public class Renderer { boolean up = block.canRender(blockAccess, blockPosIn.up(), Facing.UP); boolean down = block.canRender(blockAccess, blockPosIn.down(), Facing.DOWN); boolean[] aboolean = new boolean[] {block.canRender(blockAccess, blockPosIn.north(), Facing.NORTH), block.canRender(blockAccess, blockPosIn.south(), Facing.SOUTH), block.canRender(blockAccess, blockPosIn.west(), Facing.WEST), block.canRender(blockAccess, blockPosIn.east(), Facing.EAST)}; - float shine = block.getShinyness(); if (!up && !down && !aboolean[0] && !aboolean[1] && !aboolean[2] && !aboolean[3]) { diff --git a/client/src/main/java/client/renderer/Shader.java b/client/src/main/java/client/renderer/Shader.java index 5583fbba..c6495ec2 100644 --- a/client/src/main/java/client/renderer/Shader.java +++ b/client/src/main/java/client/renderer/Shader.java @@ -9,7 +9,7 @@ import java.util.Map.Entry; import java.util.function.Consumer; import java.util.function.Supplier; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL20; import client.Client; import client.util.FileUtils; @@ -46,63 +46,63 @@ public enum Shader { } public ShaderContext bool(String name, boolean x) { - GL46.glUniform1i(GL46.glGetUniformLocation(this.program, name), x ? 1 : 0); + GL20.glUniform1i(GL20.glGetUniformLocation(this.program, name), x ? 1 : 0); return this; } public ShaderContext integer(String name, int x) { - GL46.glUniform1i(GL46.glGetUniformLocation(this.program, name), x); + GL20.glUniform1i(GL20.glGetUniformLocation(this.program, name), x); return this; } public ShaderContext vec(String name, float x) { - GL46.glUniform1f(GL46.glGetUniformLocation(this.program, name), x); + GL20.glUniform1f(GL20.glGetUniformLocation(this.program, name), x); return this; } public ShaderContext vec(String name, float x, float y) { - GL46.glUniform2f(GL46.glGetUniformLocation(this.program, name), x, y); + GL20.glUniform2f(GL20.glGetUniformLocation(this.program, name), x, y); return this; } public ShaderContext vec(String name, float x, float y, float z) { - GL46.glUniform3f(GL46.glGetUniformLocation(this.program, name), x, y, z); + GL20.glUniform3f(GL20.glGetUniformLocation(this.program, name), x, y, z); return this; } public ShaderContext vec(String name, float x, float y, float z, float w) { - GL46.glUniform4f(GL46.glGetUniformLocation(this.program, name), x, y, z, w); + GL20.glUniform4f(GL20.glGetUniformLocation(this.program, name), x, y, z, w); return this; } public ShaderContext vec(String name, Vec3 vec) { - GL46.glUniform3f(GL46.glGetUniformLocation(this.program, name), (float)vec.xCoord, (float)vec.yCoord, (float)vec.zCoord); + GL20.glUniform3f(GL20.glGetUniformLocation(this.program, name), (float)vec.xCoord, (float)vec.yCoord, (float)vec.zCoord); return this; } public ShaderContext vec(String name, Vector3f vec) { - GL46.glUniform3f(GL46.glGetUniformLocation(this.program, name), vec.x, vec.y, vec.z); + GL20.glUniform3f(GL20.glGetUniformLocation(this.program, name), vec.x, vec.y, vec.z); return this; } public ShaderContext vec(String name, Vector4f vec) { - GL46.glUniform4f(GL46.glGetUniformLocation(this.program, name), vec.x, vec.y, vec.z, vec.w); + GL20.glUniform4f(GL20.glGetUniformLocation(this.program, name), vec.x, vec.y, vec.z, vec.w); return this; } public ShaderContext matrix(String name, FloatBuffer mat) { - GL46.glUniformMatrix4fv(GL46.glGetUniformLocation(this.program, name), false, mat); + GL20.glUniformMatrix4fv(GL20.glGetUniformLocation(this.program, name), false, mat); return this; } public ShaderContext matrix(String name, Matrix4f mat) { mat.store(BUFFER); - GL46.glUniformMatrix4fv(GL46.glGetUniformLocation(this.program, name), false, BUFFER); + GL20.glUniformMatrix4fv(GL20.glGetUniformLocation(this.program, name), false, BUFFER); return this; } public ShaderContext color(String name, int color) { - GL46.glUniform4f(GL46.glGetUniformLocation(this.program, name), + GL20.glUniform4f(GL20.glGetUniformLocation(this.program, name), (float)((int)((color >> 16) & 0xff)) / 255.0f, (float)((int)((color >> 8) & 0xff)) / 255.0f, (float)((int)(color & 0xff)) / 255.0f, (float)((int)((color >> 24) & 0xff)) / 255.0f ); @@ -110,7 +110,7 @@ public enum Shader { } public ShaderContext color3(String name, int color) { - GL46.glUniform3f(GL46.glGetUniformLocation(this.program, name), + GL20.glUniform3f(GL20.glGetUniformLocation(this.program, name), (float)((int)((color >> 16) & 0xff)) / 255.0f, (float)((int)((color >> 8) & 0xff)) / 255.0f, (float)((int)(color & 0xff)) / 255.0f ); @@ -120,7 +120,7 @@ public enum Shader { public void finish() { if(context != this) throw new IllegalStateException("Der Shader-Kontext wird nicht mehr verwendet"); - GL46.glUseProgram(0); + GL20.glUseProgram(0); context = null; } } @@ -179,44 +179,44 @@ public enum Shader { private boolean compile(String vcode, String fcode) { String include = this.buildInclude(); - int vs = GL46.glCreateShader(GL46.GL_VERTEX_SHADER); - GL46.glShaderSource(vs, "#version 460 compatibility\n" + include + vcode); - GL46.glCompileShader(vs); - int ok = GL46.glGetShaderi(vs, GL46.GL_COMPILE_STATUS); + int vs = GL20.glCreateShader(GL20.GL_VERTEX_SHADER); + GL20.glShaderSource(vs, "#version 460 compatibility\n" + include + vcode); + GL20.glCompileShader(vs); + int ok = GL20.glGetShaderi(vs, GL20.GL_COMPILE_STATUS); if(ok == 0) { - Log.RENDER.error(GL46.glGetShaderInfoLog(vs)); + Log.RENDER.error(GL20.glGetShaderInfoLog(vs)); Log.RENDER.error("Fehler beim Kompilieren des Vertex-Shaders '%s'", this.vertex); - GL46.glDeleteShader(vs); + GL20.glDeleteShader(vs); return false; } - int fs = GL46.glCreateShader(GL46.GL_FRAGMENT_SHADER); - GL46.glShaderSource(fs, "#version 460 compatibility\n" + include + fcode); - GL46.glCompileShader(fs); - ok = GL46.glGetShaderi(fs, GL46.GL_COMPILE_STATUS); + int fs = GL20.glCreateShader(GL20.GL_FRAGMENT_SHADER); + GL20.glShaderSource(fs, "#version 460 compatibility\n" + include + fcode); + GL20.glCompileShader(fs); + ok = GL20.glGetShaderi(fs, GL20.GL_COMPILE_STATUS); if(ok == 0) { - Log.RENDER.error(GL46.glGetShaderInfoLog(fs)); + Log.RENDER.error(GL20.glGetShaderInfoLog(fs)); Log.RENDER.error("Fehler beim Kompilieren des Fragment-Shaders '%s'", this.fragment); - GL46.glDeleteShader(vs); - GL46.glDeleteShader(fs); + GL20.glDeleteShader(vs); + GL20.glDeleteShader(fs); return false; } - int pr = GL46.glCreateProgram(); - GL46.glAttachShader(pr, vs); - GL46.glAttachShader(pr, fs); - GL46.glLinkProgram(pr); - ok = GL46.glGetProgrami(pr, GL46.GL_LINK_STATUS); + int pr = GL20.glCreateProgram(); + GL20.glAttachShader(pr, vs); + GL20.glAttachShader(pr, fs); + GL20.glLinkProgram(pr); + ok = GL20.glGetProgrami(pr, GL20.GL_LINK_STATUS); if(ok == 0) { - Log.RENDER.error(GL46.glGetProgramInfoLog(pr)); + Log.RENDER.error(GL20.glGetProgramInfoLog(pr)); Log.RENDER.error("Fehler beim Verbinden des Shader-Programms '%s' / '%s'", this.vertex, this.fragment); - GL46.glDeleteShader(vs); - GL46.glDeleteShader(fs); - GL46.glDeleteProgram(pr); + GL20.glDeleteShader(vs); + GL20.glDeleteShader(fs); + GL20.glDeleteProgram(pr); return false; } - GL46.glDeleteShader(vs); - GL46.glDeleteShader(fs); + GL20.glDeleteShader(vs); + GL20.glDeleteShader(fs); if(this.program != 0) { - GL46.glDeleteProgram(this.program); + GL20.glDeleteProgram(this.program); Log.RENDER.debug("Shader '%s' / '%s' / ID #%d wurde mit ID #%d neu geladen", this.vertex, this.fragment, this.program, pr); } else { @@ -224,7 +224,7 @@ public enum Shader { } this.program = pr; if(this.init != null) { - GL46.glUseProgram(this.program); + GL20.glUseProgram(this.program); context = new ShaderContext(this.program); this.init.accept(context); context.finish(); @@ -255,7 +255,7 @@ public enum Shader { private boolean unload() { if(this.program == 0) return false; - GL46.glDeleteProgram(this.program); + GL20.glDeleteProgram(this.program); Log.RENDER.debug("Shader '%s' / '%s' / ID #%d wurde gelöscht", this.vertex, this.fragment, this.program); this.program = 0; return true; @@ -264,7 +264,7 @@ public enum Shader { public ShaderContext use() { if(context != null) throw new IllegalStateException("Ein Shader wird bereits verwendet"); - GL46.glUseProgram(this.program); + GL20.glUseProgram(this.program); context = new ShaderContext(this.program); if(this.draw != null) this.draw.accept(context); diff --git a/client/src/main/java/client/renderer/Tessellator.java b/client/src/main/java/client/renderer/Tessellator.java index 4183e5d2..2bca3a59 100755 --- a/client/src/main/java/client/renderer/Tessellator.java +++ b/client/src/main/java/client/renderer/Tessellator.java @@ -3,7 +3,7 @@ package client.renderer; import java.nio.ByteBuffer; import java.util.List; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; public abstract class Tessellator { @@ -35,29 +35,29 @@ public abstract class Tessellator switch (vertexformatelement$enumusage) { case POSITION: - GL46.glVertexPointer(vertexformatelement.count(), k, i, bytebuffer); - GL46.glEnableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glVertexPointer(vertexformatelement.count(), k, i, bytebuffer); + GL15.glEnableClientState(GL15.GL_VERTEX_ARRAY); break; case UV: - GL46.glClientActiveTexture(GL46.GL_TEXTURE0 + l); - GL46.glTexCoordPointer(vertexformatelement.count(), k, i, bytebuffer); - GL46.glEnableClientState(GL46.GL_TEXTURE_COORD_ARRAY); - GL46.glClientActiveTexture(GL46.GL_TEXTURE0); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0 + l); + GL15.glTexCoordPointer(vertexformatelement.count(), k, i, bytebuffer); + GL15.glEnableClientState(GL15.GL_TEXTURE_COORD_ARRAY); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0); break; case COLOR: - GL46.glColorPointer(vertexformatelement.count(), k, i, bytebuffer); - GL46.glEnableClientState(GL46.GL_COLOR_ARRAY); + GL15.glColorPointer(vertexformatelement.count(), k, i, bytebuffer); + GL15.glEnableClientState(GL15.GL_COLOR_ARRAY); break; case NORMAL: - GL46.glNormalPointer(k, i, bytebuffer); - GL46.glEnableClientState(GL46.GL_NORMAL_ARRAY); + GL15.glNormalPointer(k, i, bytebuffer); + GL15.glEnableClientState(GL15.GL_NORMAL_ARRAY); } } - GL46.glDrawArrays(BUFFER.getDrawMode(), 0, BUFFER.getVertexCount()); + GL15.glDrawArrays(BUFFER.getDrawMode(), 0, BUFFER.getVertexCount()); int i1 = 0; for (int j1 = list.size(); i1 < j1; ++i1) @@ -69,22 +69,22 @@ public abstract class Tessellator switch (vertexformatelement$enumusage1) { case POSITION: - GL46.glDisableClientState(GL46.GL_VERTEX_ARRAY); + GL15.glDisableClientState(GL15.GL_VERTEX_ARRAY); break; case UV: - GL46.glClientActiveTexture(GL46.GL_TEXTURE0 + k1); - GL46.glDisableClientState(GL46.GL_TEXTURE_COORD_ARRAY); - GL46.glClientActiveTexture(GL46.GL_TEXTURE0); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0 + k1); + GL15.glDisableClientState(GL15.GL_TEXTURE_COORD_ARRAY); + GL15.glClientActiveTexture(GL15.GL_TEXTURE0); break; case COLOR: - GL46.glDisableClientState(GL46.GL_COLOR_ARRAY); + GL15.glDisableClientState(GL15.GL_COLOR_ARRAY); GlState.resetColor(); break; case NORMAL: - GL46.glDisableClientState(GL46.GL_NORMAL_ARRAY); + GL15.glDisableClientState(GL15.GL_NORMAL_ARRAY); } } } diff --git a/client/src/main/java/client/renderer/VertexBuffer.java b/client/src/main/java/client/renderer/VertexBuffer.java index 4765bd91..96a14645 100755 --- a/client/src/main/java/client/renderer/VertexBuffer.java +++ b/client/src/main/java/client/renderer/VertexBuffer.java @@ -2,7 +2,7 @@ package client.renderer; import java.nio.ByteBuffer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; public class VertexBuffer { private int id; @@ -11,31 +11,31 @@ public class VertexBuffer { public VertexBuffer(VertexFormat format) { this.format = format; - this.id = GL46.glGenBuffers(); + this.id = GL15.glGenBuffers(); } public void bindBuffer() { - GL46.glBindBuffer(GL46.GL_ARRAY_BUFFER, this.id); + GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, this.id); } public void bufferData(ByteBuffer buffer) { this.bindBuffer(); - GL46.glBufferData(GL46.GL_ARRAY_BUFFER, buffer, GL46.GL_STATIC_DRAW); + GL15.glBufferData(GL15.GL_ARRAY_BUFFER, buffer, GL15.GL_STATIC_DRAW); this.unbindBuffer(); this.count = buffer.limit() / this.format.getNextOffset(); } public void drawArrays(int mode) { - GL46.glDrawArrays(mode, 0, this.count); + GL15.glDrawArrays(mode, 0, this.count); } public void unbindBuffer() { - GL46.glBindBuffer(GL46.GL_ARRAY_BUFFER, 0); + GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0); } public void deleteGlBuffers() { if(this.id >= 0) { - GL46.glDeleteBuffers(this.id); + GL15.glDeleteBuffers(this.id); this.id = -1; } } diff --git a/client/src/main/java/client/renderer/VertexFormatElement.java b/client/src/main/java/client/renderer/VertexFormatElement.java index fd0534ed..77720993 100755 --- a/client/src/main/java/client/renderer/VertexFormatElement.java +++ b/client/src/main/java/client/renderer/VertexFormatElement.java @@ -1,6 +1,6 @@ package client.renderer; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; public record VertexFormatElement(int index, VertexFormatElement.EnumType type, VertexFormatElement.EnumUsage usage, int count) { public String toString() { @@ -33,13 +33,13 @@ public record VertexFormatElement(int index, VertexFormatElement.EnumType type, } public static enum EnumType { - FLOAT(4, "Float", GL46.GL_FLOAT), - UBYTE(1, "Unsigned Byte", GL46.GL_UNSIGNED_BYTE), - BYTE(1, "Byte", GL46.GL_BYTE), - USHORT(2, "Unsigned Short", GL46.GL_UNSIGNED_SHORT), - SHORT(2, "Short", GL46.GL_SHORT), - UINT(4, "Unsigned Int", GL46.GL_UNSIGNED_INT), - INT(4, "Int", GL46.GL_INT); + FLOAT(4, "Float", GL15.GL_FLOAT), + UBYTE(1, "Unsigned Byte", GL15.GL_UNSIGNED_BYTE), + BYTE(1, "Byte", GL15.GL_BYTE), + USHORT(2, "Unsigned Short", GL15.GL_UNSIGNED_SHORT), + SHORT(2, "Short", GL15.GL_SHORT), + UINT(4, "Unsigned Int", GL15.GL_UNSIGNED_INT), + INT(4, "Int", GL15.GL_INT); private final int size; private final String name; diff --git a/client/src/main/java/client/renderer/blockmodel/FaceBakery.java b/client/src/main/java/client/renderer/blockmodel/FaceBakery.java index 0d816dae..99dfaecd 100755 --- a/client/src/main/java/client/renderer/blockmodel/FaceBakery.java +++ b/client/src/main/java/client/renderer/blockmodel/FaceBakery.java @@ -73,9 +73,9 @@ public class FaceBakery FACINGS[Constants.EAST_INDEX] = EnumFaceDirection.EAST; } - public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, Sprite sprite, Facing facing, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade, float shine, boolean asItem) + public BakedQuad makeBakedQuad(Vector3f posFrom, Vector3f posTo, BlockPartFace face, Sprite sprite, Facing facing, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) { - int[] aint = this.makeQuadVertexData(face, sprite, facing, this.getPositionsDiv16(posFrom, posTo), modelRotationIn, partRotation, uvLocked, shade, shine, asItem); + int[] aint = this.makeQuadVertexData(face, sprite, facing, this.getPositionsDiv16(posFrom, posTo), modelRotationIn, partRotation, uvLocked, shade); Facing enumfacing = getFacingFromVertexData(aint); if (uvLocked) @@ -91,13 +91,13 @@ public class FaceBakery return new BakedQuad(aint, face.tint, enumfacing); } - private int[] makeQuadVertexData(BlockPartFace partFace, Sprite sprite, Facing facing, float[] p_178405_4_, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade, float shine, boolean asItem) + private int[] makeQuadVertexData(BlockPartFace partFace, Sprite sprite, Facing facing, float[] p_178405_4_, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) { int[] aint = new int[28]; for (int i = 0; i < 4; ++i) { - this.fillVertexData(aint, i, facing, partFace, p_178405_4_, sprite, modelRotationIn, partRotation, uvLocked, shade, shine, asItem); + this.fillVertexData(aint, i, facing, partFace, p_178405_4_, sprite, modelRotationIn, partRotation, uvLocked, shade); } return aint; @@ -132,30 +132,6 @@ public class FaceBakery return 1.0F; } } - - private static int getFaceNormal(Facing facing) - { - switch (facing) - { - case DOWN: - default: - return 0x008100; - case UP: - return 0x007f00; - case WEST: - return 0x000081; - case EAST: - return 0x00007f; - case NORTH: - return 0x810000; - case SOUTH: - return 0x7f0000; - } - } - - public static int getFaceNormal(float shine, Facing shade) { - return (int)((shine / 32.0f) * 127.0f) << 24 | (shade != null ? getFaceNormal(shade) : 0x000000); - } private float[] getPositionsDiv16(Vector3f pos1, Vector3f pos2) { @@ -169,24 +145,24 @@ public class FaceBakery return afloat; } - private void fillVertexData(int[] faceData, int vertexIndex, Facing facing, BlockPartFace partFace, float[] p_178402_5_, Sprite sprite, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade, float shine, boolean asItem) + private void fillVertexData(int[] faceData, int vertexIndex, Facing facing, BlockPartFace partFace, float[] p_178402_5_, Sprite sprite, ModelRotation modelRotationIn, BlockPartRotation partRotation, boolean uvLocked, boolean shade) { Facing enumfacing = modelRotationIn.rotateFace(facing); - int normColor = asItem ? (shade ? getFaceShadeColor(enumfacing) : 0xffffffff) : getFaceNormal(shine, shade ? enumfacing : null); + int color = shade ? getFaceShadeColor(enumfacing) : 0xffffffff; VertexInformation enumfacedirection$vertexinformation = EnumFaceDirection.getFacing(facing).getVertexInformation(vertexIndex); Vector3f vector3f = new Vector3f(p_178402_5_[enumfacedirection$vertexinformation.xIndex], p_178402_5_[enumfacedirection$vertexinformation.yIndex], p_178402_5_[enumfacedirection$vertexinformation.zIndex]); this.rotatePart(vector3f, partRotation); int j = this.rotateVertex(vector3f, facing, vertexIndex, modelRotationIn, uvLocked); - this.storeVertexData(faceData, j, vertexIndex, vector3f, normColor, sprite, partFace.uv); + this.storeVertexData(faceData, j, vertexIndex, vector3f, color, sprite, partFace.uv); } - private void storeVertexData(int[] faceData, int storeIndex, int vertexIndex, Vector3f position, int normColor, Sprite sprite, BlockFaceUV faceUV) + private void storeVertexData(int[] faceData, int storeIndex, int vertexIndex, Vector3f position, int color, Sprite sprite, BlockFaceUV faceUV) { int i = storeIndex * 7; faceData[i] = Float.floatToRawIntBits(position.x); faceData[i + 1] = Float.floatToRawIntBits(position.y); faceData[i + 2] = Float.floatToRawIntBits(position.z); - faceData[i + 3] = normColor; + faceData[i + 3] = color; faceData[i + 4] = Float.floatToRawIntBits(sprite.getInterpolatedU((double)faceUV.getU(vertexIndex))); faceData[i + 4 + 1] = Float.floatToRawIntBits(sprite.getInterpolatedV((double)faceUV.getV(vertexIndex))); } diff --git a/client/src/main/java/client/renderer/blockmodel/ModelBakery.java b/client/src/main/java/client/renderer/blockmodel/ModelBakery.java index 6a75e12f..e6f7bcf4 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelBakery.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelBakery.java @@ -61,7 +61,6 @@ public abstract class ModelBakery for(Entry entry : map.entrySet()) { ModelBlock model = (ModelBlock)entry.getKey().getBlock().getModel(provider, BlockRegistry.getName(entry.getKey().getBlock()) .toString(), entry.getKey()); - model.setShinyness(entry.getKey().getBlock().getShinyness()); models.put(entry.getValue(), model); variants.add(entry.getValue()); } @@ -175,7 +174,7 @@ public abstract class ModelBakery if (modelblock != null) { bakedRegistry.put(modelresourcelocation, bakeModel(sprites, faceBakery, textureMap.getMissingSprite(), - modelblock, modelblock.getRotation(), modelblock.isUvLocked(), false)); + modelblock, modelblock.getRotation(), modelblock.isUvLocked())); } else { @@ -196,7 +195,7 @@ public abstract class ModelBakery else { bakedRegistry.put(entry, bakeModel(sprites, faceBakery, textureMap.getMissingSprite(), - modelblock1, modelblock1.getRotation(), modelblock1.isUvLocked(), true)); + modelblock1, modelblock1.getRotation(), modelblock1.isUvLocked())); } } else @@ -219,7 +218,7 @@ public abstract class ModelBakery } private static IBakedModel bakeModel(Map sprites, FaceBakery faceBakery, - Sprite fallback, ModelBlock modelBlockIn, ModelRotation modelRotationIn, boolean uvLocked, boolean asItem) + Sprite fallback, ModelBlock modelBlockIn, ModelRotation modelRotationIn, boolean uvLocked) { Sprite particle = sprites.get(modelBlockIn.getPrimary()); BakedModel.Builder builder = new BakedModel.Builder(modelBlockIn).setTexture(particle == null ? fallback : particle); @@ -232,9 +231,9 @@ public abstract class ModelBakery sprite = sprite == null ? fallback : sprite; if (face.cull == null) - builder.addGeneralQuad(faceBakery.makeBakedQuad(blockpart.positionFrom, blockpart.positionTo, face, sprite, enumfacing, modelRotationIn, blockpart.partRotation, uvLocked, blockpart.shade, modelBlockIn.getShinyness(), asItem)); + builder.addGeneralQuad(faceBakery.makeBakedQuad(blockpart.positionFrom, blockpart.positionTo, face, sprite, enumfacing, modelRotationIn, blockpart.partRotation, uvLocked, blockpart.shade)); else - builder.addFaceQuad(modelRotationIn.rotateFace(face.cull), faceBakery.makeBakedQuad(blockpart.positionFrom, blockpart.positionTo, face, sprite, enumfacing, modelRotationIn, blockpart.partRotation, uvLocked, blockpart.shade, modelBlockIn.getShinyness(), asItem)); + builder.addFaceQuad(modelRotationIn.rotateFace(face.cull), faceBakery.makeBakedQuad(blockpart.positionFrom, blockpart.positionTo, face, sprite, enumfacing, modelRotationIn, blockpart.partRotation, uvLocked, blockpart.shade)); } } return builder.makeBakedModel(); diff --git a/client/src/main/java/client/renderer/blockmodel/ModelBlock.java b/client/src/main/java/client/renderer/blockmodel/ModelBlock.java index 3476e9eb..e4bc904c 100755 --- a/client/src/main/java/client/renderer/blockmodel/ModelBlock.java +++ b/client/src/main/java/client/renderer/blockmodel/ModelBlock.java @@ -21,7 +21,6 @@ public class ModelBlock extends Model { private ModelRotation rotation; private boolean uvLock; private GuiPosition transform; - private float shinyness; private BlockPart lastPart; private BlockPartFace[] last; @@ -160,12 +159,4 @@ public class ModelBlock extends Model { public boolean isUvLocked() { return this.uvLock; } - - public void setShinyness(float shinyness) { - this.shinyness = shinyness; - } - - public float getShinyness() { - return this.shinyness; - } } diff --git a/client/src/main/java/client/renderer/chunk/RenderChunk.java b/client/src/main/java/client/renderer/chunk/RenderChunk.java index f9a3c798..d99b0796 100755 --- a/client/src/main/java/client/renderer/chunk/RenderChunk.java +++ b/client/src/main/java/client/renderer/chunk/RenderChunk.java @@ -8,7 +8,7 @@ import java.util.HashSet; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.DefaultVertexFormats; @@ -241,20 +241,20 @@ public class RenderChunk private void preRenderBlocks(RenderBuffer worldRendererIn, BlockPos pos) { - worldRendererIn.begin(GL46.GL_QUADS, DefaultVertexFormats.BLOCK); + worldRendererIn.begin(GL15.GL_QUADS, DefaultVertexFormats.BLOCK); worldRendererIn.setTranslation((double)(-pos.getX()), (double)(-pos.getY()), (double)(-pos.getZ())); } private void initModelviewMatrix() { - GL46.glPushMatrix(); - GL46.glLoadIdentity(); + GL15.glPushMatrix(); + GL15.glLoadIdentity(); float f = 1.000001F; - GL46.glTranslatef(-8.0F, -8.0F, -8.0F); - GL46.glScalef(f, f, f); - GL46.glTranslatef(8.0F, 8.0F, 8.0F); - GL46.glGetFloatv(2982, this.modelviewMatrix); - GL46.glPopMatrix(); + GL15.glTranslatef(-8.0F, -8.0F, -8.0F); + GL15.glScalef(f, f, f); + GL15.glTranslatef(8.0F, 8.0F, 8.0F); + GL15.glGetFloatv(2982, this.modelviewMatrix); + GL15.glPopMatrix(); } public FloatBuffer getModelviewMatrix() diff --git a/client/src/main/java/client/renderer/entity/RenderArachnoid.java b/client/src/main/java/client/renderer/entity/RenderArachnoid.java index 976941ed..0e3bb4dd 100755 --- a/client/src/main/java/client/renderer/entity/RenderArachnoid.java +++ b/client/src/main/java/client/renderer/entity/RenderArachnoid.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.layers.LayerArachnoidArmor; import client.renderer.model.ModelArachnoid; @@ -22,10 +22,10 @@ public class RenderArachnoid extends RenderHumanoid // } protected void renderLayers(EntityNPC entity, float swing, float amount, float partial, float time, float dYaw, float dPitch, float scale) { - GL46.glPushMatrix(); - GL46.glTranslatef(0.0f, 3.0f / 16.0f, 0.0f); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0f, 3.0f / 16.0f, 0.0f); super.renderLayers(entity, swing, amount, partial, time, dYaw, dPitch, scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } public ModelArachnoid getMainModel() diff --git a/client/src/main/java/client/renderer/entity/RenderArrow.java b/client/src/main/java/client/renderer/entity/RenderArrow.java index 6f3a40b6..03904b03 100755 --- a/client/src/main/java/client/renderer/entity/RenderArrow.java +++ b/client/src/main/java/client/renderer/entity/RenderArrow.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -26,10 +26,10 @@ public class RenderArrow extends Render { this.bindEntityTexture(entity); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y, (float)z); - GL46.glRotatef(entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks - 90.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks, 0.0F, 0.0F, 1.0F); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y, (float)z); + GL15.glRotatef(entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks - 90.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks, 0.0F, 0.0F, 1.0F); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); int i = 0; @@ -48,21 +48,21 @@ public class RenderArrow extends Render if (f9 > 0.0F) { float f10 = -ExtMath.sin(f9 * 3.0F) * f9; - GL46.glRotatef(f10, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(f10, 0.0F, 0.0F, 1.0F); } - GL46.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); - GL46.glScalef(f8, f8, f8); - GL46.glTranslatef(-4.0F, 0.0F, 0.0F); - GL46.glNormal3f(f8, 0.0F, 0.0F); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + GL15.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); + GL15.glScalef(f8, f8, f8); + GL15.glTranslatef(-4.0F, 0.0F, 0.0F); + GL15.glNormal3f(f8, 0.0F, 0.0F); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f7).endVertex(); Tessellator.draw(); - GL46.glNormal3f(-f8, 0.0F, 0.0F); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + GL15.glNormal3f(-f8, 0.0F, 0.0F); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); @@ -71,9 +71,9 @@ public class RenderArrow extends Render for (int j = 0; j < 4; ++j) { - GL46.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL46.glNormal3f(0.0F, 0.0F, f8); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + GL15.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL15.glNormal3f(0.0F, 0.0F, f8); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double)f, (double)f2).endVertex(); worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double)f1, (double)f2).endVertex(); worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double)f1, (double)f3).endVertex(); @@ -82,7 +82,7 @@ public class RenderArrow extends Render } GlState.disableRescaleNormal(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderBat.java b/client/src/main/java/client/renderer/entity/RenderBat.java index 9ef40442..c75dc659 100755 --- a/client/src/main/java/client/renderer/entity/RenderBat.java +++ b/client/src/main/java/client/renderer/entity/RenderBat.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.model.ModelBat; import common.entity.animal.EntityBat; @@ -30,18 +30,18 @@ public class RenderBat extends RenderLiving */ protected void preRenderCallback(EntityBat entitylivingbaseIn, float partialTickTime) { - GL46.glScalef(0.35F, 0.35F, 0.35F); + GL15.glScalef(0.35F, 0.35F, 0.35F); } protected void rotateCorpse(EntityBat bat, float p_77043_2_, float p_77043_3_, float partialTicks) { if (!bat.getIsBatHanging()) { - GL46.glTranslatef(0.0F, ExtMath.cos(p_77043_2_ * 0.3F) * 0.1F, 0.0F); + GL15.glTranslatef(0.0F, ExtMath.cos(p_77043_2_ * 0.3F) * 0.1F, 0.0F); } else { - GL46.glTranslatef(0.0F, -0.1F, 0.0F); + GL15.glTranslatef(0.0F, -0.1F, 0.0F); } super.rotateCorpse(bat, p_77043_2_, p_77043_3_, partialTicks); diff --git a/client/src/main/java/client/renderer/entity/RenderBlockEntity.java b/client/src/main/java/client/renderer/entity/RenderBlockEntity.java index 926935c5..143a95f0 100755 --- a/client/src/main/java/client/renderer/entity/RenderBlockEntity.java +++ b/client/src/main/java/client/renderer/entity/RenderBlockEntity.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.texture.TextureMap; @@ -21,13 +21,13 @@ public class RenderBlockEntity extends Render public void doRender(Entity entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y + 0.5F, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y + 0.5F, (float)z); this.bindEntityTexture(entity); - GL46.glTranslatef(-0.5F, -0.5F, 0.5F); + GL15.glTranslatef(-0.5F, -0.5F, 0.5F); Client.CLIENT.renderer.renderBlockEntity(this.state, new BlockPos(entity.posX, entity.posY + (double)entity.getEyeHeight(), entity.posZ)); - GL46.glTranslatef(0.0F, 0.0F, 1.0F); - GL46.glPopMatrix(); + GL15.glTranslatef(0.0F, 0.0F, 1.0F); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderBoat.java b/client/src/main/java/client/renderer/entity/RenderBoat.java index 9237f080..2a9966c8 100755 --- a/client/src/main/java/client/renderer/entity/RenderBoat.java +++ b/client/src/main/java/client/renderer/entity/RenderBoat.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.model.ModelBase; import client.renderer.model.ModelBoat; @@ -26,9 +26,9 @@ public class RenderBoat extends Render */ public void doRender(EntityBoat entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y + 0.25F, (float)z); - GL46.glRotatef(180.0F - (entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks), 0.0F, 1.0F, 0.0F); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y + 0.25F, (float)z); + GL15.glRotatef(180.0F - (entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks), 0.0F, 1.0F, 0.0F); float f = (float)entity.getTimeSinceHit() - partialTicks; float f1 = (float)entity.getDamageTaken() - partialTicks; @@ -39,16 +39,16 @@ public class RenderBoat extends Render if (f > 0.0F) { - GL46.glRotatef(ExtMath.sin(f) * f * f1 / 10.0F * (float)entity.getForwardDirection(), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(ExtMath.sin(f) * f * f1 / 10.0F * (float)entity.getForwardDirection(), 1.0F, 0.0F, 0.0F); } float f2 = 0.75F; - GL46.glScalef(f2, f2, f2); - GL46.glScalef(1.0F / f2, 1.0F / f2, 1.0F / f2); + GL15.glScalef(f2, f2, f2); + GL15.glScalef(1.0F / f2, 1.0F / f2, 1.0F / f2); this.bindEntityTexture(entity); - GL46.glScalef(-1.0F, -1.0F, 1.0F); + GL15.glScalef(-1.0F, -1.0F, 1.0F); this.modelBoat.render(entity, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderBullet.java b/client/src/main/java/client/renderer/entity/RenderBullet.java index 86f7b45f..e654f296 100755 --- a/client/src/main/java/client/renderer/entity/RenderBullet.java +++ b/client/src/main/java/client/renderer/entity/RenderBullet.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -22,10 +22,10 @@ public class RenderBullet extends Render { this.bindEntityTexture(entity); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y, (float)z); - GL46.glRotatef(entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks - 90.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks, 0.0F, 0.0F, 1.0F); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y, (float)z); + GL15.glRotatef(entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks - 90.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks, 0.0F, 0.0F, 1.0F); RenderBuffer worldrenderer = Tessellator.getBuffer(); float f = 0.0F; float f1 = 0.5F; @@ -38,18 +38,18 @@ public class RenderBullet extends Render float f8 = 0.05625F; GlState.enableRescaleNormal(); - GL46.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); - GL46.glScalef(f8, f8, f8); - GL46.glTranslatef(-4.0F, 0.0F, 0.0F); - GL46.glNormal3f(f8, 0.0F, 0.0F); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + GL15.glRotatef(45.0F, 1.0F, 0.0F, 0.0F); + GL15.glScalef(f8, f8, f8); + GL15.glTranslatef(-4.0F, 0.0F, 0.0F); + GL15.glNormal3f(f8, 0.0F, 0.0F); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, -2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f7).endVertex(); Tessellator.draw(); - GL46.glNormal3f(-f8, 0.0F, 0.0F); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + GL15.glNormal3f(-f8, 0.0F, 0.0F); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-7.0D, 2.0D, -2.0D).tex((double)f4, (double)f6).endVertex(); worldrenderer.pos(-7.0D, 2.0D, 2.0D).tex((double)f5, (double)f6).endVertex(); worldrenderer.pos(-7.0D, -2.0D, 2.0D).tex((double)f5, (double)f7).endVertex(); @@ -58,9 +58,9 @@ public class RenderBullet extends Render for (int j = 0; j < 4; ++j) { - GL46.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); - GL46.glNormal3f(0.0F, 0.0F, f8); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + GL15.glRotatef(90.0F, 1.0F, 0.0F, 0.0F); + GL15.glNormal3f(0.0F, 0.0F, f8); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); worldrenderer.pos(-8.0D, -2.0D, 0.0D).tex((double)f, (double)f2).endVertex(); worldrenderer.pos(8.0D, -2.0D, 0.0D).tex((double)f1, (double)f2).endVertex(); worldrenderer.pos(8.0D, 2.0D, 0.0D).tex((double)f1, (double)f3).endVertex(); @@ -69,7 +69,7 @@ public class RenderBullet extends Render } GlState.disableRescaleNormal(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderCat.java b/client/src/main/java/client/renderer/entity/RenderCat.java index 33d2cce0..872163fc 100755 --- a/client/src/main/java/client/renderer/entity/RenderCat.java +++ b/client/src/main/java/client/renderer/entity/RenderCat.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.model.ModelBase; import common.entity.animal.EntityCat; @@ -50,7 +50,7 @@ public class RenderCat extends RenderLiving if (entitylivingbaseIn.isTamed()) { - GL46.glScalef(0.8F, 0.8F, 0.8F); + GL15.glScalef(0.8F, 0.8F, 0.8F); } } } diff --git a/client/src/main/java/client/renderer/entity/RenderCrystal.java b/client/src/main/java/client/renderer/entity/RenderCrystal.java index b06a4c49..b4ecd3b7 100755 --- a/client/src/main/java/client/renderer/entity/RenderCrystal.java +++ b/client/src/main/java/client/renderer/entity/RenderCrystal.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.model.ModelBase; import client.renderer.model.ModelCrystal; @@ -26,13 +26,13 @@ public class RenderCrystal extends Render public void doRender(EntityCrystal entity, double x, double y, double z, float partialTicks) { float f = (float)entity.innerRotation + partialTicks; - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y, (float)z); this.bindTexture(crystalTextures); float f1 = ExtMath.sin(f * 0.2F) / 2.0F + 0.5F; f1 = f1 * f1 + f1; this.modelCrystal.render(entity, 0.0F, f * 3.0F, f1 * 0.2F, 0.0F, 0.0F, 0.0625F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderDie.java b/client/src/main/java/client/renderer/entity/RenderDie.java index 4bf6340e..82b18e1c 100755 --- a/client/src/main/java/client/renderer/entity/RenderDie.java +++ b/client/src/main/java/client/renderer/entity/RenderDie.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.model.ModelDie; @@ -19,16 +19,16 @@ public class RenderDie extends Render { } public void doRender(EntityDie entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y + 0.05F, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y + 0.05F, (float)z); this.bindEntityTexture(entity); if(entity.getValue() == 0) - GL46.glRotatef((float)((entity.ticksExisted % 10) * (360 / 10)), 0.3f, 0.4f, 0.1f); - GL46.glScalef(-0.1f, -0.1f, 0.1f); + GL15.glRotatef((float)((entity.ticksExisted % 10) * (360 / 10)), 0.3f, 0.4f, 0.1f); + GL15.glScalef(-0.1f, -0.1f, 0.1f); GlState.disableCull(); this.model.render(entity, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, 0.0625F); GlState.enableCull(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } } diff --git a/client/src/main/java/client/renderer/entity/RenderEntity.java b/client/src/main/java/client/renderer/entity/RenderEntity.java index 2ce1d5ab..21a4a4f5 100755 --- a/client/src/main/java/client/renderer/entity/RenderEntity.java +++ b/client/src/main/java/client/renderer/entity/RenderEntity.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -18,7 +18,7 @@ public class RenderEntity extends Render RenderBuffer rb = Tessellator.getBuffer(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); rb.setTranslation(x, y, z); - rb.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_NORMAL); + rb.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_NORMAL); rb.pos(bb.minX, bb.maxY, bb.minZ).normal(0.0F, 0.0F, -1.0F).endVertex(); rb.pos(bb.maxX, bb.maxY, bb.minZ).normal(0.0F, 0.0F, -1.0F).endVertex(); rb.pos(bb.maxX, bb.minY, bb.minZ).normal(0.0F, 0.0F, -1.0F).endVertex(); @@ -55,9 +55,9 @@ public class RenderEntity extends Render public void doRender(Entity entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); renderOffsetAABB(entity.getEntityBoundingBox(), x - entity.lastTickPosX, y - entity.lastTickPosY, z - entity.lastTickPosZ); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderEntityItem.java b/client/src/main/java/client/renderer/entity/RenderEntityItem.java index 98c40ae1..60e3a324 100755 --- a/client/src/main/java/client/renderer/entity/RenderEntityItem.java +++ b/client/src/main/java/client/renderer/entity/RenderEntityItem.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.blockmodel.IBakedModel; @@ -39,12 +39,12 @@ public class RenderEntityItem extends Render int i = this.getMultiplier(itemstack); float f = 0.25F; float f1 = ExtMath.sin(((float)itemIn.getAge() + p_177077_8_) / 10.0F + itemIn.hoverStart) * 0.1F + 0.1F; - GL46.glTranslatef((float)p_177077_2_, (float)p_177077_4_ + f1 + 0.25F, (float)p_177077_6_); + GL15.glTranslatef((float)p_177077_2_, (float)p_177077_4_ + f1 + 0.25F, (float)p_177077_6_); if (flag || this.manager.gm != null) { float f3 = (((float)itemIn.getAge() + p_177077_8_) / 20.0F + itemIn.hoverStart) * (180F / (float)Math.PI); - GL46.glRotatef(f3, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(f3, 0.0F, 1.0F, 0.0F); } if (!flag) @@ -52,7 +52,7 @@ public class RenderEntityItem extends Render float f6 = -0.0F * (float)(i - 1) * 0.5F; float f4 = -0.0F * (float)(i - 1) * 0.5F; float f5 = -0.046875F * (float)(i - 1) * 0.5F; - GL46.glTranslatef(f6, f4, f5); + GL15.glTranslatef(f6, f4, f5); } GlState.color(1.0F, 1.0F, 1.0F, 1.0F); @@ -102,10 +102,10 @@ public class RenderEntityItem extends Render // } GlState.enableRescaleNormal(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GL46.glPushMatrix(); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GL15.glPushMatrix(); IBakedModel ibakedmodel = this.itemRenderer.getItemModelMesher().getItemModel(itemstack); int i = this.func_177077_a(entity, x, y, z, partialTicks, ibakedmodel); @@ -113,30 +113,30 @@ public class RenderEntityItem extends Render { if (ibakedmodel.isGui3d()) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); if (j > 0) { float f = (this.field_177079_e.floatv() * 2.0F - 1.0F) * 0.15F; float f1 = (this.field_177079_e.floatv() * 2.0F - 1.0F) * 0.15F; float f2 = (this.field_177079_e.floatv() * 2.0F - 1.0F) * 0.15F; - GL46.glTranslatef(f, f1, f2); + GL15.glTranslatef(f, f1, f2); } - GL46.glScalef(0.5F, 0.5F, 0.5F); + GL15.glScalef(0.5F, 0.5F, 0.5F); this.itemRenderer.renderItem(itemstack, ibakedmodel); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.itemRenderer.renderItem(itemstack, ibakedmodel); - GL46.glPopMatrix(); - GL46.glTranslatef(0.0F, 0.0F, 0.046875F); + GL15.glPopMatrix(); + GL15.glTranslatef(0.0F, 0.0F, 0.046875F); } } - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.disableRescaleNormal(); GlState.disableBlend(); this.bindEntityTexture(entity); diff --git a/client/src/main/java/client/renderer/entity/RenderFallingBlock.java b/client/src/main/java/client/renderer/entity/RenderFallingBlock.java index c5d44d7a..0a54101a 100755 --- a/client/src/main/java/client/renderer/entity/RenderFallingBlock.java +++ b/client/src/main/java/client/renderer/entity/RenderFallingBlock.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.texture.TextureMap; @@ -25,13 +25,13 @@ public class RenderFallingBlock extends Render { if(state != world.getState(pos) && block != Blocks.air && !block.getMaterial().isLiquid()) { - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y + 0.5F, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y + 0.5F, (float)z); this.bindEntityTexture(entity); - GL46.glTranslatef(-0.5F, -0.5F, 0.5F); + GL15.glTranslatef(-0.5F, -0.5F, 0.5F); Client.CLIENT.renderer.renderBlockEntity(state, new BlockPos(entity.posX, entity.posY + (double)entity.getEyeHeight(), entity.posZ)); - GL46.glTranslatef(0.0F, 0.0F, 1.0F); - GL46.glPopMatrix(); + GL15.glTranslatef(0.0F, 0.0F, 1.0F); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } } diff --git a/client/src/main/java/client/renderer/entity/RenderFireball.java b/client/src/main/java/client/renderer/entity/RenderFireball.java index bb8608d9..faf480cd 100755 --- a/client/src/main/java/client/renderer/entity/RenderFireball.java +++ b/client/src/main/java/client/renderer/entity/RenderFireball.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.DefaultVertexFormats; @@ -28,11 +28,11 @@ public class RenderFireball extends Render */ public void doRender(EntityProjectile entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.bindEntityTexture(entity); - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glTranslatef((float)x, (float)y, (float)z); GlState.enableRescaleNormal(); - GL46.glScalef(this.scale, this.scale, this.scale); + GL15.glScalef(this.scale, this.scale, this.scale); Sprite textureatlassprite = Client.CLIENT.getRenderItem().getItemModelMesher().getParticleIcon(Items.fireball); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); @@ -43,16 +43,16 @@ public class RenderFireball extends Render float f4 = 1.0F; float f5 = 0.5F; float f6 = 0.25F; - GL46.glRotatef(180.0F - this.manager.playerViewY, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-this.manager.playerViewX, 1.0F, 0.0F, 0.0F); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + GL15.glRotatef(180.0F - this.manager.playerViewY, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-this.manager.playerViewX, 1.0F, 0.0F, 0.0F); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); worldrenderer.pos(-0.5D, -0.25D, 0.0D).tex((double)f, (double)f3).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, -0.25D, 0.0D).tex((double)f1, (double)f3).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, 0.75D, 0.0D).tex((double)f1, (double)f2).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(-0.5D, 0.75D, 0.0D).tex((double)f, (double)f2).normal(0.0F, 1.0F, 0.0F).endVertex(); Tessellator.draw(); GlState.disableRescaleNormal(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderFish.java b/client/src/main/java/client/renderer/entity/RenderFish.java index d81f39ec..fd6ea03a 100755 --- a/client/src/main/java/client/renderer/entity/RenderFish.java +++ b/client/src/main/java/client/renderer/entity/RenderFish.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.DefaultVertexFormats; @@ -25,10 +25,10 @@ public class RenderFish extends Render */ public void doRender(EntityHook entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y, (float)z); GlState.enableRescaleNormal(); - GL46.glScalef(0.5F, 0.5F, 0.5F); + GL15.glScalef(0.5F, 0.5F, 0.5F); this.bindEntityTexture(entity); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); @@ -41,16 +41,16 @@ public class RenderFish extends Render float f4 = 1.0F; float f5 = 0.5F; float f6 = 0.5F; - GL46.glRotatef(180.0F - this.manager.playerViewY, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-this.manager.playerViewX, 1.0F, 0.0F, 0.0F); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); + GL15.glRotatef(180.0F - this.manager.playerViewY, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-this.manager.playerViewX, 1.0F, 0.0F, 0.0F); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL); worldrenderer.pos(-0.5D, -0.5D, 0.0D).tex(0.0D, 0.25D).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, -0.5D, 0.0D).tex(0.25D, 0.25D).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(0.5D, 0.5D, 0.0D).tex(0.25D, 0.0D).normal(0.0F, 1.0F, 0.0F).endVertex(); worldrenderer.pos(-0.5D, 0.5D, 0.0D).tex(0.0D, 0.0D).normal(0.0F, 1.0F, 0.0F).endVertex(); Tessellator.draw(); GlState.disableRescaleNormal(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); if (entity.angler != null) { @@ -87,7 +87,7 @@ public class RenderFish extends Render double d12 = (double)((float)(d2 - d7)); GlState.disableTexture2D(); GlState.disableLighting(); - worldrenderer.begin(GL46.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); int k = 16; for (int l = 0; l <= 16; ++l) diff --git a/client/src/main/java/client/renderer/entity/RenderFlyingBox.java b/client/src/main/java/client/renderer/entity/RenderFlyingBox.java index d367686c..ac1abc5f 100755 --- a/client/src/main/java/client/renderer/entity/RenderFlyingBox.java +++ b/client/src/main/java/client/renderer/entity/RenderFlyingBox.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.model.ModelHead; @@ -40,19 +40,19 @@ public class RenderFlyingBox extends Render */ public void doRender(EntityBox entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); GlState.disableCull(); float f = this.func_82400_a(entity.prevYaw, entity.rotYaw, partialTicks); float f1 = entity.prevPitch + (entity.rotPitch - entity.prevPitch) * partialTicks; - GL46.glTranslatef((float)x, (float)y, (float)z); - GL46.glRotatef((float)(entity.ticksExisted % 100) * 360.0f / 100.0f, 0.3f, 0.4f, 0.1f); + GL15.glTranslatef((float)x, (float)y, (float)z); + GL15.glRotatef((float)(entity.ticksExisted % 100) * 360.0f / 100.0f, 0.3f, 0.4f, 0.1f); float f2 = 0.0625F; GlState.enableRescaleNormal(); - GL46.glScalef(-1.0F, -1.0F, 1.0F); + GL15.glScalef(-1.0F, -1.0F, 1.0F); GlState.enableAlpha(); this.bindEntityTexture(entity); this.boxModel.render(entity, 0.0F, 0.0F, 0.0F, f, f1, f2); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderHorse.java b/client/src/main/java/client/renderer/entity/RenderHorse.java index 54437d81..4c4b9998 100755 --- a/client/src/main/java/client/renderer/entity/RenderHorse.java +++ b/client/src/main/java/client/renderer/entity/RenderHorse.java @@ -2,7 +2,7 @@ package client.renderer.entity; import java.util.Set; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.model.ModelHorse; @@ -40,7 +40,7 @@ public class RenderHorse extends RenderLiving f *= 0.92F; } - GL46.glScalef(f, f, f); + GL15.glScalef(f, f, f); super.preRenderCallback(entitylivingbaseIn, partialTickTime); } diff --git a/client/src/main/java/client/renderer/entity/RenderHumanoid.java b/client/src/main/java/client/renderer/entity/RenderHumanoid.java index 13a8d30b..b406cec7 100755 --- a/client/src/main/java/client/renderer/entity/RenderHumanoid.java +++ b/client/src/main/java/client/renderer/entity/RenderHumanoid.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.layers.LayerArmor; @@ -178,7 +178,7 @@ public class RenderHumanoid extends RenderNpc // SKC.glScalef(f2, f3, f2); // } float f = entitylivingbaseIn.getRenderScale(); // 0.9375F; - GL46.glScalef(f, f, f); + GL15.glScalef(f, f, f); } // protected int getColorMultiplier(EntityNPC entitylivingbaseIn, float lightBrightness, float partialTickTime) diff --git a/client/src/main/java/client/renderer/entity/RenderItem.java b/client/src/main/java/client/renderer/entity/RenderItem.java index 6e95dd0f..2e48a5f3 100755 --- a/client/src/main/java/client/renderer/entity/RenderItem.java +++ b/client/src/main/java/client/renderer/entity/RenderItem.java @@ -2,7 +2,7 @@ package client.renderer.entity; import java.util.List; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -67,7 +67,7 @@ public class RenderItem private void renderModel(IBakedModel model, int color, ItemStack stack) { RenderBuffer worldrenderer = Tessellator.getBuffer(); - worldrenderer.begin(GL46.GL_QUADS, DefaultVertexFormats.ITEM); + worldrenderer.begin(GL15.GL_QUADS, DefaultVertexFormats.ITEM); for (Facing enumfacing : Facing.values()) { @@ -82,31 +82,31 @@ public class RenderItem { if (stack != null) { - GL46.glPushMatrix(); - GL46.glScalef(0.5F, 0.5F, 0.5F); + GL15.glPushMatrix(); + GL15.glScalef(0.5F, 0.5F, 0.5F); if (model.isBuiltin()) { - GL46.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(-0.5F, -0.5F, -0.5F); + GL15.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(-0.5F, -0.5F, -0.5F); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.enableRescaleNormal(); this.renderBuiltin(stack); } else { - GL46.glTranslatef(-0.5F, -0.5F, -0.5F); + GL15.glTranslatef(-0.5F, -0.5F, -0.5F); this.renderModel(model, stack); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } private void renderBuiltin(ItemStack stack) { if(stack.getItem() instanceof ItemArmor armor) { this.stack = stack; - GL46.glPushMatrix(); + GL15.glPushMatrix(); float offset = 0.0f; switch(armor.getArmorType()) { case HELMET: @@ -128,9 +128,9 @@ public class RenderItem offset = 0.0f; break; } - GL46.glTranslatef(1.0f, offset, 0.0f); - GL46.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); - GL46.glScalef(1.4f, -1.4f, 1.4f); + GL15.glTranslatef(1.0f, offset, 0.0f); + GL15.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); + GL15.glScalef(1.4f, -1.4f, 1.4f); boolean cull = GlState.isCullEnabled(); if(cull) GlState.disableCull(); @@ -142,14 +142,14 @@ public class RenderItem // if(cull) GlState.enableCull(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); this.stack = null; } else if(stack.getItem() instanceof ItemAnimalArmor horseArmor) { - GL46.glPushMatrix(); - GL46.glTranslatef(0.9f, 0.5f, 0.0f); - GL46.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); - GL46.glScalef(0.85f, -0.85f, 0.85f); + GL15.glPushMatrix(); + GL15.glTranslatef(0.9f, 0.5f, 0.0f); + GL15.glRotatef(180.0f, 0.0f, 1.0f, 0.0f); + GL15.glScalef(0.85f, -0.85f, 0.85f); Class clazz = horseArmor.getArmorType().getAnimalType(); boolean cull = GlState.isCullEnabled(); if(cull) @@ -160,7 +160,7 @@ public class RenderItem } if(cull) GlState.enableCull(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } @@ -214,7 +214,7 @@ public class RenderItem if (!flag) { - GL46.glScalef(2.0F, 2.0F, 2.0F); + GL15.glScalef(2.0F, 2.0F, 2.0F); } GlState.color(1.0F, 1.0F, 1.0F, 1.0F); @@ -254,45 +254,45 @@ public class RenderItem this.manager.bindTexture(TextureMap.BLOCKS); this.preTransform(stack); GlState.enableRescaleNormal(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); - GL46.glPushMatrix(); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); + GL15.glPushMatrix(); if(transform) { WieldType type = stack.getItem().getWieldType(); if(third && type != null) { switch(type) { case TOOL_FLIP: - GL46.glTranslatef(0.0f, 0.0f, -3.5f * 0.0625f); - GL46.glRotatef(90.0f, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(180.0f, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(-35.0f, 0.0F, 0.0F, 1.0F); - GL46.glScalef(0.85f, 0.85f, 0.85f); + GL15.glTranslatef(0.0f, 0.0f, -3.5f * 0.0625f); + GL15.glRotatef(90.0f, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(180.0f, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(-35.0f, 0.0F, 0.0F, 1.0F); + GL15.glScalef(0.85f, 0.85f, 0.85f); break; case TOOL: - GL46.glTranslatef(0.0f, 1.25f * 0.0625f, -3.5f * 0.0625f); - GL46.glRotatef(90.0f, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-35.0f, 0.0F, 0.0F, 1.0F); - GL46.glScalef(0.85f, 0.85f, 0.85f); + GL15.glTranslatef(0.0f, 1.25f * 0.0625f, -3.5f * 0.0625f); + GL15.glRotatef(90.0f, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-35.0f, 0.0F, 0.0F, 1.0F); + GL15.glScalef(0.85f, 0.85f, 0.85f); break; case RANGED: - GL46.glTranslatef(0.75f * 0.0625f, 0.0f, 0.25f * 0.0625f); - GL46.glRotatef(80.0f, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(5.0f, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(-45.0f, 0.0F, 0.0F, 1.0F); + GL15.glTranslatef(0.75f * 0.0625f, 0.0f, 0.25f * 0.0625f); + GL15.glRotatef(80.0f, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(5.0f, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(-45.0f, 0.0F, 0.0F, 1.0F); break; } } else if(!third) { - GL46.glTranslatef(0.0f, 4.0f * 0.0625f, 2.0f * 0.0625f); - GL46.glRotatef(type == WieldType.TOOL_FLIP ? 45.0f : -135.0f, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(25.0f, 0.0F, 0.0F, 1.0F); - GL46.glScalef(1.7f, 1.7f, 1.7f); + GL15.glTranslatef(0.0f, 4.0f * 0.0625f, 2.0f * 0.0625f); + GL15.glRotatef(type == WieldType.TOOL_FLIP ? 45.0f : -135.0f, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(25.0f, 0.0F, 0.0F, 1.0F); + GL15.glScalef(1.7f, 1.7f, 1.7f); } } this.renderItem(stack, model); - GlState.cullFace(GL46.GL_BACK); - GL46.glPopMatrix(); + GlState.cullFace(GL15.GL_BACK); + GL15.glPopMatrix(); GlState.disableRescaleNormal(); GlState.disableBlend(); this.manager.bindTexture(TextureMap.BLOCKS); @@ -301,22 +301,22 @@ public class RenderItem private void renderItemIntoGUI(ItemStack stack, int x, int y) { IBakedModel ibakedmodel = this.mesher.getItemModel(stack); - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.manager.bindTexture(TextureMap.BLOCKS); GlState.enableRescaleNormal(); GlState.enableAlpha(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); this.setupGuiTransform(x, y, ibakedmodel.isGui3d()); GuiPosition vec = ibakedmodel.getTransforms(); if(vec != GuiPosition.NORMAL) { - GL46.glTranslatef(vec.translationX(), vec.translationY(), vec.translationZ()); - GL46.glRotatef(vec.rotationY(), 0.0F, 1.0F, 0.0F); - GL46.glRotatef(vec.rotationX(), 1.0F, 0.0F, 0.0F); - GL46.glRotatef(vec.rotationZ(), 0.0F, 0.0F, 1.0F); - GL46.glScalef(vec.scale(), vec.scale(), vec.scale()); + GL15.glTranslatef(vec.translationX(), vec.translationY(), vec.translationZ()); + GL15.glRotatef(vec.rotationY(), 0.0F, 1.0F, 0.0F); + GL15.glRotatef(vec.rotationX(), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(vec.rotationZ(), 0.0F, 0.0F, 1.0F); + GL15.glScalef(vec.scale(), vec.scale(), vec.scale()); } boolean cull = GlState.isCullEnabled(); if(!cull) @@ -327,28 +327,28 @@ public class RenderItem GlState.disableAlpha(); GlState.disableRescaleNormal(); GlState.disableLighting(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); this.manager.bindTexture(TextureMap.BLOCKS); } private void setupGuiTransform(int xPosition, int yPosition, boolean isGui3d) { - GL46.glTranslatef((float)xPosition, (float)yPosition, 100.0F + this.zLevel); - GL46.glTranslatef(8.0F, 8.0F, 0.0F); - GL46.glScalef(1.0F, 1.0F, -1.0F); - GL46.glScalef(0.5F, 0.5F, 0.5F); + GL15.glTranslatef((float)xPosition, (float)yPosition, 100.0F + this.zLevel); + GL15.glTranslatef(8.0F, 8.0F, 0.0F); + GL15.glScalef(1.0F, 1.0F, -1.0F); + GL15.glScalef(0.5F, 0.5F, 0.5F); if (isGui3d) { - GL46.glScalef(40.0F, 40.0F, 40.0F); - GL46.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); + GL15.glScalef(40.0F, 40.0F, 40.0F); + GL15.glRotatef(210.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(-135.0F, 0.0F, 1.0F, 0.0F); GlState.enableLighting(); } else { - GL46.glScalef(64.0F, 64.0F, 64.0F); - GL46.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); + GL15.glScalef(64.0F, 64.0F, 64.0F); + GL15.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); GlState.disableLighting(); } } diff --git a/client/src/main/java/client/renderer/entity/RenderItemEntity.java b/client/src/main/java/client/renderer/entity/RenderItemEntity.java index 93e2699c..5a321b45 100755 --- a/client/src/main/java/client/renderer/entity/RenderItemEntity.java +++ b/client/src/main/java/client/renderer/entity/RenderItemEntity.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.texture.TextureMap; @@ -23,16 +23,16 @@ public class RenderItemEntity extends Render public void doRender(T entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y, (float)z); GlState.enableRescaleNormal(); - GL46.glScalef(0.5F, 0.5F, 0.5F); - GL46.glRotatef(-this.manager.playerViewY, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(this.manager.playerViewX, 1.0F, 0.0F, 0.0F); + GL15.glScalef(0.5F, 0.5F, 0.5F); + GL15.glRotatef(-this.manager.playerViewY, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(this.manager.playerViewX, 1.0F, 0.0F, 0.0F); this.bindTexture(TextureMap.BLOCKS); this.itemRenderer.renderItemAsGround(this.getStack(entity)); GlState.disableRescaleNormal(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderLeashKnot.java b/client/src/main/java/client/renderer/entity/RenderLeashKnot.java index 62ccd59c..f4743995 100755 --- a/client/src/main/java/client/renderer/entity/RenderLeashKnot.java +++ b/client/src/main/java/client/renderer/entity/RenderLeashKnot.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.model.ModelLeashKnot; @@ -22,16 +22,16 @@ public class RenderLeashKnot extends Render */ public void doRender(EntityLeashKnot entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); GlState.disableCull(); - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glTranslatef((float)x, (float)y, (float)z); float f = 0.0625F; GlState.enableRescaleNormal(); - GL46.glScalef(-1.0F, -1.0F, 1.0F); + GL15.glScalef(-1.0F, -1.0F, 1.0F); GlState.enableAlpha(); this.bindEntityTexture(entity); this.leashKnotModel.render(entity, 0.0F, 0.0F, 0.0F, 0.0F, 0.0F, f); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderLightning.java b/client/src/main/java/client/renderer/entity/RenderLightning.java index 1705ca64..eaa78ce1 100755 --- a/client/src/main/java/client/renderer/entity/RenderLightning.java +++ b/client/src/main/java/client/renderer/entity/RenderLightning.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -27,7 +27,7 @@ public class RenderLightning extends Render GlState.disableTexture2D(); GlState.disableLighting(); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_ONE); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_ONE); double[] adouble = new double[8]; double[] adouble1 = new double[8]; double d0 = 0.0D; @@ -83,7 +83,7 @@ public class RenderLightning extends Render d3 += (double)(random1.zrange(31) - 15); } - worldrenderer.begin(GL46.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); float f = 0.5F; float f1 = 0.45F; float f2 = 0.45F; diff --git a/client/src/main/java/client/renderer/entity/RenderLiving.java b/client/src/main/java/client/renderer/entity/RenderLiving.java index 58233430..df95de90 100755 --- a/client/src/main/java/client/renderer/entity/RenderLiving.java +++ b/client/src/main/java/client/renderer/entity/RenderLiving.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.Frustum; @@ -46,7 +46,7 @@ public abstract class RenderLiving extends RendererLivin int l = RenderManager.getBrightnessForRender(entity); int a = l % 65536; int b = l / 65536; - GL46.glMultiTexCoord2f(GL46.GL_TEXTURE1, (float)a / 1.0F, (float)b / 1.0F); + GL15.glMultiTexCoord2f(GL15.GL_TEXTURE1, (float)a / 1.0F, (float)b / 1.0F); } private static double interpolateValue(double start, double end, double pct) { @@ -95,7 +95,7 @@ public abstract class RenderLiving extends RendererLivin GlState.disableTexture2D(); GlState.disableLighting(); GlState.disableCull(); - renderer.begin(GL46.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); + renderer.begin(GL15.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); for(int n = 0; n <= 24; ++n) { float cr = r; float cg = g; @@ -118,7 +118,7 @@ public abstract class RenderLiving extends RendererLivin ).color(cr, cg, cb, 1.0F).endVertex(); } Tessellator.draw(); - renderer.begin(GL46.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); + renderer.begin(GL15.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR); for(int n = 0; n <= 24; ++n) { float cr = r; float cg = g; diff --git a/client/src/main/java/client/renderer/entity/RenderManager.java b/client/src/main/java/client/renderer/entity/RenderManager.java index 1a7eae1f..2c10cf26 100755 --- a/client/src/main/java/client/renderer/entity/RenderManager.java +++ b/client/src/main/java/client/renderer/entity/RenderManager.java @@ -2,7 +2,7 @@ package client.renderer.entity; import java.util.Map; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.init.RenderRegistry; @@ -142,7 +142,7 @@ public class RenderManager { int j = i % 65536; int k = i / 65536; - GL46.glMultiTexCoord2f(GL46.GL_TEXTURE1, (float)j / 1.0F, (float)k / 1.0F); + GL15.glMultiTexCoord2f(GL15.GL_TEXTURE1, (float)j / 1.0F, (float)k / 1.0F); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); return this.renderEntity(entity, d0 - this.renderPosX, d1 - this.renderPosY, d2 - this.renderPosZ, partialTicks); } @@ -180,22 +180,22 @@ public class RenderManager { if(dist > (double)(maxDistance * maxDistance) || !this.gm.canRenderHud()) return; float scale = 0.016666668F; - GL46.glPushMatrix(); - GL46.glTranslatef((float)x + 0.0F, (float)y + entity.height + 0.5F, (float)z); - GL46.glNormal3f(0.0F, 1.0F, 0.0F); - GL46.glRotatef(-this.playerViewY, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(this.playerViewX, 1.0F, 0.0F, 0.0F); - GL46.glScalef(-scale, -scale, scale); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x + 0.0F, (float)y + entity.height + 0.5F, (float)z); + GL15.glNormal3f(0.0F, 1.0F, 0.0F); + GL15.glRotatef(-this.playerViewY, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(this.playerViewX, 1.0F, 0.0F, 0.0F); + GL15.glScalef(-scale, -scale, scale); GlState.disableLighting(); GlState.depthMask(false); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); GlState.depthMask(true); Drawing.drawTextboxCentered(str, 0, 0, 0x3f000000); GlState.enableLighting(); GlState.disableBlend(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } private void renderEntityFire(Entity entity, double x, double y, double z) { @@ -203,21 +203,21 @@ public class RenderManager { TextureMap map = this.gm.getTextureMapBlocks(); Sprite layer0 = map.getAtlasSprite("blocks/fire_layer_0"); Sprite layer1 = map.getAtlasSprite("blocks/fire_layer_1"); - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y, (float)z); float scale = entity.width * 1.4F; - GL46.glScalef(scale, scale, scale); + GL15.glScalef(scale, scale, scale); RenderBuffer rb = Tessellator.getBuffer(); float f1 = 0.5F; float f2 = 0.0F; float f3 = entity.height / scale; float f4 = (float)(entity.posY - entity.getEntityBoundingBox().minY); - GL46.glRotatef(-this.playerViewY, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(0.0F, 0.0F, -0.3F + (float)((int)f3) * 0.02F); + GL15.glRotatef(-this.playerViewY, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.0F, 0.0F, -0.3F + (float)((int)f3) * 0.02F); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); float f5 = 0.0F; int i = 0; - rb.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX); + rb.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX); while(f3 > 0.0F) { Sprite layer = i % 2 == 0 ? layer0 : layer1; @@ -245,7 +245,7 @@ public class RenderManager { } Tessellator.draw(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.enableLighting(); } @@ -269,7 +269,7 @@ public class RenderManager { RenderBuffer worldrenderer = Tessellator.getBuffer(); Vec3 vec3 = entityIn.getLook(partialTicks); - worldrenderer.begin(GL46.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_LINE_STRIP, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(x, y + (double)entityIn.getEyeHeight(), z).color(0, 0, 255, 255).endVertex(); worldrenderer.pos(x + vec3.xCoord * 2.0D, y + (double)entityIn.getEyeHeight() + vec3.yCoord * 2.0D, z + vec3.zCoord * 2.0D).color(0, 0, 255, 255).endVertex(); Tessellator.draw(); diff --git a/client/src/main/java/client/renderer/entity/RenderMinecart.java b/client/src/main/java/client/renderer/entity/RenderMinecart.java index 1625e348..369261de 100755 --- a/client/src/main/java/client/renderer/entity/RenderMinecart.java +++ b/client/src/main/java/client/renderer/entity/RenderMinecart.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.GlState; @@ -33,14 +33,14 @@ public class RenderMinecart extends Render public void doRender(T entity, double x, double y, double z, float partialTicks) { float entityYaw = entity.prevYaw + (entity.rotYaw - entity.prevYaw) * partialTicks; - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.bindEntityTexture(entity); long i = (long)entity.getId() * 493286711L; i = i * i * 4392167121L + i * 98761L; float f = (((float)(i >> 16 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float f1 = (((float)(i >> 20 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; float f2 = (((float)(i >> 24 & 7L) + 0.5F) / 8.0F - 0.5F) * 0.004F; - GL46.glTranslatef(f, f1, f2); + GL15.glTranslatef(f, f1, f2); 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; @@ -76,9 +76,9 @@ public class RenderMinecart extends Render } } - GL46.glTranslatef((float)x, (float)y + 0.375F, (float)z); - GL46.glRotatef(180.0F - entityYaw, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-f3, 0.0F, 0.0F, 1.0F); + GL15.glTranslatef((float)x, (float)y + 0.375F, (float)z); + GL15.glRotatef(180.0F - entityYaw, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-f3, 0.0F, 0.0F, 1.0F); float f5 = (float)entity.getRollingAmplitude() - partialTicks; float f6 = (float)entity.getDamage() - partialTicks; @@ -89,7 +89,7 @@ public class RenderMinecart extends Render if (f5 > 0.0F) { - GL46.glRotatef(ExtMath.sin(f5) * f5 * f6 / 10.0F * (float)entity.getRollingDirection(), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(ExtMath.sin(f5) * f5 * f6 / 10.0F * (float)entity.getRollingDirection(), 1.0F, 0.0F, 0.0F); } int j = entity.getDisplayTileOffset(); @@ -97,20 +97,20 @@ public class RenderMinecart extends Render if (iblockstate.getBlock() != Blocks.air && !iblockstate.getBlock().getMaterial().isLiquid()) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.bindTexture(TextureMap.BLOCKS); float f4 = 0.75F; - GL46.glScalef(f4, f4, f4); - GL46.glTranslatef(-0.5F, (float)(j - 8) / 16.0F, 0.5F); + GL15.glScalef(f4, f4, f4); + GL15.glTranslatef(-0.5F, (float)(j - 8) / 16.0F, 0.5F); this.func_180560_a(entity, partialTicks, iblockstate); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); this.bindEntityTexture(entity); } - GL46.glScalef(-1.0F, -1.0F, 1.0F); + GL15.glScalef(-1.0F, -1.0F, 1.0F); this.modelMinecart.render(entity, 0.0F, 0.0F, -0.1F, 0.0F, 0.0F, 0.0625F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } @@ -124,8 +124,8 @@ public class RenderMinecart extends Render protected void func_180560_a(T minecart, float partialTicks, State state) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); Client.CLIENT.renderer.renderBlockEntity(state, new BlockPos(minecart.posX, minecart.posY + (double)minecart.getEyeHeight(), minecart.posZ)); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } diff --git a/client/src/main/java/client/renderer/entity/RenderSlime.java b/client/src/main/java/client/renderer/entity/RenderSlime.java index 233557c3..5fda6bcb 100755 --- a/client/src/main/java/client/renderer/entity/RenderSlime.java +++ b/client/src/main/java/client/renderer/entity/RenderSlime.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.layers.LayerSlimeGel; import client.renderer.model.ModelSlime; @@ -25,7 +25,7 @@ public class RenderSlime extends RenderNpc f1 = (slime.prevSquishFactor + (slime.squishFactor - slime.prevSquishFactor) * partialTickTime) / (f * 0.5F + 1.0F); } float f2 = 1.0F / (f1 + 1.0F); - GL46.glScalef(f2 * f, 1.0F / f2 * f, f2 * f); + GL15.glScalef(f2 * f, 1.0F / f2 * f, f2 * f); } public void doRender(EntityNPC entity, double x, double y, double z, float partialTicks) diff --git a/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java b/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java index 7847e95b..55a63c2f 100755 --- a/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java +++ b/client/src/main/java/client/renderer/entity/RenderSpaceMarine.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.layers.LayerArrow; import client.renderer.layers.LayerHeldItem; @@ -83,7 +83,7 @@ public class RenderSpaceMarine extends RenderNpc protected void preRenderCallback(EntityNPC entitylivingbaseIn, float partialTickTime) { float f = entitylivingbaseIn.getRenderScale(); // 0.9375F; - GL46.glScalef(f, f, f); + GL15.glScalef(f, f, f); } // public void renderPlayerArm(EntityNPC entity) diff --git a/client/src/main/java/client/renderer/entity/RenderTntMinecart.java b/client/src/main/java/client/renderer/entity/RenderTntMinecart.java index e7bdbe3d..5dc1c78b 100755 --- a/client/src/main/java/client/renderer/entity/RenderTntMinecart.java +++ b/client/src/main/java/client/renderer/entity/RenderTntMinecart.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.GlState; @@ -27,7 +27,7 @@ public class RenderTntMinecart extends RenderMinecart f = f * f; f = f * f; float f1 = 1.0F + f * 0.3F; - GL46.glScalef(f1, f1, f1); + GL15.glScalef(f1, f1, f1); } super.func_180560_a(minecart, partialTicks, state); @@ -37,11 +37,11 @@ public class RenderTntMinecart extends RenderMinecart GlState.disableTexture2D(); GlState.disableLighting(); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_DST_ALPHA); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_DST_ALPHA); GlState.color(1.0F, 1.0F, 1.0F, (1.0F - ((float)i - partialTicks + 1.0F) / 100.0F) * 0.8F); - GL46.glPushMatrix(); + GL15.glPushMatrix(); Client.CLIENT.renderer.renderBlockEntity(Blocks.tnt.getState(), null); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.disableBlend(); GlState.enableLighting(); diff --git a/client/src/main/java/client/renderer/entity/RenderTntPrimed.java b/client/src/main/java/client/renderer/entity/RenderTntPrimed.java index ab22173b..fa696815 100755 --- a/client/src/main/java/client/renderer/entity/RenderTntPrimed.java +++ b/client/src/main/java/client/renderer/entity/RenderTntPrimed.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.GlState; @@ -23,8 +23,8 @@ public class RenderTntPrimed extends Render public void doRender(EntityTnt entity, double x, double y, double z, float partialTicks) { Renderer renderer = Client.CLIENT.renderer; - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y + 0.5F, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y + 0.5F, (float)z); if ((float)entity.fuse - partialTicks + 1.0F < 10.0F) { @@ -33,22 +33,22 @@ public class RenderTntPrimed extends Render f = f * f; f = f * f; float f1 = 1.0F + f * 0.3F; - GL46.glScalef(f1, f1, f1); + GL15.glScalef(f1, f1, f1); } float f2 = (1.0F - ((float)entity.fuse - partialTicks + 1.0F) / 100.0F) * 0.8F; this.bindEntityTexture(entity); - GL46.glTranslatef(-0.5F, -0.5F, 0.5F); + GL15.glTranslatef(-0.5F, -0.5F, 0.5F); Block tnt = BlockRegistry.byName("tnt" + (entity.explosionSize <= 0 || entity.explosionSize >= 8 ? "" : "_" + entity.explosionSize)); renderer.renderBlockEntity(tnt.getState(), new BlockPos(entity.posX, entity.posY + (double)entity.getEyeHeight(), entity.posZ)); - GL46.glTranslatef(0.0F, 0.0F, 1.0F); + GL15.glTranslatef(0.0F, 0.0F, 1.0F); if (entity.fuse / 5 % 2 == 0) { GlState.disableTexture2D(); GlState.disableLighting(); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_DST_ALPHA); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_DST_ALPHA); GlState.color(1.0F, 1.0F, 1.0F, f2); GlState.doPolygonOffset(-3.0F, -3.0F); GlState.enablePolygonOffset(); @@ -61,7 +61,7 @@ public class RenderTntPrimed extends Render GlState.enableTexture2D(); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partialTicks); } diff --git a/client/src/main/java/client/renderer/entity/RenderXp.java b/client/src/main/java/client/renderer/entity/RenderXp.java index 61921ede..55811630 100755 --- a/client/src/main/java/client/renderer/entity/RenderXp.java +++ b/client/src/main/java/client/renderer/entity/RenderXp.java @@ -1,6 +1,6 @@ package client.renderer.entity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -17,8 +17,8 @@ public class RenderXp extends Render { } public void doRender(EntityXp entity, double x, double y, double z, float partial) { - GL46.glPushMatrix(); - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x, (float)y, (float)z); this.bindEntityTexture(entity); int value = entity.getXpValue(); float u1 = (float)(value % 4 * 16 + 0) / 64.0F; @@ -31,19 +31,19 @@ public class RenderXp extends Render { int light = RenderManager.getBrightnessForRender(entity); int block = light % 65536; int sky = light / 65536; - GL46.glMultiTexCoord2f(GL46.GL_TEXTURE1, (float)block / 1.0F, (float)sky / 1.0F); + GL15.glMultiTexCoord2f(GL15.GL_TEXTURE1, (float)block / 1.0F, (float)sky / 1.0F); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); float color = ((float)entity.xpColor + partial) / 16.0F; int g = (int)((ExtMath.sin(color + 0.0F) + 1.0F) * 0.5F * 255.0F); float n = (int)((ExtMath.sin(color + (float)Math.PI) + 1.0F) * 0.5F * 255.0F); int r = (int)(n * (value / 10.0f)); int b = (int)(n * ((10 - value) / 10.0f)); - GL46.glRotatef(180.0F - this.manager.playerViewY, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(-this.manager.playerViewX, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(180.0F - this.manager.playerViewY, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(-this.manager.playerViewX, 1.0F, 0.0F, 0.0F); float size = 0.25F; - GL46.glScalef(size, size, size); + GL15.glScalef(size, size, size); RenderBuffer rb = Tessellator.getBuffer(); - rb.begin(GL46.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); + rb.begin(GL15.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR_NORMAL); rb.pos((double)(0.0F - dx), (double)(0.0F - dy), 0.0D).tex((double)u1, (double)v2).color(r, g, b, 128).normal(0.0F, 1.0F, 0.0F) .endVertex(); rb.pos((double)(bx - dx), (double)(0.0F - dy), 0.0D).tex((double)u2, (double)v2).color(r, g, b, 128).normal(0.0F, 1.0F, 0.0F) @@ -55,7 +55,7 @@ public class RenderXp extends Render { Tessellator.draw(); GlState.disableBlend(); GlState.disableRescaleNormal(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); super.doRender(entity, x, y, z, partial); } diff --git a/client/src/main/java/client/renderer/entity/RendererLivingEntity.java b/client/src/main/java/client/renderer/entity/RendererLivingEntity.java index 60cbe529..a463d08c 100755 --- a/client/src/main/java/client/renderer/entity/RendererLivingEntity.java +++ b/client/src/main/java/client/renderer/entity/RendererLivingEntity.java @@ -5,7 +5,7 @@ import java.nio.ByteOrder; import java.nio.FloatBuffer; import java.util.List; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -86,7 +86,7 @@ public abstract class RendererLivingEntity extends Rende */ public void doRender(T entity, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); GlState.disableCull(); this.mainModel.swingProgress = this.getSwingProgress(entity, partialTicks); this.mainModel.isRiding = entity.isRiding(); @@ -128,10 +128,10 @@ public abstract class RendererLivingEntity extends Rende float f8 = this.handleRotationFloat(entity, partialTicks); this.rotateCorpse(entity, f8, f, partialTicks); GlState.enableRescaleNormal(); - GL46.glScalef(-1.0F, -1.0F, 1.0F); + GL15.glScalef(-1.0F, -1.0F, 1.0F); this.preRenderCallback(entity, partialTicks); float f4 = 0.0625F; - GL46.glTranslatef(0.0F, -1.5078125F, 0.0F); + GL15.glTranslatef(0.0F, -1.5078125F, 0.0F); float f5 = entity.prevLswingAmount + (entity.lswingAmount - entity.prevLswingAmount) * partialTicks; float f6 = entity.limbSwing - entity.lswingAmount * (1.0F - partialTicks); @@ -184,11 +184,11 @@ public abstract class RendererLivingEntity extends Rende Log.RENDER.error((Throwable)exception, (String)"Konnte Objekt nicht rendern"); } - GlState.setActiveTexture(GL46.GL_TEXTURE1); + GlState.setActiveTexture(GL15.GL_TEXTURE1); GlState.enableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.enableCull(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); if (!this.renderOutlines) { @@ -222,23 +222,23 @@ public abstract class RendererLivingEntity extends Rende float g = (float)(c >> 8 & 255) / 255.0F; float b = (float)(c & 255) / 255.0F; GlState.disableLighting(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.color(r, g, b, 1.0F); GlState.disableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE1); + GlState.setActiveTexture(GL15.GL_TEXTURE1); GlState.disableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); return true; } protected void unsetOutlineColor() { GlState.enableLighting(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); GlState.enableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE1); + GlState.setActiveTexture(GL15.GL_TEXTURE1); GlState.enableTexture2D(); - GlState.setActiveTexture(GL46.GL_TEXTURE0); + GlState.setActiveTexture(GL15.GL_TEXTURE0); } protected void renderModel(T entity, float x, float y, float z, float yaw, float pitch, float scale) @@ -255,13 +255,13 @@ public abstract class RendererLivingEntity extends Rende if (ghost) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); GlState.color(1.0F, 1.0F, 1.0F, 0.3F); // GlState.color(entity.getRenderColor() | (vis ? 0x50000000 : 0x26000000)); GlState.depthMask(false); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA); - GlState.alphaFunc(GL46.GL_GREATER, 0.003921569F); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA); + GlState.alphaFunc(GL15.GL_GREATER, 0.003921569F); } if(entity.isGlowing()) @@ -274,8 +274,8 @@ public abstract class RendererLivingEntity extends Rende if (ghost) { GlState.disableBlend(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); - GL46.glPopMatrix(); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); + GL15.glPopMatrix(); GlState.depthMask(true); } // } @@ -414,12 +414,12 @@ public abstract class RendererLivingEntity extends Rende */ protected void renderLivingAt(T entityLivingBaseIn, double x, double y, double z) { - GL46.glTranslatef((float)x, (float)y, (float)z); + GL15.glTranslatef((float)x, (float)y, (float)z); } protected void rotateCorpse(T bat, float p_77043_2_, float p_77043_3_, float partialTicks) { - GL46.glRotatef(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(180.0F - p_77043_3_, 0.0F, 1.0F, 0.0F); if (bat.deathTime > 0) { @@ -431,7 +431,7 @@ public abstract class RendererLivingEntity extends Rende f = 1.0F; } - GL46.glRotatef(f * this.getDeathMaxRotation(bat), 0.0F, 0.0F, 1.0F); + GL15.glRotatef(f * this.getDeathMaxRotation(bat), 0.0F, 0.0F, 1.0F); } else { @@ -439,8 +439,8 @@ public abstract class RendererLivingEntity extends Rende if (s != null && (s.startsWith("Australia") || s.startsWith("Australien"))) // && (!(bat.isPlayer()) || ((EntityNPC)bat).isWearing(ModelPart.CAPE))) { - GL46.glTranslatef(0.0F, bat.height + 0.1F, 0.0F); - GL46.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); + GL15.glTranslatef(0.0F, bat.height + 0.1F, 0.0F); + GL15.glRotatef(180.0F, 0.0F, 0.0F, 1.0F); } } } @@ -526,19 +526,19 @@ public abstract class RendererLivingEntity extends Rende float f4 = (float)(crystal.posZ - entity.posZ - (entity.prevZ - entity.posZ) * (double)(1.0F - p_180574_8_)); float f5 = ExtMath.sqrtf(f2 * f2 + f4 * f4); float f6 = ExtMath.sqrtf(f2 * f2 + f3 * f3 + f4 * f4); - GL46.glPushMatrix(); - GL46.glTranslatef((float)p_180574_2_, (float)p_180574_4_ + 2.0F, (float)p_180574_6_); - GL46.glRotatef((float)(-Math.atan2((double)f4, (double)f2)) * 180.0F / (float)Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef((float)(-Math.atan2((double)f5, (double)f3)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); + GL15.glPushMatrix(); + GL15.glTranslatef((float)p_180574_2_, (float)p_180574_4_ + 2.0F, (float)p_180574_6_); + GL15.glRotatef((float)(-Math.atan2((double)f4, (double)f2)) * 180.0F / (float)Math.PI - 90.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef((float)(-Math.atan2((double)f5, (double)f3)) * 180.0F / (float)Math.PI - 90.0F, 1.0F, 0.0F, 0.0F); // Tessellator tessellator = Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); ItemRenderer.disableStandardItemLighting(); GlState.disableCull(); this.bindTexture(crystalBeamTextures); - GlState.shadeModel(GL46.GL_SMOOTH); + GlState.shadeModel(GL15.GL_SMOOTH); float f7 = 0.0F - ((float)entity.ticksExisted + p_180574_8_) * 0.01F; float f8 = ExtMath.sqrtf(f2 * f2 + f3 * f3 + f4 * f4) / 32.0F - ((float)entity.ticksExisted + p_180574_8_) * 0.01F; - worldrenderer.begin(GL46.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_TEX_COLOR); + worldrenderer.begin(GL15.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_TEX_COLOR); int i = 8; for (int j = 0; j <= 8; ++j) @@ -552,9 +552,9 @@ public abstract class RendererLivingEntity extends Rende Tessellator.draw(); GlState.enableCull(); - GlState.shadeModel(GL46.GL_FLAT); + GlState.shadeModel(GL15.GL_FLAT); ItemRenderer.enableStandardItemLighting(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } static diff --git a/client/src/main/java/client/renderer/layers/LayerArmor.java b/client/src/main/java/client/renderer/layers/LayerArmor.java index c4d77c99..b7675acd 100755 --- a/client/src/main/java/client/renderer/layers/LayerArmor.java +++ b/client/src/main/java/client/renderer/layers/LayerArmor.java @@ -2,7 +2,7 @@ package client.renderer.layers; import java.util.List; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.GlState; @@ -19,7 +19,6 @@ import common.util.Equipment; public class LayerArmor implements LayerRenderer { - protected static final String ENCHANTED_ITEM_GLINT_RES = "textures/glint.png"; private static final Equipment[] SLOTS; static { @@ -93,8 +92,6 @@ public class LayerArmor implements LayerRenderer } GlState.color(this.colorR, this.colorG, this.colorB, this.alpha); t.render(entitylivingbaseIn, limbSwing, limbSwingAmount, yaw, pitch, factor, scale); - if (itemstack.isItemEnchanted()) - this.renderGlint(entitylivingbaseIn, t, limbSwing, limbSwingAmount, partial, yaw, pitch, factor, scale); } } @@ -113,44 +110,6 @@ public class LayerArmor implements LayerRenderer return armorSlot == Equipment.LEGGINGS; } - private void renderGlint(EntityLiving entitylivingbaseIn, ModelArmor modelbaseIn, float p_177183_3_, float p_177183_4_, float partialTicks, float p_177183_6_, float p_177183_7_, float p_177183_8_, float scale) - { - float f = entitylivingbaseIn == null ? (float)(System.currentTimeMillis() % 1000000L) / 50.0f : (float)entitylivingbaseIn.ticksExisted + partialTicks; - if(this.renderer != null) - this.renderer.bindTexture(ENCHANTED_ITEM_GLINT_RES); - else - Client.CLIENT.getTextureManager().bindTexture(ENCHANTED_ITEM_GLINT_RES); - GlState.enableBlend(); - GlState.depthFunc(GL46.GL_EQUAL); - GlState.depthMask(false); - float f1 = 0.5F; - GlState.color(f1, f1, f1, 1.0F); - - for (int i = 0; i < 2; ++i) - { - GlState.disableLighting(); - GlState.blendFunc(GL46.GL_SRC_COLOR, GL46.GL_ONE); - float f2 = 0.76F; - GlState.color(0.5F * f2, 0.25F * f2, 0.8F * f2, 1.0F); - GL46.glMatrixMode(GL46.GL_TEXTURE); - GL46.glLoadIdentity(); - float f3 = 0.33333334F; - GL46.glScalef(f3, f3, f3); - GL46.glRotatef(30.0F - (float)i * 60.0F, 0.0F, 0.0F, 1.0F); - GL46.glTranslatef(0.0F, f * (0.001F + (float)i * 0.003F) * 20.0F, 0.0F); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - modelbaseIn.render(entitylivingbaseIn, p_177183_3_, p_177183_4_, p_177183_6_, p_177183_7_, p_177183_8_, scale); - } - - GL46.glMatrixMode(GL46.GL_TEXTURE); - GL46.glLoadIdentity(); - GL46.glMatrixMode(GL46.GL_MODELVIEW); - GlState.enableLighting(); - GlState.depthMask(true); - GlState.depthFunc(GL46.GL_LEQUAL); - GlState.disableBlend(); - } - // private String getArmorResource(ItemArmor item, boolean legs) // { // return this.getArmorResource(item, legs, null); diff --git a/client/src/main/java/client/renderer/layers/LayerArrow.java b/client/src/main/java/client/renderer/layers/LayerArrow.java index 902303d3..65a0f2e6 100755 --- a/client/src/main/java/client/renderer/layers/LayerArrow.java +++ b/client/src/main/java/client/renderer/layers/LayerArrow.java @@ -1,6 +1,6 @@ package client.renderer.layers; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.ItemRenderer; import client.renderer.entity.RendererLivingEntity; @@ -33,7 +33,7 @@ public class LayerArrow implements LayerRenderer for (int j = 0; j < i; ++j) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); ModelRenderer modelrenderer = this.field_177168_a.getMainModel().getRandomModelBox(random); ModelBox modelbox = (ModelBox)modelrenderer.cubeList.get(random.zrange(modelrenderer.cubeList.size())); modelrenderer.postRender(0.0625F); @@ -43,7 +43,7 @@ public class LayerArrow implements LayerRenderer float f3 = (modelbox.posX1 + (modelbox.posX2 - modelbox.posX1) * f) / 16.0F; float f4 = (modelbox.posY1 + (modelbox.posY2 - modelbox.posY1) * f1) / 16.0F; float f5 = (modelbox.posZ1 + (modelbox.posZ2 - modelbox.posZ1) * f2) / 16.0F; - GL46.glTranslatef(f3, f4, f5); + GL15.glTranslatef(f3, f4, f5); f = f * 2.0F - 1.0F; f1 = f1 * 2.0F - 1.0F; f2 = f2 * 2.0F - 1.0F; @@ -57,7 +57,7 @@ public class LayerArrow implements LayerRenderer double d1 = 0.0D; double d2 = 0.0D; this.field_177168_a.getRenderManager().renderEntity(entity, d0, d1, d2, partialTicks); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } ItemRenderer.enableStandardItemLighting(); diff --git a/client/src/main/java/client/renderer/layers/LayerCape.java b/client/src/main/java/client/renderer/layers/LayerCape.java index 2c485e7a..28856668 100755 --- a/client/src/main/java/client/renderer/layers/LayerCape.java +++ b/client/src/main/java/client/renderer/layers/LayerCape.java @@ -1,6 +1,6 @@ package client.renderer.layers; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.entity.RenderHumanoid; @@ -31,8 +31,8 @@ public class LayerCape implements LayerRenderer entitylivingbaseIn.getCape() != null) { GlState.color(1.0F, 1.0F, 1.0F, 1.0F); this.renderer.bindTexture("textures/npc/cape_" + entitylivingbaseIn.getCape() + ".png"); - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, 0.0F, 0.125F); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, 0.0F, 0.125F); if(entitylivingbaseIn.isPlayer()) { EntityNPC player = (EntityNPC)entitylivingbaseIn; double d0 = player.prevChasingPosX + (player.chasingPosX - player.prevChasingPosX) * (double)partialTicks - (entitylivingbaseIn.prevX + (entitylivingbaseIn.posX - entitylivingbaseIn.prevX) * (double)partialTicks); @@ -59,17 +59,17 @@ public class LayerCape implements LayerRenderer f1 += 25.0F; } - GL46.glRotatef(6.0F + f2 / 2.0F + f1, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(f3 / 2.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(-f3 / 2.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(6.0F + f2 / 2.0F + f1, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(f3 / 2.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(-f3 / 2.0F, 0.0F, 1.0F, 0.0F); } else { - GL46.glRotatef(entitylivingbaseIn.isSneakingVisually() ? 25.0F : 5.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(entitylivingbaseIn.isSneakingVisually() ? 25.0F : 5.0F, 1.0F, 0.0F, 0.0F); } - GL46.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(180.0F, 0.0F, 1.0F, 0.0F); this.bipedCape.rotationPointY = this.shift + (entitylivingbaseIn.isSneakingVisually() ? 2.0f : 0.0f); this.bipedCape.render(0.0625F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } diff --git a/client/src/main/java/client/renderer/layers/LayerCharge.java b/client/src/main/java/client/renderer/layers/LayerCharge.java index b1817682..acb33ddb 100755 --- a/client/src/main/java/client/renderer/layers/LayerCharge.java +++ b/client/src/main/java/client/renderer/layers/LayerCharge.java @@ -1,6 +1,6 @@ package client.renderer.layers; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.entity.RenderHumanoid; @@ -27,23 +27,23 @@ public class LayerCharge implements LayerRenderer // boolean flag = entitylivingbaseIn.isInvisible(); GlState.depthMask(true); this.main.bindTexture(LIGHTNING_TEXTURE); - GL46.glMatrixMode(GL46.GL_TEXTURE); - GL46.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_TEXTURE); + GL15.glLoadIdentity(); float f = (float)entitylivingbaseIn.ticksExisted + partialTicks; - GL46.glTranslatef(f * 0.01F, f * 0.01F, 0.0F); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + GL15.glTranslatef(f * 0.01F, f * 0.01F, 0.0F); + GL15.glMatrixMode(GL15.GL_MODELVIEW); GlState.enableBlend(); float f1 = 0.5F; GlState.color(f1, f1, f1, 1.0F); GlState.disableLighting(); - GlState.blendFunc(GL46.GL_ONE, GL46.GL_ONE); + GlState.blendFunc(GL15.GL_ONE, GL15.GL_ONE); this.charge.setModelAttributes(this.main.getMainModel()); - GL46.glScalef(entitylivingbaseIn.height, entitylivingbaseIn.height, entitylivingbaseIn.height); - GL46.glTranslatef(0.0f, -0.25f, 0.0f); + GL15.glScalef(entitylivingbaseIn.height, entitylivingbaseIn.height, entitylivingbaseIn.height); + GL15.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); - GL46.glMatrixMode(GL46.GL_TEXTURE); - GL46.glLoadIdentity(); - GL46.glMatrixMode(GL46.GL_MODELVIEW); + GL15.glMatrixMode(GL15.GL_TEXTURE); + GL15.glLoadIdentity(); + GL15.glMatrixMode(GL15.GL_MODELVIEW); GlState.enableLighting(); GlState.disableBlend(); GlState.depthMask(false); diff --git a/client/src/main/java/client/renderer/layers/LayerEntityBreak.java b/client/src/main/java/client/renderer/layers/LayerEntityBreak.java index b215b571..6459ad9e 100755 --- a/client/src/main/java/client/renderer/layers/LayerEntityBreak.java +++ b/client/src/main/java/client/renderer/layers/LayerEntityBreak.java @@ -1,6 +1,6 @@ package client.renderer.layers; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.GlState; @@ -29,26 +29,26 @@ public class LayerEntityBreak implements LayerRenderer Random random = new Random(432L); GlState.disableTexture2D(); - GlState.shadeModel(GL46.GL_SMOOTH); + GlState.shadeModel(GL15.GL_SMOOTH); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_ONE); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.GL_ONE); GlState.disableAlpha(); GlState.enableCull(); GlState.depthMask(false); - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, -1.0F, -2.0F); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, -1.0F, -2.0F); for (int i = 0; (float)i < (f + f * f) / 2.0F * 60.0F; ++i) { - GL46.glRotatef(random.floatv() * 360.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(random.floatv() * 360.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(random.floatv() * 360.0F, 0.0F, 0.0F, 1.0F); - GL46.glRotatef(random.floatv() * 360.0F, 1.0F, 0.0F, 0.0F); - GL46.glRotatef(random.floatv() * 360.0F, 0.0F, 1.0F, 0.0F); - GL46.glRotatef(random.floatv() * 360.0F + f * 90.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(random.floatv() * 360.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(random.floatv() * 360.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(random.floatv() * 360.0F, 0.0F, 0.0F, 1.0F); + GL15.glRotatef(random.floatv() * 360.0F, 1.0F, 0.0F, 0.0F); + GL15.glRotatef(random.floatv() * 360.0F, 0.0F, 1.0F, 0.0F); + GL15.glRotatef(random.floatv() * 360.0F + f * 90.0F, 0.0F, 0.0F, 1.0F); float f2 = random.floatv() * 20.0F + 5.0F + f1 * 10.0F; float f3 = random.floatv() * 2.0F + 1.0F + f1 * 2.0F; - worldrenderer.begin(GL46.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); + worldrenderer.begin(GL15.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR); worldrenderer.pos(0.0D, 0.0D, 0.0D).color(255, 255, 255, (int)(255.0F * (1.0F - f1))).endVertex(); worldrenderer.pos(-0.866D * (double)f3, (double)f2, (double)(-0.5F * f3)).color(255, 0, 255, 0).endVertex(); worldrenderer.pos(0.866D * (double)f3, (double)f2, (double)(-0.5F * f3)).color(255, 0, 255, 0).endVertex(); @@ -57,11 +57,11 @@ public class LayerEntityBreak implements LayerRenderer Tessellator.draw(); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.depthMask(true); GlState.disableCull(); GlState.disableBlend(); - GlState.shadeModel(GL46.GL_FLAT); + GlState.shadeModel(GL15.GL_FLAT); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.enableTexture2D(); GlState.enableAlpha(); diff --git a/client/src/main/java/client/renderer/layers/LayerExtra.java b/client/src/main/java/client/renderer/layers/LayerExtra.java index bba0db0f..f0bc641c 100755 --- a/client/src/main/java/client/renderer/layers/LayerExtra.java +++ b/client/src/main/java/client/renderer/layers/LayerExtra.java @@ -2,7 +2,7 @@ package client.renderer.layers; import java.util.List; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.GlState; @@ -62,11 +62,11 @@ public class LayerExtra implements LayerRenderer // { GlState.color(1.0F, 1.0F, 1.0F, 1.0F); Client.CLIENT.getTextureManager().bindTexture(EntityTexManager.getSkin(entity)); - GL46.glPushMatrix(); + GL15.glPushMatrix(); if (entity.isSneakingVisually()) { - GL46.glTranslatef(0.0F, 0.2F, 0.0F); + GL15.glTranslatef(0.0F, 0.2F, 0.0F); } // if (entity.isChild()) @@ -77,20 +77,20 @@ public class LayerExtra implements LayerRenderer // SKC.glTranslatef(0.0F, 24.0F * scale, 0.0F); // } - GL46.glPushMatrix(); + GL15.glPushMatrix(); this.model.bipedBody.postRender(0.0625F); for(ModelRenderer model : this.wing) { if(entity.hasDualWings()) { - GL46.glPushMatrix(); - GL46.glRotatef(model.rotateAngleY < 0.0f ? -10.0f : 10.0f, 0.0f, 1.0f, 0.0f); - GL46.glTranslatef(0.0f, 0.125f, -0.0625f); + GL15.glPushMatrix(); + GL15.glRotatef(model.rotateAngleY < 0.0f ? -10.0f : 10.0f, 0.0f, 1.0f, 0.0f); + GL15.glTranslatef(0.0f, 0.125f, -0.0625f); model.render(0.0625F); - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glRotatef(model.rotateAngleY < 0.0f ? 10.0f : -10.0f, 0.0f, 1.0f, 0.0f); - GL46.glTranslatef(model.rotateAngleY < 0.0f ? 0.0625f : -0.0625f, -0.125f, 0.0f); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glRotatef(model.rotateAngleY < 0.0f ? 10.0f : -10.0f, 0.0f, 1.0f, 0.0f); + GL15.glTranslatef(model.rotateAngleY < 0.0f ? 0.0625f : -0.0625f, -0.125f, 0.0f); model.render(0.0625F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { model.render(0.0625F); @@ -99,35 +99,35 @@ public class LayerExtra implements LayerRenderer for(ModelRenderer model : this.body) { model.render(0.0625F); } - GL46.glPopMatrix(); - GL46.glPushMatrix(); + GL15.glPopMatrix(); + GL15.glPushMatrix(); this.model.bipedLeftArm.postRender(0.0625F); this.model.slimLeftArm.postRender(0.0625F, -1.0f, 0.0f, 0.0f); for(ModelRenderer model : this.larm) { model.render(0.0625F); } - GL46.glPopMatrix(); - GL46.glPushMatrix(); + GL15.glPopMatrix(); + GL15.glPushMatrix(); this.model.bipedRightArm.postRender(0.0625F); this.model.slimRightArm.postRender(0.0625F, 1.0f, 0.0f, 0.0f); for(ModelRenderer model : this.rarm) { model.render(0.0625F); } - GL46.glPopMatrix(); - GL46.glPushMatrix(); + GL15.glPopMatrix(); + GL15.glPushMatrix(); this.model.bipedHead.postRender(0.0625F); for(ModelRenderer model : this.head) { model.render(0.0625F); } for(ModelRenderer model : this.halo) { - GL46.glPushMatrix(); - GL46.glRotatef((float)(entity.ticksExisted % (360 * 4)) * 0.25f, 0.0f, 1.0f, 0.0f); + GL15.glPushMatrix(); + GL15.glRotatef((float)(entity.ticksExisted % (360 * 4)) * 0.25f, 0.0f, 1.0f, 0.0f); model.render(0.0625F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } - GL46.glPopMatrix(); + GL15.glPopMatrix(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); // } } diff --git a/client/src/main/java/client/renderer/layers/LayerHeldItem.java b/client/src/main/java/client/renderer/layers/LayerHeldItem.java index 8f74a2f2..349a0236 100755 --- a/client/src/main/java/client/renderer/layers/LayerHeldItem.java +++ b/client/src/main/java/client/renderer/layers/LayerHeldItem.java @@ -1,6 +1,6 @@ package client.renderer.layers; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.entity.RendererLivingEntity; @@ -29,7 +29,7 @@ public class LayerHeldItem implements LayerRenderer if (itemstack != null && itemstack.getItem().getWieldType() != null) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); // if (this.livingEntityRenderer.getMainModel().isChild) // { @@ -42,7 +42,7 @@ public class LayerHeldItem implements LayerRenderer // } ((ModelBiped)this.livingEntityRenderer.getMainModel()).postRenderArm(0.0625F); - GL46.glTranslatef(this.xshift, this.yshift, 0.0625F); + GL15.glTranslatef(this.xshift, this.yshift, 0.0625F); if (entitylivingbaseIn.isPlayer() && ((EntityNPC)entitylivingbaseIn).fishEntity != null) { @@ -54,11 +54,11 @@ public class LayerHeldItem implements LayerRenderer if (entitylivingbaseIn.isSneakingVisually()) { - GL46.glTranslatef(0.0F, 0.203125F, 0.0F); + GL15.glTranslatef(0.0F, 0.203125F, 0.0F); } gm.getItemRenderer().renderItem(entitylivingbaseIn, itemstack, true); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } diff --git a/client/src/main/java/client/renderer/layers/LayerSlimeGel.java b/client/src/main/java/client/renderer/layers/LayerSlimeGel.java index 9eabf740..fa267614 100755 --- a/client/src/main/java/client/renderer/layers/LayerSlimeGel.java +++ b/client/src/main/java/client/renderer/layers/LayerSlimeGel.java @@ -1,6 +1,6 @@ package client.renderer.layers; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.renderer.entity.RenderSlime; @@ -25,7 +25,7 @@ public class LayerSlimeGel implements LayerRenderer GlState.color(1.0F, 1.0F, 1.0F, 1.0F); GlState.enableNormalize(); GlState.enableBlend(); - GlState.blendFunc(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA); + GlState.blendFunc(GL15.GL_SRC_ALPHA, GL15.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/client/src/main/java/client/renderer/model/ModelArachnoid.java b/client/src/main/java/client/renderer/model/ModelArachnoid.java index 3df1e63a..282a2b81 100755 --- a/client/src/main/java/client/renderer/model/ModelArachnoid.java +++ b/client/src/main/java/client/renderer/model/ModelArachnoid.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.util.ExtMath; @@ -96,14 +96,14 @@ public class ModelArachnoid extends ModelHumanoid { this.isSneak = false; // this.setVisible(true); - GL46.glPushMatrix(); - GL46.glTranslatef(0.0f, 3.0f / 16.0f, 0.0f); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0f, 3.0f / 16.0f, 0.0f); super.render(entityIn, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); // this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, scale, entityIn); // this.spiderHead.render(scale); // this.spiderNeck.render(scale); - GL46.glPushMatrix(); + GL15.glPushMatrix(); // if (this.isChild) // { // float f = 2.0F; @@ -123,7 +123,7 @@ public class ModelArachnoid extends ModelHumanoid this.spiderLeg6.render(scale); this.spiderLeg7.render(scale); this.spiderLeg8.render(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } /** diff --git a/client/src/main/java/client/renderer/model/ModelBiped.java b/client/src/main/java/client/renderer/model/ModelBiped.java index 3ec9e886..d17e707d 100755 --- a/client/src/main/java/client/renderer/model/ModelBiped.java +++ b/client/src/main/java/client/renderer/model/ModelBiped.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.entity.types.EntityLiving; @@ -61,7 +61,7 @@ public abstract class ModelBiped extends ModelBase public void render(Entity entityIn, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float scale) { this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, scale, entityIn); - GL46.glPushMatrix(); + GL15.glPushMatrix(); // if (this.isChild) // { @@ -89,7 +89,7 @@ public abstract class ModelBiped extends ModelBase // { if (this.isSneak) // entityIn.isSneaking()) { - GL46.glTranslatef(0.0F, 0.2F, 0.0F); + GL15.glTranslatef(0.0F, 0.2F, 0.0F); } this.bipedHead.render(scale); @@ -102,7 +102,7 @@ public abstract class ModelBiped extends ModelBase this.bipedHeadwear.render(scale); // } - GL46.glPopMatrix(); + GL15.glPopMatrix(); } /** diff --git a/client/src/main/java/client/renderer/model/ModelCat.java b/client/src/main/java/client/renderer/model/ModelCat.java index 68b558e1..93c39ba8 100755 --- a/client/src/main/java/client/renderer/model/ModelCat.java +++ b/client/src/main/java/client/renderer/model/ModelCat.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.entity.animal.EntityCat; @@ -65,14 +65,14 @@ public class ModelCat extends ModelBase if (this.isChild) { float f = 2.0F; - GL46.glPushMatrix(); - GL46.glScalef(1.5F / f, 1.5F / f, 1.5F / f); - GL46.glTranslatef(0.0F, 10.0F * scale, 4.0F * scale); + GL15.glPushMatrix(); + GL15.glScalef(1.5F / f, 1.5F / f, 1.5F / f); + GL15.glTranslatef(0.0F, 10.0F * scale, 4.0F * scale); this.head.render(scale); - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glScalef(1.0F / f, 1.0F / f, 1.0F / f); - GL46.glTranslatef(0.0F, 24.0F * scale, 0.0F); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glScalef(1.0F / f, 1.0F / f, 1.0F / f); + GL15.glTranslatef(0.0F, 24.0F * scale, 0.0F); this.body.render(scale); this.backLeftLeg.render(scale); this.backRightLeg.render(scale); @@ -80,7 +80,7 @@ public class ModelCat extends ModelBase this.frontRightLeg.render(scale); this.tail.render(scale); this.tail2.render(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { diff --git a/client/src/main/java/client/renderer/model/ModelChicken.java b/client/src/main/java/client/renderer/model/ModelChicken.java index 6e491ee6..c100115d 100755 --- a/client/src/main/java/client/renderer/model/ModelChicken.java +++ b/client/src/main/java/client/renderer/model/ModelChicken.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.util.ExtMath; @@ -55,21 +55,21 @@ public class ModelChicken extends ModelBase if (this.isChild) { float f = 2.0F; - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, 5.0F * scale, 2.0F * scale); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, 5.0F * scale, 2.0F * scale); this.head.render(scale); this.bill.render(scale); this.chin.render(scale); - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glScalef(1.0F / f, 1.0F / f, 1.0F / f); - GL46.glTranslatef(0.0F, 24.0F * scale, 0.0F); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glScalef(1.0F / f, 1.0F / f, 1.0F / f); + GL15.glTranslatef(0.0F, 24.0F * scale, 0.0F); this.body.render(scale); this.rightLeg.render(scale); this.leftLeg.render(scale); this.rightWing.render(scale); this.leftWing.render(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { diff --git a/client/src/main/java/client/renderer/model/ModelCrystal.java b/client/src/main/java/client/renderer/model/ModelCrystal.java index a91532e1..e05957bc 100755 --- a/client/src/main/java/client/renderer/model/ModelCrystal.java +++ b/client/src/main/java/client/renderer/model/ModelCrystal.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; @@ -33,28 +33,28 @@ public class ModelCrystal extends ModelBase */ public void render(Entity entityIn, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float scale) { - GL46.glPushMatrix(); - GL46.glScalef(2.0F, 2.0F, 2.0F); - GL46.glTranslatef(0.0F, -0.5F, 0.0F); + GL15.glPushMatrix(); + GL15.glScalef(2.0F, 2.0F, 2.0F); + GL15.glTranslatef(0.0F, -0.5F, 0.0F); if (this.base != null) { this.base.render(scale); } - GL46.glRotatef(p_78088_3_, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(0.0F, 0.8F + p_78088_4_, 0.0F); - GL46.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); + GL15.glRotatef(p_78088_3_, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.0F, 0.8F + p_78088_4_, 0.0F); + GL15.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); this.glass.render(scale); float f = 0.875F; - GL46.glScalef(f, f, f); - GL46.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); - GL46.glRotatef(p_78088_3_, 0.0F, 1.0F, 0.0F); + GL15.glScalef(f, f, f); + GL15.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); + GL15.glRotatef(p_78088_3_, 0.0F, 1.0F, 0.0F); this.glass.render(scale); - GL46.glScalef(f, f, f); - GL46.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); - GL46.glRotatef(p_78088_3_, 0.0F, 1.0F, 0.0F); + GL15.glScalef(f, f, f); + GL15.glRotatef(60.0F, 0.7071F, 0.0F, 0.7071F); + GL15.glRotatef(p_78088_3_, 0.0F, 1.0F, 0.0F); this.cube.render(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } diff --git a/client/src/main/java/client/renderer/model/ModelDragon.java b/client/src/main/java/client/renderer/model/ModelDragon.java index f8db379c..a4e456d9 100755 --- a/client/src/main/java/client/renderer/model/ModelDragon.java +++ b/client/src/main/java/client/renderer/model/ModelDragon.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import common.entity.Entity; @@ -139,17 +139,17 @@ public class ModelDragon extends ModelBase */ public void render(Entity entityIn, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float scale) { - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, 0.5F, 0.0F); - GL46.glScalef(0.35f, 0.35f, 0.35f); - GL46.glPushMatrix(); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, 0.5F, 0.0F); + GL15.glScalef(0.35f, 0.35f, 0.35f); + GL15.glPushMatrix(); EntityDragon entitydragon = (EntityDragon)entityIn; float f = entitydragon.prevAnimTime + (entitydragon.animTime - entitydragon.prevAnimTime) * this.partialTicks; this.jaw.rotateAngleX = (float)(Math.sin((double)(f * (float)Math.PI * 2.0F)) + 1.0D) * 0.2F; float f1 = (float)(Math.sin((double)(f * (float)Math.PI * 2.0F - 1.0F)) + 1.0D); f1 = (f1 * f1 * 1.0F + f1 * 2.0F) * 0.05F; - GL46.glTranslatef(0.0F, f1 - 2.0F, -3.0F); - GL46.glRotatef(f1 * 2.0F, 1.0F, 0.0F, 0.0F); + GL15.glTranslatef(0.0F, f1 - 2.0F, -3.0F); + GL15.glRotatef(f1 * 2.0F, 1.0F, 0.0F, 0.0F); float f2 = -30.0F; float f4 = 0.0F; float f5 = 1.5F; @@ -181,10 +181,10 @@ public class ModelDragon extends ModelBase this.head.rotateAngleY = 0.0f * (float)Math.PI / 180.0F * 1.0F; this.head.rotateAngleZ = -this.updateRotations(p_78088_5_ - (double)f7) * (float)Math.PI / 180.0F * 1.0F; this.head.render(scale); - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, 1.0F, 0.0F); - GL46.glRotatef(-f6 * f5 * 1.0F, 0.0F, 0.0F, 1.0F); - GL46.glTranslatef(0.0F, -1.0F, 0.0F); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, 1.0F, 0.0F); + GL15.glRotatef(-f6 * f5 * 1.0F, 0.0F, 0.0F, 1.0F); + GL15.glTranslatef(0.0F, -1.0F, 0.0F); this.body.rotateAngleZ = 0.0F; this.body.render(scale); @@ -205,16 +205,16 @@ public class ModelDragon extends ModelBase this.wing.render(scale); this.frontLeg.render(scale); this.rearLeg.render(scale); - GL46.glScalef(-1.0F, 1.0F, 1.0F); + GL15.glScalef(-1.0F, 1.0F, 1.0F); if (j == 0) { - GlState.cullFace(GL46.GL_FRONT); + GlState.cullFace(GL15.GL_FRONT); } } - GL46.glPopMatrix(); - GlState.cullFace(GL46.GL_BACK); + GL15.glPopMatrix(); + GlState.cullFace(GL15.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; @@ -237,8 +237,8 @@ public class ModelDragon extends ModelBase this.spine.render(scale); } - GL46.glPopMatrix(); - GL46.glPopMatrix(); + GL15.glPopMatrix(); + GL15.glPopMatrix(); } /** diff --git a/client/src/main/java/client/renderer/model/ModelFox.java b/client/src/main/java/client/renderer/model/ModelFox.java index e404cbf8..448a47ba 100644 --- a/client/src/main/java/client/renderer/model/ModelFox.java +++ b/client/src/main/java/client/renderer/model/ModelFox.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.util.ExtMath; @@ -54,20 +54,20 @@ public class ModelFox extends ModelBase if (this.isChild) { float f = 2.0F; - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, 3.5F * scale, 2.0F * scale); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, 3.5F * scale, 2.0F * scale); this.head.renderWithRotation(scale); - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glScalef(1.0F / f, 1.0F / f, 1.0F / f); - GL46.glTranslatef(0.0F, 24.0F * scale, 0.0F); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glScalef(1.0F / f, 1.0F / f, 1.0F / f); + GL15.glTranslatef(0.0F, 24.0F * scale, 0.0F); this.body.render(scale); this.wolfLeg1.render(scale); this.wolfLeg2.render(scale); this.wolfLeg3.render(scale); this.wolfLeg4.render(scale); this.tail.renderWithRotation(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { diff --git a/client/src/main/java/client/renderer/model/ModelHorse.java b/client/src/main/java/client/renderer/model/ModelHorse.java index 6c3679f6..5119cdb5 100755 --- a/client/src/main/java/client/renderer/model/ModelHorse.java +++ b/client/src/main/java/client/renderer/model/ModelHorse.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.entity.animal.EntityHorse; @@ -242,9 +242,9 @@ public class ModelHorse extends ModelBase if (!flag) { - GL46.glPushMatrix(); - GL46.glScalef(f1, 0.5F + f1 * 0.5F, f1); - GL46.glTranslatef(0.0F, 0.95F * (1.0F - f1), 0.0F); + GL15.glPushMatrix(); + GL15.glScalef(f1, 0.5F + f1 * 0.5F, f1); + GL15.glTranslatef(0.0F, 0.95F * (1.0F - f1), 0.0F); } this.backLeftLeg.render(scale); @@ -262,10 +262,10 @@ public class ModelHorse extends ModelBase if (!flag) { - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glScalef(f1, f1, f1); - GL46.glTranslatef(0.0F, 1.35F * (1.0F - f1), 0.0F); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glScalef(f1, f1, f1); + GL15.glTranslatef(0.0F, 1.35F * (1.0F - f1), 0.0F); } this.body.render(scale); @@ -277,18 +277,18 @@ public class ModelHorse extends ModelBase if (!flag) { - GL46.glPopMatrix(); - GL46.glPushMatrix(); + GL15.glPopMatrix(); + GL15.glPushMatrix(); float f2 = 0.5F + f1 * f1 * 0.5F; - GL46.glScalef(f2, f2, f2); + GL15.glScalef(f2, f2, f2); if (f <= 0.0F) { - GL46.glTranslatef(0.0F, 1.35F * (1.0F - f1), 0.0F); + GL15.glTranslatef(0.0F, 1.35F * (1.0F - f1), 0.0F); } else { - GL46.glTranslatef(0.0F, 0.9F * (1.0F - f1) * f + 1.35F * (1.0F - f1) * (1.0F - f), 0.15F * (1.0F - f1) * f); + GL15.glTranslatef(0.0F, 0.9F * (1.0F - f1) * f + 1.35F * (1.0F - f1) * (1.0F - f), 0.15F * (1.0F - f1) * f); } } @@ -307,7 +307,7 @@ public class ModelHorse extends ModelBase if (!flag) { - GL46.glPopMatrix(); + GL15.glPopMatrix(); } if (flag2) diff --git a/client/src/main/java/client/renderer/model/ModelHumanoid.java b/client/src/main/java/client/renderer/model/ModelHumanoid.java index d77a54ce..2cc2fdff 100755 --- a/client/src/main/java/client/renderer/model/ModelHumanoid.java +++ b/client/src/main/java/client/renderer/model/ModelHumanoid.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.util.ExtMath; @@ -150,7 +150,7 @@ public class ModelHumanoid extends ModelBiped public void render(Entity entityIn, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float scale) { super.render(entityIn, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, scale); - GL46.glPushMatrix(); + GL15.glPushMatrix(); // if (this.isChild) // { @@ -171,7 +171,7 @@ public class ModelHumanoid extends ModelBiped // { if (this.isSneak) // entityIn.isSneaking()) { - GL46.glTranslatef(0.0F, 0.2F, 0.0F); + GL15.glTranslatef(0.0F, 0.2F, 0.0F); // } } @@ -188,7 +188,7 @@ public class ModelHumanoid extends ModelBiped // if(this.sticks) { // } - GL46.glPopMatrix(); + GL15.glPopMatrix(); } // public void renderCape(float scale) diff --git a/client/src/main/java/client/renderer/model/ModelMouse.java b/client/src/main/java/client/renderer/model/ModelMouse.java index ec2d8637..f64d22e9 100755 --- a/client/src/main/java/client/renderer/model/ModelMouse.java +++ b/client/src/main/java/client/renderer/model/ModelMouse.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.entity.types.EntityLiving; @@ -63,9 +63,9 @@ public class ModelMouse extends ModelBase this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, scale, entityIn); float s = this.isChild ? 0.125f : 0.25f; - GL46.glPushMatrix(); - GL46.glScalef(s, s, s); - GL46.glTranslatef(0.0f, (this.isChild ? 171.0f : 74.5f) * scale, 0.0f); + GL15.glPushMatrix(); + GL15.glScalef(s, s, s); + GL15.glTranslatef(0.0f, (this.isChild ? 171.0f : 74.5f) * scale, 0.0f); // if (this.isChild) // { // float f = 2.0F; @@ -97,7 +97,7 @@ public class ModelMouse extends ModelBase this.frontLeftLeg.render(scale); this.frontRightLeg.render(scale); // } - GL46.glPopMatrix(); + GL15.glPopMatrix(); } public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entityIn) diff --git a/client/src/main/java/client/renderer/model/ModelQuadruped.java b/client/src/main/java/client/renderer/model/ModelQuadruped.java index b2c0a620..de19f134 100755 --- a/client/src/main/java/client/renderer/model/ModelQuadruped.java +++ b/client/src/main/java/client/renderer/model/ModelQuadruped.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.util.ExtMath; @@ -47,19 +47,19 @@ public class ModelQuadruped extends ModelBase if (this.isChild) { float f = 2.0F; - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, this.childYOffset * scale, this.childZOffset * scale); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, this.childYOffset * scale, this.childZOffset * scale); this.head.render(scale); - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glScalef(1.0F / f, 1.0F / f, 1.0F / f); - GL46.glTranslatef(0.0F, 24.0F * scale, 0.0F); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glScalef(1.0F / f, 1.0F / f, 1.0F / f); + GL15.glTranslatef(0.0F, 24.0F * scale, 0.0F); this.body.render(scale); this.leg1.render(scale); this.leg2.render(scale); this.leg3.render(scale); this.leg4.render(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { diff --git a/client/src/main/java/client/renderer/model/ModelRabbit.java b/client/src/main/java/client/renderer/model/ModelRabbit.java index 5417b550..c4781838 100755 --- a/client/src/main/java/client/renderer/model/ModelRabbit.java +++ b/client/src/main/java/client/renderer/model/ModelRabbit.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.entity.animal.EntityRabbit; @@ -101,16 +101,16 @@ public class ModelRabbit extends ModelBase { if(this.isChild) { float f = 2.0F; - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, 5.0F * scale, 2.0F * scale); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, 5.0F * scale, 2.0F * scale); this.rabbitHead.render(scale); this.rabbitLeftEar.render(scale); this.rabbitRightEar.render(scale); this.rabbitNose.render(scale); - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glScalef(1.0F / f, 1.0F / f, 1.0F / f); - GL46.glTranslatef(0.0F, 24.0F * scale, 0.0F); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glScalef(1.0F / f, 1.0F / f, 1.0F / f); + GL15.glTranslatef(0.0F, 24.0F * scale, 0.0F); this.rabbitLeftFoot.render(scale); this.rabbitRightFoot.render(scale); this.rabbitLeftThigh.render(scale); @@ -119,7 +119,7 @@ public class ModelRabbit extends ModelBase { this.rabbitLeftArm.render(scale); this.rabbitRightArm.render(scale); this.rabbitTail.render(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { this.rabbitLeftFoot.render(scale); diff --git a/client/src/main/java/client/renderer/model/ModelRenderer.java b/client/src/main/java/client/renderer/model/ModelRenderer.java index 5b759f69..40707ea1 100755 --- a/client/src/main/java/client/renderer/model/ModelRenderer.java +++ b/client/src/main/java/client/renderer/model/ModelRenderer.java @@ -2,7 +2,7 @@ package client.renderer.model; import java.util.List; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.RenderBuffer; import client.renderer.Tessellator; @@ -173,13 +173,13 @@ public class ModelRenderer this.compileDisplayList(p_78785_1_); } - GL46.glTranslatef(this.offsetX, this.offsetY, this.offsetZ); + GL15.glTranslatef(this.offsetX, this.offsetY, this.offsetZ); if (this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) { if (this.rotationPointX == 0.0F && this.rotationPointY == 0.0F && this.rotationPointZ == 0.0F) { - GL46.glCallList(this.displayList); + GL15.glCallList(this.displayList); if (this.childModels != null) { @@ -191,8 +191,8 @@ public class ModelRenderer } else { - GL46.glTranslatef(this.rotationPointX * p_78785_1_, this.rotationPointY * p_78785_1_, this.rotationPointZ * p_78785_1_); - GL46.glCallList(this.displayList); + GL15.glTranslatef(this.rotationPointX * p_78785_1_, this.rotationPointY * p_78785_1_, this.rotationPointZ * p_78785_1_); + GL15.glCallList(this.displayList); if (this.childModels != null) { @@ -202,30 +202,30 @@ public class ModelRenderer } } - GL46.glTranslatef(-this.rotationPointX * p_78785_1_, -this.rotationPointY * p_78785_1_, -this.rotationPointZ * p_78785_1_); + GL15.glTranslatef(-this.rotationPointX * p_78785_1_, -this.rotationPointY * p_78785_1_, -this.rotationPointZ * p_78785_1_); } } else { - GL46.glPushMatrix(); - GL46.glTranslatef(this.rotationPointX * p_78785_1_, this.rotationPointY * p_78785_1_, this.rotationPointZ * p_78785_1_); + GL15.glPushMatrix(); + GL15.glTranslatef(this.rotationPointX * p_78785_1_, this.rotationPointY * p_78785_1_, this.rotationPointZ * p_78785_1_); if (this.rotateAngleZ != 0.0F) { - GL46.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + GL15.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); } if (this.rotateAngleY != 0.0F) { - GL46.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + GL15.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); } if (this.rotateAngleX != 0.0F) { - GL46.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); } - GL46.glCallList(this.displayList); + GL15.glCallList(this.displayList); if (this.childModels != null) { @@ -235,10 +235,10 @@ public class ModelRenderer } } - GL46.glPopMatrix(); + GL15.glPopMatrix(); } - GL46.glTranslatef(-this.offsetX, -this.offsetY, -this.offsetZ); + GL15.glTranslatef(-this.offsetX, -this.offsetY, -this.offsetZ); } } } @@ -254,26 +254,26 @@ public class ModelRenderer this.compileDisplayList(p_78791_1_); } - GL46.glPushMatrix(); - GL46.glTranslatef(this.rotationPointX * p_78791_1_, this.rotationPointY * p_78791_1_, this.rotationPointZ * p_78791_1_); + GL15.glPushMatrix(); + GL15.glTranslatef(this.rotationPointX * p_78791_1_, this.rotationPointY * p_78791_1_, this.rotationPointZ * p_78791_1_); if (this.rotateAngleY != 0.0F) { - GL46.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + GL15.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); } if (this.rotateAngleX != 0.0F) { - GL46.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); } if (this.rotateAngleZ != 0.0F) { - GL46.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + GL15.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); } - GL46.glCallList(this.displayList); - GL46.glPopMatrix(); + GL15.glCallList(this.displayList); + GL15.glPopMatrix(); } } } @@ -296,26 +296,26 @@ public class ModelRenderer { if (this.rotationPointX != 0.0F || this.rotationPointY != 0.0F || this.rotationPointZ != 0.0F) { - GL46.glTranslatef(this.rotationPointX * scale, this.rotationPointY * scale, this.rotationPointZ * scale); + GL15.glTranslatef(this.rotationPointX * scale, this.rotationPointY * scale, this.rotationPointZ * scale); } } else { - GL46.glTranslatef(this.rotationPointX * scale, this.rotationPointY * scale, this.rotationPointZ * scale); + GL15.glTranslatef(this.rotationPointX * scale, this.rotationPointY * scale, this.rotationPointZ * scale); if (this.rotateAngleZ != 0.0F) { - GL46.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + GL15.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); } if (this.rotateAngleY != 0.0F) { - GL46.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + GL15.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); } if (this.rotateAngleX != 0.0F) { - GL46.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); } } } @@ -337,26 +337,26 @@ public class ModelRenderer { if (this.rotationPointX + x != 0.0F || this.rotationPointY + y != 0.0F || this.rotationPointZ + z != 0.0F) { - GL46.glTranslatef((this.rotationPointX + x) * scale, (this.rotationPointY + y) * scale, (this.rotationPointZ + z) * scale); + GL15.glTranslatef((this.rotationPointX + x) * scale, (this.rotationPointY + y) * scale, (this.rotationPointZ + z) * scale); } } else { - GL46.glTranslatef((this.rotationPointX + x) * scale, (this.rotationPointY + y) * scale, (this.rotationPointZ + z) * scale); + GL15.glTranslatef((this.rotationPointX + x) * scale, (this.rotationPointY + y) * scale, (this.rotationPointZ + z) * scale); if (this.rotateAngleZ != 0.0F) { - GL46.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); + GL15.glRotatef(this.rotateAngleZ * (180F / (float)Math.PI), 0.0F, 0.0F, 1.0F); } if (this.rotateAngleY != 0.0F) { - GL46.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); + GL15.glRotatef(this.rotateAngleY * (180F / (float)Math.PI), 0.0F, 1.0F, 0.0F); } if (this.rotateAngleX != 0.0F) { - GL46.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); + GL15.glRotatef(this.rotateAngleX * (180F / (float)Math.PI), 1.0F, 0.0F, 0.0F); } } } @@ -365,8 +365,8 @@ public class ModelRenderer private void compileDisplayList(float scale) { - this.displayList = GL46.glGenLists(1); - GL46.glNewList(this.displayList, GL46.GL_COMPILE); + this.displayList = GL15.glGenLists(1); + GL15.glNewList(this.displayList, GL15.GL_COMPILE); // Tessellator.getInstance(); RenderBuffer worldrenderer = Tessellator.getBuffer(); @@ -375,13 +375,13 @@ public class ModelRenderer ((ModelBox)this.cubeList.get(i)).makeList(worldrenderer, scale); } - GL46.glEndList(); + GL15.glEndList(); this.compiled = true; } public void deleteDisplayList() { if(this.displayList != 0) - GL46.glDeleteLists(this.displayList, 1); + GL15.glDeleteLists(this.displayList, 1); this.displayList = 0; } diff --git a/client/src/main/java/client/renderer/model/ModelWolf.java b/client/src/main/java/client/renderer/model/ModelWolf.java index 571f8c19..9a601b7d 100755 --- a/client/src/main/java/client/renderer/model/ModelWolf.java +++ b/client/src/main/java/client/renderer/model/ModelWolf.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import common.entity.Entity; import common.entity.animal.EntityWolf; @@ -77,13 +77,13 @@ public class ModelWolf extends ModelBase if (this.isChild) { float f = 2.0F; - GL46.glPushMatrix(); - GL46.glTranslatef(0.0F, 5.0F * scale, 2.0F * scale); + GL15.glPushMatrix(); + GL15.glTranslatef(0.0F, 5.0F * scale, 2.0F * scale); this.wolfHeadMain.renderWithRotation(scale); - GL46.glPopMatrix(); - GL46.glPushMatrix(); - GL46.glScalef(1.0F / f, 1.0F / f, 1.0F / f); - GL46.glTranslatef(0.0F, 24.0F * scale, 0.0F); + GL15.glPopMatrix(); + GL15.glPushMatrix(); + GL15.glScalef(1.0F / f, 1.0F / f, 1.0F / f); + GL15.glTranslatef(0.0F, 24.0F * scale, 0.0F); this.wolfBody.render(scale); this.wolfLeg1.render(scale); this.wolfLeg2.render(scale); @@ -91,7 +91,7 @@ public class ModelWolf extends ModelBase this.wolfLeg4.render(scale); this.wolfTail.renderWithRotation(scale); this.wolfMane.render(scale); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } else { diff --git a/client/src/main/java/client/renderer/model/TexturedQuad.java b/client/src/main/java/client/renderer/model/TexturedQuad.java index 1585e840..7e66aba2 100755 --- a/client/src/main/java/client/renderer/model/TexturedQuad.java +++ b/client/src/main/java/client/renderer/model/TexturedQuad.java @@ -1,6 +1,6 @@ package client.renderer.model; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.DefaultVertexFormats; import client.renderer.RenderBuffer; @@ -59,7 +59,7 @@ public class TexturedQuad // ny = -ny; // nz = -nz; // } - renderer.begin(GL46.GL_QUADS, DefaultVertexFormats.OLDMODEL_POSITION_TEX_NORMAL); + renderer.begin(GL15.GL_QUADS, DefaultVertexFormats.OLDMODEL_POSITION_TEX_NORMAL); for (int i = 0; i < 4; ++i) { PositionTextureVertex vertex = this.vertices[i]; diff --git a/client/src/main/java/client/renderer/texture/Texture.java b/client/src/main/java/client/renderer/texture/Texture.java index 9496f77a..ab5674cf 100755 --- a/client/src/main/java/client/renderer/texture/Texture.java +++ b/client/src/main/java/client/renderer/texture/Texture.java @@ -2,7 +2,7 @@ package client.renderer.texture; import java.io.IOException; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; @@ -11,7 +11,7 @@ public abstract class Texture { public final int getGlTextureId() { if(this.id == -1) - this.id = GL46.glGenTextures(); + this.id = GL15.glGenTextures(); return this.id; } diff --git a/client/src/main/java/client/renderer/texture/TextureMap.java b/client/src/main/java/client/renderer/texture/TextureMap.java index 2f47664c..62816140 100755 --- a/client/src/main/java/client/renderer/texture/TextureMap.java +++ b/client/src/main/java/client/renderer/texture/TextureMap.java @@ -7,7 +7,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; +import org.lwjgl.opengl.GL30; import java.util.Map.Entry; @@ -192,7 +193,7 @@ public class TextureMap extends Texture return textureatlassprite; } - public void update() + public void update(boolean mips) { GlState.bindTexture(this.getGlTextureId()); @@ -201,7 +202,8 @@ public class TextureMap extends Texture textureatlassprite.updateAnimation(); } - GL46.glGenerateMipmap(GL46.GL_TEXTURE_2D); + if(mips) + GL30.glGenerateMipmap(GL15.GL_TEXTURE_2D); } private Sprite registerSprite(String location) diff --git a/client/src/main/java/client/renderer/texture/TextureUtil.java b/client/src/main/java/client/renderer/texture/TextureUtil.java index b84e0f42..409cda5c 100755 --- a/client/src/main/java/client/renderer/texture/TextureUtil.java +++ b/client/src/main/java/client/renderer/texture/TextureUtil.java @@ -11,7 +11,7 @@ import java.nio.IntBuffer; import javax.imageio.ImageIO; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import client.util.FileUtils; @@ -23,10 +23,10 @@ public class TextureUtil public static final int[] MISSING_DATA = MISSING.getData(); public static void setParams(boolean mips, boolean linear) { - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_MIN_FILTER, mips ? (linear ? GL46.GL_NEAREST_MIPMAP_LINEAR : GL46.GL_NEAREST_MIPMAP_NEAREST) : GL46.GL_NEAREST); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_MAG_FILTER, GL46.GL_NEAREST); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_WRAP_S, GL46.GL_REPEAT); - GL46.glTexParameteri(GL46.GL_TEXTURE_2D, GL46.GL_TEXTURE_WRAP_T, GL46.GL_REPEAT); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_MIN_FILTER, mips ? (linear ? GL15.GL_NEAREST_MIPMAP_LINEAR : GL15.GL_NEAREST_MIPMAP_NEAREST) : GL15.GL_NEAREST); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_MAG_FILTER, GL15.GL_NEAREST); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_WRAP_S, GL15.GL_REPEAT); + GL15.glTexParameteri(GL15.GL_TEXTURE_2D, GL15.GL_TEXTURE_WRAP_T, GL15.GL_REPEAT); } public static void uploadTexture(int[] data, int w, int h, int x, int y, boolean params) @@ -44,7 +44,7 @@ public class TextureUtil BUFFER.clear(); BUFFER.put(data, j, i1); BUFFER.position(0).limit(i1); - GL46.glTexSubImage2D(GL46.GL_TEXTURE_2D, 0, x, y + k, w, l, GL46.GL_BGRA, GL46.GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER); + GL15.glTexSubImage2D(GL15.GL_TEXTURE_2D, 0, x, y + k, w, l, GL15.GL_BGRA, GL15.GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER); } } @@ -67,7 +67,7 @@ public class TextureUtil BUFFER.clear(); BUFFER.put(data, 0, k1); BUFFER.position(0).limit(k1); - GL46.glTexSubImage2D(GL46.GL_TEXTURE_2D, 0, 0, i1, w, j1, GL46.GL_BGRA, GL46.GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER); + GL15.glTexSubImage2D(GL15.GL_TEXTURE_2D, 0, 0, i1, w, j1, GL15.GL_BGRA, GL15.GL_UNSIGNED_INT_8_8_8_8_REV, BUFFER); } return id; } @@ -76,7 +76,7 @@ public class TextureUtil { // GlState.deleteTexture(id); //TODO: check needed GlState.bindTexture(id); - GL46.nglTexImage2D(GL46.GL_TEXTURE_2D, 0, GL46.GL_RGBA, width, height, 0, GL46.GL_BGRA, GL46.GL_UNSIGNED_INT_8_8_8_8_REV, NULL); + GL15.nglTexImage2D(GL15.GL_TEXTURE_2D, 0, GL15.GL_RGBA, width, height, 0, GL15.GL_BGRA, GL15.GL_UNSIGNED_INT_8_8_8_8_REV, NULL); } public static int[] readImageData(String loc) throws IOException diff --git a/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java b/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java index 3e8a46ff..2f92b111 100644 --- a/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/DisplayRenderer.java @@ -3,7 +3,7 @@ package client.renderer.tileentity; import java.util.Iterator; import java.util.Map; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.Drawing; @@ -92,18 +92,18 @@ public class DisplayRenderer extends ElementRenderer { else if(dir == Facing.EAST) rot = -90.0F; - GL46.glPushMatrix(); - GL46.glTranslatef((float)x + 0.5F, (float)y + 1.0f, (float)z + 0.5F); - GL46.glRotatef(-rot, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(-0.5F, 0.0f, -0.5f + 0.0625f + 0.005f); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x + 0.5F, (float)y + 1.0f, (float)z + 0.5F); + GL15.glRotatef(-rot, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(-0.5F, 0.0f, -0.5f + 0.0625f + 0.005f); float density = 1.0f / (float)(te.density / 16); - GL46.glScalef(0.0625f * density, -0.0625f * density, 0.0625f * density); + GL15.glScalef(0.0625f * density, -0.0625f * density, 0.0625f * density); GlState.disableLighting(); Drawing.drawTexturedRect(Client.CLIENT, getTexture(te), te.density, te.density, 0, 0, 0, 0, te.density, te.density); GlState.enableLighting(); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } diff --git a/client/src/main/java/client/renderer/tileentity/ItemPipeRenderer.java b/client/src/main/java/client/renderer/tileentity/ItemPipeRenderer.java index 38b9e993..d59d50b3 100644 --- a/client/src/main/java/client/renderer/tileentity/ItemPipeRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/ItemPipeRenderer.java @@ -1,6 +1,6 @@ package client.renderer.tileentity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.Client; import client.renderer.GlState; @@ -17,17 +17,17 @@ public class ItemPipeRenderer extends ElementRenderer { return; Client.CLIENT.getTextureManager().bindTexture(TextureMap.BLOCKS); GlState.enableRescaleNormal(); - GlState.alphaFunc(GL46.GL_GREATER, 0.1F); + GlState.alphaFunc(GL15.GL_GREATER, 0.1F); GlState.enableBlend(); - GlState.tryBlendFuncSeparate(GL46.GL_SRC_ALPHA, GL46.GL_ONE_MINUS_SRC_ALPHA, GL46.GL_ONE, GL46.GL_ZERO); + GlState.tryBlendFuncSeparate(GL15.GL_SRC_ALPHA, GL15.GL_ONE_MINUS_SRC_ALPHA, GL15.GL_ONE, GL15.GL_ZERO); RenderItem itemRenderer = Client.CLIENT.getRenderItem(); IBakedModel ibakedmodel = itemRenderer.getItemModelMesher().getItemModel(itemstack); - GL46.glPushMatrix(); - GL46.glTranslatef((float)x + 0.5F, (float)y + 0.5f, (float)z + 0.5F); + GL15.glPushMatrix(); + GL15.glTranslatef((float)x + 0.5F, (float)y + 0.5f, (float)z + 0.5F); if(ibakedmodel.isGui3d()) - GL46.glScalef(0.5F, 0.5F, 0.5F); + GL15.glScalef(0.5F, 0.5F, 0.5F); itemRenderer.renderItem(itemstack, ibakedmodel); - GL46.glPopMatrix(); + GL15.glPopMatrix(); GlState.disableRescaleNormal(); GlState.disableBlend(); } diff --git a/client/src/main/java/client/renderer/tileentity/SignRenderer.java b/client/src/main/java/client/renderer/tileentity/SignRenderer.java index 969183be..4fcf0876 100755 --- a/client/src/main/java/client/renderer/tileentity/SignRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/SignRenderer.java @@ -1,6 +1,6 @@ package client.renderer.tileentity; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.Drawing; import client.renderer.GlState; @@ -14,13 +14,13 @@ public class SignRenderer extends ElementRenderer { public void renderElements(TileEntitySign te, double x, double y, double z, float partialTicks) { - GL46.glPushMatrix(); + GL15.glPushMatrix(); float f = 0.6666667F; State state = te.getState(); if (state.getBlock() instanceof BlockStandingSign) { - GL46.glTranslatef((float)x + 0.5F, (float)y + 0.75F * f, (float)z + 0.5F); + GL15.glTranslatef((float)x + 0.5F, (float)y + 0.75F * f, (float)z + 0.5F); int r = state.getValue(BlockStandingSign.FACING).getIndex(); float f1 = 0.0F; @@ -38,8 +38,8 @@ public class SignRenderer extends ElementRenderer { f1 = -90.0F; } - GL46.glRotatef(-f1, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(0.0F, f * -0.0625f * 2.0f, 0.0F); + GL15.glRotatef(-f1, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.0F, f * -0.0625f * 2.0f, 0.0F); } else { @@ -61,16 +61,16 @@ public class SignRenderer extends ElementRenderer f2 = -90.0F; } - GL46.glTranslatef((float)x + 0.5F, (float)y + 0.75F * f, (float)z + 0.5F); - GL46.glRotatef(-f2, 0.0F, 1.0F, 0.0F); - GL46.glTranslatef(0.0F, -0.3125F - f * 0.0625f * 0.5f, -0.4375F); + GL15.glTranslatef((float)x + 0.5F, (float)y + 0.75F * f, (float)z + 0.5F); + GL15.glRotatef(-f2, 0.0F, 1.0F, 0.0F); + GL15.glTranslatef(0.0F, -0.3125F - f * 0.0625f * 0.5f, -0.4375F); } GlState.enableRescaleNormal(); float f3 = 0.015625F * f; - GL46.glTranslatef(0.0F, 0.5F * f, 0.1F * f); - GL46.glScalef(f3, -f3, f3); - GL46.glNormal3f(0.0F, 0.0F, -1.0F * f3); + GL15.glTranslatef(0.0F, 0.5F * f, 0.1F * f); + GL15.glScalef(f3, -f3, f3); + GL15.glNormal3f(0.0F, 0.0F, -1.0F * f3); GlState.depthMask(false); for (int j = 0; j < te.text.length; ++j) @@ -78,15 +78,15 @@ public class SignRenderer extends ElementRenderer if (te.text[j] != null && !te.text[j].isEmpty()) { String s = te.text[j].length() > 50 ? te.text[j].substring(0, 50) : te.text[j]; - GL46.glPushMatrix(); - GL46.glScalef(0.75f, 0.75f, 0.75f); + GL15.glPushMatrix(); + GL15.glScalef(0.75f, 0.75f, 0.75f); Drawing.drawTextCenteredN(s, 0, j * (18 - 3) - 30, 0xff000000); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } GlState.depthMask(true); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); - GL46.glPopMatrix(); + GL15.glPopMatrix(); } } diff --git a/client/src/main/java/client/renderer/tileentity/SpecialRenderer.java b/client/src/main/java/client/renderer/tileentity/SpecialRenderer.java index c55f163e..034419b3 100755 --- a/client/src/main/java/client/renderer/tileentity/SpecialRenderer.java +++ b/client/src/main/java/client/renderer/tileentity/SpecialRenderer.java @@ -2,7 +2,7 @@ package client.renderer.tileentity; import java.util.Map; -import org.lwjgl.opengl.GL46; +import org.lwjgl.opengl.GL15; import client.renderer.GlState; import common.collect.Maps; @@ -58,7 +58,7 @@ public class SpecialRenderer { int light = this.world.getCombinedBrightness(tile.getPos()); int block = light % 65536; int sky = light / 65536; - GL46.glMultiTexCoord2f(GL46.GL_TEXTURE1, (float)block / 1.0F, (float)sky / 1.0F); + GL15.glMultiTexCoord2f(GL15.GL_TEXTURE1, (float)block / 1.0F, (float)sky / 1.0F); GlState.color(1.0F, 1.0F, 1.0F, 1.0F); BlockPos pos = tile.getPos(); this.render(tile, (double)pos.getX() - entityX, (double)pos.getY() - entityY, (double)pos.getZ() - entityZ, partial); diff --git a/common/src/main/java/common/block/Block.java b/common/src/main/java/common/block/Block.java index 2b86cf9d..883ce754 100755 --- a/common/src/main/java/common/block/Block.java +++ b/common/src/main/java/common/block/Block.java @@ -1080,11 +1080,6 @@ public class Block { return provider.getModel(name).add().all(); } - @Clientside - public float getShinyness() { - return 1.0f; - } - @Clientside public GuiPosition getItemPosition() { return GuiPosition.NORMAL; diff --git a/common/src/main/java/common/block/artificial/BlockGlass.java b/common/src/main/java/common/block/artificial/BlockGlass.java index 3cbd7a20..53a3d70d 100755 --- a/common/src/main/java/common/block/artificial/BlockGlass.java +++ b/common/src/main/java/common/block/artificial/BlockGlass.java @@ -46,9 +46,4 @@ public class BlockGlass extends Block { world.destroyBlock(pos, true); return false; } - - @Clientside - public float getShinyness() { - return 16.0f; - } } diff --git a/common/src/main/java/common/block/artificial/BlockMetalBlock.java b/common/src/main/java/common/block/artificial/BlockMetalBlock.java index 96fa6dde..e941ac56 100644 --- a/common/src/main/java/common/block/artificial/BlockMetalBlock.java +++ b/common/src/main/java/common/block/artificial/BlockMetalBlock.java @@ -51,9 +51,4 @@ public class BlockMetalBlock extends Block { if(this.metal.radioactivity > 0.0f) map.put(Attribute.RADIATION, this.metal.radioactivity * 4.0f * 9.0f); } - - @Clientside - public float getShinyness() { - return 32.0f; - } } diff --git a/common/src/main/java/common/block/artificial/BlockPane.java b/common/src/main/java/common/block/artificial/BlockPane.java index d7e1a5a9..1ec347a9 100755 --- a/common/src/main/java/common/block/artificial/BlockPane.java +++ b/common/src/main/java/common/block/artificial/BlockPane.java @@ -205,11 +205,6 @@ public class BlockPane extends Block return this.material == Material.SOLID ? "iron_bars" : "glass_pane"; } - @Clientside - public float getShinyness() { - return this.material == Material.SOLID ? 4.0f : 16.0f; - } - public Model getModel(ModelProvider provider, String name, State state) { boolean n = state.getValue(NORTH); boolean s = state.getValue(SOUTH); diff --git a/common/src/main/java/common/block/liquid/BlockLiquid.java b/common/src/main/java/common/block/liquid/BlockLiquid.java index 9e033c60..d7222d24 100755 --- a/common/src/main/java/common/block/liquid/BlockLiquid.java +++ b/common/src/main/java/common/block/liquid/BlockLiquid.java @@ -333,9 +333,4 @@ public abstract class BlockLiquid extends Block protected boolean hasRegisteredItem() { return false; } - - @Clientside - public float getShinyness() { - return 3.0f; - } } diff --git a/common/src/main/java/common/block/natural/BlockCyber.java b/common/src/main/java/common/block/natural/BlockCyber.java index bf579311..b5270baa 100644 --- a/common/src/main/java/common/block/natural/BlockCyber.java +++ b/common/src/main/java/common/block/natural/BlockCyber.java @@ -16,11 +16,6 @@ public class BlockCyber extends Block { this.setDisplay("CYBER"); } - @Clientside - public float getShinyness() { - return 0.0f; - } - @Clientside public boolean isNonBlock() { return true; diff --git a/common/src/main/java/common/dimension/Dimension.java b/common/src/main/java/common/dimension/Dimension.java index 66482027..b150b818 100755 --- a/common/src/main/java/common/dimension/Dimension.java +++ b/common/src/main/java/common/dimension/Dimension.java @@ -57,13 +57,11 @@ public abstract class Dimension extends Section { // client private boolean denseFog = false; - private boolean subtractBlock = false; private float cloudHeight = 192.0f; private int skyColor = 0x000000; private int fogColor = 0x000000; private int cloudColor = 0x000000; private int lightColor = 0xffffffff; - private int blockColor = 0xffffffff; private float starBrightness = 0.0f; private float deepstarBrightness = 0.0f; private CloudType cloudTexture = CloudType.NORMAL; @@ -208,16 +206,6 @@ public abstract class Dimension extends Section { return this; } - public final Dimension setBlockColor(int value) { - this.blockColor = value; - return this; - } - - public final Dimension enableBlockLightSubtraction() { - this.subtractBlock = true; - return this; - } - public final Dimension setDefaultWeather(Weather value) { this.defaultWeather = this.weather = value; return this; @@ -352,14 +340,6 @@ public abstract class Dimension extends Section { return this.lightColor; } - public final int getBlockColor() { - return this.blockColor; - } - - public final boolean isBlockLightSubtracted() { - return this.subtractBlock; - } - public final String getCloudTexture() { return "textures/world/" + this.cloudTexture.getTexture() + ".png"; } @@ -533,8 +513,6 @@ public abstract class Dimension extends Section { this.fogColor = tag.getInt("FogColor"); this.cloudColor = tag.getInt("CloudColor"); this.lightColor = tag.getInt("LightColor"); - this.blockColor = tag.getInt("BlockColor"); - this.subtractBlock = tag.getBool("SubtractBlock"); this.gravity = tag.getFloat("Gravity"); this.size = tag.getInt("Size"); this.temperature = tag.getFloat("Temperature"); @@ -582,8 +560,6 @@ public abstract class Dimension extends Section { tag.setInt("FogColor", this.fogColor); tag.setInt("CloudColor", this.cloudColor); tag.setInt("LightColor", this.lightColor); - tag.setInt("BlockColor", this.blockColor); - tag.setBool("SubtractBlock", this.subtractBlock); tag.setFloat("Gravity", this.gravity); tag.setInt("Size", this.size); tag.setFloat("Temperature", this.temperature); diff --git a/common/src/main/java/common/init/BlockRegistry.java b/common/src/main/java/common/init/BlockRegistry.java index 1cd2ea75..ef5f542c 100755 --- a/common/src/main/java/common/init/BlockRegistry.java +++ b/common/src/main/java/common/init/BlockRegistry.java @@ -149,7 +149,6 @@ public abstract class BlockRegistry { register("sandstone", sandstone); Block smooth_sandstone; register("smooth_sandstone", (smooth_sandstone = new BlockSandStone("smooth")).setSound(SoundType.STONE).setHardness(0.8F).setDisplay("Glatter Sandstein")); - register("carved_sandstone", (new BlockSandStone("carved")).setSound(SoundType.STONE).setHardness(0.8F).setDisplay("Gemeißelter Sandstein")); Block obsidian = register("obsidian", (new BlockObsidian()).setHardness(50.0F).setResistance(2000.0F).setSound(SoundType.STONE) .setDisplay("Obsidian").setMiningTool(Equipment.PICKAXE, 3)); Block clay = register("clay", (new BlockClay()).setHardness(0.6F).setSound(SoundType.GRAVEL).setDisplay("Ton").setMiningTool(Equipment.SHOVEL)); diff --git a/common/src/main/java/common/init/Blocks.java b/common/src/main/java/common/init/Blocks.java index 2137d57d..c9b30658 100755 --- a/common/src/main/java/common/init/Blocks.java +++ b/common/src/main/java/common/init/Blocks.java @@ -130,7 +130,6 @@ public abstract class Blocks { public static final BlockMetalBlock calcium_block = get("calcium_block"); public static final BlockMetalOre calcium_ore = get("calcium_ore"); public static final BlockCarrot carrots = get("carrots"); - public static final BlockSandStone carved_sandstone = get("carved_sandstone"); public static final Block carved_stonebrick = get("carved_stonebrick"); public static final BlockCauldron cauldron = get("cauldron"); public static final Block cell_rock = get("cell_rock"); diff --git a/common/src/main/java/common/init/Items.java b/common/src/main/java/common/init/Items.java index 526f217a..86d9a5fb 100755 --- a/common/src/main/java/common/init/Items.java +++ b/common/src/main/java/common/init/Items.java @@ -211,7 +211,6 @@ public abstract class Items { public static final ItemCamera camera = get("camera"); public static final ItemSeedFood carrot = get("carrot"); public static final ItemWhip whip = get("whip"); - public static final Item carved_sandstone = get("carved_sandstone"); public static final Item carved_stonebrick = get("carved_stonebrick"); public static final Item cauldron = get("cauldron"); public static final Item cell_rock = get("cell_rock"); diff --git a/common/src/main/java/common/world/Chunk.java b/common/src/main/java/common/world/Chunk.java index 351f23fa..a32fd0cc 100755 --- a/common/src/main/java/common/world/Chunk.java +++ b/common/src/main/java/common/world/Chunk.java @@ -403,8 +403,8 @@ public abstract class Chunk { Material mat = block.getMaterial(); if((!mat.blocksMovement() && !mat.isLiquid()) - // || (mat == Material.LEAVES && ((mat = this.getBlock(loc.up()).getMaterial()) == Material.POWDER) - || mat == Material.LEAVES) { + || (mat == Material.LEAVES && ((mat = this.getBlock(loc.up()).getMaterial()) == Material.POWDER) + || mat == Material.LEAVES)) { loc = loc.down(); } else { diff --git a/server/src/main/java/server/init/UniverseRegistry.java b/server/src/main/java/server/init/UniverseRegistry.java index fda7a5c3..1eb556a6 100755 --- a/server/src/main/java/server/init/UniverseRegistry.java +++ b/server/src/main/java/server/init/UniverseRegistry.java @@ -740,7 +740,7 @@ public abstract class UniverseRegistry extends DimensionRegistry { .setStarColorSin(25.0f, 0.1f, 0.25f, 0xff00ff, 1, 4).setDeepStarColorSin(25.0f, 0.1f, 0.5f, 0xff00ff, 1, 4), warp); registerDomain("Tian'Xin", () -> { - registerArea("Ni'enrath", new Area(0x7f00ff, 532109, 276.15f, 1, Blocks.tian.getState(), Blocks.spring_water.getState(), 63).setLightColor(0x07000f).setBlockColor(0xcf6fff), + registerArea("Ni'enrath", new Area(0x7f00ff, 532109, 276.15f, 1, Blocks.tian.getState(), Blocks.spring_water.getState(), 63).setLightColor(0x07000f), new GeneratorData().setGenerator(new GeneratorPerlin(0.1F, 1.0F)) .setReplacer(new ReplacerAltSimple(Blocks.tian_soil.getState(), Blocks.tian.getState())) .setPopulator(new PopulatorTian()).addCaveGen(new MapGenBigCaves()).enableSnow() @@ -755,7 +755,7 @@ public abstract class UniverseRegistry extends DimensionRegistry { registerDomain("Digital", () -> { GeneratorSettings settings = new GeneratorSettings(); settings.stretchY = 48.0f; - registerArea("Cyberspace", new Area(0x000000, 16777216, 293.15f, 15, Blocks.cyber.getState(), Blocks.spring_water.getState(), 63).setLightColor(0x00003f).setBlockColor(0x00ff00).enableBlockLightSubtraction(), + registerArea("Cyberspace", new Area(0x000000, 16777216, 293.15f, 15, Blocks.cyber.getState(), Blocks.spring_water.getState(), 63).setLightColor(0x00003f), new GeneratorData().setGenerator(new GeneratorPerlin(false, settings, 0.1f, 3.5f))); }); registerDomain("hell", "Hölle", () -> {