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

Refactor newMVWorld instance creation

Browse Source
This commit is contained in:
Ben Woo 2023-09-03 14:53:51 +08:00
parent 550dae92e9
commit f2a3d3f85a
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/onarandombox/MultiverseCore/worldnew/MVWorld.java
View File

@ -13,15 +13,16 @@ public class MVWorld extends OfflineWorld {
private final UUID worldUid;
public MVWorld(
@NotNull String worldName,
@NotNull WorldConfig worldConfig,
@NotNull UUID worldUid
@NotNull World world,
@NotNull WorldConfig worldConfig
) {
super(worldName, worldConfig);
this.worldUid = worldUid;
super(world.getName(), worldConfig);
this.worldUid = world.getUID();
worldConfig.setMVWorld(this);
worldConfig.load();
worldConfig.setEnvironment(world.getEnvironment());
worldConfig.setSeed(world.getSeed());
}
public Option<World> getBukkitWorld() {

35
src/main/java/com/onarandombox/MultiverseCore/worldnew/WorldManager.java
View File

@ -117,22 +117,13 @@ public class WorldManager {
Logging.fine("Loaded bukkit world: " + world.getName());
// Our multiverse world
WorldConfig worldConfig = worldsConfigManager.addWorldConfig(options.worldName());
worldConfig.setEnvironment(options.environment());
worldConfig.setGenerator(options.generator());
worldConfig.setSeed(world.getSeed());
OfflineWorld offlineWorld = new OfflineWorld(world.getName(), worldConfig);
offlineWorldsMap.put(offlineWorld.getName(), offlineWorld);
MVWorld mvWorld = new MVWorld(world.getName(), worldConfig, world.getUID());
worldsMap.put(mvWorld.getName(), mvWorld);
MVWorld mvWorld = newMVWorld(world);
mvWorld.getWorldConfig().setGenerator(options.generator());
saveWorldsConfig();
return Result.success(CreateWorldResult.Success.CREATED);
}
public Result<CreateWorldResult.Success, CreateWorldResult.Failure> importWorld(ImportWorldOptions options) {
public Result<CreateWorldResult.Success, CreateWorldResult.Failure> importWorld(ImportWorldOptions options) {
// Create bukkit world
World world = WorldCreator.name(options.worldName())
.environment(options.environment())
@ -145,19 +136,21 @@ public class WorldManager {
Logging.fine("Loaded bukkit world: " + world.getName());
// Our multiverse world
WorldConfig worldConfig = worldsConfigManager.addWorldConfig(options.worldName());
worldConfig.setEnvironment(world.getEnvironment());
worldConfig.setGenerator(options.generator());
worldConfig.setSeed(world.getSeed());
MVWorld mvWorld = newMVWorld(world);
mvWorld.getWorldConfig().setGenerator(options.generator());
saveWorldsConfig();
return Result.success(CreateWorldResult.Success.CREATED);
}
private MVWorld newMVWorld(World world) {
WorldConfig worldConfig = worldsConfigManager.addWorldConfig(world.getName());
OfflineWorld offlineWorld = new OfflineWorld(world.getName(), worldConfig);
offlineWorldsMap.put(offlineWorld.getName(), offlineWorld);
MVWorld mvWorld = new MVWorld(world.getName(), worldConfig, world.getUID());
MVWorld mvWorld = new MVWorld(world, worldConfig);
worldsMap.put(mvWorld.getName(), mvWorld);
saveWorldsConfig();
return Result.success(CreateWorldResult.Success.CREATED);
return mvWorld;
}
public Result<LoadWorldResult.Success, LoadWorldResult.Failure> loadWorld(@NotNull String worldName) {
@ -186,7 +179,7 @@ public class WorldManager {
// Our multiverse world
WorldConfig worldConfig = worldsConfigManager.getWorldConfig(offlineWorld.getName());
MVWorld mvWorld = new MVWorld(world.getName(), worldConfig, world.getUID());
MVWorld mvWorld = new MVWorld(world, worldConfig);
worldsMap.put(mvWorld.getName(), mvWorld);
saveWorldsConfig();