diff --git a/client/src/main/java/Static110.java b/client/src/main/java/Static110.java index 352db6c..7d2dc5e 100644 --- a/client/src/main/java/Static110.java +++ b/client/src/main/java/Static110.java @@ -8,12 +8,12 @@ public final class Static110 { public static final SoftLruHashTable aClass99_15 = new SoftLruHashTable(4); @OriginalMember(owner = "client!ih", name = "a", descriptor = "(III)Lclient!jh;") - public static Class77 method2276(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + public static Wall method2276(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; if (local7 == null) { return null; } else { - @Pc(14) Class77 local14 = local7.aClass77_1; + @Pc(14) Wall local14 = local7.aClass77_1; local7.aClass77_1 = null; return local14; } diff --git a/client/src/main/java/Static192.java b/client/src/main/java/Static192.java index 597099f..5b3cdd1 100644 --- a/client/src/main/java/Static192.java +++ b/client/src/main/java/Static192.java @@ -54,7 +54,7 @@ public final class Static192 { @Pc(159) Entity local159 = null; @Pc(164) int local164 = Static133.anIntArray453[local17.anInt1198]; if (local164 == 0) { - @Pc(176) Class77 local176 = Static262.method4509(Static55.anInt1735, local17.anInt1190, local17.anInt1204); + @Pc(176) Wall local176 = Static262.method4509(Static55.anInt1735, local17.anInt1190, local17.anInt1204); if (local176 != null) { local159 = local176.aClass8_5; } diff --git a/client/src/main/java/Static220.java b/client/src/main/java/Static220.java index 0223ebf..53b0255 100644 --- a/client/src/main/java/Static220.java +++ b/client/src/main/java/Static220.java @@ -125,7 +125,7 @@ public final class Static220 { for (@Pc(11) int local11 = 0; local11 < Static99.anInt2550; local11++) { @Pc(22) Tile local22 = Static130.aClass3_Sub5ArrayArrayArray1[local1][local6][local11]; if (local22 != null) { - @Pc(27) Class77 local27 = local22.aClass77_1; + @Pc(27) Wall local27 = local22.aClass77_1; if (local27 != null && local27.aClass8_5.method4543()) { Static69.method1544(local27.aClass8_5, local1, local6, local11, 1, 1); if (local27.aClass8_6 != null && local27.aClass8_6.method4543()) { diff --git a/client/src/main/java/Static247.java b/client/src/main/java/Static247.java index 74bfa0d..f201614 100644 --- a/client/src/main/java/Static247.java +++ b/client/src/main/java/Static247.java @@ -62,7 +62,7 @@ public final class Static247 { @Pc(48) int var10; @Pc(907) int var17; @Pc(916) int var18; - @Pc(363) Class77 var22; + @Pc(363) Wall var22; @Pc(469) boolean var24; @Pc(425) Scenery var25; @Pc(1179) Tile var32; @@ -217,7 +217,7 @@ public final class Static247 { } var10 = 0; local65 = 0; - @Pc(616) Class77 local616 = local8.aClass77_1; + @Pc(616) Wall local616 = local8.aClass77_1; @Pc(619) WallDecor local619 = local8.aClass24_1; if (local616 != null || local619 != null) { if (Static167.anInt4069 == local18) { @@ -617,7 +617,7 @@ public final class Static247 { } } } - @Pc(2275) Class77 local2275 = local8.aClass77_1; + @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) { diff --git a/client/src/main/java/Static248.java b/client/src/main/java/Static248.java index ac3e3e4..8615b41 100644 --- a/client/src/main/java/Static248.java +++ b/client/src/main/java/Static248.java @@ -66,7 +66,7 @@ public final class Static248 { local46.anInt663 = 0; if (local32 >= local9 && local32 <= local13 && local37 >= local17 && local37 <= local21) { if (local46.aClass77_1 != null) { - @Pc(103) Class77 local103 = local46.aClass77_1; + @Pc(103) Wall local103 = local46.aClass77_1; local103.aClass8_5.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044); if (local103.aClass8_6 != null) { local103.aClass8_6.method4545(0, local23, local103.anInt3051, local103.anInt3048, local103.anInt3044); diff --git a/client/src/main/java/Static262.java b/client/src/main/java/Static262.java index 7992d4b..a231d3d 100644 --- a/client/src/main/java/Static262.java +++ b/client/src/main/java/Static262.java @@ -45,7 +45,7 @@ public final class Static262 { if (arg4 == null && arg5 == null) { return; } - @Pc(8) Class77 local8 = new Class77(); + @Pc(8) Wall local8 = new Wall(); local8.aLong107 = arg8; local8.anInt3048 = arg1 * 128 + 64; local8.anInt3044 = arg2 * 128 + 64; @@ -63,7 +63,7 @@ public final class Static262 { } @OriginalMember(owner = "client!vf", name = "a", descriptor = "(III)Lclient!jh;") - public static Class77 method4509(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { + public static Wall method4509(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2) { @Pc(7) Tile local7 = Static130.aClass3_Sub5ArrayArrayArray1[arg0][arg1][arg2]; return local7 == null ? null : local7.aClass77_1; } diff --git a/client/src/main/java/Static43.java b/client/src/main/java/Static43.java index a5dbacc..ea553b5 100644 --- a/client/src/main/java/Static43.java +++ b/client/src/main/java/Static43.java @@ -81,7 +81,7 @@ public final class Static43 { @Pc(100) Entity local100 = null; @Pc(102) Entity local102 = null; if (arg3 == 0) { - @Pc(110) Class77 local110 = Static110.method2276(arg2, arg1, arg0); + @Pc(110) Wall local110 = Static110.method2276(arg2, arg1, arg0); if (local110 != null) { local100 = local110.aClass8_5; local102 = local110.aClass8_6; diff --git a/client/src/main/java/Static69.java b/client/src/main/java/Static69.java index e74d571..40957ab 100644 --- a/client/src/main/java/Static69.java +++ b/client/src/main/java/Static69.java @@ -110,7 +110,7 @@ public final class Static69 { @Pc(71) Tile local71 = Static130.aClass3_Sub5ArrayArrayArray1[local17][local28][local39]; if (local71 != null) { @Pc(158) int local158 = (Static83.anIntArrayArrayArray4[local17][local28][local39] + Static83.anIntArrayArrayArray4[local17][local28 + 1][local39] + Static83.anIntArrayArrayArray4[local17][local28][local39 + 1] + Static83.anIntArrayArrayArray4[local17][local28 + 1][local39 + 1]) / 4 - (Static83.anIntArrayArrayArray4[arg1][arg2][arg3] + Static83.anIntArrayArrayArray4[arg1][arg2 + 1][arg3] + Static83.anIntArrayArrayArray4[arg1][arg2][arg3 + 1] + Static83.anIntArrayArrayArray4[arg1][arg2 + 1][arg3 + 1]) / 4; - @Pc(161) Class77 local161 = local71.aClass77_1; + @Pc(161) Wall local161 = local71.aClass77_1; if (local161 != null) { if (local161.aClass8_5.method4543()) { arg0.method4544(local161.aClass8_5, (local28 - arg2) * 128 + (1 - arg4) * 64, local158, (local39 - arg3) * 128 + (1 - arg5) * 64, local1); diff --git a/client/src/main/java/Static92.java b/client/src/main/java/Static92.java index a72c71c..922f7ad 100644 --- a/client/src/main/java/Static92.java +++ b/client/src/main/java/Static92.java @@ -41,7 +41,7 @@ public final class Static92 { } @Pc(38) int local38; if (arg4 == 0) { - @Pc(28) Class77 local28 = Static262.method4509(arg0, arg5, arg3); + @Pc(28) Wall local28 = Static262.method4509(arg0, arg5, arg3); if (local28 != null) { local38 = Integer.MAX_VALUE & (int) (local28.aLong107 >>> 32); if (arg2 == 2) { diff --git a/client/src/main/java/Tile.java b/client/src/main/java/Tile.java index ed0bf9a..5d0fa13 100644 --- a/client/src/main/java/Tile.java +++ b/client/src/main/java/Tile.java @@ -33,7 +33,7 @@ public final class Tile extends Node { public WallDecor aClass24_1; @OriginalMember(owner = "client!bj", name = "K", descriptor = "Lclient!jh;") - public Class77 aClass77_1; + public Wall aClass77_1; @OriginalMember(owner = "client!bj", name = "M", descriptor = "Lclient!bj;") public Tile aClass3_Sub5_1; diff --git a/client/src/main/java/Class77.java b/client/src/main/java/Wall.java similarity index 96% rename from client/src/main/java/Class77.java rename to client/src/main/java/Wall.java index 2f4b6c0..6df883b 100644 --- a/client/src/main/java/Class77.java +++ b/client/src/main/java/Wall.java @@ -2,7 +2,7 @@ import org.openrs2.deob.annotation.OriginalClass; import org.openrs2.deob.annotation.OriginalMember; @OriginalClass("client!jh") -public final class Class77 { +public final class Wall { @OriginalMember(owner = "client!jh", name = "a", descriptor = "I") public int anInt3044;