Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 10:36:06 +01:00
Code Issues Projects Releases Wiki Activity

Pass multiverse core instance directly into WorldConfigNodes

Browse Source
This commit is contained in:
Ben Woo 2023-09-20 12:39:59 +08:00
parent 5dba08dd1b
commit e4bff69372
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/mvplugins/multiverse/core/world/config/WorldConfig.java
View File

@ -14,6 +14,7 @@ import org.bukkit.configuration.ConfigurationSection;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.mvplugins.multiverse.core.MultiverseCore;
import org.mvplugins.multiverse.core.configuration.handle.ConfigurationSectionHandle; import org.mvplugins.multiverse.core.configuration.handle.ConfigurationSectionHandle;
import org.mvplugins.multiverse.core.configuration.migration.BooleanMigratorAction; import org.mvplugins.multiverse.core.configuration.migration.BooleanMigratorAction;
import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator; import org.mvplugins.multiverse.core.configuration.migration.ConfigMigrator;
@ -23,7 +24,6 @@ import org.mvplugins.multiverse.core.configuration.migration.MoveMigratorAction;
import org.mvplugins.multiverse.core.configuration.migration.NullStringMigratorAction; import org.mvplugins.multiverse.core.configuration.migration.NullStringMigratorAction;
import org.mvplugins.multiverse.core.configuration.migration.VersionMigrator; import org.mvplugins.multiverse.core.configuration.migration.VersionMigrator;
import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld; import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
import org.mvplugins.multiverse.core.world.helpers.EnforcementHandler;
/** /**
* Represents a world configuration. * Represents a world configuration.
@ -37,9 +37,9 @@ public final class WorldConfig {
WorldConfig( WorldConfig(
@NotNull String worldName, @NotNull String worldName,
@NotNull ConfigurationSection configSection, @NotNull ConfigurationSection configSection,
@NotNull EnforcementHandler enforcementHandler) { @NotNull MultiverseCore multiverseCore) {
this.worldName = worldName; this.worldName = worldName;
this.configNodes = new WorldConfigNodes(enforcementHandler); this.configNodes = new WorldConfigNodes(multiverseCore);
this.configHandle = ConfigurationSectionHandle.builder(configSection) this.configHandle = ConfigurationSectionHandle.builder(configSection)
.logger(Logging.getLogger()) .logger(Logging.getLogger())
.nodes(configNodes.getNodes()) .nodes(configNodes.getNodes())

6
src/main/java/org/mvplugins/multiverse/core/world/config/WorldConfigNodes.java
View File

@ -10,10 +10,10 @@ import org.bukkit.Material;
import org.bukkit.World; import org.bukkit.World;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.mvplugins.multiverse.core.MultiverseCore;
import org.mvplugins.multiverse.core.configuration.node.ConfigNode; import org.mvplugins.multiverse.core.configuration.node.ConfigNode;
import org.mvplugins.multiverse.core.configuration.node.Node; import org.mvplugins.multiverse.core.configuration.node.Node;
import org.mvplugins.multiverse.core.configuration.node.NodeGroup; import org.mvplugins.multiverse.core.configuration.node.NodeGroup;
import org.mvplugins.multiverse.core.world.config.AllowedPortalType;
import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld; import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
import org.mvplugins.multiverse.core.world.helpers.EnforcementHandler; import org.mvplugins.multiverse.core.world.helpers.EnforcementHandler;
@ -27,8 +27,8 @@ public class WorldConfigNodes {
private EnforcementHandler enforcementHandler; private EnforcementHandler enforcementHandler;
private LoadedMultiverseWorld world = null; private LoadedMultiverseWorld world = null;
WorldConfigNodes(@NotNull EnforcementHandler enforcementHandler) { WorldConfigNodes(@NotNull MultiverseCore multiverseCore) {
this.enforcementHandler = enforcementHandler; this.enforcementHandler = multiverseCore.getService(EnforcementHandler.class);
} }
LoadedMultiverseWorld getWorld() { LoadedMultiverseWorld getWorld() {

11
src/main/java/org/mvplugins/multiverse/core/world/config/WorldsConfigManager.java
View File

@ -21,7 +21,6 @@ import org.jetbrains.annotations.NotNull;
import org.jvnet.hk2.annotations.Service; import org.jvnet.hk2.annotations.Service;
import org.mvplugins.multiverse.core.MultiverseCore; import org.mvplugins.multiverse.core.MultiverseCore;
import org.mvplugins.multiverse.core.world.helpers.EnforcementHandler;
/** /**
* Manages the worlds.yml file. * Manages the worlds.yml file.
@ -35,14 +34,14 @@ public final class WorldsConfigManager {
private final File worldConfigFile; private final File worldConfigFile;
private YamlConfiguration worldsConfig; private YamlConfiguration worldsConfig;
private final EnforcementHandler enforcementHandler; private final MultiverseCore multiverseCore;
@Inject @Inject
WorldsConfigManager(@NotNull MultiverseCore core, @NotNull EnforcementHandler enforcementHandler) { WorldsConfigManager(@NotNull MultiverseCore core, @NotNull MultiverseCore multiverseCore) {
worldConfigMap = new HashMap<>(); worldConfigMap = new HashMap<>();
worldConfigFile = core.getDataFolder().toPath().resolve(CONFIG_FILENAME).toFile(); worldConfigFile = core.getDataFolder().toPath().resolve(CONFIG_FILENAME).toFile();
this.enforcementHandler = enforcementHandler; this.multiverseCore = multiverseCore;
} }
/** /**
@ -128,7 +127,7 @@ public final class WorldsConfigManager {
WorldConfig newWorldConfig = new WorldConfig( WorldConfig newWorldConfig = new WorldConfig(
worldName, worldName,
getWorldConfigSection(worldName), getWorldConfigSection(worldName),
enforcementHandler); multiverseCore);
worldConfigMap.put(worldName, newWorldConfig); worldConfigMap.put(worldName, newWorldConfig);
newWorldsAdded.add(newWorldConfig); newWorldsAdded.add(newWorldConfig);
}); });
@ -183,7 +182,7 @@ public final class WorldsConfigManager {
if (worldConfigMap.containsKey(worldName)) { if (worldConfigMap.containsKey(worldName)) {
throw new IllegalArgumentException("WorldConfig for world " + worldName + " already exists."); throw new IllegalArgumentException("WorldConfig for world " + worldName + " already exists.");
} }
WorldConfig worldConfig = new WorldConfig(worldName, getWorldConfigSection(worldName), enforcementHandler); WorldConfig worldConfig = new WorldConfig(worldName, getWorldConfigSection(worldName), multiverseCore);
worldConfigMap.put(worldName, worldConfig); worldConfigMap.put(worldName, worldConfig);
return worldConfig; return worldConfig;
} }