chore: revision 189

This commit is contained in:
ThatGamerBlue
2020-03-26 14:17:06 +00:00
parent 60b7d0413f
commit acd339fd70
392 changed files with 43289 additions and 42917 deletions

View File

@@ -4,39 +4,30 @@ import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("bp")
@ObfuscatedName("bz")
@Implements("ArchiveLoader")
public class ArchiveLoader {
@ObfuscatedName("cj")
@Export("mouseCam")
static boolean mouseCam;
@ObfuscatedName("gw")
@ObfuscatedName("m")
@ObfuscatedSignature(
signature = "Llt;"
)
@Export("redHintArrowSprite")
static Sprite redHintArrowSprite;
@ObfuscatedName("t")
@ObfuscatedSignature(
signature = "Lia;"
signature = "Lih;"
)
@Export("archive")
final Archive archive;
@ObfuscatedName("o")
@ObfuscatedName("k")
@ObfuscatedGetter(
intValue = -737175839
intValue = 216071601
)
@Export("groupCount")
final int groupCount;
@ObfuscatedName("e")
@ObfuscatedName("d")
@ObfuscatedGetter(
intValue = -1316044815
intValue = -189862787
)
@Export("loadedCount")
int loadedCount;
@ObfuscatedSignature(
signature = "(Lia;Ljava/lang/String;)V"
signature = "(Lih;Ljava/lang/String;)V"
)
ArchiveLoader(Archive var1, String var2) {
this.loadedCount = 0;
@@ -44,17 +35,17 @@ public class ArchiveLoader {
this.groupCount = var1.getGroupCount();
}
@ObfuscatedName("c")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(I)Z",
garbageValue = "1992240637"
garbageValue = "92028555"
)
@Export("isLoaded")
boolean isLoaded() {
this.loadedCount = 0;
for (int var1 = 0; var1 < this.groupCount; ++var1) {
if (!this.archive.method4348(var1) || this.archive.method4347(var1)) {
if (!this.archive.method4353(var1) || this.archive.method4352(var1)) {
++this.loadedCount;
}
}
@@ -62,253 +53,155 @@ public class ArchiveLoader {
return this.loadedCount >= this.groupCount;
}
@ObfuscatedName("c")
@ObfuscatedName("s")
@ObfuscatedSignature(
signature = "(II)Lig;",
garbageValue = "1395082133"
signature = "(CI)Z",
garbageValue = "527367819"
)
@Export("FloorUnderlayDefinition_get")
public static FloorOverlayDefinition FloorUnderlayDefinition_get(int var0) {
FloorOverlayDefinition var1 = (FloorOverlayDefinition)FloorOverlayDefinition.FloorOverlayDefinition_cached.get((long)var0);
if (var1 != null) {
return var1;
@Export("isCharPrintable")
public static boolean isCharPrintable(char var0) {
if (var0 >= ' ' && var0 <= '~') {
return true;
} else if (var0 >= 160 && var0 <= 255) {
return true;
} else {
byte[] var2 = FloorOverlayDefinition.FloorOverlayDefinition_archive.takeFile(4, var0);
var1 = new FloorOverlayDefinition();
if (var2 != null) {
var1.decode(new Buffer(var2), var0);
}
var1.postDecode();
FloorOverlayDefinition.FloorOverlayDefinition_cached.put(var1, (long)var0);
return var1;
return var0 == 8364 || var0 == 338 || var0 == 8212 || var0 == 339 || var0 == 376;
}
}
@ObfuscatedName("w")
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(IIIIIIILem;Lfv;I)V",
garbageValue = "2035242734"
signature = "(ZB)V",
garbageValue = "-66"
)
static final void method1168(int var0, int var1, int var2, int var3, int var4, int var5, int var6, Scene var7, CollisionMap var8) {
ObjectDefinition var9 = Occluder.getObjectDefinition(var4);
int var10;
int var11;
if (var5 != 1 && var5 != 3) {
var10 = var9.sizeX;
var11 = var9.sizeY;
} else {
var10 = var9.sizeY;
var11 = var9.sizeX;
public static void method1254(boolean var0) {
if (var0 != class169.ItemDefinition_inMembersWorld) {
class257.method4558();
class169.ItemDefinition_inMembersWorld = var0;
}
int var12;
int var13;
if (var10 + var2 <= 104) {
var12 = (var10 >> 1) + var2;
var13 = var2 + (var10 + 1 >> 1);
} else {
var12 = var2;
var13 = var2 + 1;
}
}
int var14;
int var15;
if (var3 + var11 <= 104) {
var14 = var3 + (var11 >> 1);
var15 = var3 + (var11 + 1 >> 1);
} else {
var14 = var3;
var15 = var3 + 1;
}
@ObfuscatedName("km")
@ObfuscatedSignature(
signature = "(Lhe;IIII)V",
garbageValue = "510029442"
)
@Export("drawMinimap")
static final void drawMinimap(Widget var0, int var1, int var2, int var3) {
ChatChannel.playPcmPlayers();
SpriteMask var4 = var0.getSpriteMask(false);
if (var4 != null) {
Rasterizer2D.Rasterizer2D_setClip(var1, var2, var4.width + var1, var2 + var4.height);
if (Client.minimapState != 2 && Client.minimapState != 5) {
int var5 = Client.camAngleY & 2047;
int var6 = ByteArrayPool.localPlayer.x / 32 + 48;
int var7 = 464 - ByteArrayPool.localPlayer.y / 32;
ArchiveDisk.sceneMinimapSprite.drawRotatedMaskedCenteredAround(var1, var2, var4.width, var4.height, var6, var7, var5, 256, var4.xStarts, var4.xWidths);
int[][] var16 = Tiles.Tiles_heights[var1];
int var17 = var16[var13][var15] + var16[var13][var14] + var16[var12][var14] + var16[var12][var15] >> 2;
int var18 = (var2 << 7) + (var10 << 6);
int var19 = (var3 << 7) + (var11 << 6);
long var20 = GameShell.calculateTag(var2, var3, 2, var9.int1 == 0, var4);
int var22 = (var5 << 6) + var6;
if (var9.int3 == 1) {
var22 += 256;
}
int var8;
int var9;
int var10;
for (var8 = 0; var8 < Client.mapIconCount; ++var8) {
var9 = Client.mapIconXs[var8] * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
var10 = Client.mapIconYs[var8] * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
ScriptEvent.drawSpriteOnMinimap(var1, var2, var9, var10, Client.mapIcons[var8], var4);
}
Object var23;
if (var6 == 22) {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(22, var5, var16, var18, var17, var19);
int var11;
int var12;
for (var8 = 0; var8 < 104; ++var8) {
for (var9 = 0; var9 < 104; ++var9) {
NodeDeque var15 = Client.groundItems[ScriptEvent.Client_plane][var8][var9];
if (var15 != null) {
var11 = var8 * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
var12 = var9 * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
ScriptEvent.drawSpriteOnMinimap(var1, var2, var11, var12, VarpDefinition.mapDotSprites[0], var4);
}
}
}
for (var8 = 0; var8 < Client.npcCount; ++var8) {
NPC var16 = Client.npcs[Client.npcIndices[var8]];
if (var16 != null && var16.isVisible()) {
NPCDefinition var18 = var16.definition;
if (var18 != null && var18.transforms != null) {
var18 = var18.transform();
}
if (var18 != null && var18.drawMapDot && var18.isInteractable) {
var11 = var16.x / 32 - ByteArrayPool.localPlayer.x / 32;
var12 = var16.y / 32 - ByteArrayPool.localPlayer.y / 32;
ScriptEvent.drawSpriteOnMinimap(var1, var2, var11, var12, VarpDefinition.mapDotSprites[1], var4);
}
}
}
var8 = Players.Players_count;
int[] var19 = Players.Players_indices;
for (var10 = 0; var10 < var8; ++var10) {
Player var17 = Client.players[var19[var10]];
if (var17 != null && var17.isVisible() && !var17.isHidden && var17 != ByteArrayPool.localPlayer) {
var12 = var17.x / 32 - ByteArrayPool.localPlayer.x / 32;
int var13 = var17.y / 32 - ByteArrayPool.localPlayer.y / 32;
boolean var14 = false;
if (ByteArrayPool.localPlayer.team != 0 && var17.team != 0 && var17.team == ByteArrayPool.localPlayer.team) {
var14 = true;
}
if (var17.isFriend()) {
ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[3], var4);
} else if (var14) {
ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[4], var4);
} else if (var17.isClanMember()) {
ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[5], var4);
} else {
ScriptEvent.drawSpriteOnMinimap(var1, var2, var12, var13, VarpDefinition.mapDotSprites[2], var4);
}
}
}
if (Client.hintArrowType != 0 && Client.cycle % 20 < 10) {
if (Client.hintArrowType == 1 && Client.hintArrowNpcIndex >= 0 && Client.hintArrowNpcIndex < Client.npcs.length) {
NPC var20 = Client.npcs[Client.hintArrowNpcIndex];
if (var20 != null) {
var11 = var20.x / 32 - ByteArrayPool.localPlayer.x / 32;
var12 = var20.y / 32 - ByteArrayPool.localPlayer.y / 32;
class1.worldToMinimap(var1, var2, var11, var12, WorldMapAreaData.mapMarkerSprites[1], var4);
}
}
if (Client.hintArrowType == 2) {
var10 = Client.hintArrowX * 4 - class69.baseX * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
var11 = Client.hintArrowY * 4 - class89.baseY * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
class1.worldToMinimap(var1, var2, var10, var11, WorldMapAreaData.mapMarkerSprites[1], var4);
}
if (Client.hintArrowType == 10 && Client.hintArrowPlayerIndex >= 0 && Client.hintArrowPlayerIndex < Client.players.length) {
Player var21 = Client.players[Client.hintArrowPlayerIndex];
if (var21 != null) {
var11 = var21.x / 32 - ByteArrayPool.localPlayer.x / 32;
var12 = var21.y / 32 - ByteArrayPool.localPlayer.y / 32;
class1.worldToMinimap(var1, var2, var11, var12, WorldMapAreaData.mapMarkerSprites[1], var4);
}
}
}
if (Client.destinationX != 0) {
var10 = Client.destinationX * 4 + 2 - ByteArrayPool.localPlayer.x / 32;
var11 = Client.destinationY * 4 + 2 - ByteArrayPool.localPlayer.y / 32;
ScriptEvent.drawSpriteOnMinimap(var1, var2, var10, var11, WorldMapAreaData.mapMarkerSprites[0], var4);
}
if (!ByteArrayPool.localPlayer.isHidden) {
Rasterizer2D.Rasterizer2D_fillRectangle(var4.width / 2 + var1 - 1, var4.height / 2 + var2 - 1, 3, 3, 16777215);
}
} else {
var23 = new DynamicObject(var4, 22, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newFloorDecoration(var0, var2, var3, var17, (Entity)var23, var20, var22);
if (var9.interactType == 1) {
var8.setBlockedByFloorDec(var2, var3);
}
} else if (var6 != 10 && var6 != 11) {
if (var6 >= 12) {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(var6, var5, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22);
if (var9.interactType != 0) {
var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
}
} else if (var6 == 0) {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(0, var5, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, 0, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, var20, var22);
if (var9.interactType != 0) {
var8.method3626(var2, var3, var6, var5, var9.boolean1);
}
} else if (var6 == 1) {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(1, var5, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, 1, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22);
if (var9.interactType != 0) {
var8.method3626(var2, var3, var6, var5, var9.boolean1);
}
} else {
int var29;
if (var6 == 2) {
var29 = var5 + 1 & 3;
Object var24;
Object var25;
if (var9.animationId == -1 && var9.transforms == null) {
var24 = var9.getModel(2, var5 + 4, var16, var18, var17, var19);
var25 = var9.getModel(2, var29, var16, var18, var17, var19);
} else {
var24 = new DynamicObject(var4, 2, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
var25 = new DynamicObject(var4, 2, var29, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var24, (Entity)var25, Tiles.field508[var5], Tiles.field508[var29], var20, var22);
if (var9.interactType != 0) {
var8.method3626(var2, var3, var6, var5, var9.boolean1);
}
} else if (var6 == 3) {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(3, var5, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, 3, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newBoundaryObject(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field513[var5], 0, var20, var22);
if (var9.interactType != 0) {
var8.method3626(var2, var3, var6, var5, var9.boolean1);
}
} else if (var6 == 9) {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(var6, var5, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, var6, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.method3165(var0, var2, var3, var17, 1, 1, (Entity)var23, 0, var20, var22);
if (var9.interactType != 0) {
var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
}
} else if (var6 == 4) {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(4, var5, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, Tiles.field508[var5], 0, 0, 0, var20, var22);
} else {
Object var26;
long var30;
if (var6 == 5) {
var29 = 16;
var30 = var7.getBoundaryObjectTag(var0, var2, var3);
if (var30 != 0L) {
var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2;
}
if (var9.animationId == -1 && var9.transforms == null) {
var26 = var9.getModel(4, var5, var16, var18, var17, var19);
} else {
var26 = new DynamicObject(var4, 4, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, Tiles.field508[var5], 0, var29 * Tiles.field506[var5], var29 * Tiles.field516[var5], var20, var22);
} else if (var6 == 6) {
var29 = 8;
var30 = var7.getBoundaryObjectTag(var0, var2, var3);
if (var30 != 0L) {
var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2;
}
if (var9.animationId == -1 && var9.transforms == null) {
var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
} else {
var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)null, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22);
} else if (var6 == 7) {
int var32 = var5 + 2 & 3;
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(4, var32 + 4, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, 4, var32 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var23, (Entity)null, 256, var32, 0, 0, var20, var22);
} else if (var6 == 8) {
var29 = 8;
var30 = var7.getBoundaryObjectTag(var0, var2, var3);
if (var30 != 0L) {
var29 = Occluder.getObjectDefinition(GrandExchangeEvents.Entity_unpackID(var30)).int2 / 2;
}
int var28 = var5 + 2 & 3;
Object var27;
if (var9.animationId == -1 && var9.transforms == null) {
var26 = var9.getModel(4, var5 + 4, var16, var18, var17, var19);
var27 = var9.getModel(4, var28 + 4, var16, var18, var17, var19);
} else {
var26 = new DynamicObject(var4, 4, var5 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
var27 = new DynamicObject(var4, 4, var28 + 4, var1, var2, var3, var9.animationId, true, (Entity)null);
}
var7.newWallDecoration(var0, var2, var3, var17, (Entity)var26, (Entity)var27, 256, var5, var29 * Tiles.field503[var5], var29 * Tiles.field517[var5], var20, var22);
}
}
}
} else {
if (var9.animationId == -1 && var9.transforms == null) {
var23 = var9.getModel(10, var5, var16, var18, var17, var19);
} else {
var23 = new DynamicObject(var4, 10, var5, var1, var2, var3, var9.animationId, true, (Entity)null);
}
if (var23 != null) {
var7.method3165(var0, var2, var3, var17, var10, var11, (Entity)var23, var6 == 11 ? 256 : 0, var20, var22);
}
if (var9.interactType != 0) {
var8.addGameObject(var2, var3, var10, var11, var9.boolean1);
Rasterizer2D.Rasterizer2D_fillMaskedRectangle(var1, var2, 0, var4.xStarts, var4.xWidths);
}
Client.field886[var3] = true;
}
}
}