chore: use lucko's loader

MystoriaStudios · Nov 7, 2023 · a7e74a7 · a7e74a7
1 parent dc461f2
commit a7e74a7
Show file tree

Hide file tree

Showing 2 changed files with 69 additions and 67 deletions.
diff --git a/paper/api/src/main/kotlin/net/revive/framework/plugin/ExtendedKotlinPlugin.kt b/paper/api/src/main/kotlin/net/revive/framework/plugin/ExtendedKotlinPlugin.kt
@@ -4,6 +4,7 @@ import co.aikar.commands.BaseCommand
 import co.aikar.commands.BukkitCommandManager
 import co.aikar.commands.CommandManager
 import co.aikar.commands.PaperCommandManager
+import me.lucko.helper.maven.LibraryLoader
 import me.lucko.helper.plugin.ExtendedJavaPlugin
 import net.revive.framework.annotation.Listeners
 import net.revive.framework.annotation.Scoreboard
@@ -99,7 +100,8 @@ open class ExtendedKotlinPlugin : ExtendedJavaPlugin(), IConfigProvider {
             return
         }
 
-        MavenLibraryLoader.loadAll(this.classLoader, this::class)
+        //MavenLibraryLoader.loadAll(this.classLoader, this::class)
+        LibraryLoader.loadAll(this::class.java)
 
         this.flavor =
             Flavor.create((Bukkit.getPluginManager().getPlugin(description.name) ?: this)::class, FlavorOptions(logger))

diff --git a/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt b/paper/core/src/main/kotlin/net/revive/framework/PaperFrameworkPlugin.kt
@@ -4,6 +4,8 @@ import co.aikar.commands.CommandManager
 import com.google.common.base.Stopwatch
 import me.lucko.helper.Events
 import me.lucko.helper.internal.HelperImplementationPlugin
+import me.lucko.helper.maven.MavenLibrary
+import me.lucko.helper.maven.Repository
 import me.lucko.helper.plugin.ap.Plugin
 import me.lucko.helper.plugin.ap.PluginDependency
 import net.kyori.adventure.text.Component
@@ -28,8 +30,6 @@ import net.revive.framework.item.FrameworkItemStack
 import net.revive.framework.item.IItemStackProvider
 import net.revive.framework.item.PaperFrameworkItemStack
 import net.revive.framework.item.PaperItemStackProvider
-import net.revive.framework.maven.MavenLibrary
-import net.revive.framework.maven.Repository
 import net.revive.framework.menu.FrameworkMenuHandler
 import net.revive.framework.menu.IMenuHandler
 import net.revive.framework.nms.NMSVersion
