client: rev 198 (#3014)

* client: rev 198

* client: checkstyle

Co-authored-by: therealnull <therealnull@gmail.com>
This commit is contained in:
Tyler Bochard
2021-07-28 07:24:38 -04:00
committed by GitHub
parent c2af17f765
commit 56ae122b89
466 changed files with 65937 additions and 65851 deletions

View File

@@ -3,19 +3,20 @@ import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("mk")
@ObfuscatedName("mt")
@Implements("Fonts")
public class Fonts {
@ObfuscatedName("f")
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "Ljp;"
descriptor = "Ljy;"
)
@Export("spritesArchive")
AbstractArchive spritesArchive;
@ObfuscatedName("e")
@ObfuscatedName("t")
@ObfuscatedSignature(
descriptor = "Ljp;"
descriptor = "Ljy;"
)
@Export("fontsArchive")
AbstractArchive fontsArchive;
@@ -24,47 +25,237 @@ public class Fonts {
HashMap map;
@ObfuscatedSignature(
descriptor = "(Ljp;Ljp;)V"
descriptor = "(Ljy;Ljy;)V"
)
public Fonts(AbstractArchive var1, AbstractArchive var2) {
this.spritesArchive = var1; // L: 14
this.fontsArchive = var2; // L: 15
this.map = new HashMap(); // L: 16
} // L: 17
this.spritesArchive = var1;
this.fontsArchive = var2;
this.map = new HashMap();
}
@ObfuscatedName("f")
@ObfuscatedName("s")
@ObfuscatedSignature(
descriptor = "([Lmb;B)Ljava/util/HashMap;",
garbageValue = "4"
descriptor = "([Lmk;B)Ljava/util/HashMap;",
garbageValue = "43"
)
@Export("createMap")
public HashMap createMap(FontName[] var1) {
HashMap var2 = new HashMap(); // L: 20
FontName[] var3 = var1; // L: 22
HashMap var2 = new HashMap();
FontName[] var3 = var1;
for (int var4 = 0; var4 < var3.length; ++var4) { // L: 23
FontName var5 = var3[var4]; // L: 24
if (this.map.containsKey(var5)) { // L: 26
var2.put(var5, this.map.get(var5)); // L: 27
for (int var4 = 0; var4 < var3.length; ++var4) {
FontName var5 = var3[var4];
if (this.map.containsKey(var5)) {
var2.put(var5, this.map.get(var5));
} else {
Font var6 = AbstractWorldMapData.method3696(this.spritesArchive, this.fontsArchive, var5.name, ""); // L: 30
if (var6 != null) { // L: 31
this.map.put(var5, var6); // L: 32
var2.put(var5, var6); // L: 33
Font var6 = ServerPacket.method4425(this.spritesArchive, this.fontsArchive, var5.name, "");
if (var6 != null) {
this.map.put(var5, var6);
var2.put(var5, var6);
}
}
}
return var2; // L: 39
return var2;
}
@ObfuscatedName("jb")
@ObfuscatedName("av")
@ObfuscatedSignature(
descriptor = "(ZB)V",
garbageValue = "-20"
descriptor = "(ILbd;ZB)I",
garbageValue = "0"
)
@Export("setTapToDrop")
static void setTapToDrop(boolean var0) {
Client.tapToDrop = var0; // L: 10357
} // L: 10358
static int method6367(int var0, Script var1, boolean var2) {
int var3;
if (var0 == ScriptOpcodes.CAM_FORCEANGLE) {
Interpreter.Interpreter_intStackSize -= 2;
var3 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
int var4 = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
if (!Client.isCameraLocked) {
Client.camAngleX = var3;
Client.camAngleY = var4;
}
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETANGLE_XA) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleX;
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETANGLE_YA) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camAngleY;
return 1;
} else if (var0 == ScriptOpcodes.CAM_SETFOLLOWHEIGHT) {
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
if (var3 < 0) {
var3 = 0;
}
Client.camFollowHeight = var3;
return 1;
} else if (var0 == ScriptOpcodes.CAM_GETFOLLOWHEIGHT) {
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = Client.camFollowHeight;
return 1;
} else {
return 2;
}
}
@ObfuscatedName("ht")
@ObfuscatedSignature(
descriptor = "(IIIIII)V",
garbageValue = "-662295851"
)
@Export("drawObject")
static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
long var5 = WorldMapIcon_1.scene.getBoundaryObjectTag(var0, var1, var2);
int var7;
int var8;
int var9;
int var10;
int var14;
int var26;
if (var5 != 0L) {
var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3;
var9 = var7 & 31;
var10 = var3;
boolean var12 = 0L != var5;
if (var12) {
boolean var13 = (int)(var5 >>> 16 & 1L) == 1;
var12 = !var13;
}
if (var12) {
var10 = var4;
}
int[] var19 = class376.sceneMinimapSprite.pixels;
var26 = var1 * 4 + (103 - var2) * 2048 + 24624;
var14 = class78.Entity_unpackID(var5);
ObjectComposition var15 = ClanChannel.getObjectDefinition(var14);
if (var15.mapSceneId != -1) {
IndexedSprite var16 = NetFileRequest.mapSceneSprites[var15.mapSceneId];
if (var16 != null) {
int var17 = (var15.sizeX * 4 - var16.subWidth) / 2;
int var18 = (var15.sizeY * 4 - var16.subHeight) / 2;
var16.drawAt(var1 * 4 + var17 + 48, var18 + (104 - var2 - var15.sizeY) * 4 + 48);
}
} else {
if (var9 == 0 || var9 == 2) {
if (var8 == 0) {
var19[var26] = var10;
var19[var26 + 512] = var10;
var19[var26 + 1024] = var10;
var19[var26 + 1536] = var10;
} else if (var8 == 1) {
var19[var26] = var10;
var19[var26 + 1] = var10;
var19[var26 + 2] = var10;
var19[var26 + 3] = var10;
} else if (var8 == 2) {
var19[var26 + 3] = var10;
var19[var26 + 512 + 3] = var10;
var19[var26 + 1024 + 3] = var10;
var19[var26 + 1536 + 3] = var10;
} else if (var8 == 3) {
var19[var26 + 1536] = var10;
var19[var26 + 1536 + 1] = var10;
var19[var26 + 1536 + 2] = var10;
var19[var26 + 1536 + 3] = var10;
}
}
if (var9 == 3) {
if (var8 == 0) {
var19[var26] = var10;
} else if (var8 == 1) {
var19[var26 + 3] = var10;
} else if (var8 == 2) {
var19[var26 + 1536 + 3] = var10;
} else if (var8 == 3) {
var19[var26 + 1536] = var10;
}
}
if (var9 == 2) {
if (var8 == 3) {
var19[var26] = var10;
var19[var26 + 512] = var10;
var19[var26 + 1024] = var10;
var19[var26 + 1536] = var10;
} else if (var8 == 0) {
var19[var26] = var10;
var19[var26 + 1] = var10;
var19[var26 + 2] = var10;
var19[var26 + 3] = var10;
} else if (var8 == 1) {
var19[var26 + 3] = var10;
var19[var26 + 512 + 3] = var10;
var19[var26 + 1024 + 3] = var10;
var19[var26 + 1536 + 3] = var10;
} else if (var8 == 2) {
var19[var26 + 1536] = var10;
var19[var26 + 1536 + 1] = var10;
var19[var26 + 1536 + 2] = var10;
var19[var26 + 1536 + 3] = var10;
}
}
}
}
var5 = WorldMapIcon_1.scene.getGameObjectTag(var0, var1, var2);
if (var5 != 0L) {
var7 = WorldMapIcon_1.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3;
var9 = var7 & 31;
var10 = class78.Entity_unpackID(var5);
ObjectComposition var20 = ClanChannel.getObjectDefinition(var10);
if (var20.mapSceneId != -1) {
IndexedSprite var28 = NetFileRequest.mapSceneSprites[var20.mapSceneId];
if (var28 != null) {
var26 = (var20.sizeX * 4 - var28.subWidth) / 2;
var14 = (var20.sizeY * 4 - var28.subHeight) / 2;
var28.drawAt(var1 * 4 + var26 + 48, (104 - var2 - var20.sizeY) * 4 + var14 + 48);
}
} else if (var9 == 9) {
int var25 = 15658734;
boolean var27 = 0L != var5;
if (var27) {
boolean var21 = (int)(var5 >>> 16 & 1L) == 1;
var27 = !var21;
}
if (var27) {
var25 = 15597568;
}
int[] var22 = class376.sceneMinimapSprite.pixels;
int var29 = var1 * 4 + (103 - var2) * 2048 + 24624;
if (var8 != 0 && var8 != 2) {
var22[var29] = var25;
var22[var29 + 1 + 512] = var25;
var22[var29 + 1024 + 2] = var25;
var22[var29 + 1536 + 3] = var25;
} else {
var22[var29 + 1536] = var25;
var22[var29 + 1 + 1024] = var25;
var22[var29 + 512 + 2] = var25;
var22[var29 + 3] = var25;
}
}
}
var5 = WorldMapIcon_1.scene.getFloorDecorationTag(var0, var1, var2);
if (var5 != 0L) {
var7 = class78.Entity_unpackID(var5);
ObjectComposition var23 = ClanChannel.getObjectDefinition(var7);
if (var23.mapSceneId != -1) {
IndexedSprite var24 = NetFileRequest.mapSceneSprites[var23.mapSceneId];
if (var24 != null) {
var10 = (var23.sizeX * 4 - var24.subWidth) / 2;
int var11 = (var23.sizeY * 4 - var24.subHeight) / 2;
var24.drawAt(var1 * 4 + var10 + 48, var11 + (104 - var2 - var23.sizeY) * 4 + 48);
}
}
}
}
}