From 8ce7c3e63122b5e86d76dcc4b5d4629d3036f9b7 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sun, 27 Dec 2020 11:11:54 -0800 Subject: [PATCH] Updated to BentoBox 1.15.4 API --- pom.xml | 6 +++--- .../bentobox/limits/listeners/BlockLimitsListener.java | 8 ++++---- .../world/bentobox/limits/listeners/JoinListener.java | 2 +- src/main/resources/addon.yml | 2 +- .../bentobox/addon/limits/listeners/JoinListenerTest.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 3553091..a56dfbf 100644 --- a/pom.xml +++ b/pom.xml @@ -57,14 +57,14 @@ 2.0.2 - 1.16.1-R0.1-SNAPSHOT - 1.14.0 + 1.16.3-R0.1-SNAPSHOT + 1.15.4-SNAPSHOT ${build.version}-SNAPSHOT -LOCAL - 1.15.1 + 1.15.2 diff --git a/src/main/java/world/bentobox/limits/listeners/BlockLimitsListener.java b/src/main/java/world/bentobox/limits/listeners/BlockLimitsListener.java index 1dbcbc6..85e67e4 100644 --- a/src/main/java/world/bentobox/limits/listeners/BlockLimitsListener.java +++ b/src/main/java/world/bentobox/limits/listeners/BlockLimitsListener.java @@ -40,7 +40,7 @@ import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.eclipse.jdt.annotation.Nullable; -import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeleteEvent; +import world.bentobox.bentobox.api.events.island.IslandDeleteEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.Database; @@ -280,7 +280,7 @@ public class BlockLimitsListener implements Listener { // Return equivalents. b can be Block/Material public Material fixMaterial(BlockData b) { Material mat = b.getMaterial(); - + if (mat == Material.REDSTONE_WALL_TORCH) { return Material.REDSTONE_TORCH; } else if (mat == Material.WALL_TORCH) { @@ -304,8 +304,8 @@ public class BlockLimitsListener implements Listener { } } return mat; - } - + } + /** * Check if a block can be * diff --git a/src/main/java/world/bentobox/limits/listeners/JoinListener.java b/src/main/java/world/bentobox/limits/listeners/JoinListener.java index 47507a3..7a1bc00 100644 --- a/src/main/java/world/bentobox/limits/listeners/JoinListener.java +++ b/src/main/java/world/bentobox/limits/listeners/JoinListener.java @@ -20,7 +20,7 @@ import org.bukkit.permissions.PermissionAttachmentInfo; import world.bentobox.bentobox.api.events.island.IslandEvent; import world.bentobox.bentobox.api.events.island.IslandEvent.Reason; -import world.bentobox.bentobox.api.events.team.TeamEvent.TeamSetownerEvent; +import world.bentobox.bentobox.api.events.team.TeamSetownerEvent; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.limits.Limits; import world.bentobox.limits.Settings.EntityGroup; diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index 748e5f8..1627292 100755 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -1,7 +1,7 @@ name: Limits main: world.bentobox.limits.Limits version: ${version}${build.number} -api-version: 1.14 +api-version: 1.15.4 authors: tastybento diff --git a/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java b/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java index 5af7f53..beaaf26 100644 --- a/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java +++ b/src/test/java/bentobox/addon/limits/listeners/JoinListenerTest.java @@ -37,7 +37,7 @@ import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.bentobox.api.addons.AddonDescription; import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.events.island.IslandEvent; -import world.bentobox.bentobox.api.events.team.TeamEvent.TeamSetownerEvent; +import world.bentobox.bentobox.api.events.team.TeamSetownerEvent; import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.managers.IslandsManager; import world.bentobox.limits.Limits;