relocate spigot-placeholder-leaderboard as a standalone plugin

HSGamer · HSGamer · commit f0812eaec133 · 2023-04-04T09:45:18.000+07:00
diff --git a/spigot-placeholder-leaderboard/pom.xml b/spigot-placeholder-leaderboard/pom.xml
@@ -34,13 +34,25 @@
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <minimizeJar>false</minimizeJar>
                             <relocations>
+                                <relocation>
+                                    <pattern>me.hsgamer.topper.spigot</pattern>
+                                    <shadedPattern>me.hsgamer.topper.placeholderleaderboard.core</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>me.hsgamer.topper.core</pattern>
+                                    <shadedPattern>me.hsgamer.topper.placeholderleaderboard.core</shadedPattern>
+                                </relocation>
+                                <relocation>
+                                    <pattern>me.hsgamer.topper.extra</pattern>
+                                    <shadedPattern>me.hsgamer.topper.placeholderleaderboard.core</shadedPattern>
+                                </relocation>
                                 <relocation>
                                     <pattern>me.hsgamer.hscore</pattern>
-                                    <shadedPattern>me.hsgamer.topper.lib.core</shadedPattern>
+                                    <shadedPattern>me.hsgamer.topper.placeholderleaderboard.lib.core</shadedPattern>
                                 </relocation>
                                 <relocation>
                                     <pattern>org.bstats</pattern>
-                                    <shadedPattern>me.hsgamer.topper.lib.bstats</shadedPattern>
+                                    <shadedPattern>me.hsgamer.topper.placeholderleaderboard.lib.bstats</shadedPattern>
                                 </relocation>
                             </relocations>
                             <filters>
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/Permissions.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/Permissions.java
@@ -1,4 +1,4 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard;
+package me.hsgamer.topper.placeholderleaderboard;
 
 import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/TopperPlaceholderLeaderboard.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/TopperPlaceholderLeaderboard.java
@@ -1,25 +1,25 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard;
+package me.hsgamer.topper.placeholderleaderboard;
 
 import me.hsgamer.hscore.bukkit.baseplugin.BasePlugin;
 import me.hsgamer.hscore.bukkit.config.BukkitConfig;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.hscore.checker.spigotmc.SpigotVersionChecker;
 import me.hsgamer.hscore.config.proxy.ConfigGenerator;
+import me.hsgamer.topper.placeholderleaderboard.command.GetTopListCommand;
+import me.hsgamer.topper.placeholderleaderboard.command.ReloadCommand;
+import me.hsgamer.topper.placeholderleaderboard.command.SetTopSignCommand;
+import me.hsgamer.topper.placeholderleaderboard.command.SetTopSkullCommand;
+import me.hsgamer.topper.placeholderleaderboard.config.MainConfig;
+import me.hsgamer.topper.placeholderleaderboard.config.MessageConfig;
+import me.hsgamer.topper.placeholderleaderboard.hook.TopPlaceholderExpansion;
+import me.hsgamer.topper.placeholderleaderboard.listener.JoinListener;
+import me.hsgamer.topper.placeholderleaderboard.manager.SignManager;
+import me.hsgamer.topper.placeholderleaderboard.manager.SkullManager;
+import me.hsgamer.topper.placeholderleaderboard.manager.TopManager;
 import me.hsgamer.topper.spigot.block.BlockEntryConverterRegistry;
 import me.hsgamer.topper.spigot.config.DefaultConverterRegistry;
 import me.hsgamer.topper.spigot.number.NumberConverterRegistry;
 import me.hsgamer.topper.spigot.number.NumberStorageBuilder;
-import me.hsgamer.topper.spigot.placeholderleaderboard.command.GetTopListCommand;
-import me.hsgamer.topper.spigot.placeholderleaderboard.command.ReloadCommand;
-import me.hsgamer.topper.spigot.placeholderleaderboard.command.SetTopSignCommand;
-import me.hsgamer.topper.spigot.placeholderleaderboard.command.SetTopSkullCommand;
-import me.hsgamer.topper.spigot.placeholderleaderboard.config.MainConfig;
-import me.hsgamer.topper.spigot.placeholderleaderboard.config.MessageConfig;
-import me.hsgamer.topper.spigot.placeholderleaderboard.hook.TopPlaceholderExpansion;
-import me.hsgamer.topper.spigot.placeholderleaderboard.listener.JoinListener;
-import me.hsgamer.topper.spigot.placeholderleaderboard.manager.SignManager;
-import me.hsgamer.topper.spigot.placeholderleaderboard.manager.SkullManager;
-import me.hsgamer.topper.spigot.placeholderleaderboard.manager.TopManager;
 import org.bstats.bukkit.Metrics;
 
 import java.io.File;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/GetTopListCommand.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/GetTopListCommand.java
