diff --git a/pom.xml b/pom.xml index 2ed4f3a..974b344 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - bskyblock.addon + world.bentobox WelcomeWarpSigns 0.1.0-SNAPSHOT @@ -18,11 +18,27 @@ https://github.com/BentoBoxWorld/addon-welcomewarpsigns + + jenkins + http://ci.codemc.org/job/BentoBoxWorld/job/addon-welcomewarpsigns + + GitHub https://github.com/BentoBoxWorld/addon-welcomewarpsigns/issues + + + codemc-snapshots + https://repo.codemc.org/repository/maven-snapshots + + + codemc-releases + https://repo.codemc.org/repository/maven-releases + + + UTF-8 UTF-8 @@ -73,7 +89,7 @@ 0.12.0-SNAPSHOT - bskyblock.addon + world.bentobox Level 0.1.0-SNAPSHOT provided diff --git a/src/main/java/bentobox/addon/warps/Warp.java b/src/main/java/world/bentobox/warps/Warp.java similarity index 88% rename from src/main/java/bentobox/addon/warps/Warp.java rename to src/main/java/world/bentobox/warps/Warp.java index 387bd63..bc62ee9 100644 --- a/src/main/java/bentobox/addon/warps/Warp.java +++ b/src/main/java/world/bentobox/warps/Warp.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps; +package world.bentobox.warps; import java.util.HashSet; import java.util.Set; @@ -6,10 +6,10 @@ import java.util.UUID; import org.bukkit.World; -import bentobox.addon.level.Level; -import bentobox.addon.warps.commands.WarpCommand; -import bentobox.addon.warps.commands.WarpsCommand; -import bentobox.addon.warps.config.PluginConfig; +import world.bentobox.level.Level; +import world.bentobox.warps.commands.WarpCommand; +import world.bentobox.warps.commands.WarpsCommand; +import world.bentobox.warps.config.PluginConfig; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.commands.CompositeCommand; @@ -24,15 +24,15 @@ public class Warp extends Addon { private static final String BSKYBLOCK = "BSkyBlock"; private static final String ACIDISLAND = "AcidIsland"; - private static final String LEVEL_PLUGIN_NAME = "BentoBox-Level"; + private static final String LEVEL_ADDON_NAME = "Level"; // The plugin instance. private BentoBox plugin; - // Warp panel object + // Warp panel objects private WarpPanelManager warpPanelManager; - // Warps signs object + // Warps signs objects private WarpSignsManager warpSignsManager; private Set registeredWorlds; @@ -126,7 +126,7 @@ public class Warp extends Addon { * @return island level or null if there is no level plugin */ public Long getLevel(World world, UUID uniqueId) { - return plugin.getAddonsManager().getAddonByName(LEVEL_PLUGIN_NAME).map(l -> ((Level) l).getIslandLevel(world, uniqueId)).orElse(null); + return plugin.getAddonsManager().getAddonByName(LEVEL_ADDON_NAME).map(l -> ((Level) l).getIslandLevel(world, uniqueId)).orElse(null); } } diff --git a/src/main/java/bentobox/addon/warps/WarpPanelManager.java b/src/main/java/world/bentobox/warps/WarpPanelManager.java similarity index 99% rename from src/main/java/bentobox/addon/warps/WarpPanelManager.java rename to src/main/java/world/bentobox/warps/WarpPanelManager.java index 449d62e..dc8d783 100644 --- a/src/main/java/bentobox/addon/warps/WarpPanelManager.java +++ b/src/main/java/world/bentobox/warps/WarpPanelManager.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps; +package world.bentobox.warps; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/bentobox/addon/warps/WarpSignsListener.java b/src/main/java/world/bentobox/warps/WarpSignsListener.java similarity index 98% rename from src/main/java/bentobox/addon/warps/WarpSignsListener.java rename to src/main/java/world/bentobox/warps/WarpSignsListener.java index dd48ccc..3ed5495 100644 --- a/src/main/java/bentobox/addon/warps/WarpSignsListener.java +++ b/src/main/java/world/bentobox/warps/WarpSignsListener.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps; +package world.bentobox.warps; import java.util.Map; import java.util.UUID; @@ -15,7 +15,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.SignChangeEvent; -import bentobox.addon.warps.event.WarpRemoveEvent; +import world.bentobox.warps.event.WarpRemoveEvent; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bentobox/addon/warps/WarpSignsManager.java b/src/main/java/world/bentobox/warps/WarpSignsManager.java similarity index 98% rename from src/main/java/bentobox/addon/warps/WarpSignsManager.java rename to src/main/java/world/bentobox/warps/WarpSignsManager.java index b10c3a2..844a6f3 100644 --- a/src/main/java/bentobox/addon/warps/WarpSignsManager.java +++ b/src/main/java/world/bentobox/warps/WarpSignsManager.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps; +package world.bentobox.warps; import java.util.ArrayList; import java.util.Arrays; @@ -24,9 +24,9 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Sign; -import bentobox.addon.warps.database.object.WarpsData; -import bentobox.addon.warps.event.WarpInitiateEvent; -import bentobox.addon.warps.event.WarpListEvent; +import world.bentobox.warps.objects.WarpsData; +import world.bentobox.warps.event.WarpInitiateEvent; +import world.bentobox.warps.event.WarpListEvent; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.database.Database; diff --git a/src/main/java/bentobox/addon/warps/commands/WarpCommand.java b/src/main/java/world/bentobox/warps/commands/WarpCommand.java similarity index 97% rename from src/main/java/bentobox/addon/warps/commands/WarpCommand.java rename to src/main/java/world/bentobox/warps/commands/WarpCommand.java index 2777675..9ce0bf7 100644 --- a/src/main/java/bentobox/addon/warps/commands/WarpCommand.java +++ b/src/main/java/world/bentobox/warps/commands/WarpCommand.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps.commands; +package world.bentobox.warps.commands; import java.util.ArrayList; import java.util.List; @@ -6,7 +6,7 @@ import java.util.Optional; import java.util.Set; import java.util.UUID; -import bentobox.addon.warps.Warp; +import world.bentobox.warps.Warp; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bentobox/addon/warps/commands/WarpsCommand.java b/src/main/java/world/bentobox/warps/commands/WarpsCommand.java similarity index 94% rename from src/main/java/bentobox/addon/warps/commands/WarpsCommand.java rename to src/main/java/world/bentobox/warps/commands/WarpsCommand.java index a4e881e..b201972 100644 --- a/src/main/java/bentobox/addon/warps/commands/WarpsCommand.java +++ b/src/main/java/world/bentobox/warps/commands/WarpsCommand.java @@ -1,11 +1,11 @@ /** * */ -package bentobox.addon.warps.commands; +package world.bentobox.warps.commands; import java.util.List; -import bentobox.addon.warps.Warp; +import world.bentobox.warps.Warp; import world.bentobox.bentobox.api.commands.CompositeCommand; import world.bentobox.bentobox.api.user.User; diff --git a/src/main/java/bentobox/addon/warps/config/PluginConfig.java b/src/main/java/world/bentobox/warps/config/PluginConfig.java similarity index 87% rename from src/main/java/bentobox/addon/warps/config/PluginConfig.java rename to src/main/java/world/bentobox/warps/config/PluginConfig.java index 110a7b5..ea8541b 100644 --- a/src/main/java/bentobox/addon/warps/config/PluginConfig.java +++ b/src/main/java/world/bentobox/warps/config/PluginConfig.java @@ -1,6 +1,6 @@ -package bentobox.addon.warps.config; +package world.bentobox.warps.config; -import bentobox.addon.warps.Warp; +import world.bentobox.warps.Warp; public class PluginConfig { diff --git a/src/main/java/bentobox/addon/warps/event/WarpCreateEvent.java b/src/main/java/world/bentobox/warps/event/WarpCreateEvent.java similarity index 90% rename from src/main/java/bentobox/addon/warps/event/WarpCreateEvent.java rename to src/main/java/world/bentobox/warps/event/WarpCreateEvent.java index b84df4d..0c87f21 100644 --- a/src/main/java/bentobox/addon/warps/event/WarpCreateEvent.java +++ b/src/main/java/world/bentobox/warps/event/WarpCreateEvent.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps.event; +package world.bentobox.warps.event; import java.util.UUID; @@ -6,7 +6,7 @@ import org.bukkit.Location; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import bentobox.addon.warps.Warp; +import world.bentobox.warps.Warp; /** * This event is fired when a Warp is created @@ -22,7 +22,7 @@ public class WarpCreateEvent extends Event{ private UUID creator; /** - * @param plugin - BSkyBlock plugin object + * @param plugin - BSkyBlock plugin objects * @param warpLoc * @param creator */ diff --git a/src/main/java/bentobox/addon/warps/event/WarpInitiateEvent.java b/src/main/java/world/bentobox/warps/event/WarpInitiateEvent.java similarity index 93% rename from src/main/java/bentobox/addon/warps/event/WarpInitiateEvent.java rename to src/main/java/world/bentobox/warps/event/WarpInitiateEvent.java index 76997b1..0d4725d 100644 --- a/src/main/java/bentobox/addon/warps/event/WarpInitiateEvent.java +++ b/src/main/java/world/bentobox/warps/event/WarpInitiateEvent.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps.event; +package world.bentobox.warps.event; import java.util.UUID; @@ -7,7 +7,7 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import bentobox.addon.warps.Warp; +import world.bentobox.warps.Warp; /** * This event is fired when a player tries to do a warp @@ -23,7 +23,7 @@ public class WarpInitiateEvent extends Event implements Cancellable { private final UUID player; /** - * @param plugin - BSkyBlock plugin object + * @param plugin - BSkyBlock plugin objects * @param warpLoc - where the player is warping to * @param player - the UUID of the player */ diff --git a/src/main/java/bentobox/addon/warps/event/WarpListEvent.java b/src/main/java/world/bentobox/warps/event/WarpListEvent.java similarity index 94% rename from src/main/java/bentobox/addon/warps/event/WarpListEvent.java rename to src/main/java/world/bentobox/warps/event/WarpListEvent.java index 49a9fcf..869750c 100644 --- a/src/main/java/bentobox/addon/warps/event/WarpListEvent.java +++ b/src/main/java/world/bentobox/warps/event/WarpListEvent.java @@ -15,7 +15,7 @@ * along with ASkyBlock. If not, see . *******************************************************************************/ -package bentobox.addon.warps.event; +package world.bentobox.warps.event; import java.util.List; import java.util.UUID; @@ -23,7 +23,7 @@ import java.util.UUID; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import bentobox.addon.warps.Warp; +import world.bentobox.warps.Warp; /** * This event is fired when request is made for a sorted list of warps or when @@ -39,7 +39,7 @@ public class WarpListEvent extends Event { private List warps; /** - * @param plugin - BSkyBlock plugin object + * @param plugin - BSkyBlock plugin objects * @param warps */ public WarpListEvent(Warp plugin, List warps) { diff --git a/src/main/java/bentobox/addon/warps/event/WarpRemoveEvent.java b/src/main/java/world/bentobox/warps/event/WarpRemoveEvent.java similarity index 90% rename from src/main/java/bentobox/addon/warps/event/WarpRemoveEvent.java rename to src/main/java/world/bentobox/warps/event/WarpRemoveEvent.java index 976e271..54837f0 100644 --- a/src/main/java/bentobox/addon/warps/event/WarpRemoveEvent.java +++ b/src/main/java/world/bentobox/warps/event/WarpRemoveEvent.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps.event; +package world.bentobox.warps.event; import java.util.UUID; @@ -6,7 +6,7 @@ import org.bukkit.Location; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import bentobox.addon.warps.Warp; +import world.bentobox.warps.Warp; /** * This event is fired when a Warp is removed (when a warp sign is broken) @@ -22,7 +22,7 @@ public class WarpRemoveEvent extends Event{ private UUID remover; /** - * @param plugin - BSkyBlock plugin object + * @param plugin - BSkyBlock plugin objects * @param warpLoc * @param remover */ diff --git a/src/main/java/bentobox/addon/warps/database/object/WarpsData.java b/src/main/java/world/bentobox/warps/objects/WarpsData.java similarity index 90% rename from src/main/java/bentobox/addon/warps/database/object/WarpsData.java rename to src/main/java/world/bentobox/warps/objects/WarpsData.java index 1078abc..9fc6757 100644 --- a/src/main/java/bentobox/addon/warps/database/object/WarpsData.java +++ b/src/main/java/world/bentobox/warps/objects/WarpsData.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps.database.object; +package world.bentobox.warps.objects; import java.util.HashMap; import java.util.Map; @@ -41,7 +41,7 @@ public class WarpsData implements DataObject { } /** - * Puts all the data from the map into this object ready for saving + * Puts all the data from the map into this objects ready for saving * @param worldsWarpList * @return this class filled with data */ diff --git a/src/main/resources/addon.yml b/src/main/resources/addon.yml index f2691b7..0cfe154 100755 --- a/src/main/resources/addon.yml +++ b/src/main/resources/addon.yml @@ -1,5 +1,5 @@ -name: BentoBox-WelcomeWarps -main: bentobox.addon.warps.Warp +name: WelcomeWarps +main: world.bentobox.warps.Warp version: ${version} authors: tastybento diff --git a/src/test/java/bentobox/addon/warps/WarpPanelManagerTest.java b/src/test/java/world/bentobox/warps/WarpPanelManagerTest.java similarity index 87% rename from src/test/java/bentobox/addon/warps/WarpPanelManagerTest.java rename to src/test/java/world/bentobox/warps/WarpPanelManagerTest.java index 8fb1ae6..829920f 100644 --- a/src/test/java/bentobox/addon/warps/WarpPanelManagerTest.java +++ b/src/test/java/world/bentobox/warps/WarpPanelManagerTest.java @@ -1,7 +1,7 @@ /** * */ -package bentobox.addon.warps; +package world.bentobox.warps; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -30,6 +30,9 @@ import org.powermock.modules.junit4.PowerMockRunner; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.managers.PlayersManager; +import world.bentobox.warps.Warp; +import world.bentobox.warps.WarpPanelManager; +import world.bentobox.warps.WarpSignsManager; /** * @author ben @@ -99,7 +102,7 @@ public class WarpPanelManagerTest { when(Bukkit.createInventory(Mockito.any(), Mockito.anyInt(), Mockito.any())).thenReturn(top); } /** - * Test method for {@link bentobox.addon.warps.WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. + * Test method for {@link WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. */ @Test public void testShowWarpPanelFirst() { @@ -111,7 +114,7 @@ public class WarpPanelManagerTest { } /** - * Test method for {@link bentobox.addon.warps.WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. + * Test method for {@link WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. */ @Test public void testShowWarpPanelMiddle() { @@ -123,7 +126,7 @@ public class WarpPanelManagerTest { } /** - * Test method for {@link bentobox.addon.warps.WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. + * Test method for {@link WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. */ @Test public void testShowWarpPanelLast() { @@ -135,7 +138,7 @@ public class WarpPanelManagerTest { } /** - * Test method for {@link bentobox.addon.warps.WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. + * Test method for {@link WarpPanelManager#showWarpPanel(org.bukkit.World, world.bentobox.bbox.api.user.User, int)}. */ @Test public void testShowWarpPanelTestCache() { @@ -150,7 +153,7 @@ public class WarpPanelManagerTest { /** - * Test method for {@link bentobox.addon.warps.WarpPanelManager#removeWarp(org.bukkit.World, java.util.UUID)}. + * Test method for {@link WarpPanelManager#removeWarp(org.bukkit.World, java.util.UUID)}. */ @Test public void testRemoveWarp() { diff --git a/src/test/java/bentobox/addon/warps/WarpSignsListenerTest.java b/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java similarity index 98% rename from src/test/java/bentobox/addon/warps/WarpSignsListenerTest.java rename to src/test/java/world/bentobox/warps/WarpSignsListenerTest.java index 4d6f801..b5dfe2e 100644 --- a/src/test/java/bentobox/addon/warps/WarpSignsListenerTest.java +++ b/src/test/java/world/bentobox/warps/WarpSignsListenerTest.java @@ -1,4 +1,4 @@ -package bentobox.addon.warps; +package world.bentobox.warps; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,7 +33,10 @@ import org.powermock.api.mockito.PowerMockito; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; -import bentobox.addon.warps.config.PluginConfig; +import world.bentobox.warps.Warp; +import world.bentobox.warps.WarpSignsListener; +import world.bentobox.warps.WarpSignsManager; +import world.bentobox.warps.config.PluginConfig; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.user.User; import world.bentobox.bentobox.managers.IslandsManager;