From 0fd631813bee6c46366ce437709494f03327eb42 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Tue, 16 Jun 2020 14:50:03 +0200 Subject: [PATCH] [CI skip] Removed some deprecated stuff --- CHANGELOG.md | 2 ++ .../Objects/SlimefunItem/HandledBlock.java | 26 ------------------- .../Slimefun/api/SlimefunItemStack.java | 12 --------- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java diff --git a/CHANGELOG.md b/CHANGELOG.md index 805c2b63e..73227de6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ +## Release Candidate 14 (TBD) + ## Release Candidate 13 (16 Jun 2020) https://thebusybiscuit.github.io/builds/TheBusyBiscuit/Slimefun4/stable/#13 diff --git a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java b/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java deleted file mode 100644 index 937a9b669..000000000 --- a/src/main/java/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/HandledBlock.java +++ /dev/null @@ -1,26 +0,0 @@ -package me.mrCookieSlime.Slimefun.Objects.SlimefunItem; - -import org.bukkit.inventory.ItemStack; - -import me.mrCookieSlime.Slimefun.Lists.RecipeType; -import me.mrCookieSlime.Slimefun.Objects.Category; -import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; - -/** - * - * @deprecated Just override the method {@link #useVanillaBlockBreaking()} instead. - * - */ -@Deprecated -public class HandledBlock extends SlimefunItem { - - public HandledBlock(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { - super(category, item, recipeType, recipe); - } - - @Override - public boolean useVanillaBlockBreaking() { - return true; - } - -} diff --git a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java index d67056342..853c6ea43 100644 --- a/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java +++ b/src/main/java/me/mrCookieSlime/Slimefun/api/SlimefunItemStack.java @@ -171,18 +171,6 @@ public class SlimefunItemStack extends CustomItem { return id; } - /** - * Returns the id that was given to this {@link SlimefunItemStack}. - * - * @deprecated Renamed to {@link #getItemId()} - * - * @return The {@link SlimefunItem} id for this {@link SlimefunItemStack} - */ - @Deprecated - public String getItemID() { - return id; - } - /** * Gets the {@link SlimefunItem} associated for this {@link SlimefunItemStack}. Null if no item is found. *