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

134
runescape-client/src/main/java/WorldMapSection3.java
View File

@@ -20,57 +20,57 @@ public class WorldMapSection3 implements WorldMapSection {
@ObfuscatedGetter(
intValue = -948290091
)
static int __p_go;
static int field1089;
@ObfuscatedName("m")
@ObfuscatedGetter(
intValue = 1389733201
)
int __m;
int field1090;
@ObfuscatedName("f")
@ObfuscatedGetter(
intValue = -1622972483
)
int __f;
int field1091;
@ObfuscatedName("q")
@ObfuscatedGetter(
intValue = 702057599
)
int __q;
int field1092;
@ObfuscatedName("w")
@ObfuscatedGetter(
intValue = -1068088609
)
int __w;
int field1093;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = 1257151629
)
int __o;
int field1094;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -1351623663
)
int __u;
int field1095;
@ObfuscatedName("g")
@ObfuscatedGetter(
intValue = 1016557381
)
int __g;
int field1096;
@ObfuscatedName("l")
@ObfuscatedGetter(
intValue = 884736611
)
int __l;
int field1097;
@ObfuscatedName("e")
@ObfuscatedGetter(
intValue = 395786901
)
int __e;
int field1098;
@ObfuscatedName("x")
@ObfuscatedGetter(
intValue = -627081155
)
int __x;
int field1099;
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -79,20 +79,20 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("expandBounds")
public void expandBounds(WorldMapArea var1) {
if(var1.minX0 > this.__g) {
var1.minX0 = this.__g;
if (var1.minX0 > this.field1096) {
var1.minX0 = this.field1096;
}
if(var1.maxX0 < this.__e) {
var1.maxX0 = this.__e;
if (var1.maxX0 < this.field1098) {
var1.maxX0 = this.field1098;
}
if(var1.minY0 > this.__l) {
var1.minY0 = this.__l;
if (var1.minY0 > this.field1097) {
var1.minY0 = this.field1097;
}
if(var1.maxY0 < this.__x) {
var1.maxY0 = this.__x;
if (var1.maxY0 < this.field1099) {
var1.maxY0 = this.field1099;
}
}
@@ -104,7 +104,7 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
return var1 >= this.__m && var1 < this.__m + this.__f?var2 >> 6 >= this.__q && var2 >> 6 <= this.__o && var3 >> 6 >= this.__w && var3 >> 6 <= this.__u:false;
return var1 >= this.field1090 && var1 < this.field1090 + this.field1091 ? var2 >> 6 >= this.field1092 && var2 >> 6 <= this.field1094 && var3 >> 6 >= this.field1093 && var3 >> 6 <= this.field1095 : false;
}
@ObfuscatedName("q")
@@ -114,7 +114,7 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
return var1 >> 6 >= this.__g && var1 >> 6 <= this.__e && var2 >> 6 >= this.__l && var2 >> 6 <= this.__x;
return var1 >> 6 >= this.field1096 && var1 >> 6 <= this.field1098 && var2 >> 6 >= this.field1097 && var2 >> 6 <= this.field1099;
}
@ObfuscatedName("w")
@@ -124,10 +124,10 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("position")
public int[] position(int var1, int var2, int var3) {
if(!this.containsCoord(var1, var2, var3)) {
if (!this.containsCoord(var1, var2, var3)) {
return null;
} else {
int[] var4 = new int[]{this.__g * 64 - this.__q * 64 + var2, var3 + (this.__l * 64 - this.__w * 64)};
int[] var4 = new int[]{this.field1096 * 64 - this.field1092 * 64 + var2, var3 + (this.field1097 * 64 - this.field1093 * 64)};
return var4;
}
}
@@ -139,12 +139,12 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("coord")
public TileLocation coord(int var1, int var2) {
if(!this.containsPosition(var1, var2)) {
if (!this.containsPosition(var1, var2)) {
return null;
} else {
int var3 = this.__q * 64 - this.__g * 64 + var1;
int var4 = this.__w * 64 - this.__l * 64 + var2;
return new TileLocation(this.__m, var3, var4);
int var3 = this.field1092 * 64 - this.field1096 * 64 + var1;
int var4 = this.field1093 * 64 - this.field1097 * 64 + var2;
return new TileLocation(this.field1090, var3, var4);
}
}
@@ -155,17 +155,17 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("read")
public void read(Buffer var1) {
this.__m = var1.readUnsignedByte();
this.__f = var1.readUnsignedByte();
this.__q = var1.__ag_302();
this.__w = var1.__ag_302();
this.__o = var1.__ag_302();
this.__u = var1.__ag_302();
this.__g = var1.__ag_302();
this.__l = var1.__ag_302();
this.__e = var1.__ag_302();
this.__x = var1.__ag_302();
this.__g_38();
this.field1090 = var1.readUnsignedByte();
this.field1091 = var1.readUnsignedByte();
this.field1092 = var1.method43();
this.field1093 = var1.method43();
this.field1094 = var1.method43();
this.field1095 = var1.method43();
this.field1096 = var1.method43();
this.field1097 = var1.method43();
this.field1098 = var1.method43();
this.field1099 = var1.method43();
this.method426();
}
@ObfuscatedName("g")
@@ -173,7 +173,7 @@ public class WorldMapSection3 implements WorldMapSection {
signature = "(B)V",
garbageValue = "-126"
)
void __g_38() {
void method426() {
}
@ObfuscatedName("d")
@@ -182,14 +182,14 @@ public class WorldMapSection3 implements WorldMapSection {
garbageValue = "1115233428"
)
static final void method345(Widget var0, int var1) {
if(var0.__cf == null) {
if (var0.field966 == null) {
throw new RuntimeException();
} else {
if(var0.__fh == null) {
var0.__fh = new int[var0.__cf.length];
if (var0.field984 == null) {
var0.field984 = new int[var0.field966.length];
}
var0.__fh[var1] = Integer.MAX_VALUE;
var0.field984[var1] = Integer.MAX_VALUE;
}
}
@@ -200,22 +200,20 @@ public class WorldMapSection3 implements WorldMapSection {
)
@Export("runWidgetOnLoadListener")
static void runWidgetOnLoadListener(int var0) {
if(var0 != -1) {
if(GroundItemPile.loadWidgetGroup(var0)) {
Widget[] var1 = Widget.widgets[var0];
if (var0 != -1 && GroundItemPile.loadWidgetGroup(var0)) {
Widget[] var1 = Widget.widgets[var0];
for(int var2 = 0; var2 < var1.length; ++var2) {
Widget var3 = var1[var2];
if(var3.onLoad != null) {
ScriptEvent var4 = new ScriptEvent();
var4.widget = var3;
var4.args0 = var3.onLoad;
GrandExchangeEvent.runScript0(var4, 5000000);
}
for (int var2 = 0; var2 < var1.length; ++var2) {
Widget var3 = var1[var2];
if (var3.onLoad != null) {
ScriptEvent var4 = new ScriptEvent();
var4.widget = var3;
var4.args0 = var3.onLoad;
GrandExchangeEvent.runScript0(var4, 5000000);
}
}
}
}
@ObfuscatedName("ic")
@@ -227,38 +225,38 @@ public class WorldMapSection3 implements WorldMapSection {
static void alignWidgetSize(Widget var0, int var1, int var2, boolean var3) {
int var4 = var0.width;
int var5 = var0.height;
if(var0.widthAlignment == 0) {
if (var0.widthAlignment == 0) {
var0.width = var0.rawWidth;
} else if(var0.widthAlignment == 1) {
} else if (var0.widthAlignment == 1) {
var0.width = var1 - var0.rawWidth;
} else if(var0.widthAlignment == 2) {
} else if (var0.widthAlignment == 2) {
var0.width = var0.rawWidth * var1 >> 14;
}
if(var0.heightAlignment == 0) {
if (var0.heightAlignment == 0) {
var0.height = var0.rawHeight;
} else if(var0.heightAlignment == 1) {
} else if (var0.heightAlignment == 1) {
var0.height = var2 - var0.rawHeight;
} else if(var0.heightAlignment == 2) {
} else if (var0.heightAlignment == 2) {
var0.height = var2 * var0.rawHeight >> 14;
}
if(var0.widthAlignment == 4) {
var0.width = var0.height * var0.__aw / var0.__al;
if (var0.widthAlignment == 4) {
var0.width = var0.height * var0.field958 / var0.field959;
}
if(var0.heightAlignment == 4) {
var0.height = var0.width * var0.__al / var0.__aw;
if (var0.heightAlignment == 4) {
var0.height = var0.width * var0.field959 / var0.field958;
}
if(var0.contentType == 1337) {
if (var0.contentType == 1337) {
Client.viewportWidget = var0;
}
if(var3 && var0.__ee != null && (var4 != var0.width || var5 != var0.height)) {
if (var3 && var0.field975 != null && (var4 != var0.width || var5 != var0.height)) {
ScriptEvent var6 = new ScriptEvent();
var6.widget = var0;
var6.args0 = var0.__ee;
var6.args0 = var0.field975;
Client.scriptEvents.addFirst(var6);
}