Use newer version of fernflower and remove __xx names

This commit is contained in:
Lucas
2019-07-04 23:51:52 +02:00
parent 1f2a9b21d6
commit a8d801d830
294 changed files with 27369 additions and 27322 deletions

View File

@@ -10,14 +10,14 @@ import net.runelite.mapping.ObfuscatedSignature;
@Implements("Players")
public class Players {
@ObfuscatedName("q")
static byte[] __cq_q;
static byte[] field731;
@ObfuscatedName("w")
static byte[] __cq_w;
static byte[] field732;
@ObfuscatedName("o")
@ObfuscatedSignature(
signature = "[Lgr;"
)
static Buffer[] __cq_o;
static Buffer[] field733;
@ObfuscatedName("u")
@ObfuscatedGetter(
intValue = -766468303
@@ -31,9 +31,9 @@ public class Players {
@ObfuscatedGetter(
intValue = 945250525
)
static int __cq_l;
static int field734;
@ObfuscatedName("e")
static int[] __cq_e;
static int[] field735;
@ObfuscatedName("x")
@Export("Players_regions")
static int[] Players_regions;
@@ -47,14 +47,14 @@ public class Players {
@ObfuscatedGetter(
intValue = -22568397
)
static int __cq_n;
static int field736;
@ObfuscatedName("i")
static int[] __cq_i;
static int[] field737;
@ObfuscatedName("a")
@ObfuscatedSignature(
signature = "Lgr;"
)
static Buffer __cq_a;
static Buffer field738;
@ObfuscatedName("y")
@ObfuscatedSignature(
signature = "Lgr;"
@@ -62,29 +62,13 @@ public class Players {
@Export("NetCache_reference")
public static Buffer NetCache_reference;
static {
__cq_q = new byte[2048];
__cq_w = new byte[2048];
__cq_o = new Buffer[2048];
Players_count = 0;
Players_indices = new int[2048];
__cq_l = 0;
__cq_e = new int[2048];
Players_regions = new int[2048];
Players_orientations = new int[2048];
Players_targetIndices = new int[2048];
__cq_n = 0;
__cq_i = new int[2048];
__cq_a = new Buffer(new byte[5000]);
}
@ObfuscatedName("f")
@ObfuscatedSignature(
signature = "(Ljava/lang/Throwable;Ljava/lang/String;)Lfx;"
)
public static RunException method2120(Throwable var0, String var1) {
RunException var2;
if(var0 instanceof RunException) {
if (var0 instanceof RunException) {
var2 = (RunException)var0;
var2.string = var2.string + ' ' + var1;
} else {
@@ -101,30 +85,30 @@ public class Players {
)
@Export("newPcmPlayer")
public static final PcmPlayer newPcmPlayer(TaskHandler var0, int var1, int var2) {
if(var1 >= 0 && var1 < 2) {
if(var2 < 256) {
if (var1 >= 0 && var1 < 2) {
if (var2 < 256) {
var2 = 256;
}
try {
PcmPlayer var3 = class65.pcmPlayerProvider.player();
var3.samples = new int[(PcmPlayer.isStereo?2:1) * 256];
var3.samples = new int[(PcmPlayer.isStereo ? 2 : 1) * 256];
var3.frequency = var2;
var3.init();
var3.capacity = (var2 & -1024) + 1024;
if(var3.capacity > 16384) {
if (var3.capacity > 16384) {
var3.capacity = 16384;
}
var3.open(var3.capacity);
if(Login.pcmPlayerCount > 0 && Messages.soundSystem == null) {
if (Login.pcmPlayerCount > 0 && Messages.soundSystem == null) {
Messages.soundSystem = new SoundSystem();
Friend.soundSystemExecutor = Executors.newScheduledThreadPool(1);
Friend.soundSystemExecutor.scheduleAtFixedRate(Messages.soundSystem, 0L, 10L, TimeUnit.MILLISECONDS);
}
if(Messages.soundSystem != null) {
if(Messages.soundSystem.players[var1] != null) {
if (Messages.soundSystem != null) {
if (Messages.soundSystem.players[var1] != null) {
throw new IllegalArgumentException();
}
@@ -146,9 +130,9 @@ public class Players {
garbageValue = "46802049"
)
static final void method2112(int var0, int var1, int var2, int var3) {
for(int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
if(Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
Client.__client_od[var4] = true;
for (int var4 = 0; var4 < Client.rootWidgetCount; ++var4) {
if (Client.rootWidgetWidths[var4] + Client.rootWidgetXs[var4] > var0 && Client.rootWidgetXs[var4] < var0 + var2 && Client.rootWidgetHeights[var4] + Client.rootWidgetYs[var4] > var1 && Client.rootWidgetYs[var4] < var3 + var1) {
Client.field100[var4] = true;
}
}
@@ -161,25 +145,39 @@ public class Players {
)
@Export("clickWidget")
static final void clickWidget(Widget var0, int var1, int var2) {
if(Client.clickedWidget == null && !Client.isMenuOpen) {
if(var0 != null && class48.method869(var0) != null) {
Client.clickedWidget = var0;
Client.clickedWidgetParent = class48.method869(var0);
Client.widgetClickX = var1;
Client.widgetClickY = var2;
MouseRecorder.widgetDragDuration = 0;
Client.isDraggingWidget = false;
int var3 = Client.menuOptionsCount - 1;
if(var3 != -1) {
UnitPriceComparator.tempMenuAction = new MenuAction();
UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
}
if (Client.clickedWidget == null && !Client.isMenuOpen && var0 != null && class48.method869(var0) != null) {
Client.clickedWidget = var0;
Client.clickedWidgetParent = class48.method869(var0);
Client.widgetClickX = var1;
Client.widgetClickY = var2;
MouseRecorder.widgetDragDuration = 0;
Client.isDraggingWidget = false;
int var3 = Client.menuOptionsCount - 1;
if (var3 != -1) {
UnitPriceComparator.tempMenuAction = new MenuAction();
UnitPriceComparator.tempMenuAction.argument1 = Client.menuArguments1[var3];
UnitPriceComparator.tempMenuAction.argument2 = Client.menuArguments2[var3];
UnitPriceComparator.tempMenuAction.opcode = Client.menuOpcodes[var3];
UnitPriceComparator.tempMenuAction.argument0 = Client.menuArguments0[var3];
UnitPriceComparator.tempMenuAction.action = Client.menuActions[var3];
}
}
}
static {
field731 = new byte[2048];
field732 = new byte[2048];
field733 = new Buffer[2048];
Players_count = 0;
Players_indices = new int[2048];
field734 = 0;
field735 = new int[2048];
Players_regions = new int[2048];
Players_orientations = new int[2048];
Players_targetIndices = new int[2048];
field736 = 0;
field737 = new int[2048];
field738 = new Buffer(new byte[5000]);
}
}