refactor: update spawner package structure and rename properties to data for consistency

Author: ptthanh02

core/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     api project(':api')
 
-    compileOnly 'io.papermc.paper:paper-api:1.21.4-R0.1-SNAPSHOT'
+    compileOnly 'io.papermc.paper:paper-api:1.21.8-R0.1-SNAPSHOT'
     // Hook plugins
     compileOnly 'org.geysermc.floodgate:api:2.2.5-SNAPSHOT'
     compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT'
@@ -12,7 +12,6 @@ dependencies {
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1'
     compileOnly 'su.nightexpress.coinsengine:CoinsEngine:2.6.0'
     compileOnly 'com.github.Gypopo:EconomyShopGUI-API:1.9.0'
-    dependabot/gradle/world.bentobox-bentobox-3.9.3-SNAPSHOT
     compileOnly 'world.bentobox:bentobox:3.9.3-SNAPSHOT'
     compileOnly 'su.nightexpress.excellentshop:Core:4.21.2'
     compileOnly("io.github.fabiozumbi12.RedProtect:RedProtect-Core:8.1.2") { exclude(group: "*") }

core/src/main/java/github/nighter/smartspawner/SmartSpawner.java

@@ -10,7 +10,7 @@
 import github.nighter.smartspawner.commands.list.gui.management.SpawnerManagementGUI;
 import github.nighter.smartspawner.commands.list.gui.adminstacker.AdminStackerHandler;
 import github.nighter.smartspawner.commands.prices.PricesGUI;
-import github.nighter.smartspawner.config.MobHeadConfig;
+import github.nighter.smartspawner.spawner.config.MobHeadConfig;
 import github.nighter.smartspawner.logging.LoggingConfig;
 import github.nighter.smartspawner.logging.SpawnerActionLogger;
 import github.nighter.smartspawner.logging.SpawnerAuditListener;
@@ -42,18 +42,18 @@
 import github.nighter.smartspawner.spawner.limits.ChunkSpawnerLimiter;
 import github.nighter.smartspawner.spawner.loot.EntityLootRegistry;
 import github.nighter.smartspawner.spawner.lootgen.SpawnerRangeChecker;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
 import github.nighter.smartspawner.spawner.sell.SpawnerSellManager;
-import github.nighter.smartspawner.spawner.utils.SpawnerFileHandler;
-import github.nighter.smartspawner.spawner.utils.SpawnerMobHeadTexture;
+import github.nighter.smartspawner.spawner.data.SpawnerFileHandler;
+import github.nighter.smartspawner.spawner.config.SpawnerMobHeadTexture;
 import github.nighter.smartspawner.spawner.lootgen.SpawnerLootGenerator;
-import github.nighter.smartspawner.spawner.events.WorldEventHandler;
+import github.nighter.smartspawner.spawner.data.WorldEventHandler;
 import github.nighter.smartspawner.language.LanguageManager;
 import github.nighter.smartspawner.updates.ConfigUpdater;
 import github.nighter.smartspawner.nms.VersionInitializer;
 import github.nighter.smartspawner.updates.LanguageUpdater;
 import github.nighter.smartspawner.updates.UpdateChecker;
-import github.nighter.smartspawner.utils.SpawnerTypeChecker;
+import github.nighter.smartspawner.spawner.utils.SpawnerTypeChecker;
 
 import lombok.Getter;
 import lombok.experimental.Accessors;

core/src/main/java/github/nighter/smartspawner/commands/hologram/HologramSubCommand.java

@@ -4,11 +4,10 @@
 import com.mojang.brigadier.context.CommandContext;
 import github.nighter.smartspawner.SmartSpawner;
 import github.nighter.smartspawner.commands.BaseSubCommand;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.Commands;
 import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked

core/src/main/java/github/nighter/smartspawner/commands/list/ListSubCommand.java

@@ -12,8 +12,8 @@
 import github.nighter.smartspawner.language.LanguageManager;
 import github.nighter.smartspawner.language.MessageService;
 import github.nighter.smartspawner.spawner.properties.SpawnerData;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
-import github.nighter.smartspawner.spawner.utils.SpawnerMobHeadTexture;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
+import github.nighter.smartspawner.spawner.config.SpawnerMobHeadTexture;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.datacomponent.DataComponentType;
 import io.papermc.paper.datacomponent.DataComponentTypes;

core/src/main/java/github/nighter/smartspawner/commands/list/gui/adminstacker/AdminStackerHandler.java

@@ -4,7 +4,7 @@
 import github.nighter.smartspawner.commands.list.gui.management.SpawnerManagementGUI;
 import github.nighter.smartspawner.language.MessageService;
 import github.nighter.smartspawner.spawner.properties.SpawnerData;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
 import org.bukkit.Sound;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

core/src/main/java/github/nighter/smartspawner/commands/list/gui/list/SpawnerListGUI.java

@@ -8,7 +8,7 @@
 import github.nighter.smartspawner.language.LanguageManager;
 import github.nighter.smartspawner.language.MessageService;
 import github.nighter.smartspawner.spawner.properties.SpawnerData;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
 import org.bukkit.*;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

core/src/main/java/github/nighter/smartspawner/commands/list/gui/management/SpawnerManagementGUI.java

@@ -4,7 +4,7 @@
 import github.nighter.smartspawner.language.LanguageManager;
 import github.nighter.smartspawner.language.MessageService;
 import github.nighter.smartspawner.spawner.properties.SpawnerData;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
 import io.papermc.paper.datacomponent.DataComponentType;
 import io.papermc.paper.datacomponent.DataComponentTypes;
 import io.papermc.paper.datacomponent.item.TooltipDisplay;
@@ -21,9 +21,7 @@
 import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 public class SpawnerManagementGUI {

core/src/main/java/github/nighter/smartspawner/commands/list/gui/management/SpawnerManagementHandler.java

@@ -8,8 +8,8 @@
 import github.nighter.smartspawner.language.MessageService;
 import github.nighter.smartspawner.spawner.gui.main.SpawnerMenuUI;
 import github.nighter.smartspawner.spawner.properties.SpawnerData;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
-import github.nighter.smartspawner.spawner.utils.SpawnerFileHandler;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
+import github.nighter.smartspawner.spawner.data.SpawnerFileHandler;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;

core/src/main/java/github/nighter/smartspawner/extras/HopperHandler.java

@@ -3,8 +3,7 @@
 import github.nighter.smartspawner.SmartSpawner;
 import github.nighter.smartspawner.Scheduler;
 import github.nighter.smartspawner.spawner.gui.synchronization.SpawnerGuiViewManager;
-import github.nighter.smartspawner.language.LanguageManager;
-import github.nighter.smartspawner.spawner.properties.SpawnerManager;
+import github.nighter.smartspawner.spawner.data.SpawnerManager;
 import github.nighter.smartspawner.spawner.properties.VirtualInventory;
 import github.nighter.smartspawner.spawner.properties.SpawnerData;
 import org.bukkit.*;

…r/smartspawner/config/MobHeadConfig.java …pawner/spawner/config/MobHeadConfig.javacore/src/main/java/github/nighter/smartspawner/config/MobHeadConfig.java renamed to core/src/main/java/github/nighter/smartspawner/spawner/config/MobHeadConfig.java core/src/main/java/github/nighter/smartspawner/config/MobHeadConfig.java renamed to core/src/main/java/github/nighter/smartspawner/spawner/config/MobHeadConfig.java

@@ -1,4 +1,4 @@
-package github.nighter.smartspawner.config;
+package github.nighter.smartspawner.spawner.config;
 
 import github.nighter.smartspawner.SmartSpawner;
 import org.bukkit.Material;
@@ -121,7 +121,7 @@ private void parseConfig() {
             }
         }
 
-        plugin.getLogger().info("Loaded " + mobHeadMap.size() + " mob head configurations");
+        // plugin.getLogger().info("Loaded " + mobHeadMap.size() + " mob head configurations");
     }
 
     /**
@@ -156,16 +156,7 @@ public boolean hasCustomTexture(EntityType entityType) {
         MobHeadData data = mobHeadMap.get(entityType);
         return data != null && data.customTexture != null && !data.customTexture.isEmpty();
     }
-    
-    /**
-     * Get the default material for mobs without custom configuration
-     * 
-     * @return Default material
-     */
-    public Material getDefaultMaterial() {
-        return defaultMaterial;
-    }
-    
+
     /**
      * Reload the configuration
      */