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

92
runescape-client/src/main/java/WorldMapArea.java
View File

@@ -37,7 +37,7 @@ public class WorldMapArea {
@ObfuscatedGetter(
intValue = 986239133
)
int __w;
int field1015;
@ObfuscatedName("o")
@ObfuscatedGetter(
intValue = 196514055
@@ -83,7 +83,7 @@ public class WorldMapArea {
public WorldMapArea() {
this.id0 = -1;
this.__w = -1;
this.field1015 = -1;
this.zoom0 = -1;
this.origin0 = null;
this.minX0 = Integer.MAX_VALUE;
@@ -104,14 +104,14 @@ public class WorldMapArea {
this.archiveName0 = var1.readStringCp1252NullTerminated();
this.name0 = var1.readStringCp1252NullTerminated();
this.origin0 = new TileLocation(var1.readInt());
this.__w = var1.readInt();
this.field1015 = var1.readInt();
var1.readUnsignedByte();
this.isMain0 = var1.readUnsignedByte() == 1;
this.zoom0 = var1.readUnsignedByte();
int var3 = var1.readUnsignedByte();
this.sections = new LinkedList();
for(int var4 = 0; var4 < var3; ++var4) {
for (int var4 = 0; var4 < var3; ++var4) {
this.sections.add(this.readWorldMapSection(var1));
}
@@ -126,7 +126,7 @@ public class WorldMapArea {
@Export("readWorldMapSection")
WorldMapSection readWorldMapSection(Buffer var1) {
int var2 = var1.readUnsignedByte();
WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.__h_f, WorldMapSectionType.__h_w, WorldMapSectionType.__h_m, WorldMapSectionType.__h_q};
WorldMapSectionType[] var3 = new WorldMapSectionType[]{WorldMapSectionType.field1101, WorldMapSectionType.field1103, WorldMapSectionType.field1100, WorldMapSectionType.field1102};
WorldMapSectionType var4 = (WorldMapSectionType)ScriptFrame.findEnumerated(var3, var2);
Object var5 = null;
switch(var4.type) {
@@ -159,16 +159,14 @@ public class WorldMapArea {
public boolean containsCoord(int var1, int var2, int var3) {
Iterator var4 = this.sections.iterator();
WorldMapSection var5;
do {
if(!var4.hasNext()) {
return false;
while (var4.hasNext()) {
WorldMapSection var5 = (WorldMapSection)var4.next();
if (var5.containsCoord(var1, var2, var3)) {
return true;
}
}
var5 = (WorldMapSection)var4.next();
} while(!var5.containsCoord(var1, var2, var3));
return true;
return false;
}
@ObfuscatedName("w")
@@ -180,20 +178,18 @@ public class WorldMapArea {
public boolean containsPosition(int var1, int var2) {
int var3 = var1 / 64;
int var4 = var2 / 64;
if(var3 >= this.minX0 && var3 <= this.maxX0) {
if(var4 >= this.minY0 && var4 <= this.maxY0) {
if (var3 >= this.minX0 && var3 <= this.maxX0) {
if (var4 >= this.minY0 && var4 <= this.maxY0) {
Iterator var5 = this.sections.iterator();
WorldMapSection var6;
do {
if(!var5.hasNext()) {
return false;
while (var5.hasNext()) {
WorldMapSection var6 = (WorldMapSection)var5.next();
if (var6.containsPosition(var1, var2)) {
return true;
}
}
var6 = (WorldMapSection)var5.next();
} while(!var6.containsPosition(var1, var2));
return true;
return false;
} else {
return false;
}
@@ -211,16 +207,14 @@ public class WorldMapArea {
public int[] position(int var1, int var2, int var3) {
Iterator var4 = this.sections.iterator();
WorldMapSection var5;
do {
if(!var4.hasNext()) {
return null;
while (var4.hasNext()) {
WorldMapSection var5 = (WorldMapSection)var4.next();
if (var5.containsCoord(var1, var2, var3)) {
return var5.position(var1, var2, var3);
}
}
var5 = (WorldMapSection)var4.next();
} while(!var5.containsCoord(var1, var2, var3));
return var5.position(var1, var2, var3);
return null;
}
@ObfuscatedName("u")
@@ -232,16 +226,14 @@ public class WorldMapArea {
public TileLocation coord(int var1, int var2) {
Iterator var3 = this.sections.iterator();
WorldMapSection var4;
do {
if(!var3.hasNext()) {
return null;
while (var3.hasNext()) {
WorldMapSection var4 = (WorldMapSection)var3.next();
if (var4.containsPosition(var1, var2)) {
return var4.coord(var1, var2);
}
}
var4 = (WorldMapSection)var3.next();
} while(!var4.containsPosition(var1, var2));
return var4.coord(var1, var2);
return null;
}
@ObfuscatedName("g")
@@ -253,7 +245,7 @@ public class WorldMapArea {
void setBounds() {
Iterator var1 = this.sections.iterator();
while(var1.hasNext()) {
while (var1.hasNext()) {
WorldMapSection var2 = (WorldMapSection)var1.next();
var2.expandBounds(this);
}
@@ -305,8 +297,8 @@ public class WorldMapArea {
signature = "(I)I",
garbageValue = "-1657905623"
)
int __a_39() {
return this.__w;
int method386() {
return this.field1015;
}
@ObfuscatedName("z")
@@ -405,12 +397,12 @@ public class WorldMapArea {
garbageValue = "-1490951132"
)
static int method427(int var0, int var1) {
if(var0 == -2) {
if (var0 == -2) {
return 12345678;
} else if(var0 == -1) {
if(var1 < 0) {
} else if (var0 == -1) {
if (var1 < 0) {
var1 = 0;
} else if(var1 > 127) {
} else if (var1 > 127) {
var1 = 127;
}
@@ -418,9 +410,9 @@ public class WorldMapArea {
return var1;
} else {
var1 = (var0 & 127) * var1 / 128;
if(var1 < 2) {
if (var1 < 2) {
var1 = 2;
} else if(var1 > 126) {
} else if (var1 > 126) {
var1 = 126;
}
@@ -434,8 +426,8 @@ public class WorldMapArea {
garbageValue = "-26"
)
static void method428() {
if(Client.oculusOrbState == 1) {
Client.__client_ij = true;
if (Client.oculusOrbState == 1) {
Client.field199 = true;
}
}