project: Rev 202

This commit is contained in:
Owain van Brakel
2021-12-14 18:20:58 +01:00
parent e974585ce8
commit 7c7bf0901a
406 changed files with 39725 additions and 39842 deletions

View File

@@ -45,7 +45,7 @@ public final class FloorDecoration {
int flags;
FloorDecoration() {
} // L: 11
}
@ObfuscatedName("ih")
@ObfuscatedSignature(
@@ -54,73 +54,73 @@ public final class FloorDecoration {
)
@Export("addSceneMenuOptions")
static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
if (Client.isItemSelected == 0 && !Client.isSpellSelected) { // L: 10088
class11.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3); // L: 10089
if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
class11.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);
}
long var4 = -1L; // L: 10092
long var6 = -1L; // L: 10093
long var4 = -1L;
long var6 = -1L;
int var8;
for (var8 = 0; var8 < class113.method2616(); ++var8) { // L: 10094
long var23 = MenuAction.method1960(var8); // L: 10095
if (var23 != var6) { // L: 10096
var6 = var23; // L: 10097
int var25 = FloorOverlayDefinition.method3618(var8); // L: 10098
long var14 = ViewportMouse.ViewportMouse_entityTags[var8]; // L: 10102
int var13 = (int)(var14 >>> 7 & 127L); // L: 10104
var13 = var13; // L: 10108
int var26 = class114.method2629(var8); // L: 10109
int var15 = PacketWriter.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]); // L: 10112
int var16 = var15; // L: 10114
if (var26 == 2 && class7.scene.getObjectFlags(class20.Client_plane, var25, var13, var23) >= 0) { // L: 10115 10116
ObjectComposition var17 = class148.getObjectDefinition(var15); // L: 10117
if (var17.transforms != null) { // L: 10118
for (var8 = 0; var8 < class113.method2616(); ++var8) {
long var23 = MenuAction.method1960(var8);
if (var23 != var6) {
var6 = var23;
int var25 = FloorOverlayDefinition.method3618(var8);
long var14 = ViewportMouse.ViewportMouse_entityTags[var8];
int var13 = (int)(var14 >>> 7 & 127L);
var13 = var13;
int var26 = class114.method2629(var8);
int var15 = PacketWriter.Entity_unpackID(ViewportMouse.ViewportMouse_entityTags[var8]);
int var16 = var15;
if (var26 == 2 && class7.scene.getObjectFlags(class20.Client_plane, var25, var13, var23) >= 0) {
ObjectComposition var17 = class148.getObjectDefinition(var15);
if (var17.transforms != null) {
var17 = var17.transform();
}
if (var17 == null) { // L: 10119
if (var17 == null) {
continue;
}
if (Client.isItemSelected == 1) { // L: 10120
class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 1, var15, var25, var13); // L: 10121
} else if (Client.isSpellSelected) { // L: 10124
if ((class91.selectedSpellFlags & 4) == 4) { // L: 10125
class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 2, var15, var25, var13); // L: 10126
if (Client.isItemSelected == 1) {
class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 1, var15, var25, var13);
} else if (Client.isSpellSelected) {
if ((class91.selectedSpellFlags & 4) == 4) {
class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(65535) + var17.name, 2, var15, var25, var13);
}
} else {
String[] var18 = var17.actions; // L: 10131
if (var18 != null) { // L: 10132
for (int var19 = 4; var19 >= 0; --var19) { // L: 10133
if (var18[var19] != null) { // L: 10134
short var20 = 0; // L: 10135
if (var19 == 0) { // L: 10136
String[] var18 = var17.actions;
if (var18 != null) {
for (int var19 = 4; var19 >= 0; --var19) {
if (var18[var19] != null) {
short var20 = 0;
if (var19 == 0) {
var20 = 3;
}
if (var19 == 1) { // L: 10137
if (var19 == 1) {
var20 = 4;
}
if (var19 == 2) { // L: 10138
if (var19 == 2) {
var20 = 5;
}
if (var19 == 3) { // L: 10139
if (var19 == 3) {
var20 = 6;
}
if (var19 == 4) { // L: 10140
if (var19 == 4) {
var20 = 1001;
}
class11.insertMenuItemNoShift(var18[var19], UserComparator5.colorStartTag(65535) + var17.name, var20, var16, var25, var13); // L: 10141
class11.insertMenuItemNoShift(var18[var19], UserComparator5.colorStartTag(65535) + var17.name, var20, var16, var25, var13);
}
}
}
class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(65535) + var17.name, 1002, var17.id, var25, var13); // L: 10146
class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(65535) + var17.name, 1002, var17.id, var25, var13);
}
}
@@ -129,110 +129,110 @@ public final class FloorDecoration {
NPC var28;
int var35;
int[] var36;
if (var26 == 1) { // L: 10151
NPC var31 = Client.npcs[var16]; // L: 10152
if (var31 == null) { // L: 10153
if (var26 == 1) {
NPC var31 = Client.npcs[var16];
if (var31 == null) {
continue;
}
if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) { // L: 10154
for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 10155
var28 = Client.npcs[Client.npcIndices[var27]]; // L: 10156
if (var28 != null && var28 != var31 && var28.definition.size == 1 && var31.x == var28.x && var28.y == var31.y) { // L: 10157
if (var31.definition.size == 1 && (var31.x & 127) == 64 && (var31.y & 127) == 64) {
for (var27 = 0; var27 < Client.npcCount; ++var27) {
var28 = Client.npcs[Client.npcIndices[var27]];
if (var28 != null && var28 != var31 && var28.definition.size == 1 && var31.x == var28.x && var28.y == var31.y) {
GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13);
}
}
var27 = Players.Players_count; // L: 10159
var36 = Players.Players_indices; // L: 10160
var27 = Players.Players_count;
var36 = Players.Players_indices;
for (var35 = 0; var35 < var27; ++var35) { // L: 10161
var21 = Client.players[var36[var35]]; // L: 10162
if (var21 != null && var31.x == var21.x && var21.y == var31.y) { // L: 10163
for (var35 = 0; var35 < var27; ++var35) {
var21 = Client.players[var36[var35]];
if (var21 != null && var31.x == var21.x && var21.y == var31.y) {
class233.addPlayerToMenu(var21, var36[var35], var25, var13);
}
}
}
GrandExchangeOfferAgeComparator.addNpcToMenu(var31, var16, var25, var13); // L: 10166
GrandExchangeOfferAgeComparator.addNpcToMenu(var31, var16, var25, var13);
}
if (var26 == 0) { // L: 10168
Player var32 = Client.players[var16]; // L: 10169
if (var32 == null) { // L: 10170
if (var26 == 0) {
Player var32 = Client.players[var16];
if (var32 == null) {
continue;
}
if ((var32.x & 127) == 64 && (var32.y & 127) == 64) { // L: 10171
for (var27 = 0; var27 < Client.npcCount; ++var27) { // L: 10172
var28 = Client.npcs[Client.npcIndices[var27]]; // L: 10173
if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) { // L: 10174
if ((var32.x & 127) == 64 && (var32.y & 127) == 64) {
for (var27 = 0; var27 < Client.npcCount; ++var27) {
var28 = Client.npcs[Client.npcIndices[var27]];
if (var28 != null && var28.definition.size == 1 && var32.x == var28.x && var32.y == var28.y) {
GrandExchangeOfferAgeComparator.addNpcToMenu(var28, Client.npcIndices[var27], var25, var13);
}
}
var27 = Players.Players_count; // L: 10176
var36 = Players.Players_indices; // L: 10177
var27 = Players.Players_count;
var36 = Players.Players_indices;
for (var35 = 0; var35 < var27; ++var35) { // L: 10178
var21 = Client.players[var36[var35]]; // L: 10179
if (var21 != null && var32 != var21 && var21.x == var32.x && var21.y == var32.y) { // L: 10180
for (var35 = 0; var35 < var27; ++var35) {
var21 = Client.players[var36[var35]];
if (var21 != null && var32 != var21 && var21.x == var32.x && var21.y == var32.y) {
class233.addPlayerToMenu(var21, var36[var35], var25, var13);
}
}
}
if (var16 != Client.combatTargetPlayerIndex) { // L: 10183
if (var16 != Client.combatTargetPlayerIndex) {
class233.addPlayerToMenu(var32, var16, var25, var13);
} else {
var4 = var23; // L: 10184
var4 = var23;
}
}
if (var26 == 3) { // L: 10186
NodeDeque var34 = Client.groundItems[class20.Client_plane][var25][var13]; // L: 10187
if (var34 != null) { // L: 10188
for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) { // L: 10189 10190 10223
ItemComposition var37 = UserComparator6.ItemDefinition_get(var33.id); // L: 10191
if (Client.isItemSelected == 1) { // L: 10192
class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 16, var33.id, var25, var13); // L: 10193
} else if (Client.isSpellSelected) { // L: 10196
if ((class91.selectedSpellFlags & 1) == 1) { // L: 10197
class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 17, var33.id, var25, var13); // L: 10198
if (var26 == 3) {
NodeDeque var34 = Client.groundItems[class20.Client_plane][var25][var13];
if (var34 != null) {
for (TileItem var33 = (TileItem)var34.first(); var33 != null; var33 = (TileItem)var34.next()) {
ItemComposition var37 = UserComparator6.ItemDefinition_get(var33.id);
if (Client.isItemSelected == 1) {
class11.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 16, var33.id, var25, var13);
} else if (Client.isSpellSelected) {
if ((class91.selectedSpellFlags & 1) == 1) {
class11.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + UserComparator5.colorStartTag(16748608) + var37.name, 17, var33.id, var25, var13);
}
} else {
String[] var29 = var37.groundActions; // L: 10203
String[] var29 = var37.groundActions;
for (int var30 = 4; var30 >= 0; --var30) { // L: 10204
if (var29 != null && var29[var30] != null) { // L: 10205
byte var22 = 0; // L: 10206
if (var30 == 0) { // L: 10207
for (int var30 = 4; var30 >= 0; --var30) {
if (var29 != null && var29[var30] != null) {
byte var22 = 0;
if (var30 == 0) {
var22 = 18;
}
if (var30 == 1) { // L: 10208
if (var30 == 1) {
var22 = 19;
}
if (var30 == 2) { // L: 10209
if (var30 == 2) {
var22 = 20;
}
if (var30 == 3) { // L: 10210
if (var30 == 3) {
var22 = 21;
}
if (var30 == 4) { // L: 10211
if (var30 == 4) {
var22 = 22;
}
class11.insertMenuItemNoShift(var29[var30], UserComparator5.colorStartTag(16748608) + var37.name, var22, var33.id, var25, var13); // L: 10212
} else if (var30 == 2) { // L: 10215
class11.insertMenuItemNoShift("Take", UserComparator5.colorStartTag(16748608) + var37.name, 20, var33.id, var25, var13); // L: 10216
class11.insertMenuItemNoShift(var29[var30], UserComparator5.colorStartTag(16748608) + var37.name, var22, var33.id, var25, var13);
} else if (var30 == 2) {
class11.insertMenuItemNoShift("Take", UserComparator5.colorStartTag(16748608) + var37.name, 20, var33.id, var25, var13);
}
}
class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var37.name, 1004, var33.id, var25, var13); // L: 10220
class11.insertMenuItemNoShift("Examine", UserComparator5.colorStartTag(16748608) + var37.name, 1004, var33.id, var25, var13);
}
}
}
@@ -240,12 +240,12 @@ public final class FloorDecoration {
}
}
if (-1L != var4) { // L: 10228
var8 = MouseRecorder.method2159(var4); // L: 10229
int var9 = (int)(var4 >>> 7 & 127L); // L: 10232
Player var11 = Client.players[Client.combatTargetPlayerIndex]; // L: 10235
class233.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9); // L: 10236
if (-1L != var4) {
var8 = MouseRecorder.method2159(var4);
int var9 = (int)(var4 >>> 7 & 127L);
Player var11 = Client.players[Client.combatTargetPlayerIndex];
class233.addPlayerToMenu(var11, Client.combatTargetPlayerIndex, var8, var9);
}
} // L: 10238
}
}