From d99109c7474eb6d6cf5a7e392886b15bfa82afec Mon Sep 17 00:00:00 2001
From: Alex Nijjar <alexander.nijjar@icloud.com>
Date: Fri, 20 Oct 2023 14:01:58 -0500
Subject: [PATCH] Fix NoClassDefFoundError on forge from RLib

---
 changelog.md                                                | 4 +---
 .../argonauts/api/client/party/PartyClientApi.java          | 6 +++---
 .../java/earth/terrarium/argonauts/api/party/PartyApi.java  | 6 +++---
 fabric/gradle.properties                                    | 4 ++--
 forge/build.gradle.kts                                      | 3 +++
 forge/gradle.properties                                     | 2 +-
 gradle.properties                                           | 2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/changelog.md b/changelog.md
index e7e68ae..472edeb 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1 @@
-- Fix friendly fire not doing anything in parties
-- Fix party settings command setting incorrect values
-- Remove Admin claiming commands as they are now part of Cadmus
\ No newline at end of file
+- Add guild and party client API (#9)
\ No newline at end of file
diff --git a/common/src/main/java/earth/terrarium/argonauts/api/client/party/PartyClientApi.java b/common/src/main/java/earth/terrarium/argonauts/api/client/party/PartyClientApi.java
index 7e46b28..9ae98cf 100644
--- a/common/src/main/java/earth/terrarium/argonauts/api/client/party/PartyClientApi.java
+++ b/common/src/main/java/earth/terrarium/argonauts/api/client/party/PartyClientApi.java
@@ -16,7 +16,7 @@ public interface PartyClientApi {
      * Gets the party with the given id.
      *
      * @param id The id of the party.
-     * @return The party with the given id.
+     * @return The party with the given id, or null if the party does not exist.
      */
     @Nullable
     Party get(UUID id);
@@ -25,7 +25,7 @@ public interface PartyClientApi {
      * Gets the party the player is in.
      *
      * @param player The player to get the party for.
-     * @return The party the player is in.
+     * @return The party the player is in, or null if the player is not in a party.
      */
     @Nullable
     Party getPlayerParty(LocalPlayer player);
@@ -34,7 +34,7 @@ public interface PartyClientApi {
      * Gets the party the player is in.
      *
      * @param player The player to get the party for.
-     * @return The party the player is in.
+     * @return The party the player is in, or null if the player is not in a party.
      */
     @Nullable
     Party getPlayerParty(UUID player);
diff --git a/common/src/main/java/earth/terrarium/argonauts/api/party/PartyApi.java b/common/src/main/java/earth/terrarium/argonauts/api/party/PartyApi.java
index 15ed13b..9cbf495 100644
--- a/common/src/main/java/earth/terrarium/argonauts/api/party/PartyApi.java
+++ b/common/src/main/java/earth/terrarium/argonauts/api/party/PartyApi.java
@@ -36,7 +36,7 @@ default void createParty(Player player) throws MemberException {
      * Gets the party with the given id.
      *
      * @param id The id of the party.
-     * @return The party with the given id.
+     * @return The party with the given id, or null if the party does not exist.
      */
     @Nullable
     Party get(UUID id);
@@ -45,7 +45,7 @@ default void createParty(Player player) throws MemberException {
      * Gets the party the player is in.
      *
      * @param player The player to get the party for.
-     * @return The party the player is in.
+     * @return The party the player is in, or null if the player is not in a party.
      */
     @Nullable
     Party get(Player player);
@@ -54,7 +54,7 @@ default void createParty(Player player) throws MemberException {
      * Gets the party the player is in.
      *
      * @param player The player to get the party for.
-     * @return The party the player is in.
+     * @return The party the player is in, or null if the player is not in a party.
      */
     @Nullable
     Party getPlayerParty(UUID player);
diff --git a/fabric/gradle.properties b/fabric/gradle.properties
index f3ea3e6..506855c 100644
--- a/fabric/gradle.properties
+++ b/fabric/gradle.properties
@@ -1,4 +1,4 @@
-fabricLoaderVersion=0.14.21
-fabricApiVersion=0.85.0
+fabricLoaderVersion=0.14.23
+fabricApiVersion=0.90.0
 
 placeholderApiVersion=2.1.1
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
index 300a30e..240e6ad 100644
--- a/forge/build.gradle.kts
+++ b/forge/build.gradle.kts
@@ -30,6 +30,9 @@ dependencies {
     shadowCommon(project(path = ":common", configuration = "transformProductionForge")) {
         isTransitive = false
     }
+
+    forgeRuntimeLibrary("com.teamresourceful:yabn:1.0.3")
+    forgeRuntimeLibrary("com.teamresourceful:bytecodecs:1.0.2")
 }
 
 tasks.processResources {
diff --git a/forge/gradle.properties b/forge/gradle.properties
index 0a7c6b1..09490da 100644
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1,2 +1,2 @@
 loom.platform=forge
-forgeVersion=47.0.19
+forgeVersion=47.1.3
diff --git a/gradle.properties b/gradle.properties
index 84d8f38..1dcc00b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,5 +12,5 @@ mixinExtrasVersion=0.2.0-beta.8
 resourcefulLibVersion=2.1.11
 
 cadmusVersion=1.0.2
-heraclesVersion=1.0.3
+heraclesVersion=1.0.5
 reiVersion=12.0.652