From 77abf231dc88daede4eddc1656d584b4eceb4ed2 Mon Sep 17 00:00:00 2001 From: Ponkapa Date: Sun, 17 Apr 2022 15:58:37 -0700 Subject: [PATCH 1/2] Allow treasure enchantments to be added to enchantment list when appropriate --- src/main/java/net/darkhax/eplus/EnchLogic.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/darkhax/eplus/EnchLogic.java b/src/main/java/net/darkhax/eplus/EnchLogic.java index b09819b..5d898e6 100644 --- a/src/main/java/net/darkhax/eplus/EnchLogic.java +++ b/src/main/java/net/darkhax/eplus/EnchLogic.java @@ -64,8 +64,9 @@ public static List getValidEnchantments (ItemStack stack, World wor continue; } - if (!enchantment.isTreasureEnchantment() || isCurse(world, enchantment) || isTreasuresAvailable(enchantment, world, pos, pos.down())) { - + if (isCurse(world, enchantment) || isTreasuresAvailable(enchantment, world, pos, pos.down())) { + enchList.add(enchantment); + } else if (!enchantment.isTreasureEnchantment() && !enchantment.isCurse()) enchList.add(enchantment); } } @@ -94,7 +95,6 @@ public static boolean isTreasuresAvailable(Enchantment enchantment, World world, final Block block = world.getBlockState(currentPos).getBlock(); if (!block.isBeaconBase(world, currentPos, pos)) { - return false; } } From aa539ffea008eb0b2884d5ce5fccc9e3d3bd44af Mon Sep 17 00:00:00 2001 From: Ponkapa Date: Sun, 17 Apr 2022 19:11:02 -0700 Subject: [PATCH 2/2] Adds treasure enchantment and updates version num --- gradle.properties | 4 ++-- src/main/java/net/darkhax/eplus/EnchLogic.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 13f4cb5..3052199 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ -mod_version=5.0. +mod_version=5.1. mod_group=net.darkhax.eplus -mod_name=EnchantingPlus +mod_name=EnchantingPlusPlus mod_class=EnchantingPlus version_minecraft=1.12.2 diff --git a/src/main/java/net/darkhax/eplus/EnchLogic.java b/src/main/java/net/darkhax/eplus/EnchLogic.java index 5d898e6..871095f 100644 --- a/src/main/java/net/darkhax/eplus/EnchLogic.java +++ b/src/main/java/net/darkhax/eplus/EnchLogic.java @@ -66,7 +66,7 @@ public static List getValidEnchantments (ItemStack stack, World wor if (isCurse(world, enchantment) || isTreasuresAvailable(enchantment, world, pos, pos.down())) { enchList.add(enchantment); - } else if (!enchantment.isTreasureEnchantment() && !enchantment.isCurse()) + } else if (!enchantment.isTreasureEnchantment() && !enchantment.isCurse()) { enchList.add(enchantment); } }