project: rev 195

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

@@ -4,77 +4,66 @@ import net.runelite.mapping.ObfuscatedGetter;
 import net.runelite.mapping.ObfuscatedName;
 import net.runelite.mapping.ObfuscatedSignature;
 
-@ObfuscatedName("cw")
+@ObfuscatedName("cn")
 @Implements("DynamicObject")
 public class DynamicObject extends Renderable {
-	@ObfuscatedName("a")
+	@ObfuscatedName("f")
 	@ObfuscatedGetter(
-		intValue = 1608906951
-	)
-	static int field1311;
-	@ObfuscatedName("er")
-	@ObfuscatedGetter(
-		intValue = 1685580933
-	)
-	@Export("currentPort")
-	static int currentPort;
-	@ObfuscatedName("n")
-	@ObfuscatedGetter(
-		intValue = -1583763067
+		intValue = -57600529
 	)
 	@Export("id")
 	int id;
-	@ObfuscatedName("v")
+	@ObfuscatedName("o")
 	@ObfuscatedGetter(
-		intValue = 1077688157
+		intValue = 1163612607
 	)
 	@Export("type")
 	int type;
-	@ObfuscatedName("d")
+	@ObfuscatedName("u")
 	@ObfuscatedGetter(
-		intValue = -1461018485
+		intValue = 1554674349
 	)
 	@Export("orientation")
 	int orientation;
-	@ObfuscatedName("c")
+	@ObfuscatedName("p")
 	@ObfuscatedGetter(
-		intValue = 242558127
+		intValue = -1797083453
 	)
 	@Export("plane")
 	int plane;
-	@ObfuscatedName("y")
+	@ObfuscatedName("b")
 	@ObfuscatedGetter(
-		intValue = -345704253
+		intValue = 544096397
 	)
 	@Export("x")
 	int x;
-	@ObfuscatedName("h")
+	@ObfuscatedName("e")
 	@ObfuscatedGetter(
-		intValue = -2021063101
+		intValue = -252563019
 	)
 	@Export("y")
 	int y;
-	@ObfuscatedName("z")
+	@ObfuscatedName("k")
 	@ObfuscatedSignature(
-		descriptor = "Ljs;"
+		descriptor = "Lkw;"
 	)
 	@Export("sequenceDefinition")
 	SequenceDefinition sequenceDefinition;
-	@ObfuscatedName("e")
+	@ObfuscatedName("g")
 	@ObfuscatedGetter(
-		intValue = -765264835
+		intValue = -2049566951
 	)
 	@Export("frame")
 	int frame;
-	@ObfuscatedName("q")
+	@ObfuscatedName("h")
 	@ObfuscatedGetter(
-		intValue = 1029669135
+		intValue = -642790573
 	)
 	@Export("cycleStart")
 	int cycleStart;
 
 	@ObfuscatedSignature(
-		descriptor = "(IIIIIIIZLem;)V"
+		descriptor = "(IIIIIIIZLfm;)V"
 	)
 	DynamicObject(int var1, int var2, int var3, int var4, int var5, int var6, int var7, boolean var8, Renderable var9) {
 		this.id = var1; // L: 20
@@ -84,12 +73,12 @@ public class DynamicObject extends Renderable {
 		this.x = var5; // L: 24
 		this.y = var6; // L: 25
 		if (var7 != -1) { // L: 26
-			this.sequenceDefinition = InterfaceParent.SequenceDefinition_get(var7); // L: 27
+			this.sequenceDefinition = class225.SequenceDefinition_get(var7); // L: 27
 			this.frame = 0; // L: 28
 			this.cycleStart = Client.cycle - 1; // L: 29
-			if (this.sequenceDefinition.field3548 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
+			if (this.sequenceDefinition.field3707 == 0 && var9 != null && var9 instanceof DynamicObject) { // L: 30
 				DynamicObject var10 = (DynamicObject)var9; // L: 31
-				if (var10.sequenceDefinition == this.sequenceDefinition) { // L: 32
+				if (this.sequenceDefinition == var10.sequenceDefinition) { // L: 32
 					this.frame = var10.frame; // L: 33
 					this.cycleStart = var10.cycleStart; // L: 34
 					return; // L: 35
@@ -104,10 +93,10 @@ public class DynamicObject extends Renderable {
 
 	} // L: 43
 
-	@ObfuscatedName("q")
+	@ObfuscatedName("o")
 	@ObfuscatedSignature(
-		descriptor = "(B)Lef;",
-		garbageValue = "127"
+		descriptor = "(I)Lgv;",
+		garbageValue = "1835906978"
 	)
 	@Export("getModel")
 	protected final Model getModel() {
@@ -137,7 +126,7 @@ public class DynamicObject extends Renderable {
 			this.cycleStart = Client.cycle - var1; // L: 60
 		}
 
-		ObjectComposition var12 = WorldMapAreaData.getObjectDefinition(this.id); // L: 62
+		ObjectComposition var12 = class19.getObjectDefinition(this.id); // L: 62
 		if (var12.transforms != null) { // L: 63
 			var12 = var12.transform();
 		}
@@ -166,4 +155,4 @@ public class DynamicObject extends Renderable {
 			return var12.getModelDynamic(this.type, this.orientation, var8, var10, var9, var11, this.sequenceDefinition, this.frame); // L: 83
 		}
 	}
-}
+}