From 3c12a31ead109c11af7290d13e87651cff796b6c Mon Sep 17 00:00:00 2001
From: Luck <git@lucko.me>
Date: Fri, 9 Jul 2021 13:34:58 +0100
Subject: Fix Sponge API 8 platform build config

---
 spark-sponge8/build.gradle                                  |  7 ++++++-
 .../java/me/lucko/spark/sponge/Sponge8CommandSender.java    | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

(limited to 'spark-sponge8')

diff --git a/spark-sponge8/build.gradle b/spark-sponge8/build.gradle
index 4f23011..80fbd04 100644
--- a/spark-sponge8/build.gradle
+++ b/spark-sponge8/build.gradle
@@ -15,7 +15,7 @@ processResources {
     from(sourceSets.main.resources.srcDirs) {
         include 'META-INF/plugins.json'
         expand (
-                version: project.version,
+                version: project.pluginVersion,
                 description: project.pluginDescription
         )
     }
@@ -24,8 +24,13 @@ processResources {
 shadowJar {
     archiveFileName = 'spark-sponge8.jar'
 
+    dependencies {
+        exclude(dependency('net.kyori:^(?!adventure-text-feature-pagination).+$'))
+    }
+
     relocate 'okio', 'me.lucko.spark.lib.okio'
     relocate 'okhttp3', 'me.lucko.spark.lib.okhttp3'
+    relocate 'net.kyori.adventure.text.feature.pagination', 'me.lucko.spark.lib.adventure.pagination'
     relocate 'net.bytebuddy', 'me.lucko.spark.lib.bytebuddy'
     relocate 'org.tukaani.xz', 'me.lucko.spark.lib.xz'
     relocate 'com.google.protobuf', 'me.lucko.spark.lib.protobuf'
diff --git a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
index 60a4b8f..5e7a65a 100644
--- a/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
+++ b/spark-sponge8/src/main/java/me/lucko/spark/sponge/Sponge8CommandSender.java
@@ -79,4 +79,17 @@ public class Sponge8CommandSender extends AbstractCommandSender<Subject> {
     public boolean hasPermission(String permission) {
         return super.delegate.hasPermission(permission);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Sponge8CommandSender that = (Sponge8CommandSender) o;
+        return this.getUniqueId().equals(that.getUniqueId());
+    }
+
+    @Override
+    public int hashCode() {
+        return getUniqueId().hashCode();
+    }
 }
-- 
cgit