summaryrefslogtreewikicommitdiff
path: root/src/main/java/net/tylermurphy/hideAndSeek/command
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/command')
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/location/Locations.java17
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java2
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/world/Create.java36
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/world/Delete.java2
-rw-r--r--src/main/java/net/tylermurphy/hideAndSeek/command/world/List.java15
5 files changed, 45 insertions, 27 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/location/Locations.java b/src/main/java/net/tylermurphy/hideAndSeek/command/location/Locations.java
index dd73dac..c1316f8 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/location/Locations.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/location/Locations.java
@@ -5,22 +5,13 @@ package net.tylermurphy.hideAndSeek.command.location;
*/
public enum Locations {
- GAME("spawns.game"),
- LOBBY("spawns.lobby"),
- EXIT("spawns.exit"),
- SEEKER("spawns.seeker");
-
- private final String path;
- Locations(String path) {
- this.path = path;
- }
+ GAME,
+ LOBBY,
+ EXIT,
+ SEEKER;
public String message() {
return this + "_SPAWN";
}
- public String path(String additive) {
- return path + "." + additive;
- }
-
} \ No newline at end of file
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
index e9ed90c..b366b9a 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/util/CommandGroup.java
@@ -70,7 +70,7 @@ public class CommandGroup {
if (data == null) {
player.sendMessage(
- String.format("%s%sKenshin's Hide and Seek %s(%s1.7.0 BETA%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) +
+ String.format("%s%sKenshin's Hide and Seek %s(%s1.7.0%s)\n", ChatColor.AQUA, ChatColor.BOLD, ChatColor.GRAY, ChatColor.WHITE, ChatColor.GRAY) +
String.format("%sAuthor: %s[KenshinEto]\n", ChatColor.GRAY, ChatColor.WHITE) +
String.format("%sHelp Command: %s/hs %shelp", ChatColor.GRAY, ChatColor.AQUA, ChatColor.WHITE)
);
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/world/Create.java b/src/main/java/net/tylermurphy/hideAndSeek/command/world/Create.java
index 20ffd5a..e399993 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/world/Create.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/world/Create.java
@@ -3,10 +3,9 @@ package net.tylermurphy.hideAndSeek.command.world;
import net.tylermurphy.hideAndSeek.Main;
import net.tylermurphy.hideAndSeek.command.util.ICommand;
import net.tylermurphy.hideAndSeek.util.Location;
-import org.bukkit.Bukkit;
+import org.bukkit.World;
import org.bukkit.WorldType;
import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
import org.jetbrains.annotations.NotNull;
import java.util.Arrays;
@@ -23,20 +22,35 @@ public class Create implements ICommand {
List<String> worlds = Main.getInstance().getWorlds();
if(worlds.contains(args[0])) {
sender.sendMessage(errorPrefix + message("WORLD_EXISTS").addAmount(args[0]));
+ return;
}
WorldType type;
- if(args[1].equals("normal")) {
- type = WorldType.NORMAL;
- } else if(args[1].equals("flat")) {
- type = WorldType.FLAT;
- } else {
- sender.sendMessage(errorPrefix + message("INVALID_WORLD_TYPE").addAmount(args[1]));
- return;
+ World.Environment environment;
+ switch (args[1]) {
+ case "normal":
+ type = WorldType.NORMAL;
+ environment = World.Environment.NORMAL;
+ break;
+ case "flat":
+ type = WorldType.FLAT;
+ environment = World.Environment.NORMAL;
+ break;
+ case "nether":
+ type = WorldType.NORMAL;
+ environment = World.Environment.NETHER;
+ break;
+ case "end":
+ type = WorldType.NORMAL;
+ environment = World.Environment.THE_END;
+ break;
+ default:
+ sender.sendMessage(errorPrefix + message("INVALID_WORLD_TYPE").addAmount(args[1]));
+ return;
}
Location temp = new Location(args[0], 0, 0, 0);
- if (temp.load(type) == null) {
+ if (temp.load(type, environment) == null) {
sender.sendMessage(errorPrefix + message("WORLD_ADDED_FAILED"));
} else {
sender.sendMessage(messagePrefix + message("WORLD_ADDED").addAmount(args[0]));
@@ -61,7 +75,7 @@ public class Create implements ICommand {
return Collections.singletonList("name");
}
if(parameter.equals("type")) {
- return Arrays.asList("normal", "flat");
+ return Arrays.asList("normal", "flat", "nether", "end");
}
return null;
}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/world/Delete.java b/src/main/java/net/tylermurphy/hideAndSeek/command/world/Delete.java
index 4800e08..985ccdc 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/world/Delete.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/world/Delete.java
@@ -22,12 +22,14 @@ public class Delete implements ICommand {
java.util.List<String> worlds = Main.getInstance().getWorlds();
if(!worlds.contains(args[0])) {
sender.sendMessage(errorPrefix + message("WORLD_DOESNT_EXIST").addAmount(args[0]));
+ return;
}
Confirm.Confirmation confirmation = new Confirm.Confirmation(args[0], world -> {
java.util.List<String> worlds_now = Main.getInstance().getWorlds();
if(!worlds_now.contains(world)) {
sender.sendMessage(errorPrefix + message("WORLD_DOESNT_EXIST").addAmount(world));
+ return;
}
World bukkit_world = Bukkit.getWorld(world);
if(bukkit_world != null && bukkit_world.getPlayers().size() > 0) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/command/world/List.java b/src/main/java/net/tylermurphy/hideAndSeek/command/world/List.java
index 2c0f745..bdb98e5 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/command/world/List.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/command/world/List.java
@@ -4,6 +4,7 @@ import net.tylermurphy.hideAndSeek.Main;
import net.tylermurphy.hideAndSeek.command.util.ICommand;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
+import org.bukkit.World;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;
@@ -20,8 +21,18 @@ public class List implements ICommand {
} else {
StringBuilder response = new StringBuilder(messagePrefix + message("LIST_WORLDS"));
for (String world : worlds) {
- boolean loaded = Bukkit.getWorld(world) != null;
- response.append("\n ").append(world).append(": ").append(loaded ? ChatColor.GREEN + "LOADED" : ChatColor.YELLOW + "NOT LOADED").append(ChatColor.WHITE);
+ String status = ChatColor.GRAY + "NOT LOADED";
+ World bukkit_world = Bukkit.getWorld(world);
+ if(bukkit_world != null) {
+ if(bukkit_world.getEnvironment() == World.Environment.NETHER) {
+ status = ChatColor.RED + "NETHER";
+ } else if(bukkit_world.getEnvironment() == World.Environment.THE_END) {
+ status = ChatColor.YELLOW + "THE END";
+ } else {
+ status = ChatColor.GREEN + bukkit_world.getWorldType().toString();
+ }
+ }
+ response.append("\n ").append(world).append(": ").append(status).append(ChatColor.WHITE);
}
sender.sendMessage(response.toString());
}