From 4b21732ee91875d465e8b1cdc6b88160f8464fa0 Mon Sep 17 00:00:00 2001 From: J3fftw1 <44972470+J3fftw1@users.noreply.github.com> Date: Wed, 16 Oct 2019 17:14:51 +0200 Subject: [PATCH] fixed requested changes and re added EnhancedFurnace Becuase of some reason Retard Panda removed it --- .../Slimefun/Objects/SlimefunItem/EnhancedFurnace.java | 5 +---- .../Objects/SlimefunItem/items/EnderBackpack.java | 5 +---- .../Slimefun/Objects/SlimefunItem/items/GoldPan.java | 5 +---- .../Objects/SlimefunItem/items/GrapplingHook.java | 5 +---- .../Objects/SlimefunItem/items/InfernalBonemeal.java | 5 +---- .../Objects/SlimefunItem/items/KnowledgeFlask.java | 5 +---- .../Objects/SlimefunItem/items/KnowledgeTome.java | 5 +---- .../Slimefun/Objects/SlimefunItem/items/LumberAxe.java | 10 +++++----- .../Objects/SlimefunItem/items/MagicEyeOfEnder.java | 5 +---- .../Objects/SlimefunItem/items/MagicSugar.java | 5 +---- .../Objects/SlimefunItem/items/PickaxeOfTheSeeker.java | 5 +---- .../Objects/SlimefunItem/items/PortableCrafter.java | 4 ---- .../Objects/SlimefunItem/items/PortableDustbin.java | 4 ---- .../Objects/SlimefunItem/items/PortableGEOScanner.java | 5 +---- .../Objects/SlimefunItem/items/SeismicAxe.java | 5 +---- .../Objects/SlimefunItem/items/StormStaff.java | 5 +---- .../Objects/SlimefunItem/items/TelepositionScroll.java | 5 +---- .../Slimefun/Objects/SlimefunItem/items/WindStaff.java | 4 ---- 18 files changed, 19 insertions(+), 73 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java index abf801b32..af32247d7 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/EnhancedFurnace.java @@ -42,10 +42,7 @@ public class EnhancedFurnace extends SimpleSlimefunItem { fortune++; return fortune; } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public BlockTicker getItemHandler() { return new BlockTicker() { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/EnderBackpack.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/EnderBackpack.java index 89c52d1f0..24ce9c0a0 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/EnderBackpack.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/EnderBackpack.java @@ -16,10 +16,7 @@ public class EnderBackpack extends SimpleSlimefunItem { public EnderBackpack(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GoldPan.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GoldPan.java index 928828662..1f4fea6e5 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GoldPan.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GoldPan.java @@ -46,10 +46,7 @@ public class GoldPan extends SimpleSlimefunItem implemen chanceClay = (int) Slimefun.getItemValue(getID(), "chance.CLAY"); chanceFlint = (int) Slimefun.getItemValue(getID(), "chance.FLINT"); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java index 69b3b994b..58157de85 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/GrapplingHook.java @@ -30,10 +30,7 @@ public class GrapplingHook extends SimpleSlimefunItem { public GrapplingHook(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { super(category, item, recipeType, recipe, keys, values); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { Utilities utilities = SlimefunPlugin.getUtilities(); diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/InfernalBonemeal.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/InfernalBonemeal.java index 933dbe4fb..614c22d0e 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/InfernalBonemeal.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/InfernalBonemeal.java @@ -18,10 +18,7 @@ public class InfernalBonemeal extends SimpleSlimefunItem public InfernalBonemeal(Category category, ItemStack item, String id, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { super(category, item, id, recipeType, recipe, recipeOutput); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeFlask.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeFlask.java index 36f9ae324..c678ce389 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeFlask.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeFlask.java @@ -17,10 +17,7 @@ public class KnowledgeFlask extends SimpleSlimefunItem { public KnowledgeFlask(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, ItemStack recipeOutput) { super(category, item, recipeType, recipe, recipeOutput); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeTome.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeTome.java index 1bb39644f..748a740fd 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeTome.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/KnowledgeTome.java @@ -25,10 +25,7 @@ public class KnowledgeTome extends SimpleSlimefunItem { public KnowledgeTome(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java index 01c8d5a74..d653d3c2b 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/LumberAxe.java @@ -18,16 +18,16 @@ import me.mrCookieSlime.Slimefun.Objects.SlimefunItem.interfaces.NotPlaceable; import me.mrCookieSlime.Slimefun.Objects.handlers.BlockBreakHandler; import me.mrCookieSlime.Slimefun.Setup.SlimefunManager; import me.mrCookieSlime.Slimefun.api.SlimefunItemStack; -@Override -protected boolean areItemHandlersPrivate() { - return false; - } + public class LumberAxe extends SimpleSlimefunItem implements NotPlaceable { public LumberAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } - + @Override + protected boolean areItemHandlersPrivate() { + return false; + } @Override public BlockBreakHandler getItemHandler() { return (e, item, fortune, drops) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicEyeOfEnder.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicEyeOfEnder.java index ef6cbde22..50f2cbe05 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicEyeOfEnder.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicEyeOfEnder.java @@ -17,10 +17,7 @@ public class MagicEyeOfEnder extends SimpleSlimefunItem public MagicEyeOfEnder(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicSugar.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicSugar.java index 8331cdfce..584df8a4a 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicSugar.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/MagicSugar.java @@ -21,10 +21,7 @@ public class MagicSugar extends SimpleSlimefunItem { public MagicSugar(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe, String[] keys, Object[] values) { super(category, item, recipeType, recipe, keys, values); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfTheSeeker.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfTheSeeker.java index ad58e4c58..31fd12558 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfTheSeeker.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PickaxeOfTheSeeker.java @@ -18,10 +18,7 @@ public class PickaxeOfTheSeeker extends SimpleSlimefunItem { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableCrafter.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableCrafter.java index 1a0e8c9f9..218111df8 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableCrafter.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableCrafter.java @@ -17,10 +17,6 @@ public class PortableCrafter extends SimpleSlimefunItem super(category, item, recipeType, recipe); } @Override - protected boolean areItemHandlersPrivate() { - return false; - } - @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { if (SlimefunManager.isItemSimiliar(item, SlimefunItems.PORTABLE_CRAFTER, true)) { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableDustbin.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableDustbin.java index eb458f23a..c037311d8 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableDustbin.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableDustbin.java @@ -18,10 +18,6 @@ public class PortableDustbin extends SimpleSlimefunItem public PortableDustbin(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } @Override public ItemInteractionHandler getItemHandler() { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableGEOScanner.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableGEOScanner.java index 3885d0d99..e1747ba2c 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableGEOScanner.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/PortableGEOScanner.java @@ -14,10 +14,7 @@ public class PortableGEOScanner extends SimpleSlimefunItem { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SeismicAxe.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SeismicAxe.java index 9951ccc03..0a12b0638 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SeismicAxe.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/SeismicAxe.java @@ -30,10 +30,7 @@ public class SeismicAxe extends SimpleSlimefunItem imple public SeismicAxe(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/StormStaff.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/StormStaff.java index bff1d2c1c..c6f50be0f 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/StormStaff.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/StormStaff.java @@ -45,10 +45,7 @@ public class StormStaff extends SimpleSlimefunItem { item.setItemMeta(im); return item; } - @Override - protected boolean areItemHandlersPrivate() { - return false; - } + @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/TelepositionScroll.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/TelepositionScroll.java index 540b8b222..5494f56ca 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/TelepositionScroll.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/TelepositionScroll.java @@ -17,10 +17,7 @@ public class TelepositionScroll extends SimpleSlimefunItem { diff --git a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/WindStaff.java b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/WindStaff.java index 3cfc5d168..10c24dba0 100644 --- a/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/WindStaff.java +++ b/src/me/mrCookieSlime/Slimefun/Objects/SlimefunItem/items/WindStaff.java @@ -22,10 +22,6 @@ public class WindStaff extends SimpleSlimefunItem { super(category, item, recipeType, recipe); } @Override - protected boolean areItemHandlersPrivate() { - return false; - } - @Override public ItemInteractionHandler getItemHandler() { return (e, p, item) -> { if (SlimefunManager.isItemSimiliar(item, getItem(), true)) {