From 1fea0f59646c85130d19778d7e818b6a9150f7ce Mon Sep 17 00:00:00 2001 From: tastybento Date: Wed, 1 Aug 2018 16:18:27 -0700 Subject: [PATCH] Use latest Bentobox --- pom.xml | 2 +- .../bentobox/addon/acidisland/AISettings.java | 22 +++++------ .../bentobox/addon/acidisland/AcidIsland.java | 4 +- .../acidisland/commands/AcidCommand.java | 38 +++++++++---------- .../addon/acidisland/commands/AiCommand.java | 32 ++++++++-------- .../events/EntityDamageByAcidEvent.java | 4 +- .../events/ItemDestroyByAcidEvent.java | 4 +- .../events/ItemFillWithAcidEvent.java | 4 +- .../events/PlayerDrinkAcidEvent.java | 4 +- .../acidisland/listeners/AcidEffect.java | 2 +- .../acidisland/world/AcidIslandWorld.java | 2 +- .../acidisland/events/AcidEventTest.java | 2 - .../acidisland/events/AcidRainEventTest.java | 2 - .../addon/acidisland/world/AcidTaskTest.java | 1 - 14 files changed, 59 insertions(+), 64 deletions(-) diff --git a/pom.xml b/pom.xml index 2cde934..2c90736 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ world.bentobox bentobox - 1.0 + LATEST org.mockito diff --git a/src/main/java/bentobox/addon/acidisland/AISettings.java b/src/main/java/bentobox/addon/acidisland/AISettings.java index f5a2424..aea5e2c 100644 --- a/src/main/java/bentobox/addon/acidisland/AISettings.java +++ b/src/main/java/bentobox/addon/acidisland/AISettings.java @@ -14,17 +14,17 @@ import org.bukkit.GameMode; import org.bukkit.entity.EntityType; import org.bukkit.potion.PotionEffectType; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.configuration.ConfigComment; -import world.bentobox.bbox.api.configuration.ConfigEntry; -import world.bentobox.bbox.api.configuration.StoreAt; -import world.bentobox.bbox.api.configuration.WorldSettings; -import world.bentobox.bbox.api.flags.Flag; -import world.bentobox.bbox.database.objects.DataObject; -import world.bentobox.bbox.database.objects.adapters.Adapter; -import world.bentobox.bbox.database.objects.adapters.FlagSerializer; -import world.bentobox.bbox.database.objects.adapters.FlagSerializer2; -import world.bentobox.bbox.database.objects.adapters.PotionEffectListAdapter; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.configuration.ConfigComment; +import world.bentobox.bentobox.api.configuration.ConfigEntry; +import world.bentobox.bentobox.api.configuration.StoreAt; +import world.bentobox.bentobox.api.configuration.WorldSettings; +import world.bentobox.bentobox.api.flags.Flag; +import world.bentobox.bentobox.database.objects.DataObject; +import world.bentobox.bentobox.database.objects.adapters.Adapter; +import world.bentobox.bentobox.database.objects.adapters.FlagSerializer; +import world.bentobox.bentobox.database.objects.adapters.FlagSerializer2; +import world.bentobox.bentobox.database.objects.adapters.PotionEffectListAdapter; /** * A lot of placeholders right now in here... diff --git a/src/main/java/bentobox/addon/acidisland/AcidIsland.java b/src/main/java/bentobox/addon/acidisland/AcidIsland.java index 6fcb2d6..a2cd56f 100644 --- a/src/main/java/bentobox/addon/acidisland/AcidIsland.java +++ b/src/main/java/bentobox/addon/acidisland/AcidIsland.java @@ -9,8 +9,8 @@ import bentobox.addon.acidisland.listeners.AcidEffect; import bentobox.addon.acidisland.listeners.LavaCheck; import bentobox.addon.acidisland.world.AcidIslandWorld; import bentobox.addon.acidisland.world.AcidTask; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.configuration.BSBConfig; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.configuration.BSBConfig; /** * Addon to BSkyBlock that enables AcidIsland diff --git a/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java b/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java index 294866e..89cd581 100755 --- a/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java +++ b/src/main/java/bentobox/addon/acidisland/commands/AcidCommand.java @@ -3,25 +3,25 @@ package bentobox.addon.acidisland.commands; import java.util.List; import bentobox.addon.acidisland.AcidIsland; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.commands.admin.AdminClearResetsAllCommand; -import world.bentobox.bbox.commands.admin.AdminClearResetsCommand; -import world.bentobox.bbox.commands.admin.AdminGetRankCommand; -import world.bentobox.bbox.commands.admin.AdminInfoCommand; -import world.bentobox.bbox.commands.admin.AdminRegisterCommand; -import world.bentobox.bbox.commands.admin.AdminReloadCommand; -import world.bentobox.bbox.commands.admin.AdminSchemCommand; -import world.bentobox.bbox.commands.admin.AdminSetRankCommand; -import world.bentobox.bbox.commands.admin.AdminTeleportCommand; -import world.bentobox.bbox.commands.admin.AdminUnregisterCommand; -import world.bentobox.bbox.commands.admin.AdminVersionCommand; -import world.bentobox.bbox.commands.admin.range.AdminRangeCommand; -import world.bentobox.bbox.commands.admin.team.AdminTeamAddCommand; -import world.bentobox.bbox.commands.admin.team.AdminTeamDisbandCommand; -import world.bentobox.bbox.commands.admin.team.AdminTeamKickCommand; -import world.bentobox.bbox.commands.admin.team.AdminTeamMakeLeaderCommand; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.commands.admin.AdminClearResetsAllCommand; +import world.bentobox.bentobox.commands.admin.AdminClearResetsCommand; +import world.bentobox.bentobox.commands.admin.AdminGetRankCommand; +import world.bentobox.bentobox.commands.admin.AdminInfoCommand; +import world.bentobox.bentobox.commands.admin.AdminRegisterCommand; +import world.bentobox.bentobox.commands.admin.AdminReloadCommand; +import world.bentobox.bentobox.commands.admin.AdminSchemCommand; +import world.bentobox.bentobox.commands.admin.AdminSetRankCommand; +import world.bentobox.bentobox.commands.admin.AdminTeleportCommand; +import world.bentobox.bentobox.commands.admin.AdminUnregisterCommand; +import world.bentobox.bentobox.commands.admin.AdminVersionCommand; +import world.bentobox.bentobox.commands.admin.range.AdminRangeCommand; +import world.bentobox.bentobox.commands.admin.team.AdminTeamAddCommand; +import world.bentobox.bentobox.commands.admin.team.AdminTeamDisbandCommand; +import world.bentobox.bentobox.commands.admin.team.AdminTeamKickCommand; +import world.bentobox.bentobox.commands.admin.team.AdminTeamMakeLeaderCommand; public class AcidCommand extends CompositeCommand { diff --git a/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java b/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java index cfb157c..6d95b0d 100755 --- a/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java +++ b/src/main/java/bentobox/addon/acidisland/commands/AiCommand.java @@ -4,22 +4,22 @@ import java.util.ArrayList; import java.util.List; import bentobox.addon.acidisland.AcidIsland; -import world.bentobox.bbox.api.addons.Addon; -import world.bentobox.bbox.api.commands.CompositeCommand; -import world.bentobox.bbox.api.user.User; -import world.bentobox.bbox.commands.island.IslandAboutCommand; -import world.bentobox.bbox.commands.island.IslandBanCommand; -import world.bentobox.bbox.commands.island.IslandBanlistCommand; -import world.bentobox.bbox.commands.island.IslandCreateCommand; -import world.bentobox.bbox.commands.island.IslandGoCommand; -import world.bentobox.bbox.commands.island.IslandLanguageCommand; -import world.bentobox.bbox.commands.island.IslandResetCommand; -import world.bentobox.bbox.commands.island.IslandResetnameCommand; -import world.bentobox.bbox.commands.island.IslandSethomeCommand; -import world.bentobox.bbox.commands.island.IslandSetnameCommand; -import world.bentobox.bbox.commands.island.IslandSettingsCommand; -import world.bentobox.bbox.commands.island.IslandUnbanCommand; -import world.bentobox.bbox.commands.island.team.IslandTeamCommand; +import world.bentobox.bentobox.api.addons.Addon; +import world.bentobox.bentobox.api.commands.CompositeCommand; +import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.commands.island.IslandAboutCommand; +import world.bentobox.bentobox.commands.island.IslandBanCommand; +import world.bentobox.bentobox.commands.island.IslandBanlistCommand; +import world.bentobox.bentobox.commands.island.IslandCreateCommand; +import world.bentobox.bentobox.commands.island.IslandGoCommand; +import world.bentobox.bentobox.commands.island.IslandLanguageCommand; +import world.bentobox.bentobox.commands.island.IslandResetCommand; +import world.bentobox.bentobox.commands.island.IslandResetnameCommand; +import world.bentobox.bentobox.commands.island.IslandSethomeCommand; +import world.bentobox.bentobox.commands.island.IslandSetnameCommand; +import world.bentobox.bentobox.commands.island.IslandSettingsCommand; +import world.bentobox.bentobox.commands.island.IslandUnbanCommand; +import world.bentobox.bentobox.commands.island.team.IslandTeamCommand; public class AiCommand extends CompositeCommand { diff --git a/src/main/java/bentobox/addon/acidisland/events/EntityDamageByAcidEvent.java b/src/main/java/bentobox/addon/acidisland/events/EntityDamageByAcidEvent.java index 03f128f..edd5527 100755 --- a/src/main/java/bentobox/addon/acidisland/events/EntityDamageByAcidEvent.java +++ b/src/main/java/bentobox/addon/acidisland/events/EntityDamageByAcidEvent.java @@ -2,8 +2,8 @@ package bentobox.addon.acidisland.events; import org.bukkit.entity.Entity; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.database.objects.Island; /** * Fired when an entity (items excluded) receives damage from acid diff --git a/src/main/java/bentobox/addon/acidisland/events/ItemDestroyByAcidEvent.java b/src/main/java/bentobox/addon/acidisland/events/ItemDestroyByAcidEvent.java index bb918c9..1fd9aea 100755 --- a/src/main/java/bentobox/addon/acidisland/events/ItemDestroyByAcidEvent.java +++ b/src/main/java/bentobox/addon/acidisland/events/ItemDestroyByAcidEvent.java @@ -2,8 +2,8 @@ package bentobox.addon.acidisland.events; import org.bukkit.entity.Item; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.database.objects.Island; /** * Fired when an item (on the ground) gets destroyed by acid diff --git a/src/main/java/bentobox/addon/acidisland/events/ItemFillWithAcidEvent.java b/src/main/java/bentobox/addon/acidisland/events/ItemFillWithAcidEvent.java index 61712af..1ed854a 100755 --- a/src/main/java/bentobox/addon/acidisland/events/ItemFillWithAcidEvent.java +++ b/src/main/java/bentobox/addon/acidisland/events/ItemFillWithAcidEvent.java @@ -3,8 +3,8 @@ package bentobox.addon.acidisland.events; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.database.objects.Island; /** * Fired when an ItemStack (water bottle or bucket) is filled with acid diff --git a/src/main/java/bentobox/addon/acidisland/events/PlayerDrinkAcidEvent.java b/src/main/java/bentobox/addon/acidisland/events/PlayerDrinkAcidEvent.java index 0b1687d..90be643 100755 --- a/src/main/java/bentobox/addon/acidisland/events/PlayerDrinkAcidEvent.java +++ b/src/main/java/bentobox/addon/acidisland/events/PlayerDrinkAcidEvent.java @@ -2,8 +2,8 @@ package bentobox.addon.acidisland.events; import org.bukkit.entity.Player; -import world.bentobox.bbox.api.events.IslandBaseEvent; -import world.bentobox.bbox.database.objects.Island; +import world.bentobox.bentobox.api.events.IslandBaseEvent; +import world.bentobox.bentobox.database.objects.Island; /** * Fired when a player drinks acid and... DIES diff --git a/src/main/java/bentobox/addon/acidisland/listeners/AcidEffect.java b/src/main/java/bentobox/addon/acidisland/listeners/AcidEffect.java index f5e3bf1..a980e2e 100644 --- a/src/main/java/bentobox/addon/acidisland/listeners/AcidEffect.java +++ b/src/main/java/bentobox/addon/acidisland/listeners/AcidEffect.java @@ -30,7 +30,7 @@ import bentobox.addon.acidisland.AcidIsland; import bentobox.addon.acidisland.events.AcidEvent; import bentobox.addon.acidisland.events.AcidRainEvent; import bentobox.addon.acidisland.world.AcidTask; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.util.Util; /** * Applies the acid effect to players diff --git a/src/main/java/bentobox/addon/acidisland/world/AcidIslandWorld.java b/src/main/java/bentobox/addon/acidisland/world/AcidIslandWorld.java index b0f05d7..9d4d2f3 100644 --- a/src/main/java/bentobox/addon/acidisland/world/AcidIslandWorld.java +++ b/src/main/java/bentobox/addon/acidisland/world/AcidIslandWorld.java @@ -6,7 +6,7 @@ import org.bukkit.WorldCreator; import org.bukkit.WorldType; import bentobox.addon.acidisland.AcidIsland; -import world.bentobox.bbox.util.Util; +import world.bentobox.bentobox.util.Util; /** * Creates the AI worlds and registers them with BSkyBlock diff --git a/src/test/java/bentobox/addon/acidisland/events/AcidEventTest.java b/src/test/java/bentobox/addon/acidisland/events/AcidEventTest.java index c5e4500..6958704 100644 --- a/src/test/java/bentobox/addon/acidisland/events/AcidEventTest.java +++ b/src/test/java/bentobox/addon/acidisland/events/AcidEventTest.java @@ -16,8 +16,6 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import bentobox.addon.acidisland.events.AcidEvent; - public class AcidEventTest { private Player player; diff --git a/src/test/java/bentobox/addon/acidisland/events/AcidRainEventTest.java b/src/test/java/bentobox/addon/acidisland/events/AcidRainEventTest.java index 2bda14c..5e5aac5 100644 --- a/src/test/java/bentobox/addon/acidisland/events/AcidRainEventTest.java +++ b/src/test/java/bentobox/addon/acidisland/events/AcidRainEventTest.java @@ -10,8 +10,6 @@ import org.bukkit.entity.Player; import org.junit.Before; import org.junit.Test; -import bentobox.addon.acidisland.events.AcidRainEvent; - public class AcidRainEventTest { private Player player; diff --git a/src/test/java/bentobox/addon/acidisland/world/AcidTaskTest.java b/src/test/java/bentobox/addon/acidisland/world/AcidTaskTest.java index b9a1a4b..82dbbe8 100644 --- a/src/test/java/bentobox/addon/acidisland/world/AcidTaskTest.java +++ b/src/test/java/bentobox/addon/acidisland/world/AcidTaskTest.java @@ -15,7 +15,6 @@ import org.powermock.modules.junit4.PowerMockRunner; import bentobox.addon.acidisland.AISettings; import bentobox.addon.acidisland.AcidIsland; -import bentobox.addon.acidisland.world.AcidTask; @RunWith(PowerMockRunner.class) @PrepareForTest({Bukkit.class})