Merge pull request #839 from JasperLorelai/main

Mob Goals (Core)

Author: Chronoken

core/src/main/java/com/nisovin/magicspells/Perm.java

@@ -39,6 +39,7 @@ public enum Perm {
 	COMMAND_UTIL_DOWNLOAD("magicspells.command.util.download"),
 	COMMAND_UTIL_UPDATE("magicspells.command.util.update"),
 	COMMAND_UTIL_SAVE_SKIN("magicspells.command.util.saveskin"),
+	COMMAND_UTIL_LIST_GOALS("magicspells.command.util.listgoals"),
 	COMMAND_PROFILE_REPORT("magicspells.command.profilereport"),
 	COMMAND_DEBUG("magicspells.command.debug"),
 	COMMAND_TASKINFO("magicspells.command.taskinfo"),

core/src/main/java/com/nisovin/magicspells/commands/MagicCommand.java

@@ -2,33 +2,39 @@
 
 import java.util.*;
 import java.io.File;
-import java.io.Writer;
-import java.io.FileWriter;
+import java.io.IOException;
 import java.util.regex.Pattern;
 
 import org.bukkit.*;
+import org.bukkit.entity.Mob;
 import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.util.RayTraceResult;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitTask;
 import org.bukkit.command.CommandSender;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.command.ConsoleCommandSender;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 import co.aikar.commands.*;
 import co.aikar.commands.annotation.*;
 import co.aikar.commands.annotation.Optional;
 import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 
+import com.destroystokyo.paper.entity.ai.Goal;
+import com.destroystokyo.paper.profile.ProfileProperty;
+
 import com.nisovin.magicspells.Perm;
 import com.nisovin.magicspells.Spell;
 import com.nisovin.magicspells.util.*;
 import com.nisovin.magicspells.Spellbook;
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.variables.Variable;
 import com.nisovin.magicspells.spells.PassiveSpell;
+import com.nisovin.magicspells.Spell.PostCastAction;
 import com.nisovin.magicspells.mana.ManaChangeReason;
 import com.nisovin.magicspells.handlers.MagicXpHandler;
 import com.nisovin.magicspells.util.magicitems.MagicItem;
@@ -53,17 +59,15 @@ public MagicCommand() {
 		});
 
 		// Create command completions.
