diff --git a/runescape-client/src/main/java/Decimator.java b/runescape-client/src/main/java/Decimator.java index 47aadf498d..229c6bbeb6 100644 --- a/runescape-client/src/main/java/Decimator.java +++ b/runescape-client/src/main/java/Decimator.java @@ -212,10 +212,10 @@ public class Decimator { ViewportMouse.field951 = (var16 + var10) / 2; ViewportMouse.field952 = (var13 + var12) / 2; ViewportMouse.field953 = (var17 - var9) / 2; - class311.field1156 = (var16 - var10) / 2; + DefaultsGroup.field1156 = (var16 - var10) / 2; Skeleton.field874 = (var13 - var12) / 2; GraphicsObject.field377 = Math.abs(ViewportMouse.field953); - ViewportMouse.field954 = Math.abs(class311.field1156); + ViewportMouse.field954 = Math.abs(DefaultsGroup.field1156); class248.field1142 = Math.abs(Skeleton.field874); } @@ -228,7 +228,7 @@ public class Decimator { var9 = AccessFile.field7 - var5; var10 = ViewportMouse.field951 - var6; var11 = ViewportMouse.field952 - var7; - return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * class311.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * class311.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377)))); + return Math.abs(var9) > var8 + GraphicsObject.field377 ? false : (Math.abs(var10) > var12 + ViewportMouse.field954 ? false : (Math.abs(var11) > var13 + class248.field1142 ? false : (Math.abs(var11 * DefaultsGroup.field1156 - var10 * Skeleton.field874) > var13 * ViewportMouse.field954 + var12 * class248.field1142 ? false : (Math.abs(var9 * Skeleton.field874 - var11 * ViewportMouse.field953) > var8 * class248.field1142 + var13 * GraphicsObject.field377 ? false : Math.abs(var10 * ViewportMouse.field953 - var9 * DefaultsGroup.field1156) <= var8 * ViewportMouse.field954 + var12 * GraphicsObject.field377)))); } } diff --git a/runescape-client/src/main/java/class311.java b/runescape-client/src/main/java/DefaultsGroup.java similarity index 70% rename from runescape-client/src/main/java/class311.java rename to runescape-client/src/main/java/DefaultsGroup.java index df7d2a1fa4..e02abf6d73 100644 --- a/runescape-client/src/main/java/class311.java +++ b/runescape-client/src/main/java/DefaultsGroup.java @@ -1,14 +1,18 @@ +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("ka") -public class class311 { +@Implements("DefaultsGroup") +public class DefaultsGroup +{ @ObfuscatedName("m") @ObfuscatedSignature( signature = "Lka;" ) - static final class311 field3810; + static final DefaultsGroup field3810; @ObfuscatedName("e") @ObfuscatedGetter( intValue = -2077113503 @@ -18,10 +22,11 @@ public class class311 { @ObfuscatedGetter( intValue = -800980069 ) - final int field3809; + @Export("group") + final int group; - class311(int var1) { - this.field3809 = var1; + DefaultsGroup(int var1) { + this.group = var1; } @ObfuscatedName("m") @@ -34,6 +39,6 @@ public class class311 { } static { - field3810 = new class311(3); + field3810 = new DefaultsGroup(3); } } diff --git a/runescape-client/src/main/java/SpriteIds.java b/runescape-client/src/main/java/SpriteIds.java index d1580be415..62d6048213 100644 --- a/runescape-client/src/main/java/SpriteIds.java +++ b/runescape-client/src/main/java/SpriteIds.java @@ -93,7 +93,7 @@ public class SpriteIds { ) @Export("read") public void read(AbstractArchive var1) { - byte[] var2 = var1.takeFileFlat(class311.field3810.field3809); + byte[] var2 = var1.takeFileFlat(DefaultsGroup.field3810.group); Buffer var3 = new Buffer(var2); while (true) { diff --git a/runescape-client/src/main/java/StructDefinition.java b/runescape-client/src/main/java/StructDefinition.java index 0f8a462be8..b76149f043 100644 --- a/runescape-client/src/main/java/StructDefinition.java +++ b/runescape-client/src/main/java/StructDefinition.java @@ -261,7 +261,7 @@ public class StructDefinition extends DualNode { return 1; } else if (var0 == 1125) { var5 = Interpreter.Interpreter_intStack[--RouteStrategy.Interpreter_intStackSize]; - RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(class311.method5822(), var5); + RectangleMode var7 = (RectangleMode)ScriptFrame.findEnumerated(DefaultsGroup.method5822(), var5); if (var7 != null) { var4.rectangleMode = var7; class22.method295(var4);