From 8119ba83360c2e717fec162a5e79804395758b86 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Wed, 20 Apr 2022 16:38:18 -0400 Subject: [PATCH] Renamed Static239 to GlRenderer, started refactoring --- client/src/main/java/AudioChannel.java | 2 +- client/src/main/java/AudioThread.java | 2 +- client/src/main/java/BrokenInputStream.java | 2 +- client/src/main/java/BufferedSocket.java | 2 +- client/src/main/java/Class165.java | 28 +- client/src/main/java/Class3_Sub14.java | 28 +- client/src/main/java/Class45.java | 14 +- client/src/main/java/Class59.java | 2 +- client/src/main/java/Component.java | 2 +- client/src/main/java/Font.java | 22 +- client/src/main/java/GameShell.java | 8 +- client/src/main/java/GlAlphaSprite.java | 4 +- client/src/main/java/GlFont.java | 30 +- client/src/main/java/GlIndexedSprite.java | 24 +- client/src/main/java/GlModel.java | 48 +- .../java/{Static239.java => GlRenderer.java} | 500 +++++++++--------- client/src/main/java/GlSolidColorTexture.java | 10 +- client/src/main/java/GlSprite.java | 120 ++--- client/src/main/java/GlTexture.java | 18 +- .../src/main/java/GlVertexBufferObject.java | 12 +- client/src/main/java/JagString.java | 12 +- client/src/main/java/Js5.java | 18 +- client/src/main/java/Js5CacheQueue.java | 2 +- .../src/main/java/Js5GlTextureProvider.java | 6 +- .../src/main/java/LiquidMaterialRenderer.java | 26 +- client/src/main/java/Loc.java | 12 +- client/src/main/java/LocType.java | 4 +- client/src/main/java/MillisTimer.java | 2 +- client/src/main/java/MouseRecorder.java | 2 +- client/src/main/java/NanoTimer.java | 2 +- client/src/main/java/Npc.java | 16 +- client/src/main/java/NpcType.java | 2 +- client/src/main/java/ObjType.java | 2 +- client/src/main/java/PathingEntity.java | 2 +- client/src/main/java/Player.java | 32 +- client/src/main/java/RawModel.java | 2 +- client/src/main/java/SeqType.java | 8 +- .../main/java/SpecularMaterialRenderer.java | 28 +- client/src/main/java/Static1.java | 10 +- client/src/main/java/Static102.java | 2 +- client/src/main/java/Static112.java | 10 +- client/src/main/java/Static114.java | 6 +- client/src/main/java/Static115.java | 2 +- client/src/main/java/Static120.java | 32 +- client/src/main/java/Static126.java | 4 +- client/src/main/java/Static127.java | 30 +- client/src/main/java/Static132.java | 4 +- client/src/main/java/Static136.java | 4 +- client/src/main/java/Static137.java | 10 +- client/src/main/java/Static138.java | 2 +- client/src/main/java/Static140.java | 2 +- client/src/main/java/Static141.java | 2 +- client/src/main/java/Static142.java | 12 +- client/src/main/java/Static144.java | 4 +- client/src/main/java/Static145.java | 6 +- client/src/main/java/Static147.java | 2 +- client/src/main/java/Static151.java | 18 +- client/src/main/java/Static155.java | 4 +- client/src/main/java/Static156.java | 16 +- client/src/main/java/Static16.java | 2 +- client/src/main/java/Static160.java | 6 +- client/src/main/java/Static161.java | 10 +- client/src/main/java/Static164.java | 2 +- client/src/main/java/Static169.java | 4 +- client/src/main/java/Static172.java | 2 +- client/src/main/java/Static178.java | 2 +- client/src/main/java/Static18.java | 2 +- client/src/main/java/Static181.java | 2 +- client/src/main/java/Static182.java | 4 +- client/src/main/java/Static185.java | 34 +- client/src/main/java/Static196.java | 4 +- client/src/main/java/Static197.java | 20 +- client/src/main/java/Static198.java | 2 +- client/src/main/java/Static203.java | 6 +- client/src/main/java/Static213.java | 4 +- client/src/main/java/Static217.java | 2 +- client/src/main/java/Static220.java | 2 +- client/src/main/java/Static221.java | 2 +- client/src/main/java/Static231.java | 2 +- client/src/main/java/Static233.java | 2 +- client/src/main/java/Static24.java | 4 +- client/src/main/java/Static242.java | 14 +- client/src/main/java/Static243.java | 2 +- client/src/main/java/Static245.java | 2 +- client/src/main/java/Static247.java | 76 +-- client/src/main/java/Static248.java | 8 +- client/src/main/java/Static25.java | 4 +- client/src/main/java/Static253.java | 22 +- client/src/main/java/Static26.java | 2 +- client/src/main/java/Static269.java | 8 +- client/src/main/java/Static27.java | 2 +- client/src/main/java/Static275.java | 4 +- client/src/main/java/Static276.java | 2 +- client/src/main/java/Static28.java | 4 +- client/src/main/java/Static29.java | 2 +- client/src/main/java/Static30.java | 8 +- client/src/main/java/Static33.java | 2 +- client/src/main/java/Static36.java | 2 +- client/src/main/java/Static4.java | 24 +- client/src/main/java/Static41.java | 2 +- client/src/main/java/Static43.java | 2 +- client/src/main/java/Static45.java | 14 +- client/src/main/java/Static46.java | 96 ++-- client/src/main/java/Static48.java | 2 +- client/src/main/java/Static54.java | 12 +- client/src/main/java/Static60.java | 2 +- client/src/main/java/Static63.java | 4 +- client/src/main/java/Static70.java | 6 +- client/src/main/java/Static73.java | 2 +- client/src/main/java/Static74.java | 2 +- client/src/main/java/Static75.java | 2 +- client/src/main/java/Static76.java | 2 +- client/src/main/java/Static78.java | 24 +- client/src/main/java/Static80.java | 4 +- client/src/main/java/Static82.java | 2 +- client/src/main/java/Static83.java | 2 +- client/src/main/java/Static87.java | 68 +-- client/src/main/java/Static88.java | 36 +- client/src/main/java/Static89.java | 12 +- client/src/main/java/Static97.java | 2 +- .../main/java/UnderwaterMaterialRenderer.java | 16 +- .../src/main/java/UnlitMaterialRenderer.java | 8 +- .../src/main/java/WaterMaterialRenderer.java | 26 +- .../main/java/WaterfallMaterialRenderer.java | 14 +- client/src/main/java/client.java | 16 +- 125 files changed, 962 insertions(+), 962 deletions(-) rename client/src/main/java/{Static239.java => GlRenderer.java} (62%) diff --git a/client/src/main/java/AudioChannel.java b/client/src/main/java/AudioChannel.java index 99c8173..79f9b31 100644 --- a/client/src/main/java/AudioChannel.java +++ b/client/src/main/java/AudioChannel.java @@ -307,7 +307,7 @@ public class AudioChannel { if (local6) { Static60.aClass19_1.aBoolean62 = true; while (Static60.aClass19_1.aBoolean64) { - Static231.method3983(50L); + Static231.sleep(50L); } Static60.aClass19_1 = null; } diff --git a/client/src/main/java/AudioThread.java b/client/src/main/java/AudioThread.java index a597064..07abca3 100644 --- a/client/src/main/java/AudioThread.java +++ b/client/src/main/java/AudioThread.java @@ -29,7 +29,7 @@ public final class AudioThread implements Runnable { local19.method3565(); } } - Static231.method3983(10L); + Static231.sleep(10L); Static140.method2708(this.aClass213_1, null); } } catch (@Pc(43) Exception local43) { diff --git a/client/src/main/java/BrokenInputStream.java b/client/src/main/java/BrokenInputStream.java index c6ea5d8..498258c 100644 --- a/client/src/main/java/BrokenInputStream.java +++ b/client/src/main/java/BrokenInputStream.java @@ -8,7 +8,7 @@ public final class BrokenInputStream extends InputStream { @OriginalMember(owner = "client!qk", name = "read", descriptor = "()I") @Override public final int read() { - Static231.method3983(30000L); + Static231.sleep(30000L); return -1; } } diff --git a/client/src/main/java/BufferedSocket.java b/client/src/main/java/BufferedSocket.java index 78a7cb2..8f1d29c 100644 --- a/client/src/main/java/BufferedSocket.java +++ b/client/src/main/java/BufferedSocket.java @@ -200,7 +200,7 @@ public final class BufferedSocket implements Runnable { } if (this.aClass212_4 != null) { while (this.aClass212_4.status == 0) { - Static231.method3983(1L); + Static231.sleep(1L); } if (this.aClass212_4.status == 1) { try { diff --git a/client/src/main/java/Class165.java b/client/src/main/java/Class165.java index 379e0b7..11cc660 100644 --- a/client/src/main/java/Class165.java +++ b/client/src/main/java/Class165.java @@ -32,12 +32,12 @@ public final class Class165 { @OriginalMember(owner = "client!wm", name = "", descriptor = "()V") public Class165() { - @Pc(9) GL2 local9 = Static239.gl; + @Pc(9) GL2 local9 = GlRenderer.gl; @Pc(12) int[] local12 = new int[1]; local9.glGenTextures(1, local12, 0); this.anInt5901 = local12[0]; Static63.anInt1942 += 16384; - Static239.method4177(this.anInt5901); + GlRenderer.setTextureId(this.anInt5901); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); @@ -50,7 +50,7 @@ public final class Class165 { @Pc(11) int local11; for (@Pc(6) int local6 = 0; local6 <= 8; local6++) { for (local11 = 0; local11 <= 8; local11++) { - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { local4.pFloat((float) local11 / 8.0F); local4.pFloat((float) local6 / 8.0F); local4.pFloat((float) (local11 * 128)); @@ -65,7 +65,7 @@ public final class Class165 { } } } - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { @Pc(112) ByteBuffer local112 = ByteBuffer.wrap(local4.data, 0, local4.offset); this.aClass155_7 = new GlVertexBufferObject(); this.aClass155_7.method4519(local112); @@ -77,7 +77,7 @@ public final class Class165 { @Pc(147) Buffer local147 = new Buffer(1536); for (local11 = 0; local11 < 8; local11++) { for (@Pc(154) int local154 = 0; local154 < 8; local154++) { - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { local147.p4(local154 + (local11 + 1) * 9); local147.p4(local154 + local11 * 9); local147.p4(local154 + local11 * 9 + 1); @@ -94,7 +94,7 @@ public final class Class165 { } } } - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { @Pc(293) ByteBuffer local293 = ByteBuffer.wrap(local147.data, 0, local147.offset); this.aClass155_6 = new GlVertexBufferObject(); this.aClass155_6.method4517(local293); @@ -152,31 +152,31 @@ public final class Class165 { } local19 += local5 - 128; } - @Pc(145) GL2 local145 = Static239.gl; + @Pc(145) GL2 local145 = GlRenderer.gl; @Pc(148) ByteBuffer local148 = ByteBuffer.wrap(Static281.aByteArray82); local148.limit(16384); - Static239.method4177(this.anInt5901); + GlRenderer.setTextureId(this.anInt5901); local145.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_ALPHA, 128, 128, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, local148); return true; } @OriginalMember(owner = "client!wm", name = "b", descriptor = "()V") public final void method4679() { - @Pc(1) GL2 local1 = Static239.gl; - Static239.method4177(this.anInt5901); + @Pc(1) GL2 local1 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt5901); if (this.aClass155_7 == null) { - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); } local1.glInterleavedArrays(GL2.GL_T2F_V3F, 20, this.aByteBuffer12); - Static239.aBoolean265 = false; + GlRenderer.normalArrayEnabled = false; } else { this.aClass155_7.method4516(); local1.glInterleavedArrays(GL2.GL_T2F_V3F, 20, 0L); - Static239.aBoolean265 = false; + GlRenderer.normalArrayEnabled = false; } if (this.aClass155_6 == null) { - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); } local1.glDrawElements(GL2.GL_TRIANGLES, 384, GL2.GL_UNSIGNED_INT, this.aByteBuffer11); diff --git a/client/src/main/java/Class3_Sub14.java b/client/src/main/java/Class3_Sub14.java index 664dd6e..6c3fe54 100644 --- a/client/src/main/java/Class3_Sub14.java +++ b/client/src/main/java/Class3_Sub14.java @@ -158,7 +158,7 @@ public final class Class3_Sub14 extends Node { public final void method1943() { @Pc(12) Buffer local12 = new Buffer((this.aBoolean139 ? 40 : 36) * this.anInt2483); for (@Pc(14) int local14 = 0; local14 < this.anInt2483; local14++) { - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { local12.pFloat((float) this.anIntArray232[local14]); local12.pFloat((float) this.anIntArray230[local14]); local12.pFloat((float) this.anIntArray229[local14]); @@ -186,7 +186,7 @@ public final class Class3_Sub14 extends Node { } } } - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { @Pc(200) ByteBuffer local200 = ByteBuffer.wrap(local12.data, 0, local12.offset); this.aClass155_3 = new GlVertexBufferObject(); this.aClass155_3.method4519(local200); @@ -225,7 +225,7 @@ public final class Class3_Sub14 extends Node { @Pc(86) int[] local86; @Pc(90) int local90; @Pc(116) int local116; - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { for (local47 = 0; local47 < this.anInt2489; local47++) { local68 = arg0[this.anIntArray231[local47]][this.anIntArray228[local47]][this.anIntArray227[local47]]; if (local68 != null && local68.aBoolean45) { @@ -275,23 +275,23 @@ public final class Class3_Sub14 extends Node { if (Static95.aClass3_Sub15_3.offset == 0 && Static95.aClass3_Sub15_2.offset == 0) { return; } - @Pc(257) GL2 local257 = Static239.gl; + @Pc(257) GL2 local257 = GlRenderer.gl; if (this.anInt2485 == -1 || arg2) { - Static239.method4177(-1); - Static27.method766(0, 0); + GlRenderer.setTextureId(-1); + Static27.setMaterial(0, 0); } else { Rasteriser.anInterface1_2.method3227(this.anInt2485); } @Pc(282) int local282 = this.aBoolean139 ? 40 : 36; if (this.aClass155_3 == null) { - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { local257.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); } this.aByteBuffer3.position(0); local257.glVertexPointer(3, GL2.GL_FLOAT, local282, this.aByteBuffer3); this.aByteBuffer3.position(12); local257.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, local282, this.aByteBuffer3); - if (Static178.aBoolean202) { + if (Static178.highDetailLighting) { this.aByteBuffer3.position(16); local257.glNormalPointer(GL2.GL_FLOAT, local282, this.aByteBuffer3); } @@ -307,7 +307,7 @@ public final class Class3_Sub14 extends Node { this.aClass155_3.method4516(); local257.glVertexPointer(3, GL2.GL_FLOAT, local282, 0L); local257.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, local282, 12L); - if (Static178.aBoolean202) { + if (Static178.highDetailLighting) { local257.glNormalPointer(GL2.GL_FLOAT, local282, 16L); } local257.glTexCoordPointer(2, GL2.GL_FLOAT, local282, 28L); @@ -317,7 +317,7 @@ public final class Class3_Sub14 extends Node { local257.glClientActiveTexture(GL2.GL_TEXTURE0); } } - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { local257.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); } if (Static95.aClass3_Sub15_3.offset != 0) { @@ -328,7 +328,7 @@ public final class Class3_Sub14 extends Node { } Static95.aByteBuffer5.put(Static95.aClass3_Sub15_3.data, 0, Static95.aClass3_Sub15_3.offset); Static95.aByteBuffer5.flip(); - Static239.method4159(arg1); + GlRenderer.method4159(arg1); local257.glDrawElements(GL2.GL_TRIANGLES, Static95.aClass3_Sub15_3.offset / 4, GL2.GL_UNSIGNED_INT, Static95.aByteBuffer5); } if (Static95.aClass3_Sub15_2.offset == 0) { @@ -341,10 +341,10 @@ public final class Class3_Sub14 extends Node { } Static95.aByteBuffer4.put(Static95.aClass3_Sub15_2.data, 0, Static95.aClass3_Sub15_2.offset); Static95.aByteBuffer4.flip(); - Static239.method4159(arg1 - 100.0F); - Static239.method4178(); + GlRenderer.method4159(arg1 - 100.0F); + GlRenderer.disableDepthMask(); local257.glDrawElements(GL2.GL_TRIANGLES, Static95.aClass3_Sub15_2.offset / 4, GL2.GL_UNSIGNED_INT, Static95.aByteBuffer4); - Static239.method4157(); + GlRenderer.enableDepthMask(); } @OriginalMember(owner = "client!hg", name = "a", descriptor = "(III[I[IZ)I") diff --git a/client/src/main/java/Class45.java b/client/src/main/java/Class45.java index d0e042b..ed08c1a 100644 --- a/client/src/main/java/Class45.java +++ b/client/src/main/java/Class45.java @@ -115,7 +115,7 @@ public final class Class45 { @Pc(7) Buffer local7 = new Buffer(this.anInt2018 * 4); @Pc(15) Buffer local15 = new Buffer(this.anInt2017 * 16); @Pc(19) int local19; - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { for (local19 = 0; local19 < this.anInt2017; local19++) { local15.p1(this.aByteArray25[local19]); local15.p1(this.aByteArray23[local19]); @@ -142,7 +142,7 @@ public final class Class45 { local7.p4le(this.anIntArray177[local19]); } } - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { this.aClass155_1 = new GlVertexBufferObject(); @Pc(173) ByteBuffer local173 = ByteBuffer.wrap(local15.data); this.aClass155_1.method4519(local173); @@ -181,21 +181,21 @@ public final class Class45 { @OriginalMember(owner = "client!fj", name = "c", descriptor = "()V") public final void method1556() { - @Pc(1) GL2 local1 = Static239.gl; - if (Static239.aBoolean271) { + @Pc(1) GL2 local1 = GlRenderer.gl; + if (GlRenderer.arbVboSupported) { this.aClass155_1.method4516(); local1.glInterleavedArrays(GL2.GL_C4UB_V3F, 16, 0L); - Static239.aBoolean265 = false; + GlRenderer.normalArrayEnabled = false; this.aClass155_2.method4518(); local1.glDrawElements(GL2.GL_TRIANGLES, this.anInt2018, GL2.GL_UNSIGNED_INT, 0L); return; } - if (Static239.aBoolean271) { + if (GlRenderer.arbVboSupported) { local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); } local1.glInterleavedArrays(GL2.GL_C4UB_V3F, 16, this.aByteBuffer1); - Static239.aBoolean265 = false; + GlRenderer.normalArrayEnabled = false; local1.glDrawElements(GL2.GL_TRIANGLES, this.anInt2018, GL2.GL_UNSIGNED_INT, this.aByteBuffer2); } diff --git a/client/src/main/java/Class59.java b/client/src/main/java/Class59.java index a125cfb..6041781 100644 --- a/client/src/main/java/Class59.java +++ b/client/src/main/java/Class59.java @@ -296,7 +296,7 @@ public final class Class59 { } } local154 = local740.method1679(64, 850, -30, -50, -30); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { ((GlModel) local154).method4111(false, false, true, false, false, true); } Static250.aClass99_33.method3095(local154, local41); diff --git a/client/src/main/java/Component.java b/client/src/main/java/Component.java index 2a60956..3033225 100644 --- a/client/src/main/java/Component.java +++ b/client/src/main/java/Component.java @@ -962,7 +962,7 @@ public final class Component { if (this.anInt513 != 0) { local85.method314(this.anInt513); } - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { local72 = local85; } else if (local85 instanceof SoftwareAlphaSprite) { local72 = new GlAlphaSprite(local85); diff --git a/client/src/main/java/Font.java b/client/src/main/java/Font.java index 3fb798b..f21d6fd 100644 --- a/client/src/main/java/Font.java +++ b/client/src/main/java/Font.java @@ -84,7 +84,7 @@ public abstract class Font extends SecondaryNode { } else { @Pc(120) int local120; if (local22 == 62 && local6 != -1) { - @Pc(42) JagString local42 = arg0.method3137(local14, local6 + 1); + @Pc(42) JagString local42 = arg0.substring(local14, local6 + 1); local6 = -1; if (local42.method3108(Static218.aClass100_696)) { local22 = 60; @@ -149,14 +149,14 @@ public abstract class Font extends SecondaryNode { } @Pc(323) int local323 = this.anIntArray348[local22]; if (Static218.anInt3627 != -1) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local323, Static218.anInt3627); } else { Static129.method2489(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local323, Static218.anInt3627); } } if (Static218.anInt3628 != -1) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + this.anInt3626 + 1, local323, Static218.anInt3628); } else { Static129.method2489(arg1, local4 + this.anInt3626 + 1, local323, Static218.anInt3628); @@ -211,7 +211,7 @@ public abstract class Font extends SecondaryNode { local5 = local15; } else { if (local23 == 62 && local5 != -1) { - @Pc(43) JagString local43 = arg0.method3137(local15, local5 + 1); + @Pc(43) JagString local43 = arg0.substring(local15, local5 + 1); local5 = -1; if (local43.method3108(Static218.aClass100_696)) { local23 = 60; @@ -369,14 +369,14 @@ public abstract class Font extends SecondaryNode { local19 = local29; } else { if (local37 == 62 && local19 != -1) { - @Pc(57) JagString local57 = arg0.method3137(local29, local19 + 1); + @Pc(57) JagString local57 = arg0.substring(local29, local19 + 1); local19 = -1; Static218.aClass100_720.method3152(60); Static218.aClass100_720.method3113(local57); Static218.aClass100_720.method3152(62); if (local57.method3108(Static218.aClass100_713)) { if (arg2[local23] == null) { - arg2[local23] = Static218.aClass100_720.method3143().method3137(Static218.aClass100_720.length(), local11); + arg2[local23] = Static218.aClass100_720.method3143().substring(Static218.aClass100_720.length(), local11); } else { arg2[local23].method3133(0); arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length()); @@ -460,7 +460,7 @@ public abstract class Font extends SecondaryNode { } if (arg1 != null && local9 > arg1[local23 < arg1.length ? local23 : arg1.length - 1] && local13 >= 0) { if (arg2[local23] == null) { - arg2[local23] = Static218.aClass100_720.method3143().method3137(local13 - local17, local11); + arg2[local23] = Static218.aClass100_720.method3143().substring(local13 - local17, local11); } else { arg2[local23].method3133(0); arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, local13 - local17); @@ -481,7 +481,7 @@ public abstract class Font extends SecondaryNode { } if (Static218.aClass100_720.length() > local11) { if (arg2[local23] == null) { - arg2[local23] = Static218.aClass100_720.method3143().method3137(Static218.aClass100_720.length(), local11); + arg2[local23] = Static218.aClass100_720.method3143().substring(Static218.aClass100_720.length(), local11); } else { arg2[local23].method3133(0); arg2[local23] = arg2[local23].method3122(Static218.aClass100_720, local11, Static218.aClass100_720.length()); @@ -754,7 +754,7 @@ public abstract class Font extends SecondaryNode { @Pc(130) int local130; @Pc(141) int local141; if (local24 == 62 && local6 != -1) { - @Pc(44) JagString local44 = arg0.method3137(local16, local6 + 1); + @Pc(44) JagString local44 = arg0.substring(local16, local6 + 1); local6 = -1; if (local44.method3108(Static218.aClass100_696)) { local24 = 60; @@ -841,14 +841,14 @@ public abstract class Font extends SecondaryNode { } @Pc(387) int local387 = this.anIntArray348[local24]; if (Static218.anInt3627 != -1) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local387, Static218.anInt3627); } else { Static129.method2489(arg1, local4 + (int) ((double) this.anInt3626 * 0.7D), local387, Static218.anInt3627); } } if (Static218.anInt3628 != -1) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1174(arg1, local4 + this.anInt3626, local387, Static218.anInt3628); } else { Static129.method2489(arg1, local4 + this.anInt3626, local387, Static218.anInt3628); diff --git a/client/src/main/java/GameShell.java b/client/src/main/java/GameShell.java index a111264..5e5974a 100644 --- a/client/src/main/java/GameShell.java +++ b/client/src/main/java/GameShell.java @@ -119,7 +119,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene public final void destroy() { if (Static230.anApplet_Sub1_1 == this && !Static58.aBoolean101) { Static72.aLong74 = MonotonicClock.currentTimeMillis(); - Static231.method3983(5000L); + Static231.sleep(5000L); Static69.aClass213_4 = null; this.method931(false); } @@ -167,7 +167,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene return; } Static69.aBoolean115 = true; - if (Static236.aBoolean256 && !Static239.aBoolean269 && MonotonicClock.currentTimeMillis() - Static243.aLong178 > 1000L) { + if (Static236.aBoolean256 && !GlRenderer.enabled && MonotonicClock.currentTimeMillis() - Static243.aLong178 > 1000L) { @Pc(29) Rectangle local29 = arg0.getClipBounds(); if (local29 == null || local29.width >= Static72.anInt2046 && Static122.anInt3045 <= local29.height) { Static35.aBoolean66 = true; @@ -384,7 +384,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene Static69.aClass213_4 = Static71.signLink = new SignLink(null, arg0, arg1, 28); @Pc(76) PrivilegedRequest local76 = Static71.signLink.method5130(1, this); while (local76.status == 0) { - Static231.method3983(10L); + Static231.sleep(10L); } Static37.aThread1 = (Thread) local76.result; } catch (@Pc(91) Exception local91) { @@ -436,7 +436,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene } @Pc(86) PrivilegedRequest local86 = Static71.signLink.method5130(1, this); while (local86.status == 0) { - Static231.method3983(10L); + Static231.sleep(10L); } Static37.aThread1 = (Thread) local86.result; } catch (@Pc(103) Exception local103) { diff --git a/client/src/main/java/GlAlphaSprite.java b/client/src/main/java/GlAlphaSprite.java index ca36656..7dd706a 100644 --- a/client/src/main/java/GlAlphaSprite.java +++ b/client/src/main/java/GlAlphaSprite.java @@ -42,13 +42,13 @@ public final class GlAlphaSprite extends GlSprite { local22 += local32; } @Pc(94) ByteBuffer local94 = ByteBuffer.wrap(local20); - @Pc(96) GL2 local96 = Static239.gl; + @Pc(96) GL2 local96 = GlRenderer.gl; if (this.anInt1872 == -1) { @Pc(103) int[] local103 = new int[1]; local96.glGenTextures(1, local103, 0); this.anInt1872 = local103[0]; } - Static239.method4177(this.anInt1872); + GlRenderer.setTextureId(this.anInt1872); local96.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.anInt1870, this.anInt1874, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local94); Static63.anInt1944 += local94.limit() - this.anInt1869; this.anInt1869 = local94.limit(); diff --git a/client/src/main/java/GlFont.java b/client/src/main/java/GlFont.java index 931e507..c3b1390 100644 --- a/client/src/main/java/GlFont.java +++ b/client/src/main/java/GlFont.java @@ -52,24 +52,24 @@ public final class GlFont extends Font { protected final void method2854(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { @Pc(4) GL2 local4; if (Static46.aClass3_Sub2_Sub1_Sub2_1 == null) { - Static239.method4151(); - local4 = Static239.gl; - Static239.method4177(this.anInt3638); + GlRenderer.method4151(); + local4 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt3638); local4.glColor3ub((byte) (arg5 >> 16), (byte) (arg5 >> 8), (byte) arg5); - local4.glTranslatef((float) arg1, (float) (Static239.anInt5329 - arg2), 0.0F); + local4.glTranslatef((float) arg1, (float) (GlRenderer.canvasHeight - arg2), 0.0F); local4.glCallList(this.anIntArray349[arg0]); local4.glLoadIdentity(); return; } - Static239.method4151(); - local4 = Static239.gl; + GlRenderer.method4151(); + local4 = GlRenderer.gl; local4.glColor3ub((byte) (arg5 >> 16), (byte) (arg5 >> 8), (byte) arg5); - local4.glTranslatef((float) arg1, (float) (Static239.anInt5329 - arg2), 0.0F); + local4.glTranslatef((float) arg1, (float) (GlRenderer.canvasHeight - arg2), 0.0F); @Pc(32) float local32 = (float) (arg0 % 16) / 16.0F; @Pc(39) float local39 = (float) (arg0 / 16) / 16.0F; @Pc(51) float local51 = local32 + (float) this.anIntArray343[arg0] / (float) this.anInt3640; @Pc(63) float local63 = local39 + (float) this.anIntArray345[arg0] / (float) this.anInt3640; - Static239.method4177(this.anInt3638); + GlRenderer.setTextureId(this.anInt3638); @Pc(68) GlSprite local68 = Static46.aClass3_Sub2_Sub1_Sub2_1; local4.glActiveTexture(GL2.GL_TEXTURE1); local4.glEnable(GL2.GL_TEXTURE_2D); @@ -104,11 +104,11 @@ public final class GlFont extends Font { @OriginalMember(owner = "client!mb", name = "a", descriptor = "(IIIIIIIZ)V") @Override protected final void method2855(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { - Static239.method4151(); - @Pc(2) GL2 local2 = Static239.gl; - Static239.method4177(this.anInt3638); + GlRenderer.method4151(); + @Pc(2) GL2 local2 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt3638); local2.glColor4ub((byte) (arg5 >> 16), (byte) (arg5 >> 8), (byte) arg5, arg6 > 255 ? -1 : (byte) arg6); - local2.glTranslatef((float) arg1, (float) (Static239.anInt5329 - arg2), 0.0F); + local2.glTranslatef((float) arg1, (float) (GlRenderer.canvasHeight - arg2), 0.0F); local2.glCallList(this.anIntArray349[arg0]); local2.glLoadIdentity(); } @@ -119,7 +119,7 @@ public final class GlFont extends Font { return; } this.anIntArray349 = new int[256]; - @Pc(9) GL2 local9 = Static239.gl; + @Pc(9) GL2 local9 = GlRenderer.gl; for (@Pc(11) int local11 = 0; local11 < 256; local11++) { @Pc(21) float local21 = (float) (local11 % 16) / 16.0F; @Pc(28) float local28 = (float) (local11 / 16) / 16.0F; @@ -182,14 +182,14 @@ public final class GlFont extends Font { } } @Pc(153) ByteBuffer local153 = ByteBuffer.wrap(local66); - @Pc(155) GL2 local155 = Static239.gl; + @Pc(155) GL2 local155 = GlRenderer.gl; if (this.anInt3638 == -1) { @Pc(162) int[] local162 = new int[1]; local155.glGenTextures(1, local162, 0); this.anInt3638 = local162[0]; this.anInt3639 = Static63.anInt1943; } - Static239.method4177(this.anInt3638); + GlRenderer.setTextureId(this.anInt3638); local155.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, this.anInt3640, this.anInt3640, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, local153); Static63.anInt1944 += local153.limit() - this.anInt3637; this.anInt3637 = local153.limit(); diff --git a/client/src/main/java/GlIndexedSprite.java b/client/src/main/java/GlIndexedSprite.java index ce0c183..a14e1f5 100644 --- a/client/src/main/java/GlIndexedSprite.java +++ b/client/src/main/java/GlIndexedSprite.java @@ -64,14 +64,14 @@ public final class GlIndexedSprite extends IndexedSprite { local22 += (this.anInt4287 - this.anInt4270) * 4; } @Pc(93) ByteBuffer local93 = ByteBuffer.wrap(local20); - @Pc(95) GL2 local95 = Static239.gl; + @Pc(95) GL2 local95 = GlRenderer.gl; if (this.anInt4281 == -1) { @Pc(102) int[] local102 = new int[1]; local95.glGenTextures(1, local102, 0); this.anInt4281 = local102[0]; this.anInt4285 = Static63.anInt1943; } - Static239.method4177(this.anInt4281); + GlRenderer.setTextureId(this.anInt4281); local95.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.anInt4287, this.anInt4286, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local93); Static63.anInt1944 += local93.limit() - this.anInt4284; this.anInt4284 = local93.limit(); @@ -80,14 +80,14 @@ public final class GlIndexedSprite extends IndexedSprite { @OriginalMember(owner = "client!oh", name = "a", descriptor = "(III)V") @Override public final void method3335(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - Static239.method4155(); + GlRenderer.method4155(); @Pc(5) int local5 = arg0 + this.anInt4280; @Pc(10) int local10 = arg1 + this.anInt4273; - @Pc(12) GL2 local12 = Static239.gl; - Static239.method4177(this.anInt4281); + @Pc(12) GL2 local12 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt4281); this.method3338(); local12.glColor4f(1.0F, 1.0F, 1.0F, (float) arg2 / 256.0F); - local12.glTranslatef((float) local5, (float) (Static239.anInt5329 - local10), 0.0F); + local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); local12.glCallList(this.anInt4282); local12.glLoadIdentity(); } @@ -96,7 +96,7 @@ public final class GlIndexedSprite extends IndexedSprite { private void method3338() { if (this.anInt4283 != 1) { this.anInt4283 = 1; - @Pc(9) GL2 local9 = Static239.gl; + @Pc(9) GL2 local9 = GlRenderer.gl; local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_NEAREST); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_NEAREST); } @@ -105,13 +105,13 @@ public final class GlIndexedSprite extends IndexedSprite { @OriginalMember(owner = "client!oh", name = "a", descriptor = "(II)V") @Override public final void method3336(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - Static239.method4149(); + GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.anInt4280; @Pc(10) int local10 = arg1 + this.anInt4273; - @Pc(12) GL2 local12 = Static239.gl; - Static239.method4177(this.anInt4281); + @Pc(12) GL2 local12 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt4281); this.method3338(); - local12.glTranslatef((float) local5, (float) (Static239.anInt5329 - local10), 0.0F); + local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); local12.glCallList(this.anInt4282); local12.glLoadIdentity(); } @@ -135,7 +135,7 @@ public final class GlIndexedSprite extends IndexedSprite { private void method3339() { @Pc(7) float local7 = (float) this.anInt4270 / (float) this.anInt4287; @Pc(15) float local15 = (float) this.anInt4278 / (float) this.anInt4286; - @Pc(17) GL2 local17 = Static239.gl; + @Pc(17) GL2 local17 = GlRenderer.gl; if (this.anInt4282 == -1) { this.anInt4282 = local17.glGenLists(1); this.anInt4285 = Static63.anInt1943; diff --git a/client/src/main/java/GlModel.java b/client/src/main/java/GlModel.java index 9af34b5..9986ffe 100644 --- a/client/src/main/java/GlModel.java +++ b/client/src/main/java/GlModel.java @@ -205,7 +205,7 @@ public final class GlModel extends Model { this.aClass5_1 = new Class5(); this.aClass127_4 = new GlBuffer(); this.aClass127_1 = new GlBuffer(); - if (Static178.aBoolean202) { + if (Static178.highDetailLighting) { this.aClass127_2 = new GlBuffer(); } this.aClass127_3 = new GlBuffer(); @@ -802,7 +802,7 @@ public final class GlModel extends Model { } } } - @Pc(744) GL2 local744 = Static239.gl; + @Pc(744) GL2 local744 = GlRenderer.gl; local744.glPushMatrix(); local744.glTranslatef((float) arg5, (float) arg6, (float) arg7); local744.glRotatef((float) arg0 * 0.17578125F, 0.0F, 1.0F, 0.0F); @@ -1060,7 +1060,7 @@ public final class GlModel extends Model { if (this.anInt5296 == 0) { return; } - @Pc(5) GL2 local5 = Static239.gl; + @Pc(5) GL2 local5 = GlRenderer.gl; local5.glPushMatrix(); if (arg2 != 0) { local5.glRotatef((float) arg2 * 0.17578125F, 1.0F, 0.0F, 0.0F); @@ -1678,7 +1678,7 @@ public final class GlModel extends Model { Static237.aClass3_Sub15_8.offset = 0; } @Pc(25) int local25; - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { for (local25 = 0; local25 < this.anInt5297; local25++) { Static237.aClass3_Sub15_8.p4(this.aShortArray77[local25]); Static237.aClass3_Sub15_8.p4(this.aShortArray82[local25]); @@ -1691,7 +1691,7 @@ public final class GlModel extends Model { Static237.aClass3_Sub15_8.p4le(this.aShortArray83[local25]); } } - if (!Static239.aBoolean271) { + if (!GlRenderer.arbVboSupported) { @Pc(115) ByteBuffer local115 = ByteBuffer.allocateDirect(Static237.aClass3_Sub15_8.offset); local115.put(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local115.flip(); @@ -1937,7 +1937,7 @@ public final class GlModel extends Model { throw new IllegalArgumentException(); } else if (this.anInt5296 != 0) { if (arg5) { - @Pc(26) boolean local26 = !this.aClass127_1.aBoolean235 && (arg1 || arg2 && !Static178.aBoolean202); + @Pc(26) boolean local26 = !this.aClass127_1.aBoolean235 && (arg1 || arg2 && !Static178.highDetailLighting); this.method4113(false, !this.aClass127_4.aBoolean235 && arg0, local26, this.aClass127_2 != null && !this.aClass127_2.aBoolean235 && arg2, !this.aClass127_3.aBoolean235); if (!this.aClass127_5.aBoolean235 && arg3 && arg1) { this.method4103(); @@ -1965,7 +1965,7 @@ public final class GlModel extends Model { this.aByte19 = (byte) (this.aByte19 | 0x2); } } - if (arg2 && Static178.aBoolean202) { + if (arg2 && Static178.highDetailLighting) { if (this.aClass127_2.aBoolean235) { this.aShortArray76 = null; this.aShortArray79 = null; @@ -2035,7 +2035,7 @@ public final class GlModel extends Model { @Pc(99) int local99; if (arg1) { @Pc(109) int local109; - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { for (local60 = 0; local60 < this.anInt5295; local60++) { local71 = Float.floatToRawIntBits((float) this.anIntArray461[local60]); local78 = Float.floatToRawIntBits((float) this.anIntArray465[local60]); @@ -2074,7 +2074,7 @@ public final class GlModel extends Model { } } if (arg2) { - if (Static178.aBoolean202) { + if (Static178.highDetailLighting) { for (local60 = 0; local60 < this.anInt5297; local60++) { local71 = Static237.method4096(this.aShortArray75[local60], this.aShortArray80[local60], this.aShort29, this.aByteArray71[local60]); Static237.aClass3_Sub15_8.offset = this.aClass127_1.anInt4777 + this.aShortArray77[local60] * local1; @@ -2167,7 +2167,7 @@ public final class GlModel extends Model { Static237.aClass3_Sub15_8.offset = this.aClass127_2.anInt4777; @Pc(752) short local752; @Pc(790) float local790; - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { for (local78 = 0; local78 < this.anInt5296; local78++) { local752 = this.aShortArray86[local78]; if (local752 == 0) { @@ -2201,7 +2201,7 @@ public final class GlModel extends Model { } if (arg4) { Static237.aClass3_Sub15_8.offset = this.aClass127_3.anInt4777; - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { for (local60 = 0; local60 < this.anInt5296; local60++) { Static237.aClass3_Sub15_8.pFloat(this.aFloatArray25[local60]); Static237.aClass3_Sub15_8.pFloat(this.aFloatArray26[local60]); @@ -2218,7 +2218,7 @@ public final class GlModel extends Model { Static237.aClass3_Sub15_8.offset = local1 * this.anInt5296; @Pc(1007) ByteBuffer local1007; if (arg0) { - if (Static239.aBoolean273) { + if (GlRenderer.aBoolean273) { local1007 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); if (this.aClass155_5 == null) { this.aClass155_5 = new GlVertexBufferObject(true); @@ -2283,7 +2283,7 @@ public final class GlModel extends Model { this.aClass127_3.anInt4782 = local1; } } - } else if (Static239.aBoolean271) { + } else if (GlRenderer.arbVboSupported) { @Pc(1211) GlVertexBufferObject local1211 = new GlVertexBufferObject(); @Pc(1218) ByteBuffer local1218 = ByteBuffer.wrap(Static237.aClass3_Sub15_8.data, 0, Static237.aClass3_Sub15_8.offset); local1211.method4519(local1218); @@ -2423,7 +2423,7 @@ public final class GlModel extends Model { arg3.aShortArray85[local69] = this.aShortArray85[local69]; arg3.aShortArray86[local69] = this.aShortArray86[local69]; } - if (Static178.aBoolean202) { + if (Static178.highDetailLighting) { if (arg4.aClass127_2 == null) { arg4.aClass127_2 = new GlBuffer(); } @@ -2528,7 +2528,7 @@ public final class GlModel extends Model { local3.aShortArray75 = Static263.method4511(this.aShortArray75); } local3.aByteArray71 = this.aByteArray71; - if (arg2 && arg3 && (arg6 && arg4 || Static178.aBoolean202)) { + if (arg2 && arg3 && (arg6 && arg4 || Static178.highDetailLighting)) { local3.aClass127_1 = this.aClass127_1; } else { local3.aClass127_1 = new GlBuffer(); @@ -2544,7 +2544,7 @@ public final class GlModel extends Model { local3.aShortArray85 = Static263.method4511(this.aShortArray85); local3.aShortArray86 = Static263.method4511(this.aShortArray86); } - if (!Static178.aBoolean202) { + if (!Static178.highDetailLighting) { local3.aClass127_2 = null; } else if (arg4 && arg5 && arg6) { local3.aClass127_2 = this.aClass127_2; @@ -2966,7 +2966,7 @@ public final class GlModel extends Model { @OriginalMember(owner = "client!td", name = "w", descriptor = "()V") private void method4121() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; if (this.anInt5297 == 0) { return; } @@ -3019,7 +3019,7 @@ public final class GlModel extends Model { } local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, (long) this.aClass127_1.anInt4777); } - if (Static178.aBoolean202 && this.aClass127_2.aClass155_4 != null) { + if (Static178.highDetailLighting && this.aClass127_2.aClass155_4 != null) { if (local172 != this.aClass127_2.aClass155_4) { this.aClass127_2.aClass155_4.method4516(); local172 = this.aClass127_2.aClass155_4; @@ -3036,8 +3036,8 @@ public final class GlModel extends Model { if (this.aClass127_5.aClass155_4 != null) { this.aClass127_5.aClass155_4.method4518(); } - if (this.aClass127_4.aClass155_4 == null || this.aClass127_1.aClass155_4 == null || Static178.aBoolean202 && this.aClass127_2.aClass155_4 == null || this.aClass127_3.aClass155_4 == null) { - if (Static239.aBoolean271) { + if (this.aClass127_4.aClass155_4 == null || this.aClass127_1.aClass155_4 == null || Static178.highDetailLighting && this.aClass127_2.aClass155_4 == null || this.aClass127_3.aClass155_4 == null) { + if (GlRenderer.arbVboSupported) { local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, 0); } if (this.aClass127_4.aClass155_4 == null) { @@ -3048,7 +3048,7 @@ public final class GlModel extends Model { this.aClass127_1.aByteBuffer8.position(this.aClass127_1.anInt4777); local1.glColorPointer(4, GL2.GL_UNSIGNED_BYTE, this.aClass127_1.anInt4782, this.aClass127_1.aByteBuffer8); } - if (Static178.aBoolean202 && this.aClass127_2.aClass155_4 == null) { + if (Static178.highDetailLighting && this.aClass127_2.aClass155_4 == null) { this.aClass127_2.aByteBuffer8.position(this.aClass127_2.anInt4777); local1.glNormalPointer(GL2.GL_FLOAT, this.aClass127_2.anInt4782, this.aClass127_2.aByteBuffer8); } @@ -3057,7 +3057,7 @@ public final class GlModel extends Model { local1.glTexCoordPointer(2, GL2.GL_FLOAT, this.aClass127_3.anInt4782, this.aClass127_3.aByteBuffer8); } } - if (this.aClass127_5.aClass155_4 == null && Static239.aBoolean271) { + if (this.aClass127_5.aClass155_4 == null && GlRenderer.arbVboSupported) { local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, 0); } @Pc(417) int local417 = this.anIntArray463.length - 1; @@ -3066,8 +3066,8 @@ public final class GlModel extends Model { @Pc(434) int local434 = this.anIntArray463[local419 + 1]; @Pc(439) short local439 = this.aShortArray80[local427]; if (local439 == -1) { - Static239.method4177(-1); - Static27.method766(0, 0); + GlRenderer.setTextureId(-1); + Static27.setMaterial(0, 0); } else { Rasteriser.anInterface1_2.method3227(local439 & 0xFFFF); } diff --git a/client/src/main/java/Static239.java b/client/src/main/java/GlRenderer.java similarity index 62% rename from client/src/main/java/Static239.java rename to client/src/main/java/GlRenderer.java index a2d5046..f00c4d2 100644 --- a/client/src/main/java/Static239.java +++ b/client/src/main/java/GlRenderer.java @@ -12,94 +12,94 @@ import org.openrs2.deob.annotation.OriginalArg; import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; -public final class Static239 { +public final class GlRenderer { @OriginalMember(owner = "client!tf", name = "a", descriptor = "Ljava/lang/String;") - private static String aString5; + private static String vendor; @OriginalMember(owner = "client!tf", name = "b", descriptor = "Ljava/lang/String;") - private static String aString6; + private static String renderer; @OriginalMember(owner = "client!tf", name = "c", descriptor = "F") private static float aFloat30; @OriginalMember(owner = "client!tf", name = "e", descriptor = "I") - public static int anInt5322; + public static int maxTextureUnits; @OriginalMember(owner = "client!tf", name = "f", descriptor = "Z") - public static boolean aBoolean263; + public static boolean bigEndian; @OriginalMember(owner = "client!tf", name = "k", descriptor = "F") private static float aFloat32; @OriginalMember(owner = "client!tf", name = "p", descriptor = "Lgl!javax/media/opengl/GLContext;") - private static GLContext aGLContext1; + private static GLContext context; @OriginalMember(owner = "client!tf", name = "r", descriptor = "Z") - public static boolean aBoolean267; + public static boolean extTexture3dSupported; @OriginalMember(owner = "client!tf", name = "t", descriptor = "Lgl!javax/media/opengl/GL;") public static GL2 gl; @OriginalMember(owner = "client!tf", name = "v", descriptor = "I") - private static int anInt5327; + private static int maxTextureImageUnits; @OriginalMember(owner = "client!tf", name = "y", descriptor = "Z") - public static boolean aBoolean270; + public static boolean arbMultisampleSupported; @OriginalMember(owner = "client!tf", name = "z", descriptor = "I") public static int anInt5328; @OriginalMember(owner = "client!tf", name = "A", descriptor = "I") - public static int anInt5329; + public static int canvasHeight; @OriginalMember(owner = "client!tf", name = "B", descriptor = "I") - private static int anInt5330; + private static int version; @OriginalMember(owner = "client!tf", name = "C", descriptor = "Z") - public static boolean aBoolean271; + public static boolean arbVboSupported; @OriginalMember(owner = "client!tf", name = "D", descriptor = "I") - private static int anInt5331; + private static int maxTextureCoords; @OriginalMember(owner = "client!tf", name = "E", descriptor = "Lgl!javax/media/opengl/GLDrawable;") - private static GLDrawable aGLDrawable1; + private static GLDrawable drawable; @OriginalMember(owner = "client!tf", name = "G", descriptor = "Z") public static boolean aBoolean273; @OriginalMember(owner = "client!tf", name = "H", descriptor = "Z") - public static boolean aBoolean274; + public static boolean arbVertexProgramSupported; @OriginalMember(owner = "client!tf", name = "J", descriptor = "I") - public static int anInt5332; + public static int canvasWidth; @OriginalMember(owner = "client!tf", name = "K", descriptor = "Z") - public static boolean aBoolean275; + public static boolean arbTextureCubeMapSupported; @OriginalMember(owner = "client!tf", name = "d", descriptor = "Z") - private static boolean aBoolean262 = false; + private static boolean textureMatrixModified = false; @OriginalMember(owner = "client!tf", name = "g", descriptor = "I") public static int anInt5323 = 0; @OriginalMember(owner = "client!tf", name = "h", descriptor = "I") - private static int anInt5324 = 0; + private static int textureCombineAlphaMode = 0; @OriginalMember(owner = "client!tf", name = "i", descriptor = "I") - private static int anInt5325 = 0; + private static int textureCombineeRgbMode = 0; @OriginalMember(owner = "client!tf", name = "j", descriptor = "F") private static float aFloat31 = 0.0F; @OriginalMember(owner = "client!tf", name = "l", descriptor = "Z") - private static boolean aBoolean264 = true; + private static boolean lightingEnabled = true; @OriginalMember(owner = "client!tf", name = "m", descriptor = "F") private static float aFloat33 = 0.0F; @OriginalMember(owner = "client!tf", name = "n", descriptor = "Z") - public static boolean aBoolean265 = true; + public static boolean normalArrayEnabled = true; @OriginalMember(owner = "client!tf", name = "o", descriptor = "Z") private static boolean aBoolean266 = false; @@ -108,22 +108,22 @@ public final class Static239 { private static final float aFloat34 = 0.09765625F; @OriginalMember(owner = "client!tf", name = "s", descriptor = "I") - private static int anInt5326 = -1; + private static int textureId = -1; @OriginalMember(owner = "client!tf", name = "u", descriptor = "Z") - private static boolean aBoolean268 = true; + private static boolean depthTestEnabled = true; @OriginalMember(owner = "client!tf", name = "w", descriptor = "Z") - public static boolean aBoolean269 = false; + public static boolean enabled = false; @OriginalMember(owner = "client!tf", name = "x", descriptor = "[F") - private static final float[] aFloatArray27 = new float[16]; + private static final float[] matrix = new float[16]; @OriginalMember(owner = "client!tf", name = "F", descriptor = "Z") - private static boolean aBoolean272 = true; + private static boolean fogEnabled = true; @OriginalMember(owner = "client!tf", name = "I", descriptor = "Lclient!na;") - private static final JagString aClass100_1007 = Static28.parse("radeon"); + private static final JagString RADEON = Static28.parse("radeon"); @OriginalMember(owner = "client!tf", name = "a", descriptor = "(Ljava/lang/String;)Lclient!na;") private static JagString method4147(@OriginalArg(0) String arg0) { @@ -138,41 +138,41 @@ public final class Static239 { @OriginalMember(owner = "client!tf", name = "a", descriptor = "(IIII)V") public static void method4148(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - method4171(0, 0, anInt5332, anInt5329, arg0, arg1, 0.0F, 0.0F, arg2, arg3); + method4171(0, 0, canvasWidth, canvasHeight, arg0, arg1, 0.0F, 0.0F, arg2, arg3); } @OriginalMember(owner = "client!tf", name = "a", descriptor = "()V") public static void method4149() { - Static27.method766(0, 0); + Static27.setMaterial(0, 0); method4163(); - method4183(1); - method4174(1); - method4164(false); - method4158(false); - method4154(false); - method4150(); + setTextureCombineRgbMode(1); + setTextureCombineAlphaMode(1); + setLightingEnabled(false); + setDepthTestEnabled(false); + setFogEnabled(false); + resetTextureMatrix(); } @OriginalMember(owner = "client!tf", name = "b", descriptor = "()V") - public static void method4150() { - if (aBoolean262) { + public static void resetTextureMatrix() { + if (textureMatrixModified) { gl.glMatrixMode(GL2.GL_TEXTURE); gl.glLoadIdentity(); gl.glMatrixMode(GL2.GL_MODELVIEW); - aBoolean262 = false; + textureMatrixModified = false; } } @OriginalMember(owner = "client!tf", name = "c", descriptor = "()V") public static void method4151() { - Static27.method766(0, 0); + Static27.setMaterial(0, 0); // MaterialManager method4163(); - method4183(0); - method4174(0); - method4164(false); - method4158(false); - method4154(false); - method4150(); + setTextureCombineRgbMode(0); + setTextureCombineAlphaMode(0); + setLightingEnabled(false); + setDepthTestEnabled(false); + setFogEnabled(false); + resetTextureMatrix(); } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(FF)V") @@ -183,69 +183,69 @@ public final class Static239 { aFloat33 = arg0; aFloat31 = arg1; if (arg1 == 0.0F) { - aFloatArray27[10] = aFloat30; - aFloatArray27[14] = aFloat32; + matrix[10] = aFloat30; + matrix[14] = aFloat32; } else { @Pc(25) float local25 = arg0 / (arg1 + arg0); @Pc(29) float local29 = local25 * local25; @Pc(42) float local42 = -aFloat32 * (1.0F - local25) * (1.0F - local25) / arg1; - aFloatArray27[10] = aFloat30 + local42; - aFloatArray27[14] = aFloat32 * local29; + matrix[10] = aFloat30 + local42; + matrix[14] = aFloat32 * local29; } gl.glMatrixMode(GL2.GL_PROJECTION); - gl.glLoadMatrixf(aFloatArray27, 0); + gl.glLoadMatrixf(matrix, 0); gl.glMatrixMode(GL2.GL_MODELVIEW); } @OriginalMember(owner = "client!tf", name = "d", descriptor = "()V") public static void method4153() { try { - aGLDrawable1.swapBuffers(); + drawable.swapBuffers(); } catch (@Pc(3) Exception local3) { } } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(Z)V") - public static void method4154(@OriginalArg(0) boolean arg0) { - if (arg0 == aBoolean272) { + public static void setFogEnabled(@OriginalArg(0) boolean enabled) { + if (enabled == fogEnabled) { return; } - if (arg0) { + if (enabled) { gl.glEnable(GL2.GL_FOG); } else { gl.glDisable(GL2.GL_FOG); } - aBoolean272 = arg0; + fogEnabled = enabled; } @OriginalMember(owner = "client!tf", name = "e", descriptor = "()V") public static void method4155() { - Static27.method766(0, 0); + Static27.setMaterial(0, 0); method4163(); - method4183(0); - method4174(0); - method4164(false); - method4158(false); - method4154(false); - method4150(); + setTextureCombineRgbMode(0); + setTextureCombineAlphaMode(0); + setLightingEnabled(false); + setDepthTestEnabled(false); + setFogEnabled(false); + resetTextureMatrix(); } @OriginalMember(owner = "client!tf", name = "f", descriptor = "()V") private static void method4156() { aBoolean266 = false; gl.glDisable(GL2.GL_TEXTURE_2D); - anInt5326 = -1; + textureId = -1; gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_COMBINE); gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); - anInt5325 = 0; + textureCombineeRgbMode = 0; gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE); - anInt5324 = 0; + textureCombineAlphaMode = 0; gl.glEnable(GL2.GL_LIGHTING); gl.glEnable(GL2.GL_FOG); gl.glEnable(GL2.GL_DEPTH_TEST); - aBoolean264 = true; - aBoolean268 = true; - aBoolean272 = true; + lightingEnabled = true; + depthTestEnabled = true; + fogEnabled = true; Static83.method440(); gl.glActiveTexture(GL2.GL_TEXTURE1); gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_MODE, GL2.GL_COMBINE); @@ -257,7 +257,7 @@ public final class Static239 { gl.glShadeModel(GL2.GL_SMOOTH); gl.glClearDepth(1.0D); gl.glDepthFunc(GL2.GL_LEQUAL); - method4157(); + enableDepthMask(); gl.glMatrixMode(GL2.GL_TEXTURE); gl.glLoadIdentity(); gl.glPolygonMode(GL2.GL_FRONT, GL2.GL_FILL); @@ -269,23 +269,23 @@ public final class Static239 { gl.glAlphaFunc(GL2.GL_GREATER, 0.0F); gl.glEnableClientState(GL2.GL_VERTEX_ARRAY); gl.glEnableClientState(GL2.GL_NORMAL_ARRAY); - aBoolean265 = true; + normalArrayEnabled = true; gl.glEnableClientState(GL2.GL_COLOR_ARRAY); gl.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); gl.glMatrixMode(GL2.GL_MODELVIEW); gl.glLoadIdentity(); Static161.method3065(); - Static120.method2400(); + Static120.method2400(); // LightingManager } @OriginalMember(owner = "client!tf", name = "g", descriptor = "()V") - public static void method4157() { + public static void enableDepthMask() { gl.glDepthMask(true); } @OriginalMember(owner = "client!tf", name = "b", descriptor = "(Z)V") - public static void method4158(@OriginalArg(0) boolean arg0) { - if (arg0 == aBoolean268) { + public static void setDepthTestEnabled(@OriginalArg(0) boolean arg0) { + if (arg0 == depthTestEnabled) { return; } if (arg0) { @@ -293,7 +293,7 @@ public final class Static239 { } else { gl.glDisable(GL2.GL_DEPTH_TEST); } - aBoolean268 = arg0; + depthTestEnabled = arg0; } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(F)V") @@ -308,14 +308,14 @@ public final class Static239 { gl.glGetIntegerv(GL2.GL_READ_BUFFER, local2, 1); gl.glDrawBuffer(GL2.GL_BACK_LEFT); gl.glReadBuffer(GL2.GL_FRONT_LEFT); - method4177(-1); + setTextureId(-1); gl.glPushAttrib(GL2.GL_ENABLE_BIT); gl.glDisable(GL2.GL_FOG); gl.glDisable(GL2.GL_BLEND); gl.glDisable(GL2.GL_DEPTH_TEST); gl.glDisable(GL2.GL_ALPHA_TEST); gl.glRasterPos2i(0, 0); - gl.glCopyPixels(0, 0, anInt5332, anInt5329, GL2.GL_COLOR); + gl.glCopyPixels(0, 0, canvasWidth, canvasHeight, GL2.GL_COLOR); gl.glPopAttrib(); gl.glDrawBuffer(local2[0]); gl.glReadBuffer(local2[1]); @@ -347,13 +347,13 @@ public final class Static239 { @OriginalMember(owner = "client!tf", name = "i", descriptor = "()V") public static void method4162() { - Static27.method766(0, 0); + Static27.setMaterial(0, 0); method4163(); - method4177(-1); - method4164(false); - method4158(false); - method4154(false); - method4150(); + setTextureId(-1); + setLightingEnabled(false); + setDepthTestEnabled(false); + setFogEnabled(false); + resetTextureMatrix(); } @OriginalMember(owner = "client!tf", name = "j", descriptor = "()V") @@ -363,16 +363,16 @@ public final class Static239 { } gl.glMatrixMode(GL2.GL_PROJECTION); gl.glLoadIdentity(); - gl.glOrtho(0.0D, (double) anInt5332, 0.0D, (double) anInt5329, -1.0D, 1.0D); - gl.glViewport(0, 0, anInt5332, anInt5329); + gl.glOrtho(0.0D, (double) canvasWidth, 0.0D, (double) canvasHeight, -1.0D, 1.0D); + gl.glViewport(0, 0, canvasWidth, canvasHeight); gl.glMatrixMode(GL2.GL_MODELVIEW); gl.glLoadIdentity(); aBoolean266 = true; } @OriginalMember(owner = "client!tf", name = "c", descriptor = "(Z)V") - public static void method4164(@OriginalArg(0) boolean arg0) { - if (arg0 == aBoolean264) { + public static void setLightingEnabled(@OriginalArg(0) boolean arg0) { + if (arg0 == lightingEnabled) { return; } if (arg0) { @@ -380,7 +380,7 @@ public final class Static239 { } else { gl.glDisable(GL2.GL_LIGHTING); } - aBoolean264 = arg0; + lightingEnabled = arg0; } @OriginalMember(owner = "client!tf", name = "l", descriptor = "()F") @@ -389,82 +389,82 @@ public final class Static239 { } @OriginalMember(owner = "client!tf", name = "m", descriptor = "()I") - private static int method4167() { - @Pc(1) int local1 = 0; - aString5 = gl.glGetString(GL2.GL_VENDOR); - aString6 = gl.glGetString(GL2.GL_RENDERER); - @Pc(12) String local12 = aString5.toLowerCase(); - if (local12.indexOf("microsoft") != -1) { - local1 = 1; + private static int checkContext() { + @Pc(1) int result = 0; + vendor = gl.glGetString(GL2.GL_VENDOR); + renderer = gl.glGetString(GL2.GL_RENDERER); + @Pc(12) String vendor = GlRenderer.vendor.toLowerCase(); + if (vendor.indexOf("microsoft") != -1) { + result = 1; } - if (local12.indexOf("brian paul") != -1 || local12.indexOf("mesa") != -1) { - local1 |= 0x1; + if (vendor.indexOf("brian paul") != -1 || vendor.indexOf("mesa") != -1) { + result |= 0x1; } - @Pc(39) String local39 = gl.glGetString(GL2.GL_VERSION); - @Pc(43) String[] local43 = local39.split("[. ]"); - if (local43.length >= 2) { + @Pc(39) String version = gl.glGetString(GL2.GL_VERSION); + @Pc(43) String[] versionParts = version.split("[. ]"); + if (versionParts.length >= 2) { try { - @Pc(52) int local52 = Integer.parseInt(local43[0]); - @Pc(57) int local57 = Integer.parseInt(local43[1]); - anInt5330 = local52 * 10 + local57; - } catch (@Pc(65) NumberFormatException local65) { - local1 |= 0x4; + @Pc(52) int major = Integer.parseInt(versionParts[0]); + @Pc(57) int minor = Integer.parseInt(versionParts[1]); + GlRenderer.version = major * 10 + minor; + } catch (@Pc(65) NumberFormatException ex) { + result |= 0x4; } } else { - local1 |= 0x4; + result |= 0x4; } - if (anInt5330 < 12) { - local1 |= 0x2; + if (GlRenderer.version < 12) { + result |= 0x2; } if (!gl.isExtensionAvailable("GL_ARB_multitexture")) { - local1 |= 0x8; + result |= 0x8; } if (!gl.isExtensionAvailable("GL_ARB_texture_env_combine")) { - local1 |= 0x20; + result |= 0x20; } - @Pc(100) int[] local100 = new int[1]; - gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_UNITS, local100, 0); - anInt5322 = local100[0]; - gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_COORDS, local100, 0); - anInt5331 = local100[0]; - gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_IMAGE_UNITS, local100, 0); - anInt5327 = local100[0]; - if (anInt5322 < 2 || anInt5331 < 2 || anInt5327 < 2) { - local1 |= 0x10; + @Pc(100) int[] data = new int[1]; + gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_UNITS, data, 0); + maxTextureUnits = data[0]; + gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_COORDS, data, 0); + maxTextureCoords = data[0]; + gl.glGetIntegerv(GL2.GL_MAX_TEXTURE_IMAGE_UNITS, data, 0); + maxTextureImageUnits = data[0]; + if (maxTextureUnits < 2 || maxTextureCoords < 2 || maxTextureImageUnits < 2) { + result |= 0x10; } - if (local1 != 0) { - return local1; + if (result != 0) { + return result; } - aBoolean263 = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN; - aBoolean271 = gl.isExtensionAvailable("GL_ARB_vertex_buffer_object"); - aBoolean270 = gl.isExtensionAvailable("GL_ARB_multisample"); - aBoolean275 = gl.isExtensionAvailable("GL_ARB_texture_cube_map"); - aBoolean274 = gl.isExtensionAvailable("GL_ARB_vertex_program"); - aBoolean267 = gl.isExtensionAvailable("GL_EXT_texture3D"); - @Pc(176) JagString local176 = method4147(aString6).method3114(); - if (local176.method3131(aClass100_1007) != -1) { - @Pc(184) int local184 = 0; - @Pc(193) JagString[] local193 = local176.method3145().method3147(32); - for (@Pc(195) int local195 = 0; local195 < local193.length; local195++) { - @Pc(203) JagString local203 = local193[local195]; - if (local203.length() >= 4 && local203.method3137(4, 0).method3123()) { - local184 = local203.method3137(4, 0).method3132(); + bigEndian = ByteOrder.nativeOrder() == ByteOrder.BIG_ENDIAN; + arbVboSupported = gl.isExtensionAvailable("GL_ARB_vertex_buffer_object"); + arbMultisampleSupported = gl.isExtensionAvailable("GL_ARB_multisample"); + arbTextureCubeMapSupported = gl.isExtensionAvailable("GL_ARB_texture_cube_map"); + arbVertexProgramSupported = gl.isExtensionAvailable("GL_ARB_vertex_program"); + extTexture3dSupported = gl.isExtensionAvailable("GL_EXT_texture3D"); + @Pc(176) JagString renderer = method4147(GlRenderer.renderer).toLowerCase(); + if (renderer.indexOf(RADEON) != -1) { + @Pc(184) int v = 0; + @Pc(193) JagString[] rendererParts = renderer.method3145().method3147(32); + for (@Pc(195) int i = 0; i < rendererParts.length; i++) { + @Pc(203) JagString part = rendererParts[i]; + if (part.length() >= 4 && part.substring(4, 0).method3123()) { + v = part.substring(4, 0).method3132(); break; } } - if (local184 >= 7000 && local184 <= 7999) { - aBoolean271 = false; + if (v >= 7000 && v <= 7999) { + arbVboSupported = false; } - if (local184 >= 7000 && local184 <= 9250) { - aBoolean267 = false; + if (v >= 7000 && v <= 9250) { + extTexture3dSupported = false; } - aBoolean273 = aBoolean271; + aBoolean273 = arbVboSupported; } - if (aBoolean271) { + if (arbVboSupported) { try { - @Pc(250) int[] local250 = new int[1]; - gl.glGenBuffers(1, local250, 0); - } catch (@Pc(257) Throwable local257) { + @Pc(250) int[] temp = new int[1]; + gl.glGenBuffers(1, temp, 0); + } catch (@Pc(257) Throwable ex) { return -4; } } @@ -472,53 +472,53 @@ public final class Static239 { } @OriginalMember(owner = "client!tf", name = "n", descriptor = "()V") - public static void method4168() { + public static void clearDepthBuffer() { gl.glClear(GL2.GL_DEPTH_BUFFER_BIT); } @OriginalMember(owner = "client!tf", name = "o", descriptor = "()V") - public static void method4169() { + public static void quit() { if (gl != null) { try { - Static172.method3225(); + Static172.quit(); // MaterialManager } catch (@Pc(5) Throwable local5) { } gl = null; } - if (aGLContext1 != null) { - Static63.method1488(); + if (context != null) { + Static63.clear(); // GlCleaner try { - if (GLContext.getCurrent() == aGLContext1) { - aGLContext1.release(); + if (GLContext.getCurrent() == context) { + context.release(); } - } catch (@Pc(17) Throwable local17) { + } catch (@Pc(17) Throwable ex) { } try { - aGLContext1.destroy(); - } catch (@Pc(21) Throwable local21) { + context.destroy(); + } catch (@Pc(21) Throwable ex) { } - aGLContext1 = null; + context = null; } - if (aGLDrawable1 != null) { + if (drawable != null) { try { - aGLDrawable1.setRealized(false); - } catch (@Pc(30) Throwable local30) { + drawable.setRealized(false); + } catch (@Pc(30) Throwable ex) { } - aGLDrawable1 = null; + drawable = null; } - Static120.method2398(); - aBoolean269 = false; + Static120.method2398(); // LightingManager + enabled = false; } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(FFF)V") - public static void method4170(@OriginalArg(0) float arg0, @OriginalArg(1) float arg1, @OriginalArg(2) float arg2) { + public static void translateTextureMatrix(@OriginalArg(0) float x, @OriginalArg(1) float y, @OriginalArg(2) float z) { gl.glMatrixMode(GL2.GL_TEXTURE); - if (aBoolean262) { + if (textureMatrixModified) { gl.glLoadIdentity(); } - gl.glTranslatef(arg0, arg1, arg2); + gl.glTranslatef(x, y, z); gl.glMatrixMode(GL2.GL_MODELVIEW); - aBoolean262 = true; + textureMatrixModified = true; } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(IIIIIIFFII)V") @@ -530,7 +530,7 @@ public final class Static239 { gl.glMatrixMode(GL2.GL_PROJECTION); gl.glLoadIdentity(); method4175((float) local7 * aFloat34, (float) local17 * aFloat34, (float) -local35 * aFloat34, (float) -local25 * aFloat34, 50.0F, 3584.0F); - gl.glViewport(arg0, anInt5329 - arg1 - arg3, arg2, arg3); + gl.glViewport(arg0, canvasHeight - arg1 - arg3, arg2, arg3); gl.glMatrixMode(GL2.GL_MODELVIEW); gl.glLoadIdentity(); gl.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); @@ -548,95 +548,95 @@ public final class Static239 { } @OriginalMember(owner = "client!tf", name = "d", descriptor = "(Z)V") - private static void method4172(@OriginalArg(0) boolean arg0) { - if (arg0 == aBoolean265) { + private static void setNormalArrayEnabled(@OriginalArg(0) boolean enabled) { + if (enabled == normalArrayEnabled) { return; } - if (arg0) { + if (enabled) { gl.glEnableClientState(GL2.GL_NORMAL_ARRAY); } else { gl.glDisableClientState(GL2.GL_NORMAL_ARRAY); } - aBoolean265 = arg0; + normalArrayEnabled = enabled; } @OriginalMember(owner = "client!tf", name = "p", descriptor = "()V") public static void method4173() { - if (Static178.aBoolean202) { - method4164(true); - method4172(true); + if (Static178.highDetailLighting) { + setLightingEnabled(true); + setNormalArrayEnabled(true); } else { - method4164(false); - method4172(false); + setLightingEnabled(false); + setNormalArrayEnabled(false); } } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(I)V") - public static void method4174(@OriginalArg(0) int arg0) { - if (arg0 == anInt5324) { + public static void setTextureCombineAlphaMode(@OriginalArg(0) int mode) { + if (mode == textureCombineAlphaMode) { return; } - if (arg0 == 0) { + if (mode == 0) { gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_MODULATE); } - if (arg0 == 1) { + if (mode == 1) { gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_REPLACE); } - if (arg0 == 2) { + if (mode == 2) { gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_ADD); } - anInt5324 = arg0; + textureCombineAlphaMode = mode; } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(FFFFFF)V") private static void method4175(@OriginalArg(0) float arg0, @OriginalArg(1) float arg1, @OriginalArg(2) float arg2, @OriginalArg(3) float arg3, @OriginalArg(4) float arg4, @OriginalArg(5) float arg5) { @Pc(3) float local3 = arg4 * 2.0F; - aFloatArray27[0] = local3 / (arg1 - arg0); - aFloatArray27[1] = 0.0F; - aFloatArray27[2] = 0.0F; - aFloatArray27[3] = 0.0F; - aFloatArray27[4] = 0.0F; - aFloatArray27[5] = local3 / (arg3 - arg2); - aFloatArray27[6] = 0.0F; - aFloatArray27[7] = 0.0F; - aFloatArray27[8] = (arg1 + arg0) / (arg1 - arg0); - aFloatArray27[9] = (arg3 + arg2) / (arg3 - arg2); - aFloatArray27[10] = aFloat30 = -(arg5 + arg4) / (arg5 - arg4); - aFloatArray27[11] = -1.0F; - aFloatArray27[12] = 0.0F; - aFloatArray27[13] = 0.0F; - aFloatArray27[14] = aFloat32 = -(local3 * arg5) / (arg5 - arg4); - aFloatArray27[15] = 0.0F; - gl.glLoadMatrixf(aFloatArray27, 0); + matrix[0] = local3 / (arg1 - arg0); + matrix[1] = 0.0F; + matrix[2] = 0.0F; + matrix[3] = 0.0F; + matrix[4] = 0.0F; + matrix[5] = local3 / (arg3 - arg2); + matrix[6] = 0.0F; + matrix[7] = 0.0F; + matrix[8] = (arg1 + arg0) / (arg1 - arg0); + matrix[9] = (arg3 + arg2) / (arg3 - arg2); + matrix[10] = aFloat30 = -(arg5 + arg4) / (arg5 - arg4); + matrix[11] = -1.0F; + matrix[12] = 0.0F; + matrix[13] = 0.0F; + matrix[14] = aFloat32 = -(local3 * arg5) / (arg5 - arg4); + matrix[15] = 0.0F; + gl.glLoadMatrixf(matrix, 0); aFloat33 = 0.0F; aFloat31 = 0.0F; } @OriginalMember(owner = "client!tf", name = "b", descriptor = "(I)V") - public static void method4176(@OriginalArg(0) int arg0) { - gl.glClearColor((float) (arg0 >> 16 & 0xFF) / 255.0F, (float) (arg0 >> 8 & 0xFF) / 255.0F, (float) (arg0 & 0xFF) / 255.0F, 0.0F); + public static void clearColorAndDepthBuffers(@OriginalArg(0) int rgb) { + gl.glClearColor((float) (rgb >> 16 & 0xFF) / 255.0F, (float) (rgb >> 8 & 0xFF) / 255.0F, (float) (rgb & 0xFF) / 255.0F, 0.0F); gl.glClear(GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_COLOR_BUFFER_BIT); gl.glClearColor(0.0F, 0.0F, 0.0F, 0.0F); } @OriginalMember(owner = "client!tf", name = "c", descriptor = "(I)V") - public static void method4177(@OriginalArg(0) int arg0) { - if (arg0 == anInt5326) { + public static void setTextureId(@OriginalArg(0) int id) { + if (id == textureId) { return; } - if (arg0 == -1) { + if (id == -1) { gl.glDisable(GL2.GL_TEXTURE_2D); } else { - if (anInt5326 == -1) { + if (textureId == -1) { gl.glEnable(GL2.GL_TEXTURE_2D); } - gl.glBindTexture(GL2.GL_TEXTURE_2D, arg0); + gl.glBindTexture(GL2.GL_TEXTURE_2D, id); } - anInt5326 = arg0; + textureId = id; } @OriginalMember(owner = "client!tf", name = "q", descriptor = "()V") - public static void method4178() { + public static void disableDepthMask() { gl.glDepthMask(false); } @@ -646,92 +646,92 @@ public final class Static239 { } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(Ljava/awt/Canvas;I)I") - public static int method4180(@OriginalArg(0) Canvas canvas, @OriginalArg(1) int arg1) { + public static int init(@OriginalArg(0) Canvas canvas, @OriginalArg(1) int numSamples) { try { if (!canvas.isDisplayable()) { return -1; } - GLProfile glProfile = GLProfile.get(GLProfile.GL2); - @Pc(8) GLCapabilities glCaps = new GLCapabilities(glProfile); - if (arg1 > 0) { - glCaps.setSampleBuffers(true); - glCaps.setNumSamples(arg1); + GLProfile profile = GLProfile.get(GLProfile.GL2); + @Pc(8) GLCapabilities capabilities = new GLCapabilities(profile); + if (numSamples > 0) { + capabilities.setSampleBuffers(true); + capabilities.setNumSamples(numSamples); } - @Pc(18) GLDrawableFactory glDrawableFactory = GLDrawableFactory.getFactory(glProfile); - AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), glCaps, glCaps); - JAWTWindow jawtWindow = NewtFactoryAWT.getNativeWindow(canvas, config); - aGLDrawable1 = glDrawableFactory.createGLDrawable(jawtWindow); - aGLDrawable1.setRealized(true); - @Pc(29) int local29 = 0; - @Pc(36) int var5; + @Pc(18) GLDrawableFactory factory = GLDrawableFactory.getFactory(profile); + AWTGraphicsConfiguration config = AWTGraphicsConfiguration.create(canvas.getGraphicsConfiguration(), capabilities, capabilities); + JAWTWindow window = NewtFactoryAWT.getNativeWindow(canvas, config); + drawable = factory.createGLDrawable(window); + drawable.setRealized(true); + @Pc(29) int swapBuffersAttempts = 0; + @Pc(36) int result; while (true) { - aGLContext1 = aGLDrawable1.createContext(null); + context = drawable.createContext(null); try { - var5 = aGLContext1.makeCurrent(); - if (var5 != 0) { + result = context.makeCurrent(); + if (result != 0) { break; } } catch (@Pc(41) Exception local41) { } - if (local29++ > 5) { + if (swapBuffersAttempts++ > 5) { return -2; } - Static231.method3983(1000L); + Static231.sleep(1000L); } gl = GLContext.getCurrentGL().getGL2(); new GLUgl2es1(); - aBoolean269 = true; - anInt5332 = canvas.getSize().width; - anInt5329 = canvas.getSize().height; - var5 = method4167(); - if (var5 != 0) { - method4169(); - return var5; + enabled = true; + canvasWidth = canvas.getSize().width; + canvasHeight = canvas.getSize().height; + result = checkContext(); + if (result != 0) { + quit(); + return result; } method4184(); method4156(); gl.glClear(GL2.GL_COLOR_BUFFER_BIT); - local29 = 0; + swapBuffersAttempts = 0; while (true) { try { - aGLDrawable1.swapBuffers(); + drawable.swapBuffers(); break; - } catch (@Pc(86) Exception local86) { - if (local29++ > 5) { - method4169(); + } catch (@Pc(86) Exception ex) { + if (swapBuffersAttempts++ > 5) { + quit(); return -3; } - Static231.method3983(100L); + Static231.sleep(100L); } } gl.glClear(GL2.GL_COLOR_BUFFER_BIT); return 0; - } catch (@Pc(103) Throwable local103) { - method4169(); + } catch (@Pc(103) Throwable ex) { + quit(); return -5; } } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(II)V") - public static void method4181(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - anInt5332 = arg0; - anInt5329 = arg1; + public static void setCanvasSize(@OriginalArg(0) int width, @OriginalArg(1) int height) { + canvasWidth = width; + canvasHeight = height; aBoolean266 = false; } @OriginalMember(owner = "client!tf", name = "a", descriptor = "(IIIIII)V") public static void method4182(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { @Pc(2) int local2 = -arg0; - @Pc(6) int local6 = anInt5332 - arg0; + @Pc(6) int local6 = canvasWidth - arg0; @Pc(9) int local9 = -arg1; - @Pc(13) int local13 = anInt5329 - arg1; + @Pc(13) int local13 = canvasHeight - arg1; gl.glMatrixMode(GL2.GL_PROJECTION); gl.glLoadIdentity(); @Pc(23) float local23 = (float) arg2 / 512.0F; @Pc(30) float local30 = local23 * (256.0F / (float) arg4); @Pc(37) float local37 = local23 * (256.0F / (float) arg5); gl.glOrtho((double) ((float) local2 * local30), (double) ((float) local6 * local30), (double) ((float) -local13 * local37), (double) ((float) -local9 * local37), (double) (50 - arg3), (double) (3584 - arg3)); - gl.glViewport(0, 0, anInt5332, anInt5329); + gl.glViewport(0, 0, canvasWidth, canvasHeight); gl.glMatrixMode(GL2.GL_MODELVIEW); gl.glLoadIdentity(); gl.glRotatef(180.0F, 1.0F, 0.0F, 0.0F); @@ -739,8 +739,8 @@ public final class Static239 { } @OriginalMember(owner = "client!tf", name = "d", descriptor = "(I)V") - public static void method4183(@OriginalArg(0) int arg0) { - if (arg0 == anInt5325) { + public static void setTextureCombineRgbMode(@OriginalArg(0) int arg0) { + if (arg0 == textureCombineeRgbMode) { return; } if (arg0 == 0) { @@ -761,7 +761,7 @@ public final class Static239 { if (arg0 == 5) { gl.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_INTERPOLATE); } - anInt5325 = arg0; + textureCombineeRgbMode = arg0; } @OriginalMember(owner = "client!tf", name = "s", descriptor = "()V") diff --git a/client/src/main/java/GlSolidColorTexture.java b/client/src/main/java/GlSolidColorTexture.java index bb23f8b..8d74933 100644 --- a/client/src/main/java/GlSolidColorTexture.java +++ b/client/src/main/java/GlSolidColorTexture.java @@ -19,12 +19,12 @@ public final class GlSolidColorTexture extends SecondaryNode { @OriginalMember(owner = "client!sd", name = "", descriptor = "(I)V") public GlSolidColorTexture(@OriginalArg(0) int arg0) { - @Pc(9) GL2 local9 = Static239.gl; + @Pc(9) GL2 local9 = GlRenderer.gl; @Pc(12) int[] local12 = new int[1]; local9.glGenTextures(1, local12, 0); this.anInt5058 = local12[0]; this.anInt5059 = Static63.anInt1943; - Static239.method4177(this.anInt5058); + GlRenderer.setTextureId(this.anInt5058); @Pc(32) int local32 = Rasteriser.anIntArray220[arg0]; @Pc(58) byte[] local58 = new byte[] { (byte) (local32 >> 16), (byte) (local32 >> 8), (byte) local32, -1 }; @Pc(61) ByteBuffer local61 = ByteBuffer.wrap(local58); @@ -50,13 +50,13 @@ public final class GlSolidColorTexture extends SecondaryNode { public final void method3887() { @Pc(8) int local8 = Static56.method1314(); if ((local8 & 0x1) == 0) { - Static239.method4177(this.anInt5058); + GlRenderer.setTextureId(this.anInt5058); } if ((local8 & 0x2) == 0) { - Static239.method4183(0); + GlRenderer.setTextureCombineRgbMode(0); } if ((local8 & 0x4) == 0) { - Static239.method4174(0); + GlRenderer.setTextureCombineAlphaMode(0); } } } diff --git a/client/src/main/java/GlSprite.java b/client/src/main/java/GlSprite.java index 1ad6097..145b60a 100644 --- a/client/src/main/java/GlSprite.java +++ b/client/src/main/java/GlSprite.java @@ -59,7 +59,7 @@ public class GlSprite extends Sprite { return; } this.anInt1873 = arg0; - @Pc(9) GL2 local9 = Static239.gl; + @Pc(9) GL2 local9 = GlRenderer.gl; if (arg0 == 2) { local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local9.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); @@ -74,11 +74,11 @@ public class GlSprite extends Sprite { if (arg2 == null) { return; } - Static239.method4149(); - Static239.method4177(arg2.anInt1872); + GlRenderer.method4149(); + GlRenderer.setTextureId(arg2.anInt1872); arg2.method1424(1); - @Pc(11) GL2 local11 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(11) GL2 local11 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); local11.glActiveTexture(GL2.GL_TEXTURE1); local11.glEnable(GL2.GL_TEXTURE_2D); @@ -97,16 +97,16 @@ public class GlSprite extends Sprite { @Pc(115) float local115 = (float) this.anInt1859 / (float) this.anInt1874; local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local68, local56); local11.glTexCoord2f(local107, 0.0F); - local11.glVertex2f((float) (local85 + this.anInt1867), (float) (Static239.anInt5329 - local90)); + local11.glVertex2f((float) (local85 + this.anInt1867), (float) (GlRenderer.canvasHeight - local90)); local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local47, local56); local11.glTexCoord2f(0.0F, 0.0F); - local11.glVertex2f((float) local85, (float) (Static239.anInt5329 - local90)); + local11.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local90)); local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local47, local80); local11.glTexCoord2f(0.0F, local115); - local11.glVertex2f((float) local85, (float) (Static239.anInt5329 - local90 - this.anInt1859)); + local11.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local90 - this.anInt1859)); local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local68, local80); local11.glTexCoord2f(local107, local115); - local11.glVertex2f((float) (local85 + this.anInt1867), (float) (Static239.anInt5329 - local90 - this.anInt1859)); + local11.glVertex2f((float) (local85 + this.anInt1867), (float) (GlRenderer.canvasHeight - local90 - this.anInt1859)); local11.glEnd(); local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); @@ -116,9 +116,9 @@ public class GlSprite extends Sprite { @OriginalMember(owner = "client!cf", name = "c", descriptor = "(IIIII)V") public final void method1426(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - Static239.method4155(); - @Pc(2) GL2 local2 = Static239.gl; - Static239.method4177(this.anInt1872); + GlRenderer.method4155(); + @Pc(2) GL2 local2 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); @Pc(16) float local16 = (float) this.anInt1867 / (float) this.anInt1870; @Pc(24) float local24 = (float) this.anInt1859 / (float) this.anInt1874; @@ -126,7 +126,7 @@ public class GlSprite extends Sprite { @Pc(34) float local34 = local24 * (float) arg4; @Pc(39) int local39 = arg0 + this.anInt1863; @Pc(46) int local46 = local39 + this.anInt1867 * arg3; - @Pc(53) int local53 = Static239.anInt5329 - arg1 - this.anInt1861; + @Pc(53) int local53 = GlRenderer.canvasHeight - arg1 - this.anInt1861; @Pc(60) int local60 = local53 - this.anInt1859 * arg4; @Pc(65) float local65 = (float) arg2 / 256.0F; local2.glBegin(GL2.GL_TRIANGLE_FAN); @@ -147,11 +147,11 @@ public class GlSprite extends Sprite { if (arg8 == null) { return; } - Static239.method4149(); - Static239.method4177(arg8.anInt1872); + GlRenderer.method4149(); + GlRenderer.setTextureId(arg8.anInt1872); arg8.method1424(1); - @Pc(11) GL2 local11 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(11) GL2 local11 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); local11.glActiveTexture(GL2.GL_TEXTURE1); local11.glEnable(GL2.GL_TEXTURE_2D); @@ -182,16 +182,16 @@ public class GlSprite extends Sprite { @Pc(217) float local217 = (float) (this.anInt1874 * 65536); local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local188, 0.0F); local11.glTexCoord2f((float) local120 / local211, (float) local132 / local217); - local11.glVertex2f((float) (arg0 + arg2), (float) (Static239.anInt5329 - arg1)); + local11.glVertex2f((float) (arg0 + arg2), (float) (GlRenderer.canvasHeight - arg1)); local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, 0.0F, 0.0F); local11.glTexCoord2f((float) local96 / local211, (float) local108 / local217); - local11.glVertex2f((float) arg0, (float) (Static239.anInt5329 - arg1)); + local11.glVertex2f((float) arg0, (float) (GlRenderer.canvasHeight - arg1)); local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, 0.0F, local196); local11.glTexCoord2f((float) local144 / local211, (float) local156 / local217); - local11.glVertex2f((float) arg0, (float) (Static239.anInt5329 - arg1 - arg3)); + local11.glVertex2f((float) arg0, (float) (GlRenderer.canvasHeight - arg1 - arg3)); local11.glMultiTexCoord2f(GL2.GL_TEXTURE1, local188, local196); local11.glTexCoord2f((float) local168 / local211, (float) local180 / local217); - local11.glVertex2f((float) (arg0 + arg2), (float) (Static239.anInt5329 - arg1 - arg3)); + local11.glVertex2f((float) (arg0 + arg2), (float) (GlRenderer.canvasHeight - arg1 - arg3)); local11.glEnd(); local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_RGB, GL2.GL_MODULATE); local11.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_TEXTURE); @@ -202,13 +202,13 @@ public class GlSprite extends Sprite { @OriginalMember(owner = "client!cf", name = "d", descriptor = "(II)V") @Override public final void method1421(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - Static239.method4149(); + GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(12) GL2 local12 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); - local12.glTranslatef((float) local5, (float) (Static239.anInt5329 - local10), 0.0F); + local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); @Pc(35) float local35 = (float) this.anInt1867 / (float) this.anInt1870; @Pc(43) float local43 = (float) this.anInt1859 / (float) this.anInt1874; local12.glBegin(GL2.GL_TRIANGLE_FAN); @@ -227,26 +227,26 @@ public class GlSprite extends Sprite { @OriginalMember(owner = "client!cf", name = "e", descriptor = "(II)V") @Override public final void method1423(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - Static239.method4149(); + GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(12) GL2 local12 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); - local12.glTranslatef((float) local5, (float) (Static239.anInt5329 - local10), 0.0F); + local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); local12.glCallList(this.anInt1871); local12.glLoadIdentity(); } @OriginalMember(owner = "client!cf", name = "b", descriptor = "(IIIIII)V") public final void method1428(@OriginalArg(2) int arg0, @OriginalArg(3) int arg1, @OriginalArg(4) int arg2) { - Static239.method4149(); - @Pc(2) GL2 local2 = Static239.gl; - Static239.method4177(this.anInt1872); + GlRenderer.method4149(); + @Pc(2) GL2 local2 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(2); @Pc(15) int local15 = 240 - (this.anInt1863 << 4); @Pc(22) int local22 = 240 - (this.anInt1861 << 4); - local2.glTranslatef((float) arg0 / 16.0F, (float) Static239.anInt5329 - (float) arg1 / 16.0F, 0.0F); + local2.glTranslatef((float) arg0 / 16.0F, (float) GlRenderer.canvasHeight - (float) arg1 / 16.0F, 0.0F); local2.glRotatef((float) -arg2 * 0.005493164F, 0.0F, 0.0F, 1.0F); local2.glTranslatef((float) -local15 / 16.0F, (float) local22 / 16.0F, 0.0F); local2.glCallList(this.anInt1871); @@ -259,7 +259,7 @@ public class GlSprite extends Sprite { if (arg2 <= 0 || arg3 <= 0) { return; } - Static239.method4149(); + GlRenderer.method4149(); @Pc(8) int local8 = this.anInt1867; @Pc(11) int local11 = this.anInt1859; @Pc(13) int local13 = 0; @@ -285,12 +285,12 @@ public class GlSprite extends Sprite { if (local11 < local21) { arg3 = ((local11 << 16) + local33 - local15 - 1) / local33; } - @Pc(123) GL2 local123 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(123) GL2 local123 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(2); @Pc(132) float local132 = (float) arg0; @Pc(137) float local137 = local132 + (float) arg2; - @Pc(142) float local142 = (float) (Static239.anInt5329 - arg1); + @Pc(142) float local142 = (float) (GlRenderer.canvasHeight - arg1); @Pc(147) float local147 = local142 - (float) arg3; @Pc(155) float local155 = (float) this.anInt1867 / (float) this.anInt1870; @Pc(163) float local163 = (float) this.anInt1859 / (float) this.anInt1874; @@ -309,13 +309,13 @@ public class GlSprite extends Sprite { @OriginalMember(owner = "client!cf", name = "c", descriptor = "(II)V") @Override public final void method1415(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { - Static239.method4149(); + GlRenderer.method4149(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(12) GL2 local12 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); - local12.glTranslatef((float) local5, (float) (Static239.anInt5329 - local10), 0.0F); + local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); local12.glCallList(this.anInt1871); local12.glLoadIdentity(); } @@ -338,13 +338,13 @@ public class GlSprite extends Sprite { @OriginalMember(owner = "client!cf", name = "a", descriptor = "(IIIIII)V") @Override protected final void method1416(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - Static239.method4149(); - @Pc(2) GL2 local2 = Static239.gl; - Static239.method4177(this.anInt1872); + GlRenderer.method4149(); + @Pc(2) GL2 local2 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); @Pc(15) int local15 = arg0 - (this.anInt1863 << 4); @Pc(22) int local22 = arg1 - (this.anInt1861 << 4); - local2.glTranslatef((float) arg2 / 16.0F, (float) Static239.anInt5329 - (float) arg3 / 16.0F, 0.0F); + local2.glTranslatef((float) arg2 / 16.0F, (float) GlRenderer.canvasHeight - (float) arg3 / 16.0F, 0.0F); local2.glRotatef((float) arg4 * 0.005493164F, 0.0F, 0.0F, 1.0F); if (arg5 != 4096) { local2.glScalef((float) arg5 / 4096.0F, (float) arg5 / 4096.0F, 0.0F); @@ -360,7 +360,7 @@ public class GlSprite extends Sprite { if (arg2 <= 0 || arg3 <= 0) { return; } - Static239.method4155(); + GlRenderer.method4155(); @Pc(8) int local8 = this.anInt1867; @Pc(11) int local11 = this.anInt1859; @Pc(13) int local13 = 0; @@ -386,12 +386,12 @@ public class GlSprite extends Sprite { if (local11 < local21) { arg3 = ((local11 << 16) + local33 - local15 - 1) / local33; } - @Pc(123) GL2 local123 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(123) GL2 local123 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); @Pc(132) float local132 = (float) arg0; @Pc(137) float local137 = local132 + (float) arg2; - @Pc(142) float local142 = (float) (Static239.anInt5329 - arg1); + @Pc(142) float local142 = (float) (GlRenderer.canvasHeight - arg1); @Pc(147) float local147 = local142 - (float) arg3; @Pc(155) float local155 = (float) this.anInt1867 / (float) this.anInt1870; @Pc(163) float local163 = (float) this.anInt1859 / (float) this.anInt1874; @@ -411,9 +411,9 @@ public class GlSprite extends Sprite { @OriginalMember(owner = "client!cf", name = "b", descriptor = "(IIII)V") public final void method1429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - Static239.method4149(); - @Pc(2) GL2 local2 = Static239.gl; - Static239.method4177(this.anInt1872); + GlRenderer.method4149(); + @Pc(2) GL2 local2 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); @Pc(16) float local16 = (float) this.anInt1867 / (float) this.anInt1870; @Pc(24) float local24 = (float) this.anInt1859 / (float) this.anInt1874; @@ -421,7 +421,7 @@ public class GlSprite extends Sprite { @Pc(34) float local34 = local24 * (float) arg3; @Pc(39) int local39 = arg0 + this.anInt1863; @Pc(46) int local46 = local39 + this.anInt1867 * arg2; - @Pc(53) int local53 = Static239.anInt5329 - arg1 - this.anInt1861; + @Pc(53) int local53 = GlRenderer.canvasHeight - arg1 - this.anInt1861; @Pc(60) int local60 = local53 - this.anInt1859 * arg3; local2.glBegin(GL2.GL_TRIANGLE_FAN); local2.glTexCoord2f(local29, 0.0F); @@ -458,14 +458,14 @@ public class GlSprite extends Sprite { local22 += local32; } @Pc(91) ByteBuffer local91 = ByteBuffer.wrap(local20); - @Pc(93) GL2 local93 = Static239.gl; + @Pc(93) GL2 local93 = GlRenderer.gl; if (this.anInt1872 == -1) { @Pc(100) int[] local100 = new int[1]; local93.glGenTextures(1, local100, 0); this.anInt1872 = local100[0]; this.anInt1875 = Static63.anInt1943; } - Static239.method4177(this.anInt1872); + GlRenderer.setTextureId(this.anInt1872); local93.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_RGBA, this.anInt1870, this.anInt1874, 0, GL2.GL_RGBA, GL2.GL_UNSIGNED_BYTE, local91); Static63.anInt1944 += local91.limit() - this.anInt1869; this.anInt1869 = local91.limit(); @@ -474,14 +474,14 @@ public class GlSprite extends Sprite { @OriginalMember(owner = "client!cf", name = "a", descriptor = "(III)V") @Override public final void method1417(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { - Static239.method4155(); + GlRenderer.method4155(); @Pc(5) int local5 = arg0 + this.anInt1863; @Pc(10) int local10 = arg1 + this.anInt1861; - @Pc(12) GL2 local12 = Static239.gl; - Static239.method4177(this.anInt1872); + @Pc(12) GL2 local12 = GlRenderer.gl; + GlRenderer.setTextureId(this.anInt1872); this.method1424(1); local12.glColor4f(1.0F, 1.0F, 1.0F, (float) arg2 / 256.0F); - local12.glTranslatef((float) local5, (float) (Static239.anInt5329 - local10), 0.0F); + local12.glTranslatef((float) local5, (float) (GlRenderer.canvasHeight - local10), 0.0F); local12.glCallList(this.anInt1871); local12.glLoadIdentity(); } @@ -490,7 +490,7 @@ public class GlSprite extends Sprite { private void method1431() { @Pc(7) float local7 = (float) this.anInt1867 / (float) this.anInt1870; @Pc(15) float local15 = (float) this.anInt1859 / (float) this.anInt1874; - @Pc(17) GL2 local17 = Static239.gl; + @Pc(17) GL2 local17 = GlRenderer.gl; if (this.anInt1871 == -1) { this.anInt1871 = local17.glGenLists(1); this.anInt1875 = Static63.anInt1943; diff --git a/client/src/main/java/GlTexture.java b/client/src/main/java/GlTexture.java index d6759e9..df7a565 100644 --- a/client/src/main/java/GlTexture.java +++ b/client/src/main/java/GlTexture.java @@ -172,7 +172,7 @@ public final class GlTexture extends SecondaryNode { if (!this.aClass88_1.method2729(arg1, arg0)) { return false; } - @Pc(22) GL2 local22 = Static239.gl; + @Pc(22) GL2 local22 = GlRenderer.gl; @Pc(28) int local28 = arg2 ? 64 : 128; @Pc(31) int local31 = Static56.method1314(); if ((local31 & 0x1) == 0) { @@ -181,7 +181,7 @@ public final class GlTexture extends SecondaryNode { local22.glGenTextures(1, local53, 0); this.anInt5492 = Static63.anInt1943; this.anInt5493 = local53[0]; - Static239.method4177(this.anInt5493); + GlRenderer.setTextureId(this.anInt5493); @Pc(82) ByteBuffer local82 = ByteBuffer.wrap(this.aClass88_1.method2728(local28, local28, this.aBoolean288, arg1, 0.7D, arg0)); if (this.anInt5489 == 2) { @Pc(201) GLUgl2es1 local201 = new GLUgl2es1(); @@ -214,22 +214,22 @@ public final class GlTexture extends SecondaryNode { local22.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_S, this.aBoolean285 ? GL2.GL_REPEAT : GL2.GL_CLAMP_TO_EDGE); local22.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_WRAP_T, this.aBoolean284 ? GL2.GL_REPEAT : GL2.GL_CLAMP_TO_EDGE); } else { - Static239.method4177(this.anInt5493); + GlRenderer.setTextureId(this.anInt5493); } } if ((local31 & 0x2) == 0) { - Static239.method4183(this.anInt5486); + GlRenderer.setTextureCombineRgbMode(this.anInt5486); } if ((local31 & 0x4) == 0) { - Static239.method4174(0); + GlRenderer.setTextureCombineAlphaMode(0); } if ((local31 & 0x8) == 0) { if (this.anInt5497 == 0 && this.anInt5485 == 0) { - Static239.method4150(); + GlRenderer.resetTextureMatrix(); } else { - @Pc(303) float local303 = (float) (this.anInt5497 * Static239.anInt5323) / (float) local28; - @Pc(312) float local312 = (float) (this.anInt5485 * Static239.anInt5323) / (float) local28; - Static239.method4170(local312, local303, 0.0F); + @Pc(303) float local303 = (float) (this.anInt5497 * GlRenderer.anInt5323) / (float) local28; + @Pc(312) float local312 = (float) (this.anInt5485 * GlRenderer.anInt5323) / (float) local28; + GlRenderer.translateTextureMatrix(local312, local303, 0.0F); } } return true; diff --git a/client/src/main/java/GlVertexBufferObject.java b/client/src/main/java/GlVertexBufferObject.java index 82a055e..2c2a133 100644 --- a/client/src/main/java/GlVertexBufferObject.java +++ b/client/src/main/java/GlVertexBufferObject.java @@ -29,7 +29,7 @@ public final class GlVertexBufferObject { public GlVertexBufferObject(@OriginalArg(0) boolean arg0) { this.anInt5760 = -1; this.anInt5762 = 0; - @Pc(9) GL2 local9 = Static239.gl; + @Pc(9) GL2 local9 = GlRenderer.gl; @Pc(12) int[] local12 = new int[1]; local9.glGenBuffers(1, local12, 0); this.aBoolean300 = arg0; @@ -40,7 +40,7 @@ public final class GlVertexBufferObject { @OriginalMember(owner = "client!vi", name = "a", descriptor = "(Ljava/nio/ByteBuffer;)V") public final void method4515(@OriginalArg(0) ByteBuffer arg0) { if (arg0.limit() <= this.anInt5762) { - @Pc(6) GL2 local6 = Static239.gl; + @Pc(6) GL2 local6 = GlRenderer.gl; local6.glBindBuffer(GL2.GL_ARRAY_BUFFER, this.anInt5760); local6.glBufferSubData(GL2.GL_ARRAY_BUFFER, 0, arg0.limit(), arg0); } else { @@ -61,13 +61,13 @@ public final class GlVertexBufferObject { @OriginalMember(owner = "client!vi", name = "a", descriptor = "()V") public final void method4516() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, this.anInt5760); } @OriginalMember(owner = "client!vi", name = "b", descriptor = "(Ljava/nio/ByteBuffer;)V") public final void method4517(@OriginalArg(0) ByteBuffer arg0) { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, this.anInt5760); local1.glBufferData(GL2.GL_ELEMENT_ARRAY_BUFFER, arg0.limit(), arg0, this.aBoolean300 ? GL2.GL_STREAM_DRAW : GL2.GL_STATIC_DRAW); Static63.anInt1945 += arg0.limit() - this.anInt5762; @@ -76,13 +76,13 @@ public final class GlVertexBufferObject { @OriginalMember(owner = "client!vi", name = "b", descriptor = "()V") public final void method4518() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ELEMENT_ARRAY_BUFFER, this.anInt5760); } @OriginalMember(owner = "client!vi", name = "c", descriptor = "(Ljava/nio/ByteBuffer;)V") public final void method4519(@OriginalArg(0) ByteBuffer arg0) { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glBindBuffer(GL2.GL_ARRAY_BUFFER, this.anInt5760); local1.glBufferData(GL2.GL_ARRAY_BUFFER, arg0.limit(), arg0, this.aBoolean300 ? GL2.GL_STREAM_DRAW : GL2.GL_STATIC_DRAW); Static63.anInt1945 += arg0.limit() - this.anInt5762; diff --git a/client/src/main/java/JagString.java b/client/src/main/java/JagString.java index 2719f43..55d7247 100644 --- a/client/src/main/java/JagString.java +++ b/client/src/main/java/JagString.java @@ -144,7 +144,7 @@ public final class JagString implements StringInterface { } @OriginalMember(owner = "client!na", name = "a", descriptor = "(I)Lclient!na;") - public final JagString method3114() { + public final JagString toLowerCase() { @Pc(14) JagString local14 = new JagString(); local14.anInt4030 = this.anInt4030; local14.aByteArray52 = new byte[this.anInt4030]; @@ -360,7 +360,7 @@ public final class JagString implements StringInterface { } @OriginalMember(owner = "client!na", name = "a", descriptor = "(Lclient!na;I)I") - public final int method3131(@OriginalArg(0) JagString arg0) { + public final int indexOf(@OriginalArg(0) JagString arg0) { return this.method3146(arg0, 0); } @@ -416,11 +416,11 @@ public final class JagString implements StringInterface { @OriginalMember(owner = "client!na", name = "a", descriptor = "(IB)Lclient!na;") public final JagString method3136(@OriginalArg(0) int arg0) { - return this.method3137(this.anInt4030, arg0); + return this.substring(this.anInt4030, arg0); } @OriginalMember(owner = "client!na", name = "b", descriptor = "(III)Lclient!na;") - public final JagString method3137(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { + public final JagString substring(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) { @Pc(7) JagString local7 = new JagString(); local7.anInt4030 = arg0 - arg1; local7.aByteArray52 = new byte[arg0 - arg1]; @@ -673,10 +673,10 @@ public final class JagString implements StringInterface { @Pc(68) int local68; for (local68 = 0; arg0 != this.aByteArray52[local68 + local49]; local68++) { } - local37[local47++] = this.method3137(local49 + local68, local49); + local37[local47++] = this.substring(local49 + local68, local49); local49 += local68 + 1; } - local37[local7] = this.method3137(this.anInt4030, local49); + local37[local7] = this.substring(this.anInt4030, local49); return local37; } diff --git a/client/src/main/java/Js5.java b/client/src/main/java/Js5.java index 7ea6ba5..88c8edc 100644 --- a/client/src/main/java/Js5.java +++ b/client/src/main/java/Js5.java @@ -74,7 +74,7 @@ public final class Js5 { @OriginalMember(owner = "client!ve", name = "a", descriptor = "(ILclient!na;)I") public final int method4478(@OriginalArg(1) JagString arg0) { if (this.method4484()) { - @Pc(15) JagString local15 = arg0.method3114(); + @Pc(15) JagString local15 = arg0.toLowerCase(); @Pc(29) int local29 = this.aClass70_2.aClass76_1.method2405(local15.method3154()); return this.method4476(local29); } else { @@ -105,7 +105,7 @@ public final class Js5 { @OriginalMember(owner = "client!ve", name = "a", descriptor = "(Lclient!na;B)I") public final int method4482(@OriginalArg(0) JagString arg0) { if (this.method4484()) { - @Pc(16) JagString local16 = arg0.method3114(); + @Pc(16) JagString local16 = arg0.toLowerCase(); @Pc(27) int local27 = this.aClass70_2.aClass76_1.method2405(local16.method3154()); return this.method4492(local27) ? local27 : -1; } else { @@ -136,8 +136,8 @@ public final class Js5 { if (!this.method4484()) { return null; } - @Pc(15) JagString local15 = arg1.method3114(); - @Pc(19) JagString local19 = arg0.method3114(); + @Pc(15) JagString local15 = arg1.toLowerCase(); + @Pc(19) JagString local19 = arg0.toLowerCase(); @Pc(28) int local28 = this.aClass70_2.aClass76_1.method2405(local15.method3154()); if (this.method4492(local28)) { @Pc(53) int local53 = this.aClass70_2.aClass76Array1[local28].method2405(local19.method3154()); @@ -150,7 +150,7 @@ public final class Js5 { @OriginalMember(owner = "client!ve", name = "b", descriptor = "(ILclient!na;)V") public final void method4486(@OriginalArg(1) JagString arg0) { if (this.method4484()) { - @Pc(13) JagString local13 = arg0.method3114(); + @Pc(13) JagString local13 = arg0.toLowerCase(); @Pc(22) int local22 = this.aClass70_2.aClass76_1.method2405(local13.method3154()); this.method4493(local22); } @@ -161,8 +161,8 @@ public final class Js5 { if (!this.method4484()) { return false; } - @Pc(17) JagString local17 = arg1.method3114(); - @Pc(21) JagString local21 = arg0.method3114(); + @Pc(17) JagString local17 = arg1.toLowerCase(); + @Pc(21) JagString local21 = arg0.toLowerCase(); @Pc(30) int local30 = this.aClass70_2.aClass76_1.method2405(local17.method3154()); if (this.method4492(local30)) { @Pc(49) int local49 = this.aClass70_2.aClass76Array1[local30].method2405(local21.method3154()); @@ -200,7 +200,7 @@ public final class Js5 { @OriginalMember(owner = "client!ve", name = "a", descriptor = "(BLclient!na;)Z") public final boolean method4489(@OriginalArg(1) JagString arg0) { if (this.method4484()) { - @Pc(14) JagString local14 = arg0.method3114(); + @Pc(14) JagString local14 = arg0.toLowerCase(); @Pc(25) int local25 = this.aClass70_2.aClass76_1.method2405(local14.method3154()); return this.method4479(local25); } else { @@ -376,7 +376,7 @@ public final class Js5 { @OriginalMember(owner = "client!ve", name = "a", descriptor = "(Lclient!na;I)Z") public final boolean method4497(@OriginalArg(0) JagString arg0) { if (this.method4484()) { - @Pc(19) JagString local19 = arg0.method3114(); + @Pc(19) JagString local19 = arg0.toLowerCase(); @Pc(28) int local28 = this.aClass70_2.aClass76_1.method2405(local19.method3154()); return local28 >= 0; } else { diff --git a/client/src/main/java/Js5CacheQueue.java b/client/src/main/java/Js5CacheQueue.java index 605b0b0..63c9042 100644 --- a/client/src/main/java/Js5CacheQueue.java +++ b/client/src/main/java/Js5CacheQueue.java @@ -22,7 +22,7 @@ public final class Js5CacheQueue implements Runnable { public Js5CacheQueue() { @Pc(20) PrivilegedRequest local20 = Static71.signLink.method5130(5, this); while (local20.status == 0) { - Static231.method3983(10L); + Static231.sleep(10L); } if (local20.status == 2) { throw new RuntimeException(); diff --git a/client/src/main/java/Js5GlTextureProvider.java b/client/src/main/java/Js5GlTextureProvider.java index 258b556..b610727 100644 --- a/client/src/main/java/Js5GlTextureProvider.java +++ b/client/src/main/java/Js5GlTextureProvider.java @@ -61,7 +61,7 @@ public final class Js5GlTextureProvider implements GlTextureProvider { this.anInt4186 = arg3; this.aClass153_73 = arg0; this.aClass54_12 = new LruHashTable(this.anInt4186); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { this.aClass54_11 = new LruHashTable(this.anInt4186); } else { this.aClass54_11 = null; @@ -149,7 +149,7 @@ public final class Js5GlTextureProvider implements GlTextureProvider { @OriginalMember(owner = "client!nk", name = "a", descriptor = "(IZ)V") @Override public final void method3227(@OriginalArg(0) int arg0) { - Static27.method766(this.aByteArray61[arg0] & 0xFF, this.aByteArray62[arg0] & 0xFF); + Static27.setMaterial(this.aByteArray61[arg0] & 0xFF, this.aByteArray62[arg0] & 0xFF); @Pc(23) boolean local23 = false; @Pc(28) GlTexture local28 = this.method3242(arg0); if (local28 != null) { @@ -263,7 +263,7 @@ public final class Js5GlTextureProvider implements GlTextureProvider { public final void method3248(@OriginalArg(0) int arg0) { this.anInt4186 = arg0; this.aClass54_12 = new LruHashTable(this.anInt4186); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { this.aClass54_11 = new LruHashTable(this.anInt4186); } else { this.aClass54_11 = null; diff --git a/client/src/main/java/LiquidMaterialRenderer.java b/client/src/main/java/LiquidMaterialRenderer.java index 8ad9350..3f843c9 100644 --- a/client/src/main/java/LiquidMaterialRenderer.java +++ b/client/src/main/java/LiquidMaterialRenderer.java @@ -24,9 +24,9 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!rd", name = "", descriptor = "()V") public LiquidMaterialRenderer() { - if (this.anInt4831 < 0 && (Static239.aBoolean274 && Static239.anInt5322 >= 2)) { + if (this.anInt4831 < 0 && (GlRenderer.arbVertexProgramSupported && GlRenderer.maxTextureUnits >= 2)) { @Pc(19) int[] local19 = new int[1]; - @Pc(21) GL2 local21 = Static239.gl; + @Pc(21) GL2 local21 = GlRenderer.gl; local21.glGenProgramsARB(1, local19, 0); this.anInt4830 = local19[0]; @Pc(42) int[][] local42 = Static33.method874(0.4F); @@ -36,7 +36,7 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { @Pc(67) int[] local67 = local42[local60]; @Pc(71) int[] local71 = local53[local60]; for (@Pc(73) int local73 = 0; local73 < 64; local73++) { - if (Static239.aBoolean263) { + if (GlRenderer.bigEndian) { local58.pFloat((float) local67[local73] / 4096.0F); local58.pFloat((float) local71[local73] / 4096.0F); local58.pFloat(1.0F); @@ -62,7 +62,7 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { @Override public final void method4602() { if (this.anInt4831 >= 0) { - @Pc(5) GL2 local5 = Static239.gl; + @Pc(5) GL2 local5 = GlRenderer.gl; local5.glCallList(this.anInt4831 + 1); } } @@ -79,7 +79,7 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { if (this.anInt4831 < 0) { return; } - @Pc(5) GL2 local5 = Static239.gl; + @Pc(5) GL2 local5 = GlRenderer.gl; local5.glCallList(this.anInt4831); local5.glActiveTexture(GL2.GL_TEXTURE1); local5.glMatrixMode(GL2.GL_TEXTURE); @@ -89,29 +89,29 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { local5.glRotatef(-180.0F, 1.0F, 0.0F, 0.0F); local5.glMatrixMode(GL2.GL_MODELVIEW); if (!Static151.aBoolean176) { - local5.glBindTexture(GL2.GL_TEXTURE_2D, Static151.anIntArray341[(int) ((float) (Static239.anInt5323 * 64) * 0.005F) % 64]); + local5.glBindTexture(GL2.GL_TEXTURE_2D, Static151.anIntArray341[(int) ((float) (GlRenderer.anInt5323 * 64) * 0.005F) % 64]); } local5.glActiveTexture(GL2.GL_TEXTURE0); - if (this.anInt4829 == Static239.anInt5323) { + if (this.anInt4829 == GlRenderer.anInt5323) { return; } - @Pc(85) int local85 = (Static239.anInt5323 & 0xFF) * 256; + @Pc(85) int local85 = (GlRenderer.anInt5323 & 0xFF) * 256; for (@Pc(87) int local87 = 0; local87 < 64; local87++) { this.aFloatBuffer1.position(local85); local5.glProgramLocalParameter4fvARB(GL2.GL_VERTEX_PROGRAM_ARB, local87, this.aFloatBuffer1); local85 += 4; } if (Static151.aBoolean176) { - local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 65, (float) Static239.anInt5323 * 0.005F, 0.0F, 0.0F, 1.0F); + local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 65, (float) GlRenderer.anInt5323 * 0.005F, 0.0F, 0.0F, 1.0F); } else { local5.glProgramLocalParameter4fARB(GL2.GL_VERTEX_PROGRAM_ARB, 65, 0.0F, 0.0F, 0.0F, 1.0F); } - this.anInt4829 = Static239.anInt5323; + this.anInt4829 = GlRenderer.anInt5323; } @OriginalMember(owner = "client!rd", name = "e", descriptor = "()V") private void method3719() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; this.anInt4831 = local1.glGenLists(2); local1.glNewList(this.anInt4831, GL2.GL_COMPILE); local1.glActiveTexture(GL2.GL_TEXTURE1); @@ -146,7 +146,7 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { if (this.anInt4831 < 0) { return; } - @Pc(4) GL2 local4 = Static239.gl; + @Pc(4) GL2 local4 = GlRenderer.gl; @Pc(7) int[] local7 = new int[1]; local4.glBindProgramARB(GL2.GL_VERTEX_PROGRAM_ARB, this.anInt4830); local4.glProgramStringARB(GL2.GL_VERTEX_PROGRAM_ARB, GL2.GL_PROGRAM_FORMAT_ASCII_ARB, "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND".length(), "!!ARBvp1.0\nATTRIB iPos = vertex.position;\nATTRIB iColour = vertex.color;\nOUTPUT oPos = result.position;\nOUTPUT oColour = result.color;\nOUTPUT oTexCoord0 = result.texcoord[0];\nOUTPUT oTexCoord1 = result.texcoord[1];\nOUTPUT oFogCoord = result.fogcoord;\nPARAM time = program.local[65];\nPARAM turbulence = program.local[64];\nPARAM lightAmbient = program.local[66]; \nPARAM pMatrix[4] = { state.matrix.projection };\nPARAM mvMatrix[4] = { state.matrix.modelview };\nPARAM ivMatrix[4] = { state.matrix.texture[1] };\nPARAM fNoise[64] = { program.local[0..63] };\nTEMP noise, clipPos, viewPos, worldPos;\nADDRESS noiseAddr;\nDP4 viewPos.x, mvMatrix[0], iPos;\nDP4 viewPos.y, mvMatrix[1], iPos;\nDP4 viewPos.z, mvMatrix[2], iPos;\nDP4 viewPos.w, mvMatrix[3], iPos;\nDP4 worldPos.x, ivMatrix[0], viewPos;\nDP4 worldPos.y, ivMatrix[1], viewPos;\nDP4 worldPos.z, ivMatrix[2], viewPos;\nDP4 worldPos.w, ivMatrix[3], viewPos;\nADD noise.x, worldPos.x, worldPos.z;SUB noise.y, worldPos.z, worldPos.x;MUL noise, noise, 0.0001220703125;\nFRC noise, noise;\nMUL noise, noise, 64;\nARL noiseAddr.x, noise.x;\nMOV noise.x, fNoise[noiseAddr.x].x;\nARL noiseAddr.x, noise.y;\nMOV noise.y, fNoise[noiseAddr.x].y;\nMUL noise, noise, turbulence.x;\nMAD oTexCoord0, worldPos.xzww, 0.0078125, noise;\nMOV oTexCoord0.w, 1;\nMUL oTexCoord1.xy, worldPos.xzww, 0.0009765625;\nMOV oTexCoord1.zw, time.xxxw;\nDP4 clipPos.x, pMatrix[0], viewPos;\nDP4 clipPos.y, pMatrix[1], viewPos;\nDP4 clipPos.z, pMatrix[2], viewPos;\nDP4 clipPos.w, pMatrix[3], viewPos;\nMUL oColour.xyz, iColour, lightAmbient;\nMOV oColour.w, 1;\nMOV oFogCoord.x, clipPos.z;\nMOV oPos, clipPos; \nEND"); @@ -162,7 +162,7 @@ public final class LiquidMaterialRenderer implements MaterialRenderer { if (this.anInt4831 < 0) { return; } - @Pc(5) GL2 local5 = Static239.gl; + @Pc(5) GL2 local5 = GlRenderer.gl; local5.glActiveTexture(GL2.GL_TEXTURE1); if ((arg0 & 0x80) == 0) { local5.glEnable(Static151.aBoolean176 ? GL2.GL_TEXTURE_3D : GL2.GL_TEXTURE_2D); diff --git a/client/src/main/java/Loc.java b/client/src/main/java/Loc.java index 9c92de5..3f930ad 100644 --- a/client/src/main/java/Loc.java +++ b/client/src/main/java/Loc.java @@ -78,7 +78,7 @@ public final class Loc extends Entity { this.anInt1299 = arg0; this.anInt1300 = arg5; @Pc(67) LocType local67; - if (Static239.aBoolean269 && arg8 != null) { + if (GlRenderer.enabled && arg8 != null) { if (arg8 instanceof Loc) { ((Loc) arg8).method1046(); } else { @@ -124,7 +124,7 @@ public final class Loc extends Entity { this.anInt1320 = Static83.anInt372 - this.anInt1317; } } - if (Static239.aBoolean269 && arg8 != null) { + if (GlRenderer.enabled && arg8 != null) { this.method1048(true); } if (arg8 == null) { @@ -138,7 +138,7 @@ public final class Loc extends Entity { @OriginalMember(owner = "client!dc", name = "a", descriptor = "(IIIII)V") @Override public final void method4545(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { this.method1048(true); } else { this.method1047(arg4, arg3); @@ -228,7 +228,7 @@ public final class Loc extends Entity { local19 = local19.method3417(); } if (local19 == null) { - if (Static239.aBoolean269 && !local12) { + if (GlRenderer.enabled && !local12) { this.method1046(); } return null; @@ -283,7 +283,7 @@ public final class Loc extends Entity { } else if (this.anInt1303 < 3) { local314 = Static83.anIntArrayArrayArray4[this.anInt1303 + 1]; } - if (Static239.aBoolean269 && local256) { + if (GlRenderer.enabled && local256) { Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319); } @Pc(356) boolean local356 = this.aClass36_Sub1_2 == null; @@ -296,7 +296,7 @@ public final class Loc extends Entity { if (local389 == null) { return null; } - if (Static239.aBoolean269 && local256) { + if (GlRenderer.enabled && local256) { if (local356) { Static32.aClass36_Sub1_1 = local389.aClass36_Sub1_3; } diff --git a/client/src/main/java/LocType.java b/client/src/main/java/LocType.java index 19490c8..f5c0bdc 100644 --- a/client/src/main/java/LocType.java +++ b/client/src/main/java/LocType.java @@ -733,7 +733,7 @@ public final class LocType { @OriginalMember(owner = "client!pb", name = "a", descriptor = "(II[[III[[IZLclient!ek;BZI)Lclient!sm;") public final Class139 method3428(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int[][] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[][] arg5, @OriginalArg(6) boolean arg6, @OriginalArg(7) SoftwareIndexedSprite arg7, @OriginalArg(9) boolean arg8, @OriginalArg(10) int arg9) { @Pc(29) long local29; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if (this.anIntArray378 == null) { local29 = (this.anInt4426 << 10) + arg0; } else { @@ -826,7 +826,7 @@ public final class LocType { @OriginalMember(owner = "client!pb", name = "a", descriptor = "(IILclient!ek;ILclient!tk;I[[IZII[[IIII)Lclient!sm;") public final Class139 method3429(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SoftwareIndexedSprite arg2, @OriginalArg(3) int arg3, @OriginalArg(4) SeqType arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int[][] arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(10) int[][] arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11, @OriginalArg(13) int arg12) { @Pc(30) long local30; - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { if (this.anIntArray378 == null) { local30 = (this.anInt4426 << 10) + arg5; } else { diff --git a/client/src/main/java/MillisTimer.java b/client/src/main/java/MillisTimer.java index b8cbe9b..a75960e 100644 --- a/client/src/main/java/MillisTimer.java +++ b/client/src/main/java/MillisTimer.java @@ -76,7 +76,7 @@ public final class MillisTimer extends Timer { if (arg0 > this.anInt3552) { this.anInt3552 = arg0; } - Static231.method3983((long) this.anInt3552); + Static231.sleep((long) this.anInt3552); local139 = 0; while (this.anInt3553 < 256) { this.anInt3553 += this.anInt3550; diff --git a/client/src/main/java/MouseRecorder.java b/client/src/main/java/MouseRecorder.java index f7ab43e..54db676 100644 --- a/client/src/main/java/MouseRecorder.java +++ b/client/src/main/java/MouseRecorder.java @@ -32,7 +32,7 @@ public final class MouseRecorder implements Runnable { this.samples++; } } - Static231.method3983(50L); + Static231.sleep(50L); } } } diff --git a/client/src/main/java/NanoTimer.java b/client/src/main/java/NanoTimer.java index 01735b2..21dd438 100644 --- a/client/src/main/java/NanoTimer.java +++ b/client/src/main/java/NanoTimer.java @@ -23,7 +23,7 @@ public final class NanoTimer extends Timer { if (local9 > local14) { local14 = local9; } - Static231.method3983(local14 / 1000000L); + Static231.sleep(local14 / 1000000L); @Pc(31) int local31 = 0; @Pc(33) long local33 = System.nanoTime(); while (local31 < 10 && (local31 < 1 || this.aLong142 < local33)) { diff --git a/client/src/main/java/Npc.java b/client/src/main/java/Npc.java index 05b23a1..4e322e3 100644 --- a/client/src/main/java/Npc.java +++ b/client/src/main/java/Npc.java @@ -40,14 +40,14 @@ public final class Npc extends PathingEntity { @Pc(140) Model local140; if (Static209.aBoolean240 && local84.aBoolean180) { local140 = Static41.method1043(this.aClass96_1.aByte13, this.aBoolean171, local53 == null ? local29 : local53, this.anInt3412, this.aClass96_1.aShort23, this.anInt3421, this.aClass96_1.aShort24, this.aClass96_1.anInt3713, local74, arg0, local53 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, this.aClass96_1.aByte12); - if (Static239.aBoolean269) { - @Pc(144) float local144 = Static239.method4179(); - @Pc(146) float local146 = Static239.method4166(); - Static239.method4178(); - Static239.method4152(local144, local146 - 150.0F); + if (GlRenderer.enabled) { + @Pc(144) float local144 = GlRenderer.method4179(); + @Pc(146) float local146 = GlRenderer.method4166(); + GlRenderer.disableDepthMask(); + GlRenderer.method4152(local144, local146 - 150.0F); local140.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, this.aClass47_Sub1_5); - Static239.method4157(); - Static239.method4152(local144, local146); + GlRenderer.enableDepthMask(); + GlRenderer.method4152(local144, local146); } else { local140.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, this.aClass47_Sub1_5); } @@ -73,7 +73,7 @@ public final class Npc extends PathingEntity { } } } - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { if (local140 != null) { local74 = ((SoftwareModel) local74).method4588(local140); } diff --git a/client/src/main/java/NpcType.java b/client/src/main/java/NpcType.java index bfb2b0a..c008571 100644 --- a/client/src/main/java/NpcType.java +++ b/client/src/main/java/NpcType.java @@ -331,7 +331,7 @@ public final class NpcType { } } local40 = local593.method1679(this.anInt3715 + 64, this.anInt3738 + 850, -30, -50, -30); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { ((GlModel) local40).method4111(false, false, false, false, false, true); } Static125.aClass99_18.method3095(local40, (long) this.anInt3741); diff --git a/client/src/main/java/ObjType.java b/client/src/main/java/ObjType.java index 444311c..f6d7399 100644 --- a/client/src/main/java/ObjType.java +++ b/client/src/main/java/ObjType.java @@ -338,7 +338,7 @@ public final class ObjType { local76.method4559(this.anInt2373, this.anInt2350, this.anInt2368); } local76.aBoolean303 = true; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { ((GlModel) local76).method4111(false, false, false, false, false, true); } Static244.aClass99_32.method3095(local76, (long) this.anInt2354); diff --git a/client/src/main/java/PathingEntity.java b/client/src/main/java/PathingEntity.java index affe4b2..f244b42 100644 --- a/client/src/main/java/PathingEntity.java +++ b/client/src/main/java/PathingEntity.java @@ -293,7 +293,7 @@ public abstract class PathingEntity extends Entity { this.anInt3405 = 0; this.anInt3421 = arg0 * 64 + this.movementQueueZ[0] * 128; this.anInt3412 = arg0 * 64 + this.movementQueueX[0] * 128; - if (Static239.aBoolean269 && Static173.self == this) { + if (GlRenderer.enabled && Static173.self == this) { Static86.method1799(); } } diff --git a/client/src/main/java/Player.java b/client/src/main/java/Player.java index c80d3c5..5402f24 100644 --- a/client/src/main/java/Player.java +++ b/client/src/main/java/Player.java @@ -175,7 +175,7 @@ public final class Player extends PathingEntity { @Pc(54) SeqType local54 = this.anInt3366 == -1 || this.aBoolean98 || this.anInt3366 == this.method2681().anInt1037 && local25 != null ? null : Static36.method941(this.anInt3366); @Pc(76) Model local76 = this.aClass59_1.method1954(this.aClass147Array3, this.anInt3373, local54, local25, this.anInt3396, this.anInt3388, this.anInt3360, this.anInt3425, this.anInt3407); @Pc(79) int local79 = Static198.method1029(); - if (Static239.aBoolean269 && Static238.anInt5316 < 96 && local79 > 50) { + if (GlRenderer.enabled && Static238.anInt5316 < 96 && local79 > 50) { Static16.method501(); } @Pc(102) int local102; @@ -197,14 +197,14 @@ public final class Player extends PathingEntity { @Pc(184) Model local184; if (Static209.aBoolean240 && (this.aClass59_1.anInt2492 == -1 || Static214.method4363(this.aClass59_1.anInt2492).aBoolean180)) { local184 = Static41.method1043(160, this.aBoolean171, local54 == null ? local25 : local54, this.anInt3412, 0, this.anInt3421, 0, 1, local76, arg0, local54 == null ? this.anInt3425 : this.anInt3407, this.anInt3424, 240); - if (Static239.aBoolean269) { - @Pc(188) float local188 = Static239.method4179(); - @Pc(190) float local190 = Static239.method4166(); - Static239.method4178(); - Static239.method4152(local188, local190 - 150.0F); + if (GlRenderer.enabled) { + @Pc(188) float local188 = GlRenderer.method4179(); + @Pc(190) float local190 = GlRenderer.method4166(); + GlRenderer.disableDepthMask(); + GlRenderer.method4152(local188, local190 - 150.0F); local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null); - Static239.method4157(); - Static239.method4152(local188, local190); + GlRenderer.enableDepthMask(); + GlRenderer.method4152(local188, local190); } else { local184.method4546(0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, -1L, arg9, null); } @@ -281,7 +281,7 @@ public final class Player extends PathingEntity { } } } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local76.aBoolean303 = true; local76.method4546(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, this.aClass47_Sub1_5); if (local184 != null) { @@ -322,17 +322,17 @@ public final class Player extends PathingEntity { if (local46 == null) { return; } - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { local46.method4546(0, arg10, arg12, arg9, arg8, arg4, arg13, arg7, -1L, arg5, arg0); return; } - @Pc(52) float local52 = Static239.method4179(); - @Pc(54) float local54 = Static239.method4166(); - Static239.method4178(); - Static239.method4152(local52, local54 - 150.0F); + @Pc(52) float local52 = GlRenderer.method4179(); + @Pc(54) float local54 = GlRenderer.method4166(); + GlRenderer.disableDepthMask(); + GlRenderer.method4152(local52, local54 - 150.0F); local46.method4546(0, arg10, arg12, arg9, arg8, arg4, arg13, arg7, -1L, arg5, arg0); - Static239.method4157(); - Static239.method4152(local52, local54); + GlRenderer.enableDepthMask(); + GlRenderer.method4152(local52, local54); } @OriginalMember(owner = "client!e", name = "a", descriptor = "(B)Z") diff --git a/client/src/main/java/RawModel.java b/client/src/main/java/RawModel.java index e8b68bd..ad42248 100644 --- a/client/src/main/java/RawModel.java +++ b/client/src/main/java/RawModel.java @@ -1231,7 +1231,7 @@ public final class RawModel extends Entity { @OriginalMember(owner = "client!gb", name = "c", descriptor = "(IIIII)Lclient!ak;") public final Model method1679(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { @Pc(9) GlModel local9 = new GlModel(this, arg0, arg1, true); local9.method4099(); return local9; diff --git a/client/src/main/java/SeqType.java b/client/src/main/java/SeqType.java index 9ee8cbc..ea00785 100644 --- a/client/src/main/java/SeqType.java +++ b/client/src/main/java/SeqType.java @@ -93,7 +93,7 @@ public final class SeqType { } else { local124 = arg2.method4568(!local23.method901(local27) & !local41.method901(arg1), !local23.method903(local27) & !local41.method903(arg1), !this.aBoolean278); } - if (Static239.aBoolean269 && this.aBoolean278) { + if (GlRenderer.enabled && this.aBoolean278) { if (local39 == 1) { ((GlModel) local124).method4093(); } else if (local39 == 2) { @@ -109,7 +109,7 @@ public final class SeqType { local124.method4563(); } local124.method4558(local23, local27, local41, arg1, arg4 - 1, local10, this.aBoolean278); - if (Static239.aBoolean269 && this.aBoolean278) { + if (GlRenderer.enabled && this.aBoolean278) { if (local39 == 1) { ((GlModel) local124).method4116(); } else if (local39 == 2) { @@ -206,7 +206,7 @@ public final class SeqType { } else { local106 = arg4.method4572(!local19.method901(local27) & !local42.method901(arg0), !local19.method903(local27) & !local42.method903(arg0), !this.aBoolean278); } - if (this.aBoolean278 && Static239.aBoolean269) { + if (this.aBoolean278 && GlRenderer.enabled) { if (local40 == 1) { ((GlModel) local106).method4093(); } else if (local40 == 2) { @@ -222,7 +222,7 @@ public final class SeqType { local106.method4563(); } local106.method4558(local19, local27, local42, arg0, arg2 - 1, local6, this.aBoolean278); - if (this.aBoolean278 && Static239.aBoolean269) { + if (this.aBoolean278 && GlRenderer.enabled) { if (local40 == 1) { ((GlModel) local106).method4116(); } else if (local40 == 2) { diff --git a/client/src/main/java/SpecularMaterialRenderer.java b/client/src/main/java/SpecularMaterialRenderer.java index 71d1d63..923246f 100644 --- a/client/src/main/java/SpecularMaterialRenderer.java +++ b/client/src/main/java/SpecularMaterialRenderer.java @@ -19,9 +19,9 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!vm", name = "", descriptor = "()V") public SpecularMaterialRenderer() { - if (Static239.aBoolean275 && Static239.anInt5322 >= 2) { + if (GlRenderer.arbTextureCubeMapSupported && GlRenderer.maxTextureUnits >= 2) { this.method4536(); - @Pc(19) GL2 local19 = Static239.gl; + @Pc(19) GL2 local19 = GlRenderer.gl; local19.glBindTexture(GL2.GL_TEXTURE_CUBE_MAP, this.anIntArray519[0]); local19.glTexParameteri(GL2.GL_TEXTURE_CUBE_MAP, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); local19.glTexParameteri(GL2.GL_TEXTURE_CUBE_MAP, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); @@ -40,14 +40,14 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { local19.glTexParameteri(GL2.GL_TEXTURE_CUBE_MAP, GL2.GL_TEXTURE_WRAP_R, GL2.GL_CLAMP_TO_EDGE); local19.glTexParameteri(GL2.GL_TEXTURE_CUBE_MAP, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); local19.glTexParameteri(GL2.GL_TEXTURE_CUBE_MAP, GL2.GL_TEXTURE_WRAP_T, GL2.GL_CLAMP_TO_EDGE); - this.aBoolean301 = Static239.anInt5322 < 3; + this.aBoolean301 = GlRenderer.maxTextureUnits < 3; } this.method4535(); } @OriginalMember(owner = "client!vm", name = "d", descriptor = "()V") private void method4535() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; this.anInt5777 = local1.glGenLists(2); local1.glNewList(this.anInt5777, GL2.GL_COMPILE); if (this.anIntArray519 == null) { @@ -82,7 +82,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND1_RGB, GL2.GL_SRC_ALPHA); local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_COMBINE_ALPHA, GL2.GL_REPLACE); local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PRIMARY_COLOR); - local1.glBindTexture(GL2.GL_TEXTURE_2D, Static239.anInt5328); + local1.glBindTexture(GL2.GL_TEXTURE_2D, GlRenderer.anInt5328); local1.glEnable(GL2.GL_TEXTURE_2D); } local1.glActiveTexture(GL2.GL_TEXTURE0); @@ -125,8 +125,8 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!vm", name = "a", descriptor = "()V") @Override public final void method4602() { - @Pc(1) GL2 local1 = Static239.gl; - if (Static178.aBoolean202) { + @Pc(1) GL2 local1 = GlRenderer.gl; + if (Static178.highDetailLighting) { local1.glCallList(this.anInt5777 + 1); } else { local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_TEXTURE); @@ -142,9 +142,9 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!vm", name = "b", descriptor = "()V") @Override public final void method4603() { - @Pc(1) GL2 local1 = Static239.gl; - Static239.method4174(1); - if (Static178.aBoolean202) { + @Pc(1) GL2 local1 = GlRenderer.gl; + GlRenderer.setTextureCombineAlphaMode(1); + if (Static178.highDetailLighting) { local1.glCallList(this.anInt5777); } else { local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_ALPHA, GL2.GL_PRIMARY_COLOR); @@ -154,8 +154,8 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!vm", name = "a", descriptor = "(I)V") @Override public final void method4604(@OriginalArg(0) int arg0) { - @Pc(1) GL2 local1 = Static239.gl; - if (Static178.aBoolean202 && this.anIntArray519 != null) { + @Pc(1) GL2 local1 = GlRenderer.gl; + if (Static178.highDetailLighting && this.anIntArray519 != null) { local1.glActiveTexture(GL2.GL_TEXTURE1); local1.glBindTexture(GL2.GL_TEXTURE_CUBE_MAP, this.anIntArray519[arg0 - 1]); local1.glActiveTexture(GL2.GL_TEXTURE0); @@ -164,7 +164,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!vm", name = "e", descriptor = "()V") private void method4536() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; if (this.anIntArray519 == null) { this.anIntArray519 = new int[3]; local1.glGenTextures(3, this.anIntArray519, 0); @@ -207,7 +207,7 @@ public final class SpecularMaterialRenderer implements MaterialRenderer { local137 = 0; local129 = 0; } - if (Static239.anInt5322 < 3) { + if (GlRenderer.maxTextureUnits < 3) { local129 /= 5; local137 /= 5; local145 /= 5; diff --git a/client/src/main/java/Static1.java b/client/src/main/java/Static1.java index da8269b..0f08046 100644 --- a/client/src/main/java/Static1.java +++ b/client/src/main/java/Static1.java @@ -535,7 +535,7 @@ public final class Static1 { @OriginalMember(owner = "client!a", name = "a", descriptor = "(IIIII)V") public static void method4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(4) int arg3) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg3, arg2 + arg0, arg1 + arg3); Static46.method1186(arg0, arg3, arg2, arg1, 0); } else { @@ -549,12 +549,12 @@ public final class Static1 { @Pc(63) SoftwareSprite local63 = new SoftwareSprite(arg2, arg1); Static129.method2491(local63.anIntArray20, arg2, arg1); Static214.method4364(arg2, 0, Static48.anInt1449, 0, 0, Static181.anInt4296, arg1, 0); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static70.aClass3_Sub2_Sub1_2 = new GlSprite(local63); } else { Static70.aClass3_Sub2_Sub1_2 = local63; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static129.anIntArray297 = null; } else { Static260.aClass27_2.method4189(); @@ -569,7 +569,7 @@ public final class Static1 { if (Static266.game == 1) { local169 = 16777215; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1182(local161, local147, local167, local153, local169, 128); Static46.method1179(local161, local147, local167, local153, local169); } else { @@ -589,7 +589,7 @@ public final class Static1 { if (local238.anInt4308 == Static9.anInt172) { @Pc(258) int local258 = arg3 + local238.anInt4314 * arg1 / Static181.anInt4296; @Pc(267) int local267 = arg2 * local238.anInt4307 / Static48.anInt1449 + arg0; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1182(local267 - 2, local258 + -2, 4, 4, 16776960, local225); } else { Static129.method2484(local267 - 2, local258 + -2, 4, 4, 16776960, local225); diff --git a/client/src/main/java/Static102.java b/client/src/main/java/Static102.java index 18deb29..4e22efb 100644 --- a/client/src/main/java/Static102.java +++ b/client/src/main/java/Static102.java @@ -54,7 +54,7 @@ public final class Static102 { @OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V") public static void method2074(@OriginalArg(0) Js5 arg0, @OriginalArg(2) Js5 arg1) { Static114.aClass3_Sub2_Sub9_42 = Static127.method2462(Static166.anInt4049, arg1, arg0); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static265.aClass3_Sub2_Sub9_Sub1_2 = Static122.method2412(Static166.anInt4049, arg0, arg1); } else { Static265.aClass3_Sub2_Sub9_Sub1_2 = (SoftwareFont) Static114.aClass3_Sub2_Sub9_42; diff --git a/client/src/main/java/Static112.java b/client/src/main/java/Static112.java index 61a65fd..ca37993 100644 --- a/client/src/main/java/Static112.java +++ b/client/src/main/java/Static112.java @@ -17,7 +17,7 @@ public final class Static112 { if (Static209.aClass153_86.method4506(Static55.anInt1736) && Static209.aClass153_86.method4506(Static169.anInt4073)) { Static39.aClass3_Sub2_Sub1_1 = Static80.method3613(Static209.aClass153_86, Static55.anInt1736); Static181.aClass3_Sub2_Sub1_9 = Static80.method3613(Static209.aClass153_86, Static169.anInt4073); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if (Static39.aClass3_Sub2_Sub1_1 instanceof SoftwareAlphaSprite) { Static39.aClass3_Sub2_Sub1_1 = new GlAlphaSprite((SoftwareSprite) Static39.aClass3_Sub2_Sub1_1); } else { @@ -29,7 +29,7 @@ public final class Static112 { Static181.aClass3_Sub2_Sub1_9 = new GlSprite((SoftwareSprite) Static181.aClass3_Sub2_Sub1_9); } } - } else if (Static239.aBoolean269) { + } else if (GlRenderer.enabled) { Static46.method1182(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910); } else { Static129.method2484(local3, local9, local13, 20, Static40.anInt1275, 256 - Static111.anInt2910); @@ -46,7 +46,7 @@ public final class Static112 { Static181.aClass3_Sub2_Sub1_9.method1421(local3 + local13 - Static181.aClass3_Sub2_Sub1_9.anInt1867, local9); } Static280.aClass3_Sub2_Sub9_43.method2857(LocalizedText.CHOOSE_OPTION, local3 + 3, local9 + 14, Static195.anInt4581, -1); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1182(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); } else { Static129.method2484(local3, local9 + 20, local13, local11 - 20, Static40.anInt1275, 256 - Static111.anInt2910); @@ -58,7 +58,7 @@ public final class Static112 { for (local203 = 0; local203 < Static231.anInt5204; local203++) { local219 = (Static231.anInt5204 - local203 - 1) * 15 + local9 + 35; if (local3 < local112 && local112 < local3 + local13 && local114 > local219 - 13 && local114 < local219 + 3) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1182(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208); } else { Static129.method2484(local3, local219 - 13, local13, 16, Static251.anInt5457, 256 - Static232.anInt5208); @@ -69,7 +69,7 @@ public final class Static112 { Static165.aClass3_Sub2_Sub1_8 = Static80.method3613(Static209.aClass153_86, Static85.anInt2261); Static92.aClass3_Sub2_Sub1_6 = Static80.method3613(Static209.aClass153_86, Static136.anInt3324); Static204.aClass3_Sub2_Sub1_10 = Static80.method3613(Static209.aClass153_86, Static254.anInt5556); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if (Static165.aClass3_Sub2_Sub1_8 instanceof SoftwareAlphaSprite) { Static165.aClass3_Sub2_Sub1_8 = new GlAlphaSprite((SoftwareSprite) Static165.aClass3_Sub2_Sub1_8); } else { diff --git a/client/src/main/java/Static114.java b/client/src/main/java/Static114.java index b5958bf..e1c5e31 100644 --- a/client/src/main/java/Static114.java +++ b/client/src/main/java/Static114.java @@ -46,7 +46,7 @@ public final class Static114 { public static void method4636(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) { @Pc(24) int local24 = Static215.aClass3_Sub2_Sub9_32.method2856(arg1, 250); @Pc(31) int local31 = Static215.aClass3_Sub2_Sub9_32.method2860(arg1, 250) * 13; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1186(6, 6, local24 + 4 + 4, local31 + 8, 0); Static46.method1179(6, 6, local24 + 4 + 4, local31 + 4 + 4, 16777215); } else { @@ -57,8 +57,8 @@ public final class Static114 { Static133.method4012(6, local24 + 8, 6, local31 + 4 + 4); if (!arg0) { Static121.method2407(10, 10, local31, local24); - } else if (Static239.aBoolean269) { - Static239.method4153(); + } else if (GlRenderer.enabled) { + GlRenderer.method4153(); } else { try { @Pc(159) Graphics local159 = Static154.canvas.getGraphics(); diff --git a/client/src/main/java/Static115.java b/client/src/main/java/Static115.java index 4d259c8..b204075 100644 --- a/client/src/main/java/Static115.java +++ b/client/src/main/java/Static115.java @@ -84,7 +84,7 @@ public final class Static115 { if (arg2 < 1) { arg2 = 1; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { @Pc(25) int local25 = arg2 - 334; if (local25 < 0) { local25 = 0; diff --git a/client/src/main/java/Static120.java b/client/src/main/java/Static120.java index 9d4f559..40e51af 100644 --- a/client/src/main/java/Static120.java +++ b/client/src/main/java/Static120.java @@ -55,7 +55,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIII)V") public static void method2388(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6) { - if (!Static178.aBoolean202) { + if (!Static178.highDetailLighting) { return; } if (arg0 == 1 && arg5 > 0) { @@ -96,7 +96,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIIIII)V") public static void method2391(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7) { - if (!Static178.aBoolean202 || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) { + if (!Static178.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg6 && anInt3030 == arg7) { return; } @Pc(20) int local20; @@ -179,7 +179,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIIII)V") public static void method2393(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - if (!Static178.aBoolean202 || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) { + if (!Static178.highDetailLighting || anInt3031 == arg3 && anInt3033 == arg4 && anInt3029 == arg5 && anInt3035 == arg4 && anInt3030 == arg5) { return; } @Pc(20) int local20; @@ -294,14 +294,14 @@ public final class Static120 { if (aBooleanArray65[arg0]) { aBooleanArray65[arg0] = false; @Pc(14) int local14 = arg0 + 16384 + 4; - @Pc(16) GL2 local16 = Static239.gl; + @Pc(16) GL2 local16 = GlRenderer.gl; local16.glDisable(local14); } } @OriginalMember(owner = "client!jf", name = "a", descriptor = "(IIIII)V") public static void method2397(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - if (!Static178.aBoolean202) { + if (!Static178.highDetailLighting) { return; } label43: for (@Pc(4) int local4 = 0; local4 < 4; local4++) { @@ -341,7 +341,7 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "e", descriptor = "()V") public static void method2400() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; @Pc(3) int local3; for (local3 = 0; local3 < 4; local3++) { @Pc(10) int local10 = local3 + 16388; @@ -367,16 +367,16 @@ public final class Static120 { @OriginalMember(owner = "client!jf", name = "a", descriptor = "(II[[[Lclient!bj;)V") public static void method2402(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Tile[][][] arg2) { - if (!Static178.aBoolean202) { + if (!Static178.highDetailLighting) { return; } - @Pc(4) GL2 local4 = Static239.gl; - Static27.method766(0, 0); - Static239.method4183(0); - Static239.method4150(); - Static239.method4177(Static239.anInt5328); + @Pc(4) GL2 local4 = GlRenderer.gl; + Static27.setMaterial(0, 0); + GlRenderer.setTextureCombineRgbMode(0); + GlRenderer.resetTextureMatrix(); + GlRenderer.setTextureId(GlRenderer.anInt5328); local4.glDepthMask(false); - Static239.method4164(false); + GlRenderer.setLightingEnabled(false); local4.glBlendFunc(GL2.GL_DST_COLOR, GL2.GL_ONE); local4.glFogfv(GL2.GL_FOG_COLOR, new float[] { 0.0F, 0.0F, 0.0F, 0.0F }, 0); local4.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_SRC0_RGB, GL2.GL_CONSTANT); @@ -414,7 +414,7 @@ public final class Static120 { local160 = arg2[local66][local155][local112]; } if (local66 < 0 || local160 != null && local160.aBoolean45) { - Static239.method4159(201.5F - (float) local63.anInt2241 * 50.0F - 1.5F); + GlRenderer.method4159(201.5F - (float) local63.anInt2241 * 50.0F - 1.5F); local4.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, new float[] { 0.0F, 0.0F, 0.0F, local63.aFloat8 }, 0); local63.aClass45_1.method1556(); continue label71; @@ -429,13 +429,13 @@ public final class Static120 { local4.glDepthMask(true); local4.glFogfv(GL2.GL_FOG_COLOR, Static161.aFloatArray19, 0); local4.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); - Static239.method4173(); + GlRenderer.method4173(); } @OriginalMember(owner = "client!jf", name = "a", descriptor = "(ILclient!gi;III)V") private static void method2403(@OriginalArg(0) int arg0, @OriginalArg(1) Light arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { @Pc(5) int local5 = arg0 + 16384 + 4; - @Pc(7) GL2 local7 = Static239.gl; + @Pc(7) GL2 local7 = GlRenderer.gl; if (!aBooleanArray65[arg0]) { local7.glEnable(local5); aBooleanArray65[arg0] = true; diff --git a/client/src/main/java/Static126.java b/client/src/main/java/Static126.java index 6c0f039..fbacafe 100644 --- a/client/src/main/java/Static126.java +++ b/client/src/main/java/Static126.java @@ -30,7 +30,7 @@ public final class Static126 { Static97.anInt2503 = -1; Static169.aClass13_18 = null; Static182.anInt4311 = Static83.anInt372; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static263.aBoolean299 = true; } Static214.anInt5574 = -1; @@ -38,7 +38,7 @@ public final class Static126 { Static24.anInt766 = 0; Static9.method182(); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1177(); } else { Static129.method2503(); diff --git a/client/src/main/java/Static127.java b/client/src/main/java/Static127.java index 4194d5c..26acba3 100644 --- a/client/src/main/java/Static127.java +++ b/client/src/main/java/Static127.java @@ -152,7 +152,7 @@ public final class Static127 { Static84.anInt2255 -= local81; Static115.anInt2939 -= local86; } - if (Static239.aBoolean269 && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) { + if (GlRenderer.enabled && arg4 && (Math.abs(local86) > 104 || Math.abs(local81) > 104)) { Static86.method1799(); } Static107.anInt2875 = -1; @@ -184,26 +184,26 @@ public final class Static127 { @OriginalMember(owner = "client!k", name = "a", descriptor = "(Lclient!be;Lclient!na;I)Lclient!na;") public static JagString method2465(@OriginalArg(0) Component arg0, @OriginalArg(1) JagString arg1) { - if (arg1.method3131(Static49.aClass100_352) == -1) { + if (arg1.indexOf(Static49.aClass100_352) == -1) { return arg1; } while (true) { - @Pc(14) int local14 = arg1.method3131(Static23.aClass100_133); + @Pc(14) int local14 = arg1.indexOf(Static23.aClass100_133); if (local14 == -1) { while (true) { - local14 = arg1.method3131(Static276.aClass100_1097); + local14 = arg1.indexOf(Static276.aClass100_1097); if (local14 == -1) { while (true) { - local14 = arg1.method3131(Static160.aClass100_761); + local14 = arg1.indexOf(Static160.aClass100_761); if (local14 == -1) { while (true) { - local14 = arg1.method3131(Static96.aClass100_520); + local14 = arg1.indexOf(Static96.aClass100_520); if (local14 == -1) { while (true) { - local14 = arg1.method3131(Static235.aClass100_1002); + local14 = arg1.indexOf(Static235.aClass100_1002); if (local14 == -1) { while (true) { - local14 = arg1.method3131(Static122.aClass100_591); + local14 = arg1.indexOf(Static122.aClass100_591); if (local14 == -1) { return arg1; } @@ -218,22 +218,22 @@ public final class Static127 { } catch (@Pc(274) UnsupportedEncodingException local274) { } } - arg1 = Static34.method882(new JagString[] { arg1.method3137(local14, 0), local246, arg1.method3136(local14 + 4) }); + arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), local246, arg1.method3136(local14 + 4) }); } } - arg1 = Static34.method882(new JagString[] { arg1.method3137(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.method3136(local14 + 2) }); + arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(4, arg0)), arg1.method3136(local14 + 2) }); } } - arg1 = Static34.method882(new JagString[] { arg1.method3137(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.method3136(local14 + 2) }); + arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(3, arg0)), arg1.method3136(local14 + 2) }); } } - arg1 = Static34.method882(new JagString[] { arg1.method3137(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.method3136(local14 + 2) }); + arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(2, arg0)), arg1.method3136(local14 + 2) }); } } - arg1 = Static34.method882(new JagString[] { arg1.method3137(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.method3136(local14 + 2) }); + arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(1, arg0)), arg1.method3136(local14 + 2) }); } } - arg1 = Static34.method882(new JagString[] { arg1.method3137(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.method3136(local14 + 2) }); + arg1 = Static34.method882(new JagString[] { arg1.substring(local14, 0), Static262.method4510(Static273.method3212(0, arg0)), arg1.method3136(local14 + 2) }); } } @@ -272,7 +272,7 @@ public final class Static127 { if (arg0.method3111(Static240.aClass100_1009)) { Static103.method2231(null, 0, Static34.method882(new JagString[] { Static44.aClass100_335, Static123.method2423(Static198.method1029()) })); } - if (Static239.aBoolean269 && arg0.method3111(Static201.aClass100_406)) { + if (GlRenderer.enabled && arg0.method3111(Static201.aClass100_406)) { System.out.println("oncard_geometry:" + Static63.anInt1945); System.out.println("oncard_2d:" + Static63.anInt1944); System.out.println("oncard_texture:" + Static63.anInt1942); diff --git a/client/src/main/java/Static132.java b/client/src/main/java/Static132.java index b0432a5..30647d0 100644 --- a/client/src/main/java/Static132.java +++ b/client/src/main/java/Static132.java @@ -151,7 +151,7 @@ public final class Static132 { Static56.anInt1742 = arg6; Static116.anInt2954 = arg7; } - if (!Static239.aBoolean269 && !arg8) { + if (!GlRenderer.enabled && !arg8) { Rasteriser.aBoolean138 = false; if (local307 < 0 || local323 < 0 || local291 < 0 || local307 > Rasteriser.anInt2472 || local323 > Rasteriser.anInt2472 || local291 > Rasteriser.anInt2472) { Rasteriser.aBoolean138 = true; @@ -177,7 +177,7 @@ public final class Static132 { Static56.anInt1742 = arg6; Static116.anInt2954 = arg7; } - if (Static239.aBoolean269 || arg8) { + if (GlRenderer.enabled || arg8) { return; } Rasteriser.aBoolean138 = false; diff --git a/client/src/main/java/Static136.java b/client/src/main/java/Static136.java index 00201ce..d735acc 100644 --- a/client/src/main/java/Static136.java +++ b/client/src/main/java/Static136.java @@ -94,10 +94,10 @@ public final class Static136 { Static139.anInt3451 = 2; } if (local21 < 2) { - Static178.aBoolean202 = arg0.g1() == 1; + Static178.highDetailLighting = arg0.g1() == 1; arg0.g1(); } else { - Static178.aBoolean202 = arg0.g1() == 1; + Static178.highDetailLighting = arg0.g1() == 1; } Static220.aBoolean244 = arg0.g1() == 1; Static71.aBoolean107 = arg0.g1() == 1; diff --git a/client/src/main/java/Static137.java b/client/src/main/java/Static137.java index d50856d..7b33a5e 100644 --- a/client/src/main/java/Static137.java +++ b/client/src/main/java/Static137.java @@ -25,7 +25,7 @@ public final class Static137 { @Pc(76) int local76; @Pc(80) int local80; if (Static56.aClass3_Sub2_Sub1_Sub1_1 == null) { - if (Static239.aBoolean269 || Static89.aClass3_Sub2_Sub1_5 == null) { + if (GlRenderer.enabled || Static89.aClass3_Sub2_Sub1_5 == null) { Static56.aClass3_Sub2_Sub1_Sub1_1 = new SoftwareSprite(512, 512); } else { Static56.aClass3_Sub2_Sub1_Sub1_1 = (SoftwareSprite) Static89.aClass3_Sub2_Sub1_5; @@ -102,7 +102,7 @@ public final class Static137 { for (local37 = 1; local37 < 103; local37++) { for (local76 = 1; local76 < 103; local76++) { if ((Static12.aByteArrayArrayArray2[arg0][local76][local37] & 0x18) == 0 && !Static164.method3109(local76, local455, local37, local35, arg0)) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static129.anIntArray297 = null; } else { Static260.aClass27_2.method4189(); @@ -110,7 +110,7 @@ public final class Static137 { return false; } if (arg0 < 3 && (Static12.aByteArrayArrayArray2[arg0 + 1][local76][local37] & 0x8) != 0 && !Static164.method3109(local76, local455, local37, local35, arg0 + 1)) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static129.anIntArray297 = null; } else { Static260.aClass27_2.method4189(); @@ -119,7 +119,7 @@ public final class Static137 { } } } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { @Pc(576) int[] local576 = Static56.aClass3_Sub2_Sub1_Sub1_1.anIntArray20; local76 = local576.length; for (local80 = 0; local80 < local76; local80++) { @@ -131,7 +131,7 @@ public final class Static137 { } else { Static89.aClass3_Sub2_Sub1_5 = Static56.aClass3_Sub2_Sub1_Sub1_1; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static129.anIntArray297 = null; } else { Static260.aClass27_2.method4189(); diff --git a/client/src/main/java/Static138.java b/client/src/main/java/Static138.java index 8c5f809..74617f4 100644 --- a/client/src/main/java/Static138.java +++ b/client/src/main/java/Static138.java @@ -104,7 +104,7 @@ public final class Static138 { @OriginalMember(owner = "client!km", name = "f", descriptor = "(I)Z") public static boolean method2697() { - return Static239.aBoolean269 ? true : Static162.aBoolean190; + return GlRenderer.enabled ? true : Static162.aBoolean190; } @OriginalMember(owner = "client!km", name = "c", descriptor = "(Z)Z") diff --git a/client/src/main/java/Static140.java b/client/src/main/java/Static140.java index 82408a3..e7664f7 100644 --- a/client/src/main/java/Static140.java +++ b/client/src/main/java/Static140.java @@ -88,7 +88,7 @@ public final class Static140 { return; } for (@Pc(19) int local19 = 0; local19 < 50 && arg0.anEventQueue1.peekEvent() != null; local19++) { - Static231.method3983(1L); + Static231.sleep(1L); } if (arg1 != null) { arg0.anEventQueue1.postEvent(new ActionEvent(arg1, 1001, "dummy")); diff --git a/client/src/main/java/Static141.java b/client/src/main/java/Static141.java index 045231c..c8896d4 100644 --- a/client/src/main/java/Static141.java +++ b/client/src/main/java/Static141.java @@ -52,7 +52,7 @@ public final class Static141 { local46.anObject5 = null; } } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static242.method4201(); Static76.method1642(); } diff --git a/client/src/main/java/Static142.java b/client/src/main/java/Static142.java index 878a7f6..ec33ac1 100644 --- a/client/src/main/java/Static142.java +++ b/client/src/main/java/Static142.java @@ -153,13 +153,13 @@ public final class Static142 { local508.method1423(local161, local359); local639 = local508.anInt1867 * local17.anInt3372 / 255; local642 = local508.anInt1859; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1183(local161, local359, local161 + local639, local359 + local642); } else { Static129.method2498(local161, local359, local161 + local639, local642 + local359); } local512.method1423(local161, local359); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg2, arg0, arg1 + arg2, arg0 - -arg4); } else { Static129.method2496(arg2, arg0, arg1 + arg2, arg4 + arg0); @@ -275,13 +275,13 @@ public final class Static142 { } if (Static191.anIntArray391[local5] == 4) { local642 = (150 - Static191.anIntArray384[local5]) * (Static280.aClass3_Sub2_Sub9_43.method2858(local962) + 100) / 150; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1183(Static65.anInt1951 + arg2 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0); } else { Static129.method2498(arg2 + Static65.anInt1951 - 50, arg0, Static65.anInt1951 + arg2 + 50, arg4 + arg0); } Static280.aClass3_Sub2_Sub9_43.method2857(local962, arg2 + Static65.anInt1951 + 50 - local642, arg0 + Static16.anInt548, local639, 0); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg2, arg0, arg1 + arg2, arg4 + arg0); } else { Static129.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4); @@ -290,7 +290,7 @@ public final class Static142 { if (Static191.anIntArray391[local5] == 5) { @Pc(1372) int local1372 = 0; local642 = 150 - Static191.anIntArray384[local5]; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1183(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.anInt3626 - 1, arg1 + arg2, arg0 + Static16.anInt548 + 5); } else { Static129.method2498(arg2, Static16.anInt548 + arg0 - Static280.aClass3_Sub2_Sub9_43.anInt3626 - 1, arg2 + arg1, Static16.anInt548 + arg0 + 5); @@ -301,7 +301,7 @@ public final class Static142 { local1372 = local642 - 125; } Static280.aClass3_Sub2_Sub9_43.method2875(local962, Static65.anInt1951 + arg2, local1372 + arg0 + Static16.anInt548, local639, 0); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg2, arg0, arg2 + arg1, arg0 + arg4); } else { Static129.method2496(arg2, arg0, arg2 + arg1, arg0 + arg4); diff --git a/client/src/main/java/Static144.java b/client/src/main/java/Static144.java index fd186ae..9571cba 100644 --- a/client/src/main/java/Static144.java +++ b/client/src/main/java/Static144.java @@ -264,9 +264,9 @@ public final class Static144 { public static int method2736() { if (Static69.aFrame2 != null) { return 3; - } else if (Static239.aBoolean269 && Static124.aBoolean156) { + } else if (GlRenderer.enabled && Static124.aBoolean156) { return 2; - } else if (Static239.aBoolean269 && !Static124.aBoolean156) { + } else if (GlRenderer.enabled && !Static124.aBoolean156) { return 1; } else { return 0; diff --git a/client/src/main/java/Static145.java b/client/src/main/java/Static145.java index 47be9a0..18ecf7e 100644 --- a/client/src/main/java/Static145.java +++ b/client/src/main/java/Static145.java @@ -24,7 +24,7 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "a", descriptor = "(I)V") public static void method2742() { - if (Static244.anInt5370 == 10 && Static239.aBoolean269) { + if (Static244.anInt5370 == 10 && GlRenderer.enabled) { Static196.method3534(28); } if (Static244.anInt5370 == 30) { @@ -71,7 +71,7 @@ public final class Static145 { @Pc(9) int local9 = Static24.anInt761; @Pc(11) int local11 = Static183.anInt4271; @Pc(15) int local15 = Static13.anInt436; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1186(local11, local3, local9, local15, 6116423); Static46.method1186(local11 + 1, local3 + 1, local9 - 2, 16, 0); Static46.method1179(local11 + 1, local3 + 18, local9 - 2, local15 + -19, 0); @@ -105,6 +105,6 @@ public final class Static145 { @OriginalMember(owner = "client!lf", name = "c", descriptor = "(I)I") public static int method2746() { - return ((Static99.aBoolean143 ? 1 : 0) << 19) + (((Static71.aBoolean107 ? 1 : 0) << 16) + ((Static220.aBoolean244 ? 1 : 0) << 15) + ((Static178.aBoolean202 ? 1 : 0) << 13) + ((Static209.aBoolean240 ? 1 : 0) << 10) + ((Static159.aBoolean189 ? 1 : 0) << 9) + ((Static15.aBoolean33 ? 1 : 0) << 7) + ((Static53.aBoolean99 ? 1 : 0) << 6) + ((Static250.aBoolean283 ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.anInt4609 & 0x7) - (-((Static80.aBoolean231 ? 1 : 0) << 4) + -((Static11.aBoolean15 ? 1 : 0) << 8)) - (-((Static139.anInt3451 & 0x3) << 11) + -((Static125.anInt3104 == 0 ? 0 : 1) << 20) - (((Static12.anInt391 == 0 ? 0 : 1) << 21) + ((Static30.anInt978 == 0 ? 0 : 1) << 22)))) + (Static76.method1644() << 23)); + return ((Static99.aBoolean143 ? 1 : 0) << 19) + (((Static71.aBoolean107 ? 1 : 0) << 16) + ((Static220.aBoolean244 ? 1 : 0) << 15) + ((Static178.highDetailLighting ? 1 : 0) << 13) + ((Static209.aBoolean240 ? 1 : 0) << 10) + ((Static159.aBoolean189 ? 1 : 0) << 9) + ((Static15.aBoolean33 ? 1 : 0) << 7) + ((Static53.aBoolean99 ? 1 : 0) << 6) + ((Static250.aBoolean283 ? 1 : 0) << 5) + (((Static162.aBoolean190 ? 1 : 0) << 3) + (Static113.anInt4609 & 0x7) - (-((Static80.aBoolean231 ? 1 : 0) << 4) + -((Static11.aBoolean15 ? 1 : 0) << 8)) - (-((Static139.anInt3451 & 0x3) << 11) + -((Static125.anInt3104 == 0 ? 0 : 1) << 20) - (((Static12.anInt391 == 0 ? 0 : 1) << 21) + ((Static30.anInt978 == 0 ? 0 : 1) << 22)))) + (Static76.method1644() << 23)); } } diff --git a/client/src/main/java/Static147.java b/client/src/main/java/Static147.java index 722bdf1..fcc632b 100644 --- a/client/src/main/java/Static147.java +++ b/client/src/main/java/Static147.java @@ -64,7 +64,7 @@ public final class Static147 { Static56.anInt1742 = arg5; Static116.anInt2954 = arg6; } - if (!Static239.aBoolean269 && !arg7) { + if (!GlRenderer.enabled && !arg7) { Rasteriser.aBoolean138 = false; if (local39 < 0 || local148 < 0 || local152 < 0 || local39 > Rasteriser.anInt2472 || local148 > Rasteriser.anInt2472 || local152 > Rasteriser.anInt2472) { Rasteriser.aBoolean138 = true; diff --git a/client/src/main/java/Static151.java b/client/src/main/java/Static151.java index a7d19ae..961d16b 100644 --- a/client/src/main/java/Static151.java +++ b/client/src/main/java/Static151.java @@ -53,27 +53,27 @@ public final class Static151 { @Pc(4) GL2 local4; @Pc(11) int[] local11; if (anInt3587 != -1) { - local4 = Static239.gl; + local4 = GlRenderer.gl; local11 = new int[] { anInt3587 }; local4.glDeleteTextures(1, local11, 0); anInt3587 = -1; Static63.anInt1942 -= aByteBuffer7.limit() * 2; } if (anIntArray341 != null) { - local4 = Static239.gl; + local4 = GlRenderer.gl; local4.glDeleteTextures(64, anIntArray341, 0); anIntArray341 = null; Static63.anInt1942 -= aByteBuffer7.limit() * 2; } if (anInt3588 != -1) { - local4 = Static239.gl; + local4 = GlRenderer.gl; local11 = new int[] { anInt3588 }; local4.glDeleteTextures(1, local11, 0); anInt3588 = -1; Static63.anInt1942 -= aByteBuffer6.limit() * 2; } if (anIntArray340 != null) { - local4 = Static239.gl; + local4 = GlRenderer.gl; local4.glDeleteTextures(64, anIntArray340, 0); anIntArray340 = null; Static63.anInt1942 -= aByteBuffer6.limit() * 2; @@ -82,7 +82,7 @@ public final class Static151 { @OriginalMember(owner = "client!lm", name = "c", descriptor = "()V") public static void method2809() { - aBoolean176 = Static239.aBoolean267; + aBoolean176 = GlRenderer.extTexture3dSupported; method2807(); method2811(); method2812(); @@ -90,7 +90,7 @@ public final class Static151 { @OriginalMember(owner = "client!lm", name = "e", descriptor = "()V") private static void method2811() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; if (aBoolean176) { @Pc(6) int[] local6 = new int[1]; local1.glGenTextures(1, local6, 0); @@ -106,7 +106,7 @@ public final class Static151 { anIntArray341 = new int[64]; local1.glGenTextures(64, anIntArray341, 0); for (@Pc(65) int local65 = 0; local65 < 64; local65++) { - Static239.method4177(anIntArray341[local65]); + GlRenderer.setTextureId(anIntArray341[local65]); aByteBuffer7.position(local65 * 64 * 64 * 2); local1.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer7); local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); @@ -117,7 +117,7 @@ public final class Static151 { @OriginalMember(owner = "client!lm", name = "f", descriptor = "()V") private static void method2812() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; if (aBoolean176) { @Pc(6) int[] local6 = new int[1]; local1.glGenTextures(1, local6, 0); @@ -133,7 +133,7 @@ public final class Static151 { anIntArray340 = new int[64]; local1.glGenTextures(64, anIntArray340, 0); for (@Pc(65) int local65 = 0; local65 < 64; local65++) { - Static239.method4177(anIntArray340[local65]); + GlRenderer.setTextureId(anIntArray340[local65]); aByteBuffer6.position(local65 * 64 * 64 * 2); local1.glTexImage2D(GL2.GL_TEXTURE_2D, 0, GL2.GL_LUMINANCE_ALPHA, 64, 64, 0, GL2.GL_LUMINANCE_ALPHA, GL2.GL_UNSIGNED_BYTE, aByteBuffer6); local1.glTexParameteri(GL2.GL_TEXTURE_2D, GL2.GL_TEXTURE_MIN_FILTER, GL2.GL_LINEAR); diff --git a/client/src/main/java/Static155.java b/client/src/main/java/Static155.java index beda485..28cb390 100644 --- a/client/src/main/java/Static155.java +++ b/client/src/main/java/Static155.java @@ -33,11 +33,11 @@ public final class Static155 { @OriginalMember(owner = "client!me", name = "a", descriptor = "(ZLclient!na;I)V") public static void method2941(@OriginalArg(0) boolean arg0, @OriginalArg(1) JagString arg1) { @Pc(8) short[] local8 = new short[16]; - @Pc(12) JagString local12 = arg1.method3114(); + @Pc(12) JagString local12 = arg1.toLowerCase(); @Pc(14) int local14 = 0; for (@Pc(16) int local16 = 0; local16 < Static170.anInt3245; local16++) { @Pc(27) ObjType local27 = Static71.method1439(local16); - if ((!arg0 || local27.aBoolean132) && local27.anInt2358 == -1 && local27.anInt2334 == -1 && local27.anInt2370 == 0 && local27.aClass100_495.method3114().method3131(local12) != -1) { + if ((!arg0 || local27.aBoolean132) && local27.anInt2358 == -1 && local27.anInt2334 == -1 && local27.anInt2370 == 0 && local27.aClass100_495.toLowerCase().indexOf(local12) != -1) { if (local14 >= 250) { Static169.aShortArray52 = null; Static111.anInt2905 = -1; diff --git a/client/src/main/java/Static156.java b/client/src/main/java/Static156.java index 0a4df15..06faca9 100644 --- a/client/src/main/java/Static156.java +++ b/client/src/main/java/Static156.java @@ -55,7 +55,7 @@ public final class Static156 { Static215.anInt4866 = Static99.anInt2550; } @Pc(99) short local99; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local99 = 3584; } else { local99 = 3500; @@ -96,9 +96,9 @@ public final class Static156 { if (Static276.aClass3_Sub5ArrayArrayArray3 != null) { Static278.method4648(true); Static248.method3292(arg0, arg1, arg2, null, 0, (byte) 0, arg13, arg14); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static119.aBoolean153 = false; - Static27.method766(0, 0); + Static27.setMaterial(0, 0); Static161.method3066(null); Static120.method2390(); } @@ -153,13 +153,13 @@ public final class Static156 { @OriginalMember(owner = "client!mf", name = "a", descriptor = "()V") public static void method2959() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glDisableClientState(GL2.GL_COLOR_ARRAY); - Static239.method4164(false); + GlRenderer.setLightingEnabled(false); local1.glDisable(GL2.GL_DEPTH_TEST); local1.glPushAttrib(GL2.GL_FOG_BIT); local1.glFogf(GL2.GL_FOG_START, 3072.0F); - Static239.method4178(); + GlRenderer.disableDepthMask(); for (@Pc(19) int local19 = 0; local19 < Static36.aClass3_Sub14ArrayArray1[0].length; local19++) { @Pc(31) Class3_Sub14 local31 = Static36.aClass3_Sub14ArrayArray1[0][local19]; if (local31.anInt2485 >= 0 && Rasteriser.anInterface1_2.method3237(local31.anInt2485) == 4) { @@ -169,10 +169,10 @@ public final class Static156 { } } local1.glEnableClientState(GL2.GL_COLOR_ARRAY); - Static239.method4173(); + GlRenderer.method4173(); local1.glEnable(GL2.GL_DEPTH_TEST); local1.glPopAttrib(); - Static239.method4157(); + GlRenderer.enableDepthMask(); } @OriginalMember(owner = "client!mf", name = "a", descriptor = "(BLclient!wa;)Lclient!ta;") diff --git a/client/src/main/java/Static16.java b/client/src/main/java/Static16.java index f6fd743..244c2ce 100644 --- a/client/src/main/java/Static16.java +++ b/client/src/main/java/Static16.java @@ -23,7 +23,7 @@ public final class Static16 { @OriginalMember(owner = "client!bf", name = "c", descriptor = "(I)V") public static void method501() { - if (!Static239.aBoolean269 || Static231.aBoolean252) { + if (!GlRenderer.enabled || Static231.aBoolean252) { return; } @Pc(14) Tile[][][] local14 = Static130.aClass3_Sub5ArrayArrayArray1; diff --git a/client/src/main/java/Static160.java b/client/src/main/java/Static160.java index fbcfd4d..7bdcc89 100644 --- a/client/src/main/java/Static160.java +++ b/client/src/main/java/Static160.java @@ -27,11 +27,11 @@ public final class Static160 { @OriginalMember(owner = "client!mj", name = "a", descriptor = "(IILclient!be;IB)V") public static void method3047(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) Component arg2, @OriginalArg(3) int arg3) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg1, arg2.anInt445 + arg0, arg2.anInt459 + arg1); } if (Static270.anInt5795 >= 3) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { @Pc(44) Sprite local44 = arg2.method489(false); if (local44 != null) { local44.method1423(arg0, arg1); @@ -39,7 +39,7 @@ public final class Static160 { } else { Static129.method2504(arg0, arg1, arg2.anIntArray37, arg2.anIntArray45); } - } else if (Static239.aBoolean269) { + } else if (GlRenderer.enabled) { ((GlSprite) Static106.aClass3_Sub2_Sub1_7).method1427(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, 256, (GlSprite) arg2.method489(false)); } else { ((SoftwareSprite) Static106.aClass3_Sub2_Sub1_7).method313(arg0, arg1, arg2.anInt445, arg2.anInt459, Static106.aClass3_Sub2_Sub1_7.anInt1867 / 2, Static106.aClass3_Sub2_Sub1_7.anInt1859 / 2, Static57.anInt1747, arg2.anIntArray37, arg2.anIntArray45); diff --git a/client/src/main/java/Static161.java b/client/src/main/java/Static161.java index 39a5615..84d0ec4 100644 --- a/client/src/main/java/Static161.java +++ b/client/src/main/java/Static161.java @@ -46,7 +46,7 @@ public final class Static161 { @OriginalMember(owner = "client!mk", name = "a", descriptor = "()V") public static void method3058() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glLightfv(GL2.GL_LIGHT0, GL2.GL_POSITION, aFloatArray18, 0); local1.glLightfv(GL2.GL_LIGHT1, GL2.GL_POSITION, aFloatArray20, 0); } @@ -65,7 +65,7 @@ public final class Static161 { aFloat21 = arg1; aFloat19 = arg2; aFloat20 = arg3; - @Pc(25) GL2 local25 = Static239.gl; + @Pc(25) GL2 local25 = GlRenderer.gl; @Pc(34) float local34 = (float) (arg0 >> 16 & 0xFF) / 255.0F; @Pc(43) float local43 = (float) (arg0 >> 8 & 0xFF) / 255.0F; @Pc(50) float local50 = (float) (arg0 & 0xFF) / 255.0F; @@ -84,7 +84,7 @@ public final class Static161 { } anInt3925 = arg0; anInt3924 = arg1; - @Pc(12) GL2 local12 = Static239.gl; + @Pc(12) GL2 local12 = GlRenderer.gl; aFloatArray19[0] = (float) (arg0 >> 16 & 0xFF) / 255.0F; aFloatArray19[1] = (float) (arg0 >> 8 & 0xFF) / 255.0F; aFloatArray19[2] = (float) (arg0 & 0xFF) / 255.0F; @@ -122,7 +122,7 @@ public final class Static161 { @OriginalMember(owner = "client!mk", name = "e", descriptor = "()V") public static void method3065() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glColorMaterial(GL2.GL_FRONT, GL2.GL_AMBIENT_AND_DIFFUSE); local1.glEnable(GL2.GL_COLOR_MATERIAL); @Pc(27) float[] local27 = new float[] { 0.0F, 0.0F, 0.0F, 1.0F }; @@ -141,7 +141,7 @@ public final class Static161 { if (arg0 == null) { arg0 = aFloatArray19; } - @Pc(5) GL2 local5 = Static239.gl; + @Pc(5) GL2 local5 = GlRenderer.gl; local5.glFogfv(GL2.GL_FOG_COLOR, arg0, 0); } diff --git a/client/src/main/java/Static164.java b/client/src/main/java/Static164.java index fc295e0..962c37f 100644 --- a/client/src/main/java/Static164.java +++ b/client/src/main/java/Static164.java @@ -246,6 +246,6 @@ public final class Static164 { Static129.method2488(local125); Rasteriser.method1908(); Rasteriser.aBoolean136 = true; - return Static239.aBoolean269 && !arg1 ? new GlSprite(local133) : local133; + return GlRenderer.enabled && !arg1 ? new GlSprite(local133) : local133; } } diff --git a/client/src/main/java/Static169.java b/client/src/main/java/Static169.java index 2d1c7a1..7ed3865 100644 --- a/client/src/main/java/Static169.java +++ b/client/src/main/java/Static169.java @@ -32,7 +32,7 @@ public final class Static169 { } return; } - if (Static239.aBoolean269 && Static40.aBoolean78) { + if (GlRenderer.enabled && Static40.aBoolean78) { try { Static287.method1758(Static71.signLink.anApplet2, "openjs", new Object[] { arg0.method3127(Static230.anApplet_Sub1_1.getCodeBase()).toString() }); return; @@ -66,7 +66,7 @@ public final class Static169 { } @Pc(90) PrivilegedRequest local90 = arg3.method5129(arg0, arg1, arg2); while (local90.status == 0) { - Static231.method3983(10L); + Static231.sleep(10L); } @Pc(103) Frame local103 = (Frame) local90.result; if (local103 == null) { diff --git a/client/src/main/java/Static172.java b/client/src/main/java/Static172.java index 87dd75d..14d0e1f 100644 --- a/client/src/main/java/Static172.java +++ b/client/src/main/java/Static172.java @@ -69,7 +69,7 @@ public final class Static172 { } @OriginalMember(owner = "client!nj", name = "a", descriptor = "(I)V") - public static void method3225() { + public static void quit() { Static2.anInterface4Array1 = null; Static151.method2808(); } diff --git a/client/src/main/java/Static178.java b/client/src/main/java/Static178.java index fd324f0..6238eb6 100644 --- a/client/src/main/java/Static178.java +++ b/client/src/main/java/Static178.java @@ -8,7 +8,7 @@ public final class Static178 { public static MouseRecorder instance; @OriginalMember(owner = "client!od", name = "c", descriptor = "Z") - public static boolean aBoolean202 = true; + public static boolean highDetailLighting = true; @OriginalMember(owner = "client!od", name = "e", descriptor = "I") public static int anInt4246 = 0; diff --git a/client/src/main/java/Static18.java b/client/src/main/java/Static18.java index c284c09..8b02393 100644 --- a/client/src/main/java/Static18.java +++ b/client/src/main/java/Static18.java @@ -56,7 +56,7 @@ public final class Static18 { public static void method555(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) int arg6) { @Pc(5) int local5; @Pc(29) int local29; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local5 = arg1 - 334; if (local5 < 0) { local5 = 0; diff --git a/client/src/main/java/Static181.java b/client/src/main/java/Static181.java index 3ed7b6d..afb47fa 100644 --- a/client/src/main/java/Static181.java +++ b/client/src/main/java/Static181.java @@ -40,7 +40,7 @@ public final class Static181 { if (Static18.aBoolean40) { return; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1184(); } else { Static129.method2492(); diff --git a/client/src/main/java/Static182.java b/client/src/main/java/Static182.java index f3373e5..c75fee7 100644 --- a/client/src/main/java/Static182.java +++ b/client/src/main/java/Static182.java @@ -28,7 +28,7 @@ public final class Static182 { @OriginalMember(owner = "client!oj", name = "a", descriptor = "(BZLclient!rk;)V") public static void method3359(@OriginalArg(1) boolean arg0, @OriginalArg(2) Font arg1) { @Pc(9) int local9; - if (Static239.aBoolean269 || arg0) { + if (GlRenderer.enabled || arg0) { local9 = Static254.anInt5554; @Pc(15) int local15 = local9 * 956 / 503; Static78.aClass3_Sub2_Sub1_3.method1419((Static48.anInt1448 - local15) / 2, 0, local15, local9); @@ -36,7 +36,7 @@ public final class Static182 { } arg1.method2875(LocalizedText.GAME0_LOADING, Static48.anInt1448 / 2, Static254.anInt5554 / 2 - 26, 16777215, -1); local9 = Static254.anInt5554 / 2 - 18; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1179(Static48.anInt1448 / 2 - 152, local9, 304, 34, 9179409); Static46.method1179(Static48.anInt1448 / 2 - 151, local9 - -1, 302, 32, 0); Static46.method1186(Static48.anInt1448 / 2 - 150, local9 + 2, Static199.anInt4670 * 3, 30, 9179409); diff --git a/client/src/main/java/Static185.java b/client/src/main/java/Static185.java index bbd1ce2..b68e50e 100644 --- a/client/src/main/java/Static185.java +++ b/client/src/main/java/Static185.java @@ -40,7 +40,7 @@ public final class Static185 { Static146.anInt3508 = arg2; } @Pc(62) LocType local62 = Static271.method4601(arg5); - if (Static239.aBoolean269 && local62.aBoolean216) { + if (GlRenderer.enabled && local62.aBoolean216) { return; } @Pc(84) int local84; @@ -76,7 +76,7 @@ public final class Static185 { @Pc(199) int local199 = local153[local103][local133] + local153[local112][local129] + local153[local103][local129] + local153[local112][local133] >> 2; @Pc(201) int local201 = 0; @Pc(213) int[][] local213; - if (Static239.aBoolean269 && arg0 != 0) { + if (GlRenderer.enabled && arg0 != 0) { local213 = Static83.anIntArrayArrayArray4[0]; local201 = local199 - (local213[local112][local133] + local213[local112][local129] + local213[local103][local129] + local213[local103][local133] >> 2); } @@ -107,7 +107,7 @@ public final class Static185 { if (Static250.aBoolean283 || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, 22, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -122,7 +122,7 @@ public final class Static185 { } else if (arg6 == 10 || arg6 == 11) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg6 == 11 ? arg9 + 4 : arg9, local165, local153, 10, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -154,7 +154,7 @@ public final class Static185 { } else if (arg6 >= 12) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -171,7 +171,7 @@ public final class Static185 { } else if (arg6 == 0) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, 0, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -223,7 +223,7 @@ public final class Static185 { } else if (arg6 == 1) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, 1, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -253,12 +253,12 @@ public final class Static185 { @Pc(1254) Entity local1254; if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { @Pc(1287) Class139 local1287 = local62.method3428(arg9 + 4, local165, local153, 2, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local1287.aClass36_Sub1_3, local165, local201, local173); } local1254 = local1287.aClass8_10; local1287 = local62.method3428(local1226, local165, local153, 2, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local1287.aClass36_Sub1_3, local165, local201, local173); } local1269 = local1287.aClass8_10; @@ -291,7 +291,7 @@ public final class Static185 { } else if (arg6 == 3) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, 3, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -316,7 +316,7 @@ public final class Static185 { } else if (arg6 == 9) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, arg6, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -333,7 +333,7 @@ public final class Static185 { } else if (arg6 == 4) { if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local403 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local403.aClass36_Sub1_3, local165, local201, local173); } local387 = local403.aClass8_10; @@ -353,7 +353,7 @@ public final class Static185 { } if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local1950 = local62.method3428(arg9, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local1950.aClass36_Sub1_3, local165 - Static34.anIntArray80[arg9] * 8, local201, local173 - Static238.anIntArray469[arg9] * 8); } local1934 = local1950.aClass8_10; @@ -369,7 +369,7 @@ public final class Static185 { } if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { local1950 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local1950.aClass36_Sub1_3, local165 - Static114.anIntArray565[arg9] * 8, local201, local173 - Static64.anIntArray154[arg9] * 8); } local1934 = local1950.aClass8_10; @@ -381,7 +381,7 @@ public final class Static185 { @Pc(2137) int local2137 = arg9 + 2 & 0x3; if (local62.anInt4430 == -1 && local62.anIntArray380 == null && !local62.aBoolean214) { @Pc(2183) Class139 local2183 = local62.method3428(local2137 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local2183.aClass36_Sub1_3, local165, local201, local173); } local387 = local2183.aClass8_10; @@ -401,12 +401,12 @@ public final class Static185 { @Pc(2297) int local2297 = Static64.anIntArray154[arg9] * 8; @Pc(2303) int local2303 = Static114.anIntArray565[arg9] * 8; @Pc(2319) Class139 local2319 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297); } local1934 = local2319.aClass8_10; local2319 = local62.method3428(local2244 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); - if (Static239.aBoolean269 && local330) { + if (GlRenderer.enabled && local330) { Static242.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297); } local2289 = local2319.aClass8_10; diff --git a/client/src/main/java/Static196.java b/client/src/main/java/Static196.java index eb92696..a0a11bb 100644 --- a/client/src/main/java/Static196.java +++ b/client/src/main/java/Static196.java @@ -66,8 +66,8 @@ public final class Static196 { Static107.js5NetQueue.method2322(true); } } - if (Static239.aBoolean269 && (arg0 == 25 || arg0 == 28 || arg0 == 40)) { - Static239.method4160(); + if (GlRenderer.enabled && (arg0 == 25 || arg0 == 28 || arg0 == 40)) { + GlRenderer.method4160(); } Static244.anInt5370 = arg0; } diff --git a/client/src/main/java/Static197.java b/client/src/main/java/Static197.java index 2a4313d..1372288 100644 --- a/client/src/main/java/Static197.java +++ b/client/src/main/java/Static197.java @@ -26,7 +26,7 @@ public final class Static197 { } @Pc(17) PrivilegedRequest local17 = arg0.method5132(); while (local17.status == 0) { - Static231.method3983(10L); + Static231.sleep(10L); } if (local17.status == 2) { return new Class114[0]; @@ -47,7 +47,7 @@ public final class Static197 { @OriginalMember(owner = "client!pm", name = "a", descriptor = "(ZIZIZII)V") public static void method3560(@OriginalArg(0) boolean arg0, @OriginalArg(1) int arg1, @OriginalArg(2) boolean arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5) { if (arg2) { - Static239.method4169(); + GlRenderer.quit(); } if (Static69.aFrame2 != null && (arg1 != 3 || arg4 != Static114.anInt5831 || arg5 != Static22.anInt729)) { Static25.method714(Static69.aFrame2, Static71.signLink); @@ -105,8 +105,8 @@ public final class Static197 { Static71.mouseWheel.start(Static154.canvas); } } else { - if (Static239.aBoolean269) { - Static239.method4181(Static48.anInt1448, Static254.anInt5554); + if (GlRenderer.enabled) { + GlRenderer.setCanvasSize(Static48.anInt1448, Static254.anInt5554); } Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554); if (Static39.aFrame1 == local85) { @@ -117,7 +117,7 @@ public final class Static197 { } } if (arg1 == 0 && arg3 > 0) { - Static239.method4161(Static154.canvas); + GlRenderer.method4161(Static154.canvas); } if (arg2 && arg1 > 0) { Static154.canvas.setIgnoreRepaint(true); @@ -144,17 +144,17 @@ public final class Static197 { } @Pc(300) PrivilegedRequest local300 = Static71.signLink.method5123(Static215.aClient1.getClass()); while (local300.status == 0) { - Static231.method3983(100L); + Static231.sleep(100L); } if (local300.status == 1) { Static211.aBoolean73 = true; } } if (Static211.aBoolean73) { - Static239.method4180(Static154.canvas, Static186.anInt4392 * 2); + GlRenderer.init(Static154.canvas, Static186.anInt4392 * 2); } } - if (!Static239.aBoolean269 && arg1 > 0) { + if (!GlRenderer.enabled && arg1 > 0) { method3560(true, 0, true, arg3, -1, -1); return; } @@ -163,7 +163,7 @@ public final class Static197 { Static260.aClass27_2 = null; Static268.method4580(); ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(200); - if (Static178.aBoolean202) { + if (Static178.highDetailLighting) { Rasteriser.method1911(0.7F); } Static114.method4637(); @@ -173,7 +173,7 @@ public final class Static197 { Static268.method4583(); Static76.method1643(); ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3248(20); - if (Static178.aBoolean202) { + if (Static178.highDetailLighting) { if (Static113.anInt4609 == 1) { Rasteriser.method1911(0.9F); } diff --git a/client/src/main/java/Static198.java b/client/src/main/java/Static198.java index f8f3968..016f030 100644 --- a/client/src/main/java/Static198.java +++ b/client/src/main/java/Static198.java @@ -71,7 +71,7 @@ public final class Static198 { if (local113 < 50) { Static16.anInt548 = -1; Static65.anInt1951 = -1; - } else if (Static239.aBoolean269) { + } else if (GlRenderer.enabled) { @Pc(150) int local150 = arg1 * 512 >> 8; Static65.anInt1951 = local150 * local89 / local113 + arg0; @Pc(164) int local164 = arg6 * 512 >> 8; diff --git a/client/src/main/java/Static203.java b/client/src/main/java/Static203.java index c65882a..020116b 100644 --- a/client/src/main/java/Static203.java +++ b/client/src/main/java/Static203.java @@ -53,8 +53,8 @@ public final class Static203 { Static254.anInt5554 = 503; Static48.anInt1448 = 765; } - if (Static239.aBoolean269) { - Static239.method4181(Static48.anInt1448, Static254.anInt5554); + if (GlRenderer.enabled) { + GlRenderer.setCanvasSize(Static48.anInt1448, Static254.anInt5554); } Static154.canvas.setSize(Static48.anInt1448, Static254.anInt5554); if (local8 == Static39.aFrame1) { @@ -75,7 +75,7 @@ public final class Static203 { try { @Pc(16) PrivilegedRequest local16 = arg0.method5112("runescape"); while (local16.status == 0) { - Static231.method3983(1L); + Static231.sleep(1L); } if (local16.status == 1) { local11 = (FileOnDisk) local16.result; diff --git a/client/src/main/java/Static213.java b/client/src/main/java/Static213.java index 941cd01..ce30903 100644 --- a/client/src/main/java/Static213.java +++ b/client/src/main/java/Static213.java @@ -48,7 +48,7 @@ public final class Static213 { for (@Pc(44) int local44 = 0; local44 < local31; local44++) { local38[local44] = Static259.anIntArray513[local23[local44] & 0xFF] | (local42[local44] & 0xFF) << 24; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local14[local16] = new GlAlphaSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local38); } else { local14[local16] = new SoftwareAlphaSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local38); @@ -58,7 +58,7 @@ public final class Static213 { for (@Pc(121) int local121 = 0; local121 < local31; local121++) { local119[local121] = Static259.anIntArray513[local23[local121] & 0xFF]; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local14[local16] = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local119); } else { local14[local16] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local16], Static269.anIntArray252[local16], Static254.anIntArray488[local16], Static26.anIntArray66[local16], local119); diff --git a/client/src/main/java/Static217.java b/client/src/main/java/Static217.java index fd6b7d4..0d1bef8 100644 --- a/client/src/main/java/Static217.java +++ b/client/src/main/java/Static217.java @@ -115,7 +115,7 @@ public final class Static217 { Static181.method3347(); Static90.method1857(); Static139.aClass99_22.method3104(); - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { ((Js5GlTextureProvider) Rasteriser.anInterface1_2).method3247(); } Static105.aClass54_9.method1815(); diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index d01d2da..7b2bc28 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -88,7 +88,7 @@ public final class Static220 { local10.method4554(arg0); } @Pc(94) int local94; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { @Pc(68) GlModel local68 = (GlModel) local10; if (arg5 != Static207.method3685(Static55.level, arg3 + local42, arg1 + local48) || arg5 != Static207.method3685(Static55.level, arg3 + local45, local51 + arg1)) { for (local94 = 0; local94 < local68.anInt5295; local94++) { diff --git a/client/src/main/java/Static221.java b/client/src/main/java/Static221.java index fd6aea5..2b9e83c 100644 --- a/client/src/main/java/Static221.java +++ b/client/src/main/java/Static221.java @@ -66,7 +66,7 @@ public final class Static221 { } local24 += Static129.anInt3144 - 128; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1178(Static167.aClass3_Sub2_Sub1_Sub1_3.anIntArray20, arg0, arg1, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1867, Static167.aClass3_Sub2_Sub1_Sub1_3.anInt1859); } else { Static167.aClass3_Sub2_Sub1_Sub1_3.method1415(arg0, arg1); diff --git a/client/src/main/java/Static231.java b/client/src/main/java/Static231.java index de9e54d..4b991a7 100644 --- a/client/src/main/java/Static231.java +++ b/client/src/main/java/Static231.java @@ -271,7 +271,7 @@ public final class Static231 { } @OriginalMember(owner = "client!sk", name = "a", descriptor = "(JI)V") - public static void method3983(@OriginalArg(0) long arg0) { + public static void sleep(@OriginalArg(0) long arg0) { if (arg0 <= 0L) { return; } diff --git a/client/src/main/java/Static233.java b/client/src/main/java/Static233.java index cd229b5..5449280 100644 --- a/client/src/main/java/Static233.java +++ b/client/src/main/java/Static233.java @@ -87,7 +87,7 @@ public final class Static233 { public static void method4002(@OriginalArg(0) boolean arg0) { @Pc(19) byte local19; @Pc(21) byte[][] local21; - if (Static239.aBoolean269 && arg0) { + if (GlRenderer.enabled && arg0) { local21 = Static19.aByteArrayArray4; local19 = 1; } else { diff --git a/client/src/main/java/Static24.java b/client/src/main/java/Static24.java index ca1d7dc..9c85223 100644 --- a/client/src/main/java/Static24.java +++ b/client/src/main/java/Static24.java @@ -34,14 +34,14 @@ public final class Static24 { @OriginalMember(owner = "client!bn", name = "a", descriptor = "(BZLclient!na;)V") public static void method668(@OriginalArg(1) boolean arg0, @OriginalArg(2) JagString arg1) { - @Pc(9) JagString local9 = arg1.method3114(); + @Pc(9) JagString local9 = arg1.toLowerCase(); @Pc(11) int local11 = 0; @Pc(22) short[] local22 = new short[16]; @Pc(28) int local28 = arg0 ? 32768 : 0; @Pc(36) int local36 = (arg0 ? Static34.anInt1047 : Static144.anInt3490) + local28; for (@Pc(38) int local38 = local28; local38 < local36; local38++) { @Pc(45) Class3_Sub2_Sub6 local45 = Static230.method3953(local38); - if (local45.aBoolean60 && local45.method769().method3114().method3131(local9) != -1) { + if (local45.aBoolean60 && local45.method769().toLowerCase().indexOf(local9) != -1) { if (local11 >= 50) { Static111.anInt2905 = -1; Static169.aShortArray52 = null; diff --git a/client/src/main/java/Static242.java b/client/src/main/java/Static242.java index df530d0..96c61b0 100644 --- a/client/src/main/java/Static242.java +++ b/client/src/main/java/Static242.java @@ -121,12 +121,12 @@ public final class Static242 { @OriginalMember(owner = "client!tj", name = "a", descriptor = "(IIII[[Z[[I)V") public static void method4198(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) boolean[][] arg4, @OriginalArg(5) int[][] arg5) { - @Pc(1) GL2 local1 = Static239.gl; - Static239.method4183(1); - Static239.method4174(1); - Static239.method4150(); - Static239.method4164(false); - Static27.method766(0, 0); + @Pc(1) GL2 local1 = GlRenderer.gl; + GlRenderer.setTextureCombineRgbMode(1); + GlRenderer.setTextureCombineAlphaMode(1); + GlRenderer.resetTextureMatrix(); + GlRenderer.setLightingEnabled(false); + Static27.setMaterial(0, 0); local1.glDepthMask(false); for (@Pc(17) int local17 = 0; local17 < anInt5346; local17++) { label52: for (@Pc(22) int local22 = 0; local22 < anInt5345; local22++) { @@ -152,7 +152,7 @@ public final class Static242 { } local1.glEnableClientState(GL2.GL_COLOR_ARRAY); local1.glDepthMask(true); - Static239.method4173(); + GlRenderer.method4173(); } @OriginalMember(owner = "client!tj", name = "a", descriptor = "([BIIIII)Z") diff --git a/client/src/main/java/Static243.java b/client/src/main/java/Static243.java index 5f14c6e..fce278d 100644 --- a/client/src/main/java/Static243.java +++ b/client/src/main/java/Static243.java @@ -150,7 +150,7 @@ public final class Static243 { Static141.anIntArray326[local3506] = 0; Static227.anIntArray446[local3506] = 0; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static86.method1799(); } Static197.aBoolean228 = true; diff --git a/client/src/main/java/Static245.java b/client/src/main/java/Static245.java index 1188241..c657e33 100644 --- a/client/src/main/java/Static245.java +++ b/client/src/main/java/Static245.java @@ -173,7 +173,7 @@ public final class Static245 { } } @Pc(497) int local497; - if (Static239.aBoolean269 && !arg9) { + if (GlRenderer.enabled && !arg9) { @Pc(472) Environment local472 = null; label207: while (true) { label200: do { diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index 37f58c8..b642f07 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -70,7 +70,7 @@ public final class Static247 { local27 = local8.anInt668; local31 = Static130.aClass3_Sub5ArrayArrayArray1[local24]; @Pc(33) float local33 = 0.0F; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if (Static80.anIntArrayArrayArray19 == Static83.anIntArrayArrayArray4) { var9 = Static62.anIntArrayArray11[local18][local21]; var10 = var9 & 0xFFFFFF; @@ -85,12 +85,12 @@ public final class Static247 { Static147.method2761(local65); } local115 = Static107.anIntArrayArrayArray10[0][local18][local21] + Static107.anIntArrayArrayArray10[0][local18 + 1][local21] + Static107.anIntArrayArrayArray10[0][local18][local21 + 1] + Static107.anIntArrayArrayArray10[0][local18 + 1][local21 + 1] >> 2; - Static27.method766(-local115, 3); + Static27.setMaterial(-local115, 3); local33 = 201.5F; - Static239.method4159(local33); + GlRenderer.method4159(local33); } else { local33 = 201.5F - (float) (local27 + 1) * 50.0F; - Static239.method4159(local33); + GlRenderer.method4159(local33); } } if (!local8.aBoolean45) { @@ -133,8 +133,8 @@ public final class Static247 { local8.aBoolean45 = false; if (local8.aClass3_Sub5_1 != null) { local153 = local8.aClass3_Sub5_1; - if (Static239.aBoolean269) { - Static239.method4159(201.5F - (float) (local153.anInt668 + 1) * 50.0F); + if (GlRenderer.enabled) { + GlRenderer.method4159(201.5F - (float) (local153.anInt668 + 1) * 50.0F); } if (local153.aClass131_1 == null) { if (local153.aClass43_1 != null) { @@ -151,7 +151,7 @@ public final class Static247 { } var22 = local153.aClass77_1; if (var22 != null) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if ((var22.anInt3049 & local8.anInt670) == 0) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } else { @@ -163,14 +163,14 @@ public final class Static247 { for (local65 = 0; local65 < local153.anInt662; local65++) { var25 = local153.aClass31Array1[local65]; if (var25 != null) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } var25.aClass8_4.method4546(var25.anInt1714, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, var25.anInt1699 - Static149.anInt3555, var25.anInt1706 - Static162.anInt3947, var25.anInt1703 - Static217.anInt4903, var25.aLong56, local24, null); } } - if (Static239.aBoolean269) { - Static239.method4159(local33); + if (GlRenderer.enabled) { + GlRenderer.method4159(local33); } } var24 = false; @@ -194,15 +194,15 @@ public final class Static247 { if (var24) { @Pc(549) GroundDecor local549 = local8.aClass15_1; if (local549 != null && (local549.aLong26 & 0x80000000L) != 0L) { - if (Static239.aBoolean269 && local549.aBoolean49) { - Static239.method4159(local33 + 50.0F - 1.5F); + if (GlRenderer.enabled && local549.aBoolean49) { + GlRenderer.method4159(local33 + 50.0F - 1.5F); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local549.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local549.anInt732 - Static149.anInt3555, local549.anInt733 - Static162.anInt3947, local549.anInt736 - Static217.anInt4903, local549.aLong26, local24, null); - if (Static239.aBoolean269 && local549.aBoolean49) { - Static239.method4159(local33); + if (GlRenderer.enabled && local549.aBoolean49) { + GlRenderer.method4159(local33); } } } @@ -245,24 +245,24 @@ public final class Static247 { local8.anInt667 = 9 - local8.anInt665; } if ((local616.anInt3049 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3049)) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local616.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.aLong107, local24, null); } if ((local616.anInt3052 & local65) != 0 && !Static260.method3850(local27, local18, local21, local616.anInt3052)) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local616.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local616.anInt3048 - Static149.anInt3555, local616.anInt3051 - Static162.anInt3947, local616.anInt3044 - Static217.anInt4903, local616.aLong107, local24, null); } } if (local619 != null && !Static276.method4611(local27, local18, local21, local619.aClass8_3.method4549())) { - if (Static239.aBoolean269) { - Static239.method4159(local33 - 0.5F); + if (GlRenderer.enabled) { + GlRenderer.method4159(local33 - 0.5F); } if ((local619.anInt1395 & local65) != 0) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local619.anInt1390 + local619.anInt1394 - Static149.anInt3555, local619.anInt1391 - Static162.anInt3947, local619.anInt1393 + local619.anInt1392 - Static217.anInt4903, local619.aLong52, local24, null); @@ -283,38 +283,38 @@ public final class Static247 { local928 = local904; } if (local928 < var18) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local619.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894 + local619.anInt1394, local899, local904 + local619.anInt1392, local619.aLong52, local24, null); } else if (local619.aClass8_2 != null) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local619.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local894, local899, local904, local619.aLong52, local24, null); } } - if (Static239.aBoolean269) { - Static239.method4159(local33); + if (GlRenderer.enabled) { + GlRenderer.method4159(local33); } } if (var24) { @Pc(1001) GroundDecor local1001 = local8.aClass15_1; if (local1001 != null && (local1001.aLong26 & 0x80000000L) == 0L) { - if (Static239.aBoolean269 && local1001.aBoolean49) { - Static239.method4159(local33 + 50.0F - 1.5F); + if (GlRenderer.enabled && local1001.aBoolean49) { + GlRenderer.method4159(local33 + 50.0F - 1.5F); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local1001.aClass8_1.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local1001.anInt732 - Static149.anInt3555, local1001.anInt733 - Static162.anInt3947, local1001.anInt736 - Static217.anInt4903, local1001.aLong26, local24, null); - if (Static239.aBoolean269 && local1001.aBoolean49) { - Static239.method4159(local33); + if (GlRenderer.enabled && local1001.aBoolean49) { + GlRenderer.method4159(local33); } } @Pc(1064) ObjStackEntity local1064 = local8.aClass79_1; if (local1064 != null && local1064.anInt3063 == 0) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } if (local1064.aClass8_7 != null) { @@ -368,7 +368,7 @@ public final class Static247 { if (var24) { var22 = local8.aClass77_1; if (!Static260.method3850(local27, local18, local21, var22.anInt3049)) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { label882: { if ((var22.aLong107 & 0xFC000L) == 16384L) { local65 = var22.anInt3048 - Static149.anInt3555; @@ -491,7 +491,7 @@ public final class Static247 { @Pc(1697) Scenery local1697 = Static25.aClass31Array2[local115]; local1697.anInt1707 = Static13.anInt437; if (!Static73.method1599(local27, local1697.anInt1701, local1697.anInt1713, local1697.anInt1696, local1697.anInt1698, local1697.aClass8_4.method4549())) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if ((local1697.aLong56 & 0xFC000L) == 147456L) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); local894 = local1697.anInt1699 - Static149.anInt3555; @@ -559,7 +559,7 @@ public final class Static247 { Static211.anInt1142--; @Pc(1999) ObjStackEntity local1999 = local8.aClass79_1; if (local1999 != null && local1999.anInt3063 != 0) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } if (local1999.aClass8_7 != null) { @@ -576,7 +576,7 @@ public final class Static247 { @Pc(2109) WallDecor local2109 = local8.aClass24_1; if (local2109 != null && !Static276.method4611(local27, local18, local21, local2109.aClass8_3.method4549())) { if ((local2109.anInt1395 & local8.anInt670) != 0) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2109.anInt1390 + local2109.anInt1394 - Static149.anInt3555, local2109.anInt1391 - Static162.anInt3947, local2109.anInt1393 + local2109.anInt1392 - Static217.anInt4903, local2109.aLong52, local24, null); @@ -596,12 +596,12 @@ public final class Static247 { local904 = local1332; } if (local904 >= local899) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local2109.aClass8_3.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65 + local2109.anInt1394, local115, local1332 + local2109.anInt1392, local2109.aLong52, local24, null); } else if (local2109.aClass8_2 != null) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2393(Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local24, local18, local21); } local2109.aClass8_2.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local65, local115, local1332, local2109.aLong52, local24, null); @@ -611,13 +611,13 @@ public final class Static247 { @Pc(2275) Wall local2275 = local8.aClass77_1; if (local2275 != null) { if ((local2275.anInt3052 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3052)) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2388(local2275.anInt3052, Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local27, local18, local21); } local2275.aClass8_6.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.aLong107, local24, null); } if ((local2275.anInt3049 & local8.anInt670) != 0 && !Static260.method3850(local27, local18, local21, local2275.anInt3049)) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2388(local2275.anInt3049, Static149.anInt3555, Static162.anInt3947, Static217.anInt4903, local27, local18, local21); } local2275.aClass8_5.method4546(0, Static109.anInt2886, Static121.anInt3038, Static231.anInt5205, Static81.anInt2222, local2275.anInt3048 - Static149.anInt3555, local2275.anInt3051 - Static162.anInt3947, local2275.anInt3044 - Static217.anInt4903, local2275.aLong107, local24, null); diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index 43ab257..42c26ad 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -96,13 +96,13 @@ public final class Static248 { } } @Pc(240) boolean local240 = Static83.anIntArrayArrayArray4 == Static80.anIntArrayArrayArray19; - if (Static239.aBoolean269) { - @Pc(244) GL2 local244 = Static239.gl; + if (GlRenderer.enabled) { + @Pc(244) GL2 local244 = GlRenderer.gl; local244.glPushMatrix(); local244.glTranslatef((float) -arg0, (float) -arg1, (float) -arg2); if (local240) { Static156.method2959(); - Static27.method766(-1, 3); + Static27.setMaterial(-1, 3); Static119.aBoolean153 = true; Static275.method4609(); Static152.anInt3604 = -1; @@ -134,7 +134,7 @@ public final class Static248 { local336.method1944(Static130.aClass3_Sub5ArrayArrayArray1, local350, false); } if (local32 == 0 && Static139.anInt3451 > 0) { - Static239.method4159(101.5F); + GlRenderer.method4159(101.5F); Static242.method4198(Static167.anInt4069, Static193.anInt4539, Static277.anInt5855, arg1, Static48.aBooleanArrayArray1, Static83.anIntArrayArrayArray4[0]); } local32++; diff --git a/client/src/main/java/Static25.java b/client/src/main/java/Static25.java index 8aa00b0..ba2ee1a 100644 --- a/client/src/main/java/Static25.java +++ b/client/src/main/java/Static25.java @@ -37,14 +37,14 @@ public final class Static25 { while (true) { @Pc(16) PrivilegedRequest local16 = arg1.method5115(arg0); while (local16.status == 0) { - Static231.method3983(10L); + Static231.sleep(10L); } if (local16.status == 1) { arg0.setVisible(false); arg0.dispose(); return; } - Static231.method3983(100L); + Static231.sleep(100L); } } diff --git a/client/src/main/java/Static253.java b/client/src/main/java/Static253.java index e58eb94..301f2d3 100644 --- a/client/src/main/java/Static253.java +++ b/client/src/main/java/Static253.java @@ -36,7 +36,7 @@ public final class Static253 { Static195.method3532(); } Static246.method4239(); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static115.method2314(arg3, arg4, arg0, arg2, true); arg2 = Static7.anInt983; arg4 = Static24.anInt773; @@ -90,7 +90,7 @@ public final class Static253 { } } Static252.method4302(); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg2, arg4, arg2 + arg3, arg4 - -arg0); @Pc(248) float local248 = (float) Static240.anInt5333 * 0.17578125F; @Pc(253) float local253 = (float) Static184.anInt4358 * 0.17578125F; @@ -98,7 +98,7 @@ public final class Static253 { local248 = Static146.aFloat15 * 360.0F / 6.2831855F; local253 = Static84.aFloat10 * 360.0F / 6.2831855F; } - Static239.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029); + GlRenderer.method4171(arg2, arg4, arg3, arg0, arg3 / 2 + arg2, arg4 - -(arg0 / 2), local248, local253, Static223.anInt5029, Static223.anInt5029); } else { Static129.method2496(arg2, arg4, arg3 + arg2, arg0 + arg4); Rasteriser.method1908(); @@ -118,19 +118,19 @@ public final class Static253 { } Static107.method2261(); @Pc(387) byte local387 = Static236.method4047() == 2 ? (byte) Static136.anInt3325 : 1; - if (Static239.aBoolean269) { - Static239.method4173(); - Static239.method4158(true); - Static239.method4154(true); + if (GlRenderer.enabled) { + GlRenderer.method4173(); + GlRenderer.setDepthTestEnabled(true); + GlRenderer.setFogEnabled(true); if (Static244.anInt5370 == 10) { local171 = Static103.method2235(Static178.anInt4247, Static134.anInt3302 >> 10, Static113.anInt4609, Static138.anInt3439 >> 10); } else { local171 = Static103.method2235(Static178.anInt4247, Static173.self.movementQueueZ[0] >> 3, Static113.anInt4609, Static173.self.movementQueueX[0] >> 3); } Static120.method2394(Static83.anInt372, !Static11.aBoolean15); - Static239.method4176(local171); + GlRenderer.clearColorAndDepthBuffers(local171); Static143.method2731(Static240.anInt5333, Static134.anInt3302, Static5.anInt40, Static138.anInt3439, Static184.anInt4358); - Static239.anInt5323 = Static83.anInt372; + GlRenderer.anInt5323 = Static83.anInt372; Static156.method2954(Static138.anInt3439, Static5.anInt40, Static134.anInt3302, Static240.anInt5333, Static184.anInt4358, Static266.aByteArrayArrayArray15, Static79.anIntArray205, Static149.anIntArray338, Static267.anIntArray518, Static50.anIntArray134, Static243.anIntArray476, Static55.level + 1, local387, Static173.self.anInt3412 >> 7, Static173.self.anInt3421 >> 7); Static263.aBoolean299 = true; Static120.method2390(); @@ -158,7 +158,7 @@ public final class Static253 { Static19.aBoolean43 = false; } if (Static19.aBoolean43) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1186(arg2, arg4, arg3, arg0, 0); } else { Static129.method2495(arg2, arg4, arg3, arg0, 0); @@ -194,7 +194,7 @@ public final class Static253 { public static IndexedSprite[] method4331() { @Pc(8) IndexedSprite[] local8 = new IndexedSprite[Static165.anInt4038]; for (@Pc(10) int local10 = 0; local10 < Static165.anInt4038; local10++) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local8[local10] = new GlIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local10], Static269.anIntArray252[local10], Static254.anIntArray488[local10], Static26.anIntArray66[local10], Static7.aByteArrayArray5[local10], Static259.anIntArray513); } else { local8[local10] = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local10], Static269.anIntArray252[local10], Static254.anIntArray488[local10], Static26.anIntArray66[local10], Static7.aByteArrayArray5[local10], Static259.anIntArray513); diff --git a/client/src/main/java/Static26.java b/client/src/main/java/Static26.java index fa81169..88bd6bf 100644 --- a/client/src/main/java/Static26.java +++ b/client/src/main/java/Static26.java @@ -84,7 +84,7 @@ public final class Static26 { public static void method743(@OriginalArg(0) boolean arg0) { @Pc(13) int local13 = Static273.aByteArrayArray13.length; @Pc(19) byte[][] local19; - if (Static239.aBoolean269 && arg0) { + if (GlRenderer.enabled && arg0) { local19 = Static19.aByteArrayArray4; } else { local19 = Static156.aByteArrayArray11; diff --git a/client/src/main/java/Static269.java b/client/src/main/java/Static269.java index 696cf2f..e760534 100644 --- a/client/src/main/java/Static269.java +++ b/client/src/main/java/Static269.java @@ -154,7 +154,7 @@ public final class Static269 { local146 = true; } @Pc(515) int local515; - if (Static239.aBoolean269 && !arg1) { + if (GlRenderer.enabled && !arg1) { @Pc(490) Environment local490 = null; label270: while (true) { label263: do { @@ -249,7 +249,7 @@ public final class Static269 { if (Static41.anInt1309 < 100) { Static186.method3413(); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg1, arg0 + arg3, arg2 + arg1); } else { Static129.method2496(arg0, arg1, arg0 + arg3, arg2 + arg1); @@ -259,7 +259,7 @@ public final class Static269 { if (Static41.anInt1309 < 100) { local50 = arg0 + arg3 / 2; local61 = arg2 / 2 + arg1 - 18 - 20; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1186(arg0, arg1, arg3, arg2, 0); Static46.method1179(local50 - 152, local61, 304, 34, 9179409); Static46.method1179(local50 - 151, local61 + 1, 302, 32, 0); @@ -283,7 +283,7 @@ public final class Static269 { @Pc(236) int local236 = Static28.anInt919 + (int) ((float) arg2 / Static83.aFloat3); local61 = (int) ((float) arg3 / Static83.aFloat3) + Static13.anInt435; Static89.anInt2387 = (int) ((float) (arg3 * 2) / Static83.aFloat3); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if (Static153.aClass3_Sub2_Sub1_Sub1_2 == null || Static153.aClass3_Sub2_Sub1_Sub1_2.anInt1867 != arg3 || Static153.aClass3_Sub2_Sub1_Sub1_2.anInt1859 != arg2) { Static153.aClass3_Sub2_Sub1_Sub1_2 = null; Static153.aClass3_Sub2_Sub1_Sub1_2 = new SoftwareSprite(arg3, arg2); diff --git a/client/src/main/java/Static27.java b/client/src/main/java/Static27.java index cf04361..0fed0c5 100644 --- a/client/src/main/java/Static27.java +++ b/client/src/main/java/Static27.java @@ -26,7 +26,7 @@ public final class Static27 { public static final JagString aClass100_168 = Static28.parse(": "); @OriginalMember(owner = "client!cb", name = "b", descriptor = "(III)V") - public static void method766(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { + public static void setMaterial(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) { if (arg1 == 4 && !Static220.aBoolean244) { arg1 = 2; arg0 = 2; diff --git a/client/src/main/java/Static275.java b/client/src/main/java/Static275.java index 4c6af8a..5152a3e 100644 --- a/client/src/main/java/Static275.java +++ b/client/src/main/java/Static275.java @@ -14,7 +14,7 @@ public final class Static275 { @OriginalMember(owner = "client!wg", name = "f", descriptor = "()V") public static void method4608() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glClientActiveTexture(method4607()); local1.glDisableClientState(GL2.GL_TEXTURE_COORD_ARRAY); local1.glClientActiveTexture(GL2.GL_TEXTURE0); @@ -22,7 +22,7 @@ public final class Static275 { @OriginalMember(owner = "client!wg", name = "g", descriptor = "()V") public static void method4609() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glClientActiveTexture(method4607()); local1.glEnableClientState(GL2.GL_TEXTURE_COORD_ARRAY); local1.glClientActiveTexture(GL2.GL_TEXTURE0); diff --git a/client/src/main/java/Static276.java b/client/src/main/java/Static276.java index b37e5da..25f4431 100644 --- a/client/src/main/java/Static276.java +++ b/client/src/main/java/Static276.java @@ -83,7 +83,7 @@ public final class Static276 { @OriginalMember(owner = "client!wh", name = "b", descriptor = "(B)Lclient!ok;") public static IndexedSprite method4614() { @Pc(27) IndexedSprite local27; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local27 = new GlIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513); } else { local27 = new SoftwareIndexedSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], Static7.aByteArrayArray5[0], Static259.anIntArray513); diff --git a/client/src/main/java/Static28.java b/client/src/main/java/Static28.java index 4417bbc..d5f952e 100644 --- a/client/src/main/java/Static28.java +++ b/client/src/main/java/Static28.java @@ -94,14 +94,14 @@ public final class Static28 { Static277.anInt5855 = arg0; Static197.aClass3_Sub5ArrayArrayArray2 = new Tile[4][Static152.anInt3594][Static99.anInt2550]; Static107.anIntArrayArrayArray10 = new int[4][Static152.anInt3594 + 1][Static99.anInt2550 + 1]; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static36.aClass3_Sub14ArrayArray1 = new Class3_Sub14[4][]; } if (arg1) { Static276.aClass3_Sub5ArrayArrayArray3 = new Tile[1][Static152.anInt3594][Static99.anInt2550]; Static62.anIntArrayArray11 = new int[Static152.anInt3594][Static99.anInt2550]; Static80.anIntArrayArrayArray19 = new int[1][Static152.anInt3594 + 1][Static99.anInt2550 + 1]; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static195.aClass3_Sub14ArrayArray3 = new Class3_Sub14[1][]; } } else { diff --git a/client/src/main/java/Static29.java b/client/src/main/java/Static29.java index 3b67e67..504dc0f 100644 --- a/client/src/main/java/Static29.java +++ b/client/src/main/java/Static29.java @@ -13,7 +13,7 @@ public final class Static29 { return null; } @Pc(27) Font local27; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local27 = new GlFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5); } else { local27 = new SoftwareFont(arg0, Static274.anIntArray440, Static269.anIntArray252, Static254.anIntArray488, Static26.anIntArray66, Static7.aByteArrayArray5); diff --git a/client/src/main/java/Static30.java b/client/src/main/java/Static30.java index 254fb98..2bc55c9 100644 --- a/client/src/main/java/Static30.java +++ b/client/src/main/java/Static30.java @@ -38,7 +38,7 @@ public final class Static30 { Static114.aClass3_Sub2_Sub9_42.method2873(Static159.aClass36Array12, null); Static215.aClass3_Sub2_Sub9_32.method2873(Static159.aClass36Array12, null); Static280.aClass3_Sub2_Sub9_43.method2873(Static159.aClass36Array12, null); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static242.aClass36_Sub1Array2 = method837(Static84.anInt2257, arg0); for (@Pc(101) int local101 = 0; local101 < Static242.aClass36_Sub1Array2.length; local101++) { Static242.aClass36_Sub1Array2[local101].method1396(); @@ -46,7 +46,7 @@ public final class Static30 { } @Pc(124) SoftwareSprite local124 = Static78.method1693(0, arg0, Static163.anInt3962); local124.method311(); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static106.aClass3_Sub2_Sub1_7 = new GlSprite(local124); } else { Static106.aClass3_Sub2_Sub1_7 = local124; @@ -56,7 +56,7 @@ public final class Static30 { for (local145 = 0; local145 < local143.length; local145++) { local143[local145].method311(); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static277.aClass3_Sub2_Sub1Array12 = new Sprite[local143.length]; for (local145 = 0; local145 < local143.length; local145++) { Static277.aClass3_Sub2_Sub1Array12[local145] = new GlSprite(local143[local145]); @@ -72,7 +72,7 @@ public final class Static30 { for (local219 = 0; local219 < Static173.aClass3_Sub2_Sub1_Sub1Array9.length; local219++) { Static173.aClass3_Sub2_Sub1_Sub1Array9[local219].method315(local145 + local217, local217 + local196, local217 + local210); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static67.aClass3_Sub2_Sub1Array4 = new Sprite[Static173.aClass3_Sub2_Sub1_Sub1Array9.length]; for (local219 = 0; local219 < Static173.aClass3_Sub2_Sub1_Sub1Array9.length; local219++) { Static67.aClass3_Sub2_Sub1Array4[local219] = new GlSprite(Static173.aClass3_Sub2_Sub1_Sub1Array9[local219]); diff --git a/client/src/main/java/Static33.java b/client/src/main/java/Static33.java index 81ac511..9480b70 100644 --- a/client/src/main/java/Static33.java +++ b/client/src/main/java/Static33.java @@ -201,7 +201,7 @@ public final class Static33 { for (@Pc(39) int local39 = 0; local39 < local30; local39++) { local37[local39] = Static259.anIntArray513[local34[local39] & 0xFF]; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local6[local15] = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local15], Static269.anIntArray252[local15], Static254.anIntArray488[local15], Static26.anIntArray66[local15], local37); } else { local6[local15] = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[local15], Static269.anIntArray252[local15], Static254.anIntArray488[local15], Static26.anIntArray66[local15], local37); diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index b0b0017..f764af6 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -227,7 +227,7 @@ public final class Static36 { continue; } if (local9.anInt453 == 1402) { - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { Static43.method1143(local9); } continue; diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index e698d50..78bccd1 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -144,7 +144,7 @@ public final class Static4 { if (Static164.anInt3985 == 70) { @Pc(245) JagString local245 = Static57.aClass3_Sub15_Sub1_3.gjstr(); if (local245.method3130(Static196.aClass100_863)) { - local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local275 = local156.method3158(); local262 = false; for (local277 = 0; local277 < Static35.anInt1093; local277++) { @@ -157,7 +157,7 @@ public final class Static4 { Static103.method2231(local156, 4, LocalizedText.TRADEREQ); } } else if (local245.method3130(Static61.aClass100_423)) { - local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local275 = local156.method3158(); local262 = false; for (local277 = 0; local277 < Static35.anInt1093; local277++) { @@ -167,12 +167,12 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - local506 = local245.method3137(local245.length() - 9, local245.method3131(Static264.aClass100_875) + 1); + local506 = local245.substring(local245.length() - 9, local245.indexOf(Static264.aClass100_875) + 1); Static103.method2231(local156, 8, local506); } } else if (local245.method3130(Static191.aClass100_845)) { local262 = false; - local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local275 = local156.method3158(); for (local277 = 0; local277 < Static35.anInt1093; local277++) { if (local275 == Static190.aLongArray6[local277]) { @@ -184,21 +184,21 @@ public final class Static4 { Static103.method2231(local156, 10, Static186.aClass100_827); } } else if (local245.method3130(Static141.aClass100_664)) { - local156 = local245.method3137(local245.method3131(Static141.aClass100_664), 0); + local156 = local245.substring(local245.indexOf(Static141.aClass100_664), 0); Static103.method2231(Static186.aClass100_827, 11, local156); } else if (local245.method3130(Static138.aClass100_654)) { - local156 = local245.method3137(local245.method3131(Static138.aClass100_654), 0); + local156 = local245.substring(local245.indexOf(Static138.aClass100_654), 0); if (Static11.anInt384 == 0) { Static103.method2231(Static186.aClass100_827, 12, local156); } } else if (local245.method3130(Static244.aClass100_1014)) { - local156 = local245.method3137(local245.method3131(Static244.aClass100_1014), 0); + local156 = local245.substring(local245.indexOf(Static244.aClass100_1014), 0); if (Static11.anInt384 == 0) { Static103.method2231(Static186.aClass100_827, 13, local156); } } else if (local245.method3130(Static56.aClass100_379)) { local262 = false; - local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local275 = local156.method3158(); for (local277 = 0; local277 < Static35.anInt1093; local277++) { if (local275 == Static190.aLongArray6[local277]) { @@ -210,7 +210,7 @@ public final class Static4 { Static103.method2231(local156, 14, Static186.aClass100_827); } } else if (local245.method3130(Static112.aClass100_574)) { - local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local262 = false; local275 = local156.method3158(); for (local277 = 0; local277 < Static35.anInt1093; local277++) { @@ -223,7 +223,7 @@ public final class Static4 { Static103.method2231(local156, 15, Static186.aClass100_827); } } else if (local245.method3130(Static217.aClass100_916)) { - local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local275 = local156.method3158(); local262 = false; for (local277 = 0; local277 < Static35.anInt1093; local277++) { @@ -236,7 +236,7 @@ public final class Static4 { Static103.method2231(local156, 16, Static186.aClass100_827); } } else if (local245.method3130(Static164.aClass100_770)) { - local156 = local245.method3137(local245.method3131(Static264.aClass100_875), 0); + local156 = local245.substring(local245.indexOf(Static264.aClass100_875), 0); local262 = false; local275 = local156.method3158(); for (local277 = 0; local277 < Static35.anInt1093; local277++) { @@ -246,7 +246,7 @@ public final class Static4 { } } if (!local262 && Static11.anInt384 == 0) { - local506 = local245.method3137(local245.length() - 9, local245.method3131(Static264.aClass100_875) + 1); + local506 = local245.substring(local245.length() - 9, local245.indexOf(Static264.aClass100_875) + 1); Static103.method2231(local156, 21, local506); } } else { diff --git a/client/src/main/java/Static41.java b/client/src/main/java/Static41.java index ce3573b..6fc4033 100644 --- a/client/src/main/java/Static41.java +++ b/client/src/main/java/Static41.java @@ -138,7 +138,7 @@ public final class Static41 { if (arg9 != 0) { local33.method4554(arg9); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { @Pc(650) GlModel local650 = (GlModel) local33; if (Static207.method3685(Static55.level, arg3 + local384, local126 + arg5) != arg11 || Static207.method3685(Static55.level, local115 + arg3, arg5 - -local130) != arg11) { for (local162 = 0; local162 < local650.anInt5295; local162++) { diff --git a/client/src/main/java/Static43.java b/client/src/main/java/Static43.java index b00e004..533d50a 100644 --- a/client/src/main/java/Static43.java +++ b/client/src/main/java/Static43.java @@ -112,7 +112,7 @@ public final class Static43 { arg5.method3053(arg0, arg1); } } - if (!Static239.aBoolean269 || !local74.aBoolean212) { + if (!GlRenderer.enabled || !local74.aBoolean212) { return; } if (local57 == 2) { diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index f9a65f8..0432ec1 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -79,7 +79,7 @@ public final class Static45 { @Pc(326) int local326; @Pc(332) int local332; @Pc(322) int local322; - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { local168 = (int) Math.sqrt(5100.0D); local173 = local168 * 768 >> 8; for (local178 = 1; local178 < 103; local178++) { @@ -95,7 +95,7 @@ public final class Static45 { local146[local194][local178] = local200 - local273; } } - } else if (Static178.aBoolean202) { + } else if (Static178.highDetailLighting) { for (local168 = 1; local168 < 103; local168++) { for (local173 = 1; local173 < 103; local173++) { local194 = (local159[local173 + 1][local168] >> 3) + (local159[local173 - 1][local168] >> 2) + (local159[local173][local168 + -1] >> 2) + (local159[local173][local168 + 1] >> 3) + (local159[local173][local168] >> 1); @@ -231,10 +231,10 @@ public final class Static45 { local326 = local146[local168 + 1][local173 + 1]; if (local194 == 0) { Static176.method3305(local152, local168, local173, 0, 0, -1, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), 0, 0, 0, 0, local254, 0); - if (Static239.aBoolean269 && local152 > 0 && local234 != -1 && Static199.method3593(local178 - 1).aBoolean198) { + if (GlRenderer.enabled && local152 > 0 && local234 != -1 && Static199.method3593(local178 - 1).aBoolean198) { Static242.method4197(0, 0, true, false, local168, local173, local200 - Static83.anIntArrayArrayArray4[0][local168][local173], -Static83.anIntArrayArrayArray4[0][local168 + 1][local173] + local202, local209 - Static83.anIntArrayArrayArray4[0][local168 + 1][local173 + 1], local349 - Static83.anIntArrayArrayArray4[0][local168][local173 + 1]); } - if (Static239.aBoolean269 && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { + if (GlRenderer.enabled && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { for (local322 = local168 - 1; local322 <= local168 + 1; local322++) { for (@Pc(1794) int local1794 = local173 - 1; local1794 <= local173 + 1; local1794++) { if ((local322 != local168 || local173 != local1794) && local322 >= 0 && local322 < 104 && local1794 >= 0 && local1794 < 104) { @@ -257,7 +257,7 @@ public final class Static45 { @Pc(1301) int local1301; @Pc(1353) int local1353; @Pc(1288) int local1288; - if (Static239.aBoolean269 && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { + if (GlRenderer.enabled && !arg1 && Static62.anIntArrayArray11 != null && local152 == 0) { if (local1248.anInt5892 != -1 && Rasteriser.anInterface1_2.method3237(local1248.anInt5892) == 4) { Static62.anIntArrayArray11[local168][local173] = (local1248.anInt5898 << 24) + local1248.anInt5889; } else { @@ -312,7 +312,7 @@ public final class Static45 { local1353 = Rasteriser.anIntArray220[Static230.method3949(local1529, 96)]; } Static176.method3305(local152, local168, local173, local322, local1242, local1288, local200, local202, local209, local349, Static87.method1814(local267, local234), Static87.method1814(local273, local234), Static87.method1814(local326, local234), Static87.method1814(local332, local234), Static230.method3949(local1301, local267), Static230.method3949(local1301, local273), Static230.method3949(local1301, local326), Static230.method3949(local1301, local332), local254, local1353); - if (Static239.aBoolean269 && local152 > 0) { + if (GlRenderer.enabled && local152 > 0) { Static242.method4197(local322, local1242, local1301 == -2 || !local1248.aBoolean311, local234 == -1 || !Static199.method3593(local178 - 1).aBoolean198, local168, local173, local200 - Static83.anIntArrayArrayArray4[0][local168][local173], local202 - Static83.anIntArrayArrayArray4[0][local168 + 1][local173], local209 - Static83.anIntArrayArrayArray4[0][local168 + 1][local173 + 1], -Static83.anIntArrayArrayArray4[0][local168][local173 + 1] + local349); } } @@ -320,7 +320,7 @@ public final class Static45 { } } } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { @Pc(1888) float[][] local1888 = new float[105][105]; @Pc(1892) int[][] local1892 = Static83.anIntArrayArrayArray4[local152]; @Pc(1896) float[][] local1896 = new float[105][105]; diff --git a/client/src/main/java/Static46.java b/client/src/main/java/Static46.java index 9c49798..8b5b047 100644 --- a/client/src/main/java/Static46.java +++ b/client/src/main/java/Static46.java @@ -28,11 +28,11 @@ public final class Static46 { @OriginalMember(owner = "client!dj", name = "a", descriptor = "(IIII)V") public static void method1174(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - Static239.method4162(); + GlRenderer.method4162(); @Pc(5) float local5 = (float) arg0 + 0.3F; @Pc(10) float local10 = local5 + (float) arg2; - @Pc(18) float local18 = (float) Static239.anInt5329 - (float) arg1 - 0.3F; - @Pc(20) GL2 local20 = Static239.gl; + @Pc(18) float local18 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; + @Pc(20) GL2 local20 = GlRenderer.gl; local20.glBegin(GL2.GL_LINES); local20.glColor3ub((byte) (arg3 >> 16), (byte) (arg3 >> 8), (byte) arg3); local20.glVertex2f(local5, local18); @@ -42,11 +42,11 @@ public final class Static46 { @OriginalMember(owner = "client!dj", name = "b", descriptor = "(IIII)V") public static void method1176(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) { - Static239.method4162(); + GlRenderer.method4162(); @Pc(5) float local5 = (float) arg0 + 0.3F; - @Pc(13) float local13 = (float) Static239.anInt5329 - (float) arg1 - 0.3F; + @Pc(13) float local13 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; @Pc(18) float local18 = local13 - (float) arg2; - @Pc(20) GL2 local20 = Static239.gl; + @Pc(20) GL2 local20 = GlRenderer.gl; local20.glBegin(GL2.GL_LINES); local20.glColor3ub((byte) (arg3 >> 16), (byte) (arg3 >> 8), (byte) arg3); local20.glVertex2f(local5, local13); @@ -58,22 +58,22 @@ public final class Static46 { public static void method1177() { anInt1439 = 0; anInt1438 = 0; - anInt1440 = Static239.anInt5332; - anInt1441 = Static239.anInt5329; - @Pc(9) GL2 local9 = Static239.gl; + anInt1440 = GlRenderer.canvasWidth; + anInt1441 = GlRenderer.canvasHeight; + @Pc(9) GL2 local9 = GlRenderer.gl; local9.glDisable(GL2.GL_SCISSOR_TEST); method1173(); } @OriginalMember(owner = "client!dj", name = "a", descriptor = "([IIIII)V") public static void method1178(@OriginalArg(0) int[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - Static239.method4162(); - @Pc(2) GL2 local2 = Static239.gl; - local2.glRasterPos2i(arg1, Static239.anInt5329 - arg2); + GlRenderer.method4162(); + @Pc(2) GL2 local2 = GlRenderer.gl; + local2.glRasterPos2i(arg1, GlRenderer.canvasHeight - arg2); local2.glPixelZoom(1.0F, -1.0F); local2.glDisable(GL2.GL_BLEND); local2.glDisable(GL2.GL_ALPHA_TEST); - local2.glDrawPixels(arg3, arg4, GL2.GL_BGRA, Static239.aBoolean263 ? GL2.GL_UNSIGNED_INT_8_8_8_8_REV : GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(arg0)); + local2.glDrawPixels(arg3, arg4, GL2.GL_BGRA, GlRenderer.bigEndian ? GL2.GL_UNSIGNED_INT_8_8_8_8_REV : GL2.GL_UNSIGNED_BYTE, IntBuffer.wrap(arg0)); local2.glEnable(GL2.GL_ALPHA_TEST); local2.glEnable(GL2.GL_BLEND); local2.glPixelZoom(1.0F, 1.0F); @@ -81,12 +81,12 @@ public final class Static46 { @OriginalMember(owner = "client!dj", name = "a", descriptor = "(IIIII)V") public static void method1179(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - Static239.method4162(); + GlRenderer.method4162(); @Pc(5) float local5 = (float) arg0 + 0.3F; @Pc(12) float local12 = local5 + (float) (arg2 - 1); - @Pc(20) float local20 = (float) Static239.anInt5329 - (float) arg1 - 0.3F; + @Pc(20) float local20 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; @Pc(27) float local27 = local20 - (float) (arg3 - 1); - @Pc(29) GL2 local29 = Static239.gl; + @Pc(29) GL2 local29 = GlRenderer.gl; local29.glBegin(GL2.GL_LINE_LOOP); local29.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); local29.glVertex2f(local5, local20); @@ -98,12 +98,12 @@ public final class Static46 { @OriginalMember(owner = "client!dj", name = "a", descriptor = "(IIIIII)V") public static void method1180(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - Static239.method4162(); + GlRenderer.method4162(); @Pc(5) float local5 = (float) arg0 + 0.3F; @Pc(12) float local12 = local5 + (float) (arg2 - 1); - @Pc(20) float local20 = (float) Static239.anInt5329 - (float) arg1 - 0.3F; + @Pc(20) float local20 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; @Pc(27) float local27 = local20 - (float) (arg3 - 1); - @Pc(29) GL2 local29 = Static239.gl; + @Pc(29) GL2 local29 = GlRenderer.gl; local29.glBegin(GL2.GL_LINE_LOOP); local29.glColor4ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4, arg5 > 255 ? -1 : (byte) arg5); local29.glVertex2f(local5, local20); @@ -145,32 +145,32 @@ public final class Static46 { @Pc(109) int local109 = arg1 - local81; @Pc(115) int local115 = arg1 + local7 - local81; @Pc(121) int local121 = arg1 + local7 + local73; - Static239.method4162(); - @Pc(124) GL2 local124 = Static239.gl; + GlRenderer.method4162(); + @Pc(124) GL2 local124 = GlRenderer.gl; local124.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); local124.glBegin(GL2.GL_TRIANGLE_FAN); if (local43 <= local37) { - local124.glVertex2f((float) local101, (float) (Static239.anInt5329 - local121)); - local124.glVertex2f((float) local95, (float) (Static239.anInt5329 - local115)); - local124.glVertex2f((float) local89, (float) (Static239.anInt5329 - local109)); - local124.glVertex2f((float) local85, (float) (Static239.anInt5329 - local105)); + local124.glVertex2f((float) local101, (float) (GlRenderer.canvasHeight - local121)); + local124.glVertex2f((float) local95, (float) (GlRenderer.canvasHeight - local115)); + local124.glVertex2f((float) local89, (float) (GlRenderer.canvasHeight - local109)); + local124.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local105)); } else { - local124.glVertex2f((float) local85, (float) (Static239.anInt5329 - local105)); - local124.glVertex2f((float) local89, (float) (Static239.anInt5329 - local109)); - local124.glVertex2f((float) local95, (float) (Static239.anInt5329 - local115)); - local124.glVertex2f((float) local101, (float) (Static239.anInt5329 - local121)); + local124.glVertex2f((float) local85, (float) (GlRenderer.canvasHeight - local105)); + local124.glVertex2f((float) local89, (float) (GlRenderer.canvasHeight - local109)); + local124.glVertex2f((float) local95, (float) (GlRenderer.canvasHeight - local115)); + local124.glVertex2f((float) local101, (float) (GlRenderer.canvasHeight - local121)); } local124.glEnd(); } @OriginalMember(owner = "client!dj", name = "c", descriptor = "(IIIIII)V") public static void method1182(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5) { - Static239.method4162(); + GlRenderer.method4162(); @Pc(3) float local3 = (float) arg0; @Pc(8) float local8 = local3 + (float) arg2; - @Pc(13) float local13 = (float) (Static239.anInt5329 - arg1); + @Pc(13) float local13 = (float) (GlRenderer.canvasHeight - arg1); @Pc(18) float local18 = local13 - (float) arg3; - @Pc(20) GL2 local20 = Static239.gl; + @Pc(20) GL2 local20 = GlRenderer.gl; local20.glBegin(GL2.GL_TRIANGLE_FAN); local20.glColor4ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4, arg5 > 255 ? -1 : (byte) arg5); local20.glVertex2f(local3, local13); @@ -194,10 +194,10 @@ public final class Static46 { if (anInt1441 > arg3) { anInt1441 = arg3; } - @Pc(21) GL2 local21 = Static239.gl; + @Pc(21) GL2 local21 = GlRenderer.gl; local21.glEnable(GL2.GL_SCISSOR_TEST); if (anInt1439 <= anInt1440 && anInt1438 <= anInt1441) { - local21.glScissor(anInt1439, Static239.anInt5329 - anInt1441, anInt1440 - anInt1439, anInt1441 - anInt1438); + local21.glScissor(anInt1439, GlRenderer.canvasHeight - anInt1441, anInt1440 - anInt1439, anInt1441 - anInt1438); } else { local21.glScissor(0, 0, 0, 0); } @@ -206,17 +206,17 @@ public final class Static46 { @OriginalMember(owner = "client!dj", name = "d", descriptor = "()V") public static void method1184() { - Static239.gl.glClear(GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_COLOR_BUFFER_BIT); + GlRenderer.gl.glClear(GL2.GL_DEPTH_BUFFER_BIT | GL2.GL_COLOR_BUFFER_BIT); } @OriginalMember(owner = "client!dj", name = "b", descriptor = "(IIIII)V") public static void method1185(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - Static239.method4162(); + GlRenderer.method4162(); @Pc(5) float local5 = (float) arg0 + 0.3F; @Pc(10) float local10 = (float) arg2 + 0.3F; - @Pc(18) float local18 = (float) Static239.anInt5329 - (float) arg1 - 0.3F; - @Pc(26) float local26 = (float) Static239.anInt5329 - (float) arg3 - 0.3F; - @Pc(28) GL2 local28 = Static239.gl; + @Pc(18) float local18 = (float) GlRenderer.canvasHeight - (float) arg1 - 0.3F; + @Pc(26) float local26 = (float) GlRenderer.canvasHeight - (float) arg3 - 0.3F; + @Pc(28) GL2 local28 = GlRenderer.gl; local28.glBegin(GL2.GL_LINE_LOOP); local28.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); local28.glVertex2f(local5, local18); @@ -226,12 +226,12 @@ public final class Static46 { @OriginalMember(owner = "client!dj", name = "c", descriptor = "(IIIII)V") public static void method1186(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4) { - Static239.method4162(); + GlRenderer.method4162(); @Pc(3) float local3 = (float) arg0; @Pc(8) float local8 = local3 + (float) arg2; - @Pc(13) float local13 = (float) (Static239.anInt5329 - arg1); + @Pc(13) float local13 = (float) (GlRenderer.canvasHeight - arg1); @Pc(18) float local18 = local13 - (float) arg3; - @Pc(20) GL2 local20 = Static239.gl; + @Pc(20) GL2 local20 = GlRenderer.gl; local20.glBegin(GL2.GL_TRIANGLE_FAN); local20.glColor3ub((byte) (arg4 >> 16), (byte) (arg4 >> 8), (byte) arg4); local20.glVertex2f(local3, local13); @@ -249,20 +249,20 @@ public final class Static46 { if (arg1 < 0) { arg1 = 0; } - if (arg2 > Static239.anInt5332) { - arg2 = Static239.anInt5332; + if (arg2 > GlRenderer.canvasWidth) { + arg2 = GlRenderer.canvasWidth; } - if (arg3 > Static239.anInt5329) { - arg3 = Static239.anInt5329; + if (arg3 > GlRenderer.canvasHeight) { + arg3 = GlRenderer.canvasHeight; } anInt1439 = arg0; anInt1438 = arg1; anInt1440 = arg2; anInt1441 = arg3; - @Pc(27) GL2 local27 = Static239.gl; + @Pc(27) GL2 local27 = GlRenderer.gl; local27.glEnable(GL2.GL_SCISSOR_TEST); if (anInt1439 <= anInt1440 && anInt1438 <= anInt1441) { - local27.glScissor(anInt1439, Static239.anInt5329 - anInt1441, anInt1440 - anInt1439, anInt1441 - anInt1438); + local27.glScissor(anInt1439, GlRenderer.canvasHeight - anInt1441, anInt1440 - anInt1439, anInt1441 - anInt1438); } else { local27.glScissor(0, 0, 0, 0); } diff --git a/client/src/main/java/Static48.java b/client/src/main/java/Static48.java index b39bbc1..978f9c2 100644 --- a/client/src/main/java/Static48.java +++ b/client/src/main/java/Static48.java @@ -39,7 +39,7 @@ public final class Static48 { local4.p1(Static159.aBoolean189 ? 1 : 0); local4.p1(Static209.aBoolean240 ? 1 : 0); local4.p1(Static139.anInt3451); - local4.p1(Static178.aBoolean202 ? 1 : 0); + local4.p1(Static178.highDetailLighting ? 1 : 0); local4.p1(Static220.aBoolean244 ? 1 : 0); local4.p1(Static71.aBoolean107 ? 1 : 0); local4.p1(Static102.anInt2679); diff --git a/client/src/main/java/Static54.java b/client/src/main/java/Static54.java index 90ea26e..e5c8892 100644 --- a/client/src/main/java/Static54.java +++ b/client/src/main/java/Static54.java @@ -20,7 +20,7 @@ public final class Static54 { @OriginalMember(owner = "client!ed", name = "a", descriptor = "(IBIILclient!be;)V") public static void method1305(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) Component arg3) { Static107.method2261(); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); } else { Static129.method2496(arg2, arg1, arg2 + arg3.anInt445, arg1 + arg3.anInt459); @@ -29,7 +29,7 @@ public final class Static54 { @Pc(48) int local48 = Static59.anInt1814 + Static57.anInt1747 & 0x7FF; @Pc(57) int local57 = Static173.self.anInt3412 / 32 + 48; @Pc(67) int local67 = 464 - Static173.self.anInt3421 / 32; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { ((GlSprite) Static89.aClass3_Sub2_Sub1_5).method1427(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, (GlSprite) arg3.method489(false)); } else { ((SoftwareSprite) Static89.aClass3_Sub2_Sub1_5).method310(arg2, arg1, arg3.anInt445, arg3.anInt459, local57, local67, local48, Static273.anInt4130 + 256, arg3.anIntArray37, arg3.anIntArray45); @@ -67,13 +67,13 @@ public final class Static54 { if (Static235.aClass134_2.anIntArray444[local117] != -1) { local271 = Static235.aClass134_2.anIntArray444[local117]; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1188((GlSprite) arg3.method489(false)); } else { Static129.method2486(arg3.anIntArray37, arg3.anIntArray45); } local156.method2869(Static235.aClass134_2.aClass100Array153[local117], arg2 + local245 + arg3.anInt445 / 2, arg1 + arg3.anInt459 / 2 + -local200, local239, 50, local271, 0, 1, 0, 0); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1173(); } else { Static129.method2482(); @@ -189,12 +189,12 @@ public final class Static54 { local181 = Static84.anInt2255 * 4 + 2 - Static173.self.anInt3421 / 32; Static60.method1446(arg3, Static84.aClass3_Sub2_Sub1_4, local181, local146, arg1, arg2); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1186(arg2 + arg3.anInt445 / 2 - 1, arg1 + -1 - -(arg3.anInt459 / 2), 3, 3, 16777215); } else { Static129.method2495(arg3.anInt445 / 2 + arg2 - 1, arg3.anInt459 / 2 + -1 + arg1, 3, 3, 16777215); } - } else if (Static239.aBoolean269) { + } else if (GlRenderer.enabled) { @Pc(1041) Sprite local1041 = arg3.method489(false); if (local1041 != null) { local1041.method1423(arg2, arg1); diff --git a/client/src/main/java/Static60.java b/client/src/main/java/Static60.java index be025f0..3b897e6 100644 --- a/client/src/main/java/Static60.java +++ b/client/src/main/java/Static60.java @@ -48,7 +48,7 @@ public final class Static60 { @Pc(70) int local70 = local62 * 256 / (Static273.anInt4130 + 256); @Pc(81) int local81 = local58 * arg2 + arg3 * local70 >> 16; @Pc(92) int local92 = local70 * arg2 - arg3 * local58 >> 16; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { ((GlSprite) arg1).method1425(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, arg0.anInt459 / 2 + arg4 - (local92 + arg1.anInt1866 / 2), (GlSprite) arg0.method489(false)); } else { ((SoftwareSprite) arg1).method312(arg0.anInt445 / 2 + arg5 + local81 - arg1.anInt1860 / 2, -(arg1.anInt1866 / 2) + arg0.anInt459 / 2 + arg4 + -local92, arg0.anIntArray37, arg0.anIntArray45); diff --git a/client/src/main/java/Static63.java b/client/src/main/java/Static63.java index a23c88b..de8f7ed 100644 --- a/client/src/main/java/Static63.java +++ b/client/src/main/java/Static63.java @@ -54,7 +54,7 @@ public final class Static63 { } @OriginalMember(owner = "client!fa", name = "b", descriptor = "()V") - public static synchronized void method1488() { + public static synchronized void clear() { anInt1943++; aClass69_48.method2278(); aClass69_49.method2278(); @@ -76,7 +76,7 @@ public final class Static63 { @OriginalMember(owner = "client!fa", name = "c", descriptor = "()V") public static synchronized void method1490() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; @Pc(3) int local3 = 0; while (true) { @Pc(8) IntNode local8 = (IntNode) aClass69_48.method2287(); diff --git a/client/src/main/java/Static70.java b/client/src/main/java/Static70.java index a3aef7f..91452cb 100644 --- a/client/src/main/java/Static70.java +++ b/client/src/main/java/Static70.java @@ -32,12 +32,12 @@ public final class Static70 { public static JagString method1548(@OriginalArg(1) int arg0) { @Pc(9) JagString local9 = Static123.method2423(arg0); for (@Pc(21) int local21 = local9.length() - 3; local21 > 0; local21 -= 3) { - local9 = Static34.method882(new JagString[] { local9.method3137(local21, 0), Static159.aClass100_760, local9.method3136(local21) }); + local9 = Static34.method882(new JagString[] { local9.substring(local21, 0), Static159.aClass100_760, local9.method3136(local21) }); } if (local9.length() > 9) { - return Static34.method882(new JagString[] { Static250.aClass100_1043, local9.method3137(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); + return Static34.method882(new JagString[] { Static250.aClass100_1043, local9.substring(local9.length() - 8, 0), LocalizedText.MILLION_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); } else if (local9.length() > 6) { - return Static34.method882(new JagString[] { Static119.aClass100_589, local9.method3137(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); + return Static34.method882(new JagString[] { Static119.aClass100_589, local9.substring(local9.length() - 4, 0), LocalizedText.THOUSAND_SHORT, Static123.aClass100_593, local9, Static116.aClass100_583 }); } else { return Static34.method882(new JagString[] { Static278.aClass100_1101, local9, Static230.aClass100_978 }); } diff --git a/client/src/main/java/Static73.java b/client/src/main/java/Static73.java index ff8d9c3..374dd9d 100644 --- a/client/src/main/java/Static73.java +++ b/client/src/main/java/Static73.java @@ -47,7 +47,7 @@ public final class Static73 { Static173.self = new Player(); Static173.self.anInt3421 = 3000; Static173.self.anInt3412 = 3000; - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { Static145.method2743(Static209.aClass153_86); Static196.method3534(10); return; diff --git a/client/src/main/java/Static74.java b/client/src/main/java/Static74.java index 95fa41d..7c4fcd3 100644 --- a/client/src/main/java/Static74.java +++ b/client/src/main/java/Static74.java @@ -31,7 +31,7 @@ public final class Static74 { local35 = 8; } @Pc(54) int local54 = arg0 * (arg4 - local35 - 32) / (arg1 - arg4); - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { Static129.method2495(arg2, arg3 + 16, 16, arg4 - 32, Static182.anInt4306); Static129.method2495(arg2, local54 + arg3 + 16, 16, local35, Static53.anInt1704); Static129.method2490(arg2, local54 + arg3 + 16, local35, Static219.anInt4938); diff --git a/client/src/main/java/Static75.java b/client/src/main/java/Static75.java index c6910fd..21fdb9c 100644 --- a/client/src/main/java/Static75.java +++ b/client/src/main/java/Static75.java @@ -301,7 +301,7 @@ public final class Static75 { @Pc(625) byte local625 = Static57.aClass3_Sub15_Sub1_3.g1s(); local247 = Static57.aClass3_Sub15_Sub1_3.g2(); local633 = Static57.aClass3_Sub15_Sub1_3.g2lesadd(); - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { Static170.method2574(local625, local247, local633, local232, local39, local613, local19, local605, local31, local23, local609, local228); } } diff --git a/client/src/main/java/Static76.java b/client/src/main/java/Static76.java index f6c7746..8bb9f4e 100644 --- a/client/src/main/java/Static76.java +++ b/client/src/main/java/Static76.java @@ -11,7 +11,7 @@ public final class Static76 { @OriginalMember(owner = "client!ga", name = "a", descriptor = "()V") public static void method1642() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; if (local1.isExtensionAvailable("GL_ARB_point_parameters")) { @Pc(20) float[] local20 = new float[] { 1.0F, 0.0F, 5.0E-4F }; local1.glPointParameterfv(GL2.GL_POINT_DISTANCE_ATTENUATION, local20, 0); diff --git a/client/src/main/java/Static78.java b/client/src/main/java/Static78.java index ff64273..cc26548 100644 --- a/client/src/main/java/Static78.java +++ b/client/src/main/java/Static78.java @@ -80,7 +80,7 @@ public final class Static78 { Static175.anInt4220++; } } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if (Static99.anIntArray239[local14] != -1 && Static186.aByteArrayArray14[local14] == null) { Static186.aByteArrayArray14[local14] = Static26.aClass153_16.method4495(Static99.anIntArray239[local14], 0); if (Static186.aByteArrayArray14[local14] == null) { @@ -133,7 +133,7 @@ public final class Static78 { } local12 &= Static49.method1201(local320, local309, local294); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local294 = Static19.aByteArrayArray4[local14]; if (local294 != null) { local320 = (Static238.anIntArray470[local14] >> 8) * 64 - Static225.originX; @@ -157,7 +157,7 @@ public final class Static78 { Static217.method3768(); @Pc(420) boolean local420 = false; @Pc(427) int local427; - if (Static239.aBoolean269 && Static220.aBoolean244) { + if (GlRenderer.enabled && Static220.aBoolean244) { for (local427 = 0; local427 < Static273.aByteArrayArray13.length; local427++) { if (Static19.aByteArrayArray4[local427] != null || Static186.aByteArrayArray14[local427] != null) { local420 = true; @@ -165,7 +165,7 @@ public final class Static78 { } } } - Static28.method792(Static239.aBoolean269 ? 28 : 25, local420); + Static28.method792(GlRenderer.enabled ? 28 : 25, local420); for (local427 = 0; local427 < 4; local427++) { Static148.aClass97Array1[local427].method3050(); } @@ -177,7 +177,7 @@ public final class Static78 { } } Static260.method3852(false); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static242.aClass36_Sub1_4.method1392(); for (local427 = 0; local427 < 13; local427++) { for (local320 = 0; local320 < 13; local320++) { @@ -185,10 +185,10 @@ public final class Static78 { } } } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2404(); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static75.method1632(); } Static107.method2261(); @@ -198,7 +198,7 @@ public final class Static78 { if (!Static230.aBoolean250) { Static87.method1805(false); Static7.method842(true); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local427 = Static173.self.movementQueueX[0] >> 3; local320 = Static173.self.movementQueueZ[0] >> 3; Static73.method1597(local320, local427); @@ -211,7 +211,7 @@ public final class Static78 { if (Static230.aBoolean250) { Static89.method1835(false); Static7.method842(true); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local427 = Static173.self.movementQueueX[0] >> 3; local320 = Static173.self.movementQueueZ[0] >> 3; Static73.method1597(local320, local427); @@ -221,7 +221,7 @@ public final class Static78 { Static217.method3768(); Static7.method842(true); Static45.method1169(Static148.aClass97Array1, false); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static120.method2395(); } Static7.method842(true); @@ -237,7 +237,7 @@ public final class Static78 { Static146.method2750(Static146.anInt3508); } Static105.method2255(); - if (Static239.aBoolean269 && local420) { + if (GlRenderer.enabled && local420) { Static278.method4648(true); Static196.method3535(true); if (!Static230.aBoolean250) { @@ -257,7 +257,7 @@ public final class Static78 { Static105.method2255(); Static278.method4648(false); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { for (local320 = 0; local320 < 13; local320++) { for (local309 = 0; local309 < 13; local309++) { Static242.aClass165ArrayArray1[local320][local309].method4676(Static83.anIntArrayArrayArray4[0], local320 * 8, local309 * 8); diff --git a/client/src/main/java/Static80.java b/client/src/main/java/Static80.java index 49a8ae7..3fa44bc 100644 --- a/client/src/main/java/Static80.java +++ b/client/src/main/java/Static80.java @@ -52,7 +52,7 @@ public final class Static80 { Static114.anInt5831 = 0; Static139.anInt3451 = 2; Static159.aBoolean189 = true; - Static178.aBoolean202 = true; + Static178.highDetailLighting = true; Static12.anInt391 = 255; Static53.aBoolean99 = true; Static186.anInt4392 = 0; @@ -73,7 +73,7 @@ public final class Static80 { try { @Pc(78) PrivilegedRequest local78 = arg0.method5112("runescape"); while (local78.status == 0) { - Static231.method3983(1L); + Static231.sleep(1L); } if (local78.status == 1) { local48 = (FileOnDisk) local78.result; diff --git a/client/src/main/java/Static82.java b/client/src/main/java/Static82.java index 3d60ec7..e60b10a 100644 --- a/client/src/main/java/Static82.java +++ b/client/src/main/java/Static82.java @@ -28,7 +28,7 @@ public final class Static82 { local20[local28] = Static259.anIntArray513[local9[local28] & 0xFF]; } @Pc(69) Sprite local69; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local69 = new GlSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20); } else { local69 = new SoftwareSprite(Static124.anInt3080, Static227.anInt5091, Static274.anIntArray440[0], Static269.anIntArray252[0], Static254.anIntArray488[0], Static26.anIntArray66[0], local20); diff --git a/client/src/main/java/Static83.java b/client/src/main/java/Static83.java index 01c946e..a7defd1 100644 --- a/client/src/main/java/Static83.java +++ b/client/src/main/java/Static83.java @@ -75,6 +75,6 @@ public final class Static83 { @OriginalMember(owner = "client!gj", name = "b", descriptor = "(I)V") public static void method440() { - Static27.method766(0, 0); + Static27.setMaterial(0, 0); } } diff --git a/client/src/main/java/Static87.java b/client/src/main/java/Static87.java index 71485a6..b2d8eb3 100644 --- a/client/src/main/java/Static87.java +++ b/client/src/main/java/Static87.java @@ -66,7 +66,7 @@ public final class Static87 { public static void method1805(@OriginalArg(0) boolean arg0) { @Pc(7) byte local7; @Pc(9) byte[][] local9; - if (Static239.aBoolean269 && arg0) { + if (GlRenderer.enabled && arg0) { local7 = 1; local9 = Static186.aByteArrayArray14; } else { @@ -109,7 +109,7 @@ public final class Static87 { @OriginalMember(owner = "client!gn", name = "a", descriptor = "(III[Lclient!be;IIIIBI)V") public static void method1809(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) Component[] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); @@ -204,12 +204,12 @@ public final class Static87 { @Pc(571) int local571; @Pc(545) int local545; if (local30.anInt453 != 0) { - if (local30.anInt453 == 1337 || local30.anInt453 == 1403 && Static239.aBoolean269) { + if (local30.anInt453 == 1337 || local30.anInt453 == 1403 && GlRenderer.enabled) { Static280.aClass13_26 = local30; Static214.anInt5574 = local114; Static97.anInt2503 = local123; Static253.method4326(local30.anInt459, local30.anInt453 == 1403, local123, local30.anInt445, local114); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); @@ -221,7 +221,7 @@ public final class Static87 { continue; } Static54.method1305(local57, local114, local123, local30); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); @@ -264,7 +264,7 @@ public final class Static87 { if (local30.anInt453 == 1339) { if (local30.method478()) { Static160.method3047(local123, local114, local30, local57); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); @@ -276,7 +276,7 @@ public final class Static87 { Static269.method2225(local123, local114, local30.anInt459, local30.anInt445); Static186.aBooleanArray100[local57] = true; Static31.aBooleanArray29[local57] = true; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); @@ -287,7 +287,7 @@ public final class Static87 { Static1.method4(local123, local30.anInt459, local30.anInt445, local114); Static186.aBooleanArray100[local57] = true; Static31.aBooleanArray29[local57] = true; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); @@ -295,7 +295,7 @@ public final class Static87 { continue; } if (local30.anInt453 == 1402) { - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { Static221.method3392(local123, local114); Static186.aBooleanArray100[local57] = true; Static31.aBooleanArray29[local57] = true; @@ -318,7 +318,7 @@ public final class Static87 { } Static215.aClass3_Sub2_Sub9_32.method2864(Static34.method882(new JagString[] { Static25.aClass100_154, Static123.method2423(local503), Static17.aClass100_101 }), local270, local276, local514, -1); local276 += 15; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local514 = 16776960; local518 = (Static63.anInt1942 + Static63.anInt1945 + Static63.anInt1944) / 1024; if (local518 > 65536) { @@ -390,7 +390,7 @@ public final class Static87 { } Static6.method86(local1186.anInt5878, local166, local302, local123, local57, local291, local164, local114); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1187(arg0, arg6, arg4, arg7); } else { Static129.method2496(arg0, arg6, arg4, arg7); @@ -444,7 +444,7 @@ public final class Static87 { @Pc(1571) Component local1571 = arg3[arg5 & 0xFFFF]; @Pc(1577) int local1577; @Pc(1575) int local1575; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { local1575 = Static46.anInt1441; local1577 = Static46.anInt1438; } else { @@ -508,23 +508,23 @@ public final class Static87 { } if (local117 == 0) { if (local30.aBoolean30) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1186(local123, local114, local30.anInt445, local30.anInt459, local270); } else { Static129.method2495(local123, local114, local30.anInt445, local30.anInt459, local270); } - } else if (Static239.aBoolean269) { + } else if (GlRenderer.enabled) { Static46.method1179(local123, local114, local30.anInt445, local30.anInt459, local270); } else { Static129.method2483(local123, local114, local30.anInt445, local30.anInt459, local270); } } else if (local30.aBoolean30) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1182(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); } else { Static129.method2484(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); } - } else if (Static239.aBoolean269) { + } else if (GlRenderer.enabled) { Static46.method1180(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); } else { Static129.method2487(local123, local114, local30.anInt445, local30.anInt459, local270, 256 - (local117 & 0xFF)); @@ -584,7 +584,7 @@ public final class Static87 { if (local30.aBoolean23) { local503 = (local276 + local30.anInt445 - 1) / local276; local514 = (local30.anInt459 + local468 - 1) / local468; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1183(local123, local114, local30.anInt445 + local123, local30.anInt459 + local114); @Pc(2274) boolean local2274 = Static209.method3702(local2094.anInt1867); @Pc(2279) boolean local2279 = Static209.method3702(local2094.anInt1859); @@ -723,25 +723,25 @@ public final class Static87 { } local556 = local123 + local30.anInt445 / 2 + (local514 * local30.anInt495 >> 8); local545 = local30.anInt459 / 2 + local114 + (local518 * local30.anInt481 >> 8); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { if (local30.aBoolean22) { - Static239.method4182(local556, local545, local30.modelZoom, local30.aShort11, local514, local518); + GlRenderer.method4182(local556, local545, local30.modelZoom, local30.aShort11, local514, local518); } else { - Static239.method4148(local556, local545, local514, local518); - Static239.method4152((float) local30.aShort10, (float) local30.aShort11 * 1.5F); + GlRenderer.method4148(local556, local545, local514, local518); + GlRenderer.method4152((float) local30.aShort10, (float) local30.aShort11 * 1.5F); } - Static239.method4173(); - Static239.method4158(true); - Static239.method4154(false); + GlRenderer.method4173(); + GlRenderer.setDepthTestEnabled(true); + GlRenderer.setFogEnabled(false); Static229.method3935(Static113.anInt4609); if (Static263.aBoolean299) { Static46.method1177(); - Static239.method4168(); + GlRenderer.clearDepthBuffer(); Static46.method1187(arg0, arg6, arg4, arg7); Static263.aBoolean299 = false; } if (local30.aBoolean34) { - Static239.method4178(); + GlRenderer.disableDepthMask(); } local563 = MathUtils.anIntArray223[local30.modelXAngle] * local30.modelZoom >> 16; local571 = local30.modelZoom * MathUtils.anIntArray225[local30.modelXAngle] >> 16; @@ -751,7 +751,7 @@ public final class Static87 { local2589.method4571(local30.modelYAngle, 0, local30.modelXAngle, 0, local563, local571, -1L); } if (local30.aBoolean34) { - Static239.method4157(); + GlRenderer.enableDepthMask(); } } else { Rasteriser.method1919(local556, local545); @@ -809,12 +809,12 @@ public final class Static87 { local3297 = Static127.method2465(local30, local3297); @Pc(3325) JagString local3325; while (local3297.length() > 0) { - local518 = local3297.method3131(Static269.aClass100_556); + local518 = local3297.indexOf(Static269.aClass100_556); if (local518 == -1) { local3325 = local3297; local3297 = Static186.aClass100_827; } else { - local3325 = local3297.method3137(local518, 0); + local3325 = local3297.substring(local518, 0); local3297 = local3297.method3136(local518 + 4); } local556 = local3299.method2858(local3325); @@ -836,7 +836,7 @@ public final class Static87 { if (local270 + local518 > arg4) { local518 = arg4 - local270; } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1186(local518, local556, local270, local276, 16777120); Static46.method1179(local518, local556, local270, local276, 0); } else { @@ -847,12 +847,12 @@ public final class Static87 { local545 = local556 + local3299.anInt3626 + 2; local3297 = Static127.method2465(local30, local3297); while (local3297.length() > 0) { - local563 = local3297.method3131(Static269.aClass100_556); + local563 = local3297.indexOf(Static269.aClass100_556); if (local563 == -1) { local3325 = local3297; local3297 = Static186.aClass100_827; } else { - local3325 = local3297.method3137(local563, 0); + local3325 = local3297.substring(local563, 0); local3297 = local3297.method3136(local563 + 4); } local3299.method2857(local3325, local518 + 3, local545, 0, -1); @@ -870,12 +870,12 @@ public final class Static87 { local468 = local123 + local30.anInt445; } if (local30.anInt490 == 1) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1185(local123, local276, local468, local503, local30.anInt474); } else { Static129.method2500(local123, local276, local468, local503, local30.anInt474); } - } else if (Static239.aBoolean269) { + } else if (GlRenderer.enabled) { Static46.method1181(local123, local276, local468, local503, local30.anInt474, local30.anInt490); } else { Static129.method2494(local123, local276, local468, local503, local30.anInt474, local30.anInt490); diff --git a/client/src/main/java/Static88.java b/client/src/main/java/Static88.java index 6ea85b0..ac35298 100644 --- a/client/src/main/java/Static88.java +++ b/client/src/main/java/Static88.java @@ -848,7 +848,7 @@ public final class Static88 { local12937[local652] = Static254.anIntArray487[local28]; } } - local2522 = local2522.method3137(local2522.length() - 1, 0); + local2522 = local2522.substring(local2522.length() - 1, 0); } @Pc(13000) Object[] local13000 = new Object[local2522.length() + 1]; for (local4859 = local13000.length - 1; local4859 >= 1; local4859--) { @@ -2220,7 +2220,7 @@ public final class Static88 { if (Static191.staffModLevel == 0 && (Static124.aBoolean157 && !Static207.aBoolean236 || Static86.aBoolean129)) { continue; } - local2522 = local609.method3114(); + local2522 = local609.toLowerCase(); @Pc(5555) byte local5555 = 0; if (local2522.method3138(LocalizedText.STABLE_CHATCOL0)) { local5555 = 0; @@ -2298,7 +2298,7 @@ public final class Static88 { } } @Pc(5943) byte local5943 = 0; - local2522 = local609.method3114(); + local2522 = local609.toLowerCase(); if (local2522.method3138(LocalizedText.STABLE_CHATEFFECT1)) { local609 = local609.method3136(LocalizedText.STABLE_CHATEFFECT1.length()); local5943 = 1; @@ -3203,7 +3203,7 @@ public final class Static88 { local809 = 4; } Static113.anInt4609 = local809; - if (!Static239.aBoolean269 || !Static178.aBoolean202) { + if (!GlRenderer.enabled || !Static178.highDetailLighting) { if (Static113.anInt4609 == 1) { Rasteriser.method1911(0.9F); } @@ -3217,9 +3217,9 @@ public final class Static88 { Rasteriser.method1911(0.6F); } } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static86.method1799(); - if (!Static178.aBoolean202) { + if (!Static178.highDetailLighting) { Static145.method2742(); } } @@ -3302,12 +3302,12 @@ public final class Static88 { continue; } if (local226 == 6012) { - if (Static239.aBoolean269) { - Static27.method766(0, 0); + if (GlRenderer.enabled) { + Static27.setMaterial(0, 0); } local28--; - Static178.aBoolean202 = Static254.anIntArray487[local28] == 1; - if (Static239.aBoolean269 && Static178.aBoolean202) { + Static178.highDetailLighting = Static254.anIntArray487[local28] == 1; + if (GlRenderer.enabled && Static178.highDetailLighting) { Rasteriser.method1911(0.7F); } else { if (Static113.anInt4609 == 1) { @@ -3331,7 +3331,7 @@ public final class Static88 { if (local226 == 6014) { local28--; Static220.aBoolean244 = Static254.anIntArray487[local28] == 1; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static145.method2742(); } Static203.method3663(Static71.signLink); @@ -3341,7 +3341,7 @@ public final class Static88 { if (local226 == 6015) { local28--; Static71.aBoolean107 = Static254.anIntArray487[local28] == 1; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static86.method1799(); } Static203.method3663(Static71.signLink); @@ -3351,7 +3351,7 @@ public final class Static88 { if (local226 == 6016) { local28--; local809 = Static254.anIntArray487[local28]; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static35.aBoolean66 = true; } if (local809 < 0 || local809 > 2) { @@ -3505,7 +3505,7 @@ public final class Static88 { continue; } if (local226 == 6112) { - Static254.anIntArray487[local28++] = Static178.aBoolean202 ? 1 : 0; + Static254.anIntArray487[local28++] = Static178.highDetailLighting ? 1 : 0; continue; } if (local226 == 6114) { @@ -3537,8 +3537,8 @@ public final class Static88 { continue; } if (local226 == 6121) { - if (Static239.aBoolean269) { - Static254.anIntArray487[local28++] = Static239.aBoolean270 ? 1 : 0; + if (GlRenderer.enabled) { + Static254.anIntArray487[local28++] = GlRenderer.arbMultisampleSupported ? 1 : 0; } else { Static254.anIntArray487[local28++] = 0; } @@ -3838,7 +3838,7 @@ public final class Static88 { if (local226 == 4103) { local26--; local609 = Static3.aClass100Array176[local26]; - Static3.aClass100Array176[local26++] = local609.method3114(); + Static3.aClass100Array176[local26++] = local609.toLowerCase(); continue; } if (local226 == 4104) { @@ -3961,7 +3961,7 @@ public final class Static88 { local609 = Static3.aClass100Array176[local26]; local803 = Static254.anIntArray487[local28]; local1052 = Static254.anIntArray487[local28 + 1]; - Static3.aClass100Array176[local26++] = local609.method3137(local1052, local803); + Static3.aClass100Array176[local26++] = local609.substring(local1052, local803); continue; } if (local226 == 4119) { diff --git a/client/src/main/java/Static89.java b/client/src/main/java/Static89.java index 78ddf1e..3ad0ed0 100644 --- a/client/src/main/java/Static89.java +++ b/client/src/main/java/Static89.java @@ -29,7 +29,7 @@ public final class Static89 { public static void method1835(@OriginalArg(0) boolean arg0) { @Pc(11) byte local11; @Pc(13) byte[][] local13; - if (Static239.aBoolean269 && arg0) { + if (GlRenderer.enabled && arg0) { local11 = 1; local13 = Static186.aByteArrayArray14; } else { @@ -132,7 +132,7 @@ public final class Static89 { } @Pc(109) PrivilegedRequest local109 = Static69.aClass213_4.method5118(new URL(Static69.aClass213_4.anApplet2.getCodeBase(), "clienterror.ws?c=" + Static131.anInt3252 + "&u=" + Static101.aLong98 + "&v1=" + SignLink.aString20 + "&v2=" + SignLink.aString14 + "&e=" + local13)); while (local109.status == 0) { - Static231.method3983(1L); + Static231.sleep(1L); } if (local109.status == 1) { @Pc(128) DataInputStream local128 = (DataInputStream) local109.result; @@ -183,7 +183,7 @@ public final class Static89 { Static97.anInt2503 = -1; Static214.anInt5574 = -1; Static169.aClass13_18 = null; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static263.aBoolean299 = true; } Static182.anInt4311 = Static83.anInt372; @@ -191,7 +191,7 @@ public final class Static89 { Static24.anInt766 = 0; Static9.method182(); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1177(); } else { Static129.method2503(); @@ -222,13 +222,13 @@ public final class Static89 { if (Static199.anInt4672 == 3) { for (@Pc(189) int local189 = 0; local189 < Static24.anInt766; local189++) { if (Static223.aBooleanArray116[local189]) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1182(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128); } else { Static129.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711935, 128); } } else if (Static31.aBooleanArray29[local189]) { - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static46.method1182(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128); } else { Static129.method2484(Static264.anIntArray410[local189], Static50.anIntArray133[local189], Static224.anIntArray443[local189], Static67.anIntArray320[local189], 16711680, 128); diff --git a/client/src/main/java/Static97.java b/client/src/main/java/Static97.java index 7e25212..95f0ea1 100644 --- a/client/src/main/java/Static97.java +++ b/client/src/main/java/Static97.java @@ -45,7 +45,7 @@ public final class Static97 { @Pc(110) double local110 = Math.atan2((double) local93, (double) local104); @Pc(117) int local117 = (int) (Math.sin(local110) * (double) local30); @Pc(124) int local124 = (int) (Math.cos(local110) * (double) local30); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { ((GlSprite) Static277.aClass3_Sub2_Sub1Array12[arg0]).method1428((arg5.anInt445 / 2 + arg2 + local117) * 16, (arg5.anInt459 / 2 + arg1 - local124) * 16, (int) (local110 * 10430.378D)); } else { ((SoftwareSprite) Static277.aClass3_Sub2_Sub1Array12[arg0]).method306(local117 + arg5.anInt445 / 2 + arg2 - 10, arg5.anInt459 / 2 + -10 + arg1 + -local124, local110); diff --git a/client/src/main/java/UnderwaterMaterialRenderer.java b/client/src/main/java/UnderwaterMaterialRenderer.java index 8e5f78a..e6c1738 100644 --- a/client/src/main/java/UnderwaterMaterialRenderer.java +++ b/client/src/main/java/UnderwaterMaterialRenderer.java @@ -19,14 +19,14 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!wg", name = "", descriptor = "()V") public UnderwaterMaterialRenderer() { - if (Static239.anInt5322 >= 2) { + if (GlRenderer.maxTextureUnits >= 2) { @Pc(17) int[] local17 = new int[1]; @Pc(20) byte[] local20 = new byte[8]; @Pc(22) int local22 = 0; while (local22 < 8) { local20[local22++] = (byte) (local22 * 159 / 8 + 96); } - @Pc(40) GL2 local40 = Static239.gl; + @Pc(40) GL2 local40 = GlRenderer.gl; local40.glGenTextures(1, local17, 0); local40.glBindTexture(GL2.GL_TEXTURE_1D, local17[0]); local40.glTexImage1D(GL2.GL_TEXTURE_1D, 0, GL2.GL_ALPHA, 8, 0, GL2.GL_ALPHA, GL2.GL_UNSIGNED_BYTE, ByteBuffer.wrap(local20)); @@ -34,14 +34,14 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { local40.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_MAG_FILTER, GL2.GL_LINEAR); local40.glTexParameteri(GL2.GL_TEXTURE_1D, GL2.GL_TEXTURE_WRAP_S, GL2.GL_CLAMP_TO_EDGE); this.anInt5805 = local17[0]; - Static275.aBoolean308 = Static239.anInt5322 > 2 && Static239.aBoolean267; + Static275.aBoolean308 = GlRenderer.maxTextureUnits > 2 && GlRenderer.extTexture3dSupported; this.method4606(); } } @OriginalMember(owner = "client!wg", name = "d", descriptor = "()V") private void method4606() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; this.anInt5806 = local1.glGenLists(2); local1.glNewList(this.anInt5806, GL2.GL_COMPILE); local1.glActiveTexture(GL2.GL_TEXTURE1); @@ -105,7 +105,7 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!wg", name = "b", descriptor = "()V") @Override public final void method4603() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glCallList(this.anInt5806); } @@ -118,14 +118,14 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!wg", name = "a", descriptor = "()V") @Override public final void method4602() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glCallList(this.anInt5806 + 1); } @OriginalMember(owner = "client!wg", name = "a", descriptor = "(I)V") @Override public final void method4604(@OriginalArg(0) int arg0) { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glActiveTexture(GL2.GL_TEXTURE1); if (Static275.aBoolean308 || arg0 >= 0) { local1.glPushMatrix(); @@ -148,7 +148,7 @@ public final class UnderwaterMaterialRenderer implements MaterialRenderer { this.aFloatArray29[0] = 0.0F; this.aFloatArray29[1] = 0.0F; this.aFloatArray29[2] = 0.0F; - this.aFloatArray29[3] = (float) Static239.anInt5323 * 0.005F; + this.aFloatArray29[3] = (float) GlRenderer.anInt5323 * 0.005F; local1.glTexGenfv(GL2.GL_R, GL2.GL_EYE_PLANE, this.aFloatArray29, 0); local1.glActiveTexture(GL2.GL_TEXTURE2); } diff --git a/client/src/main/java/UnlitMaterialRenderer.java b/client/src/main/java/UnlitMaterialRenderer.java index 95377e0..ccbae1c 100644 --- a/client/src/main/java/UnlitMaterialRenderer.java +++ b/client/src/main/java/UnlitMaterialRenderer.java @@ -8,8 +8,8 @@ public final class UnlitMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!ue", name = "b", descriptor = "()V") @Override public final void method4603() { - if (Static178.aBoolean202) { - Static239.method4164(false); + if (Static178.highDetailLighting) { + GlRenderer.setLightingEnabled(false); } } @@ -27,8 +27,8 @@ public final class UnlitMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!ue", name = "a", descriptor = "()V") @Override public final void method4602() { - if (Static178.aBoolean202) { - Static239.method4164(true); + if (Static178.highDetailLighting) { + GlRenderer.setLightingEnabled(true); } } } diff --git a/client/src/main/java/WaterMaterialRenderer.java b/client/src/main/java/WaterMaterialRenderer.java index 3d8b193..2917dab 100644 --- a/client/src/main/java/WaterMaterialRenderer.java +++ b/client/src/main/java/WaterMaterialRenderer.java @@ -29,7 +29,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!pd", name = "d", descriptor = "()V") private void method3435() { @Pc(2) byte[] local2 = new byte[] { 0, -1 }; - @Pc(12) GL2 local12 = Static239.gl; + @Pc(12) GL2 local12 = GlRenderer.gl; @Pc(15) int[] local15 = new int[1]; local12.glGenTextures(1, local15, 0); local12.glBindTexture(GL2.GL_TEXTURE_1D, local15[0]); @@ -42,7 +42,7 @@ public final class WaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!pd", name = "f", descriptor = "()V") private void method3437() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; this.anInt4440 = local1.glGenLists(2); local1.glNewList(this.anInt4440, GL2.GL_COMPILE); local1.glTexEnvi(GL2.GL_TEXTURE_ENV, GL2.GL_OPERAND0_RGB, GL2.GL_SRC_COLOR); @@ -106,26 +106,26 @@ public final class WaterMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!pd", name = "a", descriptor = "()V") @Override public final void method4602() { - Static239.gl.glCallList(this.anInt4440 + 1); + GlRenderer.gl.glCallList(this.anInt4440 + 1); } @OriginalMember(owner = "client!pd", name = "a", descriptor = "(I)V") @Override public final void method4604(@OriginalArg(0) int arg0) { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glActiveTexture(GL2.GL_TEXTURE1); local1.glTexEnvfv(GL2.GL_TEXTURE_ENV, GL2.GL_TEXTURE_ENV_COLOR, Static257.aFloatArray2, 0); local1.glActiveTexture(GL2.GL_TEXTURE0); if ((arg0 & 0x1) == 1) { if (!Static151.aBoolean176) { - Static239.method4177(Static151.anIntArray341[Static239.anInt5323 * 64 / 100 % 64]); - } else if (this.anInt4442 != Static239.anInt5323) { + GlRenderer.setTextureId(Static151.anIntArray341[GlRenderer.anInt5323 * 64 / 100 % 64]); + } else if (this.anInt4442 != GlRenderer.anInt5323) { this.aFloatArray23[0] = 0.0F; this.aFloatArray23[1] = 0.0F; this.aFloatArray23[2] = 0.0F; - this.aFloatArray23[3] = (float) Static239.anInt5323 * 0.005F; + this.aFloatArray23[3] = (float) GlRenderer.anInt5323 * 0.005F; local1.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0); - this.anInt4442 = Static239.anInt5323; + this.anInt4442 = GlRenderer.anInt5323; } } else if (Static151.aBoolean176) { this.aFloatArray23[0] = 0.0F; @@ -134,17 +134,17 @@ public final class WaterMaterialRenderer implements MaterialRenderer { this.aFloatArray23[3] = 0.0F; local1.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray23, 0); } else { - Static239.method4177(Static151.anIntArray341[0]); + GlRenderer.setTextureId(Static151.anIntArray341[0]); } } @OriginalMember(owner = "client!pd", name = "b", descriptor = "()V") @Override public final void method4603() { - @Pc(1) GL2 local1 = Static239.gl; - Static239.method4183(2); - Static239.method4174(2); - Static239.method4150(); + @Pc(1) GL2 local1 = GlRenderer.gl; + GlRenderer.setTextureCombineRgbMode(2); + GlRenderer.setTextureCombineAlphaMode(2); + GlRenderer.resetTextureMatrix(); local1.glCallList(this.anInt4440); @Pc(12) float local12 = 2662.4001F; local12 += (float) (Static254.anInt5559 - 128) * 0.5F; diff --git a/client/src/main/java/WaterfallMaterialRenderer.java b/client/src/main/java/WaterfallMaterialRenderer.java index 9879732..38e53a3 100644 --- a/client/src/main/java/WaterfallMaterialRenderer.java +++ b/client/src/main/java/WaterfallMaterialRenderer.java @@ -27,7 +27,7 @@ public final class WaterfallMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!ob", name = "a", descriptor = "(I)V") @Override public final void method4604(@OriginalArg(0) int arg0) { - @Pc(7) GL2 local7 = Static239.gl; + @Pc(7) GL2 local7 = GlRenderer.gl; @Pc(18) float local18 = (float) ((arg0 >> 3 & 0x3) + 1) * 0.01F; @Pc(27) float local27 = -0.01F * (float) ((arg0 & 0x3) + 1); @Pc(36) float local36 = (arg0 & 0x40) == 0 ? 4.8828125E-4F : 9.765625E-4F; @@ -52,20 +52,20 @@ public final class WaterfallMaterialRenderer implements MaterialRenderer { local7.glRotatef((float) Static59.anInt1815 * 360.0F / 2048.0F, 0.0F, 1.0F, 0.0F); local7.glTranslatef((float) -Static12.anInt406, (float) -Static199.anInt4675, (float) -Static230.anInt5158); local7.glTexGenfv(GL2.GL_S, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); - this.aFloatArray21[3] = local27 * (float) Static239.anInt5323; + this.aFloatArray21[3] = local27 * (float) GlRenderer.anInt5323; this.aFloatArray21[0] = 0.0F; this.aFloatArray21[2] = 0.0F; this.aFloatArray21[1] = local36; local7.glTexGenfv(GL2.GL_T, GL2.GL_EYE_PLANE, this.aFloatArray21, 0); local7.glPopMatrix(); if (Static151.aBoolean176) { - this.aFloatArray21[3] = (float) Static239.anInt5323 * local18; + this.aFloatArray21[3] = (float) GlRenderer.anInt5323 * local18; this.aFloatArray21[1] = 0.0F; this.aFloatArray21[0] = 0.0F; this.aFloatArray21[2] = 0.0F; local7.glTexGenfv(GL2.GL_R, GL2.GL_OBJECT_PLANE, this.aFloatArray21, 0); } else { - @Pc(189) int local189 = (int) ((float) Static239.anInt5323 * local18 * 64.0F); + @Pc(189) int local189 = (int) ((float) GlRenderer.anInt5323 * local18 * 64.0F); local7.glBindTexture(GL2.GL_TEXTURE_2D, Static151.anIntArray340[local189 % 64]); } local7.glActiveTexture(GL2.GL_TEXTURE0); @@ -74,20 +74,20 @@ public final class WaterfallMaterialRenderer implements MaterialRenderer { @OriginalMember(owner = "client!ob", name = "a", descriptor = "()V") @Override public final void method4602() { - @Pc(1) GL2 local1 = Static239.gl; + @Pc(1) GL2 local1 = GlRenderer.gl; local1.glCallList(this.anInt4236 + 1); } @OriginalMember(owner = "client!ob", name = "b", descriptor = "()V") @Override public final void method4603() { - @Pc(5) GL2 local5 = Static239.gl; + @Pc(5) GL2 local5 = GlRenderer.gl; local5.glCallList(this.anInt4236); } @OriginalMember(owner = "client!ob", name = "b", descriptor = "(I)V") private void method3307() { - @Pc(3) GL2 local3 = Static239.gl; + @Pc(3) GL2 local3 = GlRenderer.gl; this.anInt4236 = local3.glGenLists(2); local3.glNewList(this.anInt4236, GL2.GL_COMPILE); local3.glActiveTexture(GL2.GL_TEXTURE1); diff --git a/client/src/main/java/client.java b/client/src/main/java/client.java index 21a1a71..e4c582e 100644 --- a/client/src/main/java/client.java +++ b/client/src/main/java/client.java @@ -116,7 +116,7 @@ public final class client extends GameShell { if (local158) { Static139.method2704(); } - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { for (local80 = 0; local80 < 100; local80++) { Static186.aBooleanArray100[local80] = true; } @@ -148,8 +148,8 @@ public final class client extends GameShell { } else if (Static244.anInt5370 == 40) { Static114.method4636(false, Static34.method882(new JagString[] { LocalizedText.CONLOST, Static269.aClass100_556, LocalizedText.ATTEMPT_TO_REESTABLISH})); } - if (Static239.aBoolean269 && Static244.anInt5370 != 0) { - Static239.method4153(); + if (GlRenderer.enabled && Static244.anInt5370 != 0) { + GlRenderer.method4153(); for (local80 = 0; local80 < Static24.anInt766; local80++) { Static31.aBooleanArray29[local80] = false; } @@ -191,8 +191,8 @@ public final class client extends GameShell { @OriginalMember(owner = "client!client", name = "c", descriptor = "(B)V") @Override protected final void method928() { - if (Static239.aBoolean269) { - Static239.method4169(); + if (GlRenderer.enabled) { + GlRenderer.quit(); } if (Static69.aFrame2 != null) { Static25.method714(Static69.aFrame2, Static71.signLink); @@ -423,7 +423,7 @@ public final class client extends GameShell { Static57.method1320(0, 0, 0, Static48.anInt1448, Static154.topLevelInterace, 0, Static254.anInt5554); } Static119.transmitTimer++; - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { label191: for (@Pc(57) int local57 = 0; local57 < 32768; local57++) { @Pc(66) Npc local66 = Static175.aClass8_Sub4_Sub2Array1[local57]; if (local66 != null) { @@ -457,7 +457,7 @@ public final class client extends GameShell { } } } - if (!Static239.aBoolean269) { + if (!GlRenderer.enabled) { Static269.method2170(); } else if (Static184.anInt4348 == 0 && Static179.anInt4261 == 0) { if (Static227.anInt5096 == 2) { @@ -962,7 +962,7 @@ public final class client extends GameShell { Static107.method2261(); Static65.method1501(); Static111.method2292(); - if (Static239.aBoolean269) { + if (GlRenderer.enabled) { Static63.method1490(); } if (Static71.mouseWheel != null) {