partially automated cleanups

DenizenScript · Oct 19, 2021 · 9382274 · 9382274
1 parent 24f8ed6
commit 9382274
Show file tree

Hide file tree

Showing 42 changed files with 61 additions and 66 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/Denizen.java b/plugin/src/main/java/com/denizenscript/denizen/Denizen.java
@@ -42,7 +42,6 @@
 import com.denizenscript.denizencore.DenizenCore;
 import com.denizenscript.denizencore.events.OldEventManager;
 import com.denizenscript.denizencore.flags.MapTagBasedFlagTracker;
-import com.denizenscript.denizencore.flags.SavableMapFlagTracker;
 import com.denizenscript.denizencore.objects.ObjectFetcher;
 import com.denizenscript.denizencore.objects.core.TimeTag;
 import com.denizenscript.denizencore.scripts.ScriptHelper;
@@ -214,7 +213,7 @@ else if (javaVersion.startsWith("9") || javaVersion.startsWith("1.9") || javaVer
         try {
             // If Citizens is enabled, Create the NPC Helper
             if (Depends.citizens != null) {
-                npcHelper = new DenizenNPCHelper(this);
+                npcHelper = new DenizenNPCHelper();
             }
             // Create our CommandManager to handle '/denizen' commands
             commandManager = new CommandManager();
@@ -386,7 +385,7 @@ else if (javaVersion.startsWith("9") || javaVersion.startsWith("1.9") || javaVer
                     Depends.setupCitizens();
                     if (Depends.citizens != null) {
                         getLogger().warning("Citizens was activated late - this means a plugin load order error occurred. You may have plugins with invalid 'plugin.yml' files (eg that use the 'loadbefore' directive, or that have circular dependencies).");
-                        npcHelper = new DenizenNPCHelper(this);
+                        npcHelper = new DenizenNPCHelper();
                         Depends.citizens.registerCommandClass(NPCCommandHandler.class);
                         TraitRegistry.registerMainTraits();
                         triggerRegistry.registerCoreMembers();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/ItemHelper.java b/plugin/src/main/java/com/denizenscript/denizen/nms/interfaces/ItemHelper.java
@@ -5,7 +5,6 @@
 import com.denizenscript.denizen.nms.util.jnbt.IntArrayTag;
 import com.denizenscript.denizen.nms.util.jnbt.Tag;
 import com.denizenscript.denizen.objects.ItemTag;
-import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.Inventory;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/DenizenNPCHelper.java b/plugin/src/main/java/com/denizenscript/denizen/npc/DenizenNPCHelper.java
@@ -27,16 +27,14 @@
 
 public class DenizenNPCHelper implements Listener {
 
-    private Denizen plugin;
     private ActionHandler actionHandler;
 
-    public DenizenNPCHelper(Denizen denizen) {
-        plugin = denizen;
+    public DenizenNPCHelper() {
         if (Depends.citizens != null) {
-            plugin.getServer().getPluginManager().registerEvents(this, plugin);
+            Bukkit.getPluginManager().registerEvents(this, Denizen.getInstance());
             INVENTORY_TRAIT_VIEW = ReflectionHelper.getFields(net.citizensnpcs.api.trait.trait.Inventory.class).get("view");
         }
-        actionHandler = new ActionHandler(plugin);
+        actionHandler = new ActionHandler();
     }
 
     /**

diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java b/plugin/src/main/java/com/denizenscript/denizen/npc/actions/ActionHandler.java
@@ -5,7 +5,6 @@
 import com.denizenscript.denizen.scripts.containers.core.AssignmentScriptContainer;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
-import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizencore.objects.core.ElementTag;
 import com.denizenscript.denizencore.objects.ArgumentHelper;
 import com.denizenscript.denizencore.objects.ObjectTag;
@@ -21,10 +20,7 @@
 
 public class ActionHandler {
 
-    final Denizen denizen;
-
-    public ActionHandler(Denizen denizen) {
-        this.denizen = denizen;
+    public ActionHandler() {
     }
 
     public String doAction(String actionName, NPCTag npc, PlayerTag player, AssignmentScriptContainer assignment, Map<String, ObjectTag> context) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MirrorTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/MirrorTrait.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.npc.traits;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.nms.abstracts.ProfileEditor;
 import com.denizenscript.denizen.utilities.packets.NetworkInterceptHelper;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/AreaContainmentObject.java b/plugin/src/main/java/com/denizenscript/denizen/objects/AreaContainmentObject.java
@@ -2,7 +2,6 @@
 
 import com.denizenscript.denizen.events.BukkitScriptEvent;
 import com.denizenscript.denizen.nms.NMSHandler;
-import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.depends.Depends;
 import com.denizenscript.denizen.utilities.flags.LocationFlagSearchHelper;
 import com.denizenscript.denizencore.objects.ObjectTag;
@@ -74,7 +73,7 @@ default ListTag getBlocksFlagged(String flagName, Attribute attribute) {
         return blocks;
     }
 
-    public static void registerTags(ObjectTagProcessor<? extends AreaContainmentObject> processor) {
+    static void registerTags(ObjectTagProcessor<? extends AreaContainmentObject> processor) {
 
         // <--[tag]
         // @attribute <AreaObject.bounding_box>

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java b/plugin/src/main/java/com/denizenscript/denizen/objects/MaterialTag.java
@@ -521,8 +521,7 @@ public static void registerTags() {
         // Returns an item of the material.
         // -->
         registerTag("item", (attribute, object) -> {
-            ItemTag item = new ItemTag(object, 1);
-            return item;
+            return new ItemTag(object, 1);
         });
 
         // <--[tag]

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemMap.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemMap.java
@@ -11,7 +11,6 @@
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import org.bukkit.Material;
 import org.bukkit.inventory.meta.MapMeta;
-import org.bukkit.map.MapView;
 
 import java.util.List;
 

diff --git a/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java b/plugin/src/main/java/com/denizenscript/denizen/objects/properties/item/ItemPotion.java
@@ -53,14 +53,12 @@ private ItemPotion(ItemTag item) {
     ItemTag item;
 
     public static String stringifyEffect(PotionEffect effect) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(effect.getType().getName()).append(",")
-                .append(effect.getAmplifier()).append(",")
-                .append(effect.getDuration()).append(",")
-                .append(effect.isAmbient()).append(",")
-                .append(effect.hasParticles()).append(",")
-                .append(effect.hasIcon());
-        return sb.toString();
+        return effect.getType().getName() + "," +
+                effect.getAmplifier() + "," +
+                effect.getDuration() + "," +
+                effect.isAmbient() + "," +
+                effect.hasParticles() + "," +
+                effect.hasIcon();
     }
 
     public static PotionEffect parseEffect(String str, TagContext context) {

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/core/CooldownCommand.java
@@ -1,6 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.core;
 
-import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.scripts.containers.core.InteractScriptContainer;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/LookCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.entity;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/RotateCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.entity;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.nms.interfaces.EntityHelper;
 import com.denizenscript.denizen.utilities.Utilities;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/entity/WalkCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.entity;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/BreakCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.npc;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PauseCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/npc/PauseCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.npc;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/...n/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java b/...n/src/main/java/com/denizenscript/denizen/scripts/commands/player/AdvancementCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.player;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.nms.NMSHandler;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/SidebarCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/SidebarCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.player;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/player/ToastCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.player;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/server/ExecuteCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.server;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.command.scripted.DenizenCommandSender;
 import com.denizenscript.denizen.utilities.Utilities;

diff --git a/...in/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java b/...in/src/main/java/com/denizenscript/denizen/scripts/commands/server/ScoreboardCommand.java
@@ -2,7 +2,6 @@
 
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.utilities.Utilities;
-import com.denizenscript.denizen.utilities.entity.FakeOfflinePlayer;
 import com.denizenscript.denizen.utilities.ScoreboardHelper;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.objects.PlayerTag;
@@ -15,8 +14,6 @@
 import com.denizenscript.denizencore.scripts.ScriptEntry;
 import com.denizenscript.denizencore.scripts.commands.AbstractCommand;
 import com.denizenscript.denizencore.utilities.CoreUtilities;
-import org.bukkit.Bukkit;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.DisplaySlot;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ChunkLoadCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/ChunkLoadCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.world;
+
 import com.denizenscript.denizen.utilities.blocks.ChunkCoordinate;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.depends.Depends;
@@ -28,10 +29,9 @@ public ChunkLoadCommand() {
         setName("chunkload");
         setSyntax("chunkload ({add}/remove/removeall) [<chunk>|...] (duration:<value>)");
         setRequiredArguments(1, 3);
-        Denizen denizen = Denizen.getInstance();
-        denizen.getServer().getPluginManager().registerEvents(this, denizen);
+        Bukkit.getPluginManager().registerEvents(this, Denizen.getInstance());
         if (Depends.citizens != null) {
-            denizen.getServer().getPluginManager().registerEvents(new ChunkLoadCommandNPCEvents(), denizen);
+            Bukkit.getPluginManager().registerEvents(new ChunkLoadCommandNPCEvents(), Denizen.getInstance());
         }
         isProcedural = false;
     }

diff --git a/...in/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java b/...in/src/main/java/com/denizenscript/denizen/scripts/commands/world/CreateWorldCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.world;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Settings;
 import com.denizenscript.denizen.utilities.Utilities;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/MidiCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.world;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/TimeCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.world;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java b/plugin/src/main/java/com/denizenscript/denizen/scripts/commands/world/WeatherCommand.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.commands.world;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.Utilities;
 import com.denizenscript.denizen.utilities.debugging.Debug;

diff --git a/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptHelper.java b/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/CommandScriptHelper.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.containers.core;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.command.scripted.DenizenAliasHelpTopic;
 import com.denizenscript.denizen.utilities.command.scripted.DenizenCommand;

diff --git a/...c/main/java/com/denizenscript/denizen/scripts/containers/core/EconomyScriptContainer.java b/...c/main/java/com/denizenscript/denizen/scripts/containers/core/EconomyScriptContainer.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.containers.core;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;
 import com.denizenscript.denizen.objects.PlayerTag;

diff --git a/.../main/java/com/denizenscript/denizen/scripts/containers/core/InteractScriptContainer.java b/.../main/java/com/denizenscript/denizen/scripts/containers/core/InteractScriptContainer.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.scripts.containers.core;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.implementation.BukkitScriptEntryData;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/ScoreboardHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/ScoreboardHelper.java
@@ -6,7 +6,6 @@
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import com.google.common.base.Splitter;
 import com.denizenscript.denizen.objects.PlayerTag;
-import com.denizenscript.denizen.scripts.commands.server.ScoreboardCommand;
 import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.configuration.ConfigurationSection;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/SpongeSchematicHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/blocks/SpongeSchematicHelper.java
@@ -116,8 +116,7 @@ public static CuboidBlockSet fromSpongeStream(InputStream is) {
                 int cbsIndex = z + y * cbs.z_height + x * cbs.z_height * cbs.y_length;
                 BlockVector pt = new BlockVector(x, y, z);
                 if (tileEntitiesMap.containsKey(pt)) {
-                    CompoundTag otag = NMSHandler.getInstance().createCompoundTag(tileEntitiesMap.get(pt));
-                    block.tileEntityData = otag;
+                    block.tileEntityData = NMSHandler.getInstance().createCompoundTag(tileEntitiesMap.get(pt));
                 }
                 cbs.blocks[cbsIndex] = block;
                 index++;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/DenizenCommandHandler.java
@@ -21,10 +21,7 @@
 
 public class DenizenCommandHandler {
 
-    private final Denizen denizen;
-
-    public DenizenCommandHandler(Denizen denizen) {
-        this.denizen = denizen;
+    public DenizenCommandHandler() {
     }
 
     // <--[language]
@@ -275,10 +272,10 @@ public void save(CommandContext args, CommandSender sender) throws CommandExcept
             min = 1, max = 3, permission = "denizen.basic", flags = "a")
     public void reload(CommandContext args, CommandSender sender) throws CommandException {
         if (args.hasFlag('a')) {
-            denizen.reloadConfig();
+            Denizen.getInstance().reloadConfig();
             DenizenCore.reloadScripts();
             NoteManager.reload();
-            denizen.reloadSaves();
+            Denizen.getInstance().reloadSaves();
             Messaging.send(sender, "Denizen save data, config, and scripts reloaded from disk to memory.");
             if (ScriptHelper.hadError()) {
                 Messaging.sendError(sender, "There was an error loading your scripts, check the console for details!");
@@ -287,7 +284,7 @@ public void reload(CommandContext args, CommandSender sender) throws CommandExce
         }
         if (args.length() > 2) {
             if (args.getString(1).equalsIgnoreCase("saves")) {
-                denizen.reloadSaves();
+                Denizen.getInstance().reloadSaves();
                 Messaging.send(sender, "Denizen save data reloaded from disk to memory.");
                 return;
             }
@@ -297,7 +294,7 @@ else if (args.getString(1).equalsIgnoreCase("notes")) {
                 return;
             }
             else if (args.getString(1).equalsIgnoreCase("config")) {
-                denizen.reloadConfig();
+                Denizen.getInstance().reloadConfig();
                 Messaging.send(sender, "Denizen config file reloaded from disk to memory.");
                 return;
             }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/StatsRecord.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/debugging/StatsRecord.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.utilities.debugging;
+
 import com.denizenscript.denizen.Denizen;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/depends/Depends.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/depends/Depends.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.utilities.depends;
+
 import com.denizenscript.denizen.Denizen;
 import com.google.common.io.ByteArrayDataOutput;
 import com.google.common.io.ByteStreams;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/EntityAttachmentHelper.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/entity/EntityAttachmentHelper.java
@@ -1,4 +1,5 @@
 package com.denizenscript.denizen.utilities.entity;
+
 import com.denizenscript.denizen.Denizen;
 import com.denizenscript.denizen.objects.EntityTag;
 import com.denizenscript.denizen.utilities.packets.NetworkInterceptHelper;

diff --git a/...in/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java b/...in/java/com/denizenscript/denizen/utilities/implementation/DenizenCoreImplementation.java
@@ -13,7 +13,6 @@
 import com.denizenscript.denizen.nms.NMSHandler;
 import com.denizenscript.denizen.utilities.maps.DenizenMapManager;
 import com.denizenscript.denizencore.DenizenImplementation;
-import com.denizenscript.denizencore.flags.AbstractFlagTracker;
 import com.denizenscript.denizencore.flags.FlaggableObject;
 import com.denizenscript.denizencore.objects.Argument;
 import com.denizenscript.denizencore.objects.ObjectFetcher;

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/maps/MapText.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/maps/MapText.java
@@ -3,7 +3,6 @@
 import com.denizenscript.denizen.objects.ColorTag;
 import com.denizenscript.denizen.objects.PlayerTag;
 import com.denizenscript.denizen.utilities.debugging.Debug;
-import org.bukkit.ChatColor;
 import org.bukkit.Color;
 import org.bukkit.map.MapCanvas;
 import org.bukkit.map.MapPalette;

diff --git a/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/ItemHelperImpl.java b/v1_14/src/main/java/com/denizenscript/denizen/nms/v1_14/helpers/ItemHelperImpl.java
@@ -13,7 +13,6 @@
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import net.minecraft.server.v1_14_R1.*;
 import org.bukkit.Bukkit;
-import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;

diff --git a/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/ItemHelperImpl.java b/v1_15/src/main/java/com/denizenscript/denizen/nms/v1_15/helpers/ItemHelperImpl.java
@@ -13,7 +13,6 @@
 import com.denizenscript.denizencore.utilities.CoreUtilities;
 import net.minecraft.server.v1_15_R1.*;
 import org.bukkit.Bukkit;
-import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;

diff --git a/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java b/v1_16/src/main/java/com/denizenscript/denizen/nms/v1_16/helpers/ItemHelperImpl.java
@@ -18,7 +18,6 @@
 import net.md_5.bungee.chat.ComponentSerializer;
 import net.minecraft.server.v1_16_R3.*;
 import org.bukkit.Bukkit;
-import org.bukkit.Color;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.craftbukkit.libs.it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;