From 21d4fe4a8f90f9c48ba9e048cde71e2d06e78ce6 Mon Sep 17 00:00:00 2001 From: Lucwousin Date: Tue, 23 Jul 2019 23:48:46 +0200 Subject: [PATCH] rs-client: name FillMode --- runescape-client/src/main/java/Client.java | 6 ++--- .../java/{class323.java => FillMode.java} | 24 ++++++++++++------- runescape-client/src/main/java/FontName.java | 2 +- runescape-client/src/main/java/PcmPlayer.java | 4 ++-- runescape-client/src/main/java/Widget.java | 4 ++-- runescape-client/src/main/java/class83.java | 2 +- 6 files changed, 24 insertions(+), 18 deletions(-) rename runescape-client/src/main/java/{class323.java => FillMode.java} (69%) diff --git a/runescape-client/src/main/java/Client.java b/runescape-client/src/main/java/Client.java index df78e67081..fee43e099f 100644 --- a/runescape-client/src/main/java/Client.java +++ b/runescape-client/src/main/java/Client.java @@ -2442,12 +2442,12 @@ public final class Client extends GameShell implements Usernamed { } if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { - class323.field3884 = ((AbstractSocket)var1).readUnsignedByte(); + FillMode.field3884 = ((AbstractSocket)var1).readUnsignedByte(); loginState = 8; } - if (loginState == 8 && ((AbstractSocket)var1).available() >= class323.field3884) { - ((AbstractSocket)var1).read(var2.array, 0, class323.field3884); + if (loginState == 8 && ((AbstractSocket)var1).available() >= FillMode.field3884) { + ((AbstractSocket)var1).read(var2.array, 0, FillMode.field3884); var2.offset = 0; loginState = 6; } diff --git a/runescape-client/src/main/java/class323.java b/runescape-client/src/main/java/FillMode.java similarity index 69% rename from runescape-client/src/main/java/class323.java rename to runescape-client/src/main/java/FillMode.java index 03f649db8c..2f65f8e546 100644 --- a/runescape-client/src/main/java/class323.java +++ b/runescape-client/src/main/java/FillMode.java @@ -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("ll") -public enum class323 implements Enumerated { +@Implements("FillMode") +public enum FillMode implements Enumerated { @ObfuscatedName("q") @ObfuscatedSignature( signature = "Lll;" @@ -15,12 +17,14 @@ public enum class323 implements Enumerated { @ObfuscatedSignature( signature = "Lll;" ) - field3887(1, 1), + @Export("GRADIENT") + GRADIENT(1, 1), @ObfuscatedName("e") @ObfuscatedSignature( signature = "Lll;" ) - field3885(2, 2); + @Export("GRADIENTALPHA") + GRADIENTALPHA(2, 2); @ObfuscatedName("ex") @ObfuscatedGetter( @@ -31,16 +35,18 @@ public enum class323 implements Enumerated { @ObfuscatedGetter( intValue = 215627811 ) - public final int field3886; + @Export("value") + public final int value; @ObfuscatedName("k") @ObfuscatedGetter( intValue = 198667019 ) - final int field3889; + @Export("id") + final int id; - class323(int var3, int var4) { - this.field3886 = var3; - this.field3889 = var4; + FillMode(int var3, int var4) { + this.value = var3; + this.id = var4; } @ObfuscatedName("e") @@ -50,6 +56,6 @@ public enum class323 implements Enumerated { ) @Export("rsOrdinal") public int rsOrdinal() { - return this.field3889; + return this.id; } } diff --git a/runescape-client/src/main/java/FontName.java b/runescape-client/src/main/java/FontName.java index 0efca21d4c..c537dac56f 100644 --- a/runescape-client/src/main/java/FontName.java +++ b/runescape-client/src/main/java/FontName.java @@ -512,7 +512,7 @@ public class FontName { } if (var10.fill) { - switch(var10.fillMode.field3886) { + switch(var10.fillMode.value) { case 1: Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); break; diff --git a/runescape-client/src/main/java/PcmPlayer.java b/runescape-client/src/main/java/PcmPlayer.java index e1d0a9a97f..2de3d6f035 100644 --- a/runescape-client/src/main/java/PcmPlayer.java +++ b/runescape-client/src/main/java/PcmPlayer.java @@ -473,8 +473,8 @@ public class PcmPlayer { signature = "(B)[Lll;", garbageValue = "69" ) - public static class323[] method2405() { - return new class323[]{class323.field3887, class323.SOLID, class323.field3885}; + public static FillMode[] method2405() { + return new FillMode[]{FillMode.GRADIENT, FillMode.SOLID, FillMode.GRADIENTALPHA}; } @ObfuscatedName("ip") diff --git a/runescape-client/src/main/java/Widget.java b/runescape-client/src/main/java/Widget.java index 425d769958..07b1d1def4 100644 --- a/runescape-client/src/main/java/Widget.java +++ b/runescape-client/src/main/java/Widget.java @@ -225,7 +225,7 @@ public class Widget extends Node { signature = "Lll;" ) @Export("fillMode") - public class323 fillMode; + public FillMode fillMode; @ObfuscatedName("ay") @ObfuscatedGetter( intValue = -1372029575 @@ -720,7 +720,7 @@ public class Widget extends Node { this.mouseOverColor = 0; this.mouseOverColor2 = 0; this.fill = false; - this.fillMode = class323.SOLID; + this.fillMode = FillMode.SOLID; this.transparencyTop = 0; this.transparencyBot = 0; this.lineWid = 1; diff --git a/runescape-client/src/main/java/class83.java b/runescape-client/src/main/java/class83.java index 7ab170b6a0..de4391e536 100644 --- a/runescape-client/src/main/java/class83.java +++ b/runescape-client/src/main/java/class83.java @@ -246,7 +246,7 @@ public class class83 { } if (var0 == ScriptOpcodes.CC_SETFILLMODE) { var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; - class323 var6 = (class323)SoundSystem.findEnumerated(PcmPlayer.method2405(), var8); + FillMode var6 = (FillMode)SoundSystem.findEnumerated(PcmPlayer.method2405(), var8); if (var6 != null) { var3.fillMode = var6; Strings.method4120(var3);