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

update client to rev 183

Browse Source
This commit is contained in:
ThatGamerBlue
2019-09-12 14:00:01 +01:00
parent 0446151736
commit 12c08b271a
342 changed files with 41159 additions and 41468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

264
runescape-client/src/main/java/NPC.java
View File

@@ -1,16 +1,14 @@
import java.io.IOException;
import net.runelite.mapping.Export;
import net.runelite.mapping.Implements;
import net.runelite.mapping.ObfuscatedName;
import net.runelite.mapping.ObfuscatedSignature;
import net.runelite.rs.ScriptOpcodes;
@ObfuscatedName("ci")
@ObfuscatedName("ct")
@Implements("NPC")
public final class NPC extends Actor {
@ObfuscatedName("s")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "Lii;"
signature = "Lia;"
)
@Export("definition")
NPCDefinition definition;
@@ -18,12 +16,12 @@ public final class NPC extends Actor {
NPC() {
}
@ObfuscatedName("s")
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(IBB)V",
garbageValue = "24"
signature = "(IBI)V",
garbageValue = "-267690393"
)
final void method1961(int var1, byte var2) {
final void method2010(int var1, byte var2) {
int var3 = super.pathX[0];
int var4 = super.pathY[0];
if (var1 == 0) {
@@ -62,7 +60,7 @@ public final class NPC extends Actor {
--var4;
}
if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) {
if (super.sequence != -1 && class83.SequenceDefinition_get(super.sequence).field3501 == 1) {
super.sequence = -1;
}
@@ -81,13 +79,13 @@ public final class NPC extends Actor {
super.pathTraversed[0] = var2;
}
@ObfuscatedName("j")
@ObfuscatedName("x")
@ObfuscatedSignature(
signature = "(IIZI)V",
garbageValue = "-1744737453"
signature = "(IIZB)V",
garbageValue = "14"
)
final void method1970(int var1, int var2, boolean var3) {
if (super.sequence != -1 && Widget.SequenceDefinition_get(super.sequence).field3505 == 1) {
final void method2011(int var1, int var2, boolean var3) {
if (super.sequence != -1 && class83.SequenceDefinition_get(super.sequence).field3501 == 1) {
super.sequence = -1;
}
@@ -113,26 +111,26 @@ public final class NPC extends Actor {
}
super.pathLength = 0;
super.field947 = 0;
super.field976 = 0;
super.field969 = 0;
super.field975 = 0;
super.pathX[0] = var1;
super.pathY[0] = var2;
super.x = super.size * -178253824 + super.pathX[0] * 128;
super.y = super.pathY[0] * 128 + super.size * -178253824;
super.x = super.size * -294686528 + super.pathX[0] * -589373056;
super.y = super.size * 64 + super.pathY[0] * 128;
}
@ObfuscatedName("x")
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(I)Ldo;",
garbageValue = "-419920513"
signature = "(B)Ldr;",
garbageValue = "-35"
)
@Export("getModel")
protected final Model getModel() {
if (this.definition == null) {
return null;
} else {
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? Widget.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? Widget.SequenceDefinition_get(super.movementSequence) : null;
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? class83.SequenceDefinition_get(super.sequence) : null;
SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? class83.SequenceDefinition_get(super.movementSequence) : null;
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
if (var3 == null) {
return null;
@@ -140,7 +138,7 @@ public final class NPC extends Actor {
var3.calculateBoundsCylinder();
super.defaultHeight = var3.height;
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
Model var4 = HealthBarUpdate.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
Model var4 = NetCache.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
if (var4 != null) {
var4.offsetBy(0, -super.heightOffset, 0);
Model[] var5 = new Model[]{var3, var4};
@@ -157,208 +155,48 @@ public final class NPC extends Actor {
}
}
@ObfuscatedName("r")
@ObfuscatedName("e")
@ObfuscatedSignature(
signature = "(B)Z",
garbageValue = "-110"
garbageValue = "93"
)
@Export("isVisible")
final boolean isVisible() {
return this.definition != null;
}
@ObfuscatedName("j")
@ObfuscatedName("gv")
@ObfuscatedSignature(
signature = "(ZI)V",
garbageValue = "-352307564"
signature = "(IIIB)V",
garbageValue = "116"
)
public static void method1977(boolean var0) {
if (NetCache.NetCache_socket != null) {
try {
Buffer var1 = new Buffer(4);
var1.writeByte(var0 ? 2 : 3);
var1.writeMedium(0);
NetCache.NetCache_socket.write(var1.array, 0, 4);
} catch (IOException var4) {
try {
NetCache.NetCache_socket.close();
} catch (Exception var3) {
}
++NetCache.NetCache_ioExceptions;
NetCache.NetCache_socket = null;
}
}
}
@ObfuscatedName("d")
@ObfuscatedSignature(
signature = "(Ljava/lang/String;I)V",
garbageValue = "106013450"
)
static final void method1976(String var0) {
StringBuilder var10000 = (new StringBuilder()).append(var0);
Object var10001 = null;
String var1 = var10000.append(" is already on your friend list").toString();
DirectByteArrayCopier.addGameMessage(30, "", var1);
}
@ObfuscatedName("c")
@ObfuscatedSignature(
signature = "(ILcr;ZI)I",
garbageValue = "594681676"
)
static int method1968(int var0, Script var1, boolean var2) {
Widget var3;
if (var0 >= 2000) {
var0 -= 1000;
var3 = WorldMapElement.getWidget(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
} else {
var3 = var2 ? class286.field3623 : class297.field3693;
}
String var4 = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
int[] var5 = null;
if (var4.length() > 0 && var4.charAt(var4.length() - 1) == 'Y') {
int var6 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
if (var6 > 0) {
for (var5 = new int[var6]; var6-- > 0; var5[var6] = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]) {
}
}
var4 = var4.substring(0, var4.length() - 1);
}
Object[] var8 = new Object[var4.length() + 1];
int var7;
for (var7 = var8.length - 1; var7 >= 1; --var7) {
if (var4.charAt(var7 - 1) == 's') {
var8[var7] = Interpreter.Interpreter_stringStack[--Interpreter.Interpreter_stringStackSize];
@Export("worldToScreen")
static final void worldToScreen(int var0, int var1, int var2) {
if (var0 >= 128 && var1 >= 128 && var0 <= 13056 && var1 <= 13056) {
int var3 = WorldMapAreaData.getTileHeight(var0, var1, MouseRecorder.plane) - var2;
var0 -= ScriptFrame.cameraX;
var3 -= GrandExchangeOfferTotalQuantityComparator.cameraY;
var1 -= class14.cameraZ;
int var4 = Rasterizer3D.Rasterizer3D_sine[class319.cameraPitch];
int var5 = Rasterizer3D.Rasterizer3D_cosine[class319.cameraPitch];
int var6 = Rasterizer3D.Rasterizer3D_sine[Tile.cameraYaw];
int var7 = Rasterizer3D.Rasterizer3D_cosine[Tile.cameraYaw];
int var8 = var6 * var1 + var0 * var7 >> 16;
var1 = var7 * var1 - var0 * var6 >> 16;
var0 = var8;
var8 = var3 * var5 - var4 * var1 >> 16;
var1 = var5 * var1 + var4 * var3 >> 16;
if (var1 >= 50) {
Client.viewportTempX = var0 * Client.viewportZoom / var1 + Client.viewportWidth / 2;
Client.viewportTempY = var8 * Client.viewportZoom / var1 + Client.viewportHeight / 2;
} else {
var8[var7] = new Integer(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
}
var7 = Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize];
if (var7 != -1) {
var8[0] = new Integer(var7);
} else {
var8 = null;
Client.viewportTempX = -1;
Client.viewportTempY = -1;
}
if (var0 == ScriptOpcodes.CC_SETONCLICK) {
var3.onClick = var8;
} else if (var0 == ScriptOpcodes.CC_SETONHOLD) {
var3.onHold = var8;
} else if (var0 == ScriptOpcodes.CC_SETONRELEASE) {
var3.onRelease = var8;
} else if (var0 == ScriptOpcodes.CC_SETONMOUSEOVER) {
var3.onMouseOver = var8;
} else if (var0 == ScriptOpcodes.CC_SETONMOUSELEAVE) {
var3.onMouseLeave = var8;
} else if (var0 == ScriptOpcodes.CC_SETONDRAG) {
var3.onDrag = var8;
} else if (var0 == ScriptOpcodes.CC_SETONTARGETLEAVE) {
var3.onTargetLeave = var8;
} else if (var0 == ScriptOpcodes.CC_SETONVARTRANSMIT) {
var3.onVarTransmit = var8;
var3.varTransmitTriggers = var5;
} else if (var0 == ScriptOpcodes.CC_SETONTIMER) {
var3.onTimer = var8;
} else if (var0 == ScriptOpcodes.CC_SETONOP) {
var3.onOp = var8;
} else if (var0 == ScriptOpcodes.CC_SETONDRAGCOMPLETE) {
var3.onDragComplete = var8;
} else if (var0 == ScriptOpcodes.CC_SETONCLICKREPEAT) {
var3.onClickRepeat = var8;
} else if (var0 == ScriptOpcodes.CC_SETONMOUSEREPEAT) {
var3.onMouseRepeat = var8;
} else if (var0 == ScriptOpcodes.CC_SETONINVTRANSMIT) {
var3.onInvTransmit = var8;
var3.invTransmitTriggers = var5;
} else if (var0 == ScriptOpcodes.CC_SETONSTATTRANSMIT) {
var3.onStatTransmit = var8;
var3.statTransmitTriggers = var5;
} else if (var0 == ScriptOpcodes.CC_SETONTARGETENTER) {
var3.onTargetEnter = var8;
} else if (var0 == ScriptOpcodes.CC_SETONSCROLLWHEEL) {
var3.onScroll = var8;
} else if (var0 == ScriptOpcodes.CC_SETONCHATTRANSMIT) {
var3.onChatTransmit = var8;
} else if (var0 == ScriptOpcodes.CC_SETONKEY) {
var3.onKey = var8;
} else if (var0 == ScriptOpcodes.CC_SETONFRIENDTRANSMIT) {
var3.onFriendTransmit = var8;
} else if (var0 == ScriptOpcodes.CC_SETONCLANTRANSMIT) {
var3.onClanTransmit = var8;
} else if (var0 == ScriptOpcodes.CC_SETONMISCTRANSMIT) {
var3.onMiscTransmit = var8;
} else if (var0 == ScriptOpcodes.CC_SETONDIALOGABORT) {
var3.onDialogAbort = var8;
} else if (var0 == ScriptOpcodes.CC_SETONSUBCHANGE) {
var3.onSubChange = var8;
} else if (var0 == ScriptOpcodes.CC_SETONSTOCKTRANSMIT) {
var3.onStockTransmit = var8;
} else if (var0 == 1426) {
var3.field2663 = var8;
} else {
if (var0 != ScriptOpcodes.CC_SETONRESIZE) {
return 2;
}
var3.onResize = var8;
}
var3.hasListener = true;
return 1;
}
@ObfuscatedName("jl")
@ObfuscatedSignature(
signature = "(IIII)Lbq;",
garbageValue = "-1663571720"
)
static final InterfaceParent method1967(int var0, int var1, int var2) {
InterfaceParent var3 = new InterfaceParent();
var3.group = var1;
var3.type = var2;
Client.interfaceParents.put(var3, (long)var0);
WorldMapSectionType.Widget_resetModelFrames(var1);
Widget var4 = WorldMapElement.getWidget(var0);
FriendSystem.invalidateWidget(var4);
if (Client.meslayerContinueWidget != null) {
FriendSystem.invalidateWidget(Client.meslayerContinueWidget);
Client.meslayerContinueWidget = null;
}
for (int var5 = 0; var5 < Client.menuOptionsCount; ++var5) {
if (PendingSpawn.isWidgetMenuOpcode(Client.menuOpcodes[var5])) {
if (var5 < Client.menuOptionsCount - 1) {
for (int var6 = var5; var6 < Client.menuOptionsCount - 1; ++var6) {
Client.menuActions[var6] = Client.menuActions[var6 + 1];
Client.menuTargets[var6] = Client.menuTargets[var6 + 1];
Client.menuOpcodes[var6] = Client.menuOpcodes[var6 + 1];
Client.menuIdentifiers[var6] = Client.menuIdentifiers[var6 + 1];
Client.menuArguments1[var6] = Client.menuArguments1[var6 + 1];
Client.menuArguments2[var6] = Client.menuArguments2[var6 + 1];
Client.menuShiftClick[var6] = Client.menuShiftClick[var6 + 1];
}
}
--var5;
--Client.menuOptionsCount;
}
}
GrandExchangeOfferNameComparator.calculateMenuBounds();
WorldMapAreaData.revalidateWidgetScroll(Widget.Widget_interfaceComponents[var0 >> 16], var4, false);
class51.runWidgetOnLoadListener(var1);
if (Client.rootInterface != -1) {
UserComparator6.runIntfCloseListeners(Client.rootInterface, 1);
}
return var3;
}
}