From 1ae3171340762fdd387f85de701e727998f72164 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Tue, 13 Aug 2019 11:14:53 +0200 Subject: [PATCH] Removed deprecated methods/classes PremadeEvent, NewIsland.Builder#world() --- .../bentobox/api/events/PremadeEvent.java | 30 ------------------- .../bentobox/managers/island/NewIsland.java | 10 ------- .../island/IslandCreateCommandTest.java | 1 - 3 files changed, 41 deletions(-) delete mode 100644 src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java diff --git a/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java b/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java deleted file mode 100644 index a64097096..000000000 --- a/src/main/java/world/bentobox/bentobox/api/events/PremadeEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package world.bentobox.bentobox.api.events; - -import org.bukkit.event.Event; - -/** - * Provides the default methods expected when extending {@link Event}. - * @deprecated As of 1.5.3, for removal. Use {@link BentoBoxEvent} instead. - */ -@Deprecated -public abstract class PremadeEvent extends BentoBoxEvent { - - /** - * The default constructor is defined for cleaner code. - * This constructor assumes the PremadeEvent is synchronous. - */ - public PremadeEvent() { - this(false); - } - - /** - * This constructor is used to explicitly declare an PremadeEvent as synchronous or asynchronous. - * @param async - true indicates the event will fire asynchronously, false - * by default from default constructor - * @since 1.5.2 - */ - public PremadeEvent(boolean async) { - super(async); - } - -} diff --git a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java index 26409e206..9a7857f9e 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java @@ -104,16 +104,6 @@ public class NewIsland { return this; } - /** - * @param world world where the island will go - * @deprecated use {@link #addon} instead - */ - @Deprecated - public Builder world(World world) { - this.world2 = world; - return this; - } - /** * Set the addon * @param addon a game mode addon diff --git a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java index 6cd047fcb..0cd80108e 100644 --- a/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java +++ b/src/test/java/world/bentobox/bentobox/api/commands/island/IslandCreateCommandTest.java @@ -145,7 +145,6 @@ public class IslandCreateCommandTest { when(NewIsland.builder()).thenReturn(builder); when(builder.player(any())).thenReturn(builder); when(builder.name(Mockito.anyString())).thenReturn(builder); - when(builder.world(any())).thenReturn(builder); when(builder.addon(addon)).thenReturn(builder); when(builder.reason(any())).thenReturn(builder); when(builder.build()).thenReturn(mock(Island.class));