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

Fix wrong class names

Browse Source
This commit is contained in:
Lucas
2019-07-05 00:37:55 +02:00
parent a8d801d830
commit 6cfc662cd8
15 changed files with 129 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,7 +99,7 @@ public final class DemotingHashTable {
this.remaining -= var4;
while (this.remaining < 0) {
Wrapper var5 = (Wrapper)this.queue.method149();
Wrapper var5 = (Wrapper)this.queue.removeLast();
this.removeWrapper(var5);
}
@@ -113,7 +113,7 @@ public final class DemotingHashTable {
@ObfuscatedName("o")
@Export("demote")
public void demote(int var1) {
for (Wrapper var2 = (Wrapper)this.queue.method150(); var2 != null; var2 = (Wrapper)this.queue.method152()) {
for (Wrapper var2 = (Wrapper)this.queue.last(); var2 != null; var2 = (Wrapper)this.queue.previous()) {
if (var2.isSoft()) {
if (var2.get() == null) {
var2.remove();
@@ -123,7 +123,7 @@ public final class DemotingHashTable {
} else if (++var2.keyDual > (long)var1) {
SoftWrapper var3 = new SoftWrapper(var2.get(), var2.size);
this.hashTable.put(var3, var2.key);
DualNodeDeque.method5220(var3, var2);
DualNodeDeque.DualNodeDeque_addBefore(var3, var2);
var2.remove();
var2.removeDual();
}

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

@@ -93,7 +93,8 @@ public final class DualNodeDeque {
@ObfuscatedSignature(
signature = "(Lfn;Lfn;)V"
)
public static void method5220(DualNode var0, DualNode var1) {
@Export("DualNodeDeque_addBefore")
public static void DualNodeDeque_addBefore(DualNode var0, DualNode var1) {
if (var0.nextDual != null) {
var0.removeDual();
}

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

@@ -76,7 +76,7 @@ public class FriendSystem {
garbageValue = "-1408945788"
)
final void method102() {
for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method164(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.method165()) {
for (FriendLoginUpdate var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.last(); var1 != null; var1 = (FriendLoginUpdate)this.friendsList.friendLoginUpdates.previous()) {
if ((long)var1.time < class203.currentTimeMs() / 1000L - 5L) {
if (var1.world > 0) {
WorldMapIcon1.method219(5, "", var1.username + " has logged in.");

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

@@ -108,7 +108,7 @@ public class FriendsList extends UserList {
if (var6 != var11.world0) {
boolean var14 = true;
for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.method164(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.method165()) {
for (FriendLoginUpdate var13 = (FriendLoginUpdate)this.friendLoginUpdates.last(); var13 != null; var13 = (FriendLoginUpdate)this.friendLoginUpdates.previous()) {
if (var13.username.equals(var4)) {
if (var6 != 0 && var13.world == 0) {
var13.remove();
@@ -121,7 +121,7 @@ public class FriendsList extends UserList {
}
if (var14) {
this.friendLoginUpdates.method163(new FriendLoginUpdate(var4, var6));
this.friendLoginUpdates.addFirst(new FriendLoginUpdate(var4, var6));
}
}
} else {

14
runescape-client/src/main/java/IterableDualNodeQueue.java
View File

@@ -55,7 +55,8 @@ public class IterableDualNodeQueue implements Iterable {
@ObfuscatedSignature(
signature = "()Lfn;"
)
public DualNode method149() {
@Export("removeLast")
public DualNode removeLast() {
DualNode var1 = this.sentinel.previousDual;
if (var1 == this.sentinel) {
return null;
@@ -69,15 +70,17 @@ public class IterableDualNodeQueue implements Iterable {
@ObfuscatedSignature(
signature = "()Lfn;"
)
public DualNode method150() {
return this.method151((DualNode)null);
@Export("last")
public DualNode last() {
return this.previousOrLast((DualNode)null);
}
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "(Lfn;)Lfn;"
)
DualNode method151(DualNode var1) {
@Export("previousOrLast")
DualNode previousOrLast(DualNode var1) {
DualNode var2;
if (var1 == null) {
var2 = this.sentinel.previousDual;
@@ -98,7 +101,8 @@ public class IterableDualNodeQueue implements Iterable {
@ObfuscatedSignature(
signature = "()Lfn;"
)
public DualNode method152() {
@Export("previous")
public DualNode previous() {
DualNode var1 = this.head;
if (var1 == this.sentinel) {
this.head = null;

31
runescape-client/src/main/java/IterableDualNodeQueueIterator.java
View File

@@ -17,51 +17,54 @@ public class IterableDualNodeQueueIterator implements Iterator {
@ObfuscatedSignature(
signature = "Lfn;"
)
DualNode field438;
@Export("head")
DualNode head;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lfn;"
)
DualNode field439;
@Export("last")
DualNode last;
@ObfuscatedSignature(
signature = "(Ljc;)V"
)
IterableDualNodeQueueIterator(IterableDualNodeQueue var1) {
this.field439 = null;
this.last = null;
this.queue = var1;
this.field438 = this.queue.sentinel.previousDual;
this.field439 = null;
this.head = this.queue.sentinel.previousDual;
this.last = null;
}
@Export("next")
@ObfuscatedName("next")
public Object next() {
DualNode var1 = this.field438;
DualNode var1 = this.head;
if (var1 == this.queue.sentinel) {
var1 = null;
this.field438 = null;
this.head = null;
} else {
this.field438 = var1.previousDual;
this.head = var1.previousDual;
}
this.field439 = var1;
this.last = var1;
return var1;
}
@Export("hasNext")
@ObfuscatedName("hasNext")
public boolean hasNext() {
return this.queue.sentinel != this.field438;
return this.queue.sentinel != this.head;
}
@ObfuscatedName("remove")
public void method153() {
if (this.field439 == null) {
@Export("remove")
public void remove() {
if (this.last == null) {
throw new IllegalStateException();
} else {
this.field439.removeDual();
this.field439 = null;
this.last.removeDual();
this.last = null;
}
}
}

41
runescape-client/src/main/java/IterableNodeDequeDescendingIterator.java
View File

@@ -17,64 +17,69 @@ public class IterableNodeDequeDescendingIterator implements Iterator {
@ObfuscatedSignature(
signature = "Lgw;"
)
Node field440;
@Export("head")
Node head;
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "Lgw;"
)
Node field441;
@Export("last")
Node last;
@ObfuscatedSignature(
signature = "(Lja;)V"
)
IterableNodeDequeDescendingIterator(IterableNodeDeque var1) {
this.field441 = null;
this.method154(var1);
this.last = null;
this.setDeque(var1);
}
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(Lja;)V"
)
void method154(IterableNodeDeque var1) {
@Export("setDeque")
void setDeque(IterableNodeDeque var1) {
this.deque = var1;
this.method155();
this.start();
}
@ObfuscatedName("g")
void method155() {
this.field440 = this.deque != null ? this.deque.sentinel.previous : null;
this.field441 = null;
@Export("start")
void start() {
this.head = this.deque != null ? this.deque.sentinel.previous : null;
this.last = null;
}
@Export("hasNext")
@ObfuscatedName("hasNext")
public boolean hasNext() {
return this.deque.sentinel != this.field440;
return this.deque.sentinel != this.head;
}
@Export("next")
@ObfuscatedName("next")
public Object next() {
Node var1 = this.field440;
Node var1 = this.head;
if (var1 == this.deque.sentinel) {
var1 = null;
this.field440 = null;
this.head = null;
} else {
this.field440 = var1.previous;
this.head = var1.previous;
}
this.field441 = var1;
this.last = var1;
return var1;
}
@ObfuscatedName("remove")
public void method156() {
if (this.field441 == null) {
@Export("remove")
public void remove() {
if (this.last == null) {
throw new IllegalStateException();
} else {
this.field441.remove();
this.field441 = null;
this.last.remove();
this.last = null;
}
}
}

59
runescape-client/src/main/java/IterableNodeHashTableIterator.java
View File

@@ -17,46 +17,50 @@ public class IterableNodeHashTableIterator implements Iterator {
@ObfuscatedSignature(
signature = "Lgw;"
)
Node field442;
@Export("head")
Node head;
@ObfuscatedName("q")
int field443;
@Export("index")
int index;
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "Lgw;"
)
Node field444;
@Export("last")
Node last;
@ObfuscatedSignature(
signature = "(Llh;)V"
)
IterableNodeHashTableIterator(IterableNodeHashTable var1) {
this.field444 = null;
this.last = null;
this.hashTable = var1;
this.method157();
this.start();
}
@ObfuscatedName("u")
void method157() {
this.field442 = this.hashTable.buckets[0].previous;
this.field443 = 1;
this.field444 = null;
@Export("start")
void start() {
this.head = this.hashTable.buckets[0].previous;
this.index = 1;
this.last = null;
}
@Export("next")
@ObfuscatedName("next")
public Object next() {
Node var1;
if (this.hashTable.buckets[this.field443 - 1] != this.field442) {
var1 = this.field442;
this.field442 = var1.previous;
this.field444 = var1;
if (this.hashTable.buckets[this.index - 1] != this.head) {
var1 = this.head;
this.head = var1.previous;
this.last = var1;
return var1;
} else {
while (this.field443 < this.hashTable.size) {
var1 = this.hashTable.buckets[this.field443++].previous;
if (var1 != this.hashTable.buckets[this.field443 - 1]) {
this.field442 = var1.previous;
this.field444 = var1;
while (this.index < this.hashTable.size) {
var1 = this.hashTable.buckets[this.index++].previous;
if (var1 != this.hashTable.buckets[this.index - 1]) {
this.head = var1.previous;
this.last = var1;
return var1;
}
}
@@ -68,16 +72,16 @@ public class IterableNodeHashTableIterator implements Iterator {
@Export("hasNext")
@ObfuscatedName("hasNext")
public boolean hasNext() {
if (this.hashTable.buckets[this.field443 - 1] != this.field442) {
if (this.hashTable.buckets[this.index - 1] != this.head) {
return true;
} else {
while (this.field443 < this.hashTable.size) {
if (this.hashTable.buckets[this.field443++].previous != this.hashTable.buckets[this.field443 - 1]) {
this.field442 = this.hashTable.buckets[this.field443 - 1].previous;
while (this.index < this.hashTable.size) {
if (this.hashTable.buckets[this.index++].previous != this.hashTable.buckets[this.index - 1]) {
this.head = this.hashTable.buckets[this.index - 1].previous;
return true;
}
this.field442 = this.hashTable.buckets[this.field443 - 1];
this.head = this.hashTable.buckets[this.index - 1];
}
return false;
@@ -85,12 +89,13 @@ public class IterableNodeHashTableIterator implements Iterator {
}
@ObfuscatedName("remove")
public void method158() {
if (this.field444 == null) {
@Export("remove")
public void remove() {
if (this.last == null) {
throw new IllegalStateException();
} else {
this.field444.remove();
this.field444 = null;
this.last.remove();
this.last = null;
}
}
}

16
runescape-client/src/main/java/Link.java
View File

@@ -10,21 +10,23 @@ public class Link {
@ObfuscatedSignature(
signature = "Lgh;"
)
public Link field461;
@Export("previous")
public Link previous;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Lgh;"
)
public Link field462;
@Export("next")
public Link next;
@ObfuscatedName("m")
@Export("remove")
public void remove() {
if (this.field462 != null) {
this.field462.field461 = this.field461;
this.field461.field462 = this.field462;
this.field461 = null;
this.field462 = null;
if (this.next != null) {
this.next.previous = this.previous;
this.previous.next = this.next;
this.previous = null;
this.next = null;
}
}

48
runescape-client/src/main/java/LinkDeque.java
View File

@@ -1,3 +1,4 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@@ -9,45 +10,49 @@ public class LinkDeque {
@ObfuscatedSignature(
signature = "Lgh;"
)
Link field463;
@Export("sentinel")
Link sentinel;
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "Lgh;"
)
Link field464;
@Export("current")
Link current;
public LinkDeque() {
this.field463 = new Link();
this.field463.field461 = this.field463;
this.field463.field462 = this.field463;
this.sentinel = new Link();
this.sentinel.previous = this.sentinel;
this.sentinel.next = this.sentinel;
}
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "(Lgh;)V"
)
public void method163(Link var1) {
if (var1.field462 != null) {
@Export("addFirst")
public void addFirst(Link var1) {
if (var1.next != null) {
var1.remove();
}
var1.field462 = this.field463.field462;
var1.field461 = this.field463;
var1.field462.field461 = var1;
var1.field461.field462 = var1;
var1.next = this.sentinel.next;
var1.previous = this.sentinel;
var1.next.previous = var1;
var1.previous.next = var1;
}
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "()Lgh;"
)
public Link method164() {
Link var1 = this.field463.field461;
if (var1 == this.field463) {
this.field464 = null;
@Export("last")
public Link last() {
Link var1 = this.sentinel.previous;
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.field464 = var1.field461;
this.current = var1.previous;
return var1;
}
}
@@ -56,13 +61,14 @@ public class LinkDeque {
@ObfuscatedSignature(
signature = "()Lgh;"
)
public Link method165() {
Link var1 = this.field464;
if (var1 == this.field463) {
this.field464 = null;
@Export("previous")
public Link previous() {
Link var1 = this.current;
if (var1 == this.sentinel) {
this.current = null;
return null;
} else {
this.field464 = var1.field461;
this.current = var1.previous;
return var1;
}
}

0
runescape-client/src/main/java/Npc.java → runescape-client/src/main/java/NPC.java
View File

0
runescape-client/src/main/java/NpcDefinition.java → runescape-client/src/main/java/NPCDefinition.java
View File

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

@@ -169,7 +169,8 @@ public class NodeDeque {
@ObfuscatedSignature(
signature = "(Lgw;Lgw;)V"
)
public static void method5270(Node var0, Node var1) {
@Export("NodeDeque_addBefore")
public static void NodeDeque_addBefore(Node var0, Node var1) {
if (var0.next != null) {
var0.remove();
}

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

@@ -69,7 +69,7 @@ public class PcmStreamMixer extends PcmStream {
var1 = var1.previous;
}
NodeDeque.method5270(var2, var1);
NodeDeque.NodeDeque_addBefore(var2, var1);
this.field692 = ((PcmStreamMixerListener)this.field690.sentinel.previous).field693;
}

1
runescape-client/src/main/java/WorldMapEvent.java
View File

@@ -55,6 +55,7 @@ public class WorldMapEvent {
signature = "(IIIIB)V",
garbageValue = "2"
)
@Export("addSceneMenuOptions")
static final void addSceneMenuOptions(int var0, int var1, int var2, int var3) {
if (Client.isItemSelected == 0 && !Client.isSpellSelected) {
Tiles.insertMenuItemNoShift("Walk here", "", 23, 0, var0 - var2, var1 - var3);