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

Even more... you guessed it! REFACTORING. Removes the need for @Export for methods overriding base java methods

Browse Source
This commit is contained in:
Lucas
2019-07-07 21:30:17 +02:00
parent e2aac6d899
commit 83533475d4
116 changed files with 802 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
runescape-client/src/main/java/ParamDefinition.java
View File

@@ -11,7 +11,8 @@ public class ParamDefinition extends DualNode {
@ObfuscatedSignature(
signature = "Lir;"
)
public static AbstractArchive field679;
@Export("ParamDefinition_archive")
public static AbstractArchive ParamDefinition_archive;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Ler;"
@@ -98,9 +99,10 @@ public class ParamDefinition extends DualNode {
signature = "(IIIIIIII)V",
garbageValue = "-904254947"
)
static final void method4933(int var0, int var1, int var2, int var3, int var4, int var5, int var6) {
if (var2 >= 1 && var3 >= 1 && var2 <= 102 && var3 <= 102) {
if (Client.isLowDetail && var0 != SoundSystem.plane) {
@Export("addPendingSpawnToScene")
static final void addPendingSpawnToScene(int plane, int objectType, int x, int y, int id, int orientation, int var6) {
if (x >= 1 && y >= 1 && x <= 102 && y <= 102) {
if (Client.isLowDetail && plane != SoundSystem.plane) {
return;
}
@@ -108,74 +110,74 @@ public class ParamDefinition extends DualNode {
boolean var9 = true;
boolean var10 = false;
boolean var11 = false;
if (var1 == 0) {
var7 = class65.scene.method290(var0, var2, var3);
if (objectType == 0) {
var7 = class65.scene.getBoundaryObjectTag(plane, x, y);
}
if (var1 == 1) {
var7 = class65.scene.method291(var0, var2, var3);
if (objectType == 1) {
var7 = class65.scene.getWallDecorationTag(plane, x, y);
}
if (var1 == 2) {
var7 = class65.scene.method292(var0, var2, var3);
if (objectType == 2) {
var7 = class65.scene.getGameObjectTag(plane, x, y);
}
if (var1 == 3) {
var7 = class65.scene.getFloorDecorationTag(var0, var2, var3);
if (objectType == 3) {
var7 = class65.scene.getFloorDecorationTag(plane, x, y);
}
int var12;
if (0L != var7) {
var12 = class65.scene.getObjectFlags(var0, var2, var3, var7);
var12 = class65.scene.getObjectFlags(plane, x, y, var7);
int var13 = HitSplatDefinition.method4972(var7);
int var14 = var12 & 31;
int var15 = var12 >> 6 & 3;
ObjectDefinition var16;
if (var1 == 0) {
class65.scene.removeBoundaryObject(var0, var2, var3);
if (objectType == 0) {
class65.scene.removeBoundaryObject(plane, x, y);
var16 = class50.getObjectDefinition(var13);
if (var16.interactType != 0) {
Client.collisionMaps[var0].method95(var2, var3, var14, var15, var16.boolean1);
Client.collisionMaps[plane].method95(x, y, var14, var15, var16.boolean1);
}
}
if (var1 == 1) {
class65.scene.removeWallDecoration(var0, var2, var3);
if (objectType == 1) {
class65.scene.removeWallDecoration(plane, x, y);
}
if (var1 == 2) {
class65.scene.method288(var0, var2, var3);
if (objectType == 2) {
class65.scene.method288(plane, x, y);
var16 = class50.getObjectDefinition(var13);
if (var2 + var16.sizeX > 103 || var3 + var16.sizeX > 103 || var2 + var16.sizeY > 103 || var3 + var16.sizeY > 103) {
if (x + var16.sizeX > 103 || y + var16.sizeX > 103 || x + var16.sizeY > 103 || y + var16.sizeY > 103) {
return;
}
if (var16.interactType != 0) {
Client.collisionMaps[var0].method96(var2, var3, var16.sizeX, var16.sizeY, var15, var16.boolean1);
Client.collisionMaps[plane].method96(x, y, var16.sizeX, var16.sizeY, var15, var16.boolean1);
}
}
if (var1 == 3) {
class65.scene.removeFloorDecoration(var0, var2, var3);
if (objectType == 3) {
class65.scene.removeFloorDecoration(plane, x, y);
var16 = class50.getObjectDefinition(var13);
if (var16.interactType == 1) {
Client.collisionMaps[var0].method98(var2, var3);
Client.collisionMaps[plane].method98(x, y);
}
}
}
if (var4 >= 0) {
var12 = var0;
if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
var12 = var0 + 1;
if (id >= 0) {
var12 = plane;
if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) {
var12 = plane + 1;
}
Scene var36 = class65.scene;
CollisionMap var37 = Client.collisionMaps[var0];
ObjectDefinition var38 = class50.getObjectDefinition(var4);
CollisionMap var37 = Client.collisionMaps[plane];
ObjectDefinition var38 = class50.getObjectDefinition(id);
int var17;
int var39;
if (var5 != 1 && var5 != 3) {
if (orientation != 1 && orientation != 3) {
var17 = var38.sizeX;
var39 = var38.sizeY;
} else {
@@ -185,30 +187,30 @@ public class ParamDefinition extends DualNode {
int var18;
int var19;
if (var17 + var2 <= 104) {
var18 = (var17 >> 1) + var2;
var19 = var2 + (var17 + 1 >> 1);
if (var17 + x <= 104) {
var18 = (var17 >> 1) + x;
var19 = x + (var17 + 1 >> 1);
} else {
var18 = var2;
var19 = var2 + 1;
var18 = x;
var19 = x + 1;
}
int var20;
int var21;
if (var3 + var39 <= 104) {
var20 = var3 + (var39 >> 1);
var21 = var3 + (var39 + 1 >> 1);
if (y + var39 <= 104) {
var20 = y + (var39 >> 1);
var21 = y + (var39 + 1 >> 1);
} else {
var20 = var3;
var21 = var3 + 1;
var20 = y;
var21 = y + 1;
}
int[][] var22 = Tiles.Tiles_heights[var12];
int var23 = var22[var18][var21] + var22[var19][var20] + var22[var18][var20] + var22[var19][var21] >> 2;
int var24 = (var2 << 7) + (var17 << 6);
int var25 = (var3 << 7) + (var39 << 6);
long var26 = FontName.calculateTag(var2, var3, 2, var38.int1 == 0, var4);
int var28 = (var5 << 6) + var6;
int var24 = (x << 7) + (var17 << 6);
int var25 = (y << 7) + (var39 << 6);
long var26 = FontName.calculateTag(x, y, 2, var38.int1 == 0, id);
int var28 = (orientation << 6) + var6;
if (var38.int3 == 1) {
var28 += 256;
}
@@ -216,173 +218,173 @@ public class ParamDefinition extends DualNode {
Object var29;
if (var6 == 22) {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(22, var5, var22, var24, var23, var25);
var29 = var38.getModel(22, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, 22, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, 22, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newFloorDecoration(var0, var2, var3, var23, (Entity)var29, var26, var28);
var36.newFloorDecoration(plane, x, y, var23, (Entity)var29, var26, var28);
if (var38.interactType == 1) {
var37.method93(var2, var3);
var37.method93(x, y);
}
} else if (var6 != 10 && var6 != 11) {
if (var6 >= 12) {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
var29 = var38.getModel(var6, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28);
if (var38.interactType != 0) {
var37.method91(var2, var3, var17, var39, var38.boolean1);
var37.method91(x, y, var17, var39, var38.boolean1);
}
} else if (var6 == 0) {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(0, var5, var22, var24, var23, var25);
var29 = var38.getModel(0, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, 0, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, 0, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, var26, var28);
var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, var26, var28);
if (var38.interactType != 0) {
var37.method90(var2, var3, var6, var5, var38.boolean1);
var37.method90(x, y, var6, orientation, var38.boolean1);
}
} else if (var6 == 1) {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(1, var5, var22, var24, var23, var25);
var29 = var38.getModel(1, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, 1, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, 1, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28);
var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28);
if (var38.interactType != 0) {
var37.method90(var2, var3, var6, var5, var38.boolean1);
var37.method90(x, y, var6, orientation, var38.boolean1);
}
} else {
int var30;
Object var31;
if (var6 == 2) {
var30 = var5 + 1 & 3;
var30 = orientation + 1 & 3;
Object var32;
if (var38.animationId == -1 && var38.transforms == null) {
var31 = var38.getModel(2, var5 + 4, var22, var24, var23, var25);
var31 = var38.getModel(2, orientation + 4, var22, var24, var23, var25);
var32 = var38.getModel(2, var30, var22, var24, var23, var25);
} else {
var31 = new DynamicObject(var4, 2, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
var32 = new DynamicObject(var4, 2, var30, var12, var2, var3, var38.animationId, true, (Entity)null);
var31 = new DynamicObject(id, 2, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
var32 = new DynamicObject(id, 2, var30, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var31, (Entity)var32, Tiles.field911[var5], Tiles.field911[var30], var26, var28);
var36.newBoundaryObject(plane, x, y, var23, (Entity)var31, (Entity)var32, Tiles.field911[orientation], Tiles.field911[var30], var26, var28);
if (var38.interactType != 0) {
var37.method90(var2, var3, var6, var5, var38.boolean1);
var37.method90(x, y, var6, orientation, var38.boolean1);
}
} else if (var6 == 3) {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(3, var5, var22, var24, var23, var25);
var29 = var38.getModel(3, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, 3, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, 3, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newBoundaryObject(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field912[var5], 0, var26, var28);
var36.newBoundaryObject(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field912[orientation], 0, var26, var28);
if (var38.interactType != 0) {
var37.method90(var2, var3, var6, var5, var38.boolean1);
var37.method90(x, y, var6, orientation, var38.boolean1);
}
} else if (var6 == 9) {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(var6, var5, var22, var24, var23, var25);
var29 = var38.getModel(var6, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, var6, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, var6, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.method284(var0, var2, var3, var23, 1, 1, (Entity)var29, 0, var26, var28);
var36.method284(plane, x, y, var23, 1, 1, (Entity)var29, 0, var26, var28);
if (var38.interactType != 0) {
var37.method91(var2, var3, var17, var39, var38.boolean1);
var37.method91(x, y, var17, var39, var38.boolean1);
}
} else if (var6 == 4) {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(4, var5, var22, var24, var23, var25);
var29 = var38.getModel(4, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, Tiles.field911[var5], 0, 0, 0, var26, var28);
var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, Tiles.field911[orientation], 0, 0, 0, var26, var28);
} else {
long var40;
if (var6 == 5) {
var30 = 16;
var40 = var36.method290(var0, var2, var3);
var40 = var36.getBoundaryObjectTag(plane, x, y);
if (var40 != 0L) {
var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2;
}
if (var38.animationId == -1 && var38.transforms == null) {
var31 = var38.getModel(4, var5, var22, var24, var23, var25);
var31 = var38.getModel(4, orientation, var22, var24, var23, var25);
} else {
var31 = new DynamicObject(var4, 4, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var31 = new DynamicObject(id, 4, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, Tiles.field911[var5], 0, var30 * Tiles.field913[var5], var30 * Tiles.field914[var5], var26, var28);
var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, Tiles.field911[orientation], 0, var30 * Tiles.field913[orientation], var30 * Tiles.field914[orientation], var26, var28);
} else if (var6 == 6) {
var30 = 8;
var40 = var36.method290(var0, var2, var3);
var40 = var36.getBoundaryObjectTag(plane, x, y);
if (var40 != 0L) {
var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
}
if (var38.animationId == -1 && var38.transforms == null) {
var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25);
} else {
var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)null, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28);
var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)null, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28);
} else {
int var34;
if (var6 == 7) {
var34 = var5 + 2 & 3;
var34 = orientation + 2 & 3;
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newWallDecoration(var0, var2, var3, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28);
var36.newWallDecoration(plane, x, y, var23, (Entity)var29, (Entity)null, 256, var34, 0, 0, var26, var28);
} else if (var6 == 8) {
var30 = 8;
var40 = var36.method290(var0, var2, var3);
var40 = var36.getBoundaryObjectTag(plane, x, y);
if (var40 != 0L) {
var30 = class50.getObjectDefinition(HitSplatDefinition.method4972(var40)).int2 / 2;
}
var34 = var5 + 2 & 3;
var34 = orientation + 2 & 3;
Object var35;
if (var38.animationId == -1 && var38.transforms == null) {
var31 = var38.getModel(4, var5 + 4, var22, var24, var23, var25);
var31 = var38.getModel(4, orientation + 4, var22, var24, var23, var25);
var35 = var38.getModel(4, var34 + 4, var22, var24, var23, var25);
} else {
var31 = new DynamicObject(var4, 4, var5 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
var35 = new DynamicObject(var4, 4, var34 + 4, var12, var2, var3, var38.animationId, true, (Entity)null);
var31 = new DynamicObject(id, 4, orientation + 4, var12, x, y, var38.animationId, true, (Entity)null);
var35 = new DynamicObject(id, 4, var34 + 4, var12, x, y, var38.animationId, true, (Entity)null);
}
var36.newWallDecoration(var0, var2, var3, var23, (Entity)var31, (Entity)var35, 256, var5, var30 * Tiles.field915[var5], var30 * Tiles.field916[var5], var26, var28);
var36.newWallDecoration(plane, x, y, var23, (Entity)var31, (Entity)var35, 256, orientation, var30 * Tiles.field915[orientation], var30 * Tiles.field916[orientation], var26, var28);
}
}
}
}
} else {
if (var38.animationId == -1 && var38.transforms == null) {
var29 = var38.getModel(10, var5, var22, var24, var23, var25);
var29 = var38.getModel(10, orientation, var22, var24, var23, var25);
} else {
var29 = new DynamicObject(var4, 10, var5, var12, var2, var3, var38.animationId, true, (Entity)null);
var29 = new DynamicObject(id, 10, orientation, var12, x, y, var38.animationId, true, (Entity)null);
}
if (var29 != null) {
var36.method284(var0, var2, var3, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28);
var36.method284(plane, x, y, var23, var17, var39, (Entity)var29, var6 == 11 ? 256 : 0, var26, var28);
}
if (var38.interactType != 0) {
var37.method91(var2, var3, var17, var39, var38.boolean1);
var37.method91(x, y, var17, var39, var38.boolean1);
}
}
}