RS-Client: Refactoring (also gradle compiler args) (#1236)

* gradle: compiler args for mixins/rs-client

* rs-client: yes

* rs-client: no
This commit is contained in:
Lucwousin
2019-08-02 22:01:00 +02:00
committed by Kyleeld
parent 2057fdfd41
commit 11f3b74687
124 changed files with 6121 additions and 5998 deletions

View File

@@ -45,8 +45,8 @@ public final class WorldMapSprite {
signature = "(Lhp;I)V",
garbageValue = "-2096884458"
)
@Export("setFloorUnderlayDefinitionArchive")
public static void setFloorUnderlayDefinitionArchive(AbstractArchive var0) {
@Export("FloorUnderlayDefinition_setArchives")
public static void FloorUnderlayDefinition_setArchives(AbstractArchive var0) {
FloorUnderlayDefinition.FloorUnderlayDefinition_archive = var0;
}
@@ -57,25 +57,27 @@ public final class WorldMapSprite {
)
@Export("drawMenuActionTextAt")
static final void drawMenuActionTextAt(int var0, int var1) {
if (Client.menuOptionsCount >= 2 || Client.isItemSelected != 0 || Client.isSpellSelected) {
if (Client.showMouseOverText) {
int var2 = class13.method151();
String var3;
if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
var3 = "Use" + " " + Client.selectedItemName + " " + "->";
} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) {
var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
} else {
var3 = WorldMapLabel.method417(var2);
}
if (Client.menuOptionsCount > 2) {
var3 = var3 + ClientPreferences.colorStartTag(16777215) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
}
WorldMapIcon_1.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 16777215, 0, Client.cycle / 1000);
}
if (Client.menuOptionsCount < 2 && Client.isItemSelected == 0 && !Client.isSpellSelected) {
return;
}
if (!Client.showMouseOverText) {
return;
}
int var2 = class13.method151();
String var3;
if (Client.isItemSelected == 1 && Client.menuOptionsCount < 2) {
var3 = "Use" + " " + Client.selectedItemName + " " + "->";
} else if (Client.isSpellSelected && Client.menuOptionsCount < 2) {
var3 = Client.selectedSpellActionName + " " + Client.selectedSpellName + " " + "->";
} else {
var3 = WorldMapLabel.getMenuText(var2);
}
if (Client.menuOptionsCount > 2) {
var3 = var3 + ClientPreferences.colorStartTag(0xffffff) + " " + '/' + " " + (Client.menuOptionsCount - 2) + " more options";
}
WorldMapIcon_1.fontBold12.drawRandomAlphaAndSpacing(var3, var0 + 4, var1 + 15, 0xffffff, 0, Client.cycle / 1000);
}
@ObfuscatedName("id")
@@ -87,14 +89,14 @@ public final class WorldMapSprite {
static void revalidateWidgetScroll(Widget[] var0, Widget var1, boolean var2) {
int var3 = var1.scrollWidth != 0 ? var1.scrollWidth : var1.width;
int var4 = var1.scrollHeight != 0 ? var1.scrollHeight : var1.height;
class13.resizeWidget(var0, var1.id, var3, var4, var2);
class13.resizeInterface(var0, var1.id, var3, var4, var2);
if (var1.children != null) {
class13.resizeWidget(var1.children, var1.id, var3, var4, var2);
class13.resizeInterface(var1.children, var1.id, var3, var4, var2);
}
InterfaceParent var5 = (InterfaceParent)Client.interfaceParents.get((long)var1.id);
if (var5 != null) {
method416(var5.group, var3, var4, var2);
resizeComponents(var5.group, var3, var4, var2);
}
if (var1.contentType == 1337) {
@@ -107,9 +109,10 @@ public final class WorldMapSprite {
signature = "(IIIZI)V",
garbageValue = "-2115353122"
)
static final void method416(int var0, int var1, int var2, boolean var3) {
@Export("resizeComponents")
static final void resizeComponents(int var0, int var1, int var2, boolean var3) {
if (class162.loadInterface(var0)) {
class13.resizeWidget(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3);
class13.resizeInterface(Widget.Widget_interfaceComponents[var0], -1, var1, var2, var3);
}
}