diff --git a/client/src/main/java/Class13.java b/client/src/main/java/Class13.java index 6865a81..dbf5be9 100644 --- a/client/src/main/java/Class13.java +++ b/client/src/main/java/Class13.java @@ -289,7 +289,7 @@ public final class Class13 { public boolean aBoolean32 = false; @OriginalMember(owner = "client!be", name = "gc", descriptor = "Lclient!bf;") - public Class3_Sub4 aClass3_Sub4_1 = Static45.aClass3_Sub4_2; + public ServerActiveProperties aClass3_Sub4_1 = Static45.aClass3_Sub4_2; @OriginalMember(owner = "client!be", name = "cc", descriptor = "I") public int anInt492 = 0; @@ -761,7 +761,7 @@ public final class Class13 { if (this.anInt530 == 6) { local164 |= 0x1; } - this.aClass3_Sub4_1 = new Class3_Sub4(local164, -1); + this.aClass3_Sub4_1 = new ServerActiveProperties(local164, -1); } @OriginalMember(owner = "client!be", name = "a", descriptor = "(ZI)Lclient!qf;") @@ -1128,7 +1128,7 @@ public final class Class13 { this.anInt484 = -1; } } - this.aClass3_Sub4_1 = new Class3_Sub4(local175, local567); + this.aClass3_Sub4_1 = new ServerActiveProperties(local175, local567); this.anObjectArray3 = this.method485(arg0); this.anObjectArray19 = this.method485(arg0); this.anObjectArray24 = this.method485(arg0); diff --git a/client/src/main/java/Class3_Sub4.java b/client/src/main/java/ServerActiveProperties.java similarity index 93% rename from client/src/main/java/Class3_Sub4.java rename to client/src/main/java/ServerActiveProperties.java index 04b816a..18229e2 100644 --- a/client/src/main/java/Class3_Sub4.java +++ b/client/src/main/java/ServerActiveProperties.java @@ -3,7 +3,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!bf") -public final class Class3_Sub4 extends Node { +public final class ServerActiveProperties extends Node { @OriginalMember(owner = "client!bf", name = "q", descriptor = "I") public final int anInt540; @@ -12,7 +12,7 @@ public final class Class3_Sub4 extends Node { public final int anInt546; @OriginalMember(owner = "client!bf", name = "", descriptor = "(II)V") - public Class3_Sub4(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { + public ServerActiveProperties(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { this.anInt540 = arg1; this.anInt546 = arg0; } diff --git a/client/src/main/java/Static103.java b/client/src/main/java/Static103.java index f3326dd..5e534c7 100644 --- a/client/src/main/java/Static103.java +++ b/client/src/main/java/Static103.java @@ -341,7 +341,7 @@ public final class Static103 { local693 = Static201.method1418(local19, local15); if (local693 != null) { Static53.method1294(); - @Pc(1493) Class3_Sub4 local1493 = Static36.method940(local693); + @Pc(1493) ServerActiveProperties local1493 = Static36.method940(local693); Static247.method4246(local19, local15, local1493.method512(), local1493.anInt540, local693.anInt499, local693.anInt484); Static260.anInt5014 = 0; Static102.aClass100_545 = Static97.method1963(local693); diff --git a/client/src/main/java/Static258.java b/client/src/main/java/Static258.java index 969c9c4..6c9f34d 100644 --- a/client/src/main/java/Static258.java +++ b/client/src/main/java/Static258.java @@ -61,7 +61,7 @@ public final class Static258 { Static169.aClass13_18 = arg2; Static18.anInt588 = local171; if (arg2.anIntArray40[local171] > 0) { - @Pc(267) Class3_Sub4 local267 = Static36.method940(arg2); + @Pc(267) ServerActiveProperties local267 = Static36.method940(arg2); @Pc(276) ObjType local276 = Static71.method1439(arg2.anIntArray40[local171] - 1); if (Static260.anInt5014 == 1 && local267.method510()) { if (Static224.anInt5062 != arg2.anInt507 || Static185.anInt4370 != local171) { diff --git a/client/src/main/java/Static36.java b/client/src/main/java/Static36.java index 846b45a..2a38310 100644 --- a/client/src/main/java/Static36.java +++ b/client/src/main/java/Static36.java @@ -41,8 +41,8 @@ public final class Static36 { } @OriginalMember(owner = "client!client", name = "b", descriptor = "(Lclient!be;)Lclient!bf;") - public static Class3_Sub4 method940(@OriginalArg(0) Class13 arg0) { - @Pc(13) Class3_Sub4 local13 = (Class3_Sub4) Static210.aClass133_21.method3863(((long) arg0.anInt507 << 32) + (long) arg0.anInt457); + public static ServerActiveProperties method940(@OriginalArg(0) Class13 arg0) { + @Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static210.aClass133_21.method3863(((long) arg0.anInt507 << 32) + (long) arg0.anInt457); return local13 == null ? arg0.aClass3_Sub4_1 : local13; } diff --git a/client/src/main/java/Static4.java b/client/src/main/java/Static4.java index 617d3f9..19b2737 100644 --- a/client/src/main/java/Static4.java +++ b/client/src/main/java/Static4.java @@ -521,8 +521,8 @@ public final class Static4 { Static164.anInt3985 = -1; return true; } else { - @Pc(1814) Class3_Sub4 local1814; - @Pc(1804) Class3_Sub4 local1804; + @Pc(1814) ServerActiveProperties local1814; + @Pc(1804) ServerActiveProperties local1804; if (Static164.anInt3985 == 9) { local133 = Static57.aClass3_Sub15_Sub1_3.method2207(); local786 = Static57.aClass3_Sub15_Sub1_3.method2208(); @@ -538,14 +538,14 @@ public final class Static4 { if (Static248.method3288(local864)) { for (local277 = local1146; local277 <= local171; local277++) { local904 = (long) local277 + ((long) local786 << 32); - local1804 = (Class3_Sub4) Static210.aClass133_21.method3863(local904); + local1804 = (ServerActiveProperties) Static210.aClass133_21.method3863(local904); if (local1804 != null) { - local1814 = new Class3_Sub4(local1804.anInt546, local133); + local1814 = new ServerActiveProperties(local1804.anInt546, local133); local1804.method4658(); } else if (local277 == -1) { - local1814 = new Class3_Sub4(Static5.method32(local786).aClass3_Sub4_1.anInt546, local133); + local1814 = new ServerActiveProperties(Static5.method32(local786).aClass3_Sub4_1.anInt546, local133); } else { - local1814 = new Class3_Sub4(0, local133); + local1814 = new ServerActiveProperties(0, local133); } Static210.aClass133_21.method3862(local1814, local904); } @@ -1400,14 +1400,14 @@ public final class Static4 { if (Static248.method3288(local133)) { for (local277 = local171; local277 <= local786; local277++) { local904 = ((long) local864 << 32) + ((long) local277); - local1804 = (Class3_Sub4) Static210.aClass133_21.method3863(local904); + local1804 = (ServerActiveProperties) Static210.aClass133_21.method3863(local904); if (local1804 != null) { - local1814 = new Class3_Sub4(local1146, local1804.anInt540); + local1814 = new ServerActiveProperties(local1146, local1804.anInt540); local1804.method4658(); } else if (local277 == -1) { - local1814 = new Class3_Sub4(local1146, Static5.method32(local864).aClass3_Sub4_1.anInt540); + local1814 = new ServerActiveProperties(local1146, Static5.method32(local864).aClass3_Sub4_1.anInt540); } else { - local1814 = new Class3_Sub4(local1146, -1); + local1814 = new ServerActiveProperties(local1146, -1); } Static210.aClass133_21.method3862(local1814, local904); } diff --git a/client/src/main/java/Static45.java b/client/src/main/java/Static45.java index 4660f9d..e418449 100644 --- a/client/src/main/java/Static45.java +++ b/client/src/main/java/Static45.java @@ -8,7 +8,7 @@ public final class Static45 { public static final JagString[] aClass100Array53 = new JagString[5]; @OriginalMember(owner = "client!di", name = "F", descriptor = "Lclient!bf;") - public static final Class3_Sub4 aClass3_Sub4_2 = new Class3_Sub4(0, -1); + public static final ServerActiveProperties aClass3_Sub4_2 = new ServerActiveProperties(0, -1); @OriginalMember(owner = "client!di", name = "H", descriptor = "Z") public static boolean aBoolean84 = false; diff --git a/client/src/main/java/Static7.java b/client/src/main/java/Static7.java index 1fcce8f..8bca56d 100644 --- a/client/src/main/java/Static7.java +++ b/client/src/main/java/Static7.java @@ -79,7 +79,7 @@ public final class Static7 { local93 = Static196.anIntArray408[Static231.anInt5204 - 1]; local99 = Static56.anIntArray142[Static231.anInt5204 - 1]; @Pc(103) Class13 local103 = Static5.method32(local99); - @Pc(106) Class3_Sub4 local106 = Static36.method940(local103); + @Pc(106) ServerActiveProperties local106 = Static36.method940(local103); if (local106.method511() || local106.method504()) { Static78.anInt2145 = 0; Static123.aBoolean155 = false;