Apply review suggestions

TonytheMacaroni · TonytheMacaroni · commit 36af17fd60e1 · 2025-11-28T11:17:46.000-05:00
diff --git a/NOTICE.md b/NOTICE.md
@@ -28,9 +28,9 @@ The project includes software developed by third parties. For their full license
   - Licensed by: **Slikey**
   - License: **MIT License** (See `3rd_party_licenses/LICENSE-MIT`)
 
-- Annotation Command Framework (ACF):
-  - Repository: `Chronoken/EffectLib`
-  - Licensed by: **Daniel Ennis and Contributors**
+- Cloud Command Framework:
+  - Repository: `Incendo/cloud`
+  - Licensed by: **Alexander Söderberg**
   - License: **MIT License** (See `3rd_party_licenses/LICENSE-MIT`)
 
 - bStats:
diff --git a/core/src/main/java/com/nisovin/magicspells/Spell.java b/core/src/main/java/com/nisovin/magicspells/Spell.java
@@ -1,7 +1,5 @@
 package com.nisovin.magicspells;
 
-import net.kyori.adventure.text.format.TextDecoration;
-import net.kyori.adventure.text.format.TextDecorationAndState;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -1245,6 +1243,11 @@ protected boolean preCastTimeCheck(LivingEntity livingEntity, String[] args) {
 		return true;
 	}
 
+	@Deprecated(forRemoval = true)
+	public List<String> tabComplete(CommandSender sender, String[] args) {
+		return null;
+	}
+
 	public SuggestionProvider<CommandSourceStack> suggestionProvider() {
 		return this instanceof SuggestionProvider ? (SuggestionProvider<CommandSourceStack>) this : SuggestionProvider.noSuggestions();
 	}
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/MagicCommands.java b/core/src/main/java/com/nisovin/magicspells/commands/MagicCommands.java
@@ -84,7 +84,7 @@ public static void register(@NotNull PaperCommandManager<CommandSourceStack> man
 				if (fallbackMapping != null && fallbackMapping.mapper() != null)
 					return fallbackMapping.mapper().apply(fallbackParser);
 
-				ArgumentTypeFactory<?> fallbackFactory =  defaultArgumentFactories.get(GenericTypeReflector.erase(fallbackParserClass));
+				ArgumentTypeFactory<?> fallbackFactory = defaultArgumentFactories.get(GenericTypeReflector.erase(fallbackParserClass));
 				if (fallbackFactory != null)
 					return fallbackFactory.create();
 
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/ResetCooldownCommand.java b/core/src/main/java/com/nisovin/magicspells/commands/ResetCooldownCommand.java
@@ -136,5 +136,4 @@ private static void resetCooldown(CommandContext<CommandSourceStack> context) {
 		));
 	}
 
-
 }
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/exceptions/InvalidCommandArgumentException.java b/core/src/main/java/com/nisovin/magicspells/commands/exceptions/InvalidCommandArgumentException.java
@@ -10,4 +10,4 @@ public InvalidCommandArgumentException(String message, Throwable cause) {
 		super(message, cause);
 	}
 
-}
+}
diff --git a/core/src/main/java/com/nisovin/magicspells/commands/parsers/SpellCastArgumentsParser.java b/core/src/main/java/com/nisovin/magicspells/commands/parsers/SpellCastArgumentsParser.java
@@ -91,7 +91,7 @@ public static ParserDescriptor<CommandSourceStack, String[]> spellCastArgumentsP
 							.suggestionProcessor()
 							.process(
 								CommandPreprocessingContext.of(context, input.cursor(preParseCursor)),
-								(Stream<Suggestion>) StreamSupport.stream(result.spliterator(), false)
+								StreamSupport.stream(result.spliterator(), false)
 							)
 							.toList();
 
diff --git a/core/src/main/java/com/nisovin/magicspells/mana/ManaBar.java b/core/src/main/java/com/nisovin/magicspells/mana/ManaBar.java
@@ -1,8 +1,5 @@
 package com.nisovin.magicspells.mana;
 
