remove enchantment for a bit since it requires a bunch of changes

closes #371
Ellpeck · Nov 4, 2024 · 70995f4 · 70995f4 · 12snooper12 · Nov 6, 2024
1 parent b3701fb
commit 70995f4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/de/ellpeck/naturesaura/enchant/ModEnchantments.java b/src/main/java/de/ellpeck/naturesaura/enchant/ModEnchantments.java
@@ -1,4 +1,4 @@
-package de.ellpeck.naturesaura.enchant;
+/*package de.ellpeck.naturesaura.enchant;
 
 import net.minecraft.core.Holder;
 import net.minecraft.server.ReloadableServerRegistries;
@@ -8,4 +8,4 @@ public final class ModEnchantments {
 
     public static Holder<Enchantment> AURA_MENDING;
 
-}
+}*/
diff --git a/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java b/src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java
@@ -2,15 +2,12 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
-import de.ellpeck.naturesaura.Helper;
 import de.ellpeck.naturesaura.api.NaturesAuraAPI;
 import de.ellpeck.naturesaura.api.render.ITrinketItem;
-import de.ellpeck.naturesaura.enchant.ModEnchantments;
 import de.ellpeck.naturesaura.reg.ICustomCreativeTab;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.core.Holder;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.player.Player;
@@ -41,12 +38,14 @@ public void inventoryTick(ItemStack stackIn, Level levelIn, Entity entityIn, int
                 if (recharge != null) {
                     if (recharge.rechargeFromContainer(container, itemSlot, i, player.getInventory().selected == i))
                         break;
-                } else if (stack.getEnchantmentLevel(ModEnchantments.AURA_MENDING) > 0) {
+                }
+                // TODO fix enchantments, https://gist.github.com/ChampionAsh5357/d895a7b1a34341e19c80870720f9880f#the-enchantment-datapack-object
+                /*else if (stack.getEnchantmentLevel(ModEnchantments.AURA_MENDING) > 0) {
                     var mainSize = player.getInventory().items.size();
                     var isArmor = i >= mainSize && i < mainSize + player.getInventory().armor.size();
                     if ((isArmor || player.getInventory().selected == i) && Helper.rechargeAuraItem(stack, container, 1000))
                         break;
-                }
+                }*/
             }
         }
 

diff --git a/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java b/src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java
@@ -12,7 +12,6 @@
 import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities;
 import de.ellpeck.naturesaura.compat.Compat;
 import de.ellpeck.naturesaura.compat.patchouli.PatchouliCompat;
-import de.ellpeck.naturesaura.enchant.ModEnchantments;
 import de.ellpeck.naturesaura.entities.*;
 import de.ellpeck.naturesaura.gen.LevelGenAncientTree;
 import de.ellpeck.naturesaura.gen.LevelGenAuraBloom;
@@ -273,15 +272,15 @@ public static void register(RegisterEvent event) {
             Helper.populateObjectHolders(ModContainers.class, event.getRegistry(), false);
         });
 
-        event.register(Registries.ENCHANTMENT, h -> {
+/*        event.register(Registries.ENCHANTMENT, h -> {
             h.register(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "aura_mending"), Enchantment.enchantment(
                 Enchantment.definition(
                     HolderSet.direct(BuiltInRegistries.ITEM.holders().filter(i -> new ItemStack(i).getCapability(NaturesAuraAPI.AURA_RECHARGE_CAPABILITY) == null).toList()),
                     // same values as unbreaking, except for the max level
                     5, 1, Enchantment.dynamicCost(5, 8), Enchantment.dynamicCost(55, 8), 2, EquipmentSlotGroup.ANY)
             ).build(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "aura_mending")));
             Helper.populateObjectHolders(ModEnchantments.class, event.getRegistry(), true);
-        });
+        });*/
 
         event.register(Registries.ENTITY_TYPE, h -> {
             h.register(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "mover_cart"), EntityType.Builder