Updated Freezing and Textures

-Made it so Freezing can't apply with Fire Aspect -Added textures for Fire Ruby and Ice Sapphire
infernalstudios · Aug 4, 2021 · 9a1bc07 · 9a1bc07
1 parent 331c1db
commit 9a1bc07
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/org/infernalstudios/miningmaster/enchantments/FreezingEnchantment.java b/src/main/java/org/infernalstudios/miningmaster/enchantments/FreezingEnchantment.java
@@ -18,6 +18,7 @@
 
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentType;
+import net.minecraft.enchantment.FireAspectEnchantment;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.inventory.EquipmentSlotType;
@@ -48,6 +49,11 @@ public int getMaxLevel() {
         return 3;
     }
 
+    @Override
+    protected boolean canApplyTogether(Enchantment ench) {
+        return !(ench instanceof FireAspectEnchantment);
+    }
+
     @Override
     public boolean canApply(ItemStack stack) {
         return stack.getItem() instanceof AxeItem || super.canApply(stack);

diff --git a/src/main/resources/assets/miningmaster/textures/item/fire_ruby.png b/src/main/resources/assets/miningmaster/textures/item/fire_ruby.png
diff --git a/src/main/resources/assets/miningmaster/textures/item/ice_sapphire.png b/src/main/resources/assets/miningmaster/textures/item/ice_sapphire.png