ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

96
runescape-client/src/main/java/class83.java
View File

@@ -1,4 +1,5 @@
import java.math.BigInteger;
import net.runelite.mapping.Export;
import net.runelite.mapping.ObfuscatedGetter;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
@@ -26,27 +27,28 @@ public class class83 {
signature = "(IIILiy;II)V",
garbageValue = "1789870821"
)
static void method1996(int var0, int var1, int var2, ObjectDefinition var3, int var4) {
@Export("newObjectSound")
static void newObjectSound(int plane, int x, int y, ObjectDefinition object, int rotation) {
ObjectSound var5 = new ObjectSound();
var5.field1078 = var0;
var5.field1083 = var1 * 128;
var5.field1090 = var2 * 16384;
int var6 = var3.sizeX;
int var7 = var3.sizeY;
if (var4 == 1 || var4 == 3) {
var6 = var3.sizeY;
var7 = var3.sizeX;
var5.plane = plane;
var5.x = x * 128;
var5.y = y * 16384;
int var6 = object.sizeX;
int var7 = object.sizeY;
if (rotation == 1 || rotation == 3) {
var6 = object.sizeY;
var7 = object.sizeX;
}
var5.field1077 = (var6 + var1) * 16384;
var5.field1082 = (var7 + var2) * 16384;
var5.soundEffectId = var3.ambientSoundId;
var5.field1091 = var3.int4 * 128;
var5.field1086 = var3.int5;
var5.field1081 = var3.int6;
var5.soundEffectIds = var3.field3367;
if (var3.transforms != null) {
var5.obj = var3;
var5.field1077 = (var6 + x) * 16384;
var5.field1082 = (var7 + y) * 16384;
var5.soundEffectId = object.ambientSoundId;
var5.field1091 = object.int4 * 128;
var5.field1086 = object.int5;
var5.field1081 = object.int6;
var5.soundEffectIds = object.soundEffectIds;
if (object.transforms != null) {
var5.obj = object;
var5.set();
}
@@ -93,48 +95,48 @@ public class class83 {
var3.scrollY = 0;
}
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETCOLOUR) {
var3.color = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETFILL) {
var3.fill = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETTRANS) {
var3.transparencyTop = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETLINEWID) {
var3.lineWid = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETGRAPHIC) {
var3.spriteId2 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SET2DANGLE) {
var3.spriteAngle = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETTILING) {
var3.spriteTiling = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETMODEL) {
var3.modelType = 1;
var3.modelId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETMODELANGLE) {
@@ -145,7 +147,7 @@ public class class83 {
var3.modelAngleY = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 3];
var3.modelAngleZ = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 4];
var3.modelZoom = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 5];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
int var8;
@@ -155,28 +157,28 @@ public class class83 {
var3.sequenceId = var8;
var3.modelFrame = 0;
var3.modelFrameCycle = 0;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
}
return 1;
}
if (var0 == ScriptOpcodes.CC_SETMODELORTHOG) {
var3.modelOrthog = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETTEXT) {
String var7 = Interpreter.Interpreter_stringStack[--Skills.Interpreter_stringStackSize];
if (!var7.equals(var3.text)) {
var3.text = var7;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
}
return 1;
}
if (var0 == ScriptOpcodes.CC_SETTEXTFONT) {
var3.fontId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETTEXTALIGN) {
@@ -184,39 +186,39 @@ public class class83 {
var3.textXAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var3.textYAlignment = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
var3.textLineHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 2];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETTEXTSHADOW) {
var3.textShadowed = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETOUTLINE) {
var3.outline = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETGRAPHICSHADOW) {
var3.spriteShadow = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETVFLIP) {
var3.spriteFlipV = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETHFLIP) {
var3.spriteFlipH = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize] == 1;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETSCROLLSIZE) {
HealthBarUpdate.Interpreter_intStackSize -= 2;
var3.scrollWidth = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize];
var3.scrollHeight = Interpreter.Interpreter_intStack[HealthBarUpdate.Interpreter_intStackSize + 1];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
if (var4 != -1 && var3.type == 0) {
WorldMapSprite.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var4 >> 16], var3, false);
}
@@ -224,32 +226,32 @@ public class class83 {
return 1;
}
if (var0 == ScriptOpcodes.CC_RESUME_PAUSEBUTTON) {
ScriptFrame.method1086(var3.id, var3.childIndex);
Client.field850 = var3;
Strings.method4120(var3);
ScriptFrame.resumePauseWidget(var3.id, var3.childIndex);
Client.meslayerContinueWidget = var3;
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == 1122) {
var3.spriteId = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETFILLCOLOUR) {
var3.color2 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == 1124) {
var3.transparencyBot = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
Strings.method4120(var3);
Strings.invalidateWidget(var3);
return 1;
}
if (var0 == ScriptOpcodes.CC_SETFILLMODE) {
var8 = Interpreter.Interpreter_intStack[--HealthBarUpdate.Interpreter_intStackSize];
FillMode var6 = (FillMode)SoundSystem.findEnumerated(PcmPlayer.method2405(), var8);
FillMode var6 = (FillMode)SoundSystem.findEnumerated(PcmPlayer.FillMode_values(), var8);
if (var6 != null) {
var3.fillMode = var6;
Strings.method4120(var3);
Strings.invalidateWidget(var3);
}
return 1;