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

develop

Browse Source
This commit is contained in:
therealunull
2020-12-14 05:25:01 -05:00
parent 77ea6c6154
commit b86aa9c5cc
207 changed files with 16762 additions and 3374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("cx")
@Implements("Actor")
public abstract class Actor extends Entity {
public abstract class Actor extends Renderable
{
@ObfuscatedName("hg")
@ObfuscatedSignature(
descriptor = "[Llm;"

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

@@ -42,13 +42,13 @@ public final class BoundaryObject {
descriptor = "Ler;"
)
@Export("entity1")
public Entity entity1;
public Renderable renderable1;
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "Ler;"
)
@Export("entity2")
public Entity entity2;
public Renderable renderable2;
@ObfuscatedName("p")
@ObfuscatedGetter(
longValue = 6107262315709824135L

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

@@ -73,7 +73,7 @@ public final class Canvas extends java.awt.Canvas {
Login.Login_loadingPercent = 10; // L: 1737
Client.titleLoadingStage = 30; // L: 1738
} else if (Client.titleLoadingStage == 30) { // L: 1741
TilePaint.archive0 = WorldMapCacheName.newArchive(0, false, true, true); // L: 1742
SceneTilePaint.archive0 = WorldMapCacheName.newArchive(0, false, true, true); // L: 1742
WorldMapSprite.archive1 = WorldMapCacheName.newArchive(1, false, true, true); // L: 1743
DynamicObject.archive2 = WorldMapCacheName.newArchive(2, true, false, true); // L: 1744
class330.archive3 = WorldMapCacheName.newArchive(3, false, true, true); // L: 1745
@@ -98,7 +98,7 @@ public final class Canvas extends java.awt.Canvas {
Client.titleLoadingStage = 40; // L: 1764
} else if (Client.titleLoadingStage == 40) { // L: 1767
byte var23 = 0; // L: 1768
var12 = var23 + TilePaint.archive0.percentage() * 4 / 100; // L: 1769
var12 = var23 + SceneTilePaint.archive0.percentage() * 4 / 100; // L: 1769
var12 += WorldMapSprite.archive1.percentage() * 4 / 100; // L: 1770
var12 += DynamicObject.archive2.percentage() * 2 / 100; // L: 1771
var12 += class330.archive3.percentage() * 2 / 100; // L: 1772
@@ -125,7 +125,7 @@ public final class Canvas extends java.awt.Canvas {
Login.Login_loadingPercent = 30; // L: 1791
} else {
UserComparator4.method3469(TilePaint.archive0, "Animations"); // L: 1794
UserComparator4.method3469(SceneTilePaint.archive0, "Animations"); // L: 1794
UserComparator4.method3469(WorldMapSprite.archive1, "Skeletons"); // L: 1795
UserComparator4.method3469(class227.archive4, "Sound FX"); // L: 1796
UserComparator4.method3469(GameShell.archive5, "Maps"); // L: 1797
@@ -276,7 +276,7 @@ public final class Canvas extends java.awt.Canvas {
World.method1849(DynamicObject.archive2, BuddyRankComparator.archive7); // L: 1920
ParamDefinition.method4526(DynamicObject.archive2); // L: 1921
Actor.method1821(DynamicObject.archive2, BuddyRankComparator.archive7, Client.isMembersWorld, class297.fontPlain11); // L: 1922
PcmPlayer.method2538(DynamicObject.archive2, TilePaint.archive0, WorldMapSprite.archive1); // L: 1923
PcmPlayer.method2538(DynamicObject.archive2, SceneTilePaint.archive0, WorldMapSprite.archive1); // L: 1923
ModelData0.method3331(DynamicObject.archive2, BuddyRankComparator.archive7); // L: 1924
class200.method3712(DynamicObject.archive2); // L: 1925
Archive var18 = DynamicObject.archive2; // L: 1926

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

@@ -3056,7 +3056,7 @@ public final class Client extends GameShell implements Usernamed {
var5.packetBuffer.method5718(Messages.archive8.hash); // L: 2380
var5.packetBuffer.method5587(DynamicObject.archive2.hash); // L: 2381
var5.packetBuffer.method5718(class330.archive3.hash); // L: 2382
var5.packetBuffer.method5587(TilePaint.archive0.hash); // L: 2383
var5.packetBuffer.method5587(SceneTilePaint.archive0.hash); // L: 2383
var5.packetBuffer.writeInt(class227.archive4.hash); // L: 2384
var5.packetBuffer.method5587(0); // L: 2385
var5.packetBuffer.method5588(BuddyRankComparator.archive7.hash); // L: 2386

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

@@ -6,7 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("cn")
@Implements("DynamicObject")
public class DynamicObject extends Entity {
public class DynamicObject extends Renderable
{
@ObfuscatedName("rl")
@ObfuscatedGetter(
intValue = 2126595663
@@ -84,7 +85,7 @@ public class DynamicObject extends Entity {
@ObfuscatedSignature(
descriptor = "(IIIIIIIZLer;)V"
)
DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Entity var9) {
DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) {
this.id = var1;
this.type = var2; // L: 21
this.orientation = var3; // L: 22

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

@@ -30,7 +30,7 @@ public final class FloorDecoration {
descriptor = "Ler;"
)
@Export("entity")
public Entity entity;
public Renderable renderable;
@ObfuscatedName("t")
@ObfuscatedGetter(
longValue = 2801138791321477185L

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

@@ -157,7 +157,7 @@ public class FontName {
if (var1 != -1412584499 && !var10.isScrollBar) { // L: 8954
class200.field2390 = var0; // L: 8955
Client.field923 = var6; // L: 8956
Entity.field1893 = var7; // L: 8957
Renderable.field1893 = var7; // L: 8957
continue; // L: 8958
}

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

@@ -42,7 +42,7 @@ public final class GameObject {
descriptor = "Ler;"
)
@Export("entity")
public Entity entity;
public Renderable renderable;
@ObfuscatedName("j")
@ObfuscatedGetter(
intValue = 1255599163

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

@@ -6,7 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ce")
@Implements("GraphicsObject")
public final class GraphicsObject extends Entity {
public final class GraphicsObject extends Renderable
{
@ObfuscatedName("a")
public static String[] field1117;
@ObfuscatedName("h")

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

@@ -217,7 +217,7 @@ public final class KeyHandler implements KeyListener, FocusListener {
class200.field2390 = null; // L: 8921
FontName.drawInterface(class9.Widget_interfaceComponents[var0], -1, var1, var2, var3, var4, var5, var6, var7); // L: 8922
if (class200.field2390 != null) { // L: 8923
FontName.drawInterface(class200.field2390, -1412584499, var1, var2, var3, var4, Client.field923, Entity.field1893, var7); // L: 8924
FontName.drawInterface(class200.field2390, -1412584499, var1, var2, var3, var4, Client.field923, Renderable.field1893, var7); // L: 8924
class200.field2390 = null; // L: 8925
}

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

@@ -5,7 +5,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("eh")
@Implements("Model")
public class Model extends Entity {
public class Model extends Renderable
{
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Leh;"

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

@@ -5,7 +5,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("es")
@Implements("ModelData")
public class ModelData extends Entity {
public class ModelData extends Renderable
{
@ObfuscatedName("av")
static int[] field1598;
@ObfuscatedName("aq")

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

@@ -581,7 +581,7 @@ public class ObjectComposition extends DualNode {
garbageValue = "-18803"
)
@Export("getEntity")
public final Entity getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
public final Renderable getEntity(int var1, int var2, int[][] var3, int var4, int var5, int var6) {
long var7;
if (this.models == null) { // L: 254
var7 = (long)(var2 + (this.id << 10));
@@ -589,7 +589,7 @@ public class ObjectComposition extends DualNode {
var7 = (long)(var2 + (var1 << 3) + (this.id << 10)); // L: 255
}
Object var9 = (Entity)ObjectDefinition_cachedEntities.get(var7); // L: 256
Object var9 = (Renderable)ObjectDefinition_cachedEntities.get(var7); // L: 256
if (var9 == null) { // L: 257
ModelData var10 = this.getModelData(var1, var2); // L: 258
if (var10 == null) { // L: 259
@@ -620,7 +620,7 @@ public class ObjectComposition extends DualNode {
}
}
return (Entity)var9; // L: 276
return (Renderable)var9; // L: 276
}
@ObfuscatedName("p")

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

@@ -6,7 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("cu")
@Implements("Projectile")
public final class Projectile extends Entity {
public final class Projectile extends Renderable
{
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = -1007905183

6
runescape-client/src/main/java/Entity.java → runescape-client/src/main/java/Renderable.java
View File

@@ -5,8 +5,8 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("er")
@Implements("Entity")
public abstract class Entity extends DualNode {
@Implements("Renderable")
public abstract class Renderable extends DualNode {
@ObfuscatedName("nw")
@ObfuscatedGetter(
intValue = -1743769759
@@ -19,7 +19,7 @@ public abstract class Entity extends DualNode {
@Export("height")
public int height;
protected Entity() {
protected Renderable() {
this.height = 1000; // L: 6
} // L: 8

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

@@ -318,10 +318,10 @@ public class Scene {
@ObfuscatedName("j")
@Export("addTile")
public void addTile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19, int var20) {
TilePaint var21;
SceneTilePaint var21;
int var22;
if (var4 == 0) { // L: 171
var21 = new TilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172
var21 = new SceneTilePaint(var11, var12, var13, var14, -1, var19, false); // L: 172
for (var22 = var1; var22 >= 0; --var22) { // L: 173
if (this.tiles[var22][var2][var3] == null) {
@@ -331,7 +331,7 @@ public class Scene {
this.tiles[var1][var2][var3].paint = var21; // L: 174
} else if (var4 != 1) { // L: 177
TileModel var23 = new TileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183
SceneTileModel var23 = new SceneTileModel(var4, var5, var6, var2, var3, var7, var8, var9, var10, var11, var12, var13, var14, var15, var16, var17, var18, var19, var20); // L: 183
for (var22 = var1; var22 >= 0; --var22) { // L: 184
if (this.tiles[var22][var2][var3] == null) {
@@ -341,7 +341,7 @@ public class Scene {
this.tiles[var1][var2][var3].model = var23; // L: 185
} else {
var21 = new TilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178
var21 = new SceneTilePaint(var15, var16, var17, var18, var6, var20, var8 == var7 && var7 == var9 && var10 == var7); // L: 178
for (var22 = var1; var22 >= 0; --var22) { // L: 179
if (this.tiles[var22][var2][var3] == null) {
@@ -358,10 +358,10 @@ public class Scene {
descriptor = "(IIIILer;JI)V"
)
@Export("newFloorDecoration")
public void newFloorDecoration(int var1, int var2, int var3, int var4, Entity var5, long var6, int var8) {
public void newFloorDecoration(int var1, int var2, int var3, int var4, Renderable var5, long var6, int var8) {
if (var5 != null) { // L: 189
FloorDecoration var9 = new FloorDecoration(); // L: 190
var9.entity = var5; // L: 191
var9.renderable = var5; // L: 191
var9.x = var2 * 128 + 64; // L: 192
var9.y = var3 * 128 + 64; // L: 193
var9.tileHeight = var4; // L: 194
@@ -380,7 +380,7 @@ public class Scene {
descriptor = "(IIIILer;JLer;Ler;)V"
)
@Export("newGroundItemPile")
public void newGroundItemPile(int var1, int var2, int var3, int var4, Entity var5, long var6, Entity var8, Entity var9) {
public void newGroundItemPile(int var1, int var2, int var3, int var4, Renderable var5, long var6, Renderable var8, Renderable var9) {
TileItemPile var10 = new TileItemPile(); // L: 202
var10.first = var5; // L: 203
var10.x = var2 * 128 + 64; // L: 204
@@ -393,8 +393,8 @@ public class Scene {
Tile var12 = this.tiles[var1][var2][var3]; // L: 211
if (var12 != null) { // L: 212
for (int var13 = 0; var13 < var12.gameObjectsCount; ++var13) { // L: 213
if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].entity instanceof Model) { // L: 214
Model var14 = (Model)var12.gameObjects[var13].entity; // L: 215
if ((var12.gameObjects[var13].flags & 256) == 256 && var12.gameObjects[var13].renderable instanceof Model) { // L: 214
Model var14 = (Model)var12.gameObjects[var13].renderable; // L: 215
var14.calculateBoundsCylinder(); // L: 216
if (var14.height > var11) { // L: 217
var11 = var14.height;
@@ -416,7 +416,7 @@ public class Scene {
descriptor = "(IIIILer;Ler;IIJI)V"
)
@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, Renderable var5, Renderable var6, int var7, int var8, long var9, int var11) {
if (var5 != null || var6 != null) { // L: 227
BoundaryObject var12 = new BoundaryObject(); // L: 228
var12.tag = var9; // L: 229
@@ -424,8 +424,8 @@ public class Scene {
var12.x = var2 * 128 + 64; // L: 231
var12.y = var3 * 128 + 64; // L: 232
var12.tileHeight = var4; // L: 233
var12.entity1 = var5; // L: 234
var12.entity2 = var6; // L: 235
var12.renderable1 = var5; // L: 234
var12.renderable2 = var6; // L: 235
var12.orientationA = var7; // L: 236
var12.orientationB = var8; // L: 237
@@ -444,7 +444,7 @@ public class Scene {
descriptor = "(IIIILer;Ler;IIIIJI)V"
)
@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, Renderable var5, Renderable var6, int var7, int var8, int var9, int var10, long var11, int var13) {
if (var5 != null) { // L: 243
WallDecoration var14 = new WallDecoration(); // L: 244
var14.tag = var11; // L: 245
@@ -452,8 +452,8 @@ public class Scene {
var14.x = var2 * 128 + 64; // L: 247
var14.y = var3 * 128 + 64; // L: 248
var14.tileHeight = var4; // L: 249
var14.entity1 = var5; // L: 250
var14.entity2 = var6; // L: 251
var14.renderable1 = var5; // L: 250
var14.renderable2 = var6; // L: 251
var14.orientation = var7; // L: 252
var14.orientation2 = var8; // L: 253
var14.xOffset = var9; // L: 254
@@ -473,7 +473,7 @@ public class Scene {
@ObfuscatedSignature(
descriptor = "(IIIIIILer;IJI)Z"
)
public boolean method3160(int var1, int var2, int var3, int var4, int var5, int var6, Entity var7, int var8, long var9, int var11) {
public boolean method3160(int var1, int var2, int var3, int var4, int var5, int var6, Renderable var7, int var8, long var9, int var11) {
if (var7 == null) { // L: 261
return true;
} else {
@@ -488,7 +488,7 @@ public class Scene {
descriptor = "(IIIIILer;IJZ)Z"
)
@Export("drawEntity")
public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, boolean var10) {
public boolean drawEntity(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, boolean var10) {
if (var6 == null) { // L: 268
return true;
} else {
@@ -527,7 +527,7 @@ public class Scene {
descriptor = "(IIIIILer;IJIIII)Z"
)
@Export("addNullableObject")
public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Entity var6, int var7, long var8, int var10, int var11, int var12, int var13) {
public boolean addNullableObject(int var1, int var2, int var3, int var4, int var5, Renderable var6, int var7, long var8, int var10, int var11, int var12, int var13) {
return var6 == null ? true : this.newGameObject(var1, var10, var11, var12 - var10 + 1, var13 - var11 + 1, var2, var3, var4, var6, var7, true, var8, 0); // L: 287 288
}
@@ -536,7 +536,7 @@ public class Scene {
descriptor = "(IIIIIIIILer;IZJI)Z"
)
@Export("newGameObject")
boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Entity var9, int var10, boolean var11, long var12, int var14) {
boolean newGameObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, Renderable var9, int var10, boolean var11, long var12, int var14) {
int var16;
for (int var15 = var2; var15 < var2 + var4; ++var15) { // L: 292
for (var16 = var3; var16 < var3 + var5; ++var16) { // L: 293
@@ -558,7 +558,7 @@ public class Scene {
var21.centerX = var6; // L: 303
var21.centerY = var7; // L: 304
var21.height = var8; // L: 305
var21.entity = var9; // L: 306
var21.renderable = var9; // L: 306
var21.orientation = var10; // L: 307
var21.startX = var2; // L: 308
var21.startY = var3; // L: 309
@@ -836,33 +836,33 @@ public class Scene {
if (var7 != null) { // L: 485
BoundaryObject var8 = var7.boundaryObject; // L: 486
ModelData var10;
if (var8 != null && var8.entity1 instanceof ModelData) { // L: 487
ModelData var9 = (ModelData)var8.entity1; // L: 488
if (var8 != null && var8.renderable1 instanceof ModelData) { // L: 487
ModelData var9 = (ModelData)var8.renderable1; // L: 488
this.method3192(var9, var4, var5, var6, 1, 1); // L: 489
if (var8.entity2 instanceof ModelData) { // L: 490
var10 = (ModelData)var8.entity2; // L: 491
if (var8.renderable2 instanceof ModelData) { // L: 490
var10 = (ModelData)var8.renderable2; // L: 491
this.method3192(var10, var4, var5, var6, 1, 1); // L: 492
ModelData.method2872(var9, var10, 0, 0, 0, false); // L: 493
var8.entity2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494
var8.renderable2 = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 494
}
var8.entity1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496
var8.renderable1 = var9.toModel(var9.ambient, var9.contrast, var1, var2, var3); // L: 496
}
for (int var12 = 0; var12 < var7.gameObjectsCount; ++var12) { // L: 498
GameObject var14 = var7.gameObjects[var12]; // L: 499
if (var14 != null && var14.entity instanceof ModelData) { // L: 500
ModelData var11 = (ModelData)var14.entity; // L: 501
if (var14 != null && var14.renderable instanceof ModelData) { // L: 500
ModelData var11 = (ModelData)var14.renderable; // L: 501
this.method3192(var11, var4, var5, var6, var14.endX - var14.startX + 1, var14.endY - var14.startY + 1); // L: 502
var14.entity = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503
var14.renderable = var11.toModel(var11.ambient, var11.contrast, var1, var2, var3); // L: 503
}
}
FloorDecoration var13 = var7.floorDecoration; // L: 506
if (var13 != null && var13.entity instanceof ModelData) { // L: 507
var10 = (ModelData)var13.entity; // L: 508
if (var13 != null && var13.renderable instanceof ModelData) { // L: 507
var10 = (ModelData)var13.renderable; // L: 508
this.method3191(var10, var4, var5, var6); // L: 509
var13.entity = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510
var13.renderable = var10.toModel(var10.ambient, var10.contrast, var1, var2, var3); // L: 510
}
}
}
@@ -880,32 +880,32 @@ public class Scene {
ModelData var6;
if (var3 < this.xSize) { // L: 519
var5 = this.tiles[var2][var3 + 1][var4]; // L: 520
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 521
var6 = (ModelData)var5.floorDecoration.entity; // L: 522
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 521
var6 = (ModelData)var5.floorDecoration.renderable; // L: 522
ModelData.method2872(var1, var6, 128, 0, 0, true); // L: 523
}
}
if (var4 < this.xSize) { // L: 526
var5 = this.tiles[var2][var3][var4 + 1]; // L: 527
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 528
var6 = (ModelData)var5.floorDecoration.entity; // L: 529
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 528
var6 = (ModelData)var5.floorDecoration.renderable; // L: 529
ModelData.method2872(var1, var6, 0, 0, 128, true); // L: 530
}
}
if (var3 < this.xSize && var4 < this.ySize) { // L: 533
var5 = this.tiles[var2][var3 + 1][var4 + 1]; // L: 534
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 535
var6 = (ModelData)var5.floorDecoration.entity; // L: 536
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 535
var6 = (ModelData)var5.floorDecoration.renderable; // L: 536
ModelData.method2872(var1, var6, 128, 0, 128, true); // L: 537
}
}
if (var3 < this.xSize && var4 > 0) { // L: 540
var5 = this.tiles[var2][var3 + 1][var4 - 1]; // L: 541
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.entity instanceof ModelData) { // L: 542
var6 = (ModelData)var5.floorDecoration.entity; // L: 543
if (var5 != null && var5.floorDecoration != null && var5.floorDecoration.renderable instanceof ModelData) { // L: 542
var6 = (ModelData)var5.floorDecoration.renderable; // L: 543
ModelData.method2872(var1, var6, 128, 0, -128, true); // L: 544
}
}
@@ -935,21 +935,21 @@ public class Scene {
BoundaryObject var17 = var15.boundaryObject; // L: 565
if (var17 != null) { // L: 566
ModelData var18;
if (var17.entity1 instanceof ModelData) { // L: 567
var18 = (ModelData)var17.entity1; // L: 568
if (var17.renderable1 instanceof ModelData) { // L: 567
var18 = (ModelData)var17.renderable1; // L: 568
ModelData.method2872(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 569
}
if (var17.entity2 instanceof ModelData) { // L: 571
var18 = (ModelData)var17.entity2; // L: 572
if (var17.renderable2 instanceof ModelData) { // L: 571
var18 = (ModelData)var17.renderable2; // L: 572
ModelData.method2872(var1, var18, (1 - var5) * 64 + (var13 - var3) * 128, var16, (var14 - var4) * 128 + (1 - var6) * 64, var7); // L: 573
}
}
for (int var23 = 0; var23 < var15.gameObjectsCount; ++var23) { // L: 576
GameObject var19 = var15.gameObjects[var23]; // L: 577
if (var19 != null && var19.entity instanceof ModelData) { // L: 578
ModelData var20 = (ModelData)var19.entity; // L: 579
if (var19 != null && var19.renderable instanceof ModelData) { // L: 578
ModelData var20 = (ModelData)var19.renderable; // L: 579
int var21 = var19.endX - var19.startX + 1; // L: 580
int var22 = var19.endY - var19.startY + 1; // L: 581
ModelData.method2872(var1, var20, (var21 - var5) * 64 + (var19.startX - var3) * 128, var16, (var19.startY - var4) * 128 + (var22 - var6) * 64, var7); // L: 582
@@ -973,7 +973,7 @@ public class Scene {
public void drawTileMinimap(int[] var1, int var2, int var3, int var4, int var5, int var6) {
Tile var7 = this.tiles[var4][var5][var6]; // L: 593
if (var7 != null) { // L: 594
TilePaint var8 = var7.paint; // L: 595
SceneTilePaint var8 = var7.paint; // L: 595
int var10;
if (var8 != null) { // L: 596
int var18 = var8.rgb; // L: 597
@@ -988,7 +988,7 @@ public class Scene {
}
} else {
TileModel var9 = var7.model; // L: 608
SceneTileModel var9 = var7.model; // L: 608
if (var9 != null) { // L: 609
var10 = var9.shape; // L: 610
int var11 = var9.rotation; // L: 611
@@ -1355,13 +1355,13 @@ public class Scene {
var10 = var9.boundaryObject; // L: 909
if (var10 != null) { // L: 910
var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
}
for (var11 = 0; var11 < var9.gameObjectsCount; ++var11) { // L: 911
var12 = var9.gameObjects[var11]; // L: 912
if (var12 != null) { // L: 913
var12.entity.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
var12.renderable.draw(var12.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var12.centerX - Scene_cameraX, var12.height - Scene_cameraY, var12.centerY - Scene_cameraZ, var12.tag);
}
}
}
@@ -1424,17 +1424,17 @@ public class Scene {
}
if ((var31.orientationA & var11) != 0 && !this.method3208(var7, var4, var5, var31.orientationA)) { // L: 965
var31.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
var31.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
if ((var31.orientationB & var11) != 0 && !this.method3208(var7, var4, var5, var31.orientationB)) { // L: 966
var31.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
var31.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var31.x - Scene_cameraX, var31.tileHeight - Scene_cameraY, var31.y - Scene_cameraZ, var31.tag);
}
}
if (var13 != null && !this.method3213(var7, var4, var5, var13.entity1.height)) { // L: 968
if (var13 != null && !this.method3213(var7, var4, var5, var13.renderable1.height)) { // L: 968
if ((var13.orientation & var11) != 0) { // L: 969
var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970
var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var13.x - Scene_cameraX + var13.xOffset, var13.tileHeight - Scene_cameraY, var13.y - Scene_cameraZ + var13.yOffset, var13.tag); // L: 970
} else if (var13.orientation == 256) { // L: 972
var14 = var13.x - Scene_cameraX; // L: 973
var15 = var13.tileHeight - Scene_cameraY; // L: 974
@@ -1454,9 +1454,9 @@ public class Scene {
}
if (var19 < var18) { // L: 983
var13.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984
} else if (var13.entity2 != null) { // L: 986
var13.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987
var13.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14 + var13.xOffset, var15, var16 + var13.yOffset, var13.tag); // L: 984
} else if (var13.renderable2 != null) { // L: 986
var13.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var14, var15, var16, var13.tag); // L: 987
}
}
}
@@ -1464,7 +1464,7 @@ public class Scene {
if (var20) { // L: 991
FloorDecoration var22 = var3.floorDecoration; // L: 992
if (var22 != null) { // L: 993
var22.entity.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
var22.renderable.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var22.x - Scene_cameraX, var22.tileHeight - Scene_cameraY, var22.y - Scene_cameraZ, var22.tag);
}
TileItemPile var23 = var3.tileItemPile; // L: 994
@@ -1529,7 +1529,7 @@ public class Scene {
if (var20) { // L: 1029
var10 = var3.boundaryObject; // L: 1030
if (!this.method3208(var7, var4, var5, var10.orientationA)) { // L: 1031
var10.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
var10.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var10.x - Scene_cameraX, var10.tileHeight - Scene_cameraY, var10.y - Scene_cameraZ, var10.tag);
}
var3.drawGameObjectEdges = 0; // L: 1032
@@ -1628,8 +1628,8 @@ public class Scene {
GameObject var33 = gameObjects[var25]; // L: 1093
var33.lastDrawn = Scene_drawnCount; // L: 1094
if (!this.method3210(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.entity.height)) { // L: 1095
var33.entity.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096
if (!this.method3210(var7, var33.startX, var33.endX, var33.startY, var33.endY, var33.renderable.height)) { // L: 1095
var33.renderable.draw(var33.orientation, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var33.centerX - Scene_cameraX, var33.height - Scene_cameraY, var33.centerY - Scene_cameraZ, var33.tag); // L: 1096
}
for (var14 = var33.startX; var14 <= var33.endX; ++var14) { // L: 1098
@@ -1702,9 +1702,9 @@ public class Scene {
if (var3.field1679 != 0) { // L: 1138
WallDecoration var29 = var3.wallDecoration; // L: 1139
if (var29 != null && !this.method3213(var7, var4, var5, var29.entity1.height)) { // L: 1140
if (var29 != null && !this.method3213(var7, var4, var5, var29.renderable1.height)) { // L: 1140
if ((var29.orientation & var3.field1679) != 0) { // L: 1141
var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142
var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var29.x - Scene_cameraX + var29.xOffset, var29.tileHeight - Scene_cameraY, var29.y - Scene_cameraZ + var29.yOffset, var29.tag); // L: 1142
} else if (var29.orientation == 256) { // L: 1144
var11 = var29.x - Scene_cameraX; // L: 1145
var25 = var29.tileHeight - Scene_cameraY; // L: 1146
@@ -1723,9 +1723,9 @@ public class Scene {
}
if (var16 >= var15) { // L: 1155
var29.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156
} else if (var29.entity2 != null) { // L: 1158
var29.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159
var29.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11 + var29.xOffset, var25, var24 + var29.yOffset, var29.tag); // L: 1156
} else if (var29.renderable2 != null) { // L: 1158
var29.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var11, var25, var24, var29.tag); // L: 1159
}
}
}
@@ -1733,11 +1733,11 @@ public class Scene {
BoundaryObject var27 = var3.boundaryObject; // L: 1163
if (var27 != null) { // L: 1164
if ((var27.orientationB & var3.field1679) != 0 && !this.method3208(var7, var4, var5, var27.orientationB)) { // L: 1165
var27.entity2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
var27.renderable2.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
}
if ((var27.orientationA & var3.field1679) != 0 && !this.method3208(var7, var4, var5, var27.orientationA)) { // L: 1166
var27.entity1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
var27.renderable1.draw(0, Scene_cameraPitchSine, Scene_cameraPitchCosine, Scene_cameraYawSine, Scene_cameraYawCosine, var27.x - Scene_cameraX, var27.tileHeight - Scene_cameraY, var27.y - Scene_cameraZ, var27.tag);
}
}
}
@@ -1785,7 +1785,7 @@ public class Scene {
descriptor = "(Lew;IIIIIII)V"
)
@Export("drawTileUnderlay")
void drawTileUnderlay(TilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
void drawTileUnderlay(SceneTilePaint var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8) {
int var9;
int var10 = var9 = (var7 << 7) - Scene_cameraX; // L: 1195
int var11;
@@ -1896,7 +1896,7 @@ public class Scene {
descriptor = "(Leq;IIIIII)V"
)
@Export("drawTileOverlay")
void drawTileOverlay(TileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) {
void drawTileOverlay(SceneTileModel var1, int var2, int var3, int var4, int var5, int var6, int var7) {
int var8 = var1.vertexX.length; // L: 1283
int var9;
@@ -1918,13 +1918,13 @@ public class Scene {
}
if (var1.triangleTextureId != null) { // L: 1295
TileModel.field1610[var9] = var10; // L: 1296
TileModel.field1621[var9] = var13; // L: 1297
TileModel.field1622[var9] = var12; // L: 1298
SceneTileModel.field1610[var9] = var10; // L: 1296
SceneTileModel.field1621[var9] = var13; // L: 1297
SceneTileModel.field1622[var9] = var12; // L: 1298
}
TileModel.field1618[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300
TileModel.field1619[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301
SceneTileModel.field1618[var9] = var10 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidX; // L: 1300
SceneTileModel.field1619[var9] = var13 * Rasterizer3D.Rasterizer3D_zoom / var12 + Rasterizer3D.Rasterizer3D_clipMidY; // L: 1301
}
Rasterizer3D.Rasterizer3D_alpha = 0; // L: 1303
@@ -1934,12 +1934,12 @@ public class Scene {
var10 = var1.faceX[var9]; // L: 1306
var11 = var1.faceY[var9]; // L: 1307
var12 = var1.faceZ[var9]; // L: 1308
var13 = TileModel.field1618[var10]; // L: 1309
int var14 = TileModel.field1618[var11]; // L: 1310
int var15 = TileModel.field1618[var12]; // L: 1311
int var16 = TileModel.field1619[var10]; // L: 1312
int var17 = TileModel.field1619[var11]; // L: 1313
int var18 = TileModel.field1619[var12]; // L: 1314
var13 = SceneTileModel.field1618[var10]; // L: 1309
int var14 = SceneTileModel.field1618[var11]; // L: 1310
int var15 = SceneTileModel.field1618[var12]; // L: 1311
int var16 = SceneTileModel.field1619[var10]; // L: 1312
int var17 = SceneTileModel.field1619[var11]; // L: 1313
int var18 = SceneTileModel.field1619[var12]; // L: 1314
if ((var13 - var14) * (var18 - var17) - (var16 - var17) * (var15 - var14) > 0) { // L: 1315
Rasterizer3D.field1791 = false; // L: 1316
if (var13 < 0 || var14 < 0 || var15 < 0 || var13 > Rasterizer3D.Rasterizer3D_clipWidth || var14 > Rasterizer3D.Rasterizer3D_clipWidth || var15 > Rasterizer3D.Rasterizer3D_clipWidth) { // L: 1317
@@ -1954,9 +1954,9 @@ public class Scene {
if (var1.triangleTextureId != null && var1.triangleTextureId[var9] != -1) { // L: 1322
if (!Scene_isLowDetail) { // L: 1326
if (var1.isFlat) { // L: 1327
Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1610[0], TileModel.field1610[1], TileModel.field1610[3], TileModel.field1621[0], TileModel.field1621[1], TileModel.field1621[3], TileModel.field1622[0], TileModel.field1622[1], TileModel.field1622[3], var1.triangleTextureId[var9]);
Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field1610[0], SceneTileModel.field1610[1], SceneTileModel.field1610[3], SceneTileModel.field1621[0], SceneTileModel.field1621[1], SceneTileModel.field1621[3], SceneTileModel.field1622[0], SceneTileModel.field1622[1], SceneTileModel.field1622[3], var1.triangleTextureId[var9]);
} else {
Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], TileModel.field1610[var10], TileModel.field1610[var11], TileModel.field1610[var12], TileModel.field1621[var10], TileModel.field1621[var11], TileModel.field1621[var12], TileModel.field1622[var10], TileModel.field1622[var11], TileModel.field1622[var12], var1.triangleTextureId[var9]); // L: 1328
Rasterizer3D.drawTexturedTile(var16, var17, var18, var13, var14, var15, var1.triangleColorA[var9], var1.triangleColorB[var9], var1.triangleColorC[var9], SceneTileModel.field1610[var10], SceneTileModel.field1610[var11], SceneTileModel.field1610[var12], SceneTileModel.field1621[var10], SceneTileModel.field1621[var11], SceneTileModel.field1621[var12], SceneTileModel.field1622[var10], SceneTileModel.field1622[var11], SceneTileModel.field1622[var12], var1.triangleTextureId[var9]); // L: 1328
}
} else {
int var19 = Rasterizer3D.Rasterizer3D_textureLoader.getAverageTextureRGB(var1.triangleTextureId[var9]); // L: 1331

7
runescape-client/src/main/java/TileModel.java → runescape-client/src/main/java/SceneTileModel.java
View File

@@ -3,8 +3,9 @@ import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
@ObfuscatedName("eq")
@Implements("TileModel")
public final class TileModel {
@Implements("SceneTileModel")
public final class SceneTileModel
{
@ObfuscatedName("f")
static int[] field1618;
@ObfuscatedName("a")
@@ -75,7 +76,7 @@ public final class TileModel {
field1603 = new int[][]{{0, 1, 2, 3, 0, 0, 1, 3}, {1, 1, 2, 3, 1, 0, 1, 3}, {0, 1, 2, 3, 1, 0, 1, 3}, {0, 0, 1, 2, 0, 0, 2, 4, 1, 0, 4, 3}, {0, 0, 1, 4, 0, 0, 4, 3, 1, 1, 2, 4}, {0, 0, 4, 3, 1, 0, 1, 2, 1, 0, 2, 4}, {0, 1, 2, 4, 1, 0, 1, 4, 1, 0, 4, 3}, {0, 4, 1, 2, 0, 4, 2, 5, 1, 0, 4, 5, 1, 0, 5, 3}, {0, 4, 1, 2, 0, 4, 2, 3, 0, 4, 3, 5, 1, 0, 4, 5}, {0, 0, 4, 5, 1, 4, 1, 2, 1, 4, 2, 3, 1, 4, 3, 5}, {0, 0, 1, 5, 0, 1, 4, 5, 0, 1, 2, 4, 1, 0, 5, 3, 1, 5, 4, 3, 1, 4, 2, 3}, {1, 0, 1, 5, 1, 1, 4, 5, 1, 1, 2, 4, 0, 0, 5, 3, 0, 5, 4, 3, 0, 4, 2, 3}, {1, 0, 5, 4, 1, 0, 1, 5, 0, 0, 4, 3, 0, 4, 5, 3, 0, 5, 2, 3, 0, 1, 2, 5}}; // L: 41
}
TileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) {
SceneTileModel(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11, int var12, int var13, int var14, int var15, int var16, int var17, int var18, int var19) {
this.isFlat = true; // L: 16
if (var7 != var6 || var8 != var6 || var9 != var6) { // L: 58
this.isFlat = false;

7
runescape-client/src/main/java/TilePaint.java → runescape-client/src/main/java/SceneTilePaint.java
View File

@@ -5,8 +5,9 @@ import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ew")
@Implements("TilePaint")
public final class TilePaint {
@Implements("SceneTilePaint")
public final class SceneTilePaint
{
@ObfuscatedName("dt")
@ObfuscatedSignature(
descriptor = "Lil;"
@@ -53,7 +54,7 @@ public final class TilePaint {
@Export("rgb")
int rgb;
TilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) {
SceneTilePaint(int var1, int var2, int var3, int var4, int var5, int var6, boolean var7) {
this.isFlat = true; // L: 9
this.swColor = var1; // L: 13
this.seColor = var2; // L: 14

56
runescape-client/src/main/java/ScriptEvent.java
View File

@@ -158,10 +158,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 939
var30 = var9.getModel(22, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 940
var30 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 940
}
var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var30, var20, var22); // L: 941
var7.newFloorDecoration(var0, var2, var3, var17, (Renderable)var30, var20, var22); // L: 941
if (var9.interactType == 1) { // L: 942
var8.setBlockedByFloorDec(var2, var3);
}
@@ -171,10 +171,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 955
var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 956
var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 956
}
var7.method3160(var0, var2, var3, var17, 1, 1, (Entity)var30, 0, var20, var22); // L: 957
var7.method3160(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 957
if (var9.interactType != 0) { // L: 958
var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
}
@@ -183,10 +183,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 963
var30 = var9.getModel(0, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 964
var30 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 964
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field512[var5], 0, var20, var22); // L: 965
var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field512[var5], 0, var20, var22); // L: 965
if (var9.interactType != 0) { // L: 966
var8.method3611(var2, var3, var6, var5, var9.boolean1);
}
@@ -195,10 +195,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 971
var30 = var9.getModel(1, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 972
var30 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 972
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field513[var5], 0, var20, var22); // L: 973
var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field513[var5], 0, var20, var22); // L: 973
if (var9.interactType != 0) { // L: 974
var8.method3611(var2, var3, var6, var5, var9.boolean1);
}
@@ -213,11 +213,11 @@ public class ScriptEvent extends Node {
var31 = var9.getModel(2, var5 + 4, var16, var18, var17, var19); // L: 982
var25 = var9.getModel(2, var23, var16, var18, var17, var19); // L: 983
} else {
var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 986
var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 987
var31 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 986
var25 = new DynamicObject(var4, 2, var23, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 987
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var31, (Entity)var25, Tiles.field512[var5], Tiles.field512[var23], var20, var22); // L: 989
var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var31, (Renderable)var25, Tiles.field512[var5], Tiles.field512[var23], var20, var22); // L: 989
if (var9.interactType != 0) { // L: 990
var8.method3611(var2, var3, var6, var5, var9.boolean1);
}
@@ -226,10 +226,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 995
var30 = var9.getModel(3, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 996
var30 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 996
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field513[var5], 0, var20, var22); // L: 997
var7.newBoundaryObject(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field513[var5], 0, var20, var22); // L: 997
if (var9.interactType != 0) { // L: 998
var8.method3611(var2, var3, var6, var5, var9.boolean1);
}
@@ -238,10 +238,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 1003
var30 = var9.getModel(var6, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 1004
var30 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 1004
}
var7.method3160(var0, var2, var3, var17, 1, 1, (Entity)var30, 0, var20, var22); // L: 1005
var7.method3160(var0, var2, var3, var17, 1, 1, (Renderable)var30, 0, var20, var22); // L: 1005
if (var9.interactType != 0) { // L: 1006
var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
}
@@ -250,10 +250,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 1011
var30 = var9.getModel(4, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 1012
var30 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 1012
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var30, (Entity)null, Tiles.field512[var5], 0, 0, 0, var20, var22); // L: 1013
var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, Tiles.field512[var5], 0, 0, 0, var20, var22); // L: 1013
} else {
long var24;
Object var26;
@@ -267,10 +267,10 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 1021
var26 = var9.getModel(4, var5, var16, var18, var17, var19);
} else {
var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 1022
var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 1022
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field512[var5], 0, var23 * Tiles.field518[var5], var23 * Tiles.field515[var5], var20, var22); // L: 1023
var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, Tiles.field512[var5], 0, var23 * Tiles.field518[var5], var23 * Tiles.field515[var5], var20, var22); // L: 1023
} else if (var6 == 6) { // L: 1026
var23 = 8; // L: 1027
var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1028
@@ -281,19 +281,19 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 1031
var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
} else {
var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 1032
var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 1032
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var23 * Tiles.field509[var5], var23 * Tiles.field517[var5], var20, var22); // L: 1033
var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)null, 256, var5, var23 * Tiles.field509[var5], var23 * Tiles.field517[var5], var20, var22); // L: 1033
} else if (var6 == 7) { // L: 1036
int var29 = var5 + 2 & 3; // L: 1038
if (var9.animationId == -1 && var9.transforms == null) { // L: 1039
var30 = var9.getModel(4, var29 + 4, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 1040
var30 = new DynamicObject(var4, 4, var29 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 1040
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var30, (Entity)null, 256, var29, 0, 0, var20, var22); // L: 1041
var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var30, (Renderable)null, 256, var29, 0, 0, var20, var22); // L: 1041
} else if (var6 == 8) { // L: 1044
var23 = 8; // L: 1045
var24 = var7.getBoundaryObjectTag(var0, var2, var3); // L: 1046
@@ -307,11 +307,11 @@ public class ScriptEvent extends Node {
var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19); // L: 1052
var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19); // L: 1053
} else {
var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 1056
var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 1057
var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 1056
var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 1057
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var23 * Tiles.field509[var5], var23 * Tiles.field517[var5], var20, var22); // L: 1059
var7.newWallDecoration(var0, var2, var3, var17, (Renderable)var26, (Renderable)var27, 256, var5, var23 * Tiles.field509[var5], var23 * Tiles.field517[var5], var20, var22); // L: 1059
}
}
}
@@ -319,11 +319,11 @@ public class ScriptEvent extends Node {
if (var9.animationId == -1 && var9.transforms == null) { // L: 947
var30 = var9.getModel(10, var5, var16, var18, var17, var19);
} else {
var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field3429, (Entity)null); // L: 948
var30 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, var9.field3429, (Renderable)null); // L: 948
}
if (var30 != null) { // L: 949
var7.method3160(var0, var2, var3, var17, var10, var11, (Entity)var30, var6 == 11 ? 256 : 0, var20, var22);
var7.method3160(var0, var2, var3, var17, var10, var11, (Renderable)var30, var6 == 11 ? 256 : 0, var20, var22);
}
if (var9.interactType != 0) { // L: 950

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

@@ -36,13 +36,13 @@ public final class Tile extends Node {
descriptor = "Lew;"
)
@Export("paint")
TilePaint paint;
SceneTilePaint paint;
@ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Leq;"
)
@Export("model")
TileModel model;
SceneTileModel model;
@ObfuscatedName("n")
@ObfuscatedSignature(
descriptor = "Lev;"

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

@@ -7,7 +7,8 @@ import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ct")
@Implements("TileItem")
public final class TileItem extends Entity {
public final class TileItem extends Renderable
{
@ObfuscatedName("h")
@ObfuscatedGetter(
intValue = 1316978929

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

@@ -43,19 +43,19 @@ public final class TileItemPile {
descriptor = "Ler;"
)
@Export("first")
Entity first;
Renderable first;
@ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "Ler;"
)
@Export("second")
Entity second;
Renderable second;
@ObfuscatedName("j")
@ObfuscatedSignature(
descriptor = "Ler;"
)
@Export("third")
Entity third;
Renderable third;
@ObfuscatedName("n")
@ObfuscatedGetter(
longValue = 7869520931752751385L

20
runescape-client/src/main/java/UserComparator4.java
View File

@@ -259,10 +259,10 @@ public class UserComparator4 implements Comparator {
if (var31 != null) { // L: 6801
var11 = Occluder.Entity_unpackID(var31.tag); // L: 6802
if (var3 == 2) { // L: 6803
var31.entity1 = new DynamicObject(var11, 2, var4 + 4, GameObject.Client_plane, var8, var9, var6, false, var31.entity1); // L: 6804
var31.entity2 = new DynamicObject(var11, 2, var4 + 1 & 3, GameObject.Client_plane, var8, var9, var6, false, var31.entity2); // L: 6805
var31.renderable1 = new DynamicObject(var11, 2, var4 + 4, GameObject.Client_plane, var8, var9, var6, false, var31.renderable1); // L: 6804
var31.renderable2 = new DynamicObject(var11, 2, var4 + 1 & 3, GameObject.Client_plane, var8, var9, var6, false, var31.renderable2); // L: 6805
} else {
var31.entity1 = new DynamicObject(var11, var3, var4, GameObject.Client_plane, var8, var9, var6, false, var31.entity1); // L: 6807
var31.renderable1 = new DynamicObject(var11, var3, var4, GameObject.Client_plane, var8, var9, var6, false, var31.renderable1); // L: 6807
}
}
}
@@ -273,15 +273,15 @@ public class UserComparator4 implements Comparator {
var11 = Occluder.Entity_unpackID(var42.tag); // L: 6813
if (var3 != 4 && var3 != 5) { // L: 6814
if (var3 == 6) { // L: 6815
var42.entity1 = new DynamicObject(var11, 4, var4 + 4, GameObject.Client_plane, var8, var9, var6, false, var42.entity1);
var42.renderable1 = new DynamicObject(var11, 4, var4 + 4, GameObject.Client_plane, var8, var9, var6, false, var42.renderable1);
} else if (var3 == 7) { // L: 6816
var42.entity1 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, GameObject.Client_plane, var8, var9, var6, false, var42.entity1);
var42.renderable1 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, GameObject.Client_plane, var8, var9, var6, false, var42.renderable1);
} else if (var3 == 8) { // L: 6817
var42.entity1 = new DynamicObject(var11, 4, var4 + 4, GameObject.Client_plane, var8, var9, var6, false, var42.entity1); // L: 6818
var42.entity2 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, GameObject.Client_plane, var8, var9, var6, false, var42.entity2); // L: 6819
var42.renderable1 = new DynamicObject(var11, 4, var4 + 4, GameObject.Client_plane, var8, var9, var6, false, var42.renderable1); // L: 6818
var42.renderable2 = new DynamicObject(var11, 4, (var4 + 2 & 3) + 4, GameObject.Client_plane, var8, var9, var6, false, var42.renderable2); // L: 6819
}
} else {
var42.entity1 = new DynamicObject(var11, 4, var4, GameObject.Client_plane, var8, var9, var6, false, var42.entity1);
var42.renderable1 = new DynamicObject(var11, 4, var4, GameObject.Client_plane, var8, var9, var6, false, var42.renderable1);
}
}
}
@@ -293,14 +293,14 @@ public class UserComparator4 implements Comparator {
}
if (var43 != null) { // L: 6826
var43.entity = new DynamicObject(Occluder.Entity_unpackID(var43.tag), var3, var4, GameObject.Client_plane, var8, var9, var6, false, var43.entity);
var43.renderable = new DynamicObject(Occluder.Entity_unpackID(var43.tag), var3, var4, GameObject.Client_plane, var8, var9, var6, false, var43.renderable);
}
}
if (var5 == 3) { // L: 6828
FloorDecoration var44 = ArchiveLoader.scene.getFloorDecoration(GameObject.Client_plane, var8, var9); // L: 6829
if (var44 != null) { // L: 6830
var44.entity = new DynamicObject(Occluder.Entity_unpackID(var44.tag), 22, var4, GameObject.Client_plane, var8, var9, var6, false, var44.entity);
var44.renderable = new DynamicObject(Occluder.Entity_unpackID(var44.tag), 22, var4, GameObject.Client_plane, var8, var9, var6, false, var44.renderable);
}
}
}

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

@@ -54,13 +54,13 @@ public final class WallDecoration {
descriptor = "Ler;"
)
@Export("entity1")
public Entity entity1;
public Renderable renderable1;
@ObfuscatedName("l")
@ObfuscatedSignature(
descriptor = "Ler;"
)
@Export("entity2")
public Entity entity2;
public Renderable renderable2;
@ObfuscatedName("z")
@ObfuscatedGetter(
longValue = 3554481859042868621L

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

@@ -639,7 +639,7 @@ public class WorldMapID {
}
}
TilePaint.method3154(var0); // L: 3971
SceneTilePaint.method3154(var0); // L: 3971
} // L: 3972
@ObfuscatedName("ik")

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

@@ -136,7 +136,7 @@ public final class WorldMapRectangle {
Widget.Widget_cachedSpriteMasks.clear(); // L: 2900
((TextureProvider)Rasterizer3D.Rasterizer3D_textureLoader).clear(); // L: 2902
Script.Script_cached.clear(); // L: 2903
TilePaint.archive0.clearFiles(); // L: 2904
SceneTilePaint.archive0.clearFiles(); // L: 2904
WorldMapSprite.archive1.clearFiles(); // L: 2905
class330.archive3.clearFiles(); // L: 2906
class227.archive4.clearFiles(); // L: 2907

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

@@ -41,7 +41,7 @@ public class class238 {
garbageValue = "1585982662"
)
public static String method4166(CharSequence var0) {
String var1 = ParamDefinition.base37DecodeLong(Entity.method3340(var0)); // L: 75
String var1 = ParamDefinition.base37DecodeLong(Renderable.method3340(var0)); // L: 75
if (var1 == null) { // L: 76
var1 = "";
}

56
runescape-client/src/main/java/class7.java
View File

@@ -137,10 +137,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 300
var34 = var8.getEntity(22, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 301
var34 = new DynamicObject(var3, 22, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 301
}
var6.newFloorDecoration(var0, var1, var2, var16, (Entity)var34, var19, var21); // L: 302
var6.newFloorDecoration(var0, var1, var2, var16, (Renderable)var34, var19, var21); // L: 302
if (var8.interactType == 1 && var7 != null) { // L: 303
var7.setBlockedByFloorDec(var1, var2);
}
@@ -152,10 +152,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 329
var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 330
var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 330
}
var6.method3160(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); // L: 331
var6.method3160(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 331
if (var5 >= 12 && var5 <= 17 && var5 != 13 && var0 > 0) { // L: 332
var10000 = GrandExchangeOfferWorldComparator.field52[var0][var1];
var10000[var2] |= 2340;
@@ -169,10 +169,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 338
var34 = var8.getEntity(0, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 339
var34 = new DynamicObject(var3, 0, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 339
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field512[var4], 0, var19, var21); // L: 340
var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field512[var4], 0, var19, var21); // L: 340
if (var4 == 0) { // L: 341
if (var8.clipped) { // L: 342
Tiles.field511[var0][var1][var2] = 50; // L: 343
@@ -227,10 +227,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 375
var34 = var8.getEntity(1, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 376
var34 = new DynamicObject(var3, 1, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 376
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field513[var4], 0, var19, var21); // L: 377
var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field513[var4], 0, var19, var21); // L: 377
if (var8.clipped) { // L: 378
if (var4 == 0) { // L: 379
Tiles.field511[var0][var1][var2 + 1] = 50;
@@ -257,11 +257,11 @@ public enum class7 implements Enumerated {
var31 = var8.getEntity(2, var4 + 4, var15, var17, var16, var18); // L: 392
var32 = var8.getEntity(2, var28, var15, var17, var16, var18); // L: 393
} else {
var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 396
var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 397
var31 = new DynamicObject(var3, 2, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 396
var32 = new DynamicObject(var3, 2, var28, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 397
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var31, (Entity)var32, Tiles.field512[var4], Tiles.field512[var28], var19, var21); // L: 399
var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var31, (Renderable)var32, Tiles.field512[var4], Tiles.field512[var28], var19, var21); // L: 399
if (var8.modelClipped) { // L: 400
if (var4 == 0) { // L: 401
var10000 = GrandExchangeOfferWorldComparator.field52[var0][var1]; // L: 402
@@ -298,10 +298,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 424
var34 = var8.getEntity(3, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 425
var34 = new DynamicObject(var3, 3, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 425
}
var6.newBoundaryObject(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field513[var4], 0, var19, var21); // L: 426
var6.newBoundaryObject(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field513[var4], 0, var19, var21); // L: 426
if (var8.clipped) { // L: 427
if (var4 == 0) { // L: 428
Tiles.field511[var0][var1][var2 + 1] = 50;
@@ -322,10 +322,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 438
var34 = var8.getEntity(var5, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 439
var34 = new DynamicObject(var3, var5, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 439
}
var6.method3160(var0, var1, var2, var16, 1, 1, (Entity)var34, 0, var19, var21); // L: 440
var6.method3160(var0, var1, var2, var16, 1, 1, (Renderable)var34, 0, var19, var21); // L: 440
if (var8.interactType != 0 && var7 != null) { // L: 441
var7.addGameObject(var1, var2, var9, var10, var8.boolean1);
}
@@ -338,10 +338,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 447
var34 = var8.getEntity(4, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 448
var34 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 448
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, Tiles.field512[var4], 0, 0, 0, var19, var21); // L: 449
var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, Tiles.field512[var4], 0, 0, 0, var19, var21); // L: 449
} else {
Object var25;
long var29;
@@ -355,10 +355,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 457
var25 = var8.getEntity(4, var4, var15, var17, var16, var18);
} else {
var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 458
var25 = new DynamicObject(var3, 4, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 458
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, Tiles.field512[var4], 0, var28 * Tiles.field518[var4], var28 * Tiles.field515[var4], var19, var21); // L: 459
var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, Tiles.field512[var4], 0, var28 * Tiles.field518[var4], var28 * Tiles.field515[var4], var19, var21); // L: 459
} else if (var5 == 6) { // L: 462
var28 = 8; // L: 463
var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 464
@@ -369,19 +369,19 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 467
var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18);
} else {
var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 468
var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 468
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)null, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field517[var4], var19, var21); // L: 469
var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)null, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field517[var4], var19, var21); // L: 469
} else if (var5 == 7) { // L: 472
var23 = var4 + 2 & 3; // L: 474
if (var8.animationId == -1 && var8.transforms == null) { // L: 475
var34 = var8.getEntity(4, var23 + 4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 476
var34 = new DynamicObject(var3, 4, var23 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 476
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var34, (Entity)null, 256, var23, 0, 0, var19, var21); // L: 477
var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var34, (Renderable)null, 256, var23, 0, 0, var19, var21); // L: 477
} else if (var5 == 8) { // L: 480
var28 = 8; // L: 481
var29 = var6.getBoundaryObjectTag(var0, var1, var2); // L: 482
@@ -395,11 +395,11 @@ public enum class7 implements Enumerated {
var25 = var8.getEntity(4, var4 + 4, var15, var17, var16, var18); // L: 488
var26 = var8.getEntity(4, var27 + 4, var15, var17, var16, var18); // L: 489
} else {
var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 492
var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 493
var25 = new DynamicObject(var3, 4, var4 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 492
var26 = new DynamicObject(var3, 4, var27 + 4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 493
}
var6.newWallDecoration(var0, var1, var2, var16, (Entity)var25, (Entity)var26, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field517[var4], var19, var21); // L: 495
var6.newWallDecoration(var0, var1, var2, var16, (Renderable)var25, (Renderable)var26, 256, var4, var28 * Tiles.field509[var4], var28 * Tiles.field517[var4], var19, var21); // L: 495
}
}
}
@@ -407,10 +407,10 @@ public enum class7 implements Enumerated {
if (var8.animationId == -1 && var8.transforms == null) { // L: 308
var34 = var8.getEntity(10, var4, var15, var17, var16, var18);
} else {
var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field3429, (Entity)null); // L: 309
var34 = new DynamicObject(var3, 10, var4, var0, var1, var2, var8.animationId, var8.field3429, (Renderable)null); // L: 309
}
if (var34 != null && var6.method3160(var0, var1, var2, var16, var9, var10, (Entity)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 310 311
if (var34 != null && var6.method3160(var0, var1, var2, var16, var9, var10, (Renderable)var34, var5 == 11 ? 256 : 0, var19, var21) && var8.clipped) { // L: 310 311
var23 = 15; // L: 312
if (var34 instanceof Model) { // L: 313
var23 = ((Model)var34).method2991() / 4; // L: 314