Merge pull request #3328 from Multiverse/fix/mvapi-not-started

Pass in config object directly into spawn config class instead of using mvapi

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/core/world/WorldConfigNodes.java

@@ -16,6 +16,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import org.mvplugins.multiverse.core.MultiverseCore;
+import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.config.node.serializer.NodeSerializer;
 import org.mvplugins.multiverse.core.event.world.MVWorldPropertyChangedEvent;
 import org.mvplugins.multiverse.core.config.node.ConfigNode;
@@ -37,11 +38,13 @@ final class WorldConfigNodes {
     private final NodeGroup nodes = new NodeGroup();
     private WorldManager worldManager;
     private EnforcementHandler enforcementHandler;
+    private CoreConfig config;
     private MultiverseWorld world = null;
 
     WorldConfigNodes(@NotNull MultiverseCore multiverseCore) {
         this.worldManager = multiverseCore.getServiceLocator().getService(WorldManager.class);
         this.enforcementHandler = multiverseCore.getServiceLocator().getService(EnforcementHandler.class);
+        this.config = multiverseCore.getServiceLocator().getService(CoreConfig.class);
     }
 
     MultiverseWorld getWorld() {
@@ -244,15 +247,15 @@ public Object serialize(Material object, Class<Material> type) {
             }));
 
     final ConfigNode<EntitySpawnConfig> enititySpawnConfig = node(ConfigNode.builder("spawning", EntitySpawnConfig.class)
-            .defaultValue(() -> EntitySpawnConfig.fromSection(new MemoryConfiguration()))
+            .defaultValue(() -> EntitySpawnConfig.fromSection(config, new MemoryConfiguration()))
             .hidden()
             .serializer(new NodeSerializer<>() {
                 @Override
                 public EntitySpawnConfig deserialize(Object object, Class<EntitySpawnConfig> type) {
                     ConfigurationSection spawnSection = (object instanceof ConfigurationSection section)
                             ? section
                             : new MemoryConfiguration();
-                    return EntitySpawnConfig.fromSection(spawnSection);
+                    return EntitySpawnConfig.fromSection(config, spawnSection);
                 }
 
                 @Override

src/main/java/org/mvplugins/multiverse/core/world/entity/EntitySpawnConfig.java

@@ -6,6 +6,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.SpawnCategory;
 import org.jetbrains.annotations.ApiStatus;
+import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.utils.StringFormatter;
 import org.mvplugins.multiverse.core.world.MultiverseWorld;
 
@@ -14,15 +15,21 @@
 
 public final class EntitySpawnConfig {
 
+    private final CoreConfig config;
     private final Map<SpawnCategory, SpawnCategoryConfig> spawnCategoriesConfig;
 
-    EntitySpawnConfig(Map<SpawnCategory, SpawnCategoryConfig> spawnCategoriesConfig) {
+    EntitySpawnConfig(CoreConfig config, Map<SpawnCategory, SpawnCategoryConfig> spawnCategoriesConfig) {
+        this.config = config;
         this.spawnCategoriesConfig = spawnCategoriesConfig;
     }
 
     public SpawnCategoryConfig getSpawnCategoryConfig(SpawnCategory spawnCategory) {
         return spawnCategoriesConfig.computeIfAbsent(spawnCategory,
-                computeSpawnCategory -> new SpawnCategoryConfig(computeSpawnCategory, new MemoryConfiguration()));
+                computeSpawnCategory -> new SpawnCategoryConfig(
+                        config,
+                        computeSpawnCategory,
+                        new MemoryConfiguration()
+                ));
     }
 
     public boolean shouldAllowSpawn(Entity entity) {
@@ -51,17 +58,17 @@ public ConfigurationSection toSection() {
     }
 
     @ApiStatus.Internal
-    public static EntitySpawnConfig fromSection(ConfigurationSection section) {
+    public static EntitySpawnConfig fromSection(CoreConfig config, ConfigurationSection section) {
         Map<SpawnCategory, SpawnCategoryConfig> spawnCategoriesConfig = new LinkedHashMap<>();
         section.getValues(false).forEach((key, value) -> {
             if (!(value instanceof ConfigurationSection sectionPart)) {
                 Logging.warning("Invalid spawn category config for " + key + ": " + value);
                 return;
             }
             SpawnCategory spawnCategory = SpawnCategory.valueOf(key.toUpperCase());
-            spawnCategoriesConfig.put(spawnCategory, new SpawnCategoryConfig(spawnCategory, sectionPart));
+            spawnCategoriesConfig.put(spawnCategory, new SpawnCategoryConfig(config, spawnCategory, sectionPart));
         });
-        return new EntitySpawnConfig(spawnCategoriesConfig);
+        return new EntitySpawnConfig(config, spawnCategoriesConfig);
     }
 
     @ApiStatus.Internal

src/main/java/org/mvplugins/multiverse/core/world/entity/SpawnCategoryConfig.java

@@ -7,7 +7,7 @@
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.SpawnCategory;
-import org.mvplugins.multiverse.core.MultiverseCoreApi;
+import org.mvplugins.multiverse.core.config.CoreConfig;
 import org.mvplugins.multiverse.core.config.handle.MemoryConfigurationHandle;
 import org.mvplugins.multiverse.core.config.handle.StringPropertyHandle;
 import org.mvplugins.multiverse.core.config.node.ConfigNode;
@@ -22,14 +22,16 @@
 
 public final class SpawnCategoryConfig {
 
+    private final CoreConfig config;
     private final SpawnCategory spawnCategory;
     private final MemoryConfigurationHandle handle;
     private final StringPropertyHandle stringPropertyHandle;
     private final Nodes nodes;
 
     private MultiverseWorld world;
 
-    SpawnCategoryConfig(SpawnCategory spawnCategory, ConfigurationSection section) {
+    SpawnCategoryConfig(CoreConfig config, SpawnCategory spawnCategory, ConfigurationSection section) {
+        this.config = config;
         this.spawnCategory = spawnCategory;
         this.nodes = new Nodes();
         this.handle = MemoryConfigurationHandle.builder(section, nodes.nodes)
@@ -64,7 +66,7 @@ void applyConfigToWorld() {
     }
 
     private void applyTickPerSpawns(World bukkitWorld) {
-        if (!MultiverseCoreApi.get().getCoreConfig().getApplyEntitySpawnLimit()) {
+        if (!config.getApplyEntitySpawnLimit()) {
             Logging.finer("World %s %s skipping setTicksPerSpawns due to core config", world.getName(), spawnCategory);
             return;
         }
@@ -83,7 +85,7 @@ private void applyTickPerSpawns(World bukkitWorld) {
     }
 
     private void applySpawnLimit(World bukkitWorld) {
-        if (!MultiverseCoreApi.get().getCoreConfig().getApplyEntitySpawnLimit()) {
+        if (!config.getApplyEntitySpawnLimit()) {
             Logging.finer("Skipping World %s %s setSpawnLimit due to core config", world.getName(), spawnCategory);
             return;
         }