2009Scape/rt4-client
1
0
Fork 0
mirror of https://gitlab.com/2009scape/rt4-client.git synced 2025-12-19 21:10:19 -07:00
Code Issues Projects Releases Packages Wiki Activity

Rename Class97 to CollisionMap

Browse source
This commit is contained in:
Pazaz 2022-04-19 06:21:34 -04:00
parent 19b4a8b710
commit 0abb56de8b
10 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/main/java/Class97.java → client/src/main/java/CollisionMap.java
View file

@ -4,7 +4,7 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc; import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!mj") @OriginalClass("client!mj")
public final class Class97 { public final class CollisionMap {
@OriginalMember(owner = "client!mj", name = "k", descriptor = "I") @OriginalMember(owner = "client!mj", name = "k", descriptor = "I")
private final int anInt3904; private final int anInt3904;
@ -22,7 +22,7 @@ public final class Class97 {
public final int[][] anIntArrayArray30; public final int[][] anIntArrayArray30;
@OriginalMember(owner = "client!mj", name = "<init>", descriptor = "(II)V") @OriginalMember(owner = "client!mj", name = "<init>", descriptor = "(II)V")
public Class97(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) { public CollisionMap(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
this.anInt3904 = arg1; this.anInt3904 = arg1;
this.anInt3907 = 0; this.anInt3907 = 0;
this.anInt3912 = 0; this.anInt3912 = 0;

4
client/src/main/java/Static124.java
View file

@ -44,7 +44,7 @@ public final class Static124 {
} }
@OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V") @OriginalMember(owner = "client!jk", name = "a", descriptor = "(IZ[BII[Lclient!mj;)V")
public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) Class97[] arg4) { public static void method2437(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(5) CollisionMap[] arg4) {
@Pc(10) Buffer local10 = new Buffer(arg2); @Pc(10) Buffer local10 = new Buffer(arg2);
@Pc(12) int local12 = -1; @Pc(12) int local12 = -1;
while (true) { while (true) {
@ -69,7 +69,7 @@ public final class Static124 {
@Pc(72) int local72 = arg0 + local56; @Pc(72) int local72 = arg0 + local56;
@Pc(76) int local76 = local46 + arg3; @Pc(76) int local76 = local46 + arg3;
if (local72 > 0 && local76 > 0 && local72 < 103 && local76 < 103) { if (local72 > 0 && local76 > 0 && local72 < 103 && local76 < 103) {
@Pc(90) Class97 local90 = null; @Pc(90) CollisionMap local90 = null;
if (!arg1) { if (!arg1) {
@Pc(95) int local95 = local50; @Pc(95) int local95 = local50;
if ((Static12.aByteArrayArrayArray2[1][local72][local76] & 0x2) == 2) { if ((Static12.aByteArrayArrayArray2[1][local72][local76] & 0x2) == 2) {

2
client/src/main/java/Static148.java
View file

@ -32,7 +32,7 @@ public final class Static148 {
public static Class100 aClass100_675 = aClass100_678; public static Class100 aClass100_675 = aClass100_678;
@OriginalMember(owner = "client!li", name = "h", descriptor = "[Lclient!mj;") @OriginalMember(owner = "client!li", name = "h", descriptor = "[Lclient!mj;")
public static final Class97[] aClass97Array1 = new Class97[4]; public static final CollisionMap[] aClass97Array1 = new CollisionMap[4];
@OriginalMember(owner = "client!li", name = "i", descriptor = "Lclient!na;") @OriginalMember(owner = "client!li", name = "i", descriptor = "Lclient!na;")
public static Class100 aClass100_676 = aClass100_673; public static Class100 aClass100_676 = aClass100_673;

2
client/src/main/java/Static185.java
View file

@ -27,7 +27,7 @@ public final class Static185 {
} }
@OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V") @OriginalMember(owner = "client!p", name = "a", descriptor = "(IZIZLclient!mj;IIIBII)V")
public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) Class97 arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) { public static void method3397(@OriginalArg(0) int arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) boolean arg3, @OriginalArg(4) CollisionMap arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) int arg9) {
if (arg1 && !Static138.method2697() && (Static12.aByteArrayArrayArray2[0][arg7][arg8] & 0x2) == 0) { if (arg1 && !Static138.method2697() && (Static12.aByteArrayArrayArray2[0][arg7][arg8] & 0x2) == 0) {
if ((Static12.aByteArrayArrayArray2[arg2][arg7][arg8] & 0x10) != 0) { if ((Static12.aByteArrayArrayArray2[arg2][arg7][arg8] & 0x10) != 0) {
return; return;

4
client/src/main/java/Static217.java
View file

@ -134,7 +134,7 @@ public final class Static217 {
} }
@OriginalMember(owner = "client!rj", name = "a", descriptor = "([Lclient!mj;I[BIIIIZIIB)V") @OriginalMember(owner = "client!rj", name = "a", descriptor = "([Lclient!mj;I[BIIIIZIIB)V")
public static void method3771(@OriginalArg(0) Class97[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) { public static void method3771(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) int arg1, @OriginalArg(2) byte[] arg2, @OriginalArg(3) int arg3, @OriginalArg(4) int arg4, @OriginalArg(5) int arg5, @OriginalArg(6) int arg6, @OriginalArg(7) boolean arg7, @OriginalArg(8) int arg8, @OriginalArg(9) int arg9) {
@Pc(7) int local7 = -1; @Pc(7) int local7 = -1;
@Pc(12) Buffer local12 = new Buffer(arg2); @Pc(12) Buffer local12 = new Buffer(arg2);
while (true) { while (true) {
@ -161,7 +161,7 @@ public final class Static217 {
@Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.anInt4403, local103.anInt4397, local56 & 0x7) + arg5; @Pc(120) int local120 = Static52.method1286(local50 & 0x7, arg4, local72, local103.anInt4403, local103.anInt4397, local56 & 0x7) + arg5;
@Pc(137) int local137 = Static241.method4541(local103.anInt4397, arg4, local103.anInt4403, local56 & 0x7, local72, local50 & 0x7) + arg6; @Pc(137) int local137 = Static241.method4541(local103.anInt4397, arg4, local103.anInt4403, local56 & 0x7, local72, local50 & 0x7) + arg6;
if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) { if (local120 > 0 && local137 > 0 && local120 < 103 && local137 < 103) {
@Pc(154) Class97 local154 = null; @Pc(154) CollisionMap local154 = null;
if (!arg7) { if (!arg7) {
@Pc(159) int local159 = arg1; @Pc(159) int local159 = arg1;
if ((Static12.aByteArrayArrayArray2[1][local120][local137] & 0x2) == 2) { if ((Static12.aByteArrayArrayArray2[1][local120][local137] & 0x2) == 2) {

2
client/src/main/java/Static245.java
View file

@ -82,7 +82,7 @@ public final class Static245 {
} }
@OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V") @OriginalMember(owner = "client!tm", name = "a", descriptor = "(III[Lclient!mj;IB[BIIIZ)V")
public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) Class97[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) { public static void method4228(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) CollisionMap[] arg3, @OriginalArg(4) int arg4, @OriginalArg(6) byte[] arg5, @OriginalArg(7) int arg6, @OriginalArg(8) int arg7, @OriginalArg(9) int arg8, @OriginalArg(10) boolean arg9) {
@Pc(17) int local17; @Pc(17) int local17;
if (!arg9) { if (!arg9) {
for (@Pc(10) int local10 = 0; local10 < 8; local10++) { for (@Pc(10) int local10 = 0; local10 < 8; local10++) {

2
client/src/main/java/Static269.java
View file

@ -42,7 +42,7 @@ public final class Static269 {
} }
@OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V") @OriginalMember(owner = "client!wa", name = "a", descriptor = "([Lclient!mj;ZIIIII[B)V")
public static void method2203(@OriginalArg(0) Class97[] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) byte[] arg6) { public static void method2203(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) int arg5, @OriginalArg(7) byte[] arg6) {
@Pc(14) int local14; @Pc(14) int local14;
@Pc(21) int local21; @Pc(21) int local21;
if (!arg1) { if (!arg1) {

2
client/src/main/java/Static43.java
View file

@ -57,7 +57,7 @@ public final class Static43 {
} }
@OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V") @OriginalMember(owner = "client!dg", name = "a", descriptor = "(IIIIIILclient!mj;)V")
public static void method1144(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) Class97 arg5) { public static void method1144(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2, @OriginalArg(4) int arg3, @OriginalArg(5) int arg4, @OriginalArg(6) CollisionMap arg5) {
@Pc(9) long local9 = 0L; @Pc(9) long local9 = 0L;
if (arg3 == 0) { if (arg3 == 0) {
local9 = Static265.method4521(arg2, arg1, arg0); local9 = Static265.method4521(arg2, arg1, arg0);

2
client/src/main/java/Static45.java
View file

@ -17,7 +17,7 @@ public final class Static45 {
public static final Class99 aClass99_6 = new Class99(32); public static final Class99 aClass99_6 = new Class99(32);
@OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V") @OriginalMember(owner = "client!di", name = "a", descriptor = "([Lclient!mj;ZI)V")
public static void method1169(@OriginalArg(0) Class97[] arg0, @OriginalArg(1) boolean arg1) { public static void method1169(@OriginalArg(0) CollisionMap[] arg0, @OriginalArg(1) boolean arg1) {
@Pc(10) int local10; @Pc(10) int local10;
@Pc(15) int local15; @Pc(15) int local15;
if (!arg1) { if (!arg1) {

2
client/src/main/java/client.java
View file

@ -660,7 +660,7 @@ public final class client extends GameShell {
if (Static166.anInt4051 == 10) { if (Static166.anInt4051 == 10) {
Static120.method2392(); Static120.method2392();
for (local98 = 0; local98 < 4; local98++) { for (local98 = 0; local98 < 4; local98++) {
Static148.aClass97Array1[local98] = new Class97(104, 104); Static148.aClass97Array1[local98] = new CollisionMap(104, 104);
} }
Static199.anInt4670 = 10; Static199.anInt4670 = 10;
Static166.anInt4051 = 30; Static166.anInt4051 = 30;