Added advanced natural spawner config

Author: ptthanh02

NMS/v1_21_6/build.gradle

@@ -0,0 +1,11 @@
+plugins {
+    id 'java-library'
+}
+
+group 'NMS:v1_21_6'
+
+dependencies {
+    implementation project(':core')
+    implementation project(':api')
+    compileOnly 'io.papermc.paper:paper-api:1.21.6-R0.1-SNAPSHOT'
+}

NMS/v1_21_6/src/main/java/github/nighter/smartspawner/v1_21_6/ParticleInitializer.java

@@ -0,0 +1,11 @@
+package github.nighter.smartspawner.v1_21_6;
+
+import github.nighter.smartspawner.nms.ParticleWrapper;
+import org.bukkit.Particle;
+
+public class ParticleInitializer {
+    public static void init() {
+        ParticleWrapper.VILLAGER_HAPPY = Particle.HAPPY_VILLAGER;
+        ParticleWrapper.SPELL_WITCH = Particle.WITCH;
+    }
+}

NMS/v1_21_6/src/main/java/github/nighter/smartspawner/v1_21_6/SpawnerInitializer.java

@@ -0,0 +1,12 @@
+package github.nighter.smartspawner.v1_21_6;
+import org.bukkit.entity.EntityType;
+import github.nighter.smartspawner.nms.SpawnerWrapper;
+import java.util.Arrays;
+
+public class SpawnerInitializer {
+    public static void init() {
+        SpawnerWrapper.SUPPORTED_MOBS = Arrays.stream(EntityType.values())
+                .map(EntityType::name)
+                .toList();
+    }
+}

NMS/v1_21_6/src/main/java/github/nighter/smartspawner/v1_21_6/TextureInitializer.java

@@ -0,0 +1,37 @@
+package github.nighter.smartspawner.v1_21_6;
+
+import github.nighter.smartspawner.nms.TextureWrapper;
+import org.bukkit.entity.EntityType;
+
+public class TextureInitializer {
+    public static void init() {
+        TextureWrapper.addVersionSpecificTexture(
+                EntityType.ARMADILLO,
+                "9164ed0e0ef69b0ce7815e4300b4413a4828fcb0092918543545a418a48e0c3c"
+        );
+        TextureWrapper.addVersionSpecificTexture(
+                EntityType.BOGGED,
+                "a3b9003ba2d05562c75119b8a62185c67130e9282f7acbac4bc2824c21eb95d9"
+        );
+        TextureWrapper.addVersionSpecificTexture(
+                EntityType.BREEZE,
+                "a275728af7e6a29c88125b675a39d88ae9919bb61fdc200337fed6ab0c49d65c"
+        );
+        TextureWrapper.addVersionSpecificTexture(
+                EntityType.MOOSHROOM,
+                "45603d539f666fdf0f7a0fe20b81dfef3abe6c51da34b9525a5348432c5523b2"
+        );
+        TextureWrapper.addVersionSpecificTexture(
+                EntityType.SNOW_GOLEM,
+                "1fdfd1f7538c040258be7a91446da89ed845cc5ef728eb5e690543378fcf4"
+        );
+        TextureWrapper.addVersionSpecificTexture(
+                EntityType.CREAKING,
+                "ac91c87bbe7f4c586e0f8b60f9b76d173a41daa302944531703be9ff4fd117f8"
+        );
+        TextureWrapper.addVersionSpecificTexture(
+                EntityType.HAPPY_GHAST,
+                "a1a36cb93d01675c4622dd5c8d872110911ec12c372e89afa8ba03862867f6fb"
+        );
+    }
+}

core/build.gradle

