From 24a26cfb04d231904df37a0706a6b9324f5dba7a Mon Sep 17 00:00:00 2001
From: Pyrbu <pyrmcserver@gmail.com>
Date: Mon, 16 Oct 2023 04:37:12 +0200
Subject: [PATCH] change the relocation package names to make the package
 layout nicer in the final jar

---
 plugin/build.gradle                           | 24 +++++++++----------
 .../lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java | 20 ++++++++--------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/plugin/build.gradle b/plugin/build.gradle
index 670d8a4..a1a44b4 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -36,20 +36,20 @@ shadowJar {
     archivesBaseName = "ZNPCsPlus"
     archiveClassifier.set ""
 
-    relocate "org.objectweb.asm", "lol.pyr.znpcsplus.lib.asm"
-    relocate "me.lucko.jarrelocator", "lol.pyr.znpcsplus.lib.jarrelocator"
+    relocate "org.objectweb.asm", "lol.pyr.znpcsplus.libraries.asm"
+    relocate "me.lucko.jarrelocator", "lol.pyr.znpcsplus.libraries.jarrelocator"
 
     // When changing anything here remember to also update the bootstrap
-    relocate "org.bstats", "lol.pyr.znpcsplus.lib.bstats"
-    relocate "me.robertlit.spigotresources", "lol.pyr.znpcsplus.lib.spigotresources"
-    relocate "net.kyori", "lol.pyr.znpcsplus.lib.kyori"
-    relocate "org.checkerframework", "lol.pyr.znpcsplus.lib.checkerframework"
-    relocate "com.google", "lol.pyr.znpcsplus.lib.google"
-    relocate "com.github.retrooper.packetevents", "lol.pyr.znpcsplus.lib.packetevents.api"
-    relocate "io.github.retrooper.packetevents", "lol.pyr.znpcsplus.lib.packetevents.impl"
-    relocate "org.yaml.snakeyaml", "lol.pyr.znpcsplus.lib.snakeyaml"
-    relocate "space.arim.dazzleconf", "lol.pyr.znpcsplus.lib.dazzleconf"
-    relocate "lol.pyr.director", "lol.pyr.znpcsplus.lib.command"
+    relocate "org.bstats", "lol.pyr.znpcsplus.libraries.bstats"
+    relocate "me.robertlit.spigotresources", "lol.pyr.znpcsplus.libraries.spigotresources"
+    relocate "net.kyori", "lol.pyr.znpcsplus.libraries.kyori"
+    relocate "org.checkerframework", "lol.pyr.znpcsplus.libraries.checkerframework"
+    relocate "com.google", "lol.pyr.znpcsplus.libraries.google"
+    relocate "com.github.retrooper.packetevents", "lol.pyr.znpcsplus.libraries.packetevents.api"
+    relocate "io.github.retrooper.packetevents", "lol.pyr.znpcsplus.libraries.packetevents.impl"
+    relocate "org.yaml.snakeyaml", "lol.pyr.znpcsplus.libraries.snakeyaml"
+    relocate "space.arim.dazzleconf", "lol.pyr.znpcsplus.libraries.dazzleconf"
+    relocate "lol.pyr.director", "lol.pyr.znpcsplus.libraries.command"
 
     minimize()
 }
diff --git a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java
index 867b36b..5b5cf47 100644
--- a/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java
+++ b/plugin/src/main/java/lol/pyr/znpcsplus/ZNpcsPlusBootstrap.java
@@ -19,16 +19,16 @@ public class ZNpcsPlusBootstrap extends JavaPlugin {
         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"));
 
-        loader.addRelocation(decrypt("org..bstats"), "lol.pyr.znpcsplus.lib.bstats");
-        loader.addRelocation(decrypt("me..robertlit..spigotresources"), "lol.pyr.znpcsplus.lib.spigotresources");
-        loader.addRelocation(decrypt("net..kyori"), "lol.pyr.znpcsplus.lib.kyori");
-        loader.addRelocation(decrypt("org..checkerframework"), "lol.pyr.znpcsplus.lib.checkerframework");
-        loader.addRelocation(decrypt("com..google"), "lol.pyr.znpcsplus.lib.google");
-        loader.addRelocation(decrypt("com..github..retrooper..packetevents"), "lol.pyr.znpcsplus.lib.packetevents.api");
-        loader.addRelocation(decrypt("io..github..retrooper..packetevents"), "lol.pyr.znpcsplus.lib.packetevents.impl");
-        loader.addRelocation(decrypt("org..yaml..snakeyaml"), "lol.pyr.znpcsplus.lib.snakeyaml");
-        loader.addRelocation(decrypt("space..arim..dazzleconf"), "lol.pyr.znpcsplus.lib.dazzleconf");
-        loader.addRelocation(decrypt("lol..pyr..director"), "lol.pyr.znpcsplus.lib.command");
+        loader.addRelocation(decrypt("org..bstats"), "lol.pyr.znpcsplus.libraries.bstats");
+        loader.addRelocation(decrypt("me..robertlit..spigotresources"), "lol.pyr.znpcsplus.libraries.spigotresources");
+        loader.addRelocation(decrypt("net..kyori"), "lol.pyr.znpcsplus.libraries.kyori");
+        loader.addRelocation(decrypt("org..checkerframework"), "lol.pyr.znpcsplus.libraries.checkerframework");
+        loader.addRelocation(decrypt("com..google"), "lol.pyr.znpcsplus.libraries.google");
+        loader.addRelocation(decrypt("com..github..retrooper..packetevents"), "lol.pyr.znpcsplus.libraries.packetevents.api");
+        loader.addRelocation(decrypt("io..github..retrooper..packetevents"), "lol.pyr.znpcsplus.libraries.packetevents.impl");
+        loader.addRelocation(decrypt("org..yaml..snakeyaml"), "lol.pyr.znpcsplus.libraries.snakeyaml");
+        loader.addRelocation(decrypt("space..arim..dazzleconf"), "lol.pyr.znpcsplus.libraries.dazzleconf");
+        loader.addRelocation(decrypt("lol..pyr..director"), "lol.pyr.znpcsplus.libraries.command");
         
         loader.loadLibrary(decrypt("com..google..guava"), "guava", "18.0");
         loader.loadLibrary(decrypt("com..google..code..gson"), "gson", "2.10.1");