From c825f3c874ba2f683499f635c16484e6bbe913e2 Mon Sep 17 00:00:00 2001
From: copokbl <copokbl@serble.net>
Date: Wed, 27 Mar 2024 00:10:26 +1100
Subject: [PATCH] Better messages and new version

---
 pom.xml                                       |  2 +-
 src/main/java/net/serble/estools/CMD.java     |  4 ++--
 .../net/serble/estools/Commands/CChest.java   |  1 -
 .../net/serble/estools/Commands/Feed.java     |  6 ++++++
 .../java/net/serble/estools/Commands/Fix.java | 20 +++++++++----------
 .../java/net/serble/estools/Commands/Fly.java | 11 +++-------
 .../net/serble/estools/Commands/GetInfo.java  | 13 ++----------
 .../java/net/serble/estools/Commands/H.java   | 10 ++++++----
 .../net/serble/estools/Commands/Heal.java     |  5 +++--
 .../java/net/serble/estools/Commands/I.java   | 10 ++++++----
 .../net/serble/estools/Commands/Infinite.java |  4 ++--
 .../net/serble/estools/Commands/Invsee.java   |  2 +-
 .../net/serble/estools/Commands/Music.java    |  1 -
 .../net/serble/estools/Commands/Night.java    |  1 +
 .../estools/Commands/PowerPick/PowerPick.java |  1 +
 .../serble/estools/Commands/SetHealth.java    |  9 +++++----
 .../net/serble/estools/Commands/SetStack.java |  3 ++-
 .../net/serble/estools/Commands/Smite.java    |  3 +--
 .../net/serble/estools/Commands/Sudo.java     |  2 +-
 .../net/serble/estools/Commands/Suicide.java  |  1 +
 .../java/net/serble/estools/Commands/Sun.java |  1 +
 .../estools/Commands/Teleport/TPAll.java      |  6 ++++--
 .../estools/Commands/Teleport/TPHere.java     |  2 ++
 src/main/resources/plugin.yml                 |  2 +-
 24 files changed, 61 insertions(+), 59 deletions(-)

diff --git a/pom.xml b/pom.xml
index 53fadc1..4828393 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>net.serble.EsTools</groupId>
   <artifactId>EsTools</artifactId>
-  <version>3.3</version>
+  <version>4.0</version>
   <packaging>jar</packaging>
 
   <name>EsTools</name>
diff --git a/src/main/java/net/serble/estools/CMD.java b/src/main/java/net/serble/estools/CMD.java
index c0fbb04..c70ff1c 100644
--- a/src/main/java/net/serble/estools/CMD.java
+++ b/src/main/java/net/serble/estools/CMD.java
@@ -137,10 +137,10 @@ public static String[] removeArgs(String[] args, int amount) {
 		return outp;
 	}
 
-	public static String argsToString(String[] args, int amount) {
+	public static String argsToString(String[] args, int skipAmount) {
 		StringBuilder outp = new StringBuilder();
 
-		for (int i = amount; i < args.length; i++) {
+		for (int i = skipAmount; i < args.length; i++) {
 			outp.append(args[i]);
 		}
 
diff --git a/src/main/java/net/serble/estools/Commands/CChest.java b/src/main/java/net/serble/estools/Commands/CChest.java
index 2cd94ed..4930ede 100644
--- a/src/main/java/net/serble/estools/Commands/CChest.java
+++ b/src/main/java/net/serble/estools/Commands/CChest.java
@@ -76,7 +76,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		p.openInventory(inv);
 		
 		cchests.put(puid, inv);
-		
 		return true;
 	}
 	
diff --git a/src/main/java/net/serble/estools/Commands/Feed.java b/src/main/java/net/serble/estools/Commands/Feed.java
index e9eeea2..8919567 100644
--- a/src/main/java/net/serble/estools/Commands/Feed.java
+++ b/src/main/java/net/serble/estools/Commands/Feed.java
@@ -30,6 +30,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			p.setFoodLevel(20);
 			p.setSaturation(20);
 		}
+
+		if (args.length == 0) {
+			s(sender, "&aFed!");
+		} else {
+			s(sender, "&aFed &6%s&a!", args[0]);
+		}
 		return true;
 	}
 
diff --git a/src/main/java/net/serble/estools/Commands/Fix.java b/src/main/java/net/serble/estools/Commands/Fix.java
index 98c1fe1..c4f1e7c 100644
--- a/src/main/java/net/serble/estools/Commands/Fix.java
+++ b/src/main/java/net/serble/estools/Commands/Fix.java
@@ -78,33 +78,31 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
 			p.getInventory().setContents(contents);
 		} else {
-			ItemStack ir = Repair(is);
-//
-//			if (ir != null) {
-//				is = ir.clone();
-//			}
-		}
+            Repair(is);
+        }
 
