feat: refactor item creators and interactions to include plugin dependency for improved functionality

Pinont · Pinont · commit 1e7df849f5ff · 2025-11-06T15:13:47.000+07:00
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.pinont</groupId>
     <artifactId>singularitylib</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.3.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>SingularityLib</name>
diff --git a/src/main/java/com/github/pinont/plugin/CorePlugin.java b/src/main/java/com/github/pinont/plugin/CorePlugin.java
@@ -1,9 +1,9 @@
-package com.github.pinont.singularitylib.plugin;
+package com.github.pinont.plugin;
 
+import com.github.pinont.plugin.listener.PlayerListener;
 import com.github.pinont.singularitylib.api.command.SimpleCommand;
 import com.github.pinont.singularitylib.api.manager.ConfigManager;
-import com.github.pinont.singularitylib.plugin.listener.PlayerListener;
-import com.github.pinont.singularitylib.plugin.register.Register;
+import com.github.pinont.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/plugin/listener/EntityDamageListener.java
@@ -1,4 +1,4 @@
-package com.github.pinont.singularitylib.plugin.listener;
+package com.github.pinont.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/plugin/listener/PlayerListener.java
@@ -1,12 +1,12 @@
-package com.github.pinont.singularitylib.plugin.listener;
+package com.github.pinont.plugin.listener;
 
 import com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent;
+import com.github.pinont.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;
 import com.github.pinont.singularitylib.api.ui.Menu;
 import com.github.pinont.singularitylib.api.utils.Common;
-import com.github.pinont.singularitylib.plugin.CorePlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Player;
@@ -25,7 +25,7 @@
 import java.util.Objects;
 
 import static com.github.pinont.singularitylib.api.items.ItemInteraction.*;
-import static com.github.pinont.singularitylib.plugin.CorePlugin.*;
+import static com.github.pinont.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/plugin/register/Register.java
@@ -1,4 +1,4 @@
-package com.github.pinont.singularitylib.plugin.register;
+package com.github.pinont.plugin.register;
 
 import com.github.pinont.singularitylib.api.annotation.AutoRegister;
 import com.github.pinont.singularitylib.api.command.SimpleCommand;
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
@@ -8,10 +8,9 @@
 import org.bukkit.util.Vector;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Objects;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage;
+import static com.github.pinont.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
@@ -12,7 +12,7 @@
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage;
+import static com.github.pinont.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
@@ -9,7 +9,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.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
@@ -23,7 +23,7 @@
 
 import java.util.*;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.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
@@ -12,7 +12,7 @@
 import java.util.Objects;
 import java.util.Set;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.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
@@ -10,8 +10,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.getStartTime;
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.plugin.CorePlugin.getStartTime;
+import static com.github.pinont.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
@@ -8,7 +8,7 @@
 import java.io.File;
 import java.io.IOException;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.getInstance;
+import static com.github.pinont.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
@@ -1,23 +1,14 @@
 package com.github.pinont.singularitylib.api.manager;
 
 import com.github.pinont.devtool.api.CItemManager;
-import com.github.pinont.singularitylib.api.command.SimpleCommand;
 import com.github.pinont.singularitylib.api.items.CustomItem;
-import com.github.pinont.singularitylib.api.utils.Common;
-import io.papermc.paper.command.brigadier.CommandSourceStack;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.Plugin;
-import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.getInstance;
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.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
@@ -1,14 +1,14 @@
 package com.github.pinont.singularitylib.api.manager;
 
-import com.github.pinont.singularitylib.plugin.CorePlugin;
+import com.github.pinont.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.singularitylib.plugin.CorePlugin.sendConsoleMessage;
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage;
+import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.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
@@ -6,7 +6,7 @@
 
 import java.util.Objects;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.getInstance;
+import static com.github.pinont.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
@@ -1,7 +1,7 @@
 package com.github.pinont.singularitylib.api.runnable;
 
 import com.github.pinont.singularitylib.api.utils.Common;
-import com.github.pinont.singularitylib.plugin.CorePlugin;
+import com.github.pinont.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
@@ -14,8 +14,8 @@
 import java.util.Arrays;
 import java.util.Objects;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.getInstance;
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage;
+import static com.github.pinont.plugin.CorePlugin.getInstance;
+import static com.github.pinont.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
@@ -2,8 +2,8 @@
 
 import org.bukkit.ChatColor;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage;
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage;
+import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.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
@@ -6,8 +6,8 @@
 
 import java.sql.Connection;
 
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendConsoleMessage;
-import static com.github.pinont.singularitylib.plugin.CorePlugin.sendDebugMessage;
+import static com.github.pinont.plugin.CorePlugin.sendConsoleMessage;
+import static com.github.pinont.plugin.CorePlugin.sendDebugMessage;
 
 /**
  * Utility class for managing MySQL database connections.
diff --git a/src/main/resources/api-version.yml b/src/main/resources/api-version.yml
diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml
@@ -0,0 +1,8 @@
+name: SingularityLib
+version: '1.0-SNAPSHOT'
+main: com.github.pinont.plugin.CorePlugin
+api-version: '1.21'
+prefix: Singularity
+load: STARTUP
+description: A plugin library for Singularity Plugins
+author: Pinont
diff --git 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.singularitylib.plugin.CorePlugin;
+import com.github.pinont.plugin.CorePlugin;
 
 // This is a simple test plugin extending CorePlugin for testing purposes.
 public class TestPlugin extends CorePlugin {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.pinont.singularitylib.plugin.listener;`
	`1`	`+package com.github.pinont.plugin.listener;`
`2`	`2`
`3`	`3`	`import com.github.pinont.singularitylib.api.annotation.AutoRegister;`
`4`	`4`	`import com.github.pinont.singularitylib.api.event.PlayerDamageByPlayerEvent;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.github.pinont.singularitylib.plugin.register;`
	`1`	`+package com.github.pinont.plugin.register;`
`2`	`2`
`3`	`3`	`import com.github.pinont.singularitylib.api.annotation.AutoRegister;`
`4`	`4`	`import com.github.pinont.singularitylib.api.command.SimpleCommand;`