refactor: Cleanup

Author: JasperLorelai

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 {
 

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 {
 

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;

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 {
 

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 {
 

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()

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;
 		};
 	}

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;

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;