Merge pull request #1096 from Lucwousin/filemood

rs-client: name FillMode

runescape-client/src/main/java/Calendar.java

@@ -14,7 +14,8 @@ public class Calendar {
 	@Export("DAYS_OF_THE_WEEK")
 	public static final String[] DAYS_OF_THE_WEEK;
 	@ObfuscatedName("e")
-	public static java.util.Calendar field2504;
+	@Export("Calendar_calendar")
+	public static java.util.Calendar Calendar_calendar;
 	@ObfuscatedName("x")
 	@ObfuscatedSignature(
 		signature = "Lhj;"
@@ -27,7 +28,7 @@ public class Calendar {
 		MONTH_NAMES_ENGLISH_GERMAN = new String[][]{{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"Jan", "Feb", "Mär", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"}, {"jan", "fév", "mars", "avr", "mai", "juin", "juil", "août", "sept", "oct", "nov", "déc"}, {"jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"}, {"jan", "feb", "mrt", "apr", "mei", "jun", "jul", "aug", "sep", "okt", "nov", "dec"}, {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}, {"ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"}};
 		DAYS_OF_THE_WEEK = new String[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 		java.util.Calendar.getInstance();
-		field2504 = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
+		Calendar_calendar = java.util.Calendar.getInstance(TimeZone.getTimeZone("GMT"));
 	}
 
 	@ObfuscatedName("g")

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) {
+			if (loginState == 8 && ((AbstractSocket)var1).available() >= FillMode.field3884) {
-				((AbstractSocket)var1).read(var2.array, 0, class323.field3884);
+				((AbstractSocket)var1).read(var2.array, 0, FillMode.field3884);
 				var2.offset = 0;
 				loginState = 6;
 			}

runescape-client/src/main/java/ClientPacket.java

@@ -6,7 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("gx")
 @Implements("ClientPacket")
-public class ClientPacket implements class181 {
+public class ClientPacket implements ClientPacketMarker
+{
 	@ObfuscatedName("ng")
 	@ObfuscatedGetter(
 		intValue = -1373117165

runescape-client/src/main/java/ClientPacketMarker.java

@@ -0,0 +1,7 @@
+import net.runelite.mapping.Implements;
+import net.runelite.mapping.ObfuscatedName;
+
+@ObfuscatedName("fh")
+@Implements("ClientPacketMarker")
+public interface ClientPacketMarker {
+}

runescape-client/src/main/java/DevicePcmPlayerProvider.java

@@ -6,7 +6,7 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("ak")
 @Implements("DevicePcmPlayerProvider")
-public class DevicePcmPlayerProvider implements class99 {
+public class DevicePcmPlayerProvider implements PcmPlayerProvider {
 	@ObfuscatedName("pf")
 	@ObfuscatedSignature(
 		signature = "Ljx;"

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) {
+	FillMode(int var3, int var4) {
-		this.field3886 = var3;
+		this.value = var3;
-		this.field3889 = var4;
+		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;
 	}
 }

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;

runescape-client/src/main/java/LoginPacket.java

@@ -6,7 +6,8 @@ import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("gh")
 @Implements("LoginPacket")
-public class LoginPacket implements class181 {
+public class LoginPacket implements ClientPacketMarker
+{
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "Lgh;"

runescape-client/src/main/java/PcmPlayer.java

@@ -473,8 +473,8 @@ public class PcmPlayer {
 		signature = "(B)[Lll;",
 		garbageValue = "69"
 	)
-	public static class323[] method2405() {
+	public static FillMode[] method2405() {
-		return new class323[]{class323.field3887, class323.SOLID, class323.field3885};
+		return new FillMode[]{FillMode.GRADIENT, FillMode.SOLID, FillMode.GRADIENTALPHA};
 	}
 
 	@ObfuscatedName("ip")

runescape-client/src/main/java/PcmPlayerProvider.java

@@ -1,9 +1,11 @@
 import net.runelite.mapping.Export;
+import net.runelite.mapping.Implements;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
 @ObfuscatedName("cm")
-public interface class99 {
+@Implements("PcmPlayerProvider")
+public interface PcmPlayerProvider {
 	@ObfuscatedName("q")
 	@ObfuscatedSignature(
 		signature = "(B)Ldn;",

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;

runescape-client/src/main/java/class14.java

@@ -74,14 +74,14 @@ public class class14 {
 			} else {
 				String var4 = var3 + "; Expires=";
 				long var6 = DirectByteArrayCopier.currentTimeMs() + 94608000000L;
-				Calendar.field2504.setTime(new Date(var6));
+				Calendar.Calendar_calendar.setTime(new Date(var6));
-				int var8 = Calendar.field2504.get(7);
+				int var8 = Calendar.Calendar_calendar.get(7);
-				int var9 = Calendar.field2504.get(5);
+				int var9 = Calendar.Calendar_calendar.get(5);
-				int var10 = Calendar.field2504.get(2);
+				int var10 = Calendar.Calendar_calendar.get(2);
-				int var11 = Calendar.field2504.get(1);
+				int var11 = Calendar.Calendar_calendar.get(1);
-				int var12 = Calendar.field2504.get(11);
+				int var12 = Calendar.Calendar_calendar.get(11);
-				int var13 = Calendar.field2504.get(12);
+				int var13 = Calendar.Calendar_calendar.get(12);
-				int var14 = Calendar.field2504.get(13);
+				int var14 = Calendar.Calendar_calendar.get(13);
 				var5 = Calendar.DAYS_OF_THE_WEEK[var8 - 1] + ", " + var9 / 10 + var9 % 10 + "-" + Calendar.MONTH_NAMES_ENGLISH_GERMAN[0][var10] + "-" + var11 + " " + var12 / 10 + var12 % 10 + ":" + var13 / 10 + var13 % 10 + ":" + var14 / 10 + var14 % 10 + " GMT";
 				var3 = var4 + var5 + "; Max-Age=" + 94608000L;
 			}

runescape-client/src/main/java/class181.java

@@ -1,5 +0,0 @@
-import net.runelite.mapping.ObfuscatedName;
-
-@ObfuscatedName("fh")
-public interface class181 {
-}

runescape-client/src/main/java/class32.java

@@ -18,7 +18,7 @@ public class class32 {
 		signature = "Lcm;"
 	)
 	@Export("pcmPlayerProvider")
-	public static class99 pcmPlayerProvider;
+	public static PcmPlayerProvider pcmPlayerProvider;
 	@ObfuscatedName("dq")
 	@ObfuscatedSignature(
 		signature = "Liu;"

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);