make injected client java8-compliant, dumb mixin

This commit is contained in:
ThatGamerBlue
2021-02-19 15:00:07 +00:00
parent 07f512edef
commit 195b4a94dd
11 changed files with 186 additions and 38 deletions

View File

@@ -333,8 +333,8 @@ public final class NetSocket extends AbstractSocket implements Runnable {
garbageValue = "8"
)
@Export("FillMode_values")
public static class333[] FillMode_values() {
return new class333[]{class333.field3897, class333.field3898, class333.SOLID}; // L: 15
public static WidgetFillMode[] FillMode_values() {
return new WidgetFillMode[]{WidgetFillMode.field3897, WidgetFillMode.field3898, WidgetFillMode.SOLID}; // L: 15
}
@ObfuscatedName("gh")

View File

@@ -213,7 +213,7 @@ public class Widget extends Node {
descriptor = "Llj;"
)
@Export("fillMode")
public class333 fillMode;
public WidgetFillMode fillMode;
@ObfuscatedName("ar")
@ObfuscatedGetter(
intValue = -318915915
@@ -711,7 +711,7 @@ public class Widget extends Node {
this.mouseOverColor = 0;
this.mouseOverColor2 = 0;
this.fill = false;
this.fillMode = class333.SOLID;
this.fillMode = WidgetFillMode.SOLID;
this.transparencyTop = 0;
this.transparencyBot = 0;
this.lineWid = 1;

View File

@@ -1,10 +1,12 @@
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;
@ObfuscatedName("lj")
public enum class333 implements Enumerated {
@Implements("WidgetFillMode")
public enum WidgetFillMode implements Enumerated {
@ObfuscatedName("h")
@ObfuscatedSignature(
descriptor = "Llj;"
@@ -33,7 +35,7 @@ public enum class333 implements Enumerated {
)
final int field3900;
class333(int var3, int var4) {
WidgetFillMode(int var3, int var4) {
this.field3902 = var3; // L: 19
this.field3900 = var4; // L: 20
} // L: 21

View File

@@ -340,7 +340,7 @@ public class WorldMapData_1 extends AbstractWorldMapData {
return 1; // L: 708
} else if (var0 == ScriptOpcodes.CC_SETFILLMODE) { // L: 710
var8 = Interpreter.Interpreter_intStack[--VarcInt.Interpreter_intStackSize]; // L: 711
class333 var6 = (class333)UrlRequester.findEnumerated(NetSocket.FillMode_values(), var8); // L: 712
WidgetFillMode var6 = (WidgetFillMode)UrlRequester.findEnumerated(NetSocket.FillMode_values(), var8); // L: 712
if (var6 != null) { // L: 713
var3.fillMode = var6; // L: 714
CollisionMap.invalidateWidget(var3); // L: 715