Major client code cleanup

This commit is contained in:
Woah 2021-03-24 15:51:22 -04:00
parent 9b97a8799a
commit 9a3d79abf0
235 changed files with 29482 additions and 29717 deletions

View file

@ -1,4 +1,5 @@
package org.runite.client;
import org.rs09.client.Node;
import org.rs09.client.data.ReferenceCache;
@ -7,167 +8,167 @@ import java.util.Arrays;
final class Class128 {
static ReferenceCache aReferenceCache_1683 = new ReferenceCache(64);
static boolean aBoolean1685 = true;
static ReferenceCache aReferenceCache_1683 = new ReferenceCache(64);
static boolean aBoolean1685 = true;
static void method1760(int var0, int var2) {
try {
if (WorldListCountry.localPlane > 3 || WorldListCountry.localPlane < 0) {
System.err.println("Local plane " + WorldListCountry.localPlane + " is out of bounds - rendering log=" + Arrays.toString(Class163_Sub3.PLAYER_RENDER_LOG) + "!");
WorldListCountry.localPlane %= 4;
}
Class61 var3 = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var0];
if(var3 == null) {
ObjectDefinition.method1688(WorldListCountry.localPlane, var2, var0);
} else {
int var4 = -99999999;
WorldMap var5 = null;
Class128() {
try {
Node[] aClass3_Sub28Array1684 = new Node[8];
WorldMap var6;
for (var6 = (WorldMap) var3.method1222(); null != var6; var6 = (WorldMap) var3.method1221()) {
ItemDefinition var7 = ItemDefinition.getItemDefinition(var6.aClass140_Sub7_3676.anInt2936);
int var8 = var7.value;
if (var7.stackingType == 1) {
var8 *= 1 + var6.aClass140_Sub7_3676.anInt2930;
}
if (var4 < var8) {
var4 = var8;
var5 = var6;
}
for (int var2 = 0; 8 > var2; ++var2) {
Node var3 = aClass3_Sub28Array1684[var2] = new Node();
var3.previousNode = var3;
var3.nextNode = var3;
}
if (null == var5) {
ObjectDefinition.method1688(WorldListCountry.localPlane, var2, var0);
} catch (RuntimeException var4) {
throw ClientErrorException.clientError(var4, "rm.<init>(" + 8 + ')');
}
}
static void method1760(int var0, int var2) {
try {
if (WorldListCountry.localPlane > 3 || WorldListCountry.localPlane < 0) {
System.err.println("Local plane " + WorldListCountry.localPlane + " is out of bounds - rendering log=" + Arrays.toString(Class163_Sub3.PLAYER_RENDER_LOG) + "!");
WorldListCountry.localPlane %= 4;
}
Class61 var3 = Class3_Sub13_Sub22.aClass61ArrayArrayArray3273[WorldListCountry.localPlane][var2][var0];
if (var3 == null) {
ObjectDefinition.method1688(WorldListCountry.localPlane, var2, var0);
} else {
var3.method1216(var5);
Class140_Sub7 var12 = null;
Class140_Sub7 var14 = null;
int var4 = -99999999;
WorldMap var5 = null;
for (var6 = (WorldMap) var3.method1222(); var6 != null; var6 = (WorldMap) var3.method1221()) {
Class140_Sub7 var9 = var6.aClass140_Sub7_3676;
if (var5.aClass140_Sub7_3676.anInt2936 != var9.anInt2936) {
if (null == var12) {
var12 = var9;
}
WorldMap var6;
for (var6 = (WorldMap) var3.method1222(); null != var6; var6 = (WorldMap) var3.method1221()) {
ItemDefinition var7 = ItemDefinition.getItemDefinition(var6.aClass140_Sub7_3676.anInt2936);
int var8 = var7.value;
if (var7.stackingType == 1) {
var8 *= 1 + var6.aClass140_Sub7_3676.anInt2930;
}
if (var12.anInt2936 != var9.anInt2936 && null == var14) {
var14 = var9;
}
}
}
if (var4 < var8) {
var4 = var8;
var5 = var6;
}
}
long var13 = (long) (1610612736 + (var0 << 7) + var2);
Class3_Sub13_Sub10.method213(WorldListCountry.localPlane, var2, var0, Class121.method1736(WorldListCountry.localPlane, 1, 64 + 128 * var2, 64 + var0 * 128), var5.aClass140_Sub7_3676, var13, var12, var14);
if (null == var5) {
ObjectDefinition.method1688(WorldListCountry.localPlane, var2, var0);
} else {
var3.method1216(var5);
Class140_Sub7 var12 = null;
Class140_Sub7 var14 = null;
for (var6 = (WorldMap) var3.method1222(); var6 != null; var6 = (WorldMap) var3.method1221()) {
Class140_Sub7 var9 = var6.aClass140_Sub7_3676;
if (var5.aClass140_Sub7_3676.anInt2936 != var9.anInt2936) {
if (null == var12) {
var12 = var9;
}
if (var12.anInt2936 != var9.anInt2936 && null == var14) {
var14 = var9;
}
}
}
long var13 = 1610612736 + (var0 << 7) + var2;
Class3_Sub13_Sub10.method213(WorldListCountry.localPlane, var2, var0, Class121.method1736(WorldListCountry.localPlane, 1, 64 + 128 * var2, 64 + var0 * 128), var5.aClass140_Sub7_3676, var13, var12, var14);
}
}
}
} catch (RuntimeException var11) {
throw ClientErrorException.clientError(var11, "rm.E(" + var0 + ',' + (byte) 65 + ',' + var2 + ')');
}
}
} catch (RuntimeException var11) {
throw ClientErrorException.clientError(var11, "rm.E(" + var0 + ',' + (byte) 65 + ',' + var2 + ')');
}
}
static Model method1763(int var1, int var2, int var3, int var4, Model var5, int var6) {
try {
Model var9 = (Model)Class61.aReferenceCache_939.get(var3);
if(var9 == null) {
Model_Sub1 var10 = Model_Sub1.method2015(CacheIndex.modelsIndex, var3);
if(var10 == null) {
return null;
static Model method1763(int var1, int var2, int var3, int var4, Model var5, int var6) {
try {
Model var9 = (Model) Class61.aReferenceCache_939.get(var3);
if (var9 == null) {
Model_Sub1 var10 = Model_Sub1.method2015(CacheIndex.modelsIndex, var3);
if (var10 == null) {
return null;
}
var9 = var10.method2008(64, 768, -50, -10, -50);
Class61.aReferenceCache_939.put(var9, var3);
}
var9 = var10.method2008(64, 768, -50, -10, -50);
Class61.aReferenceCache_939.put(var9, (long)var3);
}
int var17 = var5.method1884();
int var11 = var5.method1883();
int var12 = var5.method1898();
int var13 = var5.method1872();
var9 = var9.method1882(true, true, true);
if(var1 != 0) {
var9.method1876(var1);
}
int var15;
if(HDToolKit.highDetail) {
Class140_Sub1_Sub1 var14 = (Class140_Sub1_Sub1)var9;
if(var6 != Class121.method1736(WorldListCountry.localPlane, 1, var4 + var17, var2 + var12) || var6 != Class121.method1736(WorldListCountry.localPlane, 1, var4 - -var11, var13 + var2)) {
for(var15 = 0; var14.anInt3823 > var15; ++var15) {
var14.anIntArray3845[var15] += Class121.method1736(WorldListCountry.localPlane, 1, var14.anIntArray3822[var15] + var4, var14.anIntArray3848[var15] + var2) - var6;
}
var14.aClass121_3839.aBoolean1640 = false;
var14.aClass6_3835.aBoolean98 = false;
int var17 = var5.method1884();
int var11 = var5.method1883();
int var12 = var5.method1898();
int var13 = var5.method1872();
var9 = var9.method1882(true, true, true);
if (var1 != 0) {
var9.method1876(var1);
}
} else {
Class140_Sub1_Sub2 var18 = (Class140_Sub1_Sub2)var9;
if(var6 != Class121.method1736(WorldListCountry.localPlane, 1, var17 + var4, var12 + var2) || var6 != Class121.method1736(WorldListCountry.localPlane, 1, var4 - -var11, var13 + var2)) {
for(var15 = 0; var18.anInt3891 > var15; ++var15) {
var18.anIntArray3883[var15] += Class121.method1736(WorldListCountry.localPlane, 1, var4 + var18.anIntArray3885[var15], var18.anIntArray3895[var15] + var2) - var6;
}
var18.aBoolean3897 = false;
int var15;
if (HDToolKit.highDetail) {
Class140_Sub1_Sub1 var14 = (Class140_Sub1_Sub1) var9;
if (var6 != Class121.method1736(WorldListCountry.localPlane, 1, var4 + var17, var2 + var12) || var6 != Class121.method1736(WorldListCountry.localPlane, 1, var4 - -var11, var13 + var2)) {
for (var15 = 0; var14.anInt3823 > var15; ++var15) {
var14.anIntArray3845[var15] += Class121.method1736(WorldListCountry.localPlane, 1, var14.anIntArray3822[var15] + var4, var14.anIntArray3848[var15] + var2) - var6;
}
var14.aClass121_3839.aBoolean1640 = false;
var14.aClass6_3835.aBoolean98 = false;
}
} else {
Class140_Sub1_Sub2 var18 = (Class140_Sub1_Sub2) var9;
if (var6 != Class121.method1736(WorldListCountry.localPlane, 1, var17 + var4, var12 + var2) || var6 != Class121.method1736(WorldListCountry.localPlane, 1, var4 - -var11, var13 + var2)) {
for (var15 = 0; var18.anInt3891 > var15; ++var15) {
var18.anIntArray3883[var15] += Class121.method1736(WorldListCountry.localPlane, 1, var4 + var18.anIntArray3885[var15], var18.anIntArray3895[var15] + var2) - var6;
}
var18.aBoolean3897 = false;
}
}
}
return var9;
} catch (RuntimeException var16) {
throw ClientErrorException.clientError(var16, "rm.D(" + true + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + (var5 != null?"{...}":"null") + ',' + var6 + ')');
}
}
return var9;
} catch (RuntimeException var16) {
throw ClientErrorException.clientError(var16, "rm.D(" + true + ',' + var1 + ',' + var2 + ',' + var3 + ',' + var4 + ',' + (var5 != null ? "{...}" : "null") + ',' + var6 + ')');
}
}
static void method1764() {
for(int var3 = 0; var3 < Class3_Sub17.anInt2456; ++var3) {
for(int var4 = 0; var4 < Unsorted.anInt1234; ++var4) {
for(int var5 = 0; var5 < Class3_Sub13_Sub15.anInt3179; ++var5) {
Class3_Sub2 var6 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var3][var4][var5];
if(var6 != null) {
Class70 var7 = var6.aClass70_2234;
if(var7 != null && var7.aClass140_1049.method1865()) {
Class3_Sub13_Sub10.method214(var7.aClass140_1049, var3, var4, var5, 1, 1);
if(var7.aClass140_1052 != null && var7.aClass140_1052.method1865()) {
Class3_Sub13_Sub10.method214(var7.aClass140_1052, var3, var4, var5, 1, 1);
var7.aClass140_1049.method1866(var7.aClass140_1052, 0, 0, 0, false);
var7.aClass140_1052 = var7.aClass140_1052.method1861();
}
static void method1764() {
for (int var3 = 0; var3 < Class3_Sub17.anInt2456; ++var3) {
for (int var4 = 0; var4 < Unsorted.anInt1234; ++var4) {
for (int var5 = 0; var5 < Class3_Sub13_Sub15.anInt3179; ++var5) {
Class3_Sub2 var6 = Class75_Sub2.aClass3_Sub2ArrayArrayArray2638[var3][var4][var5];
if (var6 != null) {
Class70 var7 = var6.aClass70_2234;
if (var7 != null && var7.aClass140_1049.method1865()) {
Class3_Sub13_Sub10.method214(var7.aClass140_1049, var3, var4, var5, 1, 1);
if (var7.aClass140_1052 != null && var7.aClass140_1052.method1865()) {
Class3_Sub13_Sub10.method214(var7.aClass140_1052, var3, var4, var5, 1, 1);
var7.aClass140_1049.method1866(var7.aClass140_1052, 0, 0, 0, false);
var7.aClass140_1052 = var7.aClass140_1052.method1861();
}
var7.aClass140_1049 = var7.aClass140_1049.method1861();
}
var7.aClass140_1049 = var7.aClass140_1049.method1861();
}
for(int var8 = 0; var8 < var6.anInt2223; ++var8) {
Class25 var9 = var6.aClass25Array2221[var8];
if(var9 != null && var9.aClass140_479.method1865()) {
Class3_Sub13_Sub10.method214(var9.aClass140_479, var3, var4, var5, var9.anInt495 - var9.anInt483 + 1, var9.anInt481 - var9.anInt478 + 1);
var9.aClass140_479 = var9.aClass140_479.method1861();
}
}
for (int var8 = 0; var8 < var6.anInt2223; ++var8) {
Class25 var9 = var6.aClass25Array2221[var8];
if (var9 != null && var9.aClass140_479.method1865()) {
Class3_Sub13_Sub10.method214(var9.aClass140_479, var3, var4, var5, var9.anInt495 - var9.anInt483 + 1, var9.anInt481 - var9.anInt478 + 1);
var9.aClass140_479 = var9.aClass140_479.method1861();
}
}
Class12 var10 = var6.aClass12_2230;
if(var10 != null && var10.object.method1865()) {
Class155.method2162(var10.object, var3, var4, var5);
var10.object = var10.object.method1861();
}
}
Class12 var10 = var6.aClass12_2230;
if (var10 != null && var10.object.method1865()) {
Class155.method2162(var10.object, var3, var4, var5);
var10.object = var10.object.method1861();
}
}
}
}
}
}
}
}
Class128() {
try {
Node[] aClass3_Sub28Array1684 = new Node[8];
for(int var2 = 0; 8 > var2; ++var2) {
Node var3 = aClass3_Sub28Array1684[var2] = new Node();
var3.previousNode = var3;
var3.nextNode = var3;
}
} catch (RuntimeException var4) {
throw ClientErrorException.clientError(var4, "rm.<init>(" + 8 + ')');
}
}
}
}