From ed3ecde76604c94eec20202fd5c1b496936958ad Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 10 Jun 2019 16:24:34 +0200 Subject: [PATCH] Fix itemcomposition note imports --- .../src/main/java/net/runelite/rs/api/RSItemDefinition.java | 2 +- runescape-client/src/main/java/Skills.java | 2 +- runescape-client/src/main/java/class171.java | 2 +- runescape-client/src/main/java/class30.java | 4 ++-- runescape-client/src/main/java/class31.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java index 67c0cdb459..609ef5eb45 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSItemDefinition.java @@ -17,7 +17,7 @@ public interface RSItemDefinition extends ItemDefinition @Override int getNote(); - @Import("notedId") + @Import("note") @Override int getLinkedNoteId(); diff --git a/runescape-client/src/main/java/Skills.java b/runescape-client/src/main/java/Skills.java index 3482eb1f36..469999c36d 100644 --- a/runescape-client/src/main/java/Skills.java +++ b/runescape-client/src/main/java/Skills.java @@ -61,7 +61,7 @@ public class Skills { var1.__g_428(getItemDefinition(var1.placeholderTemplate), getItemDefinition(var1.placeholder)); } - if(!class30.__ar_l && var1.isMembersOnly) { + if(!class30.inMembersWorld && var1.isMembersOnly) { var1.name = "Members object"; var1.isTradable = false; var1.groundActions = null; diff --git a/runescape-client/src/main/java/class171.java b/runescape-client/src/main/java/class171.java index c1e9afface..b05c100bf3 100644 --- a/runescape-client/src/main/java/class171.java +++ b/runescape-client/src/main/java/class171.java @@ -251,7 +251,7 @@ public class class171 { Font var6 = ScriptEvent.fontPlain11; ItemDefinition.ItemDefinition_indexCache = var3; ItemDefinition.ItemDefinition_modelIndexCache = var4; - class30.__ar_l = var5; + class30.inMembersWorld = var5; class83.__cm_e = ItemDefinition.ItemDefinition_indexCache.__s_396(10); class204.__gx_n = var6; IndexCache var7 = ObjectSound.indexCache2; diff --git a/runescape-client/src/main/java/class30.java b/runescape-client/src/main/java/class30.java index ca1c58090c..5e56ee55cb 100644 --- a/runescape-client/src/main/java/class30.java +++ b/runescape-client/src/main/java/class30.java @@ -28,8 +28,8 @@ public class class30 { @Export("musicTrackArchiveId") public static int musicTrackArchiveId; @ObfuscatedName("l") - @Export("__ar_l") - public static boolean __ar_l; + @Export("inMembersWorld") + public static boolean inMembersWorld; @ObfuscatedName("bd") @ObfuscatedSignature( signature = "[Lln;" diff --git a/runescape-client/src/main/java/class31.java b/runescape-client/src/main/java/class31.java index 9942be4c2f..58fb9b20d4 100644 --- a/runescape-client/src/main/java/class31.java +++ b/runescape-client/src/main/java/class31.java @@ -40,9 +40,9 @@ public class class31 { if(var0.__e_144() != Client.isMembersWorld) { Client.isMembersWorld = var0.__e_144(); boolean var1 = var0.__e_144(); - if(var1 != class30.__ar_l) { + if(var1 != class30.inMembersWorld) { class72.method1780(); - class30.__ar_l = var1; + class30.inMembersWorld = var1; } }