Rename Class3_Sub2_Sub14 to InvType

This commit is contained in:
Pazaz 2022-04-23 14:59:10 -04:00
parent bf151a0e12
commit a169470107
50 changed files with 507 additions and 507 deletions

View file

@ -61,7 +61,7 @@ public final class Class45 {
@Pc(1) long local1 = 0L;
if ((arg1 & 0x7F) == 0 || (arg3 & 0x7F) == 0) {
local1 = arg1 + (arg3 << 16);
@Pc(23) IntNode local23 = (IntNode) this.aClass133_4.method3863(local1);
@Pc(23) IntNode local23 = (IntNode) this.aClass133_4.get(local1);
if (local23 != null) {
return local23.anInt3141;
}

View file

@ -55,7 +55,7 @@ public final class EnumType extends SecondaryNode {
if (this.aClass133_16 == null) {
return this.aClass100_766;
} else {
@Pc(26) StringNode local26 = (StringNode) this.aClass133_16.method3863((long) arg0);
@Pc(26) StringNode local26 = (StringNode) this.aClass133_16.get((long) arg0);
return local26 == null ? this.aClass100_766 : local26.aClass100_980;
}
}
@ -68,7 +68,7 @@ public final class EnumType extends SecondaryNode {
if (this.aClass133_17 == null) {
this.method3087();
}
for (@Pc(38) Class3_Sub13 local38 = (Class3_Sub13) this.aClass133_17.method3863(arg0.method3118()); local38 != null; local38 = (Class3_Sub13) this.aClass133_17.method3867()) {
for (@Pc(38) Class3_Sub13 local38 = (Class3_Sub13) this.aClass133_17.get(arg0.method3118()); local38 != null; local38 = (Class3_Sub13) this.aClass133_17.method3867()) {
if (local38.aClass100_503.strEquals(arg0)) {
return true;
}
@ -90,7 +90,7 @@ public final class EnumType extends SecondaryNode {
if (this.aClass133_16 == null) {
return this.anInt3960;
} else {
@Pc(18) IntNode local18 = (IntNode) this.aClass133_16.method3863((long) arg0);
@Pc(18) IntNode local18 = (IntNode) this.aClass133_16.get((long) arg0);
return local18 == null ? this.anInt3960 : local18.anInt3141;
}
}
@ -103,7 +103,7 @@ public final class EnumType extends SecondaryNode {
if (this.aClass133_17 == null) {
this.method3091();
}
@Pc(34) IntNode local34 = (IntNode) this.aClass133_17.method3863((long) arg0);
@Pc(34) IntNode local34 = (IntNode) this.aClass133_17.get((long) arg0);
return local34 != null;
}

View file

@ -130,7 +130,7 @@ public final class GlTile extends Node {
@Pc(1) long local1 = 0L;
if ((arg0 & 0x7F) == 0 || (arg2 & 0x7F) == 0) {
local1 = (long) (arg0 + (arg2 << 16)) + ((long) arg6 << 32);
@Pc(28) IntNode local28 = (IntNode) this.aClass133_8.method3863(local1);
@Pc(28) IntNode local28 = (IntNode) this.aClass133_8.get(local1);
if (local28 != null) {
if (arg1 < this.anIntArray230[local28.anInt3141]) {
this.anIntArray230[local28.anInt3141] = arg1;

View file

@ -89,7 +89,7 @@ public final class HashTable {
}
@OriginalMember(owner = "client!sc", name = "a", descriptor = "(JI)Lclient!ab;")
public final Node method3863(@OriginalArg(0) long arg0) {
public final Node get(@OriginalArg(0) long arg0) {
this.aLong168 = arg0;
@Pc(24) Node local24 = this.aClass3Array1[(int) (arg0 & (long) (this.anInt5023 - 1))];
for (this.aClass3_192 = local24.aClass3_222; this.aClass3_192 != local24; this.aClass3_192 = this.aClass3_192.aClass3_222) {

View file

@ -5,7 +5,7 @@ import org.openrs2.deob.annotation.OriginalMember;
public final class Inv extends Node {
@OriginalMember(owner = "client!qe", name = "p", descriptor = "[I")
public int[] anIntArray420 = new int[] { -1 };
public int[] objectIds = new int[] { -1 };
@OriginalMember(owner = "client!qe", name = "u", descriptor = "[I")
public int[] anIntArray422 = new int[] { 0 };

View file

@ -4,13 +4,13 @@ import org.openrs2.deob.annotation.OriginalMember;
import org.openrs2.deob.annotation.Pc;
@OriginalClass("client!md")
public final class Class3_Sub2_Sub14 extends SecondaryNode {
public final class InvType extends SecondaryNode {
@OriginalMember(owner = "client!md", name = "K", descriptor = "I")
public int anInt3706 = 0;
public int size = 0;
@OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!wa;I)V")
public final void method2927(@OriginalArg(0) Buffer arg0) {
public final void decode(@OriginalArg(0) Buffer arg0) {
while (true) {
@Pc(10) int local10 = arg0.g1();
if (local10 == 0) {
@ -23,7 +23,7 @@ public final class Class3_Sub2_Sub14 extends SecondaryNode {
@OriginalMember(owner = "client!md", name = "a", descriptor = "(Lclient!wa;IZ)V")
private void method2931(@OriginalArg(0) Buffer arg0, @OriginalArg(1) int arg1) {
if (arg1 == 2) {
this.anInt3706 = arg0.g2();
this.size = arg0.g2();
}
}
}

View file

@ -701,7 +701,7 @@ public final class JagString implements StringInterface {
if (Static148.aClass133_13 == null) {
Static148.aClass133_13 = new HashTable(4096);
} else {
for (local30 = (StringNode) Static148.aClass133_13.method3863(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.method3867()) {
for (local30 = (StringNode) Static148.aClass133_13.get(local9); local30 != null; local30 = (StringNode) Static148.aClass133_13.method3867()) {
if (this.strEquals(local30.aClass100_980)) {
return local30.aClass100_980;
}

View file

@ -298,7 +298,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
@OriginalMember(owner = "client!bg", name = "b", descriptor = "(II)I")
@Override
public final int method524(@OriginalArg(0) int arg0) {
@Pc(15) Js5Request local15 = (Js5Request) this.aClass133_1.method3863((long) arg0);
@Pc(15) Js5Request local15 = (Js5Request) this.aClass133_1.get((long) arg0);
return local15 == null ? 0 : local15.method3553();
}
@ -309,7 +309,7 @@ public final class Js5CachedResourceProvider extends Js5ResourceProvider {
@OriginalMember(owner = "client!bg", name = "a", descriptor = "(III)Lclient!il;")
private Js5Request method536(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1) {
@Pc(13) Js5Request local13 = (Js5Request) this.aClass133_1.method3863((long) arg1);
@Pc(13) Js5Request local13 = (Js5Request) this.aClass133_1.get((long) arg1);
if (local13 != null && arg0 == 0 && !local13.aBoolean225 && local13.aBoolean226) {
local13.method4658();
local13 = null;

View file

@ -163,7 +163,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
@OriginalMember(owner = "client!nk", name = "i", descriptor = "(II)Lclient!uh;")
private GlTexture method3242(@OriginalArg(0) int arg0) {
@Pc(14) GlTexture local14 = (GlTexture) this.aClass54_12.method1806((long) arg0);
@Pc(14) GlTexture local14 = (GlTexture) this.aClass54_12.get((long) arg0);
if (local14 != null) {
return local14;
}
@ -173,7 +173,7 @@ public final class Js5GlTextureProvider implements TextureProvider {
} else {
@Pc(41) Buffer local41 = new Buffer(local30);
local14 = new GlTexture(local41);
this.aClass54_12.method1811(local14, (long) arg0);
this.aClass54_12.put(local14, (long) arg0);
return local14;
}
}
@ -204,10 +204,10 @@ public final class Js5GlTextureProvider implements TextureProvider {
@OriginalMember(owner = "client!nk", name = "j", descriptor = "(II)Lclient!sd;")
private GlSolidColorTexture method3244(@OriginalArg(1) int arg0) {
@Pc(19) GlSolidColorTexture local19 = (GlSolidColorTexture) this.aClass54_11.method1806((long) arg0);
@Pc(19) GlSolidColorTexture local19 = (GlSolidColorTexture) this.aClass54_11.get((long) arg0);
if (local19 == null) {
local19 = new GlSolidColorTexture(this.aShortArray59[arg0] & 0xFFFF);
this.aClass54_11.method1811(local19, (long) arg0);
this.aClass54_11.put(local19, (long) arg0);
return local19;
} else {
return local19;

View file

@ -377,7 +377,7 @@ public final class LocType {
if (this.aClass133_19 == null) {
return arg0;
} else {
@Pc(21) IntNode local21 = (IntNode) this.aClass133_19.method3863((long) arg1);
@Pc(21) IntNode local21 = (IntNode) this.aClass133_19.get((long) arg1);
return local21 == null ? arg0 : local21.anInt3141;
}
}
@ -910,7 +910,7 @@ public final class LocType {
if (this.aClass133_19 == null) {
return arg0;
} else {
@Pc(26) StringNode local26 = (StringNode) this.aClass133_19.method3863((long) arg1);
@Pc(26) StringNode local26 = (StringNode) this.aClass133_19.get((long) arg1);
return local26 == null ? arg0 : local26.aClass100_980;
}
}

View file

@ -33,8 +33,8 @@ public final class LruHashTable {
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(JI)Lclient!rg;")
public final SecondaryNode method1806(@OriginalArg(0) long arg0) {
@Pc(16) SecondaryNode local16 = (SecondaryNode) this.aClass133_5.method3863(arg0);
public final SecondaryNode get(@OriginalArg(0) long arg0) {
@Pc(16) SecondaryNode local16 = (SecondaryNode) this.aClass133_5.get(arg0);
if (local16 != null) {
this.aClass16_1.method798(local16);
}
@ -47,7 +47,7 @@ public final class LruHashTable {
}
@OriginalMember(owner = "client!gn", name = "a", descriptor = "(Lclient!rg;JB)V")
public final void method1811(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) long arg1) {
public final void put(@OriginalArg(0) SecondaryNode arg0, @OriginalArg(1) long arg1) {
if (this.anInt2314 == 0) {
@Pc(14) SecondaryNode local14 = this.aClass16_1.method796();
local14.method4658();

View file

@ -112,7 +112,7 @@ public final class MidiPcmStream extends PcmStream {
@Pc(20) int[] local20 = new int[] { 22050 };
for (@Pc(34) Class3_Sub9 local34 = (Class3_Sub9) arg0.aClass133_22.method3859(); local34 != null; local34 = (Class3_Sub9) arg0.aClass133_22.method3861()) {
@Pc(40) int local40 = (int) local34.uid;
@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.method3863((long) local40);
@Pc(48) MidiInstrument local48 = (MidiInstrument) this.aClass133_23.get((long) local40);
if (local48 == null) {
local48 = Static116.method2320(arg1, local40);
if (local48 == null) {
@ -276,7 +276,7 @@ public final class MidiPcmStream extends PcmStream {
}
}
}
@Pc(118) MidiInstrument local118 = (MidiInstrument) this.aClass133_23.method3863((long) this.anIntArray506[arg1]);
@Pc(118) MidiInstrument local118 = (MidiInstrument) this.aClass133_23.get((long) this.anIntArray506[arg1]);
if (local118 == null) {
return;
}

View file

@ -209,7 +209,7 @@ public final class NpcType {
if (this.aClass133_15 == null) {
return arg1;
} else {
@Pc(18) IntNode local18 = (IntNode) this.aClass133_15.method3863((long) arg0);
@Pc(18) IntNode local18 = (IntNode) this.aClass133_15.get((long) arg0);
return local18 == null ? arg1 : local18.anInt3141;
}
}
@ -479,7 +479,7 @@ public final class NpcType {
if (this.aClass133_15 == null) {
return arg1;
} else {
@Pc(18) StringNode local18 = (StringNode) this.aClass133_15.method3863((long) arg0);
@Pc(18) StringNode local18 = (StringNode) this.aClass133_15.get((long) arg0);
return local18 == null ? arg1 : local18.aClass100_980;
}
}

View file

@ -207,7 +207,7 @@ public final class ObjType {
if (this.aClass133_6 == null) {
return arg0;
} else {
@Pc(21) StringNode local21 = (StringNode) this.aClass133_6.method3863((long) arg1);
@Pc(21) StringNode local21 = (StringNode) this.aClass133_6.get((long) arg1);
return local21 == null ? arg0 : local21.aClass100_980;
}
}
@ -523,7 +523,7 @@ public final class ObjType {
if (this.aClass133_6 == null) {
return arg0;
} else {
@Pc(25) IntNode local25 = (IntNode) this.aClass133_6.method3863((long) arg1);
@Pc(25) IntNode local25 = (IntNode) this.aClass133_6.get((long) arg1);
return local25 == null ? arg0 : local25.anInt3141;
}
}

View file

@ -46,7 +46,7 @@ public final class SoftLruHashTable {
@OriginalMember(owner = "client!n", name = "a", descriptor = "(JB)V")
public final void method3098(@OriginalArg(0) long arg0) {
@Pc(6) ReferenceNode local6 = (ReferenceNode) this.aClass133_18.method3863(arg0);
@Pc(6) ReferenceNode local6 = (ReferenceNode) this.aClass133_18.get(arg0);
if (local6 != null) {
local6.method4658();
local6.method4365();
@ -107,7 +107,7 @@ public final class SoftLruHashTable {
@OriginalMember(owner = "client!n", name = "b", descriptor = "(JB)Ljava/lang/Object;")
public final Object method3106(@OriginalArg(0) long arg0) {
@Pc(12) ReferenceNode local12 = (ReferenceNode) this.aClass133_18.method3863(arg0);
@Pc(12) ReferenceNode local12 = (ReferenceNode) this.aClass133_18.get(arg0);
if (local12 == null) {
return null;
}

View file

@ -357,7 +357,7 @@ 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.method3863((long) local179);
@Pc(187) Class3_Sub9 local187 = (Class3_Sub9) this.aClass133_22.get((long) local179);
if (local187 == null) {
local187 = new Class3_Sub9(new byte[128]);
this.aClass133_22.method3862(local187, (long) local179);

View file

@ -29,7 +29,7 @@ public final class SoundBank {
@Pc(21) int local21 = arg2 ^ (arg1 >>> 12 | arg1 << 4 & 0xFFF3);
@Pc(27) int local27 = local21 | arg1 << 16;
@Pc(30) long local30 = (long) local27;
@Pc(37) PcmSound local37 = (PcmSound) this.aClass133_12.method3863(local30);
@Pc(37) PcmSound local37 = (PcmSound) this.aClass133_12.get(local30);
if (local37 != null) {
return local37;
} else if (arg0 == null || arg0[0] > 0) {
@ -64,11 +64,11 @@ public final class SoundBank {
@Pc(15) int local15 = arg2 ^ (arg0 >>> 12 | arg0 << 4 & 0xFFF3);
@Pc(21) int local21 = local15 | arg0 << 16;
@Pc(26) long local26 = (long) local21 ^ 0x100000000L;
@Pc(33) PcmSound local33 = (PcmSound) this.aClass133_12.method3863(local26);
@Pc(33) PcmSound local33 = (PcmSound) this.aClass133_12.get(local26);
if (local33 != null) {
return local33;
} else if (arg1 == null || arg1[0] > 0) {
@Pc(53) VorbisSound local53 = (VorbisSound) this.aClass133_11.method3863(local26);
@Pc(53) VorbisSound local53 = (VorbisSound) this.aClass133_11.get(local26);
if (local53 == null) {
local53 = Static117.method2345(this.aClass153_53, arg0, arg2);
if (local53 == null) {

View file

@ -42,7 +42,7 @@ public final class Static102 {
@OriginalMember(owner = "client!hn", name = "f", descriptor = "(B)V")
public static void method2073() {
Static20.aClass133_2 = new HashTable(32);
Static20.objectContainerCache = new HashTable(32);
}
@OriginalMember(owner = "client!hn", name = "a", descriptor = "(Lclient!ve;ILclient!ve;)V")

View file

@ -19,20 +19,20 @@ public final class Static11 {
}
@OriginalMember(owner = "client!ba", name = "a", descriptor = "(IB)I")
public static int method446(@OriginalArg(0) int arg0) {
public static int getFreeSpaces(@OriginalArg(0) int arg0) {
if (arg0 < 0) {
return 0;
}
@Pc(17) Inv local17 = (Inv) Static20.aClass133_2.method3863((long) arg0);
@Pc(17) Inv local17 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local17 == null) {
return Static246.method4241(arg0).anInt3706;
return Static246.list(arg0).size;
}
@Pc(31) int local31 = 0;
for (@Pc(33) int local33 = 0; local33 < local17.anIntArray420.length; local33++) {
if (local17.anIntArray420[local33] == -1) {
local31++;
@Pc(31) int freeSpaces = 0;
for (@Pc(33) int id = 0; id < local17.objectIds.length; id++) {
if (local17.objectIds[id] == -1) {
freeSpaces++;
}
}
return local31 + Static246.method4241(arg0).anInt3706 - local17.anIntArray420.length;
return freeSpaces + Static246.list(arg0).size - local17.objectIds.length;
}
}

View file

@ -21,7 +21,7 @@ public final class Static110 {
@OriginalMember(owner = "client!ih", name = "a", descriptor = "(II)Lclient!hn;")
public static ParamType method2277(@OriginalArg(1) int arg0) {
@Pc(6) ParamType local6 = (ParamType) Static272.aClass54_14.method1806((long) arg0);
@Pc(6) ParamType local6 = (ParamType) Static272.aClass54_14.get((long) arg0);
if (local6 != null) {
return local6;
}
@ -30,7 +30,7 @@ public final class Static110 {
if (local30 != null) {
local6.method2076(new Buffer(local30));
}
Static272.aClass54_14.method1811(local6, (long) arg0);
Static272.aClass54_14.put(local6, (long) arg0);
return local6;
}

View file

@ -38,7 +38,7 @@ public final class Static118 {
if (local15.createdComponents != null) {
method2354(local15.id, local15.createdComponents);
}
@Pc(73) Class3_Sub31 local73 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local15.id);
@Pc(73) Class3_Sub31 local73 = (Class3_Sub31) Static119.aClass133_9.get((long) local15.id);
if (local73 != null) {
Static96.method1949(local73.anInt5878);
}

View file

@ -21,7 +21,7 @@ public final class Static123 {
@OriginalMember(owner = "client!jj", name = "a", descriptor = "(BI)Lclient!lk;")
public static StructType method2417(@OriginalArg(1) int arg0) {
@Pc(10) StructType local10 = (StructType) Static231.aClass54_13.method1806((long) arg0);
@Pc(10) StructType local10 = (StructType) Static231.aClass54_13.get((long) arg0);
if (local10 != null) {
return local10;
}
@ -30,7 +30,7 @@ public final class Static123 {
if (local26 != null) {
local10.method2806(new Buffer(local26));
}
Static231.aClass54_13.method1811(local10, (long) arg0);
Static231.aClass54_13.put(local10, (long) arg0);
return local10;
}

View file

@ -43,7 +43,7 @@ public final class Static13 {
@OriginalMember(owner = "client!bc", name = "d", descriptor = "(II)V")
public static void method472(@OriginalArg(0) int arg0) {
@Pc(14) Inv local14 = (Inv) Static20.aClass133_2.method3863((long) arg0);
@Pc(14) Inv local14 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local14 != null) {
local14.method4658();
}

View file

@ -31,10 +31,10 @@ public final class Static14 {
@OriginalMember(owner = "client!bd", name = "a", descriptor = "(BI)V")
public static void method475(@OriginalArg(1) int arg0) {
@Pc(8) Inv local8 = (Inv) Static20.aClass133_2.method3863((long) arg0);
@Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local8 != null) {
for (@Pc(24) int local24 = 0; local24 < local8.anIntArray420.length; local24++) {
local8.anIntArray420[local24] = -1;
for (@Pc(24) int local24 = 0; local24 < local8.objectIds.length; local24++) {
local8.objectIds[local24] = -1;
local8.anIntArray422[local24] = 0;
}
}

View file

@ -38,7 +38,7 @@ public final class Static148 {
@OriginalMember(owner = "client!li", name = "a", descriptor = "(III)V")
public static void method2766(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
Static7.varps[arg0] = arg1;
@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.method3863((long) arg0);
@Pc(21) LongNode local21 = (LongNode) Static199.aClass133_20.get((long) arg0);
if (local21 == null) {
local21 = new LongNode(MonotonicClock.currentTimeMillis() + 500L);
Static199.aClass133_20.method3862(local21, (long) arg0);

View file

@ -37,11 +37,11 @@ public final class Static15 {
@OriginalMember(owner = "client!be", name = "a", descriptor = "(III)I")
public static int method484(@OriginalArg(0) int arg0, @OriginalArg(2) int arg1) {
@Pc(10) Inv local10 = (Inv) Static20.aClass133_2.method3863((long) arg0);
@Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local10 == null) {
return -1;
} else if (arg1 >= 0 && arg1 < local10.anIntArray420.length) {
return local10.anIntArray420[arg1];
} else if (arg1 >= 0 && arg1 < local10.objectIds.length) {
return local10.objectIds[arg1];
} else {
return -1;
}

View file

@ -77,7 +77,7 @@ public final class Static17 {
if (arg0.createdComponents != null) {
Static266.method4190(arg0.id, arg1, local20, local32, arg0.createdComponents);
}
@Pc(66) Class3_Sub31 local66 = (Class3_Sub31) Static119.aClass133_9.method3863((long) arg0.id);
@Pc(66) Class3_Sub31 local66 = (Class3_Sub31) Static119.aClass133_9.get((long) arg0.id);
if (local66 != null) {
Static234.method4017(local32, arg1, local66.anInt5878, local20);
}

View file

@ -76,7 +76,7 @@ public final class Static170 {
@OriginalMember(owner = "client!nh", name = "a", descriptor = "(BII)V")
public static void method2575(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
Static106.anIntArray257[arg1] = arg0;
@Pc(20) LongNode local20 = (LongNode) Static199.aClass133_20.method3863((long) arg1);
@Pc(20) LongNode local20 = (LongNode) Static199.aClass133_20.get((long) arg1);
if (local20 == null) {
local20 = new LongNode(4611686018427387905L);
Static199.aClass133_20.method3862(local20, (long) arg1);

View file

@ -39,17 +39,17 @@ public final class Static178 {
}
@OriginalMember(owner = "client!od", name = "a", descriptor = "(IZII)I")
public static int method3319(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(19) Inv local19 = (Inv) Static20.aClass133_2.method3863((long) arg1);
public static int getTotalParam(@OriginalArg(1) boolean arg0, @OriginalArg(2) int arg1, @OriginalArg(3) int arg2) {
@Pc(19) Inv local19 = (Inv) Static20.objectContainerCache.get((long) arg1);
if (local19 == null) {
return 0;
}
@Pc(27) int local27 = 0;
for (@Pc(29) int local29 = 0; local29 < local19.anIntArray420.length; local29++) {
if (local19.anIntArray420[local29] >= 0 && Static170.anInt3245 > local19.anIntArray420[local29]) {
@Pc(56) ObjType local56 = Static71.method1439(local19.anIntArray420[local29]);
for (@Pc(29) int local29 = 0; local29 < local19.objectIds.length; local29++) {
if (local19.objectIds[local29] >= 0 && Static170.anInt3245 > local19.objectIds[local29]) {
@Pc(56) ObjType local56 = Static71.method1439(local19.objectIds[local29]);
if (local56.aClass133_6 != null) {
@Pc(68) IntNode local68 = (IntNode) local56.aClass133_6.method3863((long) arg2);
@Pc(68) IntNode local68 = (IntNode) local56.aClass133_6.get((long) arg2);
if (local68 != null) {
if (arg0) {
local27 += local19.anIntArray422[local29] * local68.anInt3141;

View file

@ -98,7 +98,7 @@ public final class Static193 {
@Pc(214) long local214 = (long) local196 << 32 | (long) local155;
@Pc(219) int local219 = local135.length / 2;
@Pc(227) long local227 = (long) local155 | (long) local161 << 32;
@Pc(233) GlTile local233 = (GlTile) local103.method3863(local227);
@Pc(233) GlTile local233 = (GlTile) local103.get(local227);
if (local233 == null) {
local233 = new GlTile((local161 >> 16) - 1, (float) (local161 & 0xFFFF), false, arg13 != null, local155);
local103.method3862(local233, local227);
@ -106,7 +106,7 @@ public final class Static193 {
local233.anInt2484++;
local233.anInt2482 += local219;
if (local188 != local227) {
local233 = (GlTile) local103.method3863(local188);
local233 = (GlTile) local103.get(local188);
if (local233 == null) {
local233 = new GlTile((local169 >> 16) - 1, (float) (local169 & 0xFFFF), false, arg13 != null, local155);
local103.method3862(local233, local188);
@ -116,7 +116,7 @@ public final class Static193 {
}
@Pc(340) long local340 = (long) local206 << 32 | (long) local155;
if (local340 != local227 && local340 != local188) {
local233 = (GlTile) local103.method3863(local340);
local233 = (GlTile) local103.get(local340);
if (local233 == null) {
local233 = new GlTile((local206 >> 16) - 1, (float) (local206 & 0xFFFF), false, arg13 != null, local155);
local103.method3862(local233, local340);
@ -125,7 +125,7 @@ public final class Static193 {
local233.anInt2484++;
}
if (local214 != local227 && local188 != local214 && local214 != local340) {
local233 = (GlTile) local103.method3863(local214);
local233 = (GlTile) local103.get(local214);
if (local233 == null) {
local233 = new GlTile((local196 >> 16) - 1, (float) (local196 & 0xFFFF), false, arg13 != null, local155);
local103.method3862(local233, local214);
@ -235,19 +235,19 @@ public final class Static193 {
@Pc(963) int local963 = (local678 >> 16) - 1;
@Pc(969) int local969 = (local655 >> 16) - 1;
@Pc(975) int local975 = (local712 >> 16) - 1;
@Pc(981) GlTile local981 = (GlTile) local103.method3863(local861);
@Pc(981) GlTile local981 = (GlTile) local103.get(local861);
Static53.method1291(arg13, local655 <= local655, Static19.method588(local969, local883, local931), local981, local614, local112, local155, local16, local655 <= local712, arg8, local754 >= local655, arg4, local169, Static19.method588(local969, local925, local957), Static19.method588(local969, local901, local949), local655 <= local678, arg12, arg10, local628, Static19.method588(local969, local909, local939), local574);
@Pc(1050) int local1050 = (local754 >> 16) - 1;
if (local869 != local861) {
local981 = (GlTile) local103.method3863(local869);
local981 = (GlTile) local103.get(local869);
Static53.method1291(arg13, local678 <= local655, Static19.method588(local963, local883, local931), local981, local614, local112, local155, local16, local712 >= local678, arg8, local678 <= local754, arg4, local169, Static19.method588(local963, local925, local957), Static19.method588(local963, local901, local949), local678 <= local678, arg12, arg10, local628, Static19.method588(local963, local909, local939), local574);
}
if (local877 != local861 && local877 != local869) {
local981 = (GlTile) local103.method3863(local877);
local981 = (GlTile) local103.get(local877);
Static53.method1291(arg13, local655 >= local712, Static19.method588(local975, local883, local931), local981, local614, local112, local155, local16, local712 <= local712, arg8, local712 <= local754, arg4, local169, Static19.method588(local975, local925, local957), Static19.method588(local975, local901, local949), local678 >= local712, arg12, arg10, local628, Static19.method588(local975, local909, local939), local574);
}
if (local917 != local861 && local917 != local869 && local917 != local877) {
local981 = (GlTile) local103.method3863(local917);
local981 = (GlTile) local103.get(local917);
Static53.method1291(arg13, local754 <= local655, Static19.method588(local1050, local883, local931), local981, local614, local112, local155, local16, local754 <= local712, arg8, local754 >= local754, arg4, local169, Static19.method588(local1050, local925, local957), Static19.method588(local1050, local901, local949), local678 >= local754, arg12, arg10, local628, Static19.method588(local1050, local909, local939), local574);
}
}

View file

@ -44,7 +44,7 @@ public final class Static2 {
if (local23.createdComponents != null) {
method7(local23.createdComponents, arg1);
}
@Pc(49) Class3_Sub31 local49 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local23.id);
@Pc(49) Class3_Sub31 local49 = (Class3_Sub31) Static119.aClass133_9.get((long) local23.id);
if (local49 != null) {
Static54.method1304(arg1, local49.anInt5878);
}

View file

@ -14,7 +14,7 @@ public final class Static20 {
public static final short[] aShortArray5 = new short[] { -4160, -4163, -8256, -8259, 22461 };
@OriginalMember(owner = "client!bj", name = "v", descriptor = "Lclient!sc;")
public static HashTable aClass133_2 = new HashTable(32);
public static HashTable objectContainerCache = new HashTable(32);
@OriginalMember(owner = "client!bj", name = "V", descriptor = "I")
public static final int anInt671 = 3353893;

View file

@ -27,7 +27,7 @@ public final class Static214 {
@OriginalMember(owner = "client!rg", name = "a", descriptor = "(Lclient!e;I)V")
public static void method4359(@OriginalArg(0) Player arg0) {
@Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.method3863(arg0.aClass100_364.encode37());
@Pc(12) AreaSound local12 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37());
if (local12 == null) {
Static122.method2411(arg0.movementQueueZ[0], null, 0, null, arg0.movementQueueX[0], Static55.level, arg0);
} else {

View file

@ -70,7 +70,7 @@ public final class Static23 {
@OriginalMember(owner = "client!bm", name = "a", descriptor = "(III)I")
public static int method647(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(10) Inv local10 = (Inv) Static20.aClass133_2.method3863((long) arg0);
@Pc(10) Inv local10 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local10 == null) {
return 0;
} else if (arg1 >= 0 && arg1 < local10.anIntArray422.length) {

View file

@ -126,7 +126,7 @@ public final class Static230 {
@OriginalMember(owner = "client!sj", name = "b", descriptor = "(II)Lclient!cb;")
public static QuickChatPhraseType method3953(@OriginalArg(1) int arg0) {
@Pc(10) QuickChatPhraseType local10 = (QuickChatPhraseType) Static249.aClass54_15.method1806((long) arg0);
@Pc(10) QuickChatPhraseType local10 = (QuickChatPhraseType) Static249.aClass54_15.get((long) arg0);
if (local10 != null) {
return local10;
}
@ -143,7 +143,7 @@ public final class Static230 {
if (arg0 >= 32768) {
local10.method763();
}
Static249.aClass54_15.method1811(local10, (long) arg0);
Static249.aClass54_15.put(local10, (long) arg0);
return local10;
}

View file

@ -20,7 +20,7 @@ public final class Static235 {
@OriginalMember(owner = "client!tb", name = "b", descriptor = "(IB)Lclient!bc;")
public static QuickChatCatType method4045(@OriginalArg(0) int arg0) {
@Pc(10) QuickChatCatType local10 = (QuickChatCatType) Static73.aClass54_7.method1806((long) arg0);
@Pc(10) QuickChatCatType local10 = (QuickChatCatType) Static73.aClass54_7.get((long) arg0);
if (local10 != null) {
return local10;
}
@ -37,7 +37,7 @@ public final class Static235 {
if (arg0 >= 32768) {
local10.method465();
}
Static73.aClass54_7.method1811(local10, (long) arg0);
Static73.aClass54_7.put(local10, (long) arg0);
return local10;
}
}

View file

@ -20,7 +20,7 @@ public final class Static238 {
@OriginalMember(owner = "client!te", name = "a", descriptor = "(III)Lclient!da;")
public static DelayedStateChange method4143(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(13) DelayedStateChange local13 = (DelayedStateChange) Static36.aClass133_3.method3863((long) arg1 | (long) arg0 << 32);
@Pc(13) DelayedStateChange local13 = (DelayedStateChange) Static36.aClass133_3.get((long) arg1 | (long) arg0 << 32);
if (local13 == null) {
local13 = new DelayedStateChange(arg0, arg1);
Static36.aClass133_3.method3862(local13, local13.uid);

View file

@ -22,7 +22,7 @@ public final class Static243 {
@OriginalMember(owner = "client!tk", name = "a", descriptor = "(Lclient!sc;ZLclient!wl;)Lclient!hg;")
public static GlTile method4212(@OriginalArg(0) HashTable arg0, @OriginalArg(2) FloType arg1) {
@Pc(23) long local23 = (long) ((arg1.anInt5892 + 1 << 16) + arg1.anInt5885) + ((long) arg1.anInt5897 << 56) + ((long) arg1.anInt5889 << 32);
@Pc(38) GlTile local38 = (GlTile) arg0.method3863(local23);
@Pc(38) GlTile local38 = (GlTile) arg0.get(local23);
if (local38 == null) {
local38 = new GlTile(arg1.anInt5892, (float) arg1.anInt5885, true, false, arg1.anInt5889);
arg0.method3862(local38, local23);

View file

@ -130,17 +130,17 @@ public final class Static246 {
}
@OriginalMember(owner = "client!u", name = "a", descriptor = "(II)Lclient!md;")
public static Class3_Sub2_Sub14 method4241(@OriginalArg(0) int arg0) {
@Pc(16) Class3_Sub2_Sub14 local16 = (Class3_Sub2_Sub14) Static89.aClass54_8.method1806((long) arg0);
if (local16 != null) {
return local16;
public static InvType list(@OriginalArg(0) int id) {
@Pc(16) InvType invType = (InvType) Static89.recentUse.get((long) id);
if (invType != null) {
return invType;
}
@Pc(27) byte[] local27 = Static9.aClass153_2.getFile(5, arg0);
local16 = new Class3_Sub2_Sub14();
if (local27 != null) {
local16.method2927(new Buffer(local27));
@Pc(27) byte[] data = Static9.aClass153_2.getFile(5, id);
invType = new InvType();
if (data != null) {
invType.decode(new Buffer(data));
}
Static89.aClass54_8.method1811(local16, (long) arg0);
return local16;
Static89.recentUse.put(invType, (long) id);
return invType;
}
}

View file

@ -177,7 +177,7 @@ public final class Static253 {
@OriginalMember(owner = "client!ui", name = "a", descriptor = "(IZ)Lclient!ml;")
public static EnumType method4330(@OriginalArg(0) int arg0) {
@Pc(10) EnumType local10 = (EnumType) Static149.aClass54_10.method1806((long) arg0);
@Pc(10) EnumType local10 = (EnumType) Static149.aClass54_10.get((long) arg0);
if (local10 != null) {
return local10;
}
@ -186,7 +186,7 @@ public final class Static253 {
if (local24 != null) {
local10.method3094(new Buffer(local24));
}
Static149.aClass54_10.method1811(local10, (long) arg0);
Static149.aClass54_10.put(local10, (long) arg0);
return local10;
}

View file

@ -18,7 +18,7 @@ public final class Static271 {
@OriginalMember(owner = "client!wc", name = "a", descriptor = "(Lclient!e;I)V")
public static void method4597(@OriginalArg(0) Player arg0) {
@Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.method3863(arg0.aClass100_364.encode37());
@Pc(10) AreaSound local10 = (AreaSound) Static93.aClass133_7.get(arg0.aClass100_364.encode37());
if (local10 == null) {
return;
}

View file

@ -177,7 +177,7 @@ public final class Static278 {
@OriginalMember(owner = "client!wj", name = "a", descriptor = "(BII)I")
public static int method4652(@OriginalArg(1) int arg0, @OriginalArg(2) int arg1) {
@Pc(8) Inv local8 = (Inv) Static20.aClass133_2.method3863((long) arg0);
@Pc(8) Inv local8 = (Inv) Static20.objectContainerCache.get((long) arg0);
if (local8 == null) {
return 0;
} else if (arg1 == -1) {
@ -185,7 +185,7 @@ public final class Static278 {
} else {
@Pc(25) int local25 = 0;
for (@Pc(27) int local27 = 0; local27 < local8.anIntArray422.length; local27++) {
if (arg1 == local8.anIntArray420[local27]) {
if (arg1 == local8.objectIds[local27]) {
local25 += local8.anIntArray422[local27];
}
}

View file

@ -675,27 +675,27 @@ public final class Static280 {
@OriginalMember(owner = "client!wl", name = "a", descriptor = "(IIIIB)V")
public static void method4672(@OriginalArg(0) int arg0, @OriginalArg(1) int arg1, @OriginalArg(2) int arg2, @OriginalArg(3) int arg3) {
@Pc(12) Inv local12 = (Inv) Static20.aClass133_2.method3863((long) arg3);
@Pc(12) Inv local12 = (Inv) Static20.objectContainerCache.get((long) arg3);
if (local12 == null) {
local12 = new Inv();
Static20.aClass133_2.method3862(local12, (long) arg3);
Static20.objectContainerCache.method3862(local12, (long) arg3);
}
if (arg1 >= local12.anIntArray420.length) {
if (arg1 >= local12.objectIds.length) {
@Pc(39) int[] local39 = new int[arg1 + 1];
@Pc(44) int[] local44 = new int[arg1 + 1];
@Pc(46) int local46;
for (local46 = 0; local46 < local12.anIntArray420.length; local46++) {
local39[local46] = local12.anIntArray420[local46];
for (local46 = 0; local46 < local12.objectIds.length; local46++) {
local39[local46] = local12.objectIds[local46];
local44[local46] = local12.anIntArray422[local46];
}
for (local46 = local12.anIntArray420.length; local46 < arg1; local46++) {
for (local46 = local12.objectIds.length; local46 < arg1; local46++) {
local39[local46] = -1;
local44[local46] = 0;
}
local12.anIntArray420 = local39;
local12.objectIds = local39;
local12.anIntArray422 = local44;
}
local12.anIntArray420[arg1] = arg0;
local12.objectIds[arg1] = arg0;
local12.anIntArray422[arg1] = arg2;
}

View file

@ -33,7 +33,7 @@ public final class Static36 {
@OriginalMember(owner = "client!client", name = "b", descriptor = "(Lclient!be;)Lclient!bf;")
public static ServerActiveProperties method940(@OriginalArg(0) Component arg0) {
@Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static210.aClass133_21.method3863(((long) arg0.id << 32) + (long) arg0.createdComponentId);
@Pc(13) ServerActiveProperties local13 = (ServerActiveProperties) Static210.aClass133_21.get(((long) arg0.id << 32) + (long) arg0.createdComponentId);
return local13 == null ? arg0.aClass3_Sub4_1 : local13;
}
@ -494,7 +494,7 @@ public final class Static36 {
if (local9.createdComponents != null) {
method946(local9.createdComponents, local9.id, local61, local63, local65, local67, local50 - local9.anInt489, local55 - local9.scrollY);
}
@Pc(1595) Class3_Sub31 local1595 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local9.id);
@Pc(1595) Class3_Sub31 local1595 = (Class3_Sub31) Static119.aClass133_9.get((long) local9.id);
if (local1595 != null) {
Static57.method1320(local50, local63, local55, local65, local1595.anInt5878, local61, local67);
}

View file

@ -538,7 +538,7 @@ public final class Static4 {
if (Static248.method3288(local864)) {
for (local277 = local1146; local277 <= local171; local277++) {
local904 = (long) local277 + ((long) local786 << 32);
local1804 = (ServerActiveProperties) Static210.aClass133_21.method3863(local904);
local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904);
if (local1804 != null) {
local1814 = new ServerActiveProperties(local1804.anInt546, local133);
local1804.method4658();
@ -681,7 +681,7 @@ public final class Static4 {
local133 = Static57.aClass3_Sub15_Sub1_3.g2();
local786 = Static57.aClass3_Sub15_Sub1_3.g4();
if (Static248.method3288(local133)) {
@Pc(2441) Class3_Sub31 local2441 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local786);
@Pc(2441) Class3_Sub31 local2441 = (Class3_Sub31) Static119.aClass133_9.get((long) local786);
if (local2441 != null) {
Static132.method2605(true, local2441);
}
@ -928,8 +928,8 @@ public final class Static4 {
local786 = Static57.aClass3_Sub15_Sub1_3.g2sub();
local864 = Static57.aClass3_Sub15_Sub1_3.g4rme();
if (Static248.method3288(local786)) {
@Pc(3449) Class3_Sub31 local3449 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local133);
local3456 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local864);
@Pc(3449) Class3_Sub31 local3449 = (Class3_Sub31) Static119.aClass133_9.get((long) local133);
local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local864);
if (local3456 != null) {
Static132.method2605(local3449 == null || local3456.anInt5878 != local3449.anInt5878, local3456);
}
@ -1074,7 +1074,7 @@ public final class Static4 {
local864 = Static57.aClass3_Sub15_Sub1_3.g2sub();
local171 = Static57.aClass3_Sub15_Sub1_3.g2();
if (Static248.method3288(local864)) {
local3456 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local786);
local3456 = (Class3_Sub31) Static119.aClass133_9.get((long) local786);
if (local3456 != null) {
Static132.method2605(local3456.anInt5878 != local171, local3456);
}
@ -1400,7 +1400,7 @@ public final class Static4 {
if (Static248.method3288(local133)) {
for (local277 = local171; local277 <= local786; local277++) {
local904 = ((long) local864 << 32) + ((long) local277);
local1804 = (ServerActiveProperties) Static210.aClass133_21.method3863(local904);
local1804 = (ServerActiveProperties) Static210.aClass133_21.get(local904);
if (local1804 != null) {
local1814 = new ServerActiveProperties(local1146, local1804.anInt540);
local1804.method4658();

View file

@ -379,7 +379,7 @@ public final class Static87 {
if (local30.createdComponents != null) {
method1809(local166, local114 - local30.scrollY, -local30.anInt489 + local123, local30.createdComponents, local302, local30.id, local164, local291, local57);
}
@Pc(1186) Class3_Sub31 local1186 = (Class3_Sub31) Static119.aClass133_9.method3863((long) local30.id);
@Pc(1186) Class3_Sub31 local1186 = (Class3_Sub31) Static119.aClass133_9.get((long) local30.id);
if (local1186 != null) {
if (local1186.anInt5879 == 0 && !Static60.aBoolean108 && Static155.anInt3751 >= local166 && local164 <= Static60.anInt1892 && local302 > Static155.anInt3751 && Static60.anInt1892 < local291 && !Static121.aBoolean154) {
Static254.aClass100Array168[0] = LocalizedText.CANCEL;

File diff suppressed because it is too large Load diff

View file

@ -20,7 +20,7 @@ public final class Static89 {
public static int anInt2385 = 0;
@OriginalMember(owner = "client!ha", name = "p", descriptor = "Lclient!gn;")
public static final LruHashTable aClass54_8 = new LruHashTable(64);
public static final LruHashTable recentUse = new LruHashTable(64);
@OriginalMember(owner = "client!ha", name = "q", descriptor = "I")
public static int anInt2388 = 0;
@ -77,7 +77,7 @@ public final class Static89 {
@OriginalMember(owner = "client!ha", name = "a", descriptor = "(II)[B")
public static byte[] method1837(@OriginalArg(1) int arg0) {
@Pc(10) ByteArrayNode local10 = (ByteArrayNode) Static53.aClass54_5.method1806((long) arg0);
@Pc(10) ByteArrayNode local10 = (ByteArrayNode) Static53.aClass54_5.get((long) arg0);
if (local10 == null) {
@Pc(24) Random local24 = new Random((long) arg0);
@Pc(27) byte[] local27 = new byte[512];
@ -93,7 +93,7 @@ public final class Static89 {
local27[local53] = local27[511 - local29] = local62;
}
local10 = new ByteArrayNode(local27);
Static53.aClass54_5.method1811(local10, (long) arg0);
Static53.aClass54_5.put(local10, (long) arg0);
}
return local10.aByteArray37;
}

View file

@ -27,7 +27,7 @@ public final class Static91 {
@OriginalMember(owner = "client!hc", name = "a", descriptor = "(IB)Lclient!qc;")
public static ClientScript getCs2ById(@OriginalArg(0) int arg0) {
@Pc(12) ClientScript local12 = (ClientScript) Static105.aClass54_9.method1806((long) arg0);
@Pc(12) ClientScript local12 = (ClientScript) Static105.aClass54_9.get((long) arg0);
if (local12 != null) {
return local12;
}
@ -79,7 +79,7 @@ public final class Static91 {
}
local12.opcodes[local107++] = local114;
}
Static105.aClass54_9.method1811(local12, (long) arg0);
Static105.aClass54_9.put(local12, (long) arg0);
return local12;
}

View file

@ -14,7 +14,7 @@ public final class StructType extends SecondaryNode {
if (this.aClass133_14 == null) {
return arg1;
} else {
@Pc(29) IntNode local29 = (IntNode) this.aClass133_14.method3863((long) arg0);
@Pc(29) IntNode local29 = (IntNode) this.aClass133_14.get((long) arg0);
return local29 == null ? arg1 : local29.anInt3141;
}
}
@ -48,7 +48,7 @@ public final class StructType extends SecondaryNode {
if (this.aClass133_14 == null) {
return arg0;
} else {
@Pc(16) StringNode local16 = (StringNode) this.aClass133_14.method3863((long) arg1);
@Pc(16) StringNode local16 = (StringNode) this.aClass133_14.get((long) arg1);
return local16 == null ? arg0 : local16.aClass100_980;
}
}