Fix modded items not working with some gems

infernalstudios · Jul 24, 2023 · bdfe628 · bdfe628
1 parent f99c226
commit bdfe628
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 21 deletions.
diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/FloatationEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/FloatationEnchantment.java
@@ -30,7 +30,7 @@ public FloatationEnchantment(Rarity rarityIn, EquipmentSlot... slots) {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return stack.getItem() instanceof CrossbowItem || this.category.canEnchant(stack.getItem());
+        return stack.getItem() instanceof CrossbowItem || this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/GraceEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/GraceEnchantment.java
@@ -61,7 +61,7 @@ public boolean isTradeable() {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return this.category.canEnchant(stack.getItem());
+        return this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/HeartfeltEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/HeartfeltEnchantment.java
@@ -57,7 +57,7 @@ public int getMaxLevel() {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return this.category.canEnchant(stack.getItem());
+        return this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/KnightJumpEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/KnightJumpEnchantment.java
@@ -25,8 +25,6 @@
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.infernalstudios.miningmaster.access.LivingEntityAccess;
 
-import net.minecraft.world.item.enchantment.Enchantment.Rarity;
-
 public class KnightJumpEnchantment extends Enchantment {
     private static boolean jumpPrevPressed = false;
 
@@ -67,7 +65,7 @@ public int getMaxLevel() {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return this.category.canEnchant(stack.getItem());
+        return this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/LeechingEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/LeechingEnchantment.java
@@ -22,8 +22,6 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentCategory;
 
-import net.minecraft.world.item.enchantment.Enchantment.Rarity;
-
 public class LeechingEnchantment extends Enchantment {
     public LeechingEnchantment(Rarity rarityIn, EquipmentSlot... slots) {
         super(rarityIn, EnchantmentCategory.WEAPON, slots);
@@ -46,7 +44,7 @@ public int getMaxLevel() {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return stack.getItem() instanceof AxeItem || this.category.canEnchant(stack.getItem());
+        return stack.getItem() instanceof AxeItem || this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/RunnerEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/RunnerEnchantment.java
@@ -34,8 +34,6 @@
 import java.util.Random;
 import java.util.UUID;
 
-import net.minecraft.world.item.enchantment.Enchantment.Rarity;
-
 public class RunnerEnchantment extends Enchantment {
 
     public RunnerEnchantment(Rarity rarityIn, EquipmentSlot... slots) {
@@ -59,7 +57,7 @@ public int getMaxLevel() {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return this.category.canEnchant(stack.getItem());
+        return this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/SmeltingEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/SmeltingEnchantment.java
@@ -21,8 +21,6 @@
 import net.minecraft.world.item.enchantment.Enchantment;
 import net.minecraft.world.item.enchantment.EnchantmentCategory;
 
-import net.minecraft.world.item.enchantment.Enchantment.Rarity;
-
 public class SmeltingEnchantment extends Enchantment {
     public SmeltingEnchantment(Rarity rarityIn, EquipmentSlot... slots) {
         super(rarityIn, EnchantmentCategory.DIGGER, slots);
@@ -45,7 +43,7 @@ public int getMaxLevel() {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return this.category.canEnchant(stack.getItem());
+        return this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
 

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/SnowpiercerEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/SnowpiercerEnchantment.java
@@ -30,8 +30,6 @@
 import org.infernalstudios.miningmaster.init.MMEnchantments;
 import org.infernalstudios.miningmaster.init.MMTags;
 
-import net.minecraft.world.item.enchantment.Enchantment.Rarity;
-
 public class SnowpiercerEnchantment extends Enchantment {
 
     public SnowpiercerEnchantment(Rarity rarityIn, EquipmentSlot... slots) {
@@ -55,7 +53,7 @@ public int getMaxLevel() {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return this.category.canEnchant(stack.getItem());
+        return this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override

diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/StonebreakerEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/StonebreakerEnchantment.java
@@ -22,8 +22,6 @@
 import net.minecraft.world.item.enchantment.EnchantmentCategory;
 import net.minecraft.world.item.enchantment.UntouchingEnchantment;
 
-import net.minecraft.world.item.enchantment.Enchantment.Rarity;
-
 public class StonebreakerEnchantment extends Enchantment {
 
     public StonebreakerEnchantment(Rarity rarityIn, EquipmentSlot... slots) {
@@ -52,7 +50,7 @@ protected boolean checkCompatibility(Enchantment ench) {
 
     @Override
     public boolean canEnchant(ItemStack stack) {
-        return this.category.canEnchant(stack.getItem());
+        return this.category.canEnchant(stack.getItem()) || stack.canApplyAtEnchantingTable(this);
     }
 
     @Override