ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

rs-client: Fix project for deob test (#1258)

Browse Source 
rs-client: Fix project for deob test
This commit is contained in:
Owain van Brakel
2019-08-04 04:05:15 +02:00
committed by GitHub
parent 5b5ee5b5a6 38fd83a651
commit 64b5c5b3a0
19 changed files with 778 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
deobfuscator/src/test/java/net/runelite/deob/updater/AnnotationCleaner.java
View File

@@ -2,6 +2,8 @@ package net.runelite.deob.updater;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.List;
import net.runelite.asm.ClassFile; import net.runelite.asm.ClassFile;
import net.runelite.asm.ClassGroup; import net.runelite.asm.ClassGroup;
import net.runelite.asm.Field; import net.runelite.asm.Field;
@@ -11,8 +13,6 @@ import net.runelite.deob.Deob;
import net.runelite.deob.DeobAnnotations; import net.runelite.deob.DeobAnnotations;
import net.runelite.deob.DeobTestProperties; import net.runelite.deob.DeobTestProperties;
import net.runelite.deob.util.JarUtil; import net.runelite.deob.util.JarUtil;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Rule; import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
@@ -29,6 +29,7 @@ public class AnnotationCleaner
@Test @Test
public void checkMappings() throws Exception public void checkMappings() throws Exception
{ {
final List<String> missing = new ArrayList<>();
File client = new File(properties.getRsClient()); File client = new File(properties.getRsClient());
ClassGroup group = JarUtil.loadJar(client); ClassGroup group = JarUtil.loadJar(client);
@@ -38,17 +39,21 @@ public class AnnotationCleaner
{ {
continue; continue;
} }
final String className = c.getClassName();
log.debug("Checking {}", c.toString()); log.debug("Checking {}", c.toString());
String implementingName = DeobAnnotations.getImplements(c); String implementingName = DeobAnnotations.getImplements(c);
if (!Strings.isNullOrEmpty(implementingName)) if (!Strings.isNullOrEmpty(implementingName))
{ {
assertEquals(c + " implements " + implementingName + " but is called " + c.getClassName(), implementingName, c.getClassName()); if (!implementingName.equals(className))
{
missing.add("Implements: " + className + " != " + implementingName);
}
} }
else else if (!Deob.isObfuscated(c.getClassName()))
{ {
assertTrue(c + " isn't obfuscated but doesn't have @Implements", Deob.isObfuscated(c.getClassName())); missing.add("Implements: " + className + " == missing");
} }
for (Field f : c.getFields()) for (Field f : c.getFields())
@@ -60,29 +65,50 @@ public class AnnotationCleaner
if (exportedName == null) if (exportedName == null)
{ {
assertTrue("Field " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null); if (!Deob.isObfuscated(fieldName) && DeobAnnotations.getObfuscatedName(an) != null)
continue; {
missing.add("Export: (field) " + className + '.' + fieldName + " == missing");
}
}
else if (!fieldName.equals(exportedName))
{
missing.add("Export: (field) " + className + '.' + fieldName + " != " + exportedName);
} }
assertEquals("Field " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
} }
for (Method m : c.getMethods()) for (Method m : c.getMethods())
{ {
Annotations an = m.getAnnotations(); Annotations an = m.getAnnotations();
String fieldName = m.getName(); String methodName = m.getName();
String exportedName = DeobAnnotations.getExportedName(an); String exportedName = DeobAnnotations.getExportedName(an);
if (exportedName == null) if (exportedName == null)
{ {
assertTrue("Method " + c.getClassName() + '.' + fieldName + " isn't obfuscated but doesn't have @Export.", Deob.isObfuscated(fieldName) || fieldName.equals(DeobAnnotations.getObfuscatedName(an)) || DeobAnnotations.getObfuscatedName(an) == null); if (!Deob.isObfuscated(methodName) && DeobAnnotations.getObfuscatedName(an) != null)
continue; {
missing.add("Export: (method) " + className + '.' + methodName + " == missing");
}
}
else if (!methodName.equals(exportedName))
{
missing.add("Export: (method) " + className + '.' + methodName + " != " + exportedName);
} }
assertEquals("Method " + c.getClassName() + '.' + fieldName + " has " + exportedName + " in @Export", fieldName, exportedName);
} }
} }
if (missing.isEmpty())
{
return;
}
log.error("{} missing annotations!", missing.size());
for (String s : missing)
{
log.error(s);
}
throw new OhNoException();
} }
@Test @Test
@@ -97,4 +123,11 @@ public class AnnotationCleaner
JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/niec.jar")); JarUtil.saveJar(group, new File("C:/Users/Lucas/Desktop/niec.jar"));
} }
private class OhNoException extends Exception
{
private OhNoException()
{
}
}
} }

4
runelite-mixins/src/main/java/net/runelite/mixins/RSRasterizer2DMixin.java
View File

@@ -109,13 +109,13 @@ public abstract class RSRasterizer2DMixin implements RSClient
} }
} }
@Copy("raster2d7") @Copy("Rasterizer2D_drawGradientPixels")
public static void rs$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) public static void rs$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7)
{ {
throw new RuntimeException(); throw new RuntimeException();
} }
@Replace("raster2d7") @Replace("Rasterizer2D_drawGradientPixels")
public static void rl$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) public static void rl$raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7)
{ {
final int width = client.getGraphicsPixelsWidth(); final int width = client.getGraphicsPixelsWidth();

8
runescape-client/src/main/java/Client.java
View File

@@ -1338,10 +1338,10 @@ public final class Client extends GameShell implements Usernamed {
instanceChunkTemplates = new int[4][13][13]; instanceChunkTemplates = new int[4][13][13];
field713 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3}; field713 = new int[]{0, 0, 0, 0, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3};
field718 = 0; field718 = 0;
field715 = 2301979; field715 = 0x23201b;
field716 = 5063219; field716 = 0x4d4233;
field720 = 3353893; field720 = 0x332d25;
field772 = 7759444; field772 = 0x766654;
field719 = false; field719 = false;
field882 = 0; field882 = 0;
camAngleX = 128; camAngleX = 128;

8
runescape-client/src/main/java/Decimator.java
View File

@@ -734,7 +734,7 @@ public class Decimator {
var85.drawTransAt(var56 + var65 - var29, var66, var73); var85.drawTransAt(var56 + var65 - var29, var66, var73);
} }
var86.drawAlpha(var45, var55 + var65, var69, var95.field3333, 0, var73); var86.drawAlpha(var45, var55 + var65, var69, var95.textColor, 0, var73);
if (var81 != null) { if (var81 != null) {
if (var30 != null) { if (var30 != null) {
var30.drawTransAt(var65 + var57 - var38, var66, var73); var30.drawTransAt(var65 + var57 - var38, var66, var73);
@@ -754,7 +754,7 @@ public class Decimator {
var33.drawTransAt(var60 + var65 - var41, var66, var73); var33.drawTransAt(var60 + var65 - var41, var66, var73);
} }
var44.drawAlpha(var46, var65 + var61, var72, var81.field3333, 0, var73); var44.drawAlpha(var46, var65 + var61, var72, var81.textColor, 0, var73);
} }
} else { } else {
if (var82 != null) { if (var82 != null) {
@@ -775,7 +775,7 @@ public class Decimator {
var85.drawTransBgAt(var65 + var56 - var29, var66); var85.drawTransBgAt(var65 + var56 - var29, var66);
} }
var86.draw(var45, var65 + var55, var69, var95.field3333 | 0xff000000, 0); var86.draw(var45, var65 + var55, var69, var95.textColor | 0xff000000, 0);
if (var81 == null) { if (var81 == null) {
continue; continue;
} }
@@ -797,7 +797,7 @@ public class Decimator {
var33.drawTransBgAt(var60 + var65 - var41, var66); var33.drawTransBgAt(var60 + var65 - var41, var66);
} }
var44.draw(var46, var61 + var65, var72, var81.field3333 | 0xff000000, 0); var44.draw(var46, var61 + var65, var72, var81.textColor | 0xff000000, 0);
} }
} }

1
runescape-client/src/main/java/DynamicObject.java
View File

