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

Use newer version of fernflower and remove __xx names

Browse Source
This commit is contained in:
Lucas
2019-07-04 23:51:52 +02:00
parent 1f2a9b21d6
commit a8d801d830
294 changed files with 27369 additions and 27322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
runescape-client/src/main/java/AbstractWorldMapIcon.java
View File

@@ -11,7 +11,7 @@ public abstract class AbstractWorldMapIcon {
@ObfuscatedGetter(
intValue = -1942470229
)
static int __ak_qj;
static int field4;
@ObfuscatedName("ka")
@ObfuscatedGetter(
intValue = -1734004743
@@ -34,12 +34,12 @@ public abstract class AbstractWorldMapIcon {
@ObfuscatedGetter(
intValue = -521086143
)
int __e;
int field5;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = -1065362217
)
int __x;
int field6;
@ObfuscatedSignature(
signature = "(Lhu;Lhu;)V"
@@ -54,36 +54,36 @@ public abstract class AbstractWorldMapIcon {
signature = "(I)I",
garbageValue = "1990181988"
)
public abstract int __m_15();
public abstract int vmethod395();
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(I)Laj;",
garbageValue = "1159446036"
)
abstract WorldMapLabel __f_16();
abstract WorldMapLabel vmethod396();
@ObfuscatedName("q")
@ObfuscatedSignature(
signature = "(B)I",
garbageValue = "75"
)
abstract int __q_17();
abstract int vmethod397();
@ObfuscatedName("w")
@ObfuscatedSignature(
signature = "(I)I",
garbageValue = "-1558233611"
)
abstract int __w_18();
abstract int vmethod398();
@ObfuscatedName("y")
@ObfuscatedSignature(
signature = "(IIB)Z",
garbageValue = "-63"
)
boolean __y_66(int var1, int var2) {
return this.__b_68(var1, var2)?true:this.__c_69(var1, var2);
boolean method18(int var1, int var2) {
return this.method20(var1, var2) ? true : this.method21(var1, var2);
}
@ObfuscatedName("h")
@@ -91,8 +91,8 @@ public abstract class AbstractWorldMapIcon {
signature = "(I)Z",
garbageValue = "1150380891"
)
boolean __h_67() {
return this.__m_15() >= 0;
boolean method19() {
return this.vmethod395() >= 0;
}
@ObfuscatedName("b")
@@ -100,44 +100,45 @@ public abstract class AbstractWorldMapIcon {
signature = "(III)Z",
garbageValue = "484201257"
)
boolean __b_68(int var1, int var2) {
if(!this.__h_67()) {
boolean method20(int var1, int var2) {
if (!this.method19()) {
return false;
} else {
WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.__m_15());
int var4 = this.__q_17();
int var5 = this.__w_18();
WorldMapElement var3 = ViewportMouse.getWorldMapElement(this.vmethod395());
int var4 = this.vmethod397();
int var5 = this.vmethod398();
switch(var3.field3287.field3528) {
case 0:
if(var1 < this.__e - var4 / 2 || var1 > var4 / 2 + this.__e) {
return false;
if (var1 >= this.field5 - var4 / 2 && var1 <= var4 / 2 + this.field5) {
break;
}
break;
return false;
case 1:
if(var1 >= this.__e && var1 < var4 + this.__e) {
if (var1 >= this.field5 && var1 < var4 + this.field5) {
break;
}
return false;
case 2:
if(var1 <= this.__e - var4 || var1 > this.__e) {
if (var1 <= this.field5 - var4 || var1 > this.field5) {
return false;
}
}
switch(var3.field3301.field3275) {
case 0:
if(var2 <= this.__x - var5 || var2 > this.__x) {
if (var2 <= this.field6 - var5 || var2 > this.field6) {
return false;
}
break;
case 1:
if(var2 < this.__x - var5 / 2 || var2 > var5 / 2 + this.__x) {
if (var2 < this.field6 - var5 / 2 || var2 > var5 / 2 + this.field6) {
return false;
}
break;
case 2:
if(var2 < this.__x || var2 >= var5 + this.__x) {
if (var2 < this.field6 || var2 >= var5 + this.field6) {
return false;
}
}
@@ -151,9 +152,9 @@ public abstract class AbstractWorldMapIcon {
signature = "(III)Z",
garbageValue = "1201712205"
)
boolean __c_69(int var1, int var2) {
WorldMapLabel var3 = this.__f_16();
return var3 == null?false:(var1 >= this.__e - var3.width / 2 && var1 <= var3.width / 2 + this.__e?var2 >= this.__x && var2 <= var3.height + this.__x:false);
boolean method21(int var1, int var2) {
WorldMapLabel var3 = this.vmethod396();
return var3 == null ? false : (var1 >= this.field5 - var3.width / 2 && var1 <= var3.width / 2 + this.field5 ? var2 >= this.field6 && var2 <= var3.height + this.field6 : false);
}
@ObfuscatedName("es")
@@ -164,6 +165,6 @@ public abstract class AbstractWorldMapIcon {
static void method625(IndexCache var0, String var1) {
IndexCacheLoader var2 = new IndexCacheLoader(var0, var1);
Client.indexCacheLoaders.add(var2);
Client.__client_sx += var2.__q;
Client.field140 += var2.field408;
}
}