+		s(sender, "&aRepaired &6%s's &aitem(s)!", getEntityName(p));
 		return true;
 	}
 
-	private ItemStack Repair(ItemStack is) {
-		if (is == null)
-			return null;
+	private void Repair(ItemStack is) {
+		if (is == null) {
+			return;
+		}
 
 		if (Main.version > 12) {
 			ItemMeta im = is.getItemMeta();
 
-			if (im == null) return null;
+			if (im == null) return;
 
 			((Damageable) im).setDamage(0);
 
 			is.setItemMeta(im);
 		} else {
+			//noinspection deprecation
 			is.setDurability((short) 0);
 		}
 
-		return is;
 	}
 
 	@Override
diff --git a/src/main/java/net/serble/estools/Commands/Fly.java b/src/main/java/net/serble/estools/Commands/Fly.java
index 0efb84e..bb1023f 100644
--- a/src/main/java/net/serble/estools/Commands/Fly.java
+++ b/src/main/java/net/serble/estools/Commands/Fly.java
@@ -6,6 +6,7 @@
 import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
+import java.util.Objects;
 
 public class Fly extends MultiPlayerCommand {
 
@@ -26,16 +27,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				return false;
 		}
 
-		Player s = null;
-
-		if (sender instanceof Player) {
-			s = (Player)sender;
-		}
-
-		for (Player p : ps) {
+        for (Player p : ps) {
 			boolean isFly = p.getAllowFlight();
 
-			if (args.length != 0 && args[0] != "*") {
+			if (args.length != 0 && !Objects.equals(args[0], "*")) {
 				if (isFly)
 					s(sender, "&aFly Disabled for &6%s", p.getName());
 				else
diff --git a/src/main/java/net/serble/estools/Commands/GetInfo.java b/src/main/java/net/serble/estools/Commands/GetInfo.java
index 85a6b64..975e93b 100644
--- a/src/main/java/net/serble/estools/Commands/GetInfo.java
+++ b/src/main/java/net/serble/estools/Commands/GetInfo.java
@@ -67,8 +67,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			}
 		}
 
-		// Living entity
-		if (entity instanceof LivingEntity) {
+		if (entity instanceof LivingEntity) {  // Living entity
 			LivingEntity le = (LivingEntity) entity;
 			String maxHealth = String.valueOf(Math.round(getMaxHealth(le)));
 
@@ -118,9 +117,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
 		}
 
-		if (entity instanceof Player) {
-			// Players
-
+		if (entity instanceof Player) {  // Players
 			Player player = (Player) entity;
 
 			String playerInfo =
@@ -141,12 +138,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			}
 
 			info += playerInfo;
-		} else {
-			// Non player entities
-
-			String entityInfo = "";
-			entityInfo = String.format(entityInfo);
-			// info += entityInfo; // currently there is no extra info for non player entities
 		}
 		s(sender, info);
 		return true;
diff --git a/src/main/java/net/serble/estools/Commands/H.java b/src/main/java/net/serble/estools/Commands/H.java
index a88023b..c61f501 100644
--- a/src/main/java/net/serble/estools/Commands/H.java
+++ b/src/main/java/net/serble/estools/Commands/H.java
@@ -36,10 +36,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		
 		ItemStack is = Give.getItem(args[0], amount);
 		
-		if (is != null)
-			setMainHand(p, is);
-		else
-			s(sender, "&cItem &6%s&c not found.", args[0]);
+		if (is != null) {
+            setMainHand(p, is);
+			s(sender, "&aGave &6%s", is.getType().name());
+        } else {
+            s(sender, "&cItem &6%s&c not found", args[0]);
+        }
 		
 		return true;
 	}
diff --git a/src/main/java/net/serble/estools/Commands/Heal.java b/src/main/java/net/serble/estools/Commands/Heal.java
index fe87dfb..3651c7c 100644
--- a/src/main/java/net/serble/estools/Commands/Heal.java
+++ b/src/main/java/net/serble/estools/Commands/Heal.java
@@ -22,8 +22,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		} else {
 			p = getEntity(sender, args[0]);
 			
-			if (p == null)
-				return false;
+			if (p == null) {
+                return false;
+            }
 			
 			s(sender, "&aHealed &6%s", getEntityName(p));
 		}
diff --git a/src/main/java/net/serble/estools/Commands/I.java b/src/main/java/net/serble/estools/Commands/I.java
index 69e94f4..b8f6eb5 100644
--- a/src/main/java/net/serble/estools/Commands/I.java
+++ b/src/main/java/net/serble/estools/Commands/I.java
@@ -36,10 +36,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		
 		ItemStack is = Give.getItem(args[0], amount);
 		
-		if (is != null)
-			p.getInventory().addItem(is);
-		else
-			s(sender, "&cItem &6%s&c not found.", args[0]);
+		if (is != null) {
+            p.getInventory().addItem(is);
+			s(sender, "&aGave &6%s", is.getType().name());
+        } else {
+            s(sender, "&cItem &6%s&c not found", args[0]);
+        }
 		
 		return true;
 	}
diff --git a/src/main/java/net/serble/estools/Commands/Infinite.java b/src/main/java/net/serble/estools/Commands/Infinite.java
index d6cf9a4..c8570f4 100644
--- a/src/main/java/net/serble/estools/Commands/Infinite.java
+++ b/src/main/java/net/serble/estools/Commands/Infinite.java
@@ -32,10 +32,10 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
         if (!currentPlayers.contains(pu)) {
             currentPlayers.add(pu);
-            s(sender, "&aYou now have infinite blocks!");
+            s(sender, "&aYou now have &6infinite &ablocks!");
         } else {
             currentPlayers.remove(pu);
-            s(sender, "&aYou no longer have infinite blocks");
+            s(sender, "&aYou now have &6finite &ablocks!");
         }
 
         return true;
diff --git a/src/main/java/net/serble/estools/Commands/Invsee.java b/src/main/java/net/serble/estools/Commands/Invsee.java
index e7f9dc1..e00cc0c 100644
--- a/src/main/java/net/serble/estools/Commands/Invsee.java
+++ b/src/main/java/net/serble/estools/Commands/Invsee.java
@@ -25,7 +25,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 
 		((Player) sender).openInventory(target.getInventory());
 
-        s(sender, "&aOpened %s's Inventory", target.getName());
+        s(sender, "&aOpened &6%s's &aInventory", target.getName());
 		return true;
 	}
 