@@ -9,6 +9,7 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("DynamicObject") @Implements("DynamicObject")
public class DynamicObject extends Entity { public class DynamicObject extends Entity {
@ObfuscatedName("x") @ObfuscatedName("x")
@Export("Tiles_hueMultiplier")
static int[] Tiles_hueMultiplier; static int[] Tiles_hueMultiplier;
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedGetter( @ObfuscatedGetter(

1
runescape-client/src/main/java/GameShell.java
View File

@@ -68,6 +68,7 @@ public abstract class GameShell extends Applet implements Runnable, FocusListene
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 369880599 intValue = 369880599
) )
@Export("fiveOrOne")
static int fiveOrOne; static int fiveOrOne;
@ObfuscatedName("m") @ObfuscatedName("m")
@ObfuscatedGetter( @ObfuscatedGetter(

30
runescape-client/src/main/java/GrandExchangeOfferOwnWorldComparator.java
View File

@@ -144,7 +144,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
if (objectType == 22) { if (objectType == 22) {
if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) { if (!Client.isLowDetail || var8.int1 != 0 || var8.interactType == 1 || var8.boolean2) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(22, rotation, var15, var17, var16, var18); var22 = var8.getEntity(22, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, 22, rotation, plane, x, y, var8.animationId, true, (Entity)null); var22 = new DynamicObject(objectID, 22, rotation, plane, x, y, var8.animationId, true, (Entity)null);
} }
@@ -157,7 +157,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} }
} else if (objectType == 10 || objectType == 11) { } else if (objectType == 10 || objectType == 11) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(10, rotation, var15, var17, var16, var18); var22 = var8.getEntity(10, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, 10, rotation, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, 10, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -186,7 +186,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} else if (objectType >= 12) { } else if (objectType >= 12) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(objectType, rotation, var15, var17, var16, var18); var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -203,7 +203,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} else if (objectType == 0) { } else if (objectType == 0) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(0, rotation, var15, var17, var16, var18); var22 = var8.getEntity(0, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, 0, rotation, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, 0, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -261,7 +261,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} else if (objectType == 1) { } else if (objectType == 1) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(1, rotation, var15, var17, var16, var18); var22 = var8.getEntity(1, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, 1, rotation, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, 1, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -288,8 +288,8 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
Object var29; Object var29;
Object var30; Object var30;
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var29 = var8.method4591(2, rotation + 4, var15, var17, var16, var18); var29 = var8.getEntity(2, rotation + 4, var15, var17, var16, var18);
var30 = var8.method4591(2, var28, var15, var17, var16, var18); var30 = var8.getEntity(2, var28, var15, var17, var16, var18);
} else { } else {
var29 = new DynamicObject(objectID, 2, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); var29 = new DynamicObject(objectID, 2, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
var30 = new DynamicObject(objectID, 2, var28, plane, x, y, var8.animationId, true, (Entity) null); var30 = new DynamicObject(objectID, 2, var28, plane, x, y, var8.animationId, true, (Entity) null);
@@ -330,7 +330,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} else if (objectType == 3) { } else if (objectType == 3) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(3, rotation, var15, var17, var16, var18); var22 = var8.getEntity(3, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, 3, rotation, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, 3, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -354,7 +354,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} else if (objectType == 9) { } else if (objectType == 9) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(objectType, rotation, var15, var17, var16, var18); var22 = var8.getEntity(objectType, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, objectType, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -370,7 +370,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} else if (objectType == 4) { } else if (objectType == 4) {
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(4, rotation, var15, var17, var16, var18); var22 = var8.getEntity(4, rotation, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -385,7 +385,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} }
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, rotation, var15, var17, var16, var18); var33 = var8.getEntity(4, rotation, var15, var17, var16, var18);
} else { } else {
var33 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null); var33 = new DynamicObject(objectID, 4, rotation, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -400,7 +400,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} }
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, rotation + 4, var15, var17, var16, var18); var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18);
} else { } else {
var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -409,7 +409,7 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
} else if (objectType == 7) { } else if (objectType == 7) {
int var23 = rotation + 2 & 3; int var23 = rotation + 2 & 3;
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var22 = var8.method4591(4, var23 + 4, var15, var17, var16, var18); var22 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
} else { } else {
var22 = new DynamicObject(objectID, 4, var23 + 4, plane, x, y, var8.animationId, true, (Entity) null); var22 = new DynamicObject(objectID, 4, var23 + 4, plane, x, y, var8.animationId, true, (Entity) null);
} }
@@ -426,8 +426,8 @@ public class GrandExchangeOfferOwnWorldComparator implements Comparator {
Object var26; Object var26;
Object var33; Object var33;
if (var8.animationId == -1 && var8.transforms == null) { if (var8.animationId == -1 && var8.transforms == null) {
var33 = var8.method4591(4, rotation + 4, var15, var17, var16, var18); var33 = var8.getEntity(4, rotation + 4, var15, var17, var16, var18);
var26 = var8.method4591(4, var27 + 4, var15, var17, var16, var18); var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18);
} else { } else {
var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null); var33 = new DynamicObject(objectID, 4, rotation + 4, plane, x, y, var8.animationId, true, (Entity) null);
var26 = new DynamicObject(objectID, 4, var27 + 4, plane, x, y, var8.animationId, true, (Entity) null); var26 = new DynamicObject(objectID, 4, var27 + 4, plane, x, y, var8.animationId, true, (Entity) null);

7
runescape-client/src/main/java/HitSplatDefinition.java
View File

@@ -55,7 +55,8 @@ public class HitSplatDefinition extends DualNode {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1445466235 intValue = -1445466235
) )
public int field3333; @Export("textColor")
public int textColor;
@ObfuscatedName("r") @ObfuscatedName("r")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1814689987 intValue = -1814689987
@@ -132,7 +133,7 @@ public class HitSplatDefinition extends DualNode {
HitSplatDefinition() { HitSplatDefinition() {
this.fontId = -1; this.fontId = -1;
this.field3333 = 0xffffff; this.textColor = 0xffffff;
this.field3344 = 70; this.field3344 = 70;
this.field3334 = -1; this.field3334 = -1;
this.field3336 = -1; this.field3336 = -1;
@@ -175,7 +176,7 @@ public class HitSplatDefinition extends DualNode {
if (var2 == 1) { if (var2 == 1) {
this.fontId = var1.method5511(); this.fontId = var1.method5511();
} else if (var2 == 2) { } else if (var2 == 2) {
this.field3333 = var1.readMedium(); this.textColor = var1.readMedium();
} else if (var2 == 3) { } else if (var2 == 3) {
this.field3334 = var1.method5511(); this.field3334 = var1.method5511();
} else if (var2 == 4) { } else if (var2 == 4) {

669
runescape-client/src/main/java/Model.java
View File

@@ -374,89 +374,90 @@ public class Model extends Entity {
int var8 = var2 + this.xzRadius; int var8 = var2 + this.xzRadius;
int var9 = var4 - this.xzRadius; int var9 = var4 - this.xzRadius;
int var10 = var4 + this.xzRadius; int var10 = var4 + this.xzRadius;
if (var7 >= 0 && var8 + 128 >> 7 < var1.length && var9 >= 0 && var10 + 128 >> 7 < var1[0].length) { if (var7 < 0 || var8 + 128 >> 7 >= var1.length || var9 < 0 || var10 + 128 >> 7 >= var1[0].length) {
var7 >>= 7; return this;
var8 = var8 + 127 >> 7;
var9 >>= 7;
var10 = var10 + 127 >> 7;
if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
return this;
}
Model var11;
if (var5) {
var11 = new Model();
var11.verticesCount = this.verticesCount;
var11.indicesCount = this.indicesCount;
var11.field1691 = this.field1691;
var11.verticesX = this.verticesX;
var11.verticesZ = this.verticesZ;
var11.indices1 = this.indices1;
var11.indices2 = this.indices2;
var11.indices3 = this.indices3;
var11.faceColors1 = this.faceColors1;
var11.faceColors2 = this.faceColors2;
var11.faceColors3 = this.faceColors3;
var11.faceRenderPriorities = this.faceRenderPriorities;
var11.faceAlphas = this.faceAlphas;
var11.field1688 = this.field1688;
var11.faceTextures = this.faceTextures;
var11.field1690 = this.field1690;
var11.field1692 = this.field1692;
var11.field1693 = this.field1693;
var11.field1694 = this.field1694;
var11.vertexLabels = this.vertexLabels;
var11.faceLabelsAlpha = this.faceLabelsAlpha;
var11.isSingleTile = this.isSingleTile;
var11.verticesY = new int[var11.verticesCount];
} else {
var11 = this;
}
int var12;
int var13;
int var14;
int var15;
int var16;
int var17;
int var18;
int var19;
int var20;
int var21;
if (var6 == 0) {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = var2 + this.verticesX[var12];
var14 = var4 + this.verticesZ[var12];
var15 = var13 & 127;
var16 = var14 & 127;
var17 = var13 >> 7;
var18 = var14 >> 7;
var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7;
var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7;
var21 = var19 * (128 - var16) + var20 * var16 >> 7;
var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
}
} else {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = (-this.verticesY[var12] << 16) / super.height;
if (var13 < var6) {
var14 = var2 + this.verticesX[var12];
var15 = var4 + this.verticesZ[var12];
var16 = var14 & 127;
var17 = var15 & 127;
var18 = var14 >> 7;
var19 = var15 >> 7;
var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7;
var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7;
int var22 = var20 * (128 - var17) + var21 * var17 >> 7;
var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12];
}
}
}
var11.resetBounds();
return var11;
} }
return this; var7 >>= 7;
var8 = var8 + 127 >> 7;
var9 >>= 7;
var10 = var10 + 127 >> 7;
if (var3 == var1[var7][var9] && var3 == var1[var8][var9] && var3 == var1[var7][var10] && var3 == var1[var8][var10]) {
return this;
}
Model var11;
if (var5) {
var11 = new Model();
var11.verticesCount = this.verticesCount;
var11.indicesCount = this.indicesCount;
var11.field1691 = this.field1691;
var11.verticesX = this.verticesX;
var11.verticesZ = this.verticesZ;
var11.indices1 = this.indices1;
var11.indices2 = this.indices2;
var11.indices3 = this.indices3;
var11.faceColors1 = this.faceColors1;
var11.faceColors2 = this.faceColors2;
var11.faceColors3 = this.faceColors3;
var11.faceRenderPriorities = this.faceRenderPriorities;
var11.faceAlphas = this.faceAlphas;
var11.field1688 = this.field1688;
var11.faceTextures = this.faceTextures;
var11.field1690 = this.field1690;
var11.field1692 = this.field1692;
var11.field1693 = this.field1693;
var11.field1694 = this.field1694;
var11.vertexLabels = this.vertexLabels;
var11.faceLabelsAlpha = this.faceLabelsAlpha;
var11.isSingleTile = this.isSingleTile;
var11.verticesY = new int[var11.verticesCount];
} else {
var11 = this;
}
int var12;
int var13;
int var14;
int var15;
int var16;
int var17;
int var18;
int var19;
int var20;
int var21;
if (var6 == 0) {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = var2 + this.verticesX[var12];
var14 = var4 + this.verticesZ[var12];
var15 = var13 & 127;
var16 = var14 & 127;
var17 = var13 >> 7;
var18 = var14 >> 7;
var19 = var1[var17][var18] * (128 - var15) + var1[var17 + 1][var18] * var15 >> 7;
var20 = var1[var17][var18 + 1] * (128 - var15) + var15 * var1[var17 + 1][var18 + 1] >> 7;
var21 = var19 * (128 - var16) + var20 * var16 >> 7;
var11.verticesY[var12] = var21 + this.verticesY[var12] - var3;
}
} else {
for (var12 = 0; var12 < var11.verticesCount; ++var12) {
var13 = (-this.verticesY[var12] << 16) / super.height;
if (var13 >= var6) {
continue;
}
var14 = var2 + this.verticesX[var12];
var15 = var4 + this.verticesZ[var12];
var16 = var14 & 127;
var17 = var15 & 127;
var18 = var14 >> 7;
var19 = var15 >> 7;
var20 = var1[var18][var19] * (128 - var16) + var1[var18 + 1][var19] * var16 >> 7;
var21 = var1[var18][var19 + 1] * (128 - var16) + var16 * var1[var18 + 1][var19 + 1] >> 7;
int var22 = var20 * (128 - var17) + var21 * var17 >> 7;
var11.verticesY[var12] = (var6 - var13) * (var22 - var3) / var6 + this.verticesY[var12];
}
}
var11.resetBounds();
return var11;
} }
@ObfuscatedName("w") @ObfuscatedName("w")
@@ -769,16 +770,17 @@ public class Model extends Entity {
for (var8 = 0; var8 < var6; ++var8) { for (var8 = 0; var8 < var6; ++var8) {
int var9 = var2[var8]; int var9 = var2[var8];
if (var9 < this.vertexLabels.length) { if (var9 >= this.vertexLabels.length) {
int[] var10 = this.vertexLabels[var9]; continue;
}
int[] var10 = this.vertexLabels[var9];
for (var11 = 0; var11 < var10.length; ++var11) { for (var11 = 0; var11 < var10.length; ++var11) {
var12 = var10[var11]; var12 = var10[var11];
Model_transformTempX += this.verticesX[var12]; Model_transformTempX += this.verticesX[var12];
Model_transformTempY += this.verticesY[var12]; Model_transformTempY += this.verticesY[var12];
Model_transformTempZ += this.verticesZ[var12]; Model_transformTempZ += this.verticesZ[var12];
++var7; ++var7;
}
} }
} }
@@ -792,132 +794,115 @@ public class Model extends Entity {
Model_transformTempZ = var5; Model_transformTempZ = var5;
} }
} else { } else if (var1 == 1) {
int[] var10000; for (var7 = 0; var7 < var6; ++var7) {
int[] var18; var8 = var2[var7];
int var19; if (var8 >= this.vertexLabels.length) {
if (var1 == 1) { continue;
for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
if (var8 < this.vertexLabels.length) {
var18 = this.vertexLabels[var8];
for (var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
var10000 = this.verticesX;
var10000[var11] += var3;
var10000 = this.verticesY;
var10000[var11] += var4;
var10000 = this.verticesZ;
var10000[var11] += var5;
}
}
} }
int[] var18 = this.vertexLabels[var8];
} else if (var1 == 2) { for (int var19 = 0; var19 < var18.length; ++var19) {
for (var7 = 0; var7 < var6; ++var7) { var11 = var18[var19];
var8 = var2[var7]; this.verticesX[var11] += var3;
if (var8 < this.vertexLabels.length) { this.verticesY[var11] += var4;
var18 = this.vertexLabels[var8]; this.verticesZ[var11] += var5;
for (var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
var10000 = this.verticesX;
var10000[var11] -= Model_transformTempX;
var10000 = this.verticesY;
var10000[var11] -= Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] -= Model_transformTempZ;
var12 = (var3 & 255) * 8;
int var13 = (var4 & 255) * 8;
int var14 = (var5 & 255) * 8;
int var15;
int var16;
int var17;
if (var14 != 0) {
var15 = Model_sine[var14];
var16 = Model_cosine[var14];
var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16;
this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16;
this.verticesX[var11] = var17;
}
if (var12 != 0) {
var15 = Model_sine[var12];
var16 = Model_cosine[var12];
var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16;
this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16;
this.verticesY[var11] = var17;
}
if (var13 != 0) {
var15 = Model_sine[var13];
var16 = Model_cosine[var13];
var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16;
this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16;
this.verticesX[var11] = var17;
}
var10000 = this.verticesX;
var10000[var11] += Model_transformTempX;
var10000 = this.verticesY;
var10000[var11] += Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] += Model_transformTempZ;
}
}
} }
} else if (var1 == 3) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
if (var8 < this.vertexLabels.length) {
var18 = this.vertexLabels[var8];
for (var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
var10000 = this.verticesX;
var10000[var11] -= Model_transformTempX;
var10000 = this.verticesY;
var10000[var11] -= Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] -= Model_transformTempZ;
this.verticesX[var11] = var3 * this.verticesX[var11] / 128;
this.verticesY[var11] = var4 * this.verticesY[var11] / 128;
this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128;
var10000 = this.verticesX;
var10000[var11] += Model_transformTempX;
var10000 = this.verticesY;
var10000[var11] += Model_transformTempY;
var10000 = this.verticesZ;
var10000[var11] += Model_transformTempZ;
}
}
}
} else if (var1 == 5) {
if (this.faceLabelsAlpha != null && this.faceAlphas != null) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
if (var8 < this.faceLabelsAlpha.length) {
var18 = this.faceLabelsAlpha[var8];
for (var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
var12 = (this.faceAlphas[var11] & 255) + var3 * 8;
if (var12 < 0) {
var12 = 0;
} else if (var12 > 255) {
var12 = 255;
}
this.faceAlphas[var11] = (byte)var12;
}
}
}
}
} }
} else if (var1 == 2) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
if (var8 >= this.vertexLabels.length) {
continue;
}
int[] var18 = this.vertexLabels[var8];
for (int var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
this.verticesX[var11] -= Model_transformTempX;
this.verticesY[var11] -= Model_transformTempY;
this.verticesZ[var11] -= Model_transformTempZ;
var12 = (var3 & 255) * 8;
int var13 = (var4 & 255) * 8;
int var14 = (var5 & 255) * 8;
int var15;
int var16;
int var17;
if (var14 != 0) {
var15 = Model_sine[var14];
var16 = Model_cosine[var14];
var17 = var15 * this.verticesY[var11] + var16 * this.verticesX[var11] >> 16;
this.verticesY[var11] = var16 * this.verticesY[var11] - var15 * this.verticesX[var11] >> 16;
this.verticesX[var11] = var17;
}
if (var12 != 0) {
var15 = Model_sine[var12];
var16 = Model_cosine[var12];
var17 = var16 * this.verticesY[var11] - var15 * this.verticesZ[var11] >> 16;
this.verticesZ[var11] = var15 * this.verticesY[var11] + var16 * this.verticesZ[var11] >> 16;
this.verticesY[var11] = var17;
}
if (var13 != 0) {
var15 = Model_sine[var13];
var16 = Model_cosine[var13];
var17 = var15 * this.verticesZ[var11] + var16 * this.verticesX[var11] >> 16;
this.verticesZ[var11] = var16 * this.verticesZ[var11] - var15 * this.verticesX[var11] >> 16;
this.verticesX[var11] = var17;
}
this.verticesX[var11] += Model_transformTempX;
this.verticesY[var11] += Model_transformTempY;
this.verticesZ[var11] += Model_transformTempZ;
}
}
} else if (var1 == 3) {
for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
if (var8 < this.vertexLabels.length) {
int[] var18 = this.vertexLabels[var8];
for (int var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
this.verticesX[var11] -= Model_transformTempX;
this.verticesY[var11] -= Model_transformTempY;
this.verticesZ[var11] -= Model_transformTempZ;
this.verticesX[var11] = var3 * this.verticesX[var11] / 128;
this.verticesY[var11] = var4 * this.verticesY[var11] / 128;
this.verticesZ[var11] = var5 * this.verticesZ[var11] / 128;
this.verticesX[var11] += Model_transformTempX;
this.verticesY[var11] += Model_transformTempY;
this.verticesZ[var11] += Model_transformTempZ;
}
}
}
} else if (var1 == 5) {
if (this.faceLabelsAlpha == null || this.faceAlphas == null) {
return;
}
for (var7 = 0; var7 < var6; ++var7) {
var8 = var2[var7];
if (var8 >= this.faceLabelsAlpha.length) {
continue;
}
int[] var18 = this.faceLabelsAlpha[var8];
for (int var19 = 0; var19 < var18.length; ++var19) {
var11 = var18[var19];
var12 = (this.faceAlphas[var11] & 255) + var3 * 8;
if (var12 < 0) {
var12 = 0;
} else if (var12 > 255) {
var12 = 255;
}
this.faceAlphas[var11] = (byte) var12;
}
}
} }
} }
@@ -975,12 +960,9 @@ public class Model extends Entity {
@Export("offsetBy") @Export("offsetBy")
public void offsetBy(int var1, int var2, int var3) { public void offsetBy(int var1, int var2, int var3) {
for (int var4 = 0; var4 < this.verticesCount; ++var4) { for (int var4 = 0; var4 < this.verticesCount; ++var4) {
int[] var10000 = this.verticesX; this.verticesX[var4] += var1;
var10000[var4] += var1; this.verticesY[var4] += var2;
var10000 = this.verticesY; this.verticesZ[var4] += var3;
var10000[var4] += var2;
var10000 = this.verticesZ;
var10000[var4] += var3;
} }
this.resetBounds(); this.resetBounds();
@@ -1604,136 +1586,141 @@ public class Model extends Entity {
int var12 = var2 * var7 + var3 * var11 >> 16; int var12 = var2 * var7 + var3 * var11 >> 16;
int var13 = var3 * this.xzRadius >> 16; int var13 = var3 * this.xzRadius >> 16;
int var14 = var12 + var13; int var14 = var12 + var13;
if (var14 > 50 && var12 < 3500) { if (var14 <= 50 || var12 >= 3500) {
int var15 = var8 * var4 + var5 * var6 >> 16; return;
int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; }
if (var16 / var14 < Rasterizer3D.Rasterizer3D_clipMidX2) { int var15 = var8 * var4 + var5 * var6 >> 16;
int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom; int var16 = (var15 - this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
if (var17 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidX) { if (var16 / var14 >= Rasterizer3D.Rasterizer3D_clipMidX2) {
int var18 = var3 * var7 - var11 * var2 >> 16; return;
int var19 = var2 * this.xzRadius >> 16; }
int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom; int var17 = (var15 + this.xzRadius) * Rasterizer3D.Rasterizer3D_zoom;
if (var20 / var14 > Rasterizer3D.Rasterizer3D_clipNegativeMidY) { if (var17 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidX) {
int var21 = (var3 * super.height >> 16) + var19; return;
int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom; }
if (var22 / var14 < Rasterizer3D.Rasterizer3D_clipMidY2) { int var18 = var3 * var7 - var11 * var2 >> 16;
int var23 = var13 + (var2 * super.height >> 16); int var19 = var2 * this.xzRadius >> 16;
boolean var24 = false; int var20 = (var18 + var19) * Rasterizer3D.Rasterizer3D_zoom;
boolean var25 = false; if (var20 / var14 <= Rasterizer3D.Rasterizer3D_clipNegativeMidY) {
if (var12 - var23 <= 50) { return;
var25 = true; }
} int var21 = (var3 * super.height >> 16) + var19;
int var22 = (var18 - var21) * Rasterizer3D.Rasterizer3D_zoom;
if (var22 / var14 >= Rasterizer3D.Rasterizer3D_clipMidY2) {
return;
}
int var23 = var13 + (var2 * super.height >> 16);
boolean var24 = false;
boolean var25 = false;
if (var12 - var23 <= 50) {
var25 = true;
}
boolean var26 = var25 || this.field1691 > 0; boolean var26 = var25 || this.field1691 > 0;
int var27 = ViewportMouse.ViewportMouse_x; int var27 = ViewportMouse.ViewportMouse_x;
int var29 = ViewportMouse.ViewportMouse_y; int var29 = ViewportMouse.ViewportMouse_y;
boolean var31 = ViewportMouse.ViewportMouse_isInViewport; boolean var31 = ViewportMouse.ViewportMouse_isInViewport;
boolean var34 = 0L != var9; boolean var34 = 0L != var9;
boolean var35; boolean var35;
if (var34) { if (var34) {
var35 = (int)(var9 >>> 16 & 1L) == 1; var35 = (int)(var9 >>> 16 & 1L) == 1;
var34 = !var35; var34 = !var35;
} }
var35 = false; var35 = false;
int var37; int var37;
int var38; int var38;
int var39; int var39;
if (var34 && var31) { if (var34 && var31) {
boolean var36 = false; boolean var36 = false;
if (field1732) { if (field1732) {
var36 = Frames.boundingBoxCheck(this, var6, var7, var8); var36 = Frames.boundingBoxCheck(this, var6, var7, var8);
} else { } else {
var37 = var12 - var13; var37 = var12 - var13;
if (var37 <= 50) { if (var37 <= 50) {
var37 = 50; var37 = 50;
} }
if (var15 > 0) { if (var15 > 0) {
var16 /= var14; var16 /= var14;
var17 /= var37; var17 /= var37;
} else { } else {
var17 /= var14; var17 /= var14;
var16 /= var37; var16 /= var37;
} }
if (var18 > 0) { if (var18 > 0) {
var22 /= var14; var22 /= var14;
var20 /= var37; var20 /= var37;
} else { } else {
var20 /= var14; var20 /= var14;
var22 /= var37; var22 /= var37;
} }
var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX; var38 = var27 - Rasterizer3D.Rasterizer3D_clipMidX;
var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY; var39 = var29 - Rasterizer3D.Rasterizer3D_clipMidY;
if (var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) { if (var38 > var16 && var38 < var17 && var39 > var22 && var39 < var20) {
var36 = true; var36 = true;
} }
} }
if (var36) { if (var36) {
if (this.isSingleTile) { if (this.isSingleTile) {
ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9; ViewportMouse.ViewportMouse_entityTags[++ViewportMouse.ViewportMouse_entityCount - 1] = var9;
} else { } else {
var35 = true; var35 = true;
}
}
}
int var49 = Rasterizer3D.Rasterizer3D_clipMidX;
var37 = Rasterizer3D.Rasterizer3D_clipMidY;
var38 = 0;
var39 = 0;
if (var1 != 0) {
var38 = Model_sine[var1];
var39 = Model_cosine[var1];
}
for (int var40 = 0; var40 < this.verticesCount; ++var40) {
int var41 = this.verticesX[var40];
int var42 = this.verticesY[var40];
int var43 = this.verticesZ[var40];
int var44;
if (var1 != 0) {
var44 = var43 * var38 + var41 * var39 >> 16;
var43 = var43 * var39 - var41 * var38 >> 16;
var41 = var44;
}
var41 += var6;
var42 += var7;
var43 += var8;
var44 = var43 * var4 + var5 * var41 >> 16;
var43 = var5 * var43 - var41 * var4 >> 16;
var41 = var44;
var44 = var3 * var42 - var43 * var2 >> 16;
var43 = var42 * var2 + var3 * var43 >> 16;
field1714[var40] = var43 - var12;
if (var43 >= 50) {
modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var49;
modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37;
} else {
modelViewportXs[var40] = -5000;
var24 = true;
}
if (var26) {
field1715[var40] = var41;
field1716[var40] = var44;
field1717[var40] = var43;
}
}
try {
this.draw0(var24, var35, this.isSingleTile, var9);
} catch (Exception var48) {
}
}
}
} }
} }
} }
int var49 = Rasterizer3D.Rasterizer3D_clipMidX;
var37 = Rasterizer3D.Rasterizer3D_clipMidY;
var38 = 0;
var39 = 0;
if (var1 != 0) {
var38 = Model_sine[var1];
var39 = Model_cosine[var1];
}
for (int var40 = 0; var40 < this.verticesCount; ++var40) {
int var41 = this.verticesX[var40];
int var42 = this.verticesY[var40];
int var43 = this.verticesZ[var40];
int var44;
if (var1 != 0) {
var44 = var43 * var38 + var41 * var39 >> 16;
var43 = var43 * var39 - var41 * var38 >> 16;
var41 = var44;
}
var41 += var6;
var42 += var7;
var43 += var8;
var44 = var43 * var4 + var5 * var41 >> 16;
var43 = var5 * var43 - var41 * var4 >> 16;
var41 = var44;
var44 = var3 * var42 - var43 * var2 >> 16;
var43 = var42 * var2 + var3 * var43 >> 16;
field1714[var40] = var43 - var12;
if (var43 >= 50) {
modelViewportXs[var40] = var41 * Rasterizer3D.Rasterizer3D_zoom / var43 + var49;
modelViewportYs[var40] = var44 * Rasterizer3D.Rasterizer3D_zoom / var43 + var37;
} else {
modelViewportXs[var40] = -5000;
var24 = true;
}
if (var26) {
field1715[var40] = var41;
field1716[var40] = var44;
field1717[var40] = var43;
}
}
try {
this.draw0(var24, var35, this.isSingleTile, var9);
} catch (Exception var48) {
}
} }
} }

6
runescape-client/src/main/java/ModelData.java
View File

@@ -1244,10 +1244,10 @@ public class ModelData extends Entity {
@ObfuscatedName("y") @ObfuscatedName("y")
@Export("recolor") @Export("recolor")
public void recolor(short var1, short var2) { public void recolor(short from, short to) {
for (int var3 = 0; var3 < this.faceCount; ++var3) { for (int var3 = 0; var3 < this.faceCount; ++var3) {
if (this.faceColors[var3] == var1) { if (this.faceColors[var3] == from) {
this.faceColors[var3] = var2; this.faceColors[var3] = to;
} }
} }

45
runescape-client/src/main/java/ObjectDefinition.java
View File

@@ -572,17 +572,18 @@ public class ObjectDefinition extends DualNode {
signature = "(II[[IIIIB)Leo;", signature = "(II[[IIIIB)Leo;",
garbageValue = "-18" garbageValue = "-18"
) )
public final Entity method4591(int var1, int var2, int[][] var3, int var4, int var5, int var6) { @Export("getEntity")
public final Entity getEntity(int type, int rotation, int[][] tileHeights, int xPacked, int avgHeight, int yPacked) {
long var7; long var7;
if (this.field3359 == null) { if (this.field3359 == null) {
var7 = (long)(var2 + (this.id << 10)); var7 = (long)(rotation + (this.id << 10));
} else { } else {
var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); var7 = (long)(rotation + (type << 3) + (this.id << 10));
} }
Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7); Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7);
if (var9 == null) { if (var9 == null) {
ModelData var10 = this.getModelData(var1, var2); ModelData var10 = this.getModelData(type, rotation);
if (var10 == null) { if (var10 == null) {
return null; return null;
} }
@@ -605,9 +606,9 @@ public class ObjectDefinition extends DualNode {
if (this.clipType * 256 >= 0) { if (this.clipType * 256 >= 0) {
if (var9 instanceof Model) { if (var9 instanceof Model) {
var9 = ((Model)var9).contourGround(var3, var4, var5, var6, true, this.clipType * 256); var9 = ((Model)var9).contourGround(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256);
} else if (var9 instanceof ModelData) { } else if (var9 instanceof ModelData) {
var9 = ((ModelData)var9).method2776(var3, var4, var5, var6, true, this.clipType * 256); var9 = ((ModelData)var9).method2776(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256);
} }
} }
@@ -620,17 +621,17 @@ public class ObjectDefinition extends DualNode {
garbageValue = "-1160623337" garbageValue = "-1160623337"
) )
@Export("getModel") @Export("getModel")
public final Model getModel(int var1, int var2, int[][] var3, int var4, int var5, int var6) { public final Model getModel(int type, int rotation, int[][] tileHeights, int xPacked, int avgHeight, int yPacked) {
long var7; long var7;
if (this.field3359 == null) { if (this.field3359 == null) {
var7 = (long)(var2 + (this.id << 10)); var7 = (long)(rotation + (this.id << 10));
} else { } else {
var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); var7 = (long)(rotation + (type << 3) + (this.id << 10));
} }
Model var9 = (Model)ObjectDefinition_cachedModels.get(var7); Model var9 = (Model)ObjectDefinition_cachedModels.get(var7);
if (var9 == null) { if (var9 == null) {
ModelData var10 = this.getModelData(var1, var2); ModelData var10 = this.getModelData(type, rotation);
if (var10 == null) { if (var10 == null) {
return null; return null;
} }
@@ -640,7 +641,7 @@ public class ObjectDefinition extends DualNode {
} }
if (this.clipType * 256 >= 0) { if (this.clipType * 256 >= 0) {
var9 = var9.contourGround(var3, var4, var5, var6, true, this.clipType * 256); var9 = var9.contourGround(tileHeights, xPacked, avgHeight, yPacked, true, this.clipType * 256);
} }
return var9; return var9;
@@ -693,13 +694,13 @@ public class ObjectDefinition extends DualNode {
garbageValue = "828225621" garbageValue = "828225621"
) )
@Export("getModelData") @Export("getModelData")
final ModelData getModelData(int var1, int var2) { final ModelData getModelData(int type, int rotation) {
ModelData var3 = null; ModelData var3 = null;
boolean var4; boolean var4;
int var5; int var5;
int var7; int var7;
if (this.field3359 == null) { if (this.field3359 == null) {
if (var1 != 10) { if (type != 10) {
return null; return null;
} }
@@ -708,7 +709,7 @@ public class ObjectDefinition extends DualNode {
} }
var4 = this.isRotated; var4 = this.isRotated;
if (var1 == 2 && var2 > 3) { if (type == 2 && rotation > 3) {
var4 = !var4; var4 = !var4;
} }
@@ -746,7 +747,7 @@ public class ObjectDefinition extends DualNode {
int var9 = -1; int var9 = -1;
for (var5 = 0; var5 < this.field3359.length; ++var5) { for (var5 = 0; var5 < this.field3359.length; ++var5) {
if (this.field3359[var5] == var1) { if (this.field3359[var5] == type) {
var9 = var5; var9 = var5;
break; break;
} }
@@ -757,7 +758,7 @@ public class ObjectDefinition extends DualNode {
} }
var5 = this.field3362[var9]; var5 = this.field3362[var9];
boolean var10 = this.isRotated ^ var2 > 3; boolean var10 = this.isRotated ^ rotation > 3;
if (var10) { if (var10) {
var5 += 65536; var5 += 65536;
} }
@@ -790,18 +791,18 @@ public class ObjectDefinition extends DualNode {
var11 = true; var11 = true;
} }
ModelData var8 = new ModelData(var3, var2 == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true); ModelData var8 = new ModelData(var3, rotation == 0 && !var4 && !var11, null == this.recolorFrom, this.retextureFrom == null, true);
if (var1 == 4 && var2 > 3) { if (type == 4 && rotation > 3) {
var8.method2781(256); var8.method2781(256);
var8.method2782(45, 0, -45); var8.method2782(45, 0, -45);
} }
var2 &= 3; rotation &= 3;
if (var2 == 1) { if (rotation == 1) {
var8.method2778(); var8.method2778();
} else if (var2 == 2) { } else if (rotation == 2) {
var8.method2797(); var8.method2797();
} else if (var2 == 3) { } else if (rotation == 3) {
var8.method2780(); var8.method2780();
} }

130
runescape-client/src/main/java/Rasterizer2D.java
View File

@@ -528,80 +528,82 @@ public class Rasterizer2D extends DualNode {
signature = "(IIIIII[BIZ)V", signature = "(IIIIII[BIZ)V",
garbageValue = "1" garbageValue = "1"
) )
@Export("raster2d7") @Export("Rasterizer2D_drawGradientPixels")
public static void raster2d7(int var0, int var1, int var2, int var3, int var4, int var5, byte[] var6, int var7) { public static void Rasterizer2D_drawGradientPixels(int x, int y, int w, int h, int bgCol, int fgCol, byte[] pixels, int pxPerTile) {
if (var0 + var2 >= 0 && var3 + var1 >= 0) { if (x + w < 0 || h + y < 0) {
if (var0 < Rasterizer2D_width && var1 < Rasterizer2D_height) { return;
int var8 = 0; }
int var9 = 0; if (x >= Rasterizer2D_width || y >= Rasterizer2D_height) {
if (var0 < 0) { return;
var8 -= var0; }
var2 += var0; int var8 = 0;
} int var9 = 0;
if (x < 0) {
var8 -= x;
w += x;
}
if (var1 < 0) { if (y < 0) {
var9 -= var1; var9 -= y;
var3 += var1; h += y;
} }
if (var0 + var2 > Rasterizer2D_width) { if (x + w > Rasterizer2D_width) {
var2 = Rasterizer2D_width - var0; w = Rasterizer2D_width - x;
} }
if (var3 + var1 > Rasterizer2D_height) { if (h + y > Rasterizer2D_height) {
var3 = Rasterizer2D_height - var1; h = Rasterizer2D_height - y;
} }
int var10 = var6.length / var7; int var10 = pixels.length / pxPerTile;
int var11 = Rasterizer2D_width - var2; int var11 = Rasterizer2D_width - w;
int var12 = var4 >>> 24; int var12 = bgCol >>> 24;
int var13 = var5 >>> 24; int var13 = fgCol >>> 24;
int var14; int var14;
int var15; int var15;
int var16; int var16;
int var17; int var17;
int var18; int var18;
if (var12 == 255 && var13 == 255) { if (var12 == 255 && var13 == 255) {
var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width; var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) { for (var15 = var9 + y; var15 < h + var9 + y; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) { for (var16 = x + var8; var16 < x + var8 + w; ++var16) {
var17 = (var15 - var1) % var10; var17 = (var15 - y) % var10;
var18 = (var16 - var0) % var7; var18 = (var16 - x) % pxPerTile;
if (var6[var18 + var17 * var7] != 0) { if (pixels[var18 + var17 * pxPerTile] != 0) {
Rasterizer2D_pixels[var14++] = var5; Rasterizer2D_pixels[var14++] = fgCol;
} else { } else {
Rasterizer2D_pixels[var14++] = var4; Rasterizer2D_pixels[var14++] = bgCol;
}
}
var14 += var11;
}
} else {
var14 = var0 + var8 + (var9 + var1) * Rasterizer2D_width;
for (var15 = var9 + var1; var15 < var3 + var9 + var1; ++var15) {
for (var16 = var0 + var8; var16 < var0 + var8 + var2; ++var16) {
var17 = (var15 - var1) % var10;
var18 = (var16 - var0) % var7;
int var19 = var4;
if (var6[var18 + var17 * var7] != 0) {
var19 = var5;
}
int var20 = var19 >>> 24;
int var21 = 255 - var20;
int var22 = Rasterizer2D_pixels[var14];
int var23 = ((var19 & 0xff00ff) * var20 + (var22 & 0xff00ff) * var21 & 0xff00ff00) + (var20 * (var19 & 0xff00) + var21 * (var22 & 0xff00) & 0xff0000) >> 8;
Rasterizer2D_pixels[var14++] = var23;
}
var14 += var11;
} }
} }
var14 += var11;
}
} else {
var14 = x + var8 + (var9 + y) * Rasterizer2D_width;
for (var15 = var9 + y; var15 < h + var9 + y; ++var15) {
for (var16 = x + var8; var16 < x + var8 + w; ++var16) {
var17 = (var15 - y) % var10;
var18 = (var16 - x) % pxPerTile;
int var19 = bgCol;
if (pixels[var18 + var17 * pxPerTile] != 0) {
var19 = fgCol;
}
int var20 = var19 >>> 24;
int var21 = 255 - var20;
int var22 = Rasterizer2D_pixels[var14];
int var23 = ((var19 & 0xff00ff) * var20 + (var22 & 0xff00ff) * var21 & 0xff00ff00) + (var20 * (var19 & 0xff00) + var21 * (var22 & 0xff00) & 0xff0000) >> 8;
Rasterizer2D_pixels[var14++] = var23;
}
var14 += var11;
} }
} }
} }
@ObfuscatedName("de") @ObfuscatedName("de")

527
runescape-client/src/main/java/Scene.java
View File

@@ -419,26 +419,27 @@ public class Scene {
) )
@Export("newBoundaryObject") @Export("newBoundaryObject")
public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) { public void newBoundaryObject(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, long var9, int var11) {
if (var5 != null || var6 != null) { if (var5 == null && var6 == null) {
BoundaryObject var12 = new BoundaryObject(); return;
var12.tag = var9;
var12.flags = var11;
var12.x = var2 * 128 + 64;
var12.y = var3 * 128 + 64;
var12.tileHeight = var4;
var12.entity1 = var5;
var12.entity2 = var6;
var12.orientationA = var7;
var12.orientationB = var8;
for (int var13 = var1; var13 >= 0; --var13) {
if (this.tiles[var13][var2][var3] == null) {
this.tiles[var13][var2][var3] = new Tile(var13, var2, var3);
}
}
this.tiles[var1][var2][var3].boundaryObject = var12;
} }
BoundaryObject var12 = new BoundaryObject();
var12.tag = var9;
var12.flags = var11;
var12.x = var2 * 128 + 64;
var12.y = var3 * 128 + 64;
var12.tileHeight = var4;
var12.entity1 = var5;
var12.entity2 = var6;
var12.orientationA = var7;
var12.orientationB = var8;
for (int var13 = var1; var13 >= 0; --var13) {
if (this.tiles[var13][var2][var3] == null) {
this.tiles[var13][var2][var3] = new Tile(var13, var2, var3);
}
}
this.tiles[var1][var2][var3].boundaryObject = var12;
} }
@ObfuscatedName("u") @ObfuscatedName("u")
@@ -447,28 +448,29 @@ public class Scene {
) )
@Export("newWallDecoration") @Export("newWallDecoration")
public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) { public void newWallDecoration(int var1, int var2, int var3, int var4, Entity var5, Entity var6, int var7, int var8, int var9, int var10, long var11, int var13) {
if (var5 != null) { if (var5 == null) {
WallDecoration var14 = new WallDecoration(); return;
var14.tag = var11;
var14.flags = var13;
var14.x = var2 * 128 + 64;
var14.y = var3 * 128 + 64;
var14.tileHeight = var4;
var14.entity1 = var5;
var14.entity2 = var6;
var14.orientation = var7;
var14.orientation2 = var8;
var14.xOffset = var9;
var14.yOffset = var10;
for (int var15 = var1; var15 >= 0; --var15) {
if (this.tiles[var15][var2][var3] == null) {
this.tiles[var15][var2][var3] = new Tile(var15, var2, var3);
}
}
this.tiles[var1][var2][var3].wallDecoration = var14;
} }
WallDecoration var14 = new WallDecoration();
var14.tag = var11;
var14.flags = var13;
var14.x = var2 * 128 + 64;
var14.y = var3 * 128 + 64;
var14.tileHeight = var4;
var14.entity1 = var5;
var14.entity2 = var6;
var14.orientation = var7;
var14.orientation2 = var8;
var14.xOffset = var9;
var14.yOffset = var10;
for (int var15 = var1; var15 >= 0; --var15) {
if (this.tiles[var15][var2][var3] == null) {
this.tiles[var15][var2][var3] = new Tile(var15, var2, var3);
}
}
this.tiles[var1][var2][var3].wallDecoration = var14;
} }
@ObfuscatedName("x") @ObfuscatedName("x")
@@ -837,38 +839,39 @@ public class Scene {
for (int var5 = 0; var5 < this.xSize; ++var5) { for (int var5 = 0; var5 < this.xSize; ++var5) {
for (int var6 = 0; var6 < this.ySize; ++var6) { for (int var6 = 0; var6 < this.ySize; ++var6) {
Tile var7 = this.tiles[var4][var5][var6]; Tile var7 = this.tiles[var4][var5][var6];
if (var7 != null) { if (var7 == null) {
BoundaryObject var8 = var7.boundaryObject; continue;
ModelData var10; }
if (var8 != null && var8.entity1 instanceof ModelData) { BoundaryObject var8 = var7.boundaryObject;
ModelData var9 = (ModelData)var8.entity1; ModelData var10;
this.method3099(var9, var4, var5, var6, 1, 1); if (var8 != null && var8.entity1 instanceof ModelData) {
if (var8.entity2 instanceof ModelData) { ModelData var9 = (ModelData)var8.entity1;
var10 = (ModelData)var8.entity2; this.method3099(var9, var4, var5, var6, 1, 1);
this.method3099(var10, var4, var5, var6, 1, 1); if (var8.entity2 instanceof ModelData) {
ModelData.method2790(var9, var10, 0, 0, 0, false); var10 = (ModelData)var8.entity2;
var8.entity2 = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3); this.method3099(var10, var4, var5, var6, 1, 1);
} ModelData.method2790(var9, var10, 0, 0, 0, false);
var8.entity2 = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3);
var8.entity1 = var9.toModel(var9.field1580, var9.field1577, var1, var2, var3);
} }
for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { var8.entity1 = var9.toModel(var9.field1580, var9.field1577, var1, var2, var3);
GameObject var14 = var7.gameObjects[var12]; }
if (var14 != null && var14.entity instanceof ModelData) {
ModelData var11 = (ModelData)var14.entity;
this.method3099(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1);
var14.entity = var11.toModel(var11.field1580, var11.field1577, var1, var2, var3);
}
}
FloorDecoration var13 = var7.floorDecoration; for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) {
if (var13 != null && var13.entity instanceof ModelData) { GameObject var14 = var7.gameObjects[var12];
var10 = (ModelData)var13.entity; if (var14 != null && var14.entity instanceof ModelData) {
this.method3120(var10, var4, var5, var6); ModelData var11 = (ModelData)var14.entity;
var13.entity = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3); this.method3099(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1);
var14.entity = var11.toModel(var11.field1580, var11.field1577, var1, var2, var3);
} }
} }
FloorDecoration var13 = var7.floorDecoration;
if (var13 != null && var13.entity instanceof ModelData) {
var10 = (ModelData)var13.entity;
this.method3120(var10, var4, var5, var6);
var13.entity = var10.toModel(var10.field1580, var10.field1577, var1, var2, var3);
}
} }
} }
} }
@@ -928,46 +931,50 @@ public class Scene {
int var11 = var4 + var6; int var11 = var4 + var6;
for (int var12 = var2; var12 <= var2 + 1; ++var12) { for (int var12 = var2; var12 <= var2 + 1; ++var12) {
if (var12 != this.planes) { if (var12 == this.planes) {
for (int var13 = var8; var13 <= var9; ++var13) { continue;
if (var13 >= 0 && var13 < this.xSize) { }
for (int var14 = var10; var14 <= var11; ++var14) { for (int var13 = var8; var13 <= var9; ++var13) {
if (var14 >= 0 && var14 < this.ySize && (!var7 || var13 >= var9 || var14 >= var11 || var14 < var4 && var3 != var13)) { if (var13 < 0 || var13 >= this.xSize) {
Tile var15 = this.tiles[var12][var13][var14]; continue;
if (var15 != null) { }
int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4; for (int var14 = var10; var14 <= var11; ++var14) {
BoundaryObject var17 = var15.boundaryObject; if (var14 < 0 || var14 >= this.ySize || (var7 && var13 < var9 && var14 < var11 && (var14 >= var4 || var3 == var13))) {
if (var17 != null) { continue;
ModelData var18; }
if (var17.entity1 instanceof ModelData) { Tile var15 = this.tiles[var12][var13][var14];
var18 = (ModelData)var17.entity1; if (var15 == null) {
ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); continue;
} }
int var16 = (this.tileHeights[var12][var13 + 1][var14] + this.tileHeights[var12][var13 + 1][var14 + 1] + this.tileHeights[var12][var13][var14] + this.tileHeights[var12][var13][var14 + 1]) / 4 - (this.tileHeights[var2][var3 + 1][var4] + this.tileHeights[var2][var3][var4] + this.tileHeights[var2][var3 + 1][var4 + 1] + this.tileHeights[var2][var3][var4 + 1]) / 4;
BoundaryObject var17 = var15.boundaryObject;
if (var17 != null) {
ModelData var18;
if (var17.entity1 instanceof ModelData) {
var18 = (ModelData)var17.entity1;
ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
}
if (var17.entity2 instanceof ModelData) { if (var17.entity2 instanceof ModelData) {
var18 = (ModelData)var17.entity2; var18 = (ModelData)var17.entity2;
ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); ModelData.method2790(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7);
} }
} }
for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) {
GameObject var19 = var15.gameObjects[var23]; GameObject var19 = var15.gameObjects[var23];
if (var19 != null && var19.entity instanceof ModelData) { if (var19 != null && var19.entity instanceof ModelData) {
ModelData var20 = (ModelData)var19.entity; ModelData var20 = (ModelData)var19.entity;
int var21 = var19.endX - var19.startX + 1; int var21 = var19.endX - var19.startX + 1;
int var22 = var19.endY - var19.startY + 1; int var22 = var19.endY - var19.startY + 1;
ModelData.method2790(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); ModelData.method2790(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7);
}
}
}
}
} }
} }
} }
--var8;
var7 = false;
} }
--var8;
var7 = false;
} }
} }
@@ -976,63 +983,64 @@ public class Scene {
@Export("drawTileMinimap") @Export("drawTileMinimap")
public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) { public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
Tile var7 = this.tiles[var4][var5][var6]; Tile var7 = this.tiles[var4][var5][var6];
if (var7 != null) { if (var7 == null) {
TilePaint var8 = var7.paint; return;
int var10; }
if (var8 != null) { TilePaint var8 = var7.paint;
int var9 = var8.rgb; int var10;
if (var9 != 0) { if (var8 != null) {
for (var10 = 0; var10 < 4; ++var10) { int var9 = var8.rgb;
var1[var2] = var9; if (var9 != 0) {
var1[var2 + 1] = var9; for (var10 = 0; var10 < 4; ++var10) {
var1[var2 + 2] = var9; var1[var2] = var9;
var1[var2 + 3] = var9; var1[var2 + 1] = var9;
var1[var2 + 2] = var9;
var1[var2 + 3] = var9;
var2 += var3;
}
}
} else {
TileModel var18 = var7.model;
if (var18 != null) {
var10 = var18.shape;
int var11 = var18.rotation;
int var12 = var18.underlayRgb;
int var13 = var18.overlayRgb;
int[] var14 = this.tileShape2D[var10];
int[] var15 = this.tileRotation2D[var11];
int var16 = 0;
int var17;
if (var12 != 0) {
for (var17 = 0; var17 < 4; ++var17) {
var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13;
var2 += var3; var2 += var3;
} }
} else {
} for (var17 = 0; var17 < 4; ++var17) {
} else { if (var14[var15[var16++]] != 0) {
TileModel var18 = var7.model; var1[var2] = var13;
if (var18 != null) {
var10 = var18.shape;
int var11 = var18.rotation;
int var12 = var18.underlayRgb;
int var13 = var18.overlayRgb;
int[] var14 = this.tileShape2D[var10];
int[] var15 = this.tileRotation2D[var11];
int var16 = 0;
int var17;
if (var12 != 0) {
for (var17 = 0; var17 < 4; ++var17) {
var1[var2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 1] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 2] = var14[var15[var16++]] == 0 ? var12 : var13;
var1[var2 + 3] = var14[var15[var16++]] == 0 ? var12 : var13;
var2 += var3;
} }
} else {
for (var17 = 0; var17 < 4; ++var17) {
if (var14[var15[var16++]] != 0) {
var1[var2] = var13;
}
if (var14[var15[var16++]] != 0) { if (var14[var15[var16++]] != 0) {
var1[var2 + 1] = var13; var1[var2 + 1] = var13;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 2] = var13;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 3] = var13;
}
var2 += var3;
} }
if (var14[var15[var16++]] != 0) {
var1[var2 + 2] = var13;
}
if (var14[var15[var16++]] != 0) {
var1[var2 + 3] = var13;
}
var2 += var3;
} }
} }
} }
} }
} }
@@ -1810,91 +1818,95 @@ public class Scene {
var21 = var17 * var4 - var3 * var12 >> 16; var21 = var17 * var4 - var3 * var12 >> 16;
var12 = var3 * var17 + var12 * var4 >> 16; var12 = var3 * var17 + var12 * var4 >> 16;
var17 = var21; var17 = var21;
if (var12 >= 50) { if (var12 < 50) {
var21 = var14 * var6 + var5 * var11 >> 16; return;
var11 = var11 * var6 - var5 * var14 >> 16; }
var14 = var21; var21 = var14 * var6 + var5 * var11 >> 16;
var21 = var18 * var4 - var3 * var11 >> 16; var11 = var11 * var6 - var5 * var14 >> 16;
var11 = var3 * var18 + var11 * var4 >> 16; var14 = var21;
var18 = var21; var21 = var18 * var4 - var3 * var11 >> 16;
if (var11 >= 50) { var11 = var3 * var18 + var11 * var4 >> 16;
var21 = var13 * var6 + var5 * var16 >> 16; var18 = var21;
var16 = var16 * var6 - var5 * var13 >> 16; if (var11 < 50) {
var13 = var21; return;
var21 = var19 * var4 - var3 * var16 >> 16; }
var16 = var3 * var19 + var16 * var4 >> 16; var21 = var13 * var6 + var5 * var16 >> 16;
var19 = var21; var16 = var16 * var6 - var5 * var13 >> 16;
if (var16 >= 50) { var13 = var21;
var21 = var9 * var6 + var5 * var15 >> 16; var21 = var19 * var4 - var3 * var16 >> 16;
var15 = var15 * var6 - var5 * var9 >> 16; var16 = var3 * var19 + var16 * var4 >> 16;
var9 = var21; var19 = var21;
var21 = var20 * var4 - var3 * var15 >> 16; if (var16 < 50) {
var15 = var3 * var20 + var15 * var4 >> 16; return;
if (var15 >= 50) { }
int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; var21 = var9 * var6 + var5 * var15 >> 16;
int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; var15 = var15 * var6 - var5 * var9 >> 16;
int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX; var9 = var21;
int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY; var21 = var20 * var4 - var3 * var15 >> 16;
int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX; var15 = var3 * var20 + var15 * var4 >> 16;
int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY; if (var15 < 50) {
int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX; return;
int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY; }
Rasterizer3D.Rasterizer3D_alpha = 0; int var22 = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX;
int var30; int var23 = var17 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY;
if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) { int var24 = var14 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidX;
Rasterizer3D.field1763 = false; int var25 = var18 * Rasterizer3D.Rasterizer3D_zoom / var11 + Rasterizer3D.Rasterizer3D_clipMidY;
if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) { int var26 = var13 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidX;
Rasterizer3D.field1763 = true; int var27 = var19 * Rasterizer3D.Rasterizer3D_zoom / var16 + Rasterizer3D.Rasterizer3D_clipMidY;
} int var28 = var9 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidX;
int var29 = var21 * Rasterizer3D.Rasterizer3D_zoom / var15 + Rasterizer3D.Rasterizer3D_clipMidY;
Rasterizer3D.Rasterizer3D_alpha = 0;
int var30;
if ((var26 - var28) * (var25 - var29) - (var27 - var29) * (var24 - var28) > 0) {
Rasterizer3D.field1763 = false;
if (var26 < 0 || var28 < 0 || var24 < 0 || var26 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) { if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var27, var29, var25, var26, var28, var24)) {
Scene_selectedX = var7; Scene_selectedX = var7;
Scene_selectedY = var8; Scene_selectedY = var8;
} }
if (var1.texture == -1) { if (var1.texture == -1) {
if (var1.neColor != 12345678) { if (var1.neColor != 12345678) {
Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor); Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor);
}
} else if (!Scene_isLowDetail) {
if (var1.isFlat) {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture);
}
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, method3111(var30, var1.neColor), method3111(var30, var1.nwColor), method3111(var30, var1.seColor));
}
}
if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
Rasterizer3D.field1763 = false;
if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
Scene_selectedX = var7;
Scene_selectedY = var8;
}
if (var1.texture == -1) {
if (var1.swColor != 12345678) {
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
}
} else if (!Scene_isLowDetail) {
Rasterizer3D.method2988(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, method3111(var30, var1.swColor), method3111(var30, var1.seColor), method3111(var30, var1.nwColor));
}
}
}
} }
} else if (!Scene_isLowDetail) {
if (var1.isFlat) {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
Rasterizer3D.method2988(var27, var29, var25, var26, var28, var24, var1.neColor, var1.nwColor, var1.seColor, var13, var9, var14, var19, var21, var18, var16, var15, var11, var1.texture);
}
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var27, var29, var25, var26, var28, var24, method3111(var30, var1.neColor), method3111(var30, var1.nwColor), method3111(var30, var1.seColor));
} }
} }
if ((var22 - var24) * (var29 - var25) - (var23 - var25) * (var28 - var24) > 0) {
Rasterizer3D.field1763 = false;
if (var22 < 0 || var24 < 0 || var28 < 0 || var22 > Rasterizer3D.Rasterizer3D_clipWidth || var24 > Rasterizer3D.Rasterizer3D_clipWidth || var28 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var23, var25, var29, var22, var24, var28)) {
Scene_selectedX = var7;
Scene_selectedY = var8;
}
if (var1.texture == -1) {
if (var1.swColor != 12345678) {
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor);
}
} else if (!Scene_isLowDetail) {
Rasterizer3D.method2988(var23, var25, var29, var22, var24, var28, var1.swColor, var1.seColor, var1.nwColor, var10, var14, var9, var17, var18, var21, var12, var11, var15, var1.texture);
} else {
var30 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.texture);
Rasterizer3D.method3020(var23, var25, var29, var22, var24, var28, method3111(var30, var1.swColor), method3111(var30, var1.seColor), method3111(var30, var1.nwColor));
}
}
} }
@ObfuscatedName("ay") @ObfuscatedName("ay")
@@ -1946,31 +1958,32 @@ public class Scene {
int var16 = TileModel.field1605[var10]; int var16 = TileModel.field1605[var10];
int var17 = TileModel.field1605[var11]; int var17 = TileModel.field1605[var11];
int var18 = TileModel.field1605[var12]; int var18 = TileModel.field1605[var12];
if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) <= 0) {
Rasterizer3D.field1763 = false; continue;
if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { }
Rasterizer3D.field1763 = true; Rasterizer3D.field1763 = false;
} if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) {
Rasterizer3D.field1763 = true;
}
if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) { if (checkClick && containsBounds(Scene_selectedScreenX, Scene_selectedScreenY, var16, var17, var18, var13, var14, var15)) {
Scene_selectedX = var6; Scene_selectedX = var6;
Scene_selectedY = var7; Scene_selectedY = var7;
} }
if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) {
if (!Scene_isLowDetail) { if (!Scene_isLowDetail) {
if (var1.isFlat) { if (var1.isFlat) {
Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[0], TileModel.field1594[1], TileModel.field1594[3], TileModel.field1607[0], TileModel.field1607[1], TileModel.field1607[3], TileModel.field1608[0], TileModel.field1608[1], TileModel.field1608[3], var1.triangleTextureId[var9]); Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[0], TileModel.field1594[1], TileModel.field1594[3], TileModel.field1607[0], TileModel.field1607[1], TileModel.field1607[3], TileModel.field1608[0], TileModel.field1608[1], TileModel.field1608[3], var1.triangleTextureId[var9]);
} else {
Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[var10], TileModel.field1594[var11], TileModel.field1594[var12], TileModel.field1607[var10], TileModel.field1607[var11], TileModel.field1607[var12], TileModel.field1608[var10], TileModel.field1608[var11], TileModel.field1608[var12], var1.triangleTextureId[var9]);
}
} else { } else {
int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); Rasterizer3D.method2988(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1594[var10], TileModel.field1594[var11], TileModel.field1594[var12], TileModel.field1607[var10], TileModel.field1607[var11], TileModel.field1607[var12], TileModel.field1608[var10], TileModel.field1608[var11], TileModel.field1608[var12], var1.triangleTextureId[var9]);
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, method3111(var19, var1.triangleColorA[var9]), method3111(var19, var1.triangleColorB[var9]), method3111(var19, var1.triangleColorC[var9]));
} }
} else if (var1.triangleColorA[var9] != 12345678) { } else {
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]); int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]);
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, method3111(var19, var1.triangleColorA[var9]), method3111(var19, var1.triangleColorB[var9]), method3111(var19, var1.triangleColorC[var9]));
} }
} else if (var1.triangleColorA[var9] != 12345678) {
Rasterizer3D.method3020(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9]);
} }
} }
@@ -2580,12 +2593,12 @@ public class Scene {
int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2); int var8 = (var1 - var2) * (var6 - var5) - (var0 - var5) * (var3 - var2);
int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3); int var9 = (var7 - var6) * (var1 - var3) - (var0 - var6) * (var4 - var3);
int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7); int var10 = (var5 - var7) * (var1 - var4) - (var2 - var4) * (var0 - var7);
if (var8 == 0) { if (var8 != 0) {
if (var9 != 0) { return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0;
return var9 < 0 ? var10 <= 0 : var10 >= 0;
}
return true;
} }
return var8 < 0 ? var9 <= 0 && var10 <= 0 : var9 >= 0 && var10 >= 0; if (var9 != 0) {
return var9 < 0 ? var10 <= 0 : var10 >= 0;
}
return true;
} }
} }

