From 1e9e8be82a1db13577600483b666b359f63b6c8a Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Sat, 6 Feb 2021 01:06:11 +0100 Subject: [PATCH] More bug fixes --- .../machines/auto_crafters/AbstractAutoCrafter.java | 3 +++ .../machines/auto_crafters/EnhancedRecipe.java | 5 +++++ .../electric/machines/auto_crafters/VanillaRecipe.java | 10 ++++++++++ 3 files changed, 18 insertions(+) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java index 9a31a0221..28308fa76 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/AbstractAutoCrafter.java @@ -106,6 +106,9 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy return e -> e.getClickedBlock().ifPresent(b -> { Player p = e.getPlayer(); + // Prevent blocks from being placed, food from being eaten, etc... + e.cancel(); + if (SlimefunPlugin.getProtectionManager().hasPermission(p, b, ProtectableAction.INTERACT_BLOCK)) { if (p.isSneaking()) { // Select a new recipe diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java index b02a03296..0d7c75923 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/EnhancedRecipe.java @@ -58,4 +58,9 @@ class EnhancedRecipe extends AbstractRecipe { } } + @Override + public String toString() { + return item.getId(); + } + } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/VanillaRecipe.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/VanillaRecipe.java index f257daeb9..5cd475d7b 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/VanillaRecipe.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/auto_crafters/VanillaRecipe.java @@ -7,6 +7,7 @@ import java.util.function.Predicate; import javax.annotation.Nonnull; +import org.bukkit.Keyed; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.Recipe; import org.bukkit.inventory.RecipeChoice; @@ -96,4 +97,13 @@ class VanillaRecipe extends AbstractRecipe { } } + @Override + public String toString() { + if (recipe instanceof Keyed) { + return ((Keyed) recipe).getKey().toString(); + } else { + return "invalid-recipe"; + } + } + }