Merge remote-tracking branch 'upstream/master' into master

Nice insider info btw, be nice if you shared it, so-called "open source" client.
This commit is contained in:
ThatGamerBlue
2021-05-28 21:39:25 +01:00
481 changed files with 53410 additions and 51723 deletions

View File

@@ -2,29 +2,32 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("jw")
@ObfuscatedName("jm")
@Implements("GrandExchangeEvents")
public class GrandExchangeEvents {
@ObfuscatedName("c")
@ObfuscatedName("n")
@Export("GrandExchangeEvents_ageComparator")
public static Comparator GrandExchangeEvents_ageComparator;
@ObfuscatedName("o")
@ObfuscatedName("f")
@Export("GrandExchangeEvents_priceComparator")
public static Comparator GrandExchangeEvents_priceComparator;
@ObfuscatedName("g")
@ObfuscatedName("y")
@Export("GrandExchangeEvents_nameComparator")
public static Comparator GrandExchangeEvents_nameComparator;
@ObfuscatedName("l")
@ObfuscatedName("p")
@Export("GrandExchangeEvents_quantityComparator")
public static Comparator GrandExchangeEvents_quantityComparator;
@ObfuscatedName("h")
@ObfuscatedName("jp")
@ObfuscatedSignature(
descriptor = "Lio;"
)
static Widget field3626;
@ObfuscatedName("v")
@Export("events")
public final List events;
@@ -34,10 +37,10 @@ public class GrandExchangeEvents {
GrandExchangeEvents_priceComparator = new GrandExchangeOfferUnitPriceComparator(); // L: 41
GrandExchangeEvents_nameComparator = new GrandExchangeOfferNameComparator(); // L: 54
GrandExchangeEvents_quantityComparator = new GrandExchangeOfferTotalQuantityComparator();
}
} // L: 67
@ObfuscatedSignature(
descriptor = "(Lnk;Z)V",
descriptor = "(Lnd;Z)V",
garbageValue = "1"
)
public GrandExchangeEvents(Buffer var1, boolean var2) {
@@ -59,10 +62,10 @@ public class GrandExchangeEvents {
} // L: 92
@ObfuscatedName("h")
@ObfuscatedName("v")
@ObfuscatedSignature(
descriptor = "(Ljava/util/Comparator;ZB)V",
garbageValue = "1"
descriptor = "(Ljava/util/Comparator;ZI)V",
garbageValue = "-1954624010"
)
@Export("sort")
public void sort(Comparator var1, boolean var2) {
@@ -74,74 +77,38 @@ public class GrandExchangeEvents {
} // L: 101
@ObfuscatedName("o")
@ObfuscatedName("hy")
@ObfuscatedSignature(
descriptor = "(IIII)I",
garbageValue = "-1006012588"
descriptor = "(IIII)V",
garbageValue = "-1158444411"
)
public static int method4968(int var0, int var1, int var2) {
int var3 = WorldMapLabel.method3582(var2 - var1 + 1); // L: 37
var3 <<= var1; // L: 38
return var0 & ~var3; // L: 39
}
@ObfuscatedName("g")
@ObfuscatedSignature(
descriptor = "(IZIZB)V",
garbageValue = "-1"
)
@Export("sortWorldList")
static void sortWorldList(int var0, boolean var1, int var2, boolean var3) {
if (Messages.World_worlds != null) { // L: 171
LoginScreenAnimation.doWorldSorting(0, Messages.World_worlds.length - 1, var0, var1, var2, var3); // L: 172
}
} // L: 174
@ObfuscatedName("u")
@ObfuscatedSignature(
descriptor = "(Ldk;IIB)Lbd;",
garbageValue = "79"
)
public static final PcmPlayer method4969(TaskHandler var0, int var1, int var2) {
if (PcmPlayer.field401 == 0) { // L: 56
throw new IllegalStateException();
} else if (var1 >= 0 && var1 < 2) { // L: 57
if (var2 < 256) { // L: 58
var2 = 256;
@Export("worldToScreen")
static final void worldToScreen(int var0, int var1, int var2) {
if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) { // L: 4997
int var3 = class105.getTileHeight(var0, var1, class22.Client_plane) - var2; // L: 5002
var0 -= MouseHandler.cameraX; // L: 5003
var3 -= SecureRandomCallable.cameraY; // L: 5004
var1 -= class105.cameraZ; // L: 5005
int var4 = Rasterizer3D.Rasterizer3D_sine[SpotAnimationDefinition.cameraPitch]; // L: 5006
int var5 = Rasterizer3D.Rasterizer3D_cosine[SpotAnimationDefinition.cameraPitch]; // L: 5007
int var6 = Rasterizer3D.Rasterizer3D_sine[class376.cameraYaw]; // L: 5008
int var7 = Rasterizer3D.Rasterizer3D_cosine[class376.cameraYaw]; // L: 5009
int var8 = var6 * var1 + var0 * var7 >> 16; // L: 5010
var1 = var7 * var1 - var0 * var6 >> 16; // L: 5011
var0 = var8; // L: 5012
var8 = var5 * var3 - var4 * var1 >> 16; // L: 5013
var1 = var5 * var1 + var4 * var3 >> 16; // L: 5014
if (var1 >= 50) { // L: 5016
Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2; // L: 5017
Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2; // L: 5018
} else {
Client.viewportTempX = -1; // L: 5021
Client.viewportTempY = -1; // L: 5022
}
try {
PcmPlayer var3 = Tiles.pcmPlayerProvider.player(); // L: 60
var3.samples = new int[(ApproximateRouteStrategy.PcmPlayer_stereo ? 2 : 1) * 256]; // L: 61
var3.field400 = var2; // L: 62
var3.init(); // L: 63
var3.capacity = (var2 & -1024) + 1024; // L: 64
if (var3.capacity > 16384) { // L: 65
var3.capacity = 16384;
}
var3.open(var3.capacity); // L: 66
if (PcmPlayer.field405 > 0 && PcmPlayer.soundSystem == null) { // L: 67
PcmPlayer.soundSystem = new SoundSystem(); // L: 68
class337.soundSystemExecutor = Executors.newScheduledThreadPool(1); // L: 69
class337.soundSystemExecutor.scheduleAtFixedRate(PcmPlayer.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS); // L: 70
}
if (PcmPlayer.soundSystem != null) { // L: 72
if (PcmPlayer.soundSystem.players[var1] != null) { // L: 73
throw new IllegalArgumentException();
}
PcmPlayer.soundSystem.players[var1] = var3; // L: 74
}
return var3; // L: 76
} catch (Throwable var4) { // L: 78
return new PcmPlayer(); // L: 79
}
} else {
throw new IllegalArgumentException();
Client.viewportTempX = -1; // L: 4998
Client.viewportTempY = -1; // L: 4999
}
}
} // L: 5000 5024
}