1
runescape-client/src/main/java/ScriptFrame.java
View File

@@ -353,6 +353,7 @@ public class ScriptFrame {
signature = "(III)V", signature = "(III)V",
garbageValue = "-881674814" garbageValue = "-881674814"
) )
@Export("resumePauseWidget")
static void resumePauseWidget(int parentID, int childID) { static void resumePauseWidget(int parentID, int childID) {
PacketBufferNode var2 = Archive.method4265(ClientPacket.field2273, Client.packetWriter.isaacCipher); PacketBufferNode var2 = Archive.method4265(ClientPacket.field2273, Client.packetWriter.isaacCipher);
var2.packetBuffer.writeIntLE16(parentID); var2.packetBuffer.writeIntLE16(parentID);

1
runescape-client/src/main/java/ServerBuild.java
View File

@@ -32,6 +32,7 @@ public class ServerBuild {
@Export("WIP") @Export("WIP")
static final ServerBuild WIP; static final ServerBuild WIP;
@ObfuscatedName("f") @ObfuscatedName("f")
@Export("Tiles_hue")
static int[] Tiles_hue; static int[] Tiles_hue;
@ObfuscatedName("k") @ObfuscatedName("k")
@Export("name") @Export("name")

2
runescape-client/src/main/java/Tiles.java
View File

@@ -33,8 +33,10 @@ public final class Tiles {
@ObfuscatedName("c") @ObfuscatedName("c")
static int[][] field515; static int[][] field515;
@ObfuscatedName("m") @ObfuscatedName("m")
@Export("Tiles_saturation")
static int[] Tiles_saturation; static int[] Tiles_saturation;
@ObfuscatedName("u") @ObfuscatedName("u")
@Export("Tiles_lightness")
static int[] Tiles_lightness; static int[] Tiles_lightness;
@ObfuscatedName("j") @ObfuscatedName("j")
static final int[] field512; static final int[] field512;

4
runescape-client/src/main/java/WorldMapRegion.java
View File

@@ -538,7 +538,7 @@ public class WorldMapRegion {
} else if (var11.primaryRgb == 0xff00ff) { } else if (var11.primaryRgb == 0xff00ff) {
var9 = var10; var9 = var10;
} else { } else {
var17 = class192.method3679(var11.hue, var11.saturation, var11.lightness); var17 = class192.WorldMap_hslToRgb(var11.hue, var11.saturation, var11.lightness);
var15 = 96; var15 = 96;
if (var17 == -2) { if (var17 == -2) {
var14 = 12345678; var14 = 12345678;
@@ -648,7 +648,7 @@ public class WorldMapRegion {
} else if (var9.primaryRgb == 0xff00ff) { } else if (var9.primaryRgb == 0xff00ff) {
var7 = var8; var7 = var8;
} else { } else {
var16 = class192.method3679(var9.hue, var9.saturation, var9.lightness); var16 = class192.WorldMap_hslToRgb(var9.hue, var9.saturation, var9.lightness);
var13 = 96; var13 = 96;
if (var16 == -2) { if (var16 == -2) {
var12 = 12345678; var12 = 12345678;

3
runescape-client/src/main/java/class192.java
View File

@@ -125,7 +125,8 @@ public enum class192 implements Enumerated {
signature = "(IIIB)I", signature = "(IIIB)I",
garbageValue = "69" garbageValue = "69"
) )
static int method3679(int var0, int var1, int var2) { @Export("WorldMap_hslToRgb")
static int WorldMap_hslToRgb(int var0, int var1, int var2) {
if (var2 > 179) { if (var2 > 179) {
var1 /= 2; var1 /= 2;
} }

4
runescape-client/src/main/java/class40.java
View File

@@ -42,11 +42,11 @@ public class class40 {
signature = "(IIIIIIIII)V", signature = "(IIIIIIIII)V",
garbageValue = "1804465340" garbageValue = "1804465340"
) )
void method698(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) { void method698(int x, int y, int var3, int col, int w, int h, int var7, int var8) {
if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) { if (var7 != 0 && this.pixelsPerTile != 0 && this.tileTemplates != null) {
var8 = this.method699(var8, var7); var8 = this.method699(var8, var7);
var7 = this.method712(var7); var7 = this.method712(var7);
Rasterizer2D.raster2d7(var1, var2, var5, var6, var3, var4, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile); Rasterizer2D.Rasterizer2D_drawGradientPixels(x, y, w, h, var3, col, this.tileTemplates[var7 - 1][var8], this.pixelsPerTile);
} }
} }