rs-client: Cleanup (#1087)
* rs-client: name SpriteBuffer * rs-client: (re)name spritebuffer methods * rs-client/deob: Add missed @Export's, make updatemappings fix this next time * rs-client: run intellij redundant else inspection * rs-client: invert some script interpreter if's * deob: checkstyle fixes * rs-client: SpriteBuffer_loadSprite -> SpriteBuffer_bufferFile
This commit is contained in:
@@ -55,20 +55,19 @@ public class WorldMapData_1 extends AbstractWorldMapData {
|
||||
int var2 = var1.readUnsignedByte();
|
||||
if (var2 != WorldMapID.field269.value) {
|
||||
throw new IllegalStateException("");
|
||||
} else {
|
||||
super.minPlane = var1.readUnsignedByte();
|
||||
super.planes = var1.readUnsignedByte();
|
||||
super.regionXLow = var1.readUnsignedShort() * 4096;
|
||||
super.regionYLow = var1.readUnsignedShort() * 4096;
|
||||
this.chunkXLow = var1.readUnsignedByte();
|
||||
this.chunkYLow = var1.readUnsignedByte();
|
||||
super.regionX = var1.readUnsignedShort();
|
||||
super.regionY = var1.readUnsignedShort();
|
||||
this.chunkX = var1.readUnsignedByte();
|
||||
this.chunkY = var1.readUnsignedByte();
|
||||
super.groupId = var1.method5511();
|
||||
super.fileId = var1.method5511();
|
||||
}
|
||||
super.minPlane = var1.readUnsignedByte();
|
||||
super.planes = var1.readUnsignedByte();
|
||||
super.regionXLow = var1.readUnsignedShort() * 4096;
|
||||
super.regionYLow = var1.readUnsignedShort() * 4096;
|
||||
this.chunkXLow = var1.readUnsignedByte();
|
||||
this.chunkYLow = var1.readUnsignedByte();
|
||||
super.regionX = var1.readUnsignedShort();
|
||||
super.regionY = var1.readUnsignedShort();
|
||||
this.chunkX = var1.readUnsignedByte();
|
||||
this.chunkY = var1.readUnsignedByte();
|
||||
super.groupId = var1.method5511();
|
||||
super.fileId = var1.method5511();
|
||||
}
|
||||
|
||||
@ObfuscatedName("w")
|
||||
@@ -87,21 +86,20 @@ public class WorldMapData_1 extends AbstractWorldMapData {
|
||||
int var2 = var1.readUnsignedByte();
|
||||
if (var2 != class30.field258.value) {
|
||||
throw new IllegalStateException("");
|
||||
} else {
|
||||
int var3 = var1.readUnsignedByte();
|
||||
int var4 = var1.readUnsignedByte();
|
||||
int var5 = var1.readUnsignedByte();
|
||||
int var6 = var1.readUnsignedByte();
|
||||
if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) {
|
||||
for (int var7 = 0; var7 < 8; ++var7) {
|
||||
for (int var8 = 0; var8 < 8; ++var8) {
|
||||
this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1);
|
||||
}
|
||||
}
|
||||
int var3 = var1.readUnsignedByte();
|
||||
int var4 = var1.readUnsignedByte();
|
||||
int var5 = var1.readUnsignedByte();
|
||||
int var6 = var1.readUnsignedByte();
|
||||
if (var3 == super.regionX && var4 == super.regionY && var5 == this.chunkX && var6 == this.chunkY) {
|
||||
for (int var7 = 0; var7 < 8; ++var7) {
|
||||
for (int var8 = 0; var8 < 8; ++var8) {
|
||||
this.readTile(var7 + this.chunkX * 8, var8 + this.chunkY * 8, var1);
|
||||
}
|
||||
|
||||
} else {
|
||||
throw new IllegalStateException("");
|
||||
}
|
||||
|
||||
} else {
|
||||
throw new IllegalStateException("");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,14 +146,12 @@ public class WorldMapData_1 extends AbstractWorldMapData {
|
||||
public boolean equals(Object var1) {
|
||||
if (!(var1 instanceof WorldMapData_1)) {
|
||||
return false;
|
||||
} else {
|
||||
WorldMapData_1 var2 = (WorldMapData_1)var1;
|
||||
if (var2.regionX == super.regionX && super.regionY == var2.regionY) {
|
||||
return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
WorldMapData_1 var2 = (WorldMapData_1)var1;
|
||||
if (var2.regionX == super.regionX && super.regionY == var2.regionY) {
|
||||
return var2.chunkX == this.chunkX && var2.chunkY == this.chunkY;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public int hashCode() {
|
||||
@@ -171,8 +167,7 @@ public class WorldMapData_1 extends AbstractWorldMapData {
|
||||
if (var0 == ScriptOpcodes.LOGOUT) {
|
||||
Client.field700 = 250;
|
||||
return 1;
|
||||
} else {
|
||||
return 2;
|
||||
}
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user