From dbca509eb55c397c0119a7d0eeb71993a7aeae86 Mon Sep 17 00:00:00 2001 From: Pazaz Date: Wed, 27 Apr 2022 19:26:49 -0400 Subject: [PATCH] Renamed Class32 to WorldInfo, prefixed some unknown classes to try to group them better --- .../src/main/java/rt4/AttachLocRequest.java | 2 +- ...java => AttachLocRequest_Class3_Sub8.java} | 2 +- client/src/main/java/rt4/GlModel.java | 12 ++++---- .../{Class23.java => GlModel_Class23.java} | 2 +- client/src/main/java/rt4/Light.java | 2 +- .../rt4/{Class45.java => Light_Class45.java} | 2 +- client/src/main/java/rt4/Loc.java | 2 +- client/src/main/java/rt4/LocType.java | 8 ++--- .../rt4/{Class139.java => Loc_Class139.java} | 2 +- client/src/main/java/rt4/MidiInstrument.java | 10 +++---- client/src/main/java/rt4/MidiNote.java | 2 +- client/src/main/java/rt4/MidiPcmStream.java | 8 ++--- .../rt4/{Class162.java => Midi_Class162.java} | 2 +- .../rt4/{Class57.java => Model_Class57.java} | 6 ++-- .../main/java/rt4/MonochromeImageCache.java | 12 ++++---- ...=> MonochromeImageCache_Class3_Sub23.java} | 4 +-- client/src/main/java/rt4/NpcType.java | 2 +- .../rt4/{Class147.java => Npc_Class147.java} | 2 +- client/src/main/java/rt4/PathingEntity.java | 2 +- client/src/main/java/rt4/Player.java | 4 +-- .../src/main/java/rt4/PlayerAppearance.java | 2 +- client/src/main/java/rt4/RawModel.java | 30 +++++++++---------- client/src/main/java/rt4/ScriptRunner.java | 4 +-- client/src/main/java/rt4/SoftwareModel.java | 2 +- client/src/main/java/rt4/Song.java | 4 +-- ...Class3_Sub9.java => Song_Class3_Sub9.java} | 4 +-- client/src/main/java/rt4/Static13.java | 2 +- client/src/main/java/rt4/Static131.java | 2 +- client/src/main/java/rt4/Static155.java | 2 +- client/src/main/java/rt4/Static159.java | 4 +-- client/src/main/java/rt4/Static170.java | 2 +- client/src/main/java/rt4/Static171.java | 2 +- client/src/main/java/rt4/Static185.java | 10 +++---- client/src/main/java/rt4/Static202.java | 2 +- client/src/main/java/rt4/Static221.java | 2 +- client/src/main/java/rt4/Static272.java | 2 +- client/src/main/java/rt4/Static34.java | 2 +- client/src/main/java/rt4/Static9.java | 2 +- client/src/main/java/rt4/World.java | 2 +- .../java/rt4/{Class32.java => WorldInfo.java} | 2 +- client/src/main/java/rt4/WorldList.java | 6 ++-- client/src/main/java/rt4/client.java | 2 +- 42 files changed, 90 insertions(+), 90 deletions(-) rename client/src/main/java/rt4/{Class3_Sub8.java => AttachLocRequest_Class3_Sub8.java} (95%) rename client/src/main/java/rt4/{Class23.java => GlModel_Class23.java} (93%) rename client/src/main/java/rt4/{Class45.java => Light_Class45.java} (99%) rename client/src/main/java/rt4/{Class139.java => Loc_Class139.java} (91%) rename client/src/main/java/rt4/{Class162.java => Midi_Class162.java} (96%) rename client/src/main/java/rt4/{Class57.java => Model_Class57.java} (87%) rename client/src/main/java/rt4/{Class3_Sub23.java => MonochromeImageCache_Class3_Sub23.java} (76%) rename client/src/main/java/rt4/{Class147.java => Npc_Class147.java} (95%) rename client/src/main/java/rt4/{Class3_Sub9.java => Song_Class3_Sub9.java} (87%) rename client/src/main/java/rt4/{Class32.java => WorldInfo.java} (91%) diff --git a/client/src/main/java/rt4/AttachLocRequest.java b/client/src/main/java/rt4/AttachLocRequest.java index fb5b1b7..2b689ad 100644 --- a/client/src/main/java/rt4/AttachLocRequest.java +++ b/client/src/main/java/rt4/AttachLocRequest.java @@ -7,7 +7,7 @@ public class AttachLocRequest { @OriginalMember(owner = "client!ph", name = "a", descriptor = "(B)V") public static void loop() { while (true) { - @Pc(17) Class3_Sub8 local17 = (Class3_Sub8) Static128.aClass69_77.removeHead(); + @Pc(17) AttachLocRequest_Class3_Sub8 local17 = (AttachLocRequest_Class3_Sub8) Static128.aClass69_77.removeHead(); if (local17 == null) { return; } diff --git a/client/src/main/java/rt4/Class3_Sub8.java b/client/src/main/java/rt4/AttachLocRequest_Class3_Sub8.java similarity index 95% rename from client/src/main/java/rt4/Class3_Sub8.java rename to client/src/main/java/rt4/AttachLocRequest_Class3_Sub8.java index 53691e2..d4b6943 100644 --- a/client/src/main/java/rt4/Class3_Sub8.java +++ b/client/src/main/java/rt4/AttachLocRequest_Class3_Sub8.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!cn") -public final class Class3_Sub8 extends Node { +public final class AttachLocRequest_Class3_Sub8 extends Node { @OriginalMember(owner = "client!cn", name = "p", descriptor = "I") public int anInt1187; diff --git a/client/src/main/java/rt4/GlModel.java b/client/src/main/java/rt4/GlModel.java index 3e1c09d..98575e8 100644 --- a/client/src/main/java/rt4/GlModel.java +++ b/client/src/main/java/rt4/GlModel.java @@ -137,7 +137,7 @@ public final class GlModel extends Model { private short[] aShortArray86; @OriginalMember(owner = "client!td", name = "cb", descriptor = "Lclient!de;") - private Class23 aClass23_1; + private GlModel_Class23 aClass23_1; @OriginalMember(owner = "client!td", name = "db", descriptor = "[I") private int[] anIntArray464; @@ -602,13 +602,13 @@ public final class GlModel extends Model { if (local902 == 0) { @Pc(1994) long local1994 = (long) (local833 << 2) + ((long) (local553 << 24) + (long) (local817 << 8) + (long) local844 << 32); local919 = arg0.anIntArray197[local810]; - @Pc(2004) Class57 local2004 = arg0.aClass57Array1[local919]; + @Pc(2004) Model_Class57 local2004 = arg0.aClass57Array1[local919]; this.aShortArray77[local439] = this.method4098(arg0, local919, local1994, local2004.anInt2437, local2004.anInt2431, local2004.anInt2436, local2004.anInt2432, local854, local856); local1280 = arg0.anIntArray200[local810]; - @Pc(2033) Class57 local2033 = arg0.aClass57Array1[local1280]; + @Pc(2033) Model_Class57 local2033 = arg0.aClass57Array1[local1280]; this.aShortArray82[local439] = this.method4098(arg0, local1280, local1994 + (long) local866, local2033.anInt2437, local2033.anInt2431, local2033.anInt2436, local2033.anInt2432, local858, local683); @Pc(2060) int local2060 = arg0.anIntArray196[local810]; - @Pc(2065) Class57 local2065 = arg0.aClass57Array1[local2060]; + @Pc(2065) Model_Class57 local2065 = arg0.aClass57Array1[local2060]; this.aShortArray83[local439] = this.method4098(arg0, local2060, local1994 + (long) local868, local2065.anInt2437, local2065.anInt2431, local2065.anInt2436, local2065.anInt2432, local714, local685); } else if (local902 == 1) { @Pc(2096) TriangleNormal local2096 = arg0.aClass126Array1[local810]; @@ -1287,14 +1287,14 @@ public final class GlModel extends Model { } if (local237 != -1) { if (local40 == null) { - this.aClass23_1 = new Class23(); + this.aClass23_1 = new GlModel_Class23(); local40 = this.aClass23_1.aShortArray8 = Static263.method4511(this.aShortArray76); local44 = this.aClass23_1.aShortArray10 = Static263.method4511(this.aShortArray79); local48 = this.aClass23_1.aShortArray9 = Static263.method4511(this.aShortArray85); local52 = this.aClass23_1.aShortArray7 = Static263.method4511(this.aShortArray86); } if (local68 == null) { - @Pc(325) Class23 local325 = local2.aClass23_1 = new Class23(); + @Pc(325) GlModel_Class23 local325 = local2.aClass23_1 = new GlModel_Class23(); local68 = local325.aShortArray8 = Static263.method4511(local24); local72 = local325.aShortArray10 = Static263.method4511(local27); local76 = local325.aShortArray9 = Static263.method4511(local30); diff --git a/client/src/main/java/rt4/Class23.java b/client/src/main/java/rt4/GlModel_Class23.java similarity index 93% rename from client/src/main/java/rt4/Class23.java rename to client/src/main/java/rt4/GlModel_Class23.java index 357a552..31e0b57 100644 --- a/client/src/main/java/rt4/Class23.java +++ b/client/src/main/java/rt4/GlModel_Class23.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!de") -public final class Class23 { +public final class GlModel_Class23 { @OriginalMember(owner = "client!de", name = "a", descriptor = "[S") public short[] aShortArray7; diff --git a/client/src/main/java/rt4/Light.java b/client/src/main/java/rt4/Light.java index 1c475e7..89a34df 100644 --- a/client/src/main/java/rt4/Light.java +++ b/client/src/main/java/rt4/Light.java @@ -54,7 +54,7 @@ public final class Light { public final boolean aBoolean126; @OriginalMember(owner = "client!gi", name = "B", descriptor = "Lclient!fj;") - public Class45 aClass45_1; + public Light_Class45 aClass45_1; @OriginalMember(owner = "client!gi", name = "C", descriptor = "I") public final int anInt2247; diff --git a/client/src/main/java/rt4/Class45.java b/client/src/main/java/rt4/Light_Class45.java similarity index 99% rename from client/src/main/java/rt4/Class45.java rename to client/src/main/java/rt4/Light_Class45.java index 75baed4..1636af4 100644 --- a/client/src/main/java/rt4/Class45.java +++ b/client/src/main/java/rt4/Light_Class45.java @@ -8,7 +8,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!fj") -public final class Class45 { +public final class Light_Class45 { @OriginalMember(owner = "client!fj", name = "a", descriptor = "Lclient!vi;") private GlVertexBufferObject aClass155_1; diff --git a/client/src/main/java/rt4/Loc.java b/client/src/main/java/rt4/Loc.java index e110de1..d9d4e30 100644 --- a/client/src/main/java/rt4/Loc.java +++ b/client/src/main/java/rt4/Loc.java @@ -291,7 +291,7 @@ public final class Loc extends Entity { Static242.method4207(this.aClass36_Sub1_2, this.anInt1296, this.anInt1294, this.anInt1319); } @Pc(356) boolean local356 = this.aClass36_Sub1_2 == null; - @Pc(389) Class139 local389; + @Pc(389) Loc_Class139 local389; if (this.aClass144_2 == null) { local389 = local19.method3428(this.anInt1295, local302, local267, this.anInt1307, local293, local314, false, local356 ? aClass36_Sub1_1 : this.aClass36_Sub1_2, local256, local311); } else { diff --git a/client/src/main/java/rt4/LocType.java b/client/src/main/java/rt4/LocType.java index 71a47d6..fe13691 100644 --- a/client/src/main/java/rt4/LocType.java +++ b/client/src/main/java/rt4/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) { + public final Loc_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 (GlRenderer.enabled) { if (this.shapes == null) { @@ -741,7 +741,7 @@ public final class LocType { } else { local29 = arg0 + (this.id << 10) + (arg3 << 3); } - @Pc(225) Class139 local225 = (Class139) LocTypeList.aClass99_14.get(local29); + @Pc(225) Loc_Class139 local225 = (Loc_Class139) LocTypeList.aClass99_14.get(local29); @Pc(235) GlModel local235; @Pc(265) SoftwareIndexedSprite local265; if (local225 == null) { @@ -759,7 +759,7 @@ public final class LocType { } else { local265 = null; } - local225 = new Class139(); + local225 = new Loc_Class139(); local225.aClass8_10 = local235; local225.aClass36_Sub1_3 = local265; LocTypeList.aClass99_14.put(local225, local29); @@ -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) { + public final Loc_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 (!GlRenderer.enabled) { if (this.shapes == null) { diff --git a/client/src/main/java/rt4/Class139.java b/client/src/main/java/rt4/Loc_Class139.java similarity index 91% rename from client/src/main/java/rt4/Class139.java rename to client/src/main/java/rt4/Loc_Class139.java index f9598a3..07bcc31 100644 --- a/client/src/main/java/rt4/Class139.java +++ b/client/src/main/java/rt4/Loc_Class139.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!sm") -public final class Class139 { +public final class Loc_Class139 { @OriginalMember(owner = "client!sm", name = "a", descriptor = "Lclient!ek;") public SoftwareIndexedSprite aClass36_Sub1_3; diff --git a/client/src/main/java/rt4/MidiInstrument.java b/client/src/main/java/rt4/MidiInstrument.java index bf7c460..5d956fc 100644 --- a/client/src/main/java/rt4/MidiInstrument.java +++ b/client/src/main/java/rt4/MidiInstrument.java @@ -30,7 +30,7 @@ public final class MidiInstrument extends Node { public final short[] aShortArray36 = new short[128]; @OriginalMember(owner = "client!jk", name = "I", descriptor = "[Lclient!wh;") - public final Class162[] aClass162Array1 = new Class162[128]; + public final Midi_Class162[] aClass162Array1 = new Midi_Class162[128]; @OriginalMember(owner = "client!jk", name = "", descriptor = "([B)V") public MidiInstrument(@OriginalArg(0) byte[] arg0) { @@ -93,9 +93,9 @@ public final class MidiInstrument extends Node { local187[local206] = (byte) local204; } } - @Pc(242) Class162[] local242 = new Class162[local194]; + @Pc(242) Midi_Class162[] local242 = new Midi_Class162[local194]; for (local206 = 0; local206 < local242.length; local206++) { - @Pc(256) Class162 local256 = local242[local206] = new Class162(); + @Pc(256) Midi_Class162 local256 = local242[local206] = new Midi_Class162(); @Pc(260) int local260 = local38.g1(); if (local260 > 0) { local256.aByteArray80 = new byte[local260 * 2]; @@ -185,7 +185,7 @@ public final class MidiInstrument extends Node { } local428 = 0; local375 = 0; - @Pc(609) Class162 local609 = null; + @Pc(609) Midi_Class162 local609 = null; @Pc(611) int local611; for (local611 = 0; local611 < 128; local611++) { if (this.anIntArray289[local611] != 0) { @@ -220,7 +220,7 @@ public final class MidiInstrument extends Node { this.aByteArray45[local664] = (byte) local611; } this.anInt3078 = local38.g1() + 1; - @Pc(729) Class162 local729; + @Pc(729) Midi_Class162 local729; @Pc(734) int local734; for (local664 = 0; local664 < local194; local664++) { local729 = local242[local664]; diff --git a/client/src/main/java/rt4/MidiNote.java b/client/src/main/java/rt4/MidiNote.java index d13b65d..6a7485c 100644 --- a/client/src/main/java/rt4/MidiNote.java +++ b/client/src/main/java/rt4/MidiNote.java @@ -16,7 +16,7 @@ public final class MidiNote extends Node { public int anInt3765; @OriginalMember(owner = "client!mf", name = "w", descriptor = "Lclient!wh;") - public Class162 aClass162_1; + public Midi_Class162 aClass162_1; @OriginalMember(owner = "client!mf", name = "y", descriptor = "I") public int anInt3767; diff --git a/client/src/main/java/rt4/MidiPcmStream.java b/client/src/main/java/rt4/MidiPcmStream.java index d9efd23..f4dc597 100644 --- a/client/src/main/java/rt4/MidiPcmStream.java +++ b/client/src/main/java/rt4/MidiPcmStream.java @@ -112,7 +112,7 @@ public final class MidiPcmStream extends PcmStream { arg0.method3741(); @Pc(5) boolean local5 = true; @Pc(20) int[] local20 = new int[] { 22050 }; - for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.head(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.next()) { + for (@Pc(34) Song_Class3_Sub9 local34 = (Song_Class3_Sub9) arg0.aClass133_22.head(); local34 != null; local34 = (Song_Class3_Sub9) arg0.aClass133_22.next()) { @Pc(40) int local40 = (int) local34.key; @Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.get((long) local40); if (local48 == null) { @@ -533,7 +533,7 @@ public final class MidiPcmStream extends PcmStream { arg2.anInt3764 = local54; } arg2.aClass3_Sub3_Sub1_3.method410(this.method4439(arg2)); - @Pc(103) Class162 local103 = arg2.aClass162_1; + @Pc(103) Midi_Class162 local103 = arg2.aClass162_1; arg2.anInt3768 += local103.anInt5814; arg2.anInt3774++; @Pc(134) double local134 = (double) ((arg2.anInt3779 - 60 << 8) + (arg2.anInt3764 * arg2.anInt3781 >> 12)) * 5.086263020833333E-6D; @@ -719,7 +719,7 @@ public final class MidiPcmStream extends PcmStream { @OriginalMember(owner = "client!va", name = "a", descriptor = "(BLclient!mf;)I") private int method4439(@OriginalArg(1) MidiNote arg0) { - @Pc(6) Class162 local6 = arg0.aClass162_1; + @Pc(6) Midi_Class162 local6 = arg0.aClass162_1; @Pc(17) int local17 = (arg0.anInt3781 * arg0.anInt3764 >> 12) + arg0.anInt3769; local17 += this.anIntArray501[arg0.anInt3773] * (this.anIntArray497[arg0.anInt3773] - 8192) >> 12; @Pc(62) int local62; @@ -825,7 +825,7 @@ public final class MidiPcmStream extends PcmStream { if (this.anIntArray507[arg0.anInt3773] == 0) { return 0; } - @Pc(21) Class162 local21 = arg0.aClass162_1; + @Pc(21) Midi_Class162 local21 = arg0.aClass162_1; @Pc(37) int local37 = this.anIntArray495[arg0.anInt3773] * this.anIntArray505[arg0.anInt3773] + 4096 >> 13; @Pc(45) int local45 = local37 * local37 + 16384 >> 15; @Pc(54) int local54 = arg0.anInt3772 * local45 + 16384 >> 15; diff --git a/client/src/main/java/rt4/Class162.java b/client/src/main/java/rt4/Midi_Class162.java similarity index 96% rename from client/src/main/java/rt4/Class162.java rename to client/src/main/java/rt4/Midi_Class162.java index 6c586a3..51ea743 100644 --- a/client/src/main/java/rt4/Class162.java +++ b/client/src/main/java/rt4/Midi_Class162.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!wh") -public final class Class162 { +public final class Midi_Class162 { @OriginalMember(owner = "client!wh", name = "a", descriptor = "I") public int anInt5807; diff --git a/client/src/main/java/rt4/Class57.java b/client/src/main/java/rt4/Model_Class57.java similarity index 87% rename from client/src/main/java/rt4/Class57.java rename to client/src/main/java/rt4/Model_Class57.java index 78d1452..5f7225c 100644 --- a/client/src/main/java/rt4/Class57.java +++ b/client/src/main/java/rt4/Model_Class57.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!hd") -public final class Class57 { +public final class Model_Class57 { @OriginalMember(owner = "client!hd", name = "b", descriptor = "I") public int anInt2431; @@ -20,11 +20,11 @@ public final class Class57 { public int anInt2437; @OriginalMember(owner = "client!hd", name = "", descriptor = "()V") - public Class57() { + public Model_Class57() { } @OriginalMember(owner = "client!hd", name = "", descriptor = "(Lclient!hd;)V") - public Class57(@OriginalArg(0) Class57 arg0) { + public Model_Class57(@OriginalArg(0) Model_Class57 arg0) { this.anInt2432 = arg0.anInt2432; this.anInt2437 = arg0.anInt2437; this.anInt2431 = arg0.anInt2431; diff --git a/client/src/main/java/rt4/MonochromeImageCache.java b/client/src/main/java/rt4/MonochromeImageCache.java index 516fcab..ce8d2d7 100644 --- a/client/src/main/java/rt4/MonochromeImageCache.java +++ b/client/src/main/java/rt4/MonochromeImageCache.java @@ -30,7 +30,7 @@ public final class MonochromeImageCache { private final int anInt4064; @OriginalMember(owner = "client!nd", name = "o", descriptor = "[Lclient!lb;") - private Class3_Sub23[] aClass3_Sub23Array1; + private MonochromeImageCache_Class3_Sub23[] aClass3_Sub23Array1; @OriginalMember(owner = "client!nd", name = "a", descriptor = "[[[I") private int[][][] anIntArrayArrayArray13; @@ -48,7 +48,7 @@ public final class MonochromeImageCache { public MonochromeImageCache(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { this.anInt4067 = arg1; this.anInt4064 = arg0; - this.aClass3_Sub23Array1 = new Class3_Sub23[this.anInt4067]; + this.aClass3_Sub23Array1 = new MonochromeImageCache_Class3_Sub23[this.anInt4067]; this.anIntArrayArrayArray13 = new int[this.anInt4064][3][arg2]; } @@ -88,15 +88,15 @@ public final class MonochromeImageCache { this.anInt4062 = arg0; return this.anIntArrayArrayArray13[0]; } else { - @Pc(44) Class3_Sub23 local44 = this.aClass3_Sub23Array1[arg0]; + @Pc(44) MonochromeImageCache_Class3_Sub23 local44 = this.aClass3_Sub23Array1[arg0]; if (local44 == null) { this.aBoolean195 = true; if (this.anInt4066 < this.anInt4064) { - local44 = new Class3_Sub23(arg0, this.anInt4066); + local44 = new MonochromeImageCache_Class3_Sub23(arg0, this.anInt4066); this.anInt4066++; } else { - @Pc(80) Class3_Sub23 local80 = (Class3_Sub23) this.aClass69_96.method2279(); - local44 = new Class3_Sub23(arg0, local80.anInt3468); + @Pc(80) MonochromeImageCache_Class3_Sub23 local80 = (MonochromeImageCache_Class3_Sub23) this.aClass69_96.method2279(); + local44 = new MonochromeImageCache_Class3_Sub23(arg0, local80.anInt3468); this.aClass3_Sub23Array1[local80.anInt3476] = null; local80.unlink(); } diff --git a/client/src/main/java/rt4/Class3_Sub23.java b/client/src/main/java/rt4/MonochromeImageCache_Class3_Sub23.java similarity index 76% rename from client/src/main/java/rt4/Class3_Sub23.java rename to client/src/main/java/rt4/MonochromeImageCache_Class3_Sub23.java index 4d32ba4..5f7a0f8 100644 --- a/client/src/main/java/rt4/Class3_Sub23.java +++ b/client/src/main/java/rt4/MonochromeImageCache_Class3_Sub23.java @@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!lb") -public final class Class3_Sub23 extends Node { +public final class MonochromeImageCache_Class3_Sub23 extends Node { @OriginalMember(owner = "client!lb", name = "t", descriptor = "I") public final int anInt3468; @@ -14,7 +14,7 @@ public final class Class3_Sub23 extends Node { public final int anInt3476; @OriginalMember(owner = "client!lb", name = "", descriptor = "(II)V") - public Class3_Sub23(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + public MonochromeImageCache_Class3_Sub23(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { this.anInt3468 = arg1; this.anInt3476 = arg0; } diff --git a/client/src/main/java/rt4/NpcType.java b/client/src/main/java/rt4/NpcType.java index a5cfac6..a7ee848 100644 --- a/client/src/main/java/rt4/NpcType.java +++ b/client/src/main/java/rt4/NpcType.java @@ -217,7 +217,7 @@ public final class NpcType { } @OriginalMember(owner = "client!me", name = "a", descriptor = "([Lclient!ub;IBIIIILclient!tk;ILclient!tk;)Lclient!ak;") - public final Model getBodyModel(@OriginalArg(0) Class147[] seqs, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) SeqType seqType1, @OriginalArg(8) int arg7, @OriginalArg(9) SeqType seqType2) { + public final Model getBodyModel(@OriginalArg(0) Npc_Class147[] seqs, @OriginalArg(1) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) SeqType seqType1, @OriginalArg(8) int arg7, @OriginalArg(9) SeqType seqType2) { if (this.multiNpcs != null) { @Pc(13) NpcType local13 = this.getMultiNpc(); return local13 == null ? null : local13.getBodyModel(seqs, arg1, arg2, arg3, arg4, arg5, seqType1, arg7, seqType2); diff --git a/client/src/main/java/rt4/Class147.java b/client/src/main/java/rt4/Npc_Class147.java similarity index 95% rename from client/src/main/java/rt4/Class147.java rename to client/src/main/java/rt4/Npc_Class147.java index b7dca4c..fed4f33 100644 --- a/client/src/main/java/rt4/Class147.java +++ b/client/src/main/java/rt4/Npc_Class147.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ub") -public final class Class147 { +public final class Npc_Class147 { @OriginalMember(owner = "client!ub", name = "b", descriptor = "I") public int anInt5396; diff --git a/client/src/main/java/rt4/PathingEntity.java b/client/src/main/java/rt4/PathingEntity.java index fee9a6d..3b21657 100644 --- a/client/src/main/java/rt4/PathingEntity.java +++ b/client/src/main/java/rt4/PathingEntity.java @@ -152,7 +152,7 @@ public abstract class PathingEntity extends Entity { public int anInt3377 = 0; @OriginalMember(owner = "client!fe", name = "Eb", descriptor = "[Lclient!ub;") - public final Class147[] aClass147Array3 = new Class147[12]; + public final Npc_Class147[] aClass147Array3 = new Npc_Class147[12]; @OriginalMember(owner = "client!fe", name = "Lb", descriptor = "I") public int chatLoops = 100; diff --git a/client/src/main/java/rt4/Player.java b/client/src/main/java/rt4/Player.java index 4fd1cf8..64f1b6d 100644 --- a/client/src/main/java/rt4/Player.java +++ b/client/src/main/java/rt4/Player.java @@ -126,7 +126,7 @@ public final class Player extends PathingEntity { } else { @Pc(68) SeqType local68 = SeqTypeList.get(local20); @Pc(71) int local71 = local68.anInt5347; - @Pc(76) Class147 local76 = arg2.aClass147Array3[local30]; + @Pc(76) Npc_Class147 local76 = arg2.aClass147Array3[local30]; if (local76 != null) { if (local20 == local76.anInt5396) { if (local71 == 0) { @@ -146,7 +146,7 @@ public final class Player extends PathingEntity { } } if (local76 == null) { - local76 = arg2.aClass147Array3[local30] = new Class147(); + local76 = arg2.aClass147Array3[local30] = new Npc_Class147(); local76.anInt5396 = local20; local76.anInt5398 = 1; local76.anInt5404 = 0; diff --git a/client/src/main/java/rt4/PlayerAppearance.java b/client/src/main/java/rt4/PlayerAppearance.java index 682e623..c22e4b6 100644 --- a/client/src/main/java/rt4/PlayerAppearance.java +++ b/client/src/main/java/rt4/PlayerAppearance.java @@ -192,7 +192,7 @@ public final class PlayerAppearance { } @OriginalMember(owner = "client!hh", name = "a", descriptor = "([Lclient!ub;ILclient!tk;Lclient!tk;IIIIZII)Lclient!ak;") - public final Model method1954(@OriginalArg(0) Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SeqType arg2, @OriginalArg(3) SeqType arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(9) int arg7, @OriginalArg(10) int arg8) { + public final Model method1954(@OriginalArg(0) Npc_Class147[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) SeqType arg2, @OriginalArg(3) SeqType arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(7) int arg6, @OriginalArg(9) int arg7, @OriginalArg(10) int arg8) { if (this.anInt2492 != -1) { return NpcTypeList.get(this.anInt2492).getBodyModel(arg0, arg5, arg8, arg1, arg6, arg7, arg2, arg4, arg3); } diff --git a/client/src/main/java/rt4/RawModel.java b/client/src/main/java/rt4/RawModel.java index fce0144..d4459de 100644 --- a/client/src/main/java/rt4/RawModel.java +++ b/client/src/main/java/rt4/RawModel.java @@ -75,7 +75,7 @@ public final class RawModel extends Entity { public short[] aShortArray24; @OriginalMember(owner = "client!gb", name = "W", descriptor = "[Lclient!hd;") - public Class57[] aClass57Array1; + public Model_Class57[] aClass57Array1; @OriginalMember(owner = "client!gb", name = "X", descriptor = "S") private short aShort16; @@ -105,7 +105,7 @@ public final class RawModel extends Entity { public short[] aShortArray25; @OriginalMember(owner = "client!gb", name = "hb", descriptor = "[Lclient!hd;") - public Class57[] aClass57Array2; + public Model_Class57[] aClass57Array2; @OriginalMember(owner = "client!gb", name = "ib", descriptor = "[S") public short[] aShortArray26; @@ -557,10 +557,10 @@ public final class RawModel extends Entity { if (this.aClass57Array1 != null) { return; } - this.aClass57Array1 = new Class57[this.anInt2139]; + this.aClass57Array1 = new Model_Class57[this.anInt2139]; @Pc(10) int local10; for (local10 = 0; local10 < this.anInt2139; local10++) { - this.aClass57Array1[local10] = new Class57(); + this.aClass57Array1[local10] = new Model_Class57(); } for (local10 = 0; local10 < this.anInt2136; local10++) { @Pc(34) int local34 = this.anIntArray197[local10]; @@ -593,17 +593,17 @@ public final class RawModel extends Entity { local201 = this.aByteArray30[local10]; } if (local201 == 0) { - @Pc(214) Class57 local214 = this.aClass57Array1[local34]; + @Pc(214) Model_Class57 local214 = this.aClass57Array1[local34]; local214.anInt2437 += local112; local214.anInt2431 += local120; local214.anInt2436 += local128; local214.anInt2432++; - @Pc(243) Class57 local243 = this.aClass57Array1[local39]; + @Pc(243) Model_Class57 local243 = this.aClass57Array1[local39]; local243.anInt2437 += local112; local243.anInt2431 += local120; local243.anInt2436 += local128; local243.anInt2432++; - @Pc(272) Class57 local272 = this.aClass57Array1[local44]; + @Pc(272) Model_Class57 local272 = this.aClass57Array1[local44]; local272.anInt2437 += local112; local272.anInt2431 += local120; local272.anInt2436 += local128; @@ -1271,7 +1271,7 @@ public final class RawModel extends Entity { @Pc(18) int local18 = local2.anInt2139; @Pc(20) int local20; for (local20 = 0; local20 < this.anInt2139; local20++) { - @Pc(29) Class57 local29 = this.aClass57Array1[local20]; + @Pc(29) Model_Class57 local29 = this.aClass57Array1[local20]; if (local29.anInt2432 != 0) { @Pc(40) int local40 = this.anIntArray201[local20] - arg2; if (local40 >= local2.aShort15 && local40 <= local2.aShort13) { @@ -1280,21 +1280,21 @@ public final class RawModel extends Entity { @Pc(72) int local72 = this.anIntArray203[local20] - arg3; if (local72 >= local2.aShort20 && local72 <= local2.aShort17) { for (@Pc(83) int local83 = 0; local83 < local18; local83++) { - @Pc(91) Class57 local91 = local2.aClass57Array1[local83]; + @Pc(91) Model_Class57 local91 = local2.aClass57Array1[local83]; if (local56 == local15[local83] && local72 == local2.anIntArray203[local83] && local40 == local2.anIntArray201[local83] && local91.anInt2432 != 0) { if (this.aClass57Array2 == null) { - this.aClass57Array2 = new Class57[this.anInt2139]; + this.aClass57Array2 = new Model_Class57[this.anInt2139]; } if (local2.aClass57Array2 == null) { - local2.aClass57Array2 = new Class57[local18]; + local2.aClass57Array2 = new Model_Class57[local18]; } - @Pc(131) Class57 local131 = this.aClass57Array2[local20]; + @Pc(131) Model_Class57 local131 = this.aClass57Array2[local20]; if (local131 == null) { - local131 = this.aClass57Array2[local20] = new Class57(local29); + local131 = this.aClass57Array2[local20] = new Model_Class57(local29); } - @Pc(148) Class57 local148 = local2.aClass57Array2[local83]; + @Pc(148) Model_Class57 local148 = local2.aClass57Array2[local83]; if (local148 == null) { - local148 = local2.aClass57Array2[local83] = new Class57(local91); + local148 = local2.aClass57Array2[local83] = new Model_Class57(local91); } local131.anInt2437 += local91.anInt2437; local131.anInt2431 += local91.anInt2431; diff --git a/client/src/main/java/rt4/ScriptRunner.java b/client/src/main/java/rt4/ScriptRunner.java index 9d85e9f..07dcf4b 100644 --- a/client/src/main/java/rt4/ScriptRunner.java +++ b/client/src/main/java/rt4/ScriptRunner.java @@ -3688,7 +3688,7 @@ public final class ScriptRunner { intStack[isp++] = 1; continue; } - @Pc(10247) Class32 local10247; + @Pc(10247) WorldInfo local10247; @Pc(10191) World world; if (opcode == 6501) { world = Static18.getFirstWorld(); @@ -3763,7 +3763,7 @@ public final class ScriptRunner { } else { intStack[isp++] = local10440.flags; stringStack[ssp++] = local10440.activity; - @Pc(10458) Class32 local10458 = local10440.getWorldInfo(); + @Pc(10458) WorldInfo local10458 = local10440.getWorldInfo(); intStack[isp++] = local10458.flag; stringStack[ssp++] = local10458.name; intStack[isp++] = local10440.players; diff --git a/client/src/main/java/rt4/SoftwareModel.java b/client/src/main/java/rt4/SoftwareModel.java index ab54fe8..ec71d76 100644 --- a/client/src/main/java/rt4/SoftwareModel.java +++ b/client/src/main/java/rt4/SoftwareModel.java @@ -234,7 +234,7 @@ public final class SoftwareModel extends Model { if (local377 == -1) { local366 = 2; } - @Pc(435) Class57 local435; + @Pc(435) Model_Class57 local435; @Pc(468) int local468; @Pc(614) TriangleNormal local614; if (local388 == -1) { diff --git a/client/src/main/java/rt4/Song.java b/client/src/main/java/rt4/Song.java index 22ee533..0a1b878 100644 --- a/client/src/main/java/rt4/Song.java +++ b/client/src/main/java/rt4/Song.java @@ -365,9 +365,9 @@ public final class Song extends Node { local104 = local69 >> 16 & 0x7F; if (local104 > 0) { @Pc(179) int local179 = local15[local92]; - @Pc(187) Class3_Sub9 local187 = (Class3_Sub9) this.aClass133_22.get((long) local179); + @Pc(187) Song_Class3_Sub9 local187 = (Song_Class3_Sub9) this.aClass133_22.get((long) local179); if (local187 == null) { - local187 = new Class3_Sub9(new byte[128]); + local187 = new Song_Class3_Sub9(new byte[128]); this.aClass133_22.put(local187, (long) local179); } local187.aByteArray17[local98] = 1; diff --git a/client/src/main/java/rt4/Class3_Sub9.java b/client/src/main/java/rt4/Song_Class3_Sub9.java similarity index 87% rename from client/src/main/java/rt4/Class3_Sub9.java rename to client/src/main/java/rt4/Song_Class3_Sub9.java index ad27284..e5c4873 100644 --- a/client/src/main/java/rt4/Class3_Sub9.java +++ b/client/src/main/java/rt4/Song_Class3_Sub9.java @@ -6,7 +6,7 @@ import org.openrs2.deob.annotation.OriginalMember; import org.openrs2.deob.annotation.Pc; @OriginalClass("client!ea") -public final class Class3_Sub9 extends Node { +public final class Song_Class3_Sub9 extends Node { @OriginalMember(owner = "client!ea", name = "s", descriptor = "[I") public static final int[] anIntArray135 = new int[32]; @@ -23,7 +23,7 @@ public final class Class3_Sub9 extends Node { } @OriginalMember(owner = "client!ea", name = "", descriptor = "([B)V") - public Class3_Sub9(@OriginalArg(0) byte[] arg0) { + public Song_Class3_Sub9(@OriginalArg(0) byte[] arg0) { this.aByteArray17 = arg0; } } diff --git a/client/src/main/java/rt4/Static13.java b/client/src/main/java/rt4/Static13.java index 21f045c..48ca1c6 100644 --- a/client/src/main/java/rt4/Static13.java +++ b/client/src/main/java/rt4/Static13.java @@ -15,7 +15,7 @@ public final class Static13 { public static boolean aBoolean16 = false; @OriginalMember(owner = "client!bc", name = "N", descriptor = "Lclient!lb;") - public static final Class3_Sub23 aClass3_Sub23_1 = new Class3_Sub23(0, 0); + public static final MonochromeImageCache_Class3_Sub23 aClass3_Sub23_1 = new MonochromeImageCache_Class3_Sub23(0, 0); @OriginalMember(owner = "client!bc", name = "f", descriptor = "(B)Lclient!na;") public static JagString method471() { diff --git a/client/src/main/java/rt4/Static131.java b/client/src/main/java/rt4/Static131.java index 6669ae9..cbca7e9 100644 --- a/client/src/main/java/rt4/Static131.java +++ b/client/src/main/java/rt4/Static131.java @@ -58,7 +58,7 @@ public final class Static131 { } @OriginalMember(owner = "client!kd", name = "a", descriptor = "([[F[[II[[FI[ILclient!fj;BLclient!gi;[[FI)V") - public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) { + public static void method2578(@OriginalArg(0) float[][] arg0, @OriginalArg(1) int[][] arg1, @OriginalArg(2) int arg2, @OriginalArg(3) float[][] arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int[] arg5, @OriginalArg(6) Light_Class45 arg6, @OriginalArg(8) Light arg7, @OriginalArg(9) float[][] arg8, @OriginalArg(10) int arg9) { @Pc(7) int[] local7 = new int[arg5.length / 2]; for (@Pc(13) int local13 = 0; local13 < local7.length; local13++) { @Pc(27) int local27 = arg5[local13 + local13]; diff --git a/client/src/main/java/rt4/Static155.java b/client/src/main/java/rt4/Static155.java index 89b0ddc..06c9879 100644 --- a/client/src/main/java/rt4/Static155.java +++ b/client/src/main/java/rt4/Static155.java @@ -51,7 +51,7 @@ public final class Static155 { @Pc(16) int local16 = local13.baseVar; @Pc(19) int local19 = local13.endBit; @Pc(22) int local22 = local13.startBit; - @Pc(29) int local29 = Class3_Sub9.anIntArray135[local19 - local22]; + @Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local19 - local22]; return VarpDomain.activeVarps[local16] >> local22 & local29; } } diff --git a/client/src/main/java/rt4/Static159.java b/client/src/main/java/rt4/Static159.java index 7f2e6ed..0b67fc4 100644 --- a/client/src/main/java/rt4/Static159.java +++ b/client/src/main/java/rt4/Static159.java @@ -30,7 +30,7 @@ public final class Static159 { arg1.aClass147Array3[local25] = null; } else { @Pc(60) SeqType local60 = SeqTypeList.get(local15); - @Pc(65) Class147 local65 = arg1.aClass147Array3[local25]; + @Pc(65) Npc_Class147 local65 = arg1.aClass147Array3[local25]; @Pc(68) int local68 = local60.anInt5347; if (local65 != null) { if (local15 == local65.anInt5396) { @@ -51,7 +51,7 @@ public final class Static159 { } } if (local65 == null) { - local65 = arg1.aClass147Array3[local25] = new Class147(); + local65 = arg1.aClass147Array3[local25] = new Npc_Class147(); local65.anInt5398 = 1; local65.anInt5404 = 0; local65.anInt5408 = local23; diff --git a/client/src/main/java/rt4/Static170.java b/client/src/main/java/rt4/Static170.java index 35a711f..f2de0bd 100644 --- a/client/src/main/java/rt4/Static170.java +++ b/client/src/main/java/rt4/Static170.java @@ -38,7 +38,7 @@ public final class Static170 { @OriginalMember(owner = "client!nh", name = "a", descriptor = "(IIIIIIIIIIIII)V") public static void method2574(@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, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9, @OriginalArg(11) int arg10, @OriginalArg(12) int arg11) { - @Pc(7) Class3_Sub8 local7 = new Class3_Sub8(); + @Pc(7) AttachLocRequest_Class3_Sub8 local7 = new AttachLocRequest_Class3_Sub8(); local7.anInt1206 = arg6; local7.anInt1205 = arg3; local7.anInt1187 = arg1; diff --git a/client/src/main/java/rt4/Static171.java b/client/src/main/java/rt4/Static171.java index e471235..8579e52 100644 --- a/client/src/main/java/rt4/Static171.java +++ b/client/src/main/java/rt4/Static171.java @@ -11,7 +11,7 @@ public final class Static171 { public static int anInt4153; @OriginalMember(owner = "client!ni", name = "n", descriptor = "Lclient!sm;") - public static Class139 aClass139_1 = new Class139(); + public static Loc_Class139 aClass139_1 = new Loc_Class139(); @OriginalMember(owner = "client!ni", name = "a", descriptor = "(ILclient!na;)I") public static int method3218(@OriginalArg(1) JagString arg0) { diff --git a/client/src/main/java/rt4/Static185.java b/client/src/main/java/rt4/Static185.java index 5e87d54..414f5ff 100644 --- a/client/src/main/java/rt4/Static185.java +++ b/client/src/main/java/rt4/Static185.java @@ -88,7 +88,7 @@ public final class Static185 { @Pc(330) boolean local330 = local62.aBoolean212 & !arg3; local261 |= (long) arg5 << 32; @Pc(387) Entity local387; - @Pc(403) Class139 local403; + @Pc(403) Loc_Class139 local403; if (arg6 == 22) { if (Preferences.showGroundDecorations || local62.anInt4429 != 0 || local62.anInt4435 == 1 || local62.aBoolean206) { if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { @@ -238,7 +238,7 @@ public final class Static185 { @Pc(1269) Entity local1269; @Pc(1254) Entity local1254; if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - @Pc(1287) Class139 local1287 = local62.method3428(arg9 + 4, local165, local153, 2, local199, local213, arg1, null, local330, local173); + @Pc(1287) Loc_Class139 local1287 = local62.method3428(arg9 + 4, local165, local153, 2, local199, local213, arg1, null, local330, local173); if (GlRenderer.enabled && local330) { Static242.method4211(local1287.aClass36_Sub1_3, local165, local201, local173); } @@ -330,7 +330,7 @@ public final class Static185 { } else { @Pc(1889) long local1889; @Pc(1934) Entity local1934; - @Pc(1950) Class139 local1950; + @Pc(1950) Loc_Class139 local1950; if (arg6 == 5) { local1226 = 16; local1889 = Static265.method4521(arg2, arg7, arg8); @@ -366,7 +366,7 @@ public final class Static185 { } else if (arg6 == 7) { @Pc(2137) int local2137 = arg9 + 2 & 0x3; if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { - @Pc(2183) Class139 local2183 = local62.method3428(local2137 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); + @Pc(2183) Loc_Class139 local2183 = local62.method3428(local2137 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); if (GlRenderer.enabled && local330) { Static242.method4211(local2183.aClass36_Sub1_3, local165, local201, local173); } @@ -386,7 +386,7 @@ public final class Static185 { if (local62.anInt4430 == -1 && local62.multiLocs == null && !local62.aBoolean214) { @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); + @Pc(2319) Loc_Class139 local2319 = local62.method3428(arg9 + 4, local165, local153, 4, local199, local213, arg1, null, local330, local173); if (GlRenderer.enabled && local330) { Static242.method4211(local2319.aClass36_Sub1_3, local165 - local2303, local201, local173 - local2297); } diff --git a/client/src/main/java/rt4/Static202.java b/client/src/main/java/rt4/Static202.java index 8ec90ba..a0cb92c 100644 --- a/client/src/main/java/rt4/Static202.java +++ b/client/src/main/java/rt4/Static202.java @@ -85,7 +85,7 @@ public final class Static202 { @Pc(10) int local10 = local7.endBit; @Pc(16) int local16 = local7.startBit; @Pc(19) int local19 = local7.baseVar; - @Pc(25) int local25 = Class3_Sub9.anIntArray135[local10 - local16]; + @Pc(25) int local25 = Song_Class3_Sub9.anIntArray135[local10 - local16]; if (arg1 < 0 || arg1 > local25) { arg1 = 0; } diff --git a/client/src/main/java/rt4/Static221.java b/client/src/main/java/rt4/Static221.java index 2bb6d0a..f0cc666 100644 --- a/client/src/main/java/rt4/Static221.java +++ b/client/src/main/java/rt4/Static221.java @@ -67,7 +67,7 @@ public final class Static221 { @Pc(18) Light local18 = arg3[local7]; if (local18.anInt2241 == arg4) { @Pc(24) int local24 = 0; - @Pc(28) Class45 local28 = new Class45(); + @Pc(28) Light_Class45 local28 = new Light_Class45(); @Pc(37) int local37 = (local18.anInt2240 >> 7) - local18.anInt2236; @Pc(46) int local46 = (local18.anInt2245 >> 7) - local18.anInt2236; if (local46 < 0) { diff --git a/client/src/main/java/rt4/Static272.java b/client/src/main/java/rt4/Static272.java index ff1f511..7150d39 100644 --- a/client/src/main/java/rt4/Static272.java +++ b/client/src/main/java/rt4/Static272.java @@ -15,7 +15,7 @@ public final class Static272 { @Pc(17) int local17 = local14.baseVar; @Pc(20) int local20 = local14.endBit; @Pc(23) int local23 = local14.startBit; - @Pc(29) int local29 = Class3_Sub9.anIntArray135[local20 - local23]; + @Pc(29) int local29 = Song_Class3_Sub9.anIntArray135[local20 - local23]; if (arg0 < 0 || local29 < arg0) { arg0 = 0; } diff --git a/client/src/main/java/rt4/Static34.java b/client/src/main/java/rt4/Static34.java index e2528e7..35e8815 100644 --- a/client/src/main/java/rt4/Static34.java +++ b/client/src/main/java/rt4/Static34.java @@ -165,7 +165,7 @@ public final class Static34 { arg0.anInt3420--; } for (local156 = 0; local156 < arg0.aClass147Array3.length; local156++) { - @Pc(545) Class147 local545 = arg0.aClass147Array3[local156]; + @Pc(545) Npc_Class147 local545 = arg0.aClass147Array3[local156]; if (local545 != null) { if (local545.anInt5408 > 0) { local545.anInt5408--; diff --git a/client/src/main/java/rt4/Static9.java b/client/src/main/java/rt4/Static9.java index 9fa707e..272abfb 100644 --- a/client/src/main/java/rt4/Static9.java +++ b/client/src/main/java/rt4/Static9.java @@ -56,7 +56,7 @@ public final class Static9 { if (arg7 < 3) { local158 = Static83.activeTileHeightMap[arg7 + 1]; } - @Pc(215) Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88); + @Pc(215) Loc_Class139 local215 = arg0.method3428(arg2, local80, local120, arg4, local148, local158, false, null, true, local88); Static242.method4207(local215.aClass36_Sub1_3, local80 - arg3, local122, local88 - arg1); } diff --git a/client/src/main/java/rt4/World.java b/client/src/main/java/rt4/World.java index 261b397..64e9b9f 100644 --- a/client/src/main/java/rt4/World.java +++ b/client/src/main/java/rt4/World.java @@ -16,7 +16,7 @@ public final class World extends AbstractWorld { public JagString hostname; @OriginalMember(owner = "client!ba", name = "g", descriptor = "(I)Lclient!ee;") - public final Class32 getWorldInfo() { + public final WorldInfo getWorldInfo() { return WorldList.countries[this.country]; } } diff --git a/client/src/main/java/rt4/Class32.java b/client/src/main/java/rt4/WorldInfo.java similarity index 91% rename from client/src/main/java/rt4/Class32.java rename to client/src/main/java/rt4/WorldInfo.java index fc94e97..024d232 100644 --- a/client/src/main/java/rt4/Class32.java +++ b/client/src/main/java/rt4/WorldInfo.java @@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!ee") -public final class Class32 { +public final class WorldInfo { @OriginalMember(owner = "client!ee", name = "h", descriptor = "I") public int flag; diff --git a/client/src/main/java/rt4/WorldList.java b/client/src/main/java/rt4/WorldList.java index b178ca3..b93a13d 100644 --- a/client/src/main/java/rt4/WorldList.java +++ b/client/src/main/java/rt4/WorldList.java @@ -29,7 +29,7 @@ public class WorldList { @OriginalMember(owner = "client!gf", name = "T", descriptor = "I") public static int checksum; @OriginalMember(owner = "client!qh", name = "e", descriptor = "[Lclient!ee;") - public static Class32[] countries; + public static WorldInfo[] countries; @OriginalMember(owner = "client!bi", name = "R", descriptor = "I") public static int minId; @OriginalMember(owner = "client!ni", name = "q", descriptor = "I") @@ -163,10 +163,10 @@ public class WorldList { @OriginalMember(owner = "client!hi", name = "a", descriptor = "(Lclient!wa;I)V") public static void decodeWorlds(@OriginalArg(0) Buffer buffer) { @Pc(9) int countryCount = buffer.gSmart1or2(); - countries = new Class32[countryCount]; + countries = new WorldInfo[countryCount]; @Pc(14) int i; for (i = 0; i < countryCount; i++) { - countries[i] = new Class32(); + countries[i] = new WorldInfo(); countries[i].flag = buffer.gSmart1or2(); countries[i].name = buffer.gjstr2(); } diff --git a/client/src/main/java/rt4/client.java b/client/src/main/java/rt4/client.java index 296ec05..e0d988f 100644 --- a/client/src/main/java/rt4/client.java +++ b/client/src/main/java/rt4/client.java @@ -453,7 +453,7 @@ public final class client extends GameShell { Static107.anInt2875 = -1; method3768(); Static255.cache.clear(); - Static171.aClass139_1 = new Class139(); + Static171.aClass139_1 = new Loc_Class139(); ((Js5GlTextureProvider) Rasteriser.textureProvider).clear(); LightingManager.lightCount = 0; LightingManager.lights = new Light[255];