From ed4bff32890f62c6f9e4e63798acbb49d6046233 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 29 Oct 2021 05:27:15 +0200 Subject: [PATCH 1/2] project: Add back this workaround for now --- .../src/main/java/net/runelite/rs/api/RSItemComposition.java | 4 ++++ .../src/main/java/net/runelite/rs/api/RSNPCComposition.java | 4 ++++ .../main/java/net/runelite/rs/api/RSObjectComposition.java | 4 ++++ .../main/java/net/runelite/rs/api/RSStructComposition.java | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java index 90c8b3bc89..68c5bfacf6 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSItemComposition.java @@ -1,6 +1,7 @@ package net.runelite.rs.api; import net.runelite.api.ItemComposition; +import net.runelite.api.IterableHashTable; import net.runelite.mapping.Import; public interface RSItemComposition extends ItemComposition @@ -88,6 +89,9 @@ public interface RSItemComposition extends ItemComposition @Import("params") RSIterableNodeHashTable getParams(); + @Import("params") + void setParams(IterableHashTable params); + @Import("params") void setParams(RSIterableNodeHashTable params); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java index adeb25cab7..8aa7e1a7cd 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSNPCComposition.java @@ -1,5 +1,6 @@ package net.runelite.rs.api; +import net.runelite.api.IterableHashTable; import net.runelite.api.NPCComposition; import net.runelite.mapping.Import; @@ -63,6 +64,9 @@ public interface RSNPCComposition extends NPCComposition @Import("params") RSIterableNodeHashTable getParams(); + @Import("params") + void setParams(IterableHashTable params); + @Import("params") void setParams(RSIterableNodeHashTable params); } diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java index 7fa1a822a2..c01c350ce4 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSObjectComposition.java @@ -1,5 +1,6 @@ package net.runelite.rs.api; +import net.runelite.api.IterableHashTable; import net.runelite.api.ObjectComposition; import net.runelite.mapping.Import; @@ -39,6 +40,9 @@ public interface RSObjectComposition extends ObjectComposition @Import("params") RSIterableNodeHashTable getParams(); + @Import("params") + void setParams(IterableHashTable params); + @Import("params") void setParams(RSIterableNodeHashTable params); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSStructComposition.java b/runescape-api/src/main/java/net/runelite/rs/api/RSStructComposition.java index 4016e536f6..f953461f14 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSStructComposition.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSStructComposition.java @@ -1,5 +1,6 @@ package net.runelite.rs.api; +import net.runelite.api.IterableHashTable; import net.runelite.api.StructComposition; import net.runelite.mapping.Import; @@ -11,6 +12,9 @@ public interface RSStructComposition extends StructComposition @Import("params") RSIterableNodeHashTable getParams(); + @Import("params") + void setParams(IterableHashTable params); + @Import("params") void setParams(RSIterableNodeHashTable params); } From 5c574487052910ede682ee10e69baaf8b41e4128 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Fri, 29 Oct 2021 05:29:40 +0200 Subject: [PATCH 2/2] project: Bump OpenOSRS version --- buildSrc/src/main/kotlin/Dependencies.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index ae12e77cd8..388570a832 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -27,7 +27,7 @@ object ProjectVersions { const val launcherVersion = "2.2.0" const val rlVersion = "1.8.0" - const val openosrsVersion = "4.13.1" + const val openosrsVersion = "4.13.2" const val rsversion = 200 const val cacheversion = 165