@@ -68,111 +68,111 @@ import java.util.concurrent.TimeUnit
 )
 @HelperImplementationPlugin
 @MavenLibrary(
-    "javassist",
-    "javassist",
-    "3.12.1.GA"
+    groupId = "javassist",
+    artifactId = "javassist",
+    version = "3.12.1.GA"
 )
 @MavenLibrary(
-    "net.kyori",
-    "adventure-text-serializer-gson",
-    "4.10.1",
+    groupId = "net.kyori",
+    artifactId = "adventure-text-serializer-gson",
+    version = "4.10.1",
 )
 @MavenLibrary(
-    "net.kyori",
-    "adventure-text-minimessage",
-    "4.10.1"
+    groupId = "net.kyori",
+    artifactId = "adventure-text-minimessage",
+    version = "4.10.1"
 )
 @MavenLibrary(
-    "fr.mrmicky",
-    "fastboard",
-    "2.0.0"
+    groupId = "fr.mrmicky",
+    artifactId = "fastboard",
+    version = "2.0.0"
 )
 @MavenLibrary(
-    "com.github.cryptomorin",
-    "XSeries",
-    "9.5.0"
+    groupId = "com.github.cryptomorin",
+    artifactId = "XSeries",
+    version = "9.5.0"
 )
 @MavenLibrary(
-    "com.squareup.retrofit2",
-    "retrofit",
-    "2.9.0",
+    groupId = "com.squareup.retrofit2",
+    artifactId = "retrofit",
+    version = "2.9.0",
 
 )
 @MavenLibrary(
-    "com.squareup.retrofit2",
-    "converter-gson",
-    "2.9.0"
+    groupId = "com.squareup.retrofit2",
+    artifactId = "converter-gson",
+    version = "2.9.0"
 )
 @MavenLibrary(
-    "io.grpc",
-    "grpc-netty",
-    "1.57.2"
+    groupId = "io.grpc",
+    artifactId = "grpc-netty",
+    version = "1.57.2"
 )
 @MavenLibrary(
-    "io.grpc",
-    "grpc-protobuf",
-    "1.57.2"
+    groupId = "io.grpc",
+    artifactId = "grpc-protobuf",
+    version = "1.57.2"
 )
 @MavenLibrary(
-    "com.google.protobuf",
-    "protobuf-java-util",
-    "3.24.1"
+    groupId = "com.google.protobuf",
+    artifactId = "protobuf-java-util",
+    version = "3.24.1"
 )
 @MavenLibrary(
-    "io.grpc",
-    "grpc-kotlin-stub",
-    "1.4.0"
+    groupId = "io.grpc",
+    artifactId = "grpc-kotlin-stub",
+    version = "1.4.0"
 )
 @MavenLibrary(
-    "org.reflections",
-    "reflections",
-    "0.10.2"
+    groupId = "org.reflections",
+    artifactId = "reflections",
+    version = "0.10.2"
 )
 @MavenLibrary(
-    "com.github.ben-manes.caffeine",
-    "caffeine",
-    "3.1.8"
+    groupId = "com.github.ben-manes.caffeine",
+    artifactId = "caffeine",
+    version = "3.1.8"
 )
 @MavenLibrary(
-    "org.mongodb",
-    "mongo-java-driver",
-    "3.12.11"
+    groupId = "org.mongodb",
+    artifactId = "mongo-java-driver",
+    version = "3.12.11"
 )
 @MavenLibrary(
-    "io.lettuce",
-    "lettuce-core",
-    "6.2.4.RELEASE"
+    groupId = "io.lettuce",
+    artifactId = "lettuce-core",
+    version = "6.2.4.RELEASE"
 )
 @MavenLibrary(
-    "com.google.code.gson",
-    "gson",
-    "2.9.0"
+    groupId = "com.google.code.gson",
+    artifactId = "gson",
+    version = "2.9.0"
 )
 @MavenLibrary(
-    "io.sentry",
-    "sentry",
-    "6.29.0"
+    groupId = "io.sentry",
+    artifactId = "sentry",
+    version = "6.29.0"
 )
 @MavenLibrary(
-    "com.github.docker-java",
-    "docker-java",
-    "3.3.4"
+    groupId = "com.github.docker-java",
+    artifactId = "docker-java",
+    version = "3.3.4"
 )
 @MavenLibrary(
-    "com.github.robinbraemer",
-    "cloudflareapi",
-    "1.4.1",
-    Repository("https://jitpack.io")
+    groupId = "com.github.robinbraemer",
+    artifactId = "cloudflareapi",
+    version = "1.4.1",
+    repo = Repository(url = "https://jitpack.io")
 )
 @MavenLibrary(
-    "com.google.guava",
-    "guava",
-    "31.0.1-jre"
+    groupId = "com.google.guava",
+    artifactId = "guava",
+    version = "31.0.1-jre"
 )
 @MavenLibrary(
-    "commons-io",
-    "commons-io",
-    "2.11.0"
+    groupId = "commons-io",
+    artifactId = "commons-io",
+    version = "2.11.0"
 )
 class PaperFrameworkPlugin : ExtendedKotlinPlugin() {