@@ -40,6 +40,7 @@ jar {
     from { project(':NMS:v1_20').sourceSets.main.output }
     from { project(':NMS:v1_21').sourceSets.main.output }
     from { project(':NMS:v1_21_4').sourceSets.main.output }
+    from { project(':NMS:v1_21_6').sourceSets.main.output }
 
     // destinationDirectory = file('C:\\Users\\ADMIN\\OneDrive\\Desktop\\Paper1216\\plugins\\')
     from sourceSets.main.output

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

@@ -269,6 +269,7 @@ private void registerListeners() {
 
         // Register core listeners
         pm.registerEvents(pluginCompatibilityHandler, this);
+        pm.registerEvents(naturalSpawnerListener, this);
         pm.registerEvents(spawnerListGUI, this);
         pm.registerEvents(spawnerBreakListener, this);
         pm.registerEvents(spawnerPlaceListener, this);

core/src/main/java/github/nighter/smartspawner/nms/VersionInitializer.java

@@ -59,6 +59,7 @@ private String determineVersionPath() {
         // Define supported versions and their package names
         // Order matters: more specific versions should come first
         Map<String, String> supportedVersions = new LinkedHashMap<>();
+        supportedVersions.put("1.21.6", "v1_21_6");
         supportedVersions.put("1.21.4", "v1_21_4");
         supportedVersions.put("1.21", "v1_21");
         supportedVersions.put("1.20", "v1_20");

core/src/main/java/github/nighter/smartspawner/spawner/interactions/destroy/SpawnerBreakListener.java

@@ -72,7 +72,7 @@ public void onSpawnerBreak(BlockBreakEvent event) {
 
         final SpawnerData spawner = spawnerManager.getSpawnerByLocation(location);
 
-        if (!plugin.getConfig().getBoolean("natural_spawner.breakable", true)) {
+        if (!plugin.getConfig().getBoolean("natural_spawner.breakable", false)) {
             if (spawner == null) {
                 block.setType(Material.AIR);
                 event.setCancelled(true);
@@ -88,22 +88,22 @@ public void onSpawnerBreak(BlockBreakEvent event) {
         }
 
         if (spawner != null) {
-            handleVanillaSpawnerBreak(block, spawner, player);
+            handleSmartSpawnerBreak(block, spawner, player);
             plugin.getRangeChecker().stopSpawnerTask(spawner);
         } else {
             CreatureSpawner creatureSpawner = (CreatureSpawner) block.getState();
             if(callAPIEvent(player, block.getLocation(), 1)) {
                 event.setCancelled(true);
                 return;
             }
-            handleSpawnerBreak(block, creatureSpawner, player);
+            handleVanillaSpawnerBreak(block, creatureSpawner, player);
         }
 
         event.setCancelled(true);
         cleanupAssociatedHopper(block);
     }
 
-    private void handleVanillaSpawnerBreak(Block block, SpawnerData spawner, Player player) {
+    private void handleSmartSpawnerBreak(Block block, SpawnerData spawner, Player player) {
         Location location = block.getLocation();
         ItemStack tool = player.getInventory().getItemInMainHand();
 
@@ -122,7 +122,7 @@ private void handleVanillaSpawnerBreak(Block block, SpawnerData spawner, Player
         }
     }
 
-    private void handleSpawnerBreak(Block block, CreatureSpawner creatureSpawner, Player player) {
+    private void handleVanillaSpawnerBreak(Block block, CreatureSpawner creatureSpawner, Player player) {
         Location location = block.getLocation();
         ItemStack tool = player.getInventory().getItemInMainHand();
 
@@ -131,7 +131,12 @@ private void handleSpawnerBreak(Block block, CreatureSpawner creatureSpawner, Pl
         }
 
         EntityType entityType = creatureSpawner.getSpawnedType();
-        ItemStack spawnerItem = spawnerItemFactory.createSpawnerItem(entityType);
+        ItemStack spawnerItem;
+        if (plugin.getConfig().getBoolean("natural_spawner.convert_to_smart_spawner", false)) {
+            spawnerItem = spawnerItemFactory.createSpawnerItem(entityType);
+        } else {
+            spawnerItem = spawnerItemFactory.createVanillaSpawnerItem(entityType);
+        }
 
         boolean directToInventory = plugin.getConfig().getBoolean("spawner_break.direct_to_inventory", false);
 

core/src/main/java/github/nighter/smartspawner/spawner/interactions/destroy/SpawnerExplosionListener.java

@@ -32,8 +32,6 @@ public SpawnerExplosionListener(SmartSpawner plugin) {
         this.hopperHandler = plugin.getHopperHandler();
     }
 
-
-
     @EventHandler
     public void onEntityExplosion(EntityExplodeEvent event) {
         handleExplosion(event.blockList());
@@ -81,6 +79,9 @@ private void handleExplosion(List<Block> blockList) {
                     }
                 } else {
                     // Allow vanilla spawners to be destroyed
+                    if (plugin.getConfig().getBoolean("natural_spawner.protect_from_explosions", false)) {
+                        blocksToRemove.add(block);
+                    }
                 }
             } else if (block.getType() == Material.RESPAWN_ANCHOR) {
                 if (plugin.getConfig().getBoolean("spawner_properties.default.protect_from_explosions", true)) {

core/src/main/java/github/nighter/smartspawner/spawner/item/SpawnerItemFactory.java

@@ -239,6 +239,10 @@ public ItemStack createSpawnerItem(EntityType entityType, int amount) {
         return spawner;
     }
 
+    public ItemStack createVanillaSpawnerItem(EntityType entityType) {
+        return createVanillaSpawnerItem(entityType, 1);
+    }
+
     public ItemStack createVanillaSpawnerItem(EntityType entityType, int amount) {
         ItemStack spawner = new ItemStack(Material.SPAWNER, amount);
         ItemMeta meta = spawner.getItemMeta();