Upstream
/
Multiverse-Core
mirror of https://github.com/Multiverse/Multiverse-Core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improve import world result

This commit is contained in:
Ben Woo 2023-09-05 15:42:45 +08:00
parent e8ca95505b
commit 80ff02a92b
No known key found for this signature in database
GPG Key ID: FB2A3645536E12C8
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import com.onarandombox.MultiverseCore.worldnew.options.CreateWorldOptions;
import com.onarandombox.MultiverseCore.worldnew.options.ImportWorldOptions;
import com.onarandombox.MultiverseCore.worldnew.results.CreateWorldResult;
import com.onarandombox.MultiverseCore.worldnew.results.DeleteWorldResult;
import com.onarandombox.MultiverseCore.worldnew.results.ImportWorldResult;
import com.onarandombox.MultiverseCore.worldnew.results.LoadWorldResult;
import com.onarandombox.MultiverseCore.worldnew.results.RemoveWorldResult;
import com.onarandombox.MultiverseCore.worldnew.results.UnloadWorldResult;
@ -159,21 +160,23 @@ public class WorldManager {
return Result.success(CreateWorldResult.Success.CREATED);
}
public Result<CreateWorldResult.Success, CreateWorldResult.Failure> importWorld(ImportWorldOptions options) {
public Result<ImportWorldResult.Success, ImportWorldResult.Failure> importWorld(ImportWorldOptions options) {
if (!worldNameChecker.isValidWorldName(options.worldName())) {
return Result.failure(CreateWorldResult.Failure.INVALID_WORLDNAME);
return Result.failure(ImportWorldResult.Failure.INVALID_WORLDNAME);
}
if (!worldNameChecker.isValidWorldFolder(options.worldName())) {
return Result.failure(ImportWorldResult.Failure.WORLD_FOLDER_INVALID);
}
if (isMVWorld(options.worldName())) {
return Result.failure(CreateWorldResult.Failure.WORLD_EXIST_LOADED);
return Result.failure(ImportWorldResult.Failure.WORLD_EXIST_LOADED);
}
if (isOfflineWorld(options.worldName())) {
return Result.failure(CreateWorldResult.Failure.WORLD_EXIST_OFFLINE);
return Result.failure(ImportWorldResult.Failure.WORLD_EXIST_OFFLINE);
}
// TODO: Check if world folder exists
String parsedGenerator = Strings.isNullOrEmpty(options.generator())
? generatorProvider.getDefaultGeneratorForWorld(options.worldName())
: options.generator();
@ -187,7 +190,7 @@ public class WorldManager {
this.loadTracker.remove(options.worldName());
if (world == null) {
Logging.severe("Failed to create world: " + options.worldName());
return Result.failure(CreateWorldResult.Failure.BUKKIT_CREATION_FAILED);
return Result.failure(ImportWorldResult.Failure.BUKKIT_CREATION_FAILED);
}
Logging.fine("Loaded bukkit world: " + world.getName());
@ -195,7 +198,7 @@ public class WorldManager {
MVWorld mvWorld = newMVWorld(world);
mvWorld.getWorldConfig().setGenerator(Strings.isNullOrEmpty(parsedGenerator) ? "" : options.generator());
saveWorldsConfig();
return Result.success(CreateWorldResult.Success.CREATED);
return Result.success(ImportWorldResult.Success.IMPORTED);
}
private MVWorld newMVWorld(World world) {

33
src/main/java/com/onarandombox/MultiverseCore/worldnew/results/ImportWorldResult.java Normal file
View File

@ -0,0 +1,33 @@
package com.onarandombox.MultiverseCore.worldnew.results;
import co.aikar.locales.MessageKey;
import co.aikar.locales.MessageKeyProvider;
import com.onarandombox.MultiverseCore.utils.MVCorei18n;
import com.onarandombox.MultiverseCore.utils.result.FailureReason;
import com.onarandombox.MultiverseCore.utils.result.SuccessReason;
public class ImportWorldResult {
public enum Success implements SuccessReason {
IMPORTED
}
public enum Failure implements FailureReason {
INVALID_WORLDNAME(MVCorei18n.GENERIC_FAILURE),
WORLD_FOLDER_INVALID(MVCorei18n.GENERIC_FAILURE),
WORLD_EXIST_OFFLINE(MVCorei18n.GENERIC_FAILURE),
WORLD_EXIST_LOADED(MVCorei18n.GENERIC_FAILURE),
BUKKIT_CREATION_FAILED(MVCorei18n.GENERIC_FAILURE),
;
private final MessageKeyProvider message;
Failure(MessageKeyProvider message) {
this.message = message;
}
@Override
public MessageKey getMessageKey() {
return message.getMessageKey();
}
}
}