diff --git a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md index 749a22a..bbb8129 100644 --- a/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md +++ b/src/main/java/com/acethewildfire/acesbs/PATCH_NOTES.md @@ -5,7 +5,7 @@ - Hammers are now included in the pickaxe item tag. (aka, to other mods they will be considered a type of pickaxe) - Fire Oak Trees and associated wood blocks. Obtainable by placing an oak sapling and infernal ashes in an Entropic Entangler - Fractal Diamonds can now be obtained by placing a diamond and stable entropy into an entropic entangler. They can be used to craft tools and armor. They have the same effect as Prisma Steel and drop additional ores when mining. -- Hellfire Diamonds can now be obtained by placing a diamond and infernal ashes into an entropic entangler. They can be used to craft tools and armor. They automatically smelt items that are smeltable. (Ex: Ores->ingots, logs->charcoal, sand->glass). These tools are not compatible with silk touch, but other enchantments still work. +- Hellfire Diamonds can now be obtained by placing a diamond and infernal ashes into an entropic entangler. They can be used to craft tools and armor. They automatically smelt items that are smeltable. (Ex: Ores->ingots, logs->charcoal, sand->glass). ## Fixes - Blocks of Ashen Steel now have a recipe and drop when mined. Not sure how I missed that one. - Hammers are now enchantable and are compatible with pickaxe enchantments. @@ -14,7 +14,6 @@ ## Changes - Lemonwood saplings are now obtained through an Entropic Entangler recipe (Stable Entropy + Birch Sapling) - Ashen Steel tools now automatically smelt items that can be smeltable. (Ex: Ores->ingots, logs->charcoal, sand->glass) - - Because of this Silk Touch can not be applied to these tools. - Durability calculations have changed to reflect the material's rarity. - Tools have the mining level of the base material with the durability of the next tier. - Hammers get the equivalent durability for the materials put into them. (effectively the durability x6.33) diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingAxe.java b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingAxe.java index 4f74f6e..3fff231 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingAxe.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingAxe.java @@ -15,13 +15,4 @@ public class SmeltingAxe extends AxeItem { public SmeltingAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { super(material, attackDamage, attackSpeed, settings); } - - - @Override - public boolean canBeEnchantedWith(ItemStack stack, RegistryEntry enchantment, EnchantingContext context) { - - if (enchantment.matchesKey(Enchantments.SILK_TOUCH)) return false; - - return super.canBeEnchantedWith(stack, enchantment, context); - } } diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java index 51c20c5..e6f6168 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingHammer.java @@ -27,12 +27,4 @@ public class SmeltingHammer extends HammerItem { public SmeltingHammer(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { super(material, attackDamage, attackSpeed, settings); } - - @Override - public boolean canBeEnchantedWith(ItemStack stack, RegistryEntry enchantment, EnchantingContext context) { - - if (enchantment.matchesKey(Enchantments.SILK_TOUCH)) return false; - - return super.canBeEnchantedWith(stack, enchantment, context); - } } diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingPickaxe.java b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingPickaxe.java index 46bd084..b34dcfd 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingPickaxe.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingPickaxe.java @@ -12,12 +12,4 @@ public class SmeltingPickaxe extends Item { public SmeltingPickaxe(Settings settings) { super(settings); } - - @Override - public boolean canBeEnchantedWith(ItemStack stack, RegistryEntry enchantment, EnchantingContext context) { - - if (enchantment.matchesKey(Enchantments.SILK_TOUCH)) return false; - - return super.canBeEnchantedWith(stack, enchantment, context); - } } diff --git a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingShovel.java b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingShovel.java index 80d71a0..bd6f9ea 100644 --- a/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingShovel.java +++ b/src/main/java/com/acethewildfire/acesbs/item/custom/SmeltingShovel.java @@ -15,12 +15,4 @@ public class SmeltingShovel extends ShovelItem { public SmeltingShovel(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) { super(material, attackDamage, attackSpeed, settings); } - - @Override - public boolean canBeEnchantedWith(ItemStack stack, RegistryEntry enchantment, EnchantingContext context) { - - if (enchantment.matchesKey(Enchantments.SILK_TOUCH)) return false; - - return super.canBeEnchantedWith(stack, enchantment, context); - } }