-		commandManager.getCommandCompletions().registerAsyncCompletion("spells", context -> {
-			Set<String> spells = new HashSet<>();
-			if (context.getConfig() != null && context.getConfig().equals("*")) spells.add("*");
-			// Collect spell names.
-			spells.addAll(getSpellNames(MagicSpells.spells()));
-			return spells;
-		});
+		commandManager.getCommandCompletions().registerAsyncCompletion("spells", context ->
+			getSpellNames(MagicSpells.spells())
+		);
 		commandManager.getCommandCompletions().registerAsyncCompletion("owned_spells", context -> {
-			Set<Spell> spells = new HashSet<>();
 			Player player = context.getPlayer();
+			if (player == null) return getSpellNames(MagicSpells.spells());
+
 			Spellbook spellbook = MagicSpells.getSpellbook(player);
+			Set<Spell> spells = new HashSet<>();
 			for (Spell spell : MagicSpells.getSpellsOrdered()) {
 				if (spell.isHelperSpell()) continue;
 				if (spell instanceof PassiveSpell) continue;
@@ -72,52 +76,72 @@ public MagicCommand() {
 			}
 			return getSpellNames(spells);
 		});
-		commandManager.getCommandCompletions().registerAsyncCompletion("players+", context -> {
-			Set<String> players = new HashSet<>();
-			players.add("*");
-			for (Player player : Bukkit.getOnlinePlayers()) {
-				players.add(player.getName());
-			}
-			return players;
-		});
 		commandManager.getCommandCompletions().registerAsyncCompletion("variables", context ->
 			MagicSpells.getVariableManager().getVariables().keySet()
 		);
 		commandManager.getCommandCompletions().registerAsyncCompletion("magic_items", context ->
 			MagicItems.getMagicItemKeys()
 		);
 		commandManager.getCommandCompletions().registerAsyncCompletion("looking_at", context -> {
-			Set<String> completions = new HashSet<>();
-			if (!context.getIssuer().isPlayer()) return completions;
+			Player player = context.getPlayer();
+			if (player == null) return Collections.emptySet();
 
 			String config = context.getConfig();
-			if (config == null || config.isEmpty()) return completions;
-
+			if (config == null || config.isEmpty()) return Collections.emptySet();
+
+			RayTraceResult result = player.rayTraceBlocks(6, FluidCollisionMode.SOURCE_ONLY);
+			if (result == null) return Collections.emptySet();
+
+			Block block = result.getHitBlock();
+			if (block == null) return Collections.emptySet();
+
+			String value = switch (config.toLowerCase()) {
+				case "x" -> String.valueOf(block.getX());
+				case "y" -> String.valueOf(block.getY());
+				case "z" -> String.valueOf(block.getZ());
+				case "pitch" -> String.valueOf(player.getLocation().getPitch());
+				case "yaw" -> String.valueOf(player.getLocation().getYaw());
+				default -> "";
+			};
+			return Set.of(value);
+		});
+		commandManager.getCommandCompletions().registerAsyncCompletion("spell_target", context -> {
 			Player player = context.getPlayer();
-			Block block = player.getTargetBlockExact(6, FluidCollisionMode.SOURCE_ONLY);
-			if (block == null) return null;
-			if (block.getType().isAir()) return completions;
-
-			Location location = block.getLocation();
-			String num = "";
-			switch (config.toLowerCase()) {
-				case "x" -> num += location.getX();
-				case "y" -> num += location.getY();
-				case "z" -> num += location.getZ();
-				case "pitch" -> num += player.getLocation().getPitch();
-				case "yaw" -> num += player.getLocation().getYaw();
+			if (player == null) return getPlayers();
+			RayTraceResult result = player.rayTraceEntities(6);
+
+			Set<String> targets = new HashSet<>();
+			// Add the targeted entity's uuid/username first.
+			if (result != null && result.getHitEntity() instanceof LivingEntity entity) {
+				targets.add(entity instanceof Player pl ? pl.getName() : entity.getUniqueId().toString());
 			}
-			if (!num.isEmpty()) completions.add(num);
-			return completions;
+			targets.addAll(getPlayers());
+			return targets;
+		});
+		commandManager.getCommandCompletions().registerAsyncCompletion("target_uuid", context -> {
+			Player player = context.getPlayer();
+			if (player == null) return Collections.emptySet();
+
+			RayTraceResult result = player.rayTraceEntities(6);
+			if (result == null || !(result.getHitEntity() instanceof LivingEntity entity))
+				return Collections.emptySet();
+			return Set.of(entity.getUniqueId().toString());
 		});
 		commandManager.getCommandCompletions().registerAsyncCompletion("power", context -> {
 			Player player = context.getPlayer();
-			if (player == null) return Collections.emptyList();
-			if (!Perm.COMMAND_CAST_POWER.has(player)) return Collections.emptyList();
+			if (player != null && !Perm.COMMAND_CAST_POWER.has(player)) return Collections.emptyList();
 			return Collections.singleton("-p:");
 		});
 	}
 
+	private static Set<String> getPlayers() {
+		Set<String> players = new HashSet<>();
+		for (Player player : Bukkit.getOnlinePlayers()) {
+			players.add(player.getName());
+		}
+		return players;
+	}
+
 	private static Set<String> getSpellNames(Collection<Spell> spells) {
 		Set<String> spellNames = new HashSet<>();
 		boolean added;
@@ -298,7 +322,7 @@ public static void onTask(CommandIssuer issuer) {
 	}
 
 	@Subcommand("resetcd")
-	@CommandCompletion("@players+ @spells:* @nothing")
+	@CommandCompletion("*|@players *|@spells @nothing")
 	@Syntax("[player/*] [spell/*]")
 	@Description("Reset cooldown of all players or a player for a spell or all spells.")
 	@HelpPermission(permission = Perm.COMMAND_RESET_COOLDOWN)
@@ -612,26 +636,61 @@ public void onUpdate(CommandIssuer issuer, String[] args) {
 		@HelpPermission(permission = Perm.COMMAND_UTIL_SAVE_SKIN)
 		public void onSaveSkin(CommandIssuer issuer, @Optional Player player) {
 			if (!MagicSpells.isLoaded()) return;
+
 			if (noPermission(issuer.getIssuer(), Perm.COMMAND_UTIL_SAVE_SKIN)) return;
 			if (player == null) player = getPlayerFromIssuer(issuer);
 			if (player == null) return;
-			String data = Util.getSkinData(player);
 
-			File folder = new File(MagicSpells.getInstance().getDataFolder(), "skins");
+			List<ProfileProperty> skins = player.getPlayerProfile().getProperties().stream().filter(prop -> prop.getName().equals("textures")).toList();
+			ProfileProperty latestSkin = skins.get(0);
+
+			YamlConfiguration data = new YamlConfiguration();
+			data.set("skin", latestSkin.getValue());
+			data.set("signature", latestSkin.getSignature());
+
+			File folder = new File(PLUGIN_FOLDER, "skins");
 			if (!folder.exists()) folder.mkdir();
-			File file = new File(folder, System.currentTimeMillis() + ".yml");
 			try {
-				Writer writer = new FileWriter(file);
-				writer.write(data);
-				writer.flush();
-				writer.close();
-			} catch (Exception e) {
+				data.save(new File(folder, System.currentTimeMillis() + ".yml"));
+			} catch (IOException e) {
 				e.printStackTrace();
+				return;
 			}
 
 			issuer.sendMessage(MagicSpells.getTextColor() + TxtUtil.getPossessiveName(player.getName()) + " skin was saved.");
 		}
 
+		@Subcommand("listgoals")
+		@CommandCompletion("@target_uuid @nothing")
+		@Syntax("[uuid]")
+		@Description("List an entity's mob goals.")
+		@HelpPermission(permission = Perm.COMMAND_UTIL_LIST_GOALS)
+		public void onListGoals(CommandIssuer issuer, String uuidString) {
+			if (noPermission(issuer.getIssuer(), Perm.COMMAND_UTIL_LIST_GOALS)) return;
+
+			UUID uuid;
+			try {
+				uuid = UUID.fromString(uuidString);
+			} catch (IllegalArgumentException e) {
+				throw new ConditionFailedException("Passed UUID argument is not a valid UUIO.");
+			}
+			if (!(Bukkit.getEntity(uuid) instanceof Mob mob))
+				throw new ConditionFailedException("UUID did not match an entity of Mob type.");
+
+			Collection<Goal<Mob>> goals = Bukkit.getMobGoals().getAllGoals(mob);
+			if (goals.isEmpty()) {
+				issuer.sendMessage(MagicSpells.getTextColor() + "Entity '" + uuid + "' has no mob goals.");
+				return;
+			}
+
+			issuer.sendMessage(MagicSpells.getTextColor() + "Mob goals of entity '" + uuid + "':");
+			for (Goal<Mob> goal : goals) {
+				String entity = goal.getKey().getEntityClass().getSimpleName();
+				String key = goal.getKey().getNamespacedKey().toString();
+				issuer.sendMessage(MagicSpells.getTextColor() + "  - " + entity + ": " + key + " " + goal.getTypes());
+			}
+		}
+
 	}
 
 	@Subcommand("profilereport")
@@ -743,7 +802,7 @@ public void onCastSelf(CommandIssuer issuer, String[] args) {
 		}
 
 		@Subcommand("as")
-		@CommandCompletion("@players @spells @power @nothing")
+		@CommandCompletion("@spell_target @spells @power @nothing")
 		@Syntax("<player/UUID> <spell> (-p:[power]) [spellArgs]")
 		@Description("Force a player to cast a spell. (You can optionally define power: -p:1.0)")
 		@HelpPermission(permission = Perm.COMMAND_CAST_AS)
@@ -768,7 +827,7 @@ public void onCastAs(CommandIssuer issuer, String[] args) {
 		}
 
 		@Subcommand("on")
-		@CommandCompletion("@players @spells @nothing")
+		@CommandCompletion("@spell_target @spells @nothing")
 		@Syntax("<player/UUID> <spell>")
 		@Description("Cast a spell on an entity.")
 		@HelpPermission(permission = Perm.COMMAND_CAST_ON)
@@ -785,11 +844,10 @@ public void onCastOn(CommandIssuer issuer, String[] args) {
 				throw new ConditionFailedException("Spell is not a targeted entity spell.");
 			}
 
-			boolean casted;
-			// Handle with or without caster.
-			if (issuer.getIssuer() instanceof LivingEntity) casted = newSpell.castAtEntity(issuer.getIssuer(), target, 1F);
-			else casted = newSpell.castAtEntity(target, 1F);
-			if (!casted) throw new ConditionFailedException("Spell probably cannot be cast from console.");
+			LivingEntity caster = issuer.getIssuer() instanceof LivingEntity ? issuer.getIssuer() : null;
+			CastResult result = newSpell.castAtEntity(new SpellData(caster, target));
+			if (result.action() == PostCastAction.ALREADY_HANDLED)
+				throw new ConditionFailedException("Spell probably cannot be cast from console.");
 		}
 
 		@Subcommand("at")
@@ -851,7 +909,7 @@ else if (issuer.getIssuer() instanceof LivingEntity) {
 			SpellData data = new SpellData(issuer.getIssuer() instanceof LivingEntity le ? le : null, location, 1f, null);
 			CastResult result = newSpell.castAtLocation(data);
 
-			if (result.action() == Spell.PostCastAction.ALREADY_HANDLED)
+			if (result.action() == PostCastAction.ALREADY_HANDLED)
 				throw new ConditionFailedException("Spell probably cannot be cast from console.");
 		}