From c82b313473cb8656451eefc543b80154cccb4310 Mon Sep 17 00:00:00 2001 From: PinozenTH Date: Thu, 6 Nov 2025 16:12:46 +0700 Subject: [PATCH] refactor: update package structure to use singularitylib for improved organization --- .../pinont/singularitylib/api/entity/EntityCreator.java | 2 +- .../pinont/singularitylib/api/event/ItemExecuteEvent.java | 2 +- .../singularitylib/api/hook/discordJDA/DiscordApp.java | 2 +- .../github/pinont/singularitylib/api/items/ItemCreator.java | 2 +- .../pinont/singularitylib/api/items/ItemInteraction.java | 2 +- .../pinont/singularitylib/api/manager/CommandManager.java | 4 ++-- .../pinont/singularitylib/api/manager/ConfigManager.java | 2 +- .../singularitylib/api/manager/CustomItemManager.java | 2 +- .../pinont/singularitylib/api/manager/FileManager.java | 6 +++--- .../pinont/singularitylib/api/manager/WorldManager.java | 2 +- .../pinont/singularitylib/api/runnable/Scheduler.java | 2 +- .../java/com/github/pinont/singularitylib/api/ui/Menu.java | 4 ++-- .../com/github/pinont/singularitylib/api/utils/Console.java | 4 ++-- .../com/github/pinont/singularitylib/api/utils/MySQL.java | 4 ++-- .../pinont/{ => singularitylib}/plugin/CorePlugin.java | 6 +++--- .../plugin/listener/EntityDamageListener.java | 2 +- .../plugin/listener/PlayerListener.java | 6 +++--- .../{ => singularitylib}/plugin/register/Register.java | 2 +- src/main/resources/paper-plugin.yml | 2 +- .../java/com/github/pinont/singularitylib/TestPlugin.java | 2 +- 20 files changed, 30 insertions(+), 30 deletions(-) rename src/main/java/com/github/pinont/{ => singularitylib}/plugin/CorePlugin.java (97%) rename src/main/java/com/github/pinont/{ => singularitylib}/plugin/listener/EntityDamageListener.java (92%) rename src/main/java/com/github/pinont/{ => singularitylib}/plugin/listener/PlayerListener.java (97%) rename src/main/java/com/github/pinont/{ => singularitylib}/plugin/register/Register.java (98%) diff --git a/src/main/java/com/github/pinont/singularitylib/api/entity/EntityCreator.java b/src/main/java/com/github/pinont/singularitylib/api/entity/EntityCreator.java index 72445e3..76f0a43 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/entity/EntityCreator.java +++ b/src/main/java/com/github/pinont/singularitylib/api/entity/EntityCreator.java @@ -10,7 +10,7 @@ import java.util.HashMap; import java.util.Objects; -import static com.github.pinont.plugin.CorePlugin.sendDebugMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage; /** * Builder class for creating and configuring entities before spawning them. diff --git a/src/main/java/com/github/pinont/singularitylib/api/event/ItemExecuteEvent.java b/src/main/java/com/github/pinont/singularitylib/api/event/ItemExecuteEvent.java index 562a5fe..acfb2e9 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/event/ItemExecuteEvent.java +++ b/src/main/java/com/github/pinont/singularitylib/api/event/ItemExecuteEvent.java @@ -12,7 +12,7 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; -import static com.github.pinont.plugin.CorePlugin.sendDebugMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage; /** * Event that is fired when a player executes an item interaction. diff --git a/src/main/java/com/github/pinont/singularitylib/api/hook/discordJDA/DiscordApp.java b/src/main/java/com/github/pinont/singularitylib/api/hook/discordJDA/DiscordApp.java index 495a19d..66a3cd1 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/hook/discordJDA/DiscordApp.java +++ b/src/main/java/com/github/pinont/singularitylib/api/hook/discordJDA/DiscordApp.java @@ -9,7 +9,7 @@ import java.util.ArrayList; import java.util.Collections; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; /** * Abstract base class for Discord bot applications using JDA (Java Discord API). diff --git a/src/main/java/com/github/pinont/singularitylib/api/items/ItemCreator.java b/src/main/java/com/github/pinont/singularitylib/api/items/ItemCreator.java index 007cd33..9bd99be 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/items/ItemCreator.java +++ b/src/main/java/com/github/pinont/singularitylib/api/items/ItemCreator.java @@ -23,7 +23,7 @@ import java.util.*; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; /** * Builder class for creating and modifying ItemStacks with enhanced functionality. diff --git a/src/main/java/com/github/pinont/singularitylib/api/items/ItemInteraction.java b/src/main/java/com/github/pinont/singularitylib/api/items/ItemInteraction.java index 32829c4..4ea098c 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/items/ItemInteraction.java +++ b/src/main/java/com/github/pinont/singularitylib/api/items/ItemInteraction.java @@ -12,7 +12,7 @@ import java.util.Objects; import java.util.Set; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; /** * Interface for defining custom item interactions. diff --git a/src/main/java/com/github/pinont/singularitylib/api/manager/CommandManager.java b/src/main/java/com/github/pinont/singularitylib/api/manager/CommandManager.java index eceeefd..bf7ed8e 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/manager/CommandManager.java +++ b/src/main/java/com/github/pinont/singularitylib/api/manager/CommandManager.java @@ -10,8 +10,8 @@ import java.util.Arrays; import java.util.List; -import static com.github.pinont.plugin.CorePlugin.getStartTime; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.getStartTime; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; /** * Manages the registration of commands for the plugin. diff --git a/src/main/java/com/github/pinont/singularitylib/api/manager/ConfigManager.java b/src/main/java/com/github/pinont/singularitylib/api/manager/ConfigManager.java index 1d0dc7f..51465e3 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/manager/ConfigManager.java +++ b/src/main/java/com/github/pinont/singularitylib/api/manager/ConfigManager.java @@ -8,7 +8,7 @@ import java.io.File; import java.io.IOException; -import static com.github.pinont.plugin.CorePlugin.getInstance; +import static com.github.pinont.singularitylib.plugin.CorePlugin.getInstance; /** * Manages configuration files for the plugin. diff --git a/src/main/java/com/github/pinont/singularitylib/api/manager/CustomItemManager.java b/src/main/java/com/github/pinont/singularitylib/api/manager/CustomItemManager.java index 025af1f..d8d7252 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/manager/CustomItemManager.java +++ b/src/main/java/com/github/pinont/singularitylib/api/manager/CustomItemManager.java @@ -8,7 +8,7 @@ import java.util.*; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; /** * Manages custom items and provides a give command for them. diff --git a/src/main/java/com/github/pinont/singularitylib/api/manager/FileManager.java b/src/main/java/com/github/pinont/singularitylib/api/manager/FileManager.java index 2c881b6..1da0143 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/manager/FileManager.java +++ b/src/main/java/com/github/pinont/singularitylib/api/manager/FileManager.java @@ -1,14 +1,14 @@ package com.github.pinont.singularitylib.api.manager; -import com.github.pinont.plugin.CorePlugin; +import com.github.pinont.singularitylib.plugin.CorePlugin; import org.bukkit.plugin.java.JavaPlugin; import java.io.File; import java.util.List; import java.util.Objects; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; -import static com.github.pinont.plugin.CorePlugin.sendDebugMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage; /** * Manages file operations for the plugin. diff --git a/src/main/java/com/github/pinont/singularitylib/api/manager/WorldManager.java b/src/main/java/com/github/pinont/singularitylib/api/manager/WorldManager.java index b2363fe..7593b00 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/manager/WorldManager.java +++ b/src/main/java/com/github/pinont/singularitylib/api/manager/WorldManager.java @@ -6,7 +6,7 @@ import java.util.Objects; -import static com.github.pinont.plugin.CorePlugin.getInstance; +import static com.github.pinont.singularitylib.plugin.CorePlugin.getInstance; /** * Manager class for creating, loading, and managing worlds. diff --git a/src/main/java/com/github/pinont/singularitylib/api/runnable/Scheduler.java b/src/main/java/com/github/pinont/singularitylib/api/runnable/Scheduler.java index 4821eb1..5ced473 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/runnable/Scheduler.java +++ b/src/main/java/com/github/pinont/singularitylib/api/runnable/Scheduler.java @@ -1,7 +1,7 @@ package com.github.pinont.singularitylib.api.runnable; import com.github.pinont.singularitylib.api.utils.Common; -import com.github.pinont.plugin.CorePlugin; +import com.github.pinont.singularitylib.plugin.CorePlugin; import io.papermc.paper.threadedregions.scheduler.*; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/com/github/pinont/singularitylib/api/ui/Menu.java b/src/main/java/com/github/pinont/singularitylib/api/ui/Menu.java index 67fb1c5..1d48db9 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/ui/Menu.java +++ b/src/main/java/com/github/pinont/singularitylib/api/ui/Menu.java @@ -14,8 +14,8 @@ import java.util.Arrays; import java.util.Objects; -import static com.github.pinont.plugin.CorePlugin.getInstance; -import static com.github.pinont.plugin.CorePlugin.sendDebugMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.getInstance; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage; /** * Class for creating and managing custom inventory menus. diff --git a/src/main/java/com/github/pinont/singularitylib/api/utils/Console.java b/src/main/java/com/github/pinont/singularitylib/api/utils/Console.java index c69628f..efd5b21 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/utils/Console.java +++ b/src/main/java/com/github/pinont/singularitylib/api/utils/Console.java @@ -2,8 +2,8 @@ import org.bukkit.ChatColor; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; -import static com.github.pinont.plugin.CorePlugin.sendDebugMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage; /** * Utility class for console logging operations. diff --git a/src/main/java/com/github/pinont/singularitylib/api/utils/MySQL.java b/src/main/java/com/github/pinont/singularitylib/api/utils/MySQL.java index fa305e2..2d54eaa 100644 --- a/src/main/java/com/github/pinont/singularitylib/api/utils/MySQL.java +++ b/src/main/java/com/github/pinont/singularitylib/api/utils/MySQL.java @@ -6,8 +6,8 @@ import java.sql.Connection; -import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage; -import static com.github.pinont.plugin.CorePlugin.sendDebugMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage; +import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage; /** * Utility class for managing MySQL database connections. diff --git a/src/main/java/com/github/pinont/plugin/CorePlugin.java b/src/main/java/com/github/pinont/singularitylib/plugin/CorePlugin.java similarity index 97% rename from src/main/java/com/github/pinont/plugin/CorePlugin.java rename to src/main/java/com/github/pinont/singularitylib/plugin/CorePlugin.java index 97a53c4..1ab4d33 100644 --- a/src/main/java/com/github/pinont/plugin/CorePlugin.java +++ b/src/main/java/com/github/pinont/singularitylib/plugin/CorePlugin.java @@ -1,9 +1,9 @@ -package com.github.pinont.plugin; +package com.github.pinont.singularitylib.plugin; -import com.github.pinont.plugin.listener.PlayerListener; +import com.github.pinont.singularitylib.plugin.listener.PlayerListener; import com.github.pinont.singularitylib.api.command.SimpleCommand; import com.github.pinont.singularitylib.api.manager.ConfigManager; -import com.github.pinont.plugin.register.Register; +import com.github.pinont.singularitylib.plugin.register.Register; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/com/github/pinont/plugin/listener/EntityDamageListener.java b/src/main/java/com/github/pinont/singularitylib/plugin/listener/EntityDamageListener.java similarity index 92% rename from src/main/java/com/github/pinont/plugin/listener/EntityDamageListener.java rename to src/main/java/com/github/pinont/singularitylib/plugin/listener/EntityDamageListener.java index 26ac843..4b51e94 100644 --- a/src/main/java/com/github/pinont/plugin/listener/EntityDamageListener.java +++ b/src/main/java/com/github/pinont/singularitylib/plugin/listener/EntityDamageListener.java @@ -1,4 +1,4 @@ -package com.github.pinont.plugin.listener; +package com.github.pinont.singularitylib.plugin.listener; import com.github.pinont.singularitylib.api.annotation.AutoRegister; import com.github.pinont.singularitylib.api.event.PlayerDamageByPlayerEvent; diff --git a/src/main/java/com/github/pinont/plugin/listener/PlayerListener.java b/src/main/java/com/github/pinont/singularitylib/plugin/listener/PlayerListener.java similarity index 97% rename from src/main/java/com/github/pinont/plugin/listener/PlayerListener.java rename to src/main/java/com/github/pinont/singularitylib/plugin/listener/PlayerListener.java index 3c92151..87de28d 100644 --- a/src/main/java/com/github/pinont/plugin/listener/PlayerListener.java +++ b/src/main/java/com/github/pinont/singularitylib/plugin/listener/PlayerListener.java @@ -1,7 +1,7 @@ -package com.github.pinont.plugin.listener; +package com.github.pinont.singularitylib.plugin.listener; import com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent; -import com.github.pinont.plugin.CorePlugin; +import com.github.pinont.singularitylib.plugin.CorePlugin; import com.github.pinont.singularitylib.api.event.ItemExecuteEvent; import com.github.pinont.singularitylib.api.items.ItemInteraction; import com.github.pinont.singularitylib.api.ui.Button; @@ -25,7 +25,7 @@ import java.util.Objects; import static com.github.pinont.singularitylib.api.items.ItemInteraction.*; -import static com.github.pinont.plugin.CorePlugin.*; +import static com.github.pinont.singularitylib.plugin.CorePlugin.*; /** * Event listener for handling player interactions and menu operations. diff --git a/src/main/java/com/github/pinont/plugin/register/Register.java b/src/main/java/com/github/pinont/singularitylib/plugin/register/Register.java similarity index 98% rename from src/main/java/com/github/pinont/plugin/register/Register.java rename to src/main/java/com/github/pinont/singularitylib/plugin/register/Register.java index 7cfa69e..e5c93e0 100644 --- a/src/main/java/com/github/pinont/plugin/register/Register.java +++ b/src/main/java/com/github/pinont/singularitylib/plugin/register/Register.java @@ -1,4 +1,4 @@ -package com.github.pinont.plugin.register; +package com.github.pinont.singularitylib.plugin.register; import com.github.pinont.singularitylib.api.annotation.AutoRegister; import com.github.pinont.singularitylib.api.command.SimpleCommand; diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index 0c598dc..465582b 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -1,6 +1,6 @@ name: SingularityLib version: '1.0-SNAPSHOT' -main: com.github.pinont.plugin.CorePlugin +main: com.github.pinont.singularitylib.plugin.CorePlugin api-version: '1.21' prefix: Singularity load: STARTUP diff --git a/src/test/java/com/github/pinont/singularitylib/TestPlugin.java b/src/test/java/com/github/pinont/singularitylib/TestPlugin.java index 7f2bf19..7e889c4 100644 --- a/src/test/java/com/github/pinont/singularitylib/TestPlugin.java +++ b/src/test/java/com/github/pinont/singularitylib/TestPlugin.java @@ -1,6 +1,6 @@ package com.github.pinont.singularitylib; -import com.github.pinont.plugin.CorePlugin; +import com.github.pinont.singularitylib.plugin.CorePlugin; // This is a simple test plugin extending CorePlugin for testing purposes. public class TestPlugin extends CorePlugin {