From 12503411f71d00c52b8f2e46232facf78593a3f1 Mon Sep 17 00:00:00 2001 From: Woah Date: Wed, 31 Mar 2021 20:40:35 -0400 Subject: [PATCH] GFX methods in-lined Minor renaming --- .../java/org/runite/client/BufferedDataStream.java | 10 ---------- .../main/java/org/runite/client/Class140_Sub2.java | 4 ++-- .../main/java/org/runite/client/Class140_Sub6.java | 4 ++-- Client/src/main/java/org/runite/client/Class75.java | 12 ------------ .../java/org/runite/client/GraphicDefinition.java | 13 +++++-------- Client/src/main/java/org/runite/client/NPC.java | 2 +- .../main/java/org/runite/client/NPCRendering.java | 4 ++-- .../main/java/org/runite/client/PacketParser.java | 8 ++++---- Client/src/main/java/org/runite/client/Player.java | 2 +- .../java/org/runite/client/PlayerRendering.java | 4 ++-- .../runite/client/RenderAnimationDefinition.java | 2 +- 11 files changed, 20 insertions(+), 45 deletions(-) diff --git a/Client/src/main/java/org/runite/client/BufferedDataStream.java b/Client/src/main/java/org/runite/client/BufferedDataStream.java index 6d133d9bd..44f9cc4de 100644 --- a/Client/src/main/java/org/runite/client/BufferedDataStream.java +++ b/Client/src/main/java/org/runite/client/BufferedDataStream.java @@ -986,16 +986,6 @@ public final class BufferedDataStream extends DataBuffer { } } -// static void method813() { -// try { -// Class3_Sub28_Sub4.aReferenceCache_3572.clearSoftReferences(); -// Class143.aReferenceCache_1874.clearSoftReferences(); -// Class67.aReferenceCache_1013.clearSoftReferences(); -// } catch (RuntimeException var2) { -// throw ClientErrorException.clientError(var2, "i.O(" + 1974 + ')'); -// } -// } - final void method814(int[] var1) { try { this.isaacCipher = new ISAACCipher(var1); diff --git a/Client/src/main/java/org/runite/client/Class140_Sub2.java b/Client/src/main/java/org/runite/client/Class140_Sub2.java index 30b913fdc..c42e2cea4 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub2.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub2.java @@ -19,7 +19,7 @@ final class Class140_Sub2 extends GameObject { private Model method1949() { try { - GraphicDefinition var2 = GraphicDefinition.getGraphicDefinition((byte)42, this.anInt2708); + GraphicDefinition var2 = GraphicDefinition.getGraphicDefinition(this.anInt2708); Model var3; if(this.aBoolean2718) { @@ -194,7 +194,7 @@ final class Class140_Sub2 extends GameObject { this.anInt2703 = var7 + var6; this.anInt2708 = var1; this.anInt2712 = var5; - int var8 = GraphicDefinition.getGraphicDefinition((byte)42, this.anInt2708).anInt542; + int var8 = GraphicDefinition.getGraphicDefinition(this.anInt2708).anInt542; if(-1 == var8) { this.aBoolean2718 = true; } else { diff --git a/Client/src/main/java/org/runite/client/Class140_Sub6.java b/Client/src/main/java/org/runite/client/Class140_Sub6.java index 4afed85fd..6da8e25b6 100644 --- a/Client/src/main/java/org/runite/client/Class140_Sub6.java +++ b/Client/src/main/java/org/runite/client/Class140_Sub6.java @@ -80,7 +80,7 @@ final class Class140_Sub6 extends GameObject { private Model method2022() { try { - GraphicDefinition var2 = GraphicDefinition.getGraphicDefinition((byte)42, this.anInt2915); + GraphicDefinition var2 = GraphicDefinition.getGraphicDefinition(this.anInt2915); Model var3 = var2.method966(this.anInt2898, this.anInt2922, this.anInt2896); if(null == var3) { return null; @@ -242,7 +242,7 @@ final class Class140_Sub6 extends GameObject { this.anInt2897 = var9; this.anInt2925 = var6; this.anInt2911 = var5; - int var12 = GraphicDefinition.getGraphicDefinition((byte)42, this.anInt2915).anInt542; + int var12 = GraphicDefinition.getGraphicDefinition(this.anInt2915).anInt542; if(var12 == -1) { this.aClass142_2923 = null; } else { diff --git a/Client/src/main/java/org/runite/client/Class75.java b/Client/src/main/java/org/runite/client/Class75.java index 5dea73ec2..dcc31e69f 100644 --- a/Client/src/main/java/org/runite/client/Class75.java +++ b/Client/src/main/java/org/runite/client/Class75.java @@ -37,18 +37,6 @@ abstract class Class75 { return null; } - static int method1338(int var0, int var1) { - try { - if (var1 <= 13) { - anIntArray1107 = null; - } - - return 255 & var0; - } catch (RuntimeException var3) { - throw ClientErrorException.clientError(var3, "kf.H(" + var0 + ',' + var1 + ')'); - } - } - static void method1339(RSString var0) { try { for (Class3_Sub28_Sub3 var2 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1222(); var2 != null; var2 = (Class3_Sub28_Sub3) Class134.aLinkedList_1758.method1221()) { diff --git a/Client/src/main/java/org/runite/client/GraphicDefinition.java b/Client/src/main/java/org/runite/client/GraphicDefinition.java index 8d318c4a1..1a1a9e796 100644 --- a/Client/src/main/java/org/runite/client/GraphicDefinition.java +++ b/Client/src/main/java/org/runite/client/GraphicDefinition.java @@ -21,16 +21,13 @@ public final class GraphicDefinition { static int anInt548 = 0; static volatile int anInt549 = 0; - static GraphicDefinition getGraphicDefinition(byte var0, int graphicId) { + static GraphicDefinition getGraphicDefinition(int graphicId) { try { GraphicDefinition def = (GraphicDefinition) Class3_Sub31.aReferenceCache_2604.get(graphicId); if (def == null) { - byte[] var3 = TextureOperation19.aClass153_3214.getFile(Unsorted.method64(graphicId), Class75.method1338(graphicId, var0 ^ 7)); + byte[] var3 = TextureOperation19.aClass153_3214.getFile(graphicId >>> 8, graphicId & 0xFF); def = new GraphicDefinition(); def.graphicId = graphicId; - if (var0 != 42) { - getGraphicDefinition((byte) -83, -12); - } if (null != var3) { def.parse(new DataBuffer(var3)); @@ -40,7 +37,7 @@ public final class GraphicDefinition { } return def; } catch (RuntimeException var4) { - throw ClientErrorException.clientError(var4, "ck.D(" + var0 + ',' + graphicId + ')'); + throw ClientErrorException.clientError(var4, "ck.D(" + (byte) 42 + ',' + graphicId + ')'); } } @@ -53,14 +50,14 @@ public final class GraphicDefinition { return; } - this.method965(var1, var3); + this.decode(var1, var3); } } catch (RuntimeException var4) { throw ClientErrorException.clientError(var4, "eg.A(" + (var1 != null?"{...}":"null") + ',' + (byte) -113 + ')'); } } - private void method965(DataBuffer var1, int var2) { + private void decode(DataBuffer var1, int var2) { try { if(var2 == 1) { this.anInt541 = var1.readUnsignedShort(); diff --git a/Client/src/main/java/org/runite/client/NPC.java b/Client/src/main/java/org/runite/client/NPC.java index e0fdd24ec..f7a92a851 100644 --- a/Client/src/main/java/org/runite/client/NPC.java +++ b/Client/src/main/java/org/runite/client/NPC.java @@ -207,7 +207,7 @@ public final class NPC extends Class140_Sub4 { this.method1969((byte) 115, var15, var1); var17 = null; if (this.anInt2842 != -1 && -1 != this.anInt2805) { - GraphicDefinition var21 = GraphicDefinition.getGraphicDefinition((byte) 42, this.anInt2842); + GraphicDefinition var21 = GraphicDefinition.getGraphicDefinition(this.anInt2842); var17 = var21.method966(this.anInt2826, this.anInt2805, this.anInt2761); if (var17 != null) { var17.method1897(0, -this.anInt2799, 0); diff --git a/Client/src/main/java/org/runite/client/NPCRendering.java b/Client/src/main/java/org/runite/client/NPCRendering.java index d867749de..cd2f40404 100644 --- a/Client/src/main/java/org/runite/client/NPCRendering.java +++ b/Client/src/main/java/org/runite/client/NPCRendering.java @@ -244,7 +244,7 @@ public final class NPCRendering { var6 = BufferedDataStream.incomingBuffer.readIntLE(); boolean var7 = true; - if (var5 != -1 && npc.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var5).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, npc.anInt2842).anInt542).forcedPriority) { + if (var5 != -1 && npc.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(var5).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(npc.anInt2842).anInt542).forcedPriority) { var7 = false; } @@ -260,7 +260,7 @@ public final class NPCRendering { } if (npc.anInt2842 != -1 && Class44.anInt719 == npc.anInt2759) { - int var8 = GraphicDefinition.getGraphicDefinition((byte) 42, npc.anInt2842).anInt542; + int var8 = GraphicDefinition.getGraphicDefinition(npc.anInt2842).anInt542; if (var8 != -1) { SequenceDefinition var9 = SequenceDefinition.getAnimationDefinition(var8); if (var9.frames != null) { diff --git a/Client/src/main/java/org/runite/client/PacketParser.java b/Client/src/main/java/org/runite/client/PacketParser.java index ee0475b1d..ab240f303 100644 --- a/Client/src/main/java/org/runite/client/PacketParser.java +++ b/Client/src/main/java/org/runite/client/PacketParser.java @@ -571,7 +571,7 @@ public final class PacketParser { if (counter == 65535) { counter = -1; } - var32 = counter == -1 || -1 == var62.anInt2842 || SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var62.anInt2842).anInt542).forcedPriority <= SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, counter).anInt542).forcedPriority; + var32 = counter == -1 || -1 == var62.anInt2842 || SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(var62.anInt2842).anInt542).forcedPriority <= SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(counter).anInt542).forcedPriority; if (var32) { var62.anInt2761 = 0; @@ -585,7 +585,7 @@ public final class PacketParser { var62.anInt2799 = var19; var62.anInt2826 = 1; if (var62.anInt2842 != -1 && Class44.anInt719 == var62.anInt2759) { - var33 = GraphicDefinition.getGraphicDefinition((byte) 42, var62.anInt2842).anInt542; + var33 = GraphicDefinition.getGraphicDefinition(var62.anInt2842).anInt542; if (var33 != -1) { var53 = SequenceDefinition.getAnimationDefinition(var33); if (null != var53.frames) { @@ -608,7 +608,7 @@ public final class PacketParser { if (counter == 65535) { counter = -1; } - var32 = counter == -1 || var60.anInt2842 == -1 || SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var60.anInt2842).anInt542).forcedPriority <= SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, counter).anInt542).forcedPriority; + var32 = counter == -1 || var60.anInt2842 == -1 || SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(var60.anInt2842).anInt542).forcedPriority <= SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(counter).anInt542).forcedPriority; if (var32) { var60.anInt2759 = nodeModelId + Class44.anInt719; @@ -623,7 +623,7 @@ public final class PacketParser { } if (var60.anInt2842 != -1 && Class44.anInt719 == var60.anInt2759) { - var33 = GraphicDefinition.getGraphicDefinition((byte) 42, var60.anInt2842).anInt542; + var33 = GraphicDefinition.getGraphicDefinition(var60.anInt2842).anInt542; if (var33 != -1) { var53 = SequenceDefinition.getAnimationDefinition(var33); if (null != var53.frames) { diff --git a/Client/src/main/java/org/runite/client/Player.java b/Client/src/main/java/org/runite/client/Player.java index f008e12c9..4920699c1 100644 --- a/Client/src/main/java/org/runite/client/Player.java +++ b/Client/src/main/java/org/runite/client/Player.java @@ -298,7 +298,7 @@ public final class Player extends Class140_Sub4 { this.method1969((byte) 110, var15, var1); var23 = null; if (!this.aBoolean3968 && this.anInt2842 != -1 && this.anInt2805 != -1) { - GraphicDefinition var26 = GraphicDefinition.getGraphicDefinition((byte) 42, this.anInt2842); + GraphicDefinition var26 = GraphicDefinition.getGraphicDefinition(this.anInt2842); var23 = var26.method966(this.anInt2826, this.anInt2805, this.anInt2761); if (var23 != null) { var23.method1897(0, -this.anInt2799, 0); diff --git a/Client/src/main/java/org/runite/client/PlayerRendering.java b/Client/src/main/java/org/runite/client/PlayerRendering.java index 342f76915..f7cb6e14d 100644 --- a/Client/src/main/java/org/runite/client/PlayerRendering.java +++ b/Client/src/main/java/org/runite/client/PlayerRendering.java @@ -357,7 +357,7 @@ public final class PlayerRendering { chatIcon = BufferedDataStream.incomingBuffer.readIntV2(); boolean var21 = true; - if (var4 != -1 && var3.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var4).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition((byte) 42, var3.anInt2842).anInt542).forcedPriority) { + if (var4 != -1 && var3.anInt2842 != -1 && SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(var4).anInt542).forcedPriority < SequenceDefinition.getAnimationDefinition(GraphicDefinition.getGraphicDefinition(var3.anInt2842).anInt542).forcedPriority) { var21 = false; } @@ -373,7 +373,7 @@ public final class PlayerRendering { var3.anInt2799 = chatIcon >> 16; var3.anInt2826 = 1; if (var3.anInt2842 != -1 && Class44.anInt719 == var3.anInt2759) { - var7 = GraphicDefinition.getGraphicDefinition((byte) 42, var3.anInt2842).anInt542; + var7 = GraphicDefinition.getGraphicDefinition(var3.anInt2842).anInt542; if (var7 != -1) { SequenceDefinition var24 = SequenceDefinition.getAnimationDefinition(var7); if (var24.frames != null) { diff --git a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java index eb08311b3..91d7f018e 100644 --- a/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java +++ b/Client/src/main/java/org/runite/client/RenderAnimationDefinition.java @@ -80,7 +80,7 @@ final class RenderAnimationDefinition { int var6; if (var0.anInt2842 != -1 && var0.anInt2759 <= Class44.anInt719) { - var6 = GraphicDefinition.getGraphicDefinition((byte) 42, var0.anInt2842).anInt542; + var6 = GraphicDefinition.getGraphicDefinition(var0.anInt2842).anInt542; if (var6 == -1) { var0.anInt2842 = -1; } else {