@@ -1,11 +1,11 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.command;
+package me.hsgamer.topper.placeholderleaderboard.command;
 
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.topper.core.entry.DataEntry;
+import me.hsgamer.topper.placeholderleaderboard.Permissions;
 import me.hsgamer.topper.spigot.number.NumberFormatter;
-import me.hsgamer.topper.spigot.placeholderleaderboard.Permissions;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
-import me.hsgamer.topper.spigot.placeholderleaderboard.holder.NumberTopHolder;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.holder.NumberTopHolder;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/ReloadCommand.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/ReloadCommand.java
@@ -1,8 +1,8 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.command;
+package me.hsgamer.topper.placeholderleaderboard.command;
 
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
-import me.hsgamer.topper.spigot.placeholderleaderboard.Permissions;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.Permissions;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/SetTopBlockCommand.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/SetTopBlockCommand.java
@@ -1,9 +1,9 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.command;
+package me.hsgamer.topper.placeholderleaderboard.command;
 
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.topper.spigot.block.BlockEntry;
 import me.hsgamer.topper.spigot.block.BlockManager;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
 import org.bukkit.block.Block;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/SetTopSignCommand.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/SetTopSignCommand.java
@@ -1,8 +1,8 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.command;
+package me.hsgamer.topper.placeholderleaderboard.command;
 
-import me.hsgamer.topper.spigot.placeholderleaderboard.Permissions;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
-import me.hsgamer.topper.spigot.placeholderleaderboard.manager.SignManager;
+import me.hsgamer.topper.placeholderleaderboard.Permissions;
+import me.hsgamer.topper.placeholderleaderboard.manager.SignManager;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
 import org.bukkit.block.Block;
 import org.bukkit.block.Sign;
 import org.bukkit.permissions.Permission;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/SetTopSkullCommand.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/command/SetTopSkullCommand.java
@@ -1,8 +1,8 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.command;
+package me.hsgamer.topper.placeholderleaderboard.command;
 
-import me.hsgamer.topper.spigot.placeholderleaderboard.Permissions;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
-import me.hsgamer.topper.spigot.placeholderleaderboard.manager.SkullManager;
+import me.hsgamer.topper.placeholderleaderboard.Permissions;
+import me.hsgamer.topper.placeholderleaderboard.manager.SkullManager;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
 import org.bukkit.block.Block;
 import org.bukkit.block.Skull;
 import org.bukkit.permissions.Permission;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/config/MainConfig.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/config/MainConfig.java
@@ -1,4 +1,4 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.config;
+package me.hsgamer.topper.placeholderleaderboard.config;
 
 import me.hsgamer.hscore.config.annotation.ConfigPath;
 import me.hsgamer.topper.spigot.number.NumberFormatter;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/config/MessageConfig.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/config/MessageConfig.java
@@ -1,4 +1,4 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.config;
+package me.hsgamer.topper.placeholderleaderboard.config;
 
 import me.hsgamer.hscore.config.annotation.ConfigPath;
 
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/holder/NumberTopHolder.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/holder/NumberTopHolder.java
@@ -1,11 +1,11 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.holder;
+package me.hsgamer.topper.placeholderleaderboard.holder;
 
 import me.hsgamer.hscore.bukkit.scheduler.Scheduler;
 import me.hsgamer.topper.core.agent.snapshot.SnapshotAgent;
 import me.hsgamer.topper.core.agent.storage.StorageAgent;
 import me.hsgamer.topper.core.agent.update.UpdateAgent;
 import me.hsgamer.topper.core.holder.DataWithAgentHolder;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
 import org.bukkit.OfflinePlayer;
 
 import java.util.Optional;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/holder/PlaceholderTopHolder.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/holder/PlaceholderTopHolder.java
@@ -1,8 +1,8 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.holder;
+package me.hsgamer.topper.placeholderleaderboard.holder;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.hsgamer.hscore.bukkit.scheduler.Scheduler;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
 import org.bukkit.OfflinePlayer;
 
 import java.util.Optional;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/hook/TopPlaceholderExpansion.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/hook/TopPlaceholderExpansion.java
