From aa314d4e419a1dc69bdc162020133d947e639bd2 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 21 Apr 2021 04:08:25 +0000 Subject: [PATCH 1/7] Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 775d63bc3..0bb8257d2 100644 --- a/pom.xml +++ b/pom.xml @@ -406,7 +406,7 @@ com.sk89q.worldedit worldedit-bukkit - 7.2.4 + 7.2.5 provided From f3565a6556b23d41e0d5c084d6cb17fe7a8ea736 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 21 Apr 2021 04:08:29 +0000 Subject: [PATCH 2/7] Update dependency com.sk89q.worldedit:worldedit-core to v7.2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 775d63bc3..83f4dc314 100644 --- a/pom.xml +++ b/pom.xml @@ -392,7 +392,7 @@ com.sk89q.worldedit worldedit-core - 7.2.3 + 7.2.5 provided From de927099e4314c81f5476027d5c9462ab3178471 Mon Sep 17 00:00:00 2001 From: Rothes <449181985@qq.com> Date: Wed, 21 Apr 2021 17:37:38 +0800 Subject: [PATCH 3/7] Update --- .../AbstractEnchantmentMachine.java | 23 +++++++------------ .../machines/enchanting/AutoDisenchanter.java | 2 +- .../machines/enchanting/AutoEnchanter.java | 3 +-- 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java index 36ef40179..33c1746a4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java @@ -34,8 +34,7 @@ abstract class AbstractEnchantmentMachine extends AContainer { private final ItemSetting useLevelLimit = new ItemSetting<>(this, "use-enchant-level-limit", false); private final IntRangeSetting levelLimit = new IntRangeSetting(this, "enchant-level-limit", 0, 10, Short.MAX_VALUE); - private final ItemSetting> ignoredEnchantLores = new ItemSetting<>(this, "ignored-enchant-lores", Arrays.asList("&7- &cCan't be Auto-Enchanted")); - private final ItemSetting> ignoredDisenchantLores = new ItemSetting<>(this, "ignored-disenchant-lores", Arrays.asList("&7- &cCan't be Auto-Disenchanted")); + private final ItemSetting> ignoredLores = new ItemSetting<>(this, "ignored-lores", Arrays.asList("&7- &cCan't be used in " + getMachineIdentifier())); @ParametersAreNonnullByDefault protected AbstractEnchantmentMachine(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { @@ -43,8 +42,7 @@ abstract class AbstractEnchantmentMachine extends AContainer { addItemSetting(useLevelLimit); addItemSetting(levelLimit); - addItemSetting(ignoredEnchantLores); - addItemSetting(ignoredDisenchantLores); + addItemSetting(ignoredLores); } protected boolean isEnchantmentLevelAllowed(int enchantmentLevel) { @@ -62,18 +60,13 @@ abstract class AbstractEnchantmentMachine extends AContainer { menu.replaceExistingItem(22, progressBar); } - protected boolean hasIgnoredLore(ItemStack itemStack, AbstractEnchantmentMachine enchantmentMachine) { - List ignoredLores = null; - if (enchantmentMachine instanceof AutoEnchanter) { - ignoredLores = ignoredEnchantLores.getValue(); - } else if (enchantmentMachine instanceof AutoDisenchanter) { - ignoredLores = ignoredDisenchantLores.getValue(); - } + protected boolean hasIgnoredLore(ItemStack itemStack) { + List ignoredLore = ignoredLores.getValue(); if (itemStack.hasItemMeta()) { - List lores = itemStack.getItemMeta().getLore(); - if (lores != null && ignoredLores != null) { - for (String lore : ignoredLores) { - if (lores.contains(ChatColors.color(lore))) { + List itemLore = itemStack.getItemMeta().getLore(); + if (itemLore != null && ignoredLore != null) { + for (String lore : ignoredLores.getValue()) { + if (itemLore.contains(ChatColors.color(lore))) { return true; } } diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java index dd4b447b5..2cb69545e 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java @@ -142,7 +142,7 @@ public class AutoDisenchanter extends AbstractEnchantmentMachine { private boolean isDisenchantable(@Nullable ItemStack item) { if (item == null) { return false; - } else if (hasIgnoredLore(item, this)) { + } else if (hasIgnoredLore(item)) { return false; } else if (item.getType() != Material.BOOK) { // ^ This stops endless checks of getByItem for books diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java index 0034335e2..a8a350eb4 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java @@ -35,7 +35,6 @@ import me.mrCookieSlime.Slimefun.api.inventory.BlockMenu; * */ public class AutoEnchanter extends AbstractEnchantmentMachine { - @ParametersAreNonnullByDefault public AutoEnchanter(Category category, SlimefunItemStack item, RecipeType recipeType, ItemStack[] recipe) { super(category, item, recipeType, recipe); @@ -122,7 +121,7 @@ public class AutoEnchanter extends AbstractEnchantmentMachine { private boolean isEnchantable(@Nullable ItemStack item) { if (item == null) { return false; - } else if (hasIgnoredLore(item, this)) { + } else if (hasIgnoredLore(item)) { return false; } else if (item.getType() != Material.ENCHANTED_BOOK) { // stops endless checks of getByItem for enchanted book stacks. From f12b2a0ba73298190c07476b0dee68c129672e05 Mon Sep 17 00:00:00 2001 From: Rothes <47097395+Rothes@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:44:52 +0800 Subject: [PATCH 4/7] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 775d63bc3..affbc5e5c 100644 --- a/pom.xml +++ b/pom.xml @@ -347,7 +347,7 @@ com.github.seeseemelk MockBukkit-v1.16 - 0.34.1 + 0.33.0 test From b729e14ec4a6c29f396246d05f43423410ec84d8 Mon Sep 17 00:00:00 2001 From: Rothes <47097395+Rothes@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:46:13 +0800 Subject: [PATCH 5/7] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index affbc5e5c..e355832d1 100644 --- a/pom.xml +++ b/pom.xml @@ -420,7 +420,7 @@ com.gmail.nossr50.mcMMO mcMMO - 2.1.195 + 2.1.194 provided From 371a8b5f52c11e7208c2249306a07ea47246bfb6 Mon Sep 17 00:00:00 2001 From: TheBusyBiscuit Date: Wed, 21 Apr 2021 11:50:37 +0200 Subject: [PATCH 6/7] Restored pom.xml --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index bc0b4debb..912428a3d 100644 --- a/pom.xml +++ b/pom.xml @@ -347,7 +347,7 @@ com.github.seeseemelk MockBukkit-v1.16 - 0.33.0 + 0.34.1 test @@ -420,7 +420,7 @@ com.gmail.nossr50.mcMMO mcMMO - 2.1.194 + 2.1.195 provided @@ -474,4 +474,4 @@ - + \ No newline at end of file From 17779659645aebea2dc6840bcde2f051eb88ce23 Mon Sep 17 00:00:00 2001 From: Rothes <47097395+Rothes@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:56:39 +0800 Subject: [PATCH 7/7] Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java Co-authored-by: TheBusyBiscuit --- .../machines/enchanting/AbstractEnchantmentMachine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java index 33c1746a4..04fc89330 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java +++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java @@ -60,7 +60,7 @@ abstract class AbstractEnchantmentMachine extends AContainer { menu.replaceExistingItem(22, progressBar); } - protected boolean hasIgnoredLore(ItemStack itemStack) { + protected boolean hasIgnoredLore(@Nonnull ItemStack itemStack) { List ignoredLore = ignoredLores.getValue(); if (itemStack.hasItemMeta()) { List itemLore = itemStack.getItemMeta().getLore();