From abcd57932356755ef217268eee2580a78ed21de7 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Mon, 6 Jan 2020 22:48:14 +0100 Subject: [PATCH] Removed old and deprecated API (Addons should all have switched over...) --- .../Objects/SlimefunItem/SlimefunItem.java | 39 ++++--------------- .../handlers/BlockBreakHandler.java | 6 --- .../handlers/BlockPlaceHandler.java | 5 --- .../SlimefunItem/handlers/BlockTicker.java | 5 --- .../SlimefunItem/handlers/ItemHandler.java | 6 --- .../handlers/ItemInteractionHandler.java | 5 --- .../MultiBlockInteractionHandler.java | 5 --- 7 files changed, 7 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockBreakHandler.java delete mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockPlaceHandler.java delete mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockTicker.java delete mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemHandler.java delete mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemInteractionHandler.java delete mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/MultiBlockInteractionHandler.java diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java index a29a733ec..12a5a0572 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/SlimefunItem.java @@ -400,26 +400,18 @@ public class SlimefunItem implements Placeable { public void create() { // Deprecated } - - /** - * @deprecated Use {@link SlimefunItem#addItemHandler(ItemHandler...)} instead - */ - @Deprecated - public void addItemHandler(me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers.ItemHandler... handler) { - addItemHandler((ItemHandler[]) handler); - } - public void addItemHandler(ItemHandler... handler) { - this.itemhandlers.addAll(Arrays.asList(handler)); + public void addItemHandler(ItemHandler... handlers) { + this.itemhandlers.addAll(Arrays.asList(handlers)); - for (ItemHandler h: handler) { - if (h instanceof BlockTicker) { + for (ItemHandler handler : handlers) { + if (handler instanceof BlockTicker) { this.ticking = true; SlimefunPlugin.getUtilities().tickers.add(getID()); - this.blockTicker = (BlockTicker) h; + this.blockTicker = (BlockTicker) handler; } - else if (h instanceof EnergyTicker) { - this.energyTicker = (EnergyTicker) h; + else if (handler instanceof EnergyTicker) { + this.energyTicker = (EnergyTicker) handler; EnergyNet.registerComponent(getID(), EnergyNetComponent.SOURCE); } } @@ -435,23 +427,6 @@ public class SlimefunItem implements Placeable { register(false); } - /** - * @deprecated Use {@link SlimefunItem#register(boolean, ItemHandler...)} instead - */ - @Deprecated - public void register(boolean vanilla, me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers.ItemHandler... handlers) { - addItemHandler(handlers); - register(vanilla); - } - - /** - * @deprecated Use {@link SlimefunItem#register(ItemHandler...)} instead - */ - @Deprecated - public void register(me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers.ItemHandler... handlers) { - register((ItemHandler[]) handlers); - } - public void register(boolean vanilla, SlimefunBlockHandler handler) { SlimefunPlugin.getUtilities().blockHandlers.put(getID(), handler); register(vanilla); diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockBreakHandler.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockBreakHandler.java deleted file mode 100644 index 223308deb..000000000 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockBreakHandler.java +++ /dev/null @@ -1,6 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -@Deprecated -public abstract class BlockBreakHandler extends ItemHandler implements me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler { - -} \ No newline at end of file diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockPlaceHandler.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockPlaceHandler.java deleted file mode 100644 index 9cde2fd85..000000000 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockPlaceHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -@Deprecated -public abstract class BlockPlaceHandler extends ItemHandler implements me.mrCookieSlime.Slimefun.Objects.handlers.BlockPlaceHandler { -} \ No newline at end of file diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockTicker.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockTicker.java deleted file mode 100644 index 88a293d2f..000000000 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/BlockTicker.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -@Deprecated -public abstract class BlockTicker extends me.mrCookieSlime.Slimefun.Objects.handlers.BlockTicker { -} diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemHandler.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemHandler.java deleted file mode 100644 index 8d9913f5b..000000000 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemHandler.java +++ /dev/null @@ -1,6 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -@Deprecated -public abstract class ItemHandler implements me.mrCookieSlime.Slimefun.Objects.handlers.ItemHandler { - -} diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemInteractionHandler.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemInteractionHandler.java deleted file mode 100644 index 66c32c8c3..000000000 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/ItemInteractionHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -@Deprecated -public abstract class ItemInteractionHandler extends ItemHandler implements me.mrCookieSlime.Slimefun.Objects.handlers.ItemInteractionHandler { -} \ No newline at end of file diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/MultiBlockInteractionHandler.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/MultiBlockInteractionHandler.java deleted file mode 100644 index 7bf5b9069..000000000 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/handlers/MultiBlockInteractionHandler.java +++ /dev/null @@ -1,5 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem.handlers; - -@Deprecated -public abstract class MultiBlockInteractionHandler extends ItemHandler implements me.mrCookieSlime.Slimefun.Objects.handlers.MultiBlockInteractionHandler { -} \ No newline at end of file