Merge pull request #1074 from JasperLorelai/qol

DragonsAscent · web-flow · commit 0f7091d6670e · 2026-04-14T13:42:24.000-04:00
diff --git a/core/src/main/java/com/nisovin/magicspells/MagicSpells.java b/core/src/main/java/com/nisovin/magicspells/MagicSpells.java
@@ -1748,7 +1748,7 @@ public static String doReplacements(String message, LivingEntity recipient, Spel
 		return message;
 	}
 
-	private static final Pattern ARGUMENT_PATTERN = Pattern.compile("%arg:(\\d+):([^%]+)%", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	private static final Pattern ARGUMENT_PATTERN = Pattern.compile("%arg:(\\d+)(?::([^%]+))?%", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
 	public static String doArgumentSubstitution(String string, String[] args) {
 		if (string == null || string.isEmpty()) return string;
 
@@ -1759,6 +1759,7 @@ public static String doArgumentSubstitution(String string, String[] args) {
 			int argIndex = Integer.parseInt(matcher.group(1)) - 1;
 
 			String newValue = matcher.group(2);
+			if (newValue == null) newValue = "";
 			if (args != null && argIndex >= 0 && argIndex < args.length) newValue = args[argIndex];
 
 			matcher.appendReplacement(builder, Matcher.quoteReplacement(newValue));
@@ -1864,7 +1865,7 @@ public static String formatMessage(String message, String... replacements) {
 	 * @return the formatted string
 	 */
 	public static String formatMessage(String message, SpellData data, String... replacements) {
-		if (message == null || message.isEmpty()) return message;
+		if (message == null || message.isEmpty()) return "";
 
 		List<String> replacementList = new ArrayList<>();
 		if (replacements != null) replacementList.addAll(Arrays.asList(replacements));
diff --git a/core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/LevitatedCondition.java b/core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/LevitatedCondition.java
@@ -0,0 +1,47 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import org.jetbrains.annotations.NotNull;
+
+import com.nisovin.magicspells.Spell;
+import com.nisovin.magicspells.util.Name;
+import com.nisovin.magicspells.MagicSpells;
+import com.nisovin.magicspells.castmodifiers.Condition;
+import com.nisovin.magicspells.spells.targeted.LevitateSpell;
+
+@Name("levitated")
+public class LevitatedCondition extends Condition {
+
+	private LevitateSpell levitateSpell;
+
+	@Override
+	public boolean initialize(@NotNull String var) {
+		Spell spell = MagicSpells.getSpellByInternalName(var);
+		if (!(spell instanceof LevitateSpell levitate)) return false;
+		levitateSpell = levitate;
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity caster) {
+		return levitateSpell.isBeingLevitated(caster);
+	}
+
+	@Override
+	public boolean check(LivingEntity caster, LivingEntity target) {
+		for (LevitateSpell.Levitator levitator : levitateSpell.getLevitating().values()) {
+			if (!levitator.getData().target().equals(caster)) continue;
+			if (!levitator.getData().caster().equals(target)) continue;
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity caster, Location location) {
+		return false;
+	}
+
+}
diff --git a/core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/LevitatingCondition.java b/core/src/main/java/com/nisovin/magicspells/castmodifiers/conditions/LevitatingCondition.java
@@ -0,0 +1,47 @@
+package com.nisovin.magicspells.castmodifiers.conditions;
+
+import org.bukkit.Location;
+import org.bukkit.entity.LivingEntity;
+
+import org.jetbrains.annotations.NotNull;
+
+import com.nisovin.magicspells.Spell;
+import com.nisovin.magicspells.util.Name;
+import com.nisovin.magicspells.MagicSpells;
+import com.nisovin.magicspells.castmodifiers.Condition;
+import com.nisovin.magicspells.spells.targeted.LevitateSpell;
+
+@Name("levitating")
+public class LevitatingCondition extends Condition {
+
+	private LevitateSpell levitateSpell;
+
+	@Override
+	public boolean initialize(@NotNull String var) {
+		Spell spell = MagicSpells.getSpellByInternalName(var);
+		if (!(spell instanceof LevitateSpell levitate)) return false;
+		levitateSpell = levitate;
+		return true;
+	}
+
+	@Override
+	public boolean check(LivingEntity caster) {
+		return levitateSpell.isLevitating(caster);
+	}
+
+	@Override
+	public boolean check(LivingEntity caster, LivingEntity target) {
+		for (LevitateSpell.Levitator levitator : levitateSpell.getLevitating().values()) {
+			if (!levitator.getData().caster().equals(caster)) continue;
+			if (!levitator.getData().target().equals(target)) continue;
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public boolean check(LivingEntity caster, Location location) {
+		return false;
+	}
+
+}
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/DebugCommand.java b/core/src/main/java/com/nisovin/magicspells/commands/DebugCommand.java
@@ -15,8 +15,8 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 
 import com.nisovin.magicspells.Perm;
-import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.util.Util;
+import com.nisovin.magicspells.MagicSpells;
 
 public class DebugCommand {
 
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/MagicCommands.java b/core/src/main/java/com/nisovin/magicspells/commands/MagicCommands.java
@@ -2,7 +2,6 @@
 
 import java.util.Map;
 
-import org.incendo.cloud.parser.standard.*;
 import org.jetbrains.annotations.NotNull;
 
 import io.leangen.geantyref.TypeToken;
@@ -13,6 +12,7 @@
 
 import com.mojang.brigadier.arguments.StringArgumentType;
 
+import org.incendo.cloud.parser.standard.*;
 import org.incendo.cloud.parser.ArgumentParser;
 import org.incendo.cloud.paper.PaperCommandManager;
 import org.incendo.cloud.caption.StandardCaptionKeys;
@@ -36,11 +36,11 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import io.papermc.paper.command.brigadier.MessageComponentSerializer;
 
+import com.nisovin.magicspells.util.Util;
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.commands.parsers.*;
 import com.nisovin.magicspells.commands.exceptions.GenericCommandException;
 import com.nisovin.magicspells.commands.exceptions.InvalidCommandArgumentException;
-import com.nisovin.magicspells.util.Util;
 
 public class MagicCommands {
 
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/MagicItemCommand.java b/core/src/main/java/com/nisovin/magicspells/commands/MagicItemCommand.java
@@ -2,10 +2,10 @@
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.List;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 import org.incendo.cloud.key.CloudKey;
 import org.incendo.cloud.context.CommandContext;
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/ManaCommands.java b/core/src/main/java/com/nisovin/magicspells/commands/ManaCommands.java
@@ -32,11 +32,11 @@
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 
 import com.nisovin.magicspells.Perm;
+import com.nisovin.magicspells.util.Util;
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.mana.ManaHandler;
 import com.nisovin.magicspells.mana.ManaChangeReason;
 import com.nisovin.magicspells.commands.exceptions.InvalidCommandArgumentException;
-import com.nisovin.magicspells.util.Util;
 
 public class ManaCommands {
 
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/ReloadCommands.java b/core/src/main/java/com/nisovin/magicspells/commands/ReloadCommands.java
@@ -2,9 +2,9 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collection;
 import java.util.Map;
 import java.util.UUID;
+import java.util.Collection;
 import java.util.stream.Collectors;
 
 import net.kyori.adventure.text.Component;
@@ -24,9 +24,9 @@
 
 import com.nisovin.magicspells.Perm;
 import com.nisovin.magicspells.Spellbook;
+import com.nisovin.magicspells.util.Util;
 import com.nisovin.magicspells.MagicSpells;
 import com.nisovin.magicspells.events.SpellbookReloadEvent;
-import com.nisovin.magicspells.util.Util;
 
 public class ReloadCommands {
 
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/TaskInfoCommand.java b/core/src/main/java/com/nisovin/magicspells/commands/TaskInfoCommand.java
@@ -33,9 +33,7 @@ private static void taskInfo(CommandContext<CommandSourceStack> context) {
 			.count();
 
 		int effectLibTasks = MagicSpells.getEffectManager().getEffects().size();
-
 		VolatileCodeHandle handler = MagicSpells.getVolatileCodeHandler();
-		MagicSpells instance = MagicSpells.getInstance();
 
 		context.sender().getSender().sendMessage(Util.getMessageText(
 			Component.text()
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/parsers/SpellParser.java b/core/src/main/java/com/nisovin/magicspells/commands/parsers/SpellParser.java
@@ -68,7 +68,7 @@ public static String escapeIfRequired(@NotNull String string) {
 
 	private static boolean shouldQuote(char c) {
 		return switch (c) {
-			case ' ',  '"',  '\'',  '[',  ']',  '{',  '}' -> true;
+			case ' ', '"', '\'', '[', ']', '{', '}' -> true;
 			default -> false;
 		};
 	}
diff --git a/core/src/main/java/com/nisovin/magicspells/mana/ManaRank.java b/core/src/main/java/com/nisovin/magicspells/mana/ManaRank.java
@@ -1,7 +1,5 @@
 package com.nisovin.magicspells.mana;
 
-import net.kyori.adventure.text.format.Style;
-
 public class ManaRank {
 	
 	private String name;
diff --git a/core/src/main/java/com/nisovin/magicspells/mana/ManaSystem.java b/core/src/main/java/com/nisovin/magicspells/mana/ManaSystem.java
@@ -3,7 +3,6 @@
 import java.util.*;
 
 import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
diff --git a/core/src/main/java/com/nisovin/magicspells/spelleffects/effecttypes/ItemCooldownEffect.java b/core/src/main/java/com/nisovin/magicspells/spelleffects/effecttypes/ItemCooldownEffect.java
@@ -1,6 +1,6 @@
 package com.nisovin.magicspells.spelleffects.effecttypes;
 
-import org.bukkit.Material;
+import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.configuration.ConfigurationSection;
@@ -10,25 +10,36 @@
 import com.nisovin.magicspells.util.SpellData;
 import com.nisovin.magicspells.util.config.ConfigData;
 import com.nisovin.magicspells.spelleffects.SpellEffect;
+import com.nisovin.magicspells.util.magicitems.MagicItem;
 import com.nisovin.magicspells.util.config.ConfigDataUtil;
+import com.nisovin.magicspells.util.magicitems.MagicItems;
 
 @Name("itemcooldown")
 public class ItemCooldownEffect extends SpellEffect {
 
+	private ConfigData<String> item;
 	private ConfigData<Integer> duration;
-	private ConfigData<Material> type;
+	private ConfigData<NamespacedKey> key;
 
 	@Override
 	protected void loadFromConfig(ConfigurationSection config) {
+		item = ConfigDataUtil.getString(config, "item", "stone");
+		key = ConfigDataUtil.getNamespacedKey(config, "key", null);
 		duration = ConfigDataUtil.getInteger(config, "duration", TimeUtil.TICKS_PER_SECOND);
-		type = ConfigDataUtil.getMaterial(config, "item", Material.STONE);
 	}
 
 	@Override
 	protected Runnable playEffectEntity(Entity entity, SpellData data) {
 		if (!(entity instanceof Player player)) return null;
 
-		player.setCooldown(type.get(data), duration.get(data));
+		int duration = this.duration.get(data);
+
+		NamespacedKey key = this.key.get(data);
+		if (key == null) {
+			MagicItem item = MagicItems.getMagicItemFromString(this.item.get(data));
+			if (item != null) player.setCooldown(item.getItemStack(), duration);
+		} else player.setCooldown(key, duration);
+
 		return null;
 	}
 
diff --git a/core/src/main/java/com/nisovin/magicspells/spells/command/ImbueSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/command/ImbueSpell.java
@@ -109,7 +109,7 @@ public CastResult cast(SpellData data) {
 			return new CastResult(PostCastAction.ALREADY_HANDLED, data);
 		}
 
-		if (!inHand.hasItemMeta() || inHand.getItemMeta().getPersistentDataContainer().has(KEY)) {
+		if (inHand.hasItemMeta() && inHand.getItemMeta().getPersistentDataContainer().has(KEY)) {
 			sendMessage(strCantImbueItem, caster, data);
 			return new CastResult(PostCastAction.ALREADY_HANDLED, data);
 		}
diff --git a/core/src/main/java/com/nisovin/magicspells/spells/targeted/LevitateSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/targeted/LevitateSpell.java
@@ -91,7 +91,7 @@ public CastResult cast(SpellCastState state, SpellData data) {
 		TargetInfo<LivingEntity> info = getTargetedEntity(data);
 		if (info.noTarget()) return noTarget(info);
 
-		return castAtEntity(info.spellData());
+		return levitate(info.spellData());
 	}
 
 	@Override
@@ -103,6 +103,15 @@ public CastResult cast(SpellData data) {
 	public CastResult castAtEntity(SpellData data) {
 		if (!data.hasCaster()) return new CastResult(PostCastAction.ALREADY_HANDLED, data);
 
+		if (isLevitating(data.caster())) {
+			levitating.remove(data.caster().getUniqueId()).stop();
+			return new CastResult(PostCastAction.ALREADY_HANDLED, data);
+		}
+
+		return levitate(data);
+	}
+
+	public CastResult levitate(SpellData data) {
 		LivingEntity caster = data.caster();
 		LivingEntity target = data.target();
 
@@ -120,6 +129,10 @@ public CastResult castAtEntity(SpellData data) {
 		return new CastResult(PostCastAction.HANDLE_NORMALLY, data);
 	}
 
+	public Map<UUID, Levitator> getLevitating() {
+		return levitating;
+	}
+
 	public boolean isBeingLevitated(LivingEntity entity) {
 		for (Levitator levitator : levitating.values()) {
 			if (levitator.data.target().equals(entity)) return true;
@@ -140,7 +153,7 @@ public void removeLevitate(LivingEntity entity) {
 		toRemove.clear();
 	}
 
-	private boolean isLevitating(LivingEntity entity) {
+	public boolean isLevitating(LivingEntity entity) {
 		return levitating.containsKey(entity.getUniqueId());
 	}
 
@@ -186,7 +199,7 @@ public void onEntityDamage(EntityDamageByEntityEvent event) {
 
 	}
 
-	private class Levitator implements Runnable {
+	public class Levitator implements Runnable {
 
 		private final SpellData data;
 
@@ -260,6 +273,10 @@ private void stop() {
 			MagicSpells.cancelTask(taskId);
 		}
 
+		public SpellData getData() {
+			return data;
+		}
+
 	}
 
 }
diff --git a/core/src/main/java/com/nisovin/magicspells/util/MagicConfig.java b/core/src/main/java/com/nisovin/magicspells/util/MagicConfig.java
diff --git a/core/src/main/java/com/nisovin/magicspells/util/config/FunctionData.java b/core/src/main/java/com/nisovin/magicspells/util/config/FunctionData.java
diff --git a/core/src/main/java/com/nisovin/magicspells/util/config/StringData.java b/core/src/main/java/com/nisovin/magicspells/util/config/StringData.java
diff --git a/core/src/main/java/com/nisovin/magicspells/util/managers/ConditionManager.java b/core/src/main/java/com/nisovin/magicspells/util/managers/ConditionManager.java
diff --git a/core/src/main/java/com/nisovin/magicspells/variables/meta/AbsorptionVariable.java b/core/src/main/java/com/nisovin/magicspells/variables/meta/AbsorptionVariable.java
diff --git a/core/src/main/resources/mana.yml b/core/src/main/resources/mana.yml

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public static String escapeIfRequired(@NotNull String string) {`
`68`	`68`
`69`	`69`	`private static boolean shouldQuote(char c) {`
`70`	`70`	`return switch (c) {`
`71`		`- case ' ', '"', '\'', '[', ']', '{', '}' -> true;`
	`71`	`+ case ' ', '"', '\'', '[', ']', '{', '}' -> true;`
`72`	`72`	`default -> false;`
`73`	`73`	`};`
`74`	`74`	`}`