@@ -1,10 +1,10 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.hook;
+package me.hsgamer.topper.placeholderleaderboard.hook;
 
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import me.hsgamer.topper.core.entry.DataEntry;
 import me.hsgamer.topper.spigot.number.NumberFormatter;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
-import me.hsgamer.topper.spigot.placeholderleaderboard.holder.NumberTopHolder;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.holder.NumberTopHolder;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.jetbrains.annotations.NotNull;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/listener/JoinListener.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/listener/JoinListener.java
@@ -1,6 +1,6 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.listener;
+package me.hsgamer.topper.placeholderleaderboard.listener;
 
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/manager/SignManager.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/manager/SignManager.java
@@ -1,18 +1,18 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.manager;
+package me.hsgamer.topper.placeholderleaderboard.manager;
 
 import me.hsgamer.hscore.bukkit.config.BukkitConfig;
 import me.hsgamer.hscore.bukkit.utils.ColorUtils;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
 import me.hsgamer.hscore.config.Config;
 import me.hsgamer.hscore.config.proxy.ConfigGenerator;
 import me.hsgamer.topper.core.entry.DataEntry;
+import me.hsgamer.topper.placeholderleaderboard.Permissions;
 import me.hsgamer.topper.spigot.block.BlockEntry;
 import me.hsgamer.topper.spigot.block.BlockEntryConfig;
 import me.hsgamer.topper.spigot.block.BlockManager;
 import me.hsgamer.topper.spigot.number.NumberFormatter;
-import me.hsgamer.topper.spigot.placeholderleaderboard.Permissions;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
-import me.hsgamer.topper.spigot.placeholderleaderboard.holder.NumberTopHolder;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.holder.NumberTopHolder;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/manager/SkullManager.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/manager/SkullManager.java
@@ -1,4 +1,4 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.manager;
+package me.hsgamer.topper.placeholderleaderboard.manager;
 
 import me.hsgamer.hscore.bukkit.config.BukkitConfig;
 import me.hsgamer.hscore.bukkit.utils.MessageUtils;
@@ -8,9 +8,9 @@
 import me.hsgamer.topper.spigot.block.BlockEntry;
 import me.hsgamer.topper.spigot.block.BlockEntryConfig;
 import me.hsgamer.topper.spigot.block.BlockManager;
-import me.hsgamer.topper.spigot.placeholderleaderboard.Permissions;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
-import me.hsgamer.topper.spigot.placeholderleaderboard.holder.NumberTopHolder;
+import me.hsgamer.topper.placeholderleaderboard.Permissions;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.holder.NumberTopHolder;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
diff --git a/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/manager/TopManager.java b/spigot-placeholder-leaderboard/src/main/java/me/hsgamer/topper/placeholderleaderboard/manager/TopManager.java
@@ -1,11 +1,11 @@
-package me.hsgamer.topper.spigot.placeholderleaderboard.manager;
+package me.hsgamer.topper.placeholderleaderboard.manager;
 
 import me.hsgamer.topper.core.holder.DataHolder;
 import me.hsgamer.topper.core.storage.DataStorage;
 import me.hsgamer.topper.spigot.number.NumberFormatter;
-import me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard;
-import me.hsgamer.topper.spigot.placeholderleaderboard.holder.NumberTopHolder;
-import me.hsgamer.topper.spigot.placeholderleaderboard.holder.PlaceholderTopHolder;
+import me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard;
+import me.hsgamer.topper.placeholderleaderboard.holder.NumberTopHolder;
+import me.hsgamer.topper.placeholderleaderboard.holder.PlaceholderTopHolder;
 
 import java.util.*;
 import java.util.function.Function;
diff --git a/spigot-placeholder-leaderboard/src/main/resources/plugin.yml b/spigot-placeholder-leaderboard/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Topper
 version: '${project.version}'
-main: me.hsgamer.topper.spigot.placeholderleaderboard.TopperPlaceholderLeaderboard
+main: me.hsgamer.topper.placeholderleaderboard.TopperPlaceholderLeaderboard
 api-version: 1.13
 depend: [ PlaceholderAPI ]
 folia-supported: true

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package me.hsgamer.topper.spigot.placeholderleaderboard;`
	`1`	`+package me.hsgamer.topper.placeholderleaderboard;`
`2`	`2`
`3`	`3`	`import org.bukkit.permissions.Permission;`
`4`	`4`	`import org.bukkit.permissions.PermissionDefault;`