From 64d6118b7280a90a175651f4f34db42baf892117 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Mon, 15 Jan 2024 22:51:25 +0100 Subject: [PATCH] Fixed some texts and added other player functionality --- .../java/xyz/tronax/repairall/RepairAll.java | 4 +- .../repairall/commands/CMD_repairall.java | 80 +++++++++++++------ src/main/resources/plugin.yml | 1 + 3 files changed, 57 insertions(+), 28 deletions(-) diff --git a/src/main/java/xyz/tronax/repairall/RepairAll.java b/src/main/java/xyz/tronax/repairall/RepairAll.java index 69cd556..edb58aa 100644 --- a/src/main/java/xyz/tronax/repairall/RepairAll.java +++ b/src/main/java/xyz/tronax/repairall/RepairAll.java @@ -12,7 +12,7 @@ public final class RepairAll extends JavaPlugin { @Override public void onEnable() { // Plugin startup logic - cmdmsg(prefix + " §aPlugin started successfully!"); + cmdmsg(prefix + "§aPlugin started successfully!"); registerCmd("repairall", new CMD_repairall()); @@ -23,7 +23,7 @@ public final class RepairAll extends JavaPlugin { @Override public void onDisable() { // Plugin shutdown logic - cmdmsg(prefix + " §cPlugin stopped successfully!"); + cmdmsg(prefix + "§cPlugin stopped successfully!"); } diff --git a/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java b/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java index ba4c20e..8cf7e21 100644 --- a/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java +++ b/src/main/java/xyz/tronax/repairall/commands/CMD_repairall.java @@ -16,37 +16,65 @@ public class CMD_repairall implements CommandExecutor { if(!(sender instanceof Player)) { sender.sendMessage(RepairAll.prefix + "§cYou are not a player!"); } else { - Player p = (Player) sender; - - ItemStack[] items = p.getInventory().getContents(); - ItemStack[] armor = p.getInventory().getArmorContents(); - - for(int i = 0; i < items.length; i++) { - ItemStack e = items[i]; - if(e != null) { - ItemMeta me = e.getItemMeta(); - Damageable mee = (Damageable) me; - mee.setDamage(0); - e.setItemMeta(mee); - }else{ - + if(args.length == 0) { + Player p = (Player) sender; + ItemStack[] items = p.getInventory().getContents(); + ItemStack[] armor = p.getInventory().getArmorContents(); + for(int i = 0; i < items.length; i++) { + ItemStack e = items[i]; + if(e != null) { + ItemMeta me = e.getItemMeta(); + Damageable mee = (Damageable) me; + mee.setDamage(0); + e.setItemMeta(mee); + }else{} } - } - for(int i = 0; i < armor.length; i++) { - ItemStack a = armor[i]; - if(a != null) { - ItemMeta ae = a.getItemMeta(); - Damageable aee = (Damageable) ae; - aee.setDamage(0); - a.setItemMeta(aee); + for(int i = 0; i < armor.length; i++) { + ItemStack a = armor[i]; + if(a != null) { + ItemMeta ae = a.getItemMeta(); + Damageable aee = (Damageable) ae; + aee.setDamage(0); + a.setItemMeta(aee); + } else {} + } + p.sendMessage(RepairAll.prefix + "§aYour items were repaired!"); + Bukkit.getConsoleSender().sendMessage(RepairAll.prefix + "§4" + p.getName().toString() + " §ahas repaired all his items!"); + } else if(args.length == 1) { + Player t = Bukkit.getPlayer(args[1]); + if(t == null) { + sender.sendMessage(RepairAll.prefix + "§4" + t.getName() + " §cis not online!"); } else { - + Player p = (Player) sender; + ItemStack[] items = t.getInventory().getContents(); + ItemStack[] armor = t.getInventory().getArmorContents(); + for(int i = 0; i < items.length; i++) { + ItemStack e = items[i]; + if(e != null) { + ItemMeta me = e.getItemMeta(); + Damageable mee = (Damageable) me; + mee.setDamage(0); + e.setItemMeta(mee); + }else{} + } + for(int i = 0; i < armor.length; i++) { + ItemStack a = armor[i]; + if(a != null) { + ItemMeta ae = a.getItemMeta(); + Damageable aee = (Damageable) ae; + aee.setDamage(0); + a.setItemMeta(aee); + } else {} + } + p.sendMessage(RepairAll.prefix + "§aThe items of §e" + t.getName() + " §agot repaired!"); + Bukkit.getConsoleSender().sendMessage(RepairAll.prefix + "§4" + p.getName().toString() + " §arepaired the items of §e" + t.getName() + " §a!"); + t.sendMessage(RepairAll.prefix + " §aYour items were repaired!"); } - + } else { + sender.sendMessage(RepairAll.prefix + "§cToo many arguments!"); } - p.sendMessage(RepairAll.prefix + "§aAll your items have been repaired!"); - Bukkit.getConsoleSender().sendMessage(RepairAll.prefix + "§4" + p.getName().toString() + " §ahas repaired all his items!"); + } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index d13c61d..1c04b1f 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -10,6 +10,7 @@ commands: description: Repairs all of your items! permission: repairall.repair permission-message: '§cRepair§7All §8| §cYou are not allowed to do this!' + usage: /repairall aliases: - ra - repall