From 97732331f9fc9b5614a86a6ebb2df5e1aa2d5545 Mon Sep 17 00:00:00 2001 From: Pyrbu Date: Fri, 17 May 2024 04:56:15 +0200 Subject: [PATCH] disable library loader and shade in dependencies (stupid paper remapper) --- plugin/build.gradle | 20 +++++++++---------- .../lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java | 3 ++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/plugin/build.gradle b/plugin/build.gradle index 3364faf..075bb42 100644 --- a/plugin/build.gradle +++ b/plugin/build.gradle @@ -6,9 +6,9 @@ plugins { runServer { javaLauncher = javaToolchains.launcherFor { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } - minecraftVersion "1.20.4" + minecraftVersion "1.20.6" } processResources { @@ -17,16 +17,16 @@ processResources { dependencies { compileOnly "me.clip:placeholderapi:2.11.5" // Placeholder support - compileOnly "com.google.code.gson:gson:2.10.1" // JSON parsing - compileOnly "org.bstats:bstats-bukkit:3.0.2" // Plugin stats - compileOnly "me.robertlit:SpigotResourcesAPI:2.0" // Spigot API wrapper for update checker - compileOnly "com.github.retrooper.packetevents:spigot:2.3.0" // Packets - compileOnly "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1" // Configs - compileOnly "lol.pyr:director-adventure:2.1.1" // Commands + implementation "com.google.code.gson:gson:2.10.1" // JSON parsing + implementation "org.bstats:bstats-bukkit:3.0.2" // Plugin stats + implementation "me.robertlit:SpigotResourcesAPI:2.0" // Spigot API wrapper for update checker + implementation "com.github.retrooper.packetevents:spigot:2.3.0" // Packets + implementation "space.arim.dazzleconf:dazzleconf-ext-snakeyaml:1.2.1" // Configs + implementation "lol.pyr:director-adventure:2.1.1" // Commands // Fancy text library - compileOnly "net.kyori:adventure-platform-bukkit:4.3.2" - compileOnly "net.kyori:adventure-text-minimessage:4.15.0" + implementation "net.kyori:adventure-platform-bukkit:4.3.2" + implementation "net.kyori:adventure-text-minimessage:4.15.0" implementation "me.lucko:jar-relocator:1.7" implementation project(":api") diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java index c18c741..0b209a0 100644 --- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java +++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java @@ -2,7 +2,6 @@ package lol.pyr.znpcsplus; import lol.pyr.director.adventure.command.CommandContext; import lol.pyr.director.common.message.Message; -import lol.pyr.znpcsplus.libraries.LibraryLoader; import lol.pyr.znpcsplus.util.FileUtil; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; @@ -32,6 +31,7 @@ public class ZNpcsPlusBootstrap extends JavaPlugin { Bukkit.getPluginManager().disablePlugin(this); return; } + /* getLogger().info("Downloading and loading libraries, this might take a while if this is the first time you're launching the plugin"); LibraryLoader loader = new LibraryLoader(this, new File(getDataFolder(), "libraries")); @@ -81,6 +81,7 @@ public class ZNpcsPlusBootstrap extends JavaPlugin { loader.deleteUnloadedLibraries(); getLogger().info("Loaded " + loader.loadedLibraryCount() + " libraries!"); + */ zNpcsPlus = new ZNpcsPlus(this); }