Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-02-15 12:02:48 +01:00
Code Issues Projects Releases Wiki Activity

Make WorldConfigNodes reference MultiverseWorld instead of LoadedMultiverseWorld

Browse Source
This commit is contained in:
Ben Woo 2025-01-19 15:51:42 +08:00
parent 4362453f90
commit 55cd6b7c59
5 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/mvplugins/multiverse/core/api/event/MVWorldPropertyChangeEvent.java
View File

@ -10,6 +10,7 @@ package org.mvplugins.multiverse.core.api.event;
import org.bukkit.event.Event;
import org.bukkit.event.HandlerList;
import org.jetbrains.annotations.NotNull;
import org.mvplugins.multiverse.core.api.world.MultiverseWorld;
/**
@ -28,7 +29,7 @@ public class MVWorldPropertyChangeEvent<T> extends Event {
private final T oldValue;
private final T newValue;
public MVWorldPropertyChangeEvent(MultiverseWorld world, String name, T oldValue, T value) {
public MVWorldPropertyChangeEvent(@NotNull MultiverseWorld world, @NotNull String name, T oldValue, T value) {
this.world = world;
this.name = name;
this.oldValue = oldValue;
@ -60,7 +61,7 @@ public class MVWorldPropertyChangeEvent<T> extends Event {
* @return The changed world property's name.
* @since 5.0
*/
public String getName() {
public @NotNull String getName() {
return this.name;
}
@ -90,7 +91,7 @@ public class MVWorldPropertyChangeEvent<T> extends Event {
* @return A valid MultiverseWorld.
* @since 5.0
*/
public MultiverseWorld getWorld() {
public @NotNull MultiverseWorld getWorld() {
return this.world;
}
}

2
src/main/java/org/mvplugins/multiverse/core/world/SimpleMultiverseWorld.java
View File

@ -11,6 +11,7 @@ import org.bukkit.Location;
import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Nullable;
import org.mvplugins.multiverse.core.api.configuration.StringPropertyHandle;
@ -33,6 +34,7 @@ public class SimpleMultiverseWorld implements MultiverseWorld {
SimpleMultiverseWorld(String worldName, WorldConfig worldConfig) {
this.worldName = worldName;
this.worldConfig = worldConfig;
this.worldConfig.setMVWorld(this);
}
@Override

8
src/main/java/org/mvplugins/multiverse/core/world/SimpleWorldManager.java
View File

@ -8,6 +8,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import com.dumptruckman.minecraft.util.Logging;
@ -384,8 +385,10 @@ public class SimpleWorldManager implements WorldManager {
},
mvWorld -> {
Logging.fine("Removed MultiverseWorld from map: " + world.getName());
mvWorld.getWorldConfig().deferenceMVWorld();
return worldActionResult(getWorld(mvWorld.getName()).get());
var unloadedWorld = Objects.requireNonNull(worldsMap.get(world.getName()),
"For some reason, the unloaded world isn't in the map... BUGGG");
mvWorld.getWorldConfig().setMVWorld(unloadedWorld);
return worldActionResult(unloadedWorld);
}));
}
@ -420,6 +423,7 @@ public class SimpleWorldManager implements WorldManager {
private Attempt<String, RemoveFailureReason> removeWorldFromConfig(@NotNull MultiverseWorld world) {
// Remove world from config
worldsMap.remove(world.getName());
((SimpleMultiverseWorld) world).getWorldConfig().deferenceMVWorld();
worldsConfigManager.deleteWorldConfig(world.getName());
saveWorldsConfig();
corePermissions.removeWorldPermissions(world);

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

@ -15,8 +15,8 @@ import org.jetbrains.annotations.Nullable;
import org.mvplugins.multiverse.core.MultiverseCore;
import org.mvplugins.multiverse.core.api.configuration.StringPropertyHandle;
import org.mvplugins.multiverse.core.api.world.MultiverseWorld;
import org.mvplugins.multiverse.core.api.world.config.AllowedPortalType;
import org.mvplugins.multiverse.core.api.world.LoadedMultiverseWorld;
import org.mvplugins.multiverse.core.api.world.config.SpawnLocation;
import org.mvplugins.multiverse.core.configuration.handle.MemoryConfigurationHandle;
import org.mvplugins.multiverse.core.configuration.handle.SimpleStringPropertyHandle;
@ -391,7 +391,7 @@ public final class WorldConfig {
return configHandle.set(configNodes.WORLD_BLACKLIST, worldBlacklist);
}
public void setMVWorld(@NotNull LoadedMultiverseWorld world) {
public void setMVWorld(@NotNull MultiverseWorld world) {
configNodes.setWorld(world);
}

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

@ -38,7 +38,7 @@ public class WorldConfigNodes {
private final NodeGroup nodes = new NodeGroup();
private WorldManager worldManager;
private EnforcementHandler enforcementHandler;
private LoadedMultiverseWorld world = null;
private MultiverseWorld world = null;
WorldConfigNodes(@NotNull MultiverseCore multiverseCore) {
this.worldManager = multiverseCore.getServiceLocator().getService(SimpleWorldManager.class);
@ -49,7 +49,7 @@ public class WorldConfigNodes {
return world;
}
void setWorld(LoadedMultiverseWorld world) {
void setWorld(MultiverseWorld world) {
this.world = world;
}
@ -60,6 +60,7 @@ public class WorldConfigNodes {
private <T> ConfigNode<T> node(ConfigNode.Builder<T, ?> nodeBuilder) {
nodeBuilder.onSetValue((oldValue, newValue) -> {
if (Objects.equals(oldValue, newValue)) return;
if (world == null) return;
MVWorldPropertyChangeEvent<?> mvWorldPropertyChangeEvent = new MVWorldPropertyChangeEvent<>(
world, Option.of(nodeBuilder.name()).getOrElse(nodeBuilder.path()), oldValue, newValue);
Bukkit.getPluginManager().callEvent(mvWorldPropertyChangeEvent);
@ -86,15 +87,15 @@ public class WorldConfigNodes {
final ConfigNode<Boolean> ALLOW_FLIGHT = node(ConfigNode.builder("allow-flight", Boolean.class)
.defaultValue(false)
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
enforcementHandler.handleAllFlightEnforcement(world);
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
enforcementHandler.handleAllFlightEnforcement(loadedWorld);
}));
final ConfigNode<Boolean> ALLOW_WEATHER = node(ConfigNode.builder("allow-weather", Boolean.class)
.defaultValue(true)
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> {
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> {
if (!world.isClearWeather() && !newValue) {
world.setThundering(false);
world.setStorm(false);
@ -122,8 +123,8 @@ public class WorldConfigNodes {
final ConfigNode<Difficulty> DIFFICULTY = node(ConfigNode.builder("difficulty", Difficulty.class)
.defaultValue(Difficulty.NORMAL)
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> world.setDifficulty(newValue));
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> world.setDifficulty(newValue));
}));
final ConfigNode<Boolean> ENTRY_FEE_ENABLED = node(ConfigNode.builder("entry-fee.enabled", Boolean.class)
@ -147,8 +148,8 @@ public class WorldConfigNodes {
final ConfigNode<GameMode> GAMEMODE = node(ConfigNode.builder("gamemode", GameMode.class)
.defaultValue(GameMode.SURVIVAL)
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
enforcementHandler.handleAllGameModeEnforcement(world);
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
enforcementHandler.handleAllGameModeEnforcement(loadedWorld);
}));
final ConfigNode<String> GENERATOR = node(ConfigNode.builder("generator", String.class)
@ -166,8 +167,8 @@ public class WorldConfigNodes {
.builder("keep-spawn-in-memory", Boolean.class)
.defaultValue(true)
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> world.setKeepSpawnInMemory(newValue));
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> world.setKeepSpawnInMemory(newValue));
}));
final ConfigNode<Integer> PLAYER_LIMIT = node(ConfigNode.builder("player-limit", Integer.class)
@ -180,8 +181,8 @@ public class WorldConfigNodes {
final ConfigNode<Boolean> PVP = node(ConfigNode.builder("pvp", Boolean.class)
.defaultValue(true)
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> world.setPVP(newValue));
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> world.setPVP(newValue));
}));
final ConfigNode<String> RESPAWN_WORLD = node(ConfigNode.builder("respawn-world", String.class)
@ -209,9 +210,9 @@ public class WorldConfigNodes {
.defaultValue(NullLocation.get())
.name(null)
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
if (newValue == null || newValue instanceof NullLocation) return;
world.getBukkitWorld().peek(bukkitWorld -> {
loadedWorld.getBukkitWorld().peek(bukkitWorld -> {
bukkitWorld.setSpawnLocation(newValue.getBlockX(), newValue.getBlockY(), newValue.getBlockZ());
newValue.setWorld(bukkitWorld);
});
@ -221,8 +222,8 @@ public class WorldConfigNodes {
.defaultValue(true)
.name("spawning-animals")
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> world.setSpawnFlags(world.getAllowMonsters(), newValue));
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> world.setSpawnFlags(world.getAllowMonsters(), newValue));
}));
final ConfigNode<Integer> SPAWNING_ANIMALS_TICKS = node(ConfigNode
@ -230,8 +231,8 @@ public class WorldConfigNodes {
.defaultValue(-1)
.name("spawning-animals-ticks")
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> world.setTicksPerAnimalSpawns(newValue));
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> world.setTicksPerAnimalSpawns(newValue));
}));
final ConfigNode<List<String>> SPAWNING_ANIMALS_EXCEPTIONS = node(ListConfigNode
@ -244,8 +245,8 @@ public class WorldConfigNodes {
.defaultValue(true)
.name("spawning-monsters")
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> world.setSpawnFlags(newValue, world.getAllowAnimals()));
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> world.setSpawnFlags(newValue, world.getAllowAnimals()));
}));
final ConfigNode<Integer> SPAWNING_MONSTERS_TICKS = node(ConfigNode
@ -253,8 +254,8 @@ public class WorldConfigNodes {
.defaultValue(-1)
.name("spawning-monsters-ticks")
.onSetValue((oldValue, newValue) -> {
if (world == null) return;
world.getBukkitWorld().peek(world -> world.setTicksPerMonsterSpawns(newValue));
if (!(world instanceof LoadedMultiverseWorld loadedWorld)) return;
loadedWorld.getBukkitWorld().peek(world -> world.setTicksPerMonsterSpawns(newValue));
}));
final ConfigNode<List<String>> SPAWNING_MONSTERS_EXCEPTIONS = node(ListConfigNode