diff --git a/src/main/java/net/serble/estools/Commands/Music.java b/src/main/java/net/serble/estools/Commands/Music.java
index ae97baa..48a35e4 100644
--- a/src/main/java/net/serble/estools/Commands/Music.java
+++ b/src/main/java/net/serble/estools/Commands/Music.java
@@ -57,7 +57,6 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		name = String.valueOf(name.charAt(0)).toUpperCase() + name.substring(1);
 		
 		s(sender, "&aNow Playing: &6%s", name);
-		
 		return true;
 	}
 	
diff --git a/src/main/java/net/serble/estools/Commands/Night.java b/src/main/java/net/serble/estools/Commands/Night.java
index 2b0d299..1d46fba 100644
--- a/src/main/java/net/serble/estools/Commands/Night.java
+++ b/src/main/java/net/serble/estools/Commands/Night.java
@@ -14,6 +14,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             return true;
 
         ((Player)sender).getWorld().setTime(13000);
+        s(sender, "&aSet time to &6night");
         return true;
     }
 
diff --git a/src/main/java/net/serble/estools/Commands/PowerPick/PowerPick.java b/src/main/java/net/serble/estools/Commands/PowerPick/PowerPick.java
index be18b14..f88be34 100644
--- a/src/main/java/net/serble/estools/Commands/PowerPick/PowerPick.java
+++ b/src/main/java/net/serble/estools/Commands/PowerPick/PowerPick.java
@@ -29,6 +29,7 @@ public static void cmd(CommandSender sender, ItemStack pp) {
         Player p = (Player)sender;
 
         p.getInventory().addItem(pp);
+        s(sender, "&aThere you go!");
     }
 
     public static void init() {
diff --git a/src/main/java/net/serble/estools/Commands/SetHealth.java b/src/main/java/net/serble/estools/Commands/SetHealth.java
index 500b281..16ed206 100644
--- a/src/main/java/net/serble/estools/Commands/SetHealth.java
+++ b/src/main/java/net/serble/estools/Commands/SetHealth.java
@@ -44,10 +44,11 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 			
 			setHealth(p, health);
 			
-			if (args.length > 1)
-				s(sender, "&aSet health for &6%s&a to &6%s", getEntityName(p), String.valueOf(health));
-			else
-				s(sender, "&aSet health to &6%s", String.valueOf(health));
+			if (args.length > 1) {
+                s(sender, "&aSet health for &6%s&a to &6%s", getEntityName(p), String.valueOf(health));
+            } else {
+                s(sender, "&aSet health to &6%s", String.valueOf(health));
+            }
 		}
 		else
 			s(sender, "&cCannot set health to less than 0");
