ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

update client to rev 183

Browse Source
This commit is contained in:
ThatGamerBlue
2019-09-12 14:00:01 +01:00
parent 0446151736
commit 12c08b271a
342 changed files with 41159 additions and 41468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

424
runescape-client/src/main/java/UserComparator10.java
View File

@@ -1,13 +1,24 @@
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("ew")
@Implements("UserComparator10")
public class UserComparator10 extends AbstractUserComparator {
@ObfuscatedName("s")
@ObfuscatedName("g")
@ObfuscatedSignature(
signature = "[Llt;"
)
@Export("runesSprite")
static IndexedSprite[] runesSprite;
@ObfuscatedName("dn")
@ObfuscatedGetter(
longValue = -5864527508821093591L
)
static long field1946;
@ObfuscatedName("c")
@Export("reversed")
final boolean reversed;
@@ -15,10 +26,10 @@ public class UserComparator10 extends AbstractUserComparator {
this.reversed = var1;
}
@ObfuscatedName("s")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(Ljt;Ljt;B)I",
garbageValue = "-47"
signature = "(Lje;Lje;I)I",
garbageValue = "1179427520"
)
@Export("compareBuddy")
int compareBuddy(Buddy var1, Buddy var2) {
@@ -33,400 +44,39 @@ public class UserComparator10 extends AbstractUserComparator {
return this.compareBuddy((Buddy)var1, (Buddy)var2);
}
@ObfuscatedName("s")
@ObfuscatedSignature(
signature = "(Lhz;Lhz;Lhz;Lhz;I)V",
garbageValue = "34424485"
)
@Export("Widget_setArchives")
public static void Widget_setArchives(AbstractArchive var0, AbstractArchive var1, AbstractArchive var2, AbstractArchive var3) {
Widget.Widget_archive = var0;
Huffman.Widget_modelsArchive = var1;
WorldMapSprite.Widget_spritesArchive = var2;
Widget.Widget_fontsArchive = var3;
Widget.Widget_interfaceComponents = new Widget[Widget.Widget_archive.getGroupCount()][];
WorldMapDecoration.Widget_loadedInterfaces = new boolean[Widget.Widget_archive.getGroupCount()];
}
@ObfuscatedName("u")
@ObfuscatedSignature(
signature = "(ILcr;ZS)I",
garbageValue = "180"
)
static int method3345(int var0, Script var1, boolean var2) {
int var3 = -1;
Widget var4;
if (var0 >= 2000) {
var0 -= 1000;
var3 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
var4 = WorldMapElement.getWidget(var3);
} else {
var4 = var2 ? class286.field3623 : class297.field3693;
}
if (var0 == ScriptOpcodes.CC_SETPOSITION) {
Interpreter.Interpreter_intStackSize -= 4;
var4.rawX = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
var4.rawY = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
var4.xAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
var4.yAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
FriendSystem.invalidateWidget(var4);
WorldMapID.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETSIZE) {
Interpreter.Interpreter_intStackSize -= 4;
var4.rawWidth = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize];
var4.rawHeight = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1];
var4.widthAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2];
var4.heightAlignment = Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 3];
FriendSystem.invalidateWidget(var4);
WorldMapID.client.alignWidget(var4);
if (var3 != -1 && var4.type == 0) {
WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var3 >> 16], var4, false);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETHIDE) {
boolean var5 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
if (var5 != var4.isHidden) {
var4.isHidden = var5;
FriendSystem.invalidateWidget(var4);
}
return 1;
} else if (var0 == ScriptOpcodes.CC_SETNOCLICKTHROUGH) {
var4.noClickThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
return 1;
} else if (var0 == ScriptOpcodes.CC_SETNOSCROLLTHROUGH) {
var4.noScrollThrough = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize] == 1;
return 1;
} else {
return 2;
}
}
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(IIIIIZI)Lls;",
garbageValue = "92039087"
signature = "(IB)I",
garbageValue = "-52"
)
@Export("getItemSprite")
public static final Sprite getItemSprite(int var0, int var1, int var2, int var3, int var4, boolean var5) {
if (var1 == -1) {
var4 = 0;
} else if (var4 == 2 && var1 != 1) {
var4 = 1;
@Export("iLog")
public static int iLog(int var0) {
int var1 = 0;
if (var0 < 0 || var0 >= 65536) {
var0 >>>= 16;
var1 += 16;
}
long var6 = ((long)var3 << 42) + ((long)var4 << 40) + ((long)var2 << 38) + (long)var0 + ((long)var1 << 16);
Sprite var8;
if (!var5) {
var8 = (Sprite)ItemDefinition.ItemDefinition_cachedSprites.get(var6);
if (var8 != null) {
return var8;
}
if (var0 >= 256) {
var0 >>>= 8;
var1 += 8;
}
ItemDefinition var9 = WorldMapData_0.ItemDefinition_get(var0);
if (var1 > 1 && var9.countobj != null) {
int var10 = -1;
for (int var11 = 0; var11 < 10; ++var11) {
if (var1 >= var9.countco[var11] && var9.countco[var11] != 0) {
var10 = var9.countobj[var11];
}
}
if (var10 != -1) {
var9 = WorldMapData_0.ItemDefinition_get(var10);
}
if (var0 >= 16) {
var0 >>>= 4;
var1 += 4;
}
Model var19 = var9.getModel(1);
if (var19 == null) {
return null;
} else {
Sprite var20 = null;
if (var9.noteTemplate != -1) {
var20 = getItemSprite(var9.note, 10, 1, 0, 0, true);
if (var20 == null) {
return null;
}
} else if (var9.notedId != -1) {
var20 = getItemSprite(var9.unnotedId, var1, var2, var3, 0, false);
if (var20 == null) {
return null;
}
} else if (var9.placeholderTemplate != -1) {
var20 = getItemSprite(var9.placeholder, var1, 0, 0, 0, false);
if (var20 == null) {
return null;
}
}
int[] var12 = Rasterizer2D.Rasterizer2D_pixels;
int var13 = Rasterizer2D.Rasterizer2D_width;
int var14 = Rasterizer2D.Rasterizer2D_height;
int[] var15 = new int[4];
Rasterizer2D.Rasterizer2D_getClipArray(var15);
var8 = new Sprite(36, 32);
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
Rasterizer2D.Rasterizer2D_clear();
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
Rasterizer3D.method2929(16, 16);
Rasterizer3D.field1744 = false;
if (var9.placeholderTemplate != -1) {
var20.drawTransBgAt(0, 0);
}
int var16 = var9.zoom2d;
if (var5) {
var16 = (int)(1.5D * (double)var16);
} else if (var2 == 2) {
var16 = (int)(1.04D * (double)var16);
}
int var17 = var16 * Rasterizer3D.Rasterizer3D_sine[var9.xan2d] >> 16;
int var18 = var16 * Rasterizer3D.Rasterizer3D_cosine[var9.xan2d] >> 16;
var19.calculateBoundsCylinder();
var19.method2874(0, var9.yan2d, var9.zan2d, var9.xan2d, var9.offsetX2d, var19.height / 2 + var17 + var9.offsetY2d, var18 + var9.offsetY2d);
if (var9.notedId != -1) {
var20.drawTransBgAt(0, 0);
}
if (var2 >= 1) {
var8.outline(1);
}
if (var2 >= 2) {
var8.outline(16777215);
}
if (var3 != 0) {
var8.shadow(var3);
}
Rasterizer2D.Rasterizer2D_replace(var8.pixels, 36, 32);
if (var9.noteTemplate != -1) {
var20.drawTransBgAt(0, 0);
}
if (var4 == 1 || var4 == 2 && var9.isStackable == 1) {
ArchiveLoader.ItemDefinition_fontPlain11.draw(class96.method2201(var1), 0, 9, 16776960, 1);
}
if (!var5) {
ItemDefinition.ItemDefinition_cachedSprites.put(var8, var6);
}
Rasterizer2D.Rasterizer2D_replace(var12, var13, var14);
Rasterizer2D.Rasterizer2D_setClipArray(var15);
Rasterizer3D.Rasterizer3D_setClipFromRasterizer2D();
Rasterizer3D.field1744 = true;
return var8;
}
}
@ObfuscatedName("eu")
@ObfuscatedSignature(
signature = "(IZZZI)Lid;",
garbageValue = "-1576468201"
)
@Export("newArchive")
static Archive newArchive(int var0, boolean var1, boolean var2, boolean var3) {
ArchiveDisk var4 = null;
if (JagexCache.JagexCache_dat2File != null) {
var4 = new ArchiveDisk(var0, JagexCache.JagexCache_dat2File, WorldMapSection1.JagexCache_idxFiles[var0], 1000000);
if (var0 >= 4) {
var0 >>>= 2;
var1 += 2;
}
return new Archive(var4, class293.masterDisk, var0, var1, var2, var3);
}
@ObfuscatedName("gz")
@ObfuscatedSignature(
signature = "(IIIIII)V",
garbageValue = "-1531773798"
)
@Export("drawObject")
static final void drawObject(int var0, int var1, int var2, int var3, int var4) {
long var5 = Player.scene.getBoundaryObjectTag(var0, var1, var2);
int var7;
int var8;
int var9;
int var10;
int var12;
int var13;
if (0L != var5) {
var7 = Player.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3;
var9 = var7 & 31;
var10 = var3;
if (SpotAnimationDefinition.method4333(var5)) {
var10 = var4;
}
int[] var11 = ParamDefinition.sceneMinimapSprite.pixels;
var12 = var1 * 4 + (103 - var2) * 2048 + 24624;
var13 = BoundaryObject.Entity_unpackID(var5);
ObjectDefinition var14 = class215.getObjectDefinition(var13);
if (var14.mapSceneId != -1) {
IndexedSprite var15 = GrandExchangeOfferOwnWorldComparator.mapSceneSprites[var14.mapSceneId];
if (var15 != null) {
int var16 = (var14.sizeX * 4 - var15.subWidth) / 2;
int var17 = (var14.sizeY * 4 - var15.subHeight) / 2;
var15.drawAt(var1 * 4 + var16 + 48, var17 + (104 - var2 - var14.sizeY) * 4 + 48);
}
} else {
if (var9 == 0 || var9 == 2) {
if (var8 == 0) {
var11[var12] = var10;
var11[var12 + 512] = var10;
var11[var12 + 1024] = var10;
var11[var12 + 1536] = var10;
} else if (var8 == 1) {
var11[var12] = var10;
var11[var12 + 1] = var10;
var11[var12 + 2] = var10;
var11[var12 + 3] = var10;
} else if (var8 == 2) {
var11[var12 + 3] = var10;
var11[var12 + 512 + 3] = var10;
var11[var12 + 1024 + 3] = var10;
var11[var12 + 1536 + 3] = var10;
} else if (var8 == 3) {
var11[var12 + 1536] = var10;
var11[var12 + 1536 + 1] = var10;
var11[var12 + 1536 + 2] = var10;
var11[var12 + 1536 + 3] = var10;
}
}
if (var9 == 3) {
if (var8 == 0) {
var11[var12] = var10;
} else if (var8 == 1) {
var11[var12 + 3] = var10;
} else if (var8 == 2) {
var11[var12 + 1536 + 3] = var10;
} else if (var8 == 3) {
var11[var12 + 1536] = var10;
}
}
if (var9 == 2) {
if (var8 == 3) {
var11[var12] = var10;
var11[var12 + 512] = var10;
var11[var12 + 1024] = var10;
var11[var12 + 1536] = var10;
} else if (var8 == 0) {
var11[var12] = var10;
var11[var12 + 1] = var10;
var11[var12 + 2] = var10;
var11[var12 + 3] = var10;
} else if (var8 == 1) {
var11[var12 + 3] = var10;
var11[var12 + 512 + 3] = var10;
var11[var12 + 1024 + 3] = var10;
var11[var12 + 1536 + 3] = var10;
} else if (var8 == 2) {
var11[var12 + 1536] = var10;
var11[var12 + 1536 + 1] = var10;
var11[var12 + 1536 + 2] = var10;
var11[var12 + 1536 + 3] = var10;
}
}
}
if (var0 >= 1) {
var0 >>>= 1;
++var1;
}
var5 = Player.scene.getGameObjectTag(var0, var1, var2);
if (0L != var5) {
var7 = Player.scene.getObjectFlags(var0, var1, var2, var5);
var8 = var7 >> 6 & 3;
var9 = var7 & 31;
var10 = BoundaryObject.Entity_unpackID(var5);
ObjectDefinition var24 = class215.getObjectDefinition(var10);
int var19;
if (var24.mapSceneId != -1) {
IndexedSprite var18 = GrandExchangeOfferOwnWorldComparator.mapSceneSprites[var24.mapSceneId];
if (var18 != null) {
var13 = (var24.sizeX * 4 - var18.subWidth) / 2;
var19 = (var24.sizeY * 4 - var18.subHeight) / 2;
var18.drawAt(var1 * 4 + var13 + 48, var19 + (104 - var2 - var24.sizeY) * 4 + 48);
}
} else if (var9 == 9) {
var12 = 15658734;
if (SpotAnimationDefinition.method4333(var5)) {
var12 = 15597568;
}
int[] var23 = ParamDefinition.sceneMinimapSprite.pixels;
var19 = var1 * 4 + (103 - var2) * 2048 + 24624;
if (var8 != 0 && var8 != 2) {
var23[var19] = var12;
var23[var19 + 1 + 512] = var12;
var23[var19 + 1024 + 2] = var12;
var23[var19 + 1536 + 3] = var12;
} else {
var23[var19 + 1536] = var12;
var23[var19 + 1 + 1024] = var12;
var23[var19 + 512 + 2] = var12;
var23[var19 + 3] = var12;
}
}
}
var5 = Player.scene.getFloorDecorationTag(var0, var1, var2);
if (0L != var5) {
var7 = BoundaryObject.Entity_unpackID(var5);
ObjectDefinition var20 = class215.getObjectDefinition(var7);
if (var20.mapSceneId != -1) {
IndexedSprite var21 = GrandExchangeOfferOwnWorldComparator.mapSceneSprites[var20.mapSceneId];
if (var21 != null) {
var10 = (var20.sizeX * 4 - var21.subWidth) / 2;
int var22 = (var20.sizeY * 4 - var21.subHeight) / 2;
var21.drawAt(var1 * 4 + var10 + 48, var22 + (104 - var2 - var20.sizeY) * 4 + 48);
}
}
}
}
@ObfuscatedName("jc")
@ObfuscatedSignature(
signature = "(Lhp;I)Z",
garbageValue = "-1592710646"
)
@Export("runCs1")
static final boolean runCs1(Widget var0) {
if (var0.cs1Comparisons == null) {
return false;
} else {
for (int var1 = 0; var1 < var0.cs1Comparisons.length; ++var1) {
int var2 = AbstractByteArrayCopier.method3868(var0, var1);
int var3 = var0.cs1ComparisonValues[var1];
if (var0.cs1Comparisons[var1] == 2) {
if (var2 >= var3) {
return false;
}
} else if (var0.cs1Comparisons[var1] == 3) {
if (var2 <= var3) {
return false;
}
} else if (var0.cs1Comparisons[var1] == 4) {
if (var2 == var3) {
return false;
}
} else if (var2 != var3) {
return false;
}
}
return true;
}
return var0 + var1;
}
}