feat(pocket-base): split hostile and passive mob spawning

src/main/java/games/dmg/spigotbase/BaseSettingsCommand.java

@@ -69,9 +69,9 @@ final class BaseSettingsCommand implements CommandExecutor, TabCompleter {
                 && arguments[1].equalsIgnoreCase("upgrade")) {
             return purchasePocketUpgrade(player, state);
         }
-        if (arguments.length == 3 && arguments[0].equalsIgnoreCase("pocket")
+        if (arguments.length == 4 && arguments[0].equalsIgnoreCase("pocket")
                 && arguments[1].equalsIgnoreCase("mobs")) {
-            return updatePocketMobSpawning(player, arguments[2]);
+            return updatePocketMobSpawning(player, arguments[2], arguments[3]);
         }
         if (arguments.length == 4 && arguments[0].equalsIgnoreCase("pocket")
                 && arguments[1].equalsIgnoreCase("type")) {
@@ -240,7 +240,11 @@ final class BaseSettingsCommand implements CommandExecutor, TabCompleter {
         return true;
     }
 
-    private boolean updatePocketMobSpawning(Player player, String mode) {
+    private boolean updatePocketMobSpawning(
+        Player player,
+        String category,
+        String mode
+    ) {
         if (pocketBases == null) {
             player.sendMessage(ChatColor.RED + "Pocket Bases are currently unavailable.");
             return true;
@@ -256,17 +260,30 @@ final class BaseSettingsCommand implements CommandExecutor, TabCompleter {
             return true;
         }
         final PocketBaseState updated;
+        final boolean settingEnabled;
         try {
-            updated = pocketBases.setMobSpawning(player.getUniqueId(), enabled);
+            if (category.equalsIgnoreCase("hostile")) {
+                updated = pocketBases.setHostileMobSpawning(
+                    player.getUniqueId(), enabled
+                );
+                settingEnabled = updated.hostileMobSpawningEnabled();
+            } else if (category.equalsIgnoreCase("passive")) {
+                updated = pocketBases.setPassiveMobSpawning(
+                    player.getUniqueId(), enabled
+                );
+                settingEnabled = updated.passiveMobSpawningEnabled();
+            } else {
+                sendUsage(player);
+                return true;
+            }
         } catch (IOException | RuntimeException exception) {
             player.sendMessage(ChatColor.RED
                 + "The Pocket Base mob-spawning setting could not be changed.");
             return true;
         }
-        player.sendMessage(ChatColor.YELLOW + "Pocket Base mob spawning is now "
-            + (updated.mobSpawningEnabled()
-                ? ChatColor.GREEN + "enabled"
-                : ChatColor.RED + "disabled")
+        player.sendMessage(ChatColor.YELLOW + "Pocket Base "
+            + category.toLowerCase(Locale.ROOT) + " mob spawning is now "
+            + (settingEnabled ? ChatColor.GREEN + "enabled" : ChatColor.RED + "disabled")
             + ChatColor.YELLOW + ".");
         return true;
     }
@@ -514,8 +531,10 @@ final class BaseSettingsCommand implements CommandExecutor, TabCompleter {
             + settings.current().pocketBaseCurrencyMaterial().toLowerCase(Locale.ROOT)
             + " → /basesettings pocket upgrade; type="
             + pocket.biome().worldType().commandName() + "/" + pocket.biome().commandName()
-            + "; mob spawning="
-            + (pocket.mobSpawningEnabled() ? "enabled" : "disabled"));
+            + "; hostile spawning="
+            + (pocket.hostileMobSpawningEnabled() ? "enabled" : "disabled")
+            + "; passive spawning="
+            + (pocket.passiveMobSpawningEnabled() ? "enabled" : "disabled"));
     }
 
     private void showCooldownPath(Player player, PlayerState state) {
@@ -557,7 +576,9 @@ final class BaseSettingsCommand implements CommandExecutor, TabCompleter {
         if (arguments.length == 3 && arguments[0].equalsIgnoreCase("pocket")) {
             String prefix = arguments[2].toLowerCase(Locale.ROOT);
             if (arguments[1].equalsIgnoreCase("mobs")) {
-                return ENABLE_MODES.stream().filter(mode -> mode.startsWith(prefix)).toList();
+                return List.of("hostile", "passive").stream()
+                    .filter(category -> category.startsWith(prefix))
+                    .toList();
             }
             if (arguments[1].equalsIgnoreCase("type")) {
                 return POCKET_WORLD_TYPES.stream()
@@ -565,15 +586,23 @@ final class BaseSettingsCommand implements CommandExecutor, TabCompleter {
                     .toList();
             }
         }
-        if (arguments.length == 4 && arguments[0].equalsIgnoreCase("pocket")
-                && arguments[1].equalsIgnoreCase("type")) {
+        if (arguments.length == 4 && arguments[0].equalsIgnoreCase("pocket")) {
             String prefix = arguments[3].toLowerCase(Locale.ROOT);
-            return PocketBaseWorldType.fromCommand(arguments[2])
-                .map(PocketBaseBiome::commandNames)
-                .orElse(List.of())
-                .stream()
-                .filter(biome -> biome.startsWith(prefix))
-                .toList();
+            if (arguments[1].equalsIgnoreCase("mobs")
+                    && (arguments[2].equalsIgnoreCase("hostile")
+                        || arguments[2].equalsIgnoreCase("passive"))) {
+                return ENABLE_MODES.stream()
+                    .filter(mode -> mode.startsWith(prefix))
+                    .toList();
+            }
+            if (arguments[1].equalsIgnoreCase("type")) {
+                return PocketBaseWorldType.fromCommand(arguments[2])
+                    .map(PocketBaseBiome::commandNames)
+                    .orElse(List.of())
+                    .stream()
+                    .filter(biome -> biome.startsWith(prefix))
+                    .toList();
+            }
         }
         return List.of();
     }
@@ -634,7 +663,8 @@ final class BaseSettingsCommand implements CommandExecutor, TabCompleter {
 
     private static void sendUsage(Player player) {
         player.sendMessage(ChatColor.RED + "Usage: /basesettings "
-            + "[status|upgrade|pocket upgrade|pocket mobs <enable|disable>"
+            + "[status|upgrade|pocket upgrade|pocket mobs "
+            + "<hostile|passive> <enable|disable>"
             + "|pocket type <void|nether|overworld> <subtype>"
             + "|visitors <allowed|blocked>|navigation <enable|disable>"
             + "|flight <enable|disable>|border <enable|disable>"

src/main/java/games/dmg/spigotbase/PocketBaseManager.java

@@ -92,20 +92,48 @@ final class PocketBaseManager {
         }
     }
 
-    PocketBaseState setMobSpawning(UUID ownerId, boolean enabled) throws IOException {
+    PocketBaseState setHostileMobSpawning(UUID ownerId, boolean enabled)
+            throws IOException {
         PocketBaseState current = states.state(ownerId);
+        return setMobSpawning(
+            current,
+            enabled,
+            current.passiveMobSpawningEnabled(),
+            state -> state.withHostileMobSpawningEnabled(enabled)
+        );
+    }
+
+    PocketBaseState setPassiveMobSpawning(UUID ownerId, boolean enabled)
+            throws IOException {
+        PocketBaseState current = states.state(ownerId);
+        return setMobSpawning(
+            current,
+            current.hostileMobSpawningEnabled(),
+            enabled,
+            state -> state.withPassiveMobSpawningEnabled(enabled)
+        );
+    }
+
+    private PocketBaseState setMobSpawning(
+        PocketBaseState current,
+        boolean hostileEnabled,
+        boolean passiveEnabled,
+        java.util.function.UnaryOperator<PocketBaseState> update
+    ) throws IOException {
         if (current.level() < 1) {
             throw new IllegalStateException("Pocket Base I is still locked");
         }
-        worlds.setMobSpawning(ownerId, enabled);
+        UUID ownerId = current.ownerId();
+        worlds.setMobSpawning(ownerId, hostileEnabled, passiveEnabled);
         try {
-            return states.updateAndSave(
-                ownerId,
-                state -> state.withMobSpawningEnabled(enabled)
-            );
+            return states.updateAndSave(ownerId, update);
         } catch (IOException | RuntimeException exception) {
             try {
-                worlds.setMobSpawning(ownerId, current.mobSpawningEnabled());
+                worlds.setMobSpawning(
+                    ownerId,
+                    current.hostileMobSpawningEnabled(),
+                    current.passiveMobSpawningEnabled()
+                );
             } catch (RuntimeException rollbackFailure) {
                 exception.addSuppressed(rollbackFailure);
             }

src/main/java/games/dmg/spigotbase/PocketBaseState.java

@@ -8,7 +8,8 @@ public record PocketBaseState(
     int level,
     Optional<PocketPortalLocation> entrance,
     Optional<PocketPortalLocation> returnPortal,
-    boolean mobSpawningEnabled,
+    boolean hostileMobSpawningEnabled,
+    boolean passiveMobSpawningEnabled,
     PocketBaseBiome biome
 ) {
     public PocketBaseState {
@@ -32,73 +33,64 @@ public record PocketBaseState(
         Optional<PocketPortalLocation> entrance
     ) {
         this(
-            ownerId, level, entrance, Optional.empty(), false, PocketBaseBiome.THE_VOID
-        );
-    }
-
-    public PocketBaseState(
-        UUID ownerId,
-        int level,
-        Optional<PocketPortalLocation> entrance,
-        boolean mobSpawningEnabled
-    ) {
-        this(
-            ownerId, level, entrance, Optional.empty(), mobSpawningEnabled,
-            PocketBaseBiome.THE_VOID
-        );
-    }
-
-    public PocketBaseState(
-        UUID ownerId,
-        int level,
-        Optional<PocketPortalLocation> entrance,
-        Optional<PocketPortalLocation> returnPortal,
-        boolean mobSpawningEnabled
-    ) {
-        this(
-            ownerId, level, entrance, returnPortal, mobSpawningEnabled,
+            ownerId, level, entrance, Optional.empty(), false, false,
             PocketBaseBiome.THE_VOID
         );
     }
 
     public static PocketBaseState locked(UUID ownerId) {
         return new PocketBaseState(
-            ownerId, 0, Optional.empty(), Optional.empty(), false,
+            ownerId, 0, Optional.empty(), Optional.empty(), false, false,
             PocketBaseBiome.THE_VOID
         );
     }
 
     public PocketBaseState withLevel(int newLevel) {
         return new PocketBaseState(
-            ownerId, newLevel, entrance, returnPortal, mobSpawningEnabled, biome
+            ownerId, newLevel, entrance, returnPortal, hostileMobSpawningEnabled,
+            passiveMobSpawningEnabled, biome
         );
     }
 
     public PocketBaseState withEntrance(PocketPortalLocation portal) {
         return new PocketBaseState(
-            ownerId, level, Optional.of(portal), returnPortal, mobSpawningEnabled, biome
+            ownerId, level, Optional.of(portal), returnPortal,
+            hostileMobSpawningEnabled, passiveMobSpawningEnabled, biome
         );
     }
 
     public PocketBaseState withoutEntrance() {
         return new PocketBaseState(
-            ownerId, level, Optional.empty(), returnPortal, mobSpawningEnabled, biome
+            ownerId, level, Optional.empty(), returnPortal, hostileMobSpawningEnabled,
+            passiveMobSpawningEnabled, biome
         );
     }
 
     public PocketBaseState withReturnPortal(PocketPortalLocation portal) {
         return new PocketBaseState(
-            ownerId, level, entrance, Optional.of(portal), mobSpawningEnabled, biome
+            ownerId, level, entrance, Optional.of(portal), hostileMobSpawningEnabled,
+            passiveMobSpawningEnabled, biome
         );
     }
 
-    public PocketBaseState withMobSpawningEnabled(boolean enabled) {
-        return new PocketBaseState(ownerId, level, entrance, returnPortal, enabled, biome);
+    public PocketBaseState withHostileMobSpawningEnabled(boolean enabled) {
+        return new PocketBaseState(
+            ownerId, level, entrance, returnPortal, enabled,
+            passiveMobSpawningEnabled, biome
+        );
+    }
+
+    public PocketBaseState withPassiveMobSpawningEnabled(boolean enabled) {
+        return new PocketBaseState(
+            ownerId, level, entrance, returnPortal, hostileMobSpawningEnabled,
+            enabled, biome
+        );
     }
 
     public PocketBaseState withBiome(PocketBaseBiome selectedBiome) {
         return new PocketBaseState(
-            ownerId, level, entrance, returnPortal, mobSpawningEnabled, selectedBiome
+            ownerId, level, entrance, returnPortal, hostileMobSpawningEnabled,
+            passiveMobSpawningEnabled, selectedBiome
         );
     }
 }

src/main/java/games/dmg/spigotbase/PocketBaseWorldService.java

@@ -42,7 +42,11 @@ final class PocketBaseWorldService {
         for (PocketBaseState state : states.values()) {
             if (state.level() > 0) {
                 setBiome(state.ownerId(), state.level(), state.biome());
-                setMobSpawning(state.ownerId(), state.mobSpawningEnabled());
+                setMobSpawning(
+                    state.ownerId(),
+                    state.hostileMobSpawningEnabled(),
+                    state.passiveMobSpawningEnabled()
+                );
             }
         }
     }
@@ -91,8 +95,12 @@ final class PocketBaseWorldService {
         return ensureWorld(ownerId);
     }
 
-    void setMobSpawning(UUID ownerId, boolean enabled) {
-        ensureWorld(ownerId).setSpawnFlags(enabled, enabled);
+    void setMobSpawning(
+        UUID ownerId,
+        boolean hostileEnabled,
+        boolean passiveEnabled
+    ) {
+        ensureWorld(ownerId).setSpawnFlags(hostileEnabled, passiveEnabled);
     }
 
     void setBiome(UUID ownerId, int level, PocketBaseBiome biome) {

src/main/java/games/dmg/spigotbase/YamlPocketBaseRepository.java

@@ -44,7 +44,8 @@ public final class YamlPocketBaseRepository {
                     level,
                     loadPortal(yaml, path + ".entrance"),
                     loadPortal(yaml, path + ".return-portal"),
-                    yaml.getBoolean(path + ".mob-spawning-enabled", false),
+                    loadMobPreference(yaml, path, "hostile-mob-spawning-enabled"),
+                    loadMobPreference(yaml, path, "passive-mob-spawning-enabled"),
                     loadBiome(yaml, path)
                 );
                 states.put(ownerId, state);
@@ -64,7 +65,14 @@ public final class YamlPocketBaseRepository {
         for (PocketBaseState state : states.values()) {
             String path = "owners." + state.ownerId();
             yaml.set(path + ".level", state.level());
-            yaml.set(path + ".mob-spawning-enabled", state.mobSpawningEnabled());
+            yaml.set(
+                path + ".hostile-mob-spawning-enabled",
+                state.hostileMobSpawningEnabled()
+            );
+            yaml.set(
+                path + ".passive-mob-spawning-enabled",
+                state.passiveMobSpawningEnabled()
+            );
             yaml.set(path + ".world-type", state.biome().worldType().commandName());
             yaml.set(path + ".biome", state.biome().commandName());
             state.entrance().ifPresent(portal -> savePortal(yaml, path + ".entrance", portal));
@@ -90,6 +98,17 @@ public final class YamlPocketBaseRepository {
         }
     }
 
+    private static boolean loadMobPreference(
+        YamlConfiguration yaml,
+        String path,
+        String categoryKey
+    ) {
+        return yaml.getBoolean(
+            path + "." + categoryKey,
+            yaml.getBoolean(path + ".mob-spawning-enabled", false)
+        );
+    }
+
     private static PocketBaseBiome loadBiome(YamlConfiguration yaml, String path) {
         String worldTypeName = yaml.getString(path + ".world-type");
         String biomeName = yaml.getString(path + ".biome");