Upstream/Multiverse-Core
1
0
Fork 0
mirror of https://github.com/Multiverse/Multiverse-Core.git synced 2024-11-22 10:36:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge the 2 gamerule command class.

Browse Source
This commit is contained in:
benwoo1110 2020-12-18 18:53:56 +08:00
parent 0641099055
commit 3809f47a54
3 changed files with 38 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/onarandombox/MultiverseCore/commands_acf/GameRuleCommand.java
View File

@ -4,9 +4,12 @@ import co.aikar.commands.annotation.CommandAlias;
import co.aikar.commands.annotation.CommandCompletion;
import co.aikar.commands.annotation.CommandPermission;
import co.aikar.commands.annotation.Description;
import co.aikar.commands.annotation.Flags;
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.GameRule;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
@ -19,21 +22,51 @@ public class GameRuleCommand extends MultiverseCommand {
super(plugin);
}
//TODO: Should it be `gamerule list` instead?
@Subcommand("gamerules")
@CommandPermission("multiverse.core.gamerule.list")
@Syntax("[world]")
@CommandCompletion("@MVWorlds")
@Description("See the list gamerules values for a given world.")
public void onGameRulesCommand(@NotNull CommandSender sender,
@NotNull @Flags("other,defaultself") MultiverseWorld world) {
World CBWorld = world.getCBWorld();
StringBuilder gameRules = new StringBuilder();
for (String gameRule : CBWorld.getGameRules()) {
if (gameRules.length() != 0) {
gameRules.append(ChatColor.WHITE).append(", ");
}
gameRules.append(ChatColor.AQUA)
.append(gameRule)
.append(ChatColor.WHITE)
.append(": ")
.append(ChatColor.GREEN)
.append(CBWorld.getGameRuleValue(GameRule.getByName(gameRule)));
}
sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
sender.sendMessage(gameRules.toString());
}
//TODO: Should it be `gamerule set` instead?
@Subcommand("gamerule")
@CommandPermission("multiverse.core.gamerule.set")
@Syntax("<rule> <value> [world]")
@CommandCompletion("@gameRules")
@Description("Allows a player to set a gamerule for a given world.")
public void onGameRuleCommand(@NotNull CommandSender sender,
@NotNull GameRule gameRule,
//TODO: Need to validate value.
@NotNull String value,
@NotNull World world) {
public void onGameRuleChangeCommand(@NotNull CommandSender sender,
@NotNull GameRule gameRule,
//TODO: Need to validate value.
@NotNull String value,
@NotNull World world) {
//TODO: Set actual gameRule.
sender.sendMessage(gameRule.getName());
sender.sendMessage(gameRule.getType().getName());
sender.sendMessage(value);
sender.sendMessage(world.getName());
sender.sendMessage("Gamerule setting isnt done yet.");
}
}

53
src/main/java/com/onarandombox/MultiverseCore/commands_acf/GamerulesCommand.java
View File

@ -1,53 +0,0 @@
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.Description;
import co.aikar.commands.annotation.Flags;
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.GameRule;
import org.bukkit.World;
import org.bukkit.command.CommandSender;
import org.jetbrains.annotations.NotNull;
@CommandAlias("mv")
public class GamerulesCommand extends MultiverseCommand {
public GamerulesCommand(MultiverseCore plugin) {
super(plugin);
}
//TODO: should it be `gamerule list` instead?
@Subcommand("gamerules")
@CommandPermission("multiverse.core.gamerule.list")
@Syntax("[world]")
@CommandCompletion("@MVWorlds")
@Description("See the list gamerules values for a given world.")
public void onGameRulesCommand(@NotNull CommandSender sender,
@NotNull @Flags("other,defaultself") MultiverseWorld world) {
World CBWorld = world.getCBWorld();
StringBuilder gameRules = new StringBuilder();
for (String gameRule : CBWorld.getGameRules()) {
if (gameRules.length() != 0) {
gameRules.append(ChatColor.WHITE).append(", ");
}
gameRules.append(ChatColor.AQUA)
.append(gameRule)
.append(ChatColor.WHITE)
.append(": ")
.append(ChatColor.GREEN)
.append(CBWorld.getGameRuleValue(GameRule.getByName(gameRule)));
}
sender.sendMessage("=== Gamerules for " + ChatColor.AQUA + world.getName() + ChatColor.WHITE + " ===");
sender.sendMessage(gameRules.toString());
}
}

4
src/main/java/com/onarandombox/MultiverseCore/commands_helper/MVCommandManager.java
View File

@ -19,7 +19,6 @@ import com.onarandombox.MultiverseCore.commands_acf.CreateCommand;
import com.onarandombox.MultiverseCore.commands_acf.DebugCommand;
import com.onarandombox.MultiverseCore.commands_acf.DeleteCommand;
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.InfoCommand;
@ -82,9 +81,6 @@ public class MVCommandManager extends PaperCommandManager {
registerCommand(new CloneCommand(plugin));
registerCommand(new ImportCommand(plugin));
registerCommand(new CheckCommand(plugin));
//TODO: Can combine both gamerules class into one.
registerCommand(new GamerulesCommand(plugin));
registerCommand(new GameRuleCommand(plugin));
}