From 90f88b442521f34e642856be952e4171cfce8769 Mon Sep 17 00:00:00 2001 From: Tastybento Date: Sat, 16 Dec 2017 09:33:24 -0800 Subject: [PATCH] Fully removed Vault Added commands for /island. --- .../bskyblock/api/commands/CompositeCommand.java | 11 ++++++----- .../tastybento/bskyblock/commands/AdminCommand.java | 3 ++- .../bskyblock/commands/IslandCommand.java | 13 +++++++++++++ .../commands/admin/AdminVersionCommand.java | 5 +++-- .../commands/island/IslandAboutCommand.java | 4 ++-- .../commands/island/IslandCreateCommand.java | 1 - .../bskyblock/commands/island/IslandGoCommand.java | 1 - .../commands/island/IslandResetCommand.java | 1 - .../commands/island/IslandResetnameCommand.java | 1 - .../commands/island/IslandSethomeCommand.java | 1 - .../commands/island/IslandSetnameCommand.java | 1 - .../teams/AbstractIslandTeamCommandArgument.java | 1 - .../island/teams/IslandTeamUninviteCommand.java | 1 - .../bskyblock/database/managers/PlayersManager.java | 1 - .../database/managers/island/IslandsManager.java | 1 - .../bskyblock/island/builders/IslandBuilder.java | 1 - .../bskyblock/listeners/JoinLeaveListener.java | 2 -- .../bskyblock/listeners/NetherPortals.java | 2 -- .../bskyblock/listeners/protection/IslandGuard.java | 2 -- .../listeners/protection/IslandGuard1_8.java | 1 - .../listeners/protection/IslandGuard1_9.java | 1 - .../listeners/protection/NetherEvents.java | 2 -- .../listeners/protection/VisitorGuard.java | 2 -- .../bskyblock/managers/AddonsManager.java | 4 ++-- .../bskyblock/managers/CommandsManager.java | 9 +++++---- .../java/us/tastybento/bskyblock/util/Util.java | 3 --- .../bskyblock/util/nms/NMSAbstraction.java | 3 --- .../bskyblock/util/nms/fallback/NMSHandler.java | 1 + .../bskyblock/util/nms/v1_12_R1/NMSHandler.java | 1 + 29 files changed, 35 insertions(+), 45 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java b/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java index 8c4fe8cab..ebad0c298 100644 --- a/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java +++ b/src/main/java/us/tastybento/bskyblock/api/commands/CompositeCommand.java @@ -1,15 +1,16 @@ package us.tastybento.bskyblock.api.commands; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.command.PluginIdentifiableCommand; -import us.tastybento.bskyblock.BSkyBlock; - import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.PluginIdentifiableCommand; + +import us.tastybento.bskyblock.BSkyBlock; + public abstract class CompositeCommand extends Command implements PluginIdentifiableCommand { private BSkyBlock plugin = BSkyBlock.getPlugin(); diff --git a/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java b/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java index 0c2105a12..fb1553f7f 100755 --- a/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/AdminCommand.java @@ -1,6 +1,7 @@ package us.tastybento.bskyblock.commands; import org.bukkit.command.CommandSender; + import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.commands.admin.AdminVersionCommand; import us.tastybento.bskyblock.config.Settings; @@ -8,7 +9,7 @@ import us.tastybento.bskyblock.config.Settings; public class AdminCommand extends CompositeCommand { public AdminCommand() { - super(Settings.ADMINCOMMAND, "Admin commands"); + super(Settings.ADMINCOMMAND, "Admin commands", "bsb"); } @Override diff --git a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java index ae03c827e..98f3261a2 100755 --- a/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/IslandCommand.java @@ -1,8 +1,15 @@ package us.tastybento.bskyblock.commands; import org.bukkit.command.CommandSender; + import us.tastybento.bskyblock.api.commands.CompositeCommand; import us.tastybento.bskyblock.commands.island.IslandAboutCommand; +import us.tastybento.bskyblock.commands.island.IslandCreateCommand; +import us.tastybento.bskyblock.commands.island.IslandGoCommand; +import us.tastybento.bskyblock.commands.island.IslandResetCommand; +import us.tastybento.bskyblock.commands.island.IslandResetnameCommand; +import us.tastybento.bskyblock.commands.island.IslandSethomeCommand; +import us.tastybento.bskyblock.commands.island.IslandSetnameCommand; import us.tastybento.bskyblock.commands.island.teams.IslandTeamCommand; import us.tastybento.bskyblock.config.Settings; @@ -15,6 +22,12 @@ public class IslandCommand extends CompositeCommand { @Override public void setup() { this.addSubCommand(new IslandAboutCommand()); + this.addSubCommand(new IslandCreateCommand()); + this.addSubCommand(new IslandGoCommand()); + this.addSubCommand(new IslandResetCommand()); + this.addSubCommand(new IslandResetnameCommand()); + this.addSubCommand(new IslandSethomeCommand()); + this.addSubCommand(new IslandSetnameCommand()); this.addSubCommand(new IslandTeamCommand()); } diff --git a/src/main/java/us/tastybento/bskyblock/commands/admin/AdminVersionCommand.java b/src/main/java/us/tastybento/bskyblock/commands/admin/AdminVersionCommand.java index 6bddd6794..f0370ed05 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/admin/AdminVersionCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/admin/AdminVersionCommand.java @@ -1,12 +1,13 @@ package us.tastybento.bskyblock.commands.admin; +import java.util.Set; + import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; + import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.api.commands.CommandArgument; -import java.util.Set; - public class AdminVersionCommand extends CommandArgument { public AdminVersionCommand() { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandAboutCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandAboutCommand.java index 7cb2e17e5..027ece230 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandAboutCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandAboutCommand.java @@ -1,12 +1,12 @@ package us.tastybento.bskyblock.commands.island; +import java.util.Set; + import org.bukkit.command.CommandSender; import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.api.commands.CommandArgument; -import java.util.Set; - public class IslandAboutCommand extends CommandArgument { public IslandAboutCommand() { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java index 93e2cb7aa..3e66e12b4 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandCreateCommand.java @@ -14,7 +14,6 @@ import us.tastybento.bskyblock.api.commands.CommandArgument; import us.tastybento.bskyblock.api.events.island.IslandEvent.Reason; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.managers.island.NewIsland; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author ben diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java index c56805ee2..28e6d06fe 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandGoCommand.java @@ -13,7 +13,6 @@ import org.bukkit.entity.Player; import us.tastybento.bskyblock.api.commands.CommandArgument; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author ben diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetCommand.java index 40b861ccd..271674bfe 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetCommand.java @@ -13,7 +13,6 @@ import us.tastybento.bskyblock.api.events.island.IslandEvent.Reason; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.managers.island.NewIsland; import us.tastybento.bskyblock.database.objects.Island; -import us.tastybento.bskyblock.util.VaultHelper; public class IslandResetCommand extends CommandArgument { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java index f4ee36488..1caf9ef94 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandResetnameCommand.java @@ -12,7 +12,6 @@ import org.bukkit.entity.Player; import us.tastybento.bskyblock.api.commands.CommandArgument; import us.tastybento.bskyblock.config.Settings; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author ben diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java index cabafb190..94af98dbb 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSethomeCommand.java @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; import us.tastybento.bskyblock.api.commands.CommandArgument; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; public class IslandSethomeCommand extends CommandArgument { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java index 354e0b9ad..42316bf5c 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/IslandSetnameCommand.java @@ -12,7 +12,6 @@ import org.bukkit.entity.Player; import us.tastybento.bskyblock.api.commands.CommandArgument; import us.tastybento.bskyblock.config.Settings; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author ben diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommandArgument.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommandArgument.java index e59d1a6f2..45ec6bbd8 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommandArgument.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/AbstractIslandTeamCommandArgument.java @@ -15,7 +15,6 @@ import com.google.common.collect.HashBiMap; import us.tastybento.bskyblock.api.commands.CommandArgument; import us.tastybento.bskyblock.config.Settings; -import us.tastybento.bskyblock.util.VaultHelper; public abstract class AbstractIslandTeamCommandArgument extends CommandArgument { diff --git a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java index 77b2caf75..d056958eb 100644 --- a/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java +++ b/src/main/java/us/tastybento/bskyblock/commands/island/teams/IslandTeamUninviteCommand.java @@ -10,7 +10,6 @@ import org.bukkit.entity.Player; import us.tastybento.bskyblock.api.events.team.TeamEvent; import us.tastybento.bskyblock.api.events.team.TeamEvent.TeamReason; import us.tastybento.bskyblock.config.Settings; -import us.tastybento.bskyblock.util.VaultHelper; public class IslandTeamUninviteCommand extends AbstractIslandTeamCommandArgument { diff --git a/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java b/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java index 00a433875..1bf370e7e 100644 --- a/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/managers/PlayersManager.java @@ -19,7 +19,6 @@ import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.BSBDatabase; import us.tastybento.bskyblock.database.objects.Island; import us.tastybento.bskyblock.database.objects.Players; -import us.tastybento.bskyblock.util.VaultHelper; public class PlayersManager{ diff --git a/src/main/java/us/tastybento/bskyblock/database/managers/island/IslandsManager.java b/src/main/java/us/tastybento/bskyblock/database/managers/island/IslandsManager.java index 31dc6dfbb..034aaef6a 100644 --- a/src/main/java/us/tastybento/bskyblock/database/managers/island/IslandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/database/managers/island/IslandsManager.java @@ -5,7 +5,6 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; -import org.bukkit.ChatColor; import org.bukkit.GameMode; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java b/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java index 1a3e811d5..3d622084f 100644 --- a/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java +++ b/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java @@ -2,7 +2,6 @@ package us.tastybento.bskyblock.island.builders; import java.util.UUID; -import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.TreeType; diff --git a/src/main/java/us/tastybento/bskyblock/listeners/JoinLeaveListener.java b/src/main/java/us/tastybento/bskyblock/listeners/JoinLeaveListener.java index 01d1cc6f5..a4c4d6a7b 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/JoinLeaveListener.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/JoinLeaveListener.java @@ -13,8 +13,6 @@ import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.managers.PlayersManager; import us.tastybento.bskyblock.database.objects.Island; -import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; public class JoinLeaveListener implements Listener { diff --git a/src/main/java/us/tastybento/bskyblock/listeners/NetherPortals.java b/src/main/java/us/tastybento/bskyblock/listeners/NetherPortals.java index 6341f7c91..02a0339e0 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/NetherPortals.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/NetherPortals.java @@ -24,8 +24,6 @@ import us.tastybento.bskyblock.generators.IslandWorld; import us.tastybento.bskyblock.island.builders.IslandBuilder; import us.tastybento.bskyblock.island.builders.IslandBuilder.IslandType; import us.tastybento.bskyblock.util.SafeSpotTeleport; -import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; public class NetherPortals implements Listener { private final BSkyBlock plugin; diff --git a/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard.java b/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard.java index 183badcfc..1867dec9e 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard.java @@ -54,7 +54,6 @@ import org.bukkit.event.entity.PlayerLeashEntityEvent; import org.bukkit.event.entity.PotionSplashEvent; import org.bukkit.event.hanging.HangingBreakByEntityEvent; import org.bukkit.event.hanging.HangingPlaceEvent; -import org.bukkit.event.inventory.CraftItemEvent; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.player.PlayerBedEnterEvent; import org.bukkit.event.player.PlayerBucketEmptyEvent; @@ -82,7 +81,6 @@ import us.tastybento.bskyblock.database.objects.Island; import us.tastybento.bskyblock.database.objects.Island.SettingsFlag; import us.tastybento.bskyblock.generators.IslandWorld; import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author tastybento diff --git a/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_8.java b/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_8.java index 8622bcb95..d76717d6d 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_8.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_8.java @@ -20,7 +20,6 @@ import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.objects.Island; import us.tastybento.bskyblock.database.objects.Island.SettingsFlag; import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author tastybento diff --git a/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_9.java b/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_9.java index 487ce1eb8..f13a99ddf 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_9.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/protection/IslandGuard1_9.java @@ -39,7 +39,6 @@ import us.tastybento.bskyblock.database.objects.Island; import us.tastybento.bskyblock.database.objects.Island.SettingsFlag; import us.tastybento.bskyblock.generators.IslandWorld; import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author tastybento diff --git a/src/main/java/us/tastybento/bskyblock/listeners/protection/NetherEvents.java b/src/main/java/us/tastybento/bskyblock/listeners/protection/NetherEvents.java index f2b7c4ebf..4c2c0a835 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/protection/NetherEvents.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/protection/NetherEvents.java @@ -22,8 +22,6 @@ import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.generators.IslandWorld; import us.tastybento.bskyblock.util.SafeSpotTeleport; -import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; public class NetherEvents implements Listener { private final BSkyBlock plugin; diff --git a/src/main/java/us/tastybento/bskyblock/listeners/protection/VisitorGuard.java b/src/main/java/us/tastybento/bskyblock/listeners/protection/VisitorGuard.java index ba0e87d61..e1679fe50 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/protection/VisitorGuard.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/protection/VisitorGuard.java @@ -9,7 +9,6 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.EntityPickupItemEvent; import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerRespawnEvent; @@ -18,7 +17,6 @@ import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.database.objects.Island; import us.tastybento.bskyblock.database.objects.Island.SettingsFlag; import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; /** * @author tastybento diff --git a/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java b/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java index efe9bb6e8..893ce8f15 100644 --- a/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java +++ b/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java @@ -1,10 +1,10 @@ package us.tastybento.bskyblock.managers; -import us.tastybento.bskyblock.api.addons.BSAddon; - import java.util.ArrayList; import java.util.List; +import us.tastybento.bskyblock.api.addons.BSAddon; + public final class AddonsManager { private final List addons = new ArrayList<>(); diff --git a/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java b/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java index 54c3db828..fefa7f8b5 100644 --- a/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java @@ -1,14 +1,15 @@ package us.tastybento.bskyblock.managers; -import org.bukkit.command.Command; -import us.tastybento.bskyblock.BSkyBlock; -import us.tastybento.bskyblock.api.BSModule; - import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import org.bukkit.command.Command; + +import us.tastybento.bskyblock.BSkyBlock; +import us.tastybento.bskyblock.api.BSModule; + public final class CommandsManager { private Map> commands = new LinkedHashMap<>(); diff --git a/src/main/java/us/tastybento/bskyblock/util/Util.java b/src/main/java/us/tastybento/bskyblock/util/Util.java index ca2bc9e15..89d0920db 100755 --- a/src/main/java/us/tastybento/bskyblock/util/Util.java +++ b/src/main/java/us/tastybento/bskyblock/util/Util.java @@ -11,13 +11,11 @@ import java.util.List; import org.apache.commons.lang.math.NumberUtils; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; -import org.bukkit.command.CommandSender; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; @@ -32,7 +30,6 @@ import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.config.Settings; import us.tastybento.bskyblock.generators.IslandWorld; import us.tastybento.bskyblock.util.nms.NMSAbstraction; -import us.tastybento.bskyblock.util.placeholders.PlaceholderHandler; /** * A set of utility methods diff --git a/src/main/java/us/tastybento/bskyblock/util/nms/NMSAbstraction.java b/src/main/java/us/tastybento/bskyblock/util/nms/NMSAbstraction.java index b44d7b5ee..ffa6f1eb5 100644 --- a/src/main/java/us/tastybento/bskyblock/util/nms/NMSAbstraction.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/NMSAbstraction.java @@ -1,11 +1,8 @@ package us.tastybento.bskyblock.util.nms; -import org.bukkit.command.Command; import org.bukkit.command.CommandMap; import org.bukkit.entity.Player; -import java.util.Map; - public interface NMSAbstraction { /** diff --git a/src/main/java/us/tastybento/bskyblock/util/nms/fallback/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/fallback/NMSHandler.java index bdfc97cea..2612eabf4 100644 --- a/src/main/java/us/tastybento/bskyblock/util/nms/fallback/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/fallback/NMSHandler.java @@ -2,6 +2,7 @@ package us.tastybento.bskyblock.util.nms.fallback; import org.bukkit.command.CommandMap; import org.bukkit.entity.Player; + import us.tastybento.bskyblock.util.nms.NMSAbstraction; public class NMSHandler implements NMSAbstraction { diff --git a/src/main/java/us/tastybento/bskyblock/util/nms/v1_12_R1/NMSHandler.java b/src/main/java/us/tastybento/bskyblock/util/nms/v1_12_R1/NMSHandler.java index a7a49540f..5d512b3ce 100644 --- a/src/main/java/us/tastybento/bskyblock/util/nms/v1_12_R1/NMSHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/nms/v1_12_R1/NMSHandler.java @@ -4,6 +4,7 @@ import org.bukkit.Bukkit; import org.bukkit.command.CommandMap; import org.bukkit.craftbukkit.v1_12_R1.CraftServer; import org.bukkit.entity.Player; + import us.tastybento.bskyblock.util.nms.NMSAbstraction; public class NMSHandler implements NMSAbstraction {