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

rs-client: refactoring (#1344)

Browse Source 
* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
runescape-client/src/main/java/DirectByteArrayCopier.java
View File

@@ -67,80 +67,81 @@ public class DirectByteArrayCopier extends AbstractByteArrayCopier {
garbageValue = "1456819139"
)
@Export("addPendingSpawnToScene")
static final void addPendingSpawnToScene(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 != class42.plane) {
return;
}
static final void addPendingSpawnToScene(int plane, int type, int x, int y, int id, int orientation, int var6) {
if (x < 1 || y < 1 || x > 102 || y > 102) {
return;
}
if (Client.isLowDetail && plane != class42.plane) {
return;
}
long var7 = 0L;
boolean var9 = true;
boolean var10 = false;
boolean var11 = false;
if (var1 == 0) {
var7 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(var0, var2, var3);
}
long var7 = 0L;
boolean var9 = true;
boolean var10 = false;
boolean var11 = false;
if (type == 0) {
var7 = GrandExchangeOfferWorldComparator.scene.getBoundaryObjectTag(plane, x, y);
}
if (var1 == 1) {
var7 = GrandExchangeOfferWorldComparator.scene.getWallDecorationTag(var0, var2, var3);
}
if (type == 1) {
var7 = GrandExchangeOfferWorldComparator.scene.getWallDecorationTag(plane, x, y);
}
if (var1 == 2) {
var7 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(var0, var2, var3);
}
if (type == 2) {
var7 = GrandExchangeOfferWorldComparator.scene.getGameObjectTag(plane, x, y);
}
if (var1 == 3) {
var7 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(var0, var2, var3);
}
if (type == 3) {
var7 = GrandExchangeOfferWorldComparator.scene.getFloorDecorationTag(plane, x, y);
}
int var12;
if (0L != var7) {
var12 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(var0, var2, var3, var7);
int var14 = class43.getObjectIdFromTag(var7);
int var15 = var12 & 31;
int var16 = var12 >> 6 & 3;
ObjectDefinition var13;
if (var1 == 0) {
GrandExchangeOfferWorldComparator.scene.removeBoundaryObject(var0, var2, var3);
var13 = ViewportMouse.getObjectDefinition(var14);
if (var13.interactType != 0) {
Client.collisionMaps[var0].method3564(var2, var3, var15, var16, var13.boolean1);
}
}
if (var1 == 1) {
GrandExchangeOfferWorldComparator.scene.removeWallDecoration(var0, var2, var3);
}
if (var1 == 2) {
GrandExchangeOfferWorldComparator.scene.method3154(var0, var2, var3);
var13 = ViewportMouse.getObjectDefinition(var14);
if (var2 + var13.sizeX > 103 || var3 + var13.sizeX > 103 || var2 + var13.sizeY > 103 || var3 + var13.sizeY > 103) {
return;
}
if (var13.interactType != 0) {
Client.collisionMaps[var0].method3565(var2, var3, var13.sizeX, var13.sizeY, var16, var13.boolean1);
}
}
if (var1 == 3) {
GrandExchangeOfferWorldComparator.scene.removeFloorDecoration(var0, var2, var3);
var13 = ViewportMouse.getObjectDefinition(var14);
if (var13.interactType == 1) {
Client.collisionMaps[var0].method3567(var2, var3);
}
int var12;
if (0L != var7) {
var12 = GrandExchangeOfferWorldComparator.scene.getObjectFlags(plane, x, y, var7);
int var14 = class43.Entity_unpackID(var7);
int var15 = var12 & 31;
int var16 = var12 >> 6 & 3;
ObjectDefinition var13;
if (type == 0) {
GrandExchangeOfferWorldComparator.scene.removeBoundaryObject(plane, x, y);
var13 = ViewportMouse.getObjectDefinition(var14);
if (var13.interactType != 0) {
Client.collisionMaps[plane].method3564(x, y, var15, var16, var13.boolean1);
}
}
if (var4 >= 0) {
var12 = var0;
if (var0 < 3 && (Tiles.Tiles_renderFlags[1][var2][var3] & 2) == 2) {
var12 = var0 + 1;
if (type == 1) {
GrandExchangeOfferWorldComparator.scene.removeWallDecoration(plane, x, y);
}
if (type == 2) {
GrandExchangeOfferWorldComparator.scene.removeGameObject(plane, x, y);
var13 = ViewportMouse.getObjectDefinition(var14);
if (x + var13.sizeX > 103 || y + var13.sizeX > 103 || x + var13.sizeY > 103 || y + var13.sizeY > 103) {
return;
}
ClientPacket.method3611(var0, var12, var2, var3, var4, var5, var6, GrandExchangeOfferWorldComparator.scene, Client.collisionMaps[var0]);
if (var13.interactType != 0) {
Client.collisionMaps[plane].setFlagOffNonSquare(x, y, var13.sizeX, var13.sizeY, var16, var13.boolean1);
}
}
if (type == 3) {
GrandExchangeOfferWorldComparator.scene.removeFloorDecoration(plane, x, y);
var13 = ViewportMouse.getObjectDefinition(var14);
if (var13.interactType == 1) {
Client.collisionMaps[plane].method3567(x, y);
}
}
}
if (id >= 0) {
var12 = plane;
if (plane < 3 && (Tiles.Tiles_renderFlags[1][x][y] & 2) == 2) {
var12 = plane + 1;
}
ClientPacket.addPendingGameObject(plane, var12, x, y, id, orientation, var6, GrandExchangeOfferWorldComparator.scene, Client.collisionMaps[plane]);
}
}