Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2025-01-07 16:57:50 +01:00
Code Issues Projects Releases Wiki Activity

Add import command and improve world folder checking.

Browse Source
This commit is contained in:
benwoo1110 2020-12-18 11:24:42 +08:00
parent 519e449a54
commit e518ea4e47
6 changed files with 111 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java
View File

@ -38,6 +38,7 @@ import com.onarandombox.MultiverseCore.commands_acf.CreateCommand;
import com.onarandombox.MultiverseCore.commands_acf.GameRuleCommand;
import com.onarandombox.MultiverseCore.commands_acf.GamerulesCommand;
import com.onarandombox.MultiverseCore.commands_acf.GeneratorCommand;
import com.onarandombox.MultiverseCore.commands_acf.ImportCommand;
import com.onarandombox.MultiverseCore.commands_acf.ListCommand;
import com.onarandombox.MultiverseCore.commands_acf.ReloadCommand;
import com.onarandombox.MultiverseCore.commands_acf.RemoveCommand;
@ -751,6 +752,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
this.commandHandler.registerCommand(new ScriptCommand(this));
this.commandHandler.registerCommand(new GeneratorCommand(this));
this.commandHandler.registerCommand(new CloneCommand(this));
this.commandHandler.registerCommand(new ImportCommand(this));
//TODO: Can combine both gamerules class into one.
this.commandHandler.registerCommand(new GamerulesCommand(this));
this.commandHandler.registerCommand(new GameRuleCommand(this));

3
src/main/java/com/onarandombox/MultiverseCore/commands_acf/CreateCommand.java
View File

@ -25,11 +25,10 @@ public class CreateCommand extends MultiverseCommand {
@Subcommand("create")
@CommandPermission("multiverse.core.info")
@Syntax("<name> <env> -s [seed] -g [generator[:id]] -t [worldtype] [-n] -a [true|false]")
@CommandCompletion("")
@Description("Creates a new world and loads it.")
public void onCreateCommand(@NotNull CommandSender sender,
//TODO: Cleanup/fix conditions here
@NotNull @Conditions("isMVWorld:false|worldFolderExist:false") String worldName,
@NotNull @Conditions("creatableWorldName") String worldName,
@NotNull World.Environment environment,
@NotNull WorldFlags flags) {

8
src/main/java/com/onarandombox/MultiverseCore/commands_acf/DeleteCommand.java
View File

@ -5,12 +5,10 @@ import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Conditions;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
import co.aikar.commands.annotation.Single;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.api.MultiverseWorld;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
@ -28,7 +26,7 @@ public class DeleteCommand extends MultiverseCommand {
@CommandCompletion("@MVWorlds|@unloadedWorlds")
@Description("")
public void onDeleteCommand(@NotNull CommandSender sender,
@NotNull @Single @Conditions("isWorldInConfig") String worldName) {
@NotNull @Single @Conditions("isWorldInConfig|validWorldFolder") String worldName) {
this.plugin.getCommandQueueManager().addToQueue(sender, deleteRunnable(sender, worldName));
}
@ -39,8 +37,8 @@ public class DeleteCommand extends MultiverseCommand {
return () -> {
//TODO: deleteWorld method should take world object directly
String resultMessage = (this.plugin.getMVWorldManager().deleteWorld(worldName))
? ChatColor.GREEN + "World '" + worldName + "' Deleted!"
: ChatColor.RED + "World '" + worldName + "' could NOT be deleted!";
? ChatColor.GREEN + "World '" + worldName + "' is deleted!"
: ChatColor.RED + "World '" + worldName + "' could not be deleted!";
sender.sendMessage(resultMessage);
};

48
src/main/java/com/onarandombox/MultiverseCore/commands_acf/ImportCommand.java Normal file
View File

@ -0,0 +1,48 @@
package com.onarandombox.MultiverseCore.commands_acf;
import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Conditions;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Subcommand;
import co.aikar.commands.annotation.Syntax;
import com.onarandombox.MultiverseCore.MultiverseCore;
import com.onarandombox.MultiverseCore.commands_helper.WorldFlags;
import org.bukkit.ChatColor;
import org.bukkit.World;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
@CommandAlias("mv")
public class ImportCommand extends MultiverseCommand {
public ImportCommand(MultiverseCore plugin) {
super(plugin);
}
@Subcommand("import")
@CommandPermission("multiverse.core.import")
@Syntax("<world> <env> -g [generator[:id]] [-n]")
@CommandCompletion("@potentialWorlds")
@Description("Imports a new world of the specified type.")
public void onImportCommand(@NotNull CommandSender sender,
@NotNull @Conditions("importableWorldName") String worldName,
@NotNull World.Environment environment,
@NotNull WorldFlags flags) {
String resultMessage = (this.plugin.getMVWorldManager().addWorld(worldName,
environment,
null,
null,
null,
flags.getGenerator(),
flags.isSpawnAdjust())
)
? ChatColor.GREEN + "Import complete!"
: ChatColor.RED + "Failed! See console for more details.";
Command.broadcastCommandMessage(sender, resultMessage);
}
}

2
src/main/java/com/onarandombox/MultiverseCore/commands_acf/RemoveCommand.java
View File

@ -25,7 +25,7 @@ public class RemoveCommand extends MultiverseCommand {
@Syntax("<world>")
@Description("Unloads a world from Multiverse and removes it from worlds.yml, this does NOT DELETE the world folder.")
public void onRemoveCommand(@NotNull CommandSender sender,
@NotNull @Single @Conditions("isWorldInConfig|worldFolderExist:true") String worldName) {
@NotNull @Single @Conditions("isWorldInConfig") String worldName) {
sender.sendMessage((this.plugin.getMVWorldManager().removeWorldFromConfig(worldName))
? "World removed from config!"

94
src/main/java/com/onarandombox/MultiverseCore/commands_helper/CommandTools.java
View File

@ -41,7 +41,7 @@ public class CommandTools {
private final PaperCommandManager commandHandler;
private final MVWorldManager worldManager;
private static final Set<String> BLACKLIST_WORLD_FOLDER = Stream.of("plugins", "cache", "logs").collect(Collectors.toCollection(HashSet::new));
private static final Set<String> BLACKLIST_WORLD_FOLDER = Stream.of("plugins", "cache", "logs", "crash-reports").collect(Collectors.toCollection(HashSet::new));
private static final String UUID_REGEX = "[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[34][0-9a-fA-F]{3}-[89ab][0-9a-fA-F]{3}-[0-9a-fA-F]{12}";
public CommandTools(MultiverseCore plugin) {
@ -114,11 +114,11 @@ public class CommandTools {
@NotNull
private List<String> suggestPotentialWorlds(@NotNull BukkitCommandCompletionContext context) {
//TODO: Should be more efficient
//TODO: this should be in WorldManager API
List<String> knownWorlds = this.worldManager.getMVWorlds().stream()
.map(MultiverseWorld::getName)
.collect(Collectors.toList());
knownWorlds.addAll(this.worldManager.getUnloadedWorlds());
return Arrays.stream(this.plugin.getServer().getWorldContainer().listFiles())
.filter(File::isDirectory)
@ -196,6 +196,8 @@ public class CommandTools {
this::deriveGameRule
);
//TODO: Trim worldname strings
//TODO: Destination
}
@ -388,17 +390,23 @@ public class CommandTools {
if (env.equalsIgnoreCase("NORMAL") || env.equalsIgnoreCase("WORLD")) {
env = "NORMAL";
} else if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER")) {
}
else if (env.equalsIgnoreCase("HELL") || env.equalsIgnoreCase("NETHER")) {
env = "NETHER";
} else if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS")) {
}
else if (env.equalsIgnoreCase("END") || env.equalsIgnoreCase("THEEND") || env.equalsIgnoreCase("STARWARS")) {
env = "THE_END";
}
try {
return World.Environment.valueOf(env);
} catch (IllegalArgumentException e) {
throw new InvalidCommandArgument("'" + env + "' is not a valid environment.");
}
catch (IllegalArgumentException e) {
CommandSender sender = context.getSender();
sender.sendMessage("'" + env + "' is not a valid environment.");
sender.sendMessage("For a list of available world types, see " + ChatColor.AQUA + "/mv env");
//TODO: Possibly show valid environments.
throw new InvalidCommandArgument();
}
}
@ -426,7 +434,7 @@ public class CommandTools {
genArray.add("");
}
if (this.worldManager.getChunkGenerator(genArray.get(0), genArray.get(1), "test") == null) {
throw new InvalidCommandArgument("Invalid generator '" + value + "'.");
throw new InvalidCommandArgument("Invalid generator '" + value + "'. See /mv gens for available generators");
}
return value;
@ -543,8 +551,14 @@ public class CommandTools {
this.commandHandler.getCommandConditions().addCondition(
String.class,
"worldFolderExist",
this::checkWorldFolderExist
"creatableWorldName",
this::checkCreatableWorldName
);
this.commandHandler.getCommandConditions().addCondition(
String.class,
"importableWorldName",
this::checkImportableWorldName
);
this.commandHandler.getCommandConditions().addCondition(
@ -559,18 +573,8 @@ public class CommandTools {
@NotNull BukkitCommandExecutionContext executionContext,
@NotNull String worldName) {
boolean shouldBeMVWorld = Boolean.parseBoolean(context.getConfig());
boolean isMVWorld = this.worldManager.isMVWorld(worldName);
if (isMVWorld && !shouldBeMVWorld) {
executionContext.getSender().sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
+ "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
throw new ConditionFailedException();
}
if (!isMVWorld && shouldBeMVWorld) {
executionContext.getSender().sendMessage(ChatColor.RED + "Multiverse doesn't know about " + ChatColor.DARK_AQUA + worldName + ChatColor.WHITE + " yet.");
executionContext.getSender().sendMessage("Type " + ChatColor.DARK_AQUA + "/mv import ?" + ChatColor.WHITE + " for help!");
throw new ConditionFailedException();
if (!this.worldManager.isMVWorld(worldName)) {
throw new ConditionFailedException("World '" + worldName + "' not found.");
}
}
@ -597,40 +601,54 @@ public class CommandTools {
}
}
private void checkWorldFolderExist(@NotNull ConditionContext<BukkitCommandIssuer> context,
@NotNull BukkitCommandExecutionContext executionContext,
@NotNull String worldFolder) {
private void checkCreatableWorldName(@NotNull ConditionContext<BukkitCommandIssuer> context,
@NotNull BukkitCommandExecutionContext executionContext,
@NotNull String worldName) {
CommandSender sender = executionContext.getSender();
boolean shouldExist = Boolean.parseBoolean(context.getConfig());
boolean worldFileExist = new File(this.plugin.getServer().getWorldContainer(), worldFolder).exists();
if (worldFileExist && !shouldExist) {
sender.sendMessage(ChatColor.RED + "A Folder/World already exists with this name!");
sender.sendMessage(ChatColor.RED + "If you are confident it is a world you can import with /mv import");
if (this.worldManager.isMVWorld(worldName)) {
executionContext.getSender().sendMessage(ChatColor.RED + "Multiverse cannot create " + ChatColor.GOLD + ChatColor.UNDERLINE
+ "another" + ChatColor.RESET + ChatColor.RED + " world named " + worldName);
throw new ConditionFailedException();
}
if (!worldFileExist && shouldExist) {
sender.sendMessage(ChatColor.RED + "World folder '" + worldFolder + "' does not exist.");
//TODO: Use mv remove message.
//TODO: Possibly show potential worlds.
File worldFolder = new File(this.plugin.getServer().getWorldContainer(), worldName);
if (worldFolder.exists() && worldFolder.isDirectory()) {
executionContext.getSender().sendMessage(ChatColor.RED + "A Folder already exists with this name!");
if (folderHasDat(worldFolder)) {
executionContext.getSender().sendMessage(ChatColor.RED + "World Folder '" + worldName + "' already look like a world to me!");
executionContext.getSender().sendMessage(ChatColor.RED + "You can try importing it with /mv import");
}
throw new ConditionFailedException();
}
}
private void checkImportableWorldName(@NotNull ConditionContext<BukkitCommandIssuer> context,
@NotNull BukkitCommandExecutionContext executionContext,
@NotNull String worldName) {
if (this.worldManager.isMVWorld(worldName)) {
executionContext.getSender().sendMessage(ChatColor.GREEN + "Multiverse" + ChatColor.WHITE
+ " already knows about '" + ChatColor.AQUA + worldName + ChatColor.WHITE + "'!");
throw new ConditionFailedException();
}
checkValidWorldFolder(context, executionContext, worldName);
}
private void checkValidWorldFolder(@NotNull ConditionContext<BukkitCommandIssuer> context,
@NotNull BukkitCommandExecutionContext executionContext,
@NotNull String worldName) {
File worldFolder = new File(this.plugin.getServer().getWorldContainer(), worldName);
if (!worldFolder.isDirectory()) {
throw new ConditionFailedException("That world folder does not exist.");
//TODO: Possibly show potential worlds. Use flags.
throw new ConditionFailedException("World folder '"+ worldName +"' does not exist.");
}
if (BLACKLIST_WORLD_FOLDER.contains(worldFolder.getName())) {
throw new ConditionFailedException("World should be not in reversed server folders.");
throw new ConditionFailedException("World should not be in reserved server folders.");
}
if (!folderHasDat(worldFolder)) {
throw new ConditionFailedException("'" + worldName + "' does not appear to be a world. It is lacking a .dat file.");
throw new ConditionFailedException("'" + worldName + "' does not appear to be a world. It is lacking level.dat file.");
}
}