fix: Fixed Paper 1.20.2 Support

4drian3d · Oct 27, 2023 · fe07351 · fe07351
1 parent 96e8f06
commit fe07351
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -27,8 +27,13 @@ tasks {
     javadoc {
         options {
             this.outputLevel = JavadocOutputLevel.QUIET
+            encoding = Charsets.UTF_8.name()
         }
     }
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(17)
+    }
 }
 
 java {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 group = io.github.4drian3d
-version = 7.5.0
+version = 7.5.1-SNAPSHOT
 description=Bot protection system for Minecraft servers.
 
 org.gradle.caching=true

diff --git a/paper/build.gradle.kts b/paper/build.gradle.kts
@@ -4,6 +4,7 @@ plugins {
 
 dependencies {
     implementation(projects.core)
+    implementation(libs.configurate)
     compileOnly(libs.paper)
 }
 
@@ -19,4 +20,9 @@ tasks {
             expand("version" to project.version)
         }
     }
+    shadowJar {
+        relocate("org.spongepowered", "me.xneox.epicguard.libs.configurate")
+        relocate("com.typesafe", "me.xneox.epicguard.libs.typesafe")
+        relocate("io.leangen.geantyref", "me.xneox.epicguard.libs.geantyref")
+    }
 }
diff --git a/paper/src/main/java/me/xneox/epicguard/paper/LibraryLoader.java b/paper/src/main/java/me/xneox/epicguard/paper/LibraryLoader.java
@@ -12,7 +12,7 @@
 import java.util.stream.Stream;
 
 @SuppressWarnings({"unused", "UnstableApiUsage"})
-public class LibraryLoader implements PluginLoader {
+public final class LibraryLoader implements PluginLoader {
     @Override
     public void classloader(@NotNull PluginClasspathBuilder classpathBuilder) {
         final MavenLibraryResolver resolver = new MavenLibraryResolver();
@@ -23,7 +23,6 @@ public void classloader(@NotNull PluginClasspathBuilder classpathBuilder) {
         resolver.addRepository(mavenCentral);
 
         Stream.of(
-                "org.spongepowered:configurate-hocon:" + VersionUtils.CONFIGURATE,
                 "com.zaxxer:HikariCP:" + VersionUtils.HIKARI,
                 "com.github.ben-manes.caffeine:caffeine:" + VersionUtils.CAFFEINE,
                 "org.apache.commons:commons-compress:" + VersionUtils.COMMANDS_COMPRESS,