-import net.kyori.adventure.text.Component;
-import net.kyori.adventure.text.format.Style;
-
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
diff --git a/core/src/main/java/com/nisovin/magicspells/spells/command/AdminTeachSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/command/AdminTeachSpell.java
@@ -29,7 +29,7 @@
 
 public class AdminTeachSpell extends CommandSpell {
 
-	private static final SuggestionProvider<CommandSourceStack> suggestions = AggregateParser
+	private static final SuggestionProvider<CommandSourceStack> SUGGESTIONS = AggregateParser
 		.<CommandSourceStack>builder()
 		.withComponent("player", PlayerParser.playerParser())
 		.withComponent("spells", VarargsParser.varargsParser(new SpellParser<>()))
@@ -68,7 +68,7 @@ public boolean castFromConsole(CommandSender sender, String[] args) {
 
 	@Override
 	public SuggestionProvider<CommandSourceStack> suggestionProvider() {
-		return suggestions;
+		return SUGGESTIONS;
 	}
 
 	private static class AdminTeachTask extends BukkitRunnable {
diff --git a/core/src/main/java/com/nisovin/magicspells/spells/command/ScrollSpell.java b/core/src/main/java/com/nisovin/magicspells/spells/command/ScrollSpell.java
@@ -249,19 +249,14 @@ public ItemStack createScroll(Spell spell, int uses, ItemStack item) {
 
 		if (!(executor instanceof ConsoleCommandSender)) return Collections.emptyList();
 
-		List<String> suggestions = TxtUtil.tabCompletePlayerName(executor);
 		CommandInput original = input.copy();
 
 		String playerName = input.readString();
-		if (playerName.isEmpty() || input.isEmpty() && !input.input().endsWith(" ")) return suggestions;
-
-		Player player = Bukkit.getPlayer(playerName);
-		if (player == null) return suggestions;
+		if (playerName.isEmpty() || input.isEmpty() || Bukkit.getPlayer(playerName) == null)
+			return TxtUtil.tabCompletePlayerName(executor);
 
 		String diff = original.difference(input.skipWhitespace(), true);
-		SpellParser.suggest().stream().map(spell -> diff + spell).forEach(suggestions::add);
-
-		return suggestions;
+		return SpellParser.suggest().stream().map(spell -> diff + spell).toList();
 	}
 	
 	@EventHandler(priority=EventPriority.MONITOR)
diff --git a/core/src/main/java/com/nisovin/magicspells/util/Rotation.java b/core/src/main/java/com/nisovin/magicspells/util/Rotation.java
@@ -2,22 +2,12 @@
 
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Objects;
-
 import org.bukkit.Location;
 
 /**
  * Represents a rotation that can be applied to a {@link Location}.
  */
-public final class Rotation {
-
-	private final Angle yaw;
-	private final Angle pitch;
-
-	private Rotation(final @NotNull Angle yaw, final @NotNull Angle pitch) {
-		this.yaw = yaw;
-		this.pitch = pitch;
-	}
+public record Rotation(Angle yaw, Angle pitch) {
 
 	/**
 	 * Create a new rotation object.
@@ -30,24 +20,6 @@ public static Rotation of(final @NotNull Angle yaw, final @NotNull Angle pitch)
 		return new Rotation(yaw, pitch);
 	}
 
-	/**
-	 * Returns the yaw of this rotation.
-	 *
-	 * @return yaw
-	 */
-	public Angle yaw() {
-		return this.yaw;
-	}
-
-	/**
-	 * Returns the pitch of this rotation
-	 *
-	 * @return pitch
-	 */
-	public Angle pitch() {
-		return this.pitch;
-	}
-
 	/**
 	 * Applies this rotation to a location.
 	 *
@@ -60,26 +32,4 @@ public Angle pitch() {
 		return location;
 	}
 
-	@Override
-	public boolean equals(final Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		Rotation that = (Rotation) o;
-		return this.yaw.equals(that.yaw) && this.pitch.equals(that.pitch);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(this.yaw, this.pitch);
-	}
-
-	@Override
-	public String toString() {
-		return String.format("Rotation{yaw=%s, pitch=%s}", this.yaw, this.pitch);
-	}
-
 }
diff --git a/core/src/main/java/com/nisovin/magicspells/util/TxtUtil.java b/core/src/main/java/com/nisovin/magicspells/util/TxtUtil.java
@@ -83,9 +83,4 @@ public static List<String> tabCompletePlayerName(CommandSender sender, boolean a
 		return matches;
 	}
 
-	public static String getPossessiveName(String name) {
-		name = name.trim();
-		return name + "'" + (name.endsWith("s") ? "" : "s");
-	}
-
 }
diff --git a/core/src/main/java/com/nisovin/magicspells/util/Util.java b/core/src/main/java/com/nisovin/magicspells/util/Util.java
@@ -32,7 +32,6 @@
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.configuration.ConfigurationSection;
 
-import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -55,6 +54,7 @@
 import net.kyori.adventure.text.format.Style;
 import net.kyori.adventure.text.format.TextDecoration;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
 
@@ -819,37 +819,6 @@ public static NamedTextColor getLegacyColor(@Nullable String color, @NotNull Nam
 		};
 	}
 
-	public static Style getStyle(@Nullable String style, @NotNull Style def) {
-		return switch (style) {
-			case "0" -> Style.style(NamedTextColor.BLACK);
-			case "1" -> Style.style(NamedTextColor.DARK_BLUE);
-			case "2" -> Style.style(NamedTextColor.DARK_GREEN);
-			case "3" -> Style.style(NamedTextColor.DARK_AQUA);
-			case "4" -> Style.style(NamedTextColor.DARK_RED);
-			case "5" -> Style.style(NamedTextColor.DARK_PURPLE);
-			case "6" -> Style.style(NamedTextColor.GOLD);
-			case "7" -> Style.style(NamedTextColor.GRAY);
-			case "8" -> Style.style(NamedTextColor.DARK_GRAY);
-			case "9" -> Style.style(NamedTextColor.BLUE);
-			case "a" -> Style.style(NamedTextColor.GREEN);
-			case "b" -> Style.style(NamedTextColor.AQUA);
-			case "c" -> Style.style(NamedTextColor.RED);
-			case "d" -> Style.style(NamedTextColor.LIGHT_PURPLE);
-			case "e" -> Style.style(NamedTextColor.YELLOW);
-			case "f" -> Style.style(NamedTextColor.WHITE);
-			case "k" -> Style.style(TextDecoration.OBFUSCATED);
-			case "l" -> Style.style(TextDecoration.BOLD);
-			case "m" -> Style.style(TextDecoration.STRIKETHROUGH);
-			case "n" -> Style.style(TextDecoration.UNDERLINED);
-			case "o" -> Style.style(TextDecoration.ITALIC);
-			case null -> def;
-			default -> {
-				Component component = MiniMessage.miniMessage().deserialize(style);
-				yield component.style();
-			}
-		};
-	}
-
 	public static String colorize(String string) {
 		if (string.isEmpty()) return "";
 
diff --git a/core/src/main/resources/general.yml b/core/src/main/resources/general.yml
@@ -7,7 +7,7 @@ terminate-effectlib-instances: true
 enable-error-logging: true
 enable-profiling: false
 error-log-limit: -1
-text-style: <dark_aqua>
+text-format: <dark_aqua><text></dark_aqua>
 broadcast-range: 20
 effectlib-instance-limit: 20000
 ops-have-all-spells: true
diff --git a/core/src/main/resources/mana.yml b/core/src/main/resources/mana.yml
@@ -1,10 +1,8 @@
 enable-mana-system: true
 
-default-prefix: "Mana:"
+default-bar-format: "<dark_aqua>Mana: {<dark_blue><full_segment></dark_blue><black><empty_segment></black>} [<mana>/<max_mana>]</dark_aqua>"
 default-symbol: '='
 default-size: 35
-default-style-full: <dark_blue>
-default-style-empty: <black>
 
 default-max-mana: 100
 default-starting-mana: 100
@@ -26,8 +24,7 @@ ranks:
         starting-mana: 200
         regen-amount: 10
         regen-interval: 20
-        style-full: <dark_blue>
-        style-empty: <black>
+        bar-format: "<dark_aqua>Mana: {<dark_blue><full_segment></dark_blue><black><empty_segment></black>} [<mana>/<max_mana>]</dark_aqua>"
     adept:
         prefix: "Mana:"
         symbol: '='
@@ -36,8 +33,7 @@ ranks:
         starting-mana: 150
         regen-amount: 7
         regen-interval: 20
-        style-full: <dark_blue>
-        style-empty: <black>
+        bar-format: "<dark_aqua>Mana: {<blue><full_segment></blue><black><empty_segment></black>} [<mana>/<max_mana>]</dark_aqua>"
     novice:
         prefix: "Mana:"
         symbol: '='
@@ -46,5 +42,4 @@ ranks:
         starting-mana: 100
         regen-amount: 5
         regen-interval: 20
-        style-full: <dark_blue>
-        style-empty: <black>
+        bar-format: "<dark_aqua>Mana: {<aqua><full_segment></aqua><black><empty_segment></black>} [<mana>/<max_mana>]</dark_aqua>"
diff --git a/shop/build.gradle b/shop/build.gradle
@@ -1,5 +1,6 @@
 dependencies {
     implementation project(":core")
+    implementation("org.incendo:cloud-paper:2.0.0-beta.13")
     implementation("net.milkbowl.vault:VaultAPI:1.7") { transitive = false }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -136,5 +136,4 @@ private static void resetCooldown(CommandContext<CommandSourceStack> context) {`
`136`	`136`	`));`
`137`	`137`	`}`
`138`	`138`
`139`		`-`
`140`	`139`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ public InvalidCommandArgumentException(String message, Throwable cause) {`
`10`	`10`	`super(message, cause);`
`11`	`11`	`}`
`12`	`12`
`13`		`-}`
	`13`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public static ParserDescriptor<CommandSourceStack, String[]> spellCastArgumentsP`
`91`	`91`	`.suggestionProcessor()`
`92`	`92`	`.process(`
`93`	`93`	`CommandPreprocessingContext.of(context, input.cursor(preParseCursor)),`
`94`		`- (Stream<Suggestion>) StreamSupport.stream(result.spliterator(), false)`
	`94`	`+ StreamSupport.stream(result.spliterator(), false)`
`95`	`95`	`)`
`96`	`96`	`.toList();`
`97`	`97`