diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfig.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfig.java index 926f77a7..22c502e4 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfig.java +++ b/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfig.java @@ -2,7 +2,11 @@ package com.onarandombox.MultiverseCore.worldnew.config; import com.dumptruckman.minecraft.util.Logging; import com.onarandombox.MultiverseCore.configuration.handle.ConfigurationSectionHandle; +import com.onarandombox.MultiverseCore.world.configuration.AllowedPortalType; import io.vavr.control.Try; +import org.bukkit.Difficulty; +import org.bukkit.GameMode; +import org.bukkit.World; import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -31,22 +35,158 @@ public class WorldConfig { return configHandle.set(name, value); } - public void setAlias(String alias) { - configHandle.set(configNodes.ALIAS, alias); + public boolean getAdjustSpawn() { + return configHandle.get(configNodes.ADJUST_SPAWN); + } + + public Try setAdjustSpawn(boolean adjustSpawn) { + return configHandle.set(configNodes.ADJUST_SPAWN, adjustSpawn); } public @Nullable String getAlias() { return configHandle.get(configNodes.ALIAS); } - public void setHidden(boolean hidden) { - configHandle.set(configNodes.HIDDEN, hidden); + public Try setAlias(String alias) { + return configHandle.set(configNodes.ALIAS, alias); + } + + public boolean getAllowFlight() { + return configHandle.get(configNodes.ALLOW_FLIGHT); + } + + public Try setAllowFlight(boolean allowFlight) { + return configHandle.set(configNodes.ALLOW_FLIGHT, allowFlight); + } + + public boolean getAllowWeather() { + return configHandle.get(configNodes.ALLOW_WEATHER); + } + + public Try setAllowWeather(boolean allowWeather) { + return configHandle.set(configNodes.ALLOW_WEATHER, allowWeather); + } + + public boolean getAutoHeal() { + return configHandle.get(configNodes.AUTO_HEAL); + } + + public Try setAutoHeal(boolean autoHeal) { + return configHandle.set(configNodes.AUTO_HEAL, autoHeal); + } + + public boolean getAutoLoad() { + return configHandle.get(configNodes.AUTO_LOAD); + } + + public Try setAutoLoad(boolean autoLoad) { + return configHandle.set(configNodes.AUTO_LOAD, autoLoad); + } + + public Difficulty getDifficulty() { + return configHandle.get(configNodes.DIFFICULTY); + } + + public Try setDifficulty(Difficulty difficulty) { + return configHandle.set(configNodes.DIFFICULTY, difficulty); + } + + public World.Environment getEnvironment() { + return configHandle.get(configNodes.ENVIRONMENT); + } + + public Try setEnvironment(World.Environment environment) { + return configHandle.set(configNodes.ENVIRONMENT, environment); + } + + public GameMode getGamemode() { + return configHandle.get(configNodes.GAMEMODE); + } + + public Try setGamemode(GameMode gamemode) { + return configHandle.set(configNodes.GAMEMODE, gamemode); + } + + public @Nullable String getGenerator() { + return configHandle.get(configNodes.GENERATOR); + } + + public Try setGenerator(String generator) { + return configHandle.set(configNodes.GENERATOR, generator); } public boolean isHidden() { return configHandle.get(configNodes.HIDDEN); } + public Try setHidden(boolean hidden) { + return configHandle.set(configNodes.HIDDEN, hidden); + } + + public boolean getHunger() { + return configHandle.get(configNodes.HUNGER); + } + + public Try setHunger(boolean hunger) { + return configHandle.set(configNodes.HUNGER, hunger); + } + + public boolean getKeepSpawnInMemory() { + return configHandle.get(configNodes.KEEP_SPAWN_IN_MEMORY); + } + + public Try setKeepSpawnInMemory(boolean keepSpawnInMemory) { + return configHandle.set(configNodes.KEEP_SPAWN_IN_MEMORY, keepSpawnInMemory); + } + + public int getPlayerLimit() { + return configHandle.get(configNodes.PLAYER_LIMIT); + } + + public Try setPlayerLimit(int playerLimit) { + return configHandle.set(configNodes.PLAYER_LIMIT, playerLimit); + } + + public AllowedPortalType getPortalForm() { + return configHandle.get(configNodes.PORTAL_FORM); + } + + public Try setPortalForm(AllowedPortalType portalForm) { + return configHandle.set(configNodes.PORTAL_FORM, portalForm); + } + + public boolean getPvp() { + return configHandle.get(configNodes.PVP); + } + + public Try setPvp(boolean pvp) { + return configHandle.set(configNodes.PVP, pvp); + } + + public String getRespawnWorld() { + return configHandle.get(configNodes.RESPAWN_WORLD); + } + + public Try setRespawnWorld(String respawnWorld) { + return configHandle.set(configNodes.RESPAWN_WORLD, respawnWorld); + } + + public double getScale() { + return configHandle.get(configNodes.SCALE); + } + + public Try setScale(double scale) { + return configHandle.set(configNodes.SCALE, scale); + } + + public @Nullable String getSeed() { + return configHandle.get(configNodes.SEED); + } + + public Try setSeed(String seed) { + return configHandle.set(configNodes.SEED, seed); + } + public List getWorldBlacklist() { return (List) configHandle.get(configNodes.WORLD_BLACKLIST); } diff --git a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfigNodes.java b/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfigNodes.java index 12bfc65d..6197d6b7 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfigNodes.java +++ b/src/main/java/com/onarandombox/MultiverseCore/worldnew/config/WorldConfigNodes.java @@ -126,7 +126,7 @@ public class WorldConfigNodes { .name("world-blacklist") .build()); - //todo: color and style + //todo: Migrate color and style into alias //todo: spawning //todo: entryfee //todo: spawnLocation diff --git a/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigFileTest.kt b/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigFileTest.kt index cea40d17..8bef3703 100644 --- a/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigFileTest.kt +++ b/src/test/java/org/mvplugins/multiverse/core/world/WorldConfigFileTest.kt @@ -66,4 +66,4 @@ class WorldConfigFileTest : TestWithMockBukkit() { assertNotNull(configCompare) assertEquals(configCompare, config) } -} \ No newline at end of file +}