did some more work on commands
Java CI with Maven / build (push) Has been cancelled

This commit is contained in:
2025-02-10 18:49:00 +00:00
parent db2a40e178
commit 3eac0e391f
4 changed files with 145 additions and 37 deletions
@@ -1,7 +1,20 @@
package dev.zxq5.fantasysmp.chatutils; package dev.zxq5.fantasysmp.chatutils;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
public class Chat { public class Chat {
public static String EVENTPREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET; public static String EVENTPREFIX = ChatColor.WHITE + "<" + ChatColor.AQUA + "Server" + ChatColor.WHITE + "> " + ChatColor.RESET;
public static void success(Player player, String message) {
player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message);
}
public static void error(Player player, String message) {
player.sendMessage(EVENTPREFIX + ChatColor.RED + message);
}
public static void info(Player player, String message) {
player.sendMessage(EVENTPREFIX + message);
}
} }
@@ -1,5 +1,6 @@
package dev.zxq5.fantasysmp.groups; package dev.zxq5.fantasysmp.groups;
import dev.zxq5.fantasysmp.chatutils.Chat;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -10,14 +11,15 @@ import org.bukkit.entity.Player;
* *
* team list => TODO * team list => TODO
* team create <name> => TODO * team create <name> => TODO
* team <name> rename <new name> => TODO * team rename <new name> => TODO
* team <name> transfer <player> => TODO * team transfer <player> => TODO
* team join <name> => TODO * team join <name> => TODO
* team <name> invite <player> => TODO * team invite <player> => TODO
* team <name> leave => TODO * team leave => TODO
* team <name> disband => TODO * team disband => TODO
* team <name> setwarp => TODO * team setwarp => TODO
* team delwarp => TODO * team delwarp => TODO
* team warp <name> => TODO
* team kick => TODO * team kick => TODO
* team log => TODO * team log => TODO
* *
@@ -41,9 +43,75 @@ public class Commands implements CommandExecutor {
return true; return true;
} }
public void handleTeamCommands(Player player, String[] args) {} public void handleTeamCommands(Player player, String[] args) {
switch (args[0]) {
case "list" -> this.handleList(player, args);
case "create" -> this.handleCreate(player, args);
case "rename" -> this.handleRename(player, args);
case "transfer" -> this.handleTransfer(player, args);
case "join" -> this.handleJoin(player, args);
case "invite" -> this.handleInvite(player, args);
case "leave" -> this.handleLeave(player, args);
case "disband" -> this.handleDisband(player, args);
case "setwarp" -> this.handleSetWarp(player, args);
case "delwarp" -> this.handleDelWarp(player, args);
case "warp" -> this.handleWarp(player, args);
case "kick" -> this.handleKick(player, args);
case "log" -> this.handleLog(player, args);
}
}
public void handleRankCommands(Player player, String[] args) {} public void handleRankCommands(Player player, String[] args) {
// check perms
if (!(player.hasPermission("fantasysmp.ranks"))) {
Chat.error(player, "You do not have permission to use this command.");
return;
}
switch (args[0]) {
case "create" -> this.handleCreateRank(player, args);
case "rename" -> this.handleRenameRank(player, args);
case "delete" -> this.handleDeleteRank(player, args);
case "add" -> this.handleAddRank(player, args);
case "remove" -> this.handleRemoveRank(player, args);
}
}
public void handleList(Player player, String[] args) {}
public void handleCreate(Player player, String[] args) {}
public void handleRename(Player player, String[] args) {}
public void handleTransfer(Player player, String[] args) {}
public void handleJoin(Player player, String[] args) {}
public void handleInvite(Player player, String[] args) {}
public void handleLeave(Player player, String[] args) {}
public void handleDisband(Player player, String[] args) {}
public void handleSetWarp(Player player, String[] args) {}
public void handleDelWarp(Player player, String[] args) {}
public void handleWarp(Player player, String[] args) {}
public void handleKick(Player player, String[] args) {}
public void handleLog(Player player, String[] args) {}
public void handleCreateRank(Player player, String[] args) {}
public void handleRenameRank(Player player, String[] args) {}
public void handleDeleteRank(Player player, String[] args) {}
public void handleAddRank(Player player, String[] args) {}
public void handleRemoveRank(Player player, String[] args) {}
public Commands() {} public Commands() {}
} }
@@ -1,7 +1,11 @@
package dev.zxq5.fantasysmp.groups; package dev.zxq5.fantasysmp.groups;
import com.google.gson.Gson; import com.google.gson.Gson;
import org.bukkit.entity.Player;
import java.io.*; import java.io.*;
import java.util.ArrayList;
import static org.bukkit.Bukkit.getServer; import static org.bukkit.Bukkit.getServer;
public class Team { public class Team {
@@ -9,8 +13,43 @@ public class Team {
private String name; private String name;
private String ownerUUID; private String ownerUUID;
private String[] members; private ArrayList<String> members;
private String[] tag; private String tag;
public Team(Player creator, String name, String tag) {
this.name = name;
this.tag = tag;
this.ownerUUID = creator.getUniqueId().toString();
this.members = new ArrayList<>();
members.add(creator.getUniqueId().toString());
}
public Team createTeam(Player creator, String name) {
Team team = new Team(creator, name, name);
return team;
}
public static void loadTeams() throws Exception { public static void loadTeams() throws Exception {
File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder(); File dataFolder = getServer().getPluginManager().getPlugin("Fantasysmp").getDataFolder();
@@ -1,5 +1,6 @@
package dev.zxq5.fantasysmp.warps; package dev.zxq5.fantasysmp.warps;
import dev.zxq5.fantasysmp.chatutils.Chat;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
@@ -45,60 +46,60 @@ public class Warper implements CommandExecutor {
public void handleHome(Player player, String[] args) { public void handleHome(Player player, String[] args) {
if (args.length != 0) { if (args.length != 0) {
this.error(player,"Usage: /home"); Chat.error(player,"Usage: /home");
return; return;
} }
Warp warp = Warp.getHome(player.getUniqueId()); Warp warp = Warp.getHome(player.getUniqueId());
if (warp == null) { if (warp == null) {
this.error(player,"No home set! use /sethome to set one."); Chat.error(player,"No home set! use /sethome to set one.");
return; return;
} }
warp.execute(player); warp.execute(player);
this.success(player,"Warped Home!"); Chat.success(player,"Warped Home!");
} }
public void handleSetHome(Player player, String[] args) { public void handleSetHome(Player player, String[] args) {
if (args.length != 0) { if (args.length != 0) {
this.error(player,"Usage: /sethome"); Chat.error(player,"Usage: /sethome");
return; return;
} }
Warp.setHome(player); Warp.setHome(player);
this.success(player,"Home set Successfully!"); Chat.success(player,"Home set Successfully!");
} }
public void handleWarp(Player player, String[] args) { public void handleWarp(Player player, String[] args) {
if (args.length != 1) { if (args.length != 1) {
this.error(player, "Usage: /warp <name>"); Chat.error(player, "Usage: /warp <name>");
return; return;
} }
Warp warp = Warp.getWarp(args[0]); Warp warp = Warp.getWarp(args[0]);
if (warp == null) { if (warp == null) {
this.error(player, "Location [" + args[0] + "] does not exist or is not accessible to you!"); Chat.error(player, "Location [" + args[0] + "] does not exist or is not accessible to you!");
return; return;
}; };
warp.execute(player); warp.execute(player);
this.success(player, "Warped!"); Chat.success(player, "Warped!");
} }
public void handleSetWarp(Player player, String[] args) { public void handleSetWarp(Player player, String[] args) {
if (!(player.hasPermission("fantasysmp.manage_warps"))) { if (!(player.hasPermission("fantasysmp.manage_warps"))) {
this.error(player, "You do not have permission to use this command."); Chat.error(player, "You do not have permission to use this command.");
return; return;
} }
if (args.length != 1) { if (args.length != 1) {
this.error(player, "Usage: /setwarp <name>"); Chat.error(player, "Usage: /setwarp <name>");
return; return;
} }
Warp.setWarp(args[0], player, WarpType.PUBLIC); Warp.setWarp(args[0], player, WarpType.PUBLIC);
this.success(player, "Warp [" + args[0] + "] set Successfully!"); Chat.success(player, "Warp [" + args[0] + "] set Successfully!");
} }
public void handleDelWarp(Player player, String[] args) { public void handleDelWarp(Player player, String[] args) {
@@ -109,28 +110,15 @@ public class Warper implements CommandExecutor {
try { try {
Warp.loadWarps(); Warp.loadWarps();
} catch (Exception e) { } catch (Exception e) {
this.error(player, "Failed to reload warps. please contact zxq5."); Chat.error(player, "Failed to reload warps. please contact zxq5.");
e.printStackTrace(); e.printStackTrace();
} }
this.success(player, "Successfully reloaded warps from warps.json"); Chat.success(player, "Successfully reloaded warps from warps.json");
} }
public void handleWarpsOther(Player player, String[] args) { public void handleWarpsOther(Player player, String[] args) {
if (args.length == 0) { if (args.length == 0) {
this.info(player, Warp.listWarps(player.getUniqueId())); Chat.info(player, Warp.listWarps(player.getUniqueId()));
} }
} }
public void error(Player player, String message) {
player.sendMessage(EVENTPREFIX + ChatColor.RED + message);
}
public void success(Player player, String message) {
player.sendMessage(EVENTPREFIX + ChatColor.GREEN + message);
}
public void info(Player player, String message) {
player.sendMessage(EVENTPREFIX + message);
}
} }