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

More refactoring (tm)

Browse Source
This commit is contained in:
Lucas
2019-07-07 15:10:50 +02:00
parent e1a815eddd
commit e2aac6d899
159 changed files with 38213 additions and 46222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
runescape-client/src/main/java/class16.java
View File

@@ -294,24 +294,24 @@ public class class16 {
}
}
} else {
NodeDeque var38;
GroundItem var41;
GroundItem var38;
NodeDeque var40;
if (class190.field2347 == var0) {
var31 = var1.method58();
var2 = (var31 >> 4 & 7) + WorldMapSection3.field1089;
var32 = (var31 & 7) + Canvas.field95;
var3 = var1.method67();
if (var2 >= 0 && var32 >= 0 && var2 < 104 && var32 < 104) {
var38 = Client.groundItems[SoundSystem.plane][var2][var32];
if (var38 != null) {
for (var41 = (GroundItem)var38.last(); var41 != null; var41 = (GroundItem)var38.previous()) {
if ((var3 & 32767) == var41.id) {
var41.remove();
var40 = Client.groundItems[SoundSystem.plane][var2][var32];
if (var40 != null) {
for (var38 = (GroundItem)var40.last(); var38 != null; var38 = (GroundItem)var40.previous()) {
if ((var3 & 32767) == var38.id) {
var38.remove();
break;
}
}
if (var38.last() == null) {
if (var40.last() == null) {
Client.groundItems[SoundSystem.plane][var2][var32] = null;
}
@@ -342,17 +342,17 @@ public class class16 {
var35 = (var8 >> 4 & 7) + WorldMapSection3.field1089;
var9 = (var8 & 7) + Canvas.field95;
var10 = var1.method60();
byte var40 = var1.method61();
var11 = var40 + var35;
byte var41 = var1.method61();
var11 = var41 + var35;
int var42 = var10 + var9;
if (var35 >= 0 && var9 >= 0 && var35 < 104 && var9 < 104 && var11 >= 0 && var42 >= 0 && var11 < 104 && var42 < 104 && var32 != 65535) {
var35 = var35 * 128 + 64;
var9 = var9 * 128 + 64;
var11 = var11 * 128 + 64;
var42 = var42 * 128 + 64;
Projectile var43 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31);
var43.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle);
Client.projectiles.addFirst(var43);
Projectile var44 = new Projectile(var32, SoundSystem.plane, var35, var9, class32.getTileHeight(var35, var9, SoundSystem.plane) - var3, var7 + Client.cycle, var2 + Client.cycle, var5, var6, var4, var31);
var44.setDestination(var11, var42, class32.getTileHeight(var11, var42, SoundSystem.plane) - var31, var7 + Client.cycle);
Client.projectiles.addFirst(var44);
}
} else if (class190.field2346 != var0) {
if (class190.field2343 == var0) {
@@ -362,14 +362,14 @@ public class class16 {
var3 = (var32 >> 4 & 7) + WorldMapSection3.field1089;
var4 = (var32 & 7) + Canvas.field95;
if (var3 >= 0 && var4 >= 0 && var3 < 104 && var4 < 104) {
var41 = new GroundItem();
var41.id = var2;
var41.quantity = var31;
var38 = new GroundItem();
var38.id = var2;
var38.quantity = var31;
if (Client.groundItems[SoundSystem.plane][var3][var4] == null) {
Client.groundItems[SoundSystem.plane][var3][var4] = new NodeDeque();
}
Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var41);
Client.groundItems[SoundSystem.plane][var3][var4].addFirst(var38);
TilePaint.updateItemPile(var3, var4);
}
}
@@ -381,11 +381,11 @@ public class class16 {
var4 = (var3 >> 4 & 7) + WorldMapSection3.field1089;
var5 = (var3 & 7) + Canvas.field95;
if (var4 >= 0 && var5 >= 0 && var4 < 104 && var5 < 104) {
var38 = Client.groundItems[SoundSystem.plane][var4][var5];
if (var38 != null) {
for (GroundItem var44 = (GroundItem)var38.last(); var44 != null; var44 = (GroundItem)var38.previous()) {
if ((var31 & 32767) == var44.id && var32 == var44.quantity) {
var44.quantity = var2;
var40 = Client.groundItems[SoundSystem.plane][var4][var5];
if (var40 != null) {
for (GroundItem var43 = (GroundItem)var40.last(); var43 != null; var43 = (GroundItem)var40.previous()) {
if ((var31 & 32767) == var43.id && var32 == var43.quantity) {
var43.quantity = var2;
break;
}
}
@@ -406,11 +406,11 @@ public class class16 {
garbageValue = "0"
)
@Export("insertMenuItem")
static final void insertMenuItem(String var0, String var1, int var2, int var3, int var4, int var5, boolean var6) {
static final void insertMenuItem(String action, String targetName, int opcode, int var3, int var4, int var5, boolean var6) {
if (!Client.isMenuOpen && Client.menuOptionsCount < 500) {
Client.menuActions[Client.menuOptionsCount] = var0;
Client.menuTargetNames[Client.menuOptionsCount] = var1;
Client.menuOpcodes[Client.menuOptionsCount] = var2;
Client.menuActions[Client.menuOptionsCount] = action;
Client.menuTargetNames[Client.menuOptionsCount] = targetName;
Client.menuOpcodes[Client.menuOptionsCount] = opcode;
Client.menuArguments0[Client.menuOptionsCount] = var3;
Client.menuArguments1[Client.menuOptionsCount] = var4;
Client.menuArguments2[Client.menuOptionsCount] = var5;