rs-client: name FillMode

This commit is contained in:
Lucwousin
2019-07-23 23:48:46 +02:00
parent be27fa5399
commit 21d4fe4a8f
6 changed files with 24 additions and 18 deletions

View File

@@ -2442,12 +2442,12 @@ public final class Client extends GameShell implements Usernamed {
} }
if (loginState == 7 && ((AbstractSocket)var1).available() > 0) { if (loginState == 7 && ((AbstractSocket)var1).available() > 0) {
class323.field3884 = ((AbstractSocket)var1).readUnsignedByte(); FillMode.field3884 = ((AbstractSocket)var1).readUnsignedByte();
loginState = 8; 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; var2.offset = 0;
loginState = 6; loginState = 6;
} }

View File

@@ -1,10 +1,12 @@
import net.runelite.mapping.Export; import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedGetter; import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName; import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature; import net.runelite.mapping.ObfuscatedSignature;
@ObfuscatedName("ll") @ObfuscatedName("ll")
public enum class323 implements Enumerated { @Implements("FillMode")
public enum FillMode implements Enumerated {
@ObfuscatedName("q") @ObfuscatedName("q")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lll;" signature = "Lll;"
@@ -15,12 +17,14 @@ public enum class323 implements Enumerated {
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lll;" signature = "Lll;"
) )
field3887(1, 1), @Export("GRADIENT")
GRADIENT(1, 1),
@ObfuscatedName("e") @ObfuscatedName("e")
@ObfuscatedSignature( @ObfuscatedSignature(
signature = "Lll;" signature = "Lll;"
) )
field3885(2, 2); @Export("GRADIENTALPHA")
GRADIENTALPHA(2, 2);
@ObfuscatedName("ex") @ObfuscatedName("ex")
@ObfuscatedGetter( @ObfuscatedGetter(
@@ -31,16 +35,18 @@ public enum class323 implements Enumerated {
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 215627811 intValue = 215627811
) )
public final int field3886; @Export("value")
public final int value;
@ObfuscatedName("k") @ObfuscatedName("k")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = 198667019 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") @ObfuscatedName("e")
@@ -50,6 +56,6 @@ public enum class323 implements Enumerated {
) )
@Export("rsOrdinal") @Export("rsOrdinal")
public int rsOrdinal() { public int rsOrdinal() {
return this.field3889; return this.id;
} }
} }

View File

@@ -512,7 +512,7 @@ public class FontName {
} }
if (var10.fill) { if (var10.fill) {
switch(var10.fillMode.field3886) { switch(var10.fillMode.value) {
case 1: case 1:
Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2); Rasterizer2D.Rasterizer2D_fillRectangleGradient(var12, var13, var10.width, var10.height, var10.color, var10.color2);
break; break;

View File

@@ -473,8 +473,8 @@ public class PcmPlayer {
signature = "(B)[Lll;", signature = "(B)[Lll;",
garbageValue = "69" 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") @ObfuscatedName("ip")

View File

@@ -225,7 +225,7 @@ public class Widget extends Node {
signature = "Lll;" signature = "Lll;"
) )
@Export("fillMode") @Export("fillMode")
public class323 fillMode; public FillMode fillMode;
@ObfuscatedName("ay") @ObfuscatedName("ay")
@ObfuscatedGetter( @ObfuscatedGetter(
intValue = -1372029575 intValue = -1372029575
@@ -720,7 +720,7 @@ public class Widget extends Node {
this.mouseOverColor = 0; this.mouseOverColor = 0;
this.mouseOverColor2 = 0; this.mouseOverColor2 = 0;
this.fill = false; this.fill = false;
this.fillMode = class323.SOLID; this.fillMode = FillMode.SOLID;
this.transparencyTop = 0; this.transparencyTop = 0;
this.transparencyBot = 0; this.transparencyBot = 0;
this.lineWid = 1; this.lineWid = 1;

View File

@@ -246,7 +246,7 @@ public class class83 {
} }
if (var0 == ScriptOpcodes.CC_SETFILLMODE) { if (var0 == ScriptOpcodes.CC_SETFILLMODE) {
var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize]; 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) { if (var6 != null) {
var3.fillMode = var6; var3.fillMode = var6;
Strings.method4120(var3); Strings.method4120(var3);