Skip to content

Commit 70995f4

Browse files
committed
remove enchantment for a bit since it requires a bunch of changes
closes #371
1 parent b3701fb commit 70995f4

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package de.ellpeck.naturesaura.enchant;
1+
/*package de.ellpeck.naturesaura.enchant;
22
33
import net.minecraft.core.Holder;
44
import net.minecraft.server.ReloadableServerRegistries;
@@ -8,4 +8,4 @@ public final class ModEnchantments {
88
99
public static Holder<Enchantment> AURA_MENDING;
1010
11-
}
11+
}*/

src/main/java/de/ellpeck/naturesaura/items/ItemAuraCache.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22

33
import com.mojang.blaze3d.vertex.PoseStack;
44
import com.mojang.math.Axis;
5-
import de.ellpeck.naturesaura.Helper;
65
import de.ellpeck.naturesaura.api.NaturesAuraAPI;
76
import de.ellpeck.naturesaura.api.render.ITrinketItem;
8-
import de.ellpeck.naturesaura.enchant.ModEnchantments;
97
import de.ellpeck.naturesaura.reg.ICustomCreativeTab;
108
import net.minecraft.client.Minecraft;
119
import net.minecraft.client.renderer.MultiBufferSource;
1210
import net.minecraft.client.renderer.texture.OverlayTexture;
13-
import net.minecraft.core.Holder;
1411
import net.minecraft.world.entity.Entity;
1512
import net.minecraft.world.entity.EquipmentSlot;
1613
import net.minecraft.world.entity.player.Player;
@@ -41,12 +38,14 @@ public void inventoryTick(ItemStack stackIn, Level levelIn, Entity entityIn, int
4138
if (recharge != null) {
4239
if (recharge.rechargeFromContainer(container, itemSlot, i, player.getInventory().selected == i))
4340
break;
44-
} else if (stack.getEnchantmentLevel(ModEnchantments.AURA_MENDING) > 0) {
41+
}
42+
// TODO fix enchantments, https://gist.github.com/ChampionAsh5357/d895a7b1a34341e19c80870720f9880f#the-enchantment-datapack-object
43+
/*else if (stack.getEnchantmentLevel(ModEnchantments.AURA_MENDING) > 0) {
4544
var mainSize = player.getInventory().items.size();
4645
var isArmor = i >= mainSize && i < mainSize + player.getInventory().armor.size();
4746
if ((isArmor || player.getInventory().selected == i) && Helper.rechargeAuraItem(stack, container, 1000))
4847
break;
49-
}
48+
}*/
5049
}
5150
}
5251

src/main/java/de/ellpeck/naturesaura/reg/ModRegistry.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import de.ellpeck.naturesaura.blocks.tiles.ModBlockEntities;
1313
import de.ellpeck.naturesaura.compat.Compat;
1414
import de.ellpeck.naturesaura.compat.patchouli.PatchouliCompat;
15-
import de.ellpeck.naturesaura.enchant.ModEnchantments;
1615
import de.ellpeck.naturesaura.entities.*;
1716
import de.ellpeck.naturesaura.gen.LevelGenAncientTree;
1817
import de.ellpeck.naturesaura.gen.LevelGenAuraBloom;
@@ -273,15 +272,15 @@ public static void register(RegisterEvent event) {
273272
Helper.populateObjectHolders(ModContainers.class, event.getRegistry(), false);
274273
});
275274

276-
event.register(Registries.ENCHANTMENT, h -> {
275+
/* event.register(Registries.ENCHANTMENT, h -> {
277276
h.register(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "aura_mending"), Enchantment.enchantment(
278277
Enchantment.definition(
279278
HolderSet.direct(BuiltInRegistries.ITEM.holders().filter(i -> new ItemStack(i).getCapability(NaturesAuraAPI.AURA_RECHARGE_CAPABILITY) == null).toList()),
280279
// same values as unbreaking, except for the max level
281280
5, 1, Enchantment.dynamicCost(5, 8), Enchantment.dynamicCost(55, 8), 2, EquipmentSlotGroup.ANY)
282281
).build(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "aura_mending")));
283282
Helper.populateObjectHolders(ModEnchantments.class, event.getRegistry(), true);
284-
});
283+
});*/
285284

286285
event.register(Registries.ENTITY_TYPE, h -> {
287286
h.register(ResourceLocation.fromNamespaceAndPath(NaturesAura.MOD_ID, "mover_cart"), EntityType.Builder

0 commit comments

Comments
 (0)