Revert "Merge branch 'master' into master"

This reverts commit 43520c1958, reversing
changes made to 2e7aea3c62.
This commit is contained in:
zeruth
2019-06-22 02:38:35 -04:00
parent 43520c1958
commit c655c9f542
224 changed files with 16901 additions and 17108 deletions

View File

@@ -39,6 +39,14 @@ public class GrandExchangeEvents {
@Export("events")
public final List events;
static {
__g_f = new class12();
new WorldComparator();
__g_q = new UnitPriceComparator();
__g_w = new class11();
__g_o = new TotalQuantityComparator();
}
@ObfuscatedSignature(
signature = "(Lgr;Z)V",
garbageValue = "1"
@@ -154,7 +162,7 @@ public class GrandExchangeEvents {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.color2;
return 1;
} else if(var0 == 2613) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.ordinal();
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.rectangleMode.rsOrdinal();
return 1;
} else if(var0 == 2614) {
Interpreter.Interpreter_intStack[++class179.Interpreter_intStackSize - 1] = var3.__bv?1:0;
@@ -173,14 +181,5 @@ public class GrandExchangeEvents {
if(GroundItemPile.loadWidgetGroup(var0)) {
class30.method570(Widget.widgets[var0], var1);
}
}
static {
__g_f = new class12();
new WorldComparator();
__g_q = new UnitPriceComparator();
__g_w = new class11();
__g_o = new TotalQuantityComparator();
}
}