diff --git a/src/main/java/net/serble/estools/Commands/SetStack.java b/src/main/java/net/serble/estools/Commands/SetStack.java
index 78d682d..9affd35 100644
--- a/src/main/java/net/serble/estools/Commands/SetStack.java
+++ b/src/main/java/net/serble/estools/Commands/SetStack.java
@@ -29,7 +29,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		}
 
 		getMainHand(((Player)sender)).setAmount(amount);
-		
+
+		s(sender, "&aSet stack size to &6%d", amount);
 		return true;
 	}
 
diff --git a/src/main/java/net/serble/estools/Commands/Smite.java b/src/main/java/net/serble/estools/Commands/Smite.java
index 5ff578a..2871e87 100644
--- a/src/main/java/net/serble/estools/Commands/Smite.java
+++ b/src/main/java/net/serble/estools/Commands/Smite.java
@@ -26,8 +26,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 				
 		}
 
-		if (args.length > 0)
-			s(sender, "&aBAM!");
+        s(sender, "&aBAM!");
 		return true;
 	}
 
diff --git a/src/main/java/net/serble/estools/Commands/Sudo.java b/src/main/java/net/serble/estools/Commands/Sudo.java
index 538d420..63c10e4 100644
--- a/src/main/java/net/serble/estools/Commands/Sudo.java
+++ b/src/main/java/net/serble/estools/Commands/Sudo.java
@@ -31,7 +31,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		com = new StringBuilder(com.toString().trim());
 		
 		Bukkit.dispatchCommand(p, com.toString());
-		
+		s(sender, "&aExecuted command &6%s&a as &6%s", com.toString(), p.getName());
 		return true;
 	}
 
diff --git a/src/main/java/net/serble/estools/Commands/Suicide.java b/src/main/java/net/serble/estools/Commands/Suicide.java
index 6299884..acc1613 100644
--- a/src/main/java/net/serble/estools/Commands/Suicide.java
+++ b/src/main/java/net/serble/estools/Commands/Suicide.java
@@ -17,6 +17,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 		LivingEntity p = (LivingEntity) sender;
 
 		setHealth(p, 0);
+		s(sender, "&aRest in peace");
 		return true;
 	}
 
diff --git a/src/main/java/net/serble/estools/Commands/Sun.java b/src/main/java/net/serble/estools/Commands/Sun.java
index f456fc4..6a231e3 100644
--- a/src/main/java/net/serble/estools/Commands/Sun.java
+++ b/src/main/java/net/serble/estools/Commands/Sun.java
@@ -14,6 +14,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             return true;
 
         ((Player)sender).getWorld().setTime(1000);
+        s(sender, "&aSet time to &6day");
         return true;
     }
 
diff --git a/src/main/java/net/serble/estools/Commands/Teleport/TPAll.java b/src/main/java/net/serble/estools/Commands/Teleport/TPAll.java
index 25958de..6791775 100644
--- a/src/main/java/net/serble/estools/Commands/Teleport/TPAll.java
+++ b/src/main/java/net/serble/estools/Commands/Teleport/TPAll.java
@@ -1,8 +1,6 @@
 package net.serble.estools.Commands.Teleport;
 
 import net.serble.estools.EntityCommand;
-import net.serble.estools.Main;
-import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.LivingEntity;
@@ -22,8 +20,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
         }
 
         for (LivingEntity t : getOnlinePlayers()) {
+            assert p != null;
             t.teleport(p);
         }
+
+        assert p != null;
+        s(sender, "&aTeleported all players to &6%s", getEntityName(p));
         return true;
     }
 }
diff --git a/src/main/java/net/serble/estools/Commands/Teleport/TPHere.java b/src/main/java/net/serble/estools/Commands/Teleport/TPHere.java
index 3e9ec31..ddd4fc6 100644
--- a/src/main/java/net/serble/estools/Commands/Teleport/TPHere.java
+++ b/src/main/java/net/serble/estools/Commands/Teleport/TPHere.java
@@ -24,6 +24,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
             if (t != null)
                 t.teleport(p);
         }
+
+        s(sender, "&aTeleported &6%s&a to &6%s", argsToString(args, 0), getEntityName(p));
         return true;
     }
 }
diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
index 07b4eca..fc3a22f 100644
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,7 +1,7 @@
 main: net.serble.estools.Main
 name: EsTools
 description: Simple highly compatible general purpose plugin.
-version: 3.3
+version: '${project.version}'
 softdepend: [Vault]
 authors: [Calcilator, CoPokBl]
 api-version: 1.13