Sea and Hell Infusion for tridents

Shadows-of-Fire · Aug 14, 2020 · 96d2c9c · 96d2c9c
1 parent af16d58
commit 96d2c9c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 
-version = '4.0.1'
+version = '4.1.0'
 group = 'shadows.apotheosis'
 archivesBaseName = 'Apotheosis-1.16.1'
 

diff --git a/src/main/java/shadows/apotheosis/ench/enchantments/HellInfusionEnchantment.java b/src/main/java/shadows/apotheosis/ench/enchantments/HellInfusionEnchantment.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentType;
+import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -62,4 +63,9 @@ public ITextComponent getDisplayName(int level) {
 	protected boolean canApplyTogether(Enchantment ench) {
 		return super.canApplyTogether(ench) && ench != ApotheosisObjects.SEA_INFUSION;
 	}
+
+	@Override
+	public boolean canApplyAtEnchantingTable(ItemStack stack) {
+		return super.canApplyAtEnchantingTable(stack) || Enchantments.IMPALING.canApplyAtEnchantingTable(stack);
+	}
 }
diff --git a/src/main/java/shadows/apotheosis/ench/enchantments/SeaInfusionEnchantment.java b/src/main/java/shadows/apotheosis/ench/enchantments/SeaInfusionEnchantment.java
@@ -2,6 +2,7 @@
 
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentType;
+import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -61,4 +62,9 @@ public ITextComponent getDisplayName(int level) {
 	protected boolean canApplyTogether(Enchantment ench) {
 		return super.canApplyTogether(ench) && ench != ApotheosisObjects.HELL_INFUSION;
 	}
+
+	@Override
+	public boolean canApplyAtEnchantingTable(ItemStack stack) {
+		return super.canApplyAtEnchantingTable(stack) || Enchantments.IMPALING.canApplyAtEnchantingTable(stack);
+	}
 }