Add update.json

- Add VampiricEnchantmentEffect: heals player on hit (50%/100%/150% per level)
- Add ExplosiveEnchantmentEffect: chance-based explosions (10%/20%/30% per level)
- Register enchantments in ModEnchantmentEffects and datagen
- Add translations for 21 languages (DE, PT-BR, IT, ZH-CN, ZH-TW, JA, KO, RU, TR, UK, NL, DA, SV, NO, PL)
- Generate enchantment JSON data files
- Add enchantments to enchanting table tag

README.md

@@ -1,14 +1,16 @@
-<h1 align="left"><strong> More Spear Enchantments </strong></h1>
+<h1 align="left"><strong> More Spear Enchantments (Fabric/NeoForge) </strong></h1>
 <p align="left">
 <img alt="modrinth" height="35" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/modrinth_vector.svg"><img alt="curseforge" height="35" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/available/curseforge_vector.svg"><img alt="fabric" height="35" src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact/supported/fabric_vector.svg">
 </p>
 
-[forge port](https://github.com/sillyangel/mse-forge/)
-
 [gitea repo](https://git.sillyangel.dev/angel/more-spear-enchants)
 
-[github mirror](https://github.com/sillyangel/more-spear-enchants/)
+[Paper/Pupur/Folia port](https://git.sillyangel.dev/angel/mse-paper)
+
+[forge port](https://git.sillyangel.dev/mse-forge/)
 
 [curseforge page](https://www.curseforge.com/minecraft/mc-mods/more-spear-enchantments)
 
-[modrinth page](https://modrinth.com/mod/more-spear-enchantments)
+[modrinth page](https://modrinth.com/mod/more-spear-enchantments)
+
+[github mirror](https://github.com/sillyangel/more-spear-enchants/)

build.gradle

@@ -31,12 +31,13 @@ subprojects {
         // for more information about repositories.
     }
 
+    loom {
+        silentMojangMappingsLicense()
+    }
+
     dependencies {
         minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
-        mappings loom.layered {
-            it.mappings("net.fabricmc:yarn:$rootProject.yarn_mappings:v2")
-            it.mappings("dev.architectury:yarn-mappings-patch-neoforge:$rootProject.yarn_mappings_patch_neoforge_version")
-        }
+        mappings loom.officialMojangMappings()
     }
 
     java {

common/src/generated/resources/.cache/6d0d0277562259d530fbd3bf702f9148bb4a773a

@@ -0,0 +1,7 @@
+// 1.21.11	-999999999-01-01T00:00:00	More Spear Enchantments/ModEnchantmentGenerator
+0305667391444c93e291cb484f3a1e8673b477ef data/more_spear_enchantments/enchantment/crippling.json
+033f6c41fff18e9f2039d36468f1e119f689b6fb data/more_spear_enchantments/enchantment/explosive.json
+6b22250e780912de621d38ac3ac9e6260a56422c data/more_spear_enchantments/enchantment/poisoning.json
+293322a8166651ca50e67f240bb42eefe0dd0739 data/more_spear_enchantments/enchantment/thundering.json
+9cbf3df72ea83d811363cc23e3a6849668091e96 data/more_spear_enchantments/enchantment/vampiric.json
+b4264bd41977be031a7deee95bc1f8150dc390ce data/more_spear_enchantments/enchantment/withering.json

common/src/generated/resources/.cache/7ab4940303906b4cc26f60344931d8ca2b1a84ba

@@ -0,0 +1,2 @@
+// 1.21.11	-999999999-01-01T00:00:00	More Spear Enchantments/Tags for minecraft:item
+6f6bce02ed9eefe20fee4b9c3dadfb2d6d53c4fe data/more_spear_enchantments/tags/item/spears.json

common/src/generated/resources/data/more_spear_enchantments/enchantment/explosive.json

@@ -0,0 +1,41 @@
+{
+  "anvil_cost": 8,
+  "description": {
+    "translate": "enchantment.more_spear_enchantments.explosive"
+  },
+  "effects": {
+    "minecraft:post_attack": [
+      {
+        "affected": "victim",
+        "effect": {
+          "type": "more_spear_enchantments:explosive",
+          "chance": {
+            "type": "minecraft:linear",
+            "base": 0.1,
+            "per_level_above_first": 0.1
+          },
+          "power": {
+            "type": "minecraft:linear",
+            "base": 1.5,
+            "per_level_above_first": 0.5
+          }
+        },
+        "enchanted": "attacker"
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 70,
+    "per_level_above_first": 10
+  },
+  "max_level": 3,
+  "min_cost": {
+    "base": 20,
+    "per_level_above_first": 10
+  },
+  "slots": [
+    "hand"
+  ],
+  "supported_items": "#more_spear_enchantments:spears",
+  "weight": 2
+}

common/src/generated/resources/data/more_spear_enchantments/enchantment/vampiric.json

@@ -0,0 +1,36 @@
+{
+  "anvil_cost": 4,
+  "description": {
+    "translate": "enchantment.more_spear_enchantments.vampiric"
+  },
+  "effects": {
+    "minecraft:post_attack": [
+      {
+        "affected": "victim",
+        "effect": {
+          "type": "more_spear_enchantments:vampiric",
+          "heal_percentage": {
+            "type": "minecraft:linear",
+            "base": 0.5,
+            "per_level_above_first": 0.5
+          }
+        },
+        "enchanted": "attacker"
+      }
+    ]
+  },
+  "max_cost": {
+    "base": 50,
+    "per_level_above_first": 8
+  },
+  "max_level": 3,
+  "min_cost": {
+    "base": 10,
+    "per_level_above_first": 8
+  },
+  "slots": [
+    "hand"
+  ],
+  "supported_items": "#more_spear_enchantments:spears",
+  "weight": 5
+}

common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/ModEnchantmentEffects.java

@@ -5,22 +5,24 @@ import dev.architectury.registry.registries.DeferredRegister;
 import dev.architectury.registry.registries.RegistrySupplier;
 import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments;
 import dev.sillyangel.more_spear_enchantments.enchantment.effect.*;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.util.Identifier;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
 
 public class ModEnchantmentEffects {
 	// Deferred register for enchantment effect types
 	public static final DeferredRegister<MapCodec<? extends EnchantmentEntityEffect>> ENCHANTMENT_ENTITY_EFFECTS =
-			DeferredRegister.create(MoreSpearEnchantments.MOD_ID, RegistryKeys.ENCHANTMENT_ENTITY_EFFECT_TYPE);
+			DeferredRegister.create(MoreSpearEnchantments.MOD_ID, Registries.ENCHANTMENT_ENTITY_EFFECT_TYPE);
 
 	// Enchantment registry keys
-	public static final RegistryKey<Enchantment> THUNDERING = of("thundering");
-	public static final RegistryKey<Enchantment> WITHERING = of("withering");
-	public static final RegistryKey<Enchantment> POISONING = of("poisoning");
-	public static final RegistryKey<Enchantment> CRIPPLING = of("crippling");
+	public static final ResourceKey<Enchantment> THUNDERING = of("thundering");
+	public static final ResourceKey<Enchantment> WITHERING = of("withering");
+	public static final ResourceKey<Enchantment> POISONING = of("poisoning");
+	public static final ResourceKey<Enchantment> CRIPPLING = of("crippling");
+	public static final ResourceKey<Enchantment> VAMPIRIC = of("vampiric");
+	public static final ResourceKey<Enchantment> EXPLOSIVE = of("explosive");
 
 	// Register enchantment effect types
 	public static final RegistrySupplier<MapCodec<LightningEnchantmentEffect>> LIGHTNING_EFFECT =
@@ -31,10 +33,14 @@ public class ModEnchantmentEffects {
 			ENCHANTMENT_ENTITY_EFFECTS.register("withering", () -> WitheringEnchantmentEffect.CODEC);
 	public static final RegistrySupplier<MapCodec<CripplingEnchantmentEffect>> CRIPPLING_EFFECT =
 			ENCHANTMENT_ENTITY_EFFECTS.register("crippling", () -> CripplingEnchantmentEffect.CODEC);
+	public static final RegistrySupplier<MapCodec<VampiricEnchantmentEffect>> VAMPIRIC_EFFECT =
+			ENCHANTMENT_ENTITY_EFFECTS.register("vampiric", () -> VampiricEnchantmentEffect.CODEC);
+	public static final RegistrySupplier<MapCodec<ExplosiveEnchantmentEffect>> EXPLOSIVE_EFFECT =
+			ENCHANTMENT_ENTITY_EFFECTS.register("explosive", () -> ExplosiveEnchantmentEffect.CODEC);
 
-	private static RegistryKey<Enchantment> of(String path) {
-		Identifier id = Identifier.of(MoreSpearEnchantments.MOD_ID, path);
-		return RegistryKey.of(RegistryKeys.ENCHANTMENT, id);
+	private static ResourceKey<Enchantment> of(String path) {
+		Identifier id = Identifier.fromNamespaceAndPath(MoreSpearEnchantments.MOD_ID, path);
+		return ResourceKey.create(Registries.ENCHANTMENT, id);
 	}
 
 	public static void registerModEnchantmentEffects() {

common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/CripplingEnchantmentEffect.java

@@ -2,42 +2,41 @@ package dev.sillyangel.more_spear_enchantments.enchantment.effect;
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Mob;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.enchantment.LevelBasedValue;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.world.item.enchantment.EnchantedItemInUse;
+import net.minecraft.world.phys.Vec3;
 
-public record CripplingEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect {
+public record CripplingEnchantmentEffect(LevelBasedValue duration) implements EnchantmentEntityEffect {
     public static final MapCodec<CripplingEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
             instance.group(
-                    EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(CripplingEnchantmentEffect::duration)
+                    LevelBasedValue.CODEC.fieldOf("duration").forGetter(CripplingEnchantmentEffect::duration)
             ).apply(instance, CripplingEnchantmentEffect::new)
     );
 
     @Override
-    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
+    public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) {
         if (target instanceof LivingEntity victim) {
-            if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-                int Duration = (int) (this.duration.getValue(level) * 50); // Convert to ticks
-                int slownessAmplifier = level - 1; // Level 1 = Slowness 0, Level 2 = Slowness I, Level 3 = Slowness II
-                int weaknessAmplifier = level - 1; // Level 1 = Weakness 0, Level 2 = Weakness I, Level 3 = Weakness II
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.SLOWNESS,
+            if (context.owner() != null && context.owner() instanceof Player player) {
+                int Duration = (int) (this.duration.calculate(level) * 50); // Convert to ticks
+                victim.addEffect(new MobEffectInstance(
+                        MobEffects.SLOWNESS,
                         Duration,
-                        slownessAmplifier,
+                        level,
                         false,
                         true
                 ));
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.WEAKNESS,
+                victim.addEffect(new MobEffectInstance(
+                        MobEffects.WEAKNESS,
                         Duration,
-                        weaknessAmplifier,
+                        level,
                         false,
                         true
                 ));
@@ -46,7 +45,7 @@ public record CripplingEnchantmentEffect(EnchantmentLevelBasedValue duration) im
     }
 
     @Override
-    public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
+    public MapCodec<? extends EnchantmentEntityEffect> codec() {
         return CODEC;
     }
 }

common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/ExplosiveEnchantmentEffect.java

@@ -0,0 +1,54 @@
+package dev.sillyangel.more_spear_enchantments.enchantment.effect;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.enchantment.LevelBasedValue;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.world.item.enchantment.EnchantedItemInUse;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.phys.Vec3;
+
+public record ExplosiveEnchantmentEffect(LevelBasedValue power, LevelBasedValue chance) implements EnchantmentEntityEffect {
+    public static final MapCodec<ExplosiveEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
+            instance.group(
+                    LevelBasedValue.CODEC.fieldOf("power").forGetter(ExplosiveEnchantmentEffect::power),
+                    LevelBasedValue.CODEC.fieldOf("chance").forGetter(ExplosiveEnchantmentEffect::chance)
+            ).apply(instance, ExplosiveEnchantmentEffect::new)
+    );
+
+    @Override
+    public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) {
+        if (target instanceof LivingEntity victim) {
+            if (context.owner() != null && context.owner() instanceof Player player) {
+                // Calculate chance and power based on level
+                float explosionChance = this.chance.calculate(level);
+
+                // Random check for explosion
+                if (world.random.nextFloat() < explosionChance) {
+                    float explosionPower = this.power.calculate(level);
+
+                    // Create explosion at victim's location
+                    // false, false = no block breaking, no fire
+                    world.explode(
+                            null,
+                            victim.getX(),
+                            victim.getY(),
+                            victim.getZ(),
+                            explosionPower,
+                            Level.ExplosionInteraction.NONE
+                    );
+                }
+            }
+        }
+    }
+
+    @Override
+    public MapCodec<? extends EnchantmentEntityEffect> codec() {
+        return CODEC;
+    }
+}
+

common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/LightningEnchantmentEffect.java

@@ -2,41 +2,41 @@ package dev.sillyangel.more_spear_enchantments.enchantment.effect;
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityType;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.SpawnReason;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.EntitySpawnReason;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.enchantment.LevelBasedValue;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.world.item.enchantment.EnchantedItemInUse;
+import net.minecraft.world.phys.Vec3;
 
-public record LightningEnchantmentEffect(EnchantmentLevelBasedValue amount) implements EnchantmentEntityEffect {
+public record LightningEnchantmentEffect(LevelBasedValue amount) implements EnchantmentEntityEffect {
 	public static final MapCodec<LightningEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
 			instance.group(
-					EnchantmentLevelBasedValue.CODEC.fieldOf("amount").forGetter(LightningEnchantmentEffect::amount)
+					LevelBasedValue.CODEC.fieldOf("amount").forGetter(LightningEnchantmentEffect::amount)
 			).apply(instance, LightningEnchantmentEffect::new)
 	);
 
 	@Override
-	public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
+	public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) {
 		if (target instanceof LivingEntity victim) {
-			if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-				float numStrikes = this.amount.getValue(level);
+			if (context.owner() != null && context.owner() instanceof Player player) {
+				float numStrikes = this.amount.calculate(level);
 
 				for (float i = 0; i < numStrikes; i++) {
-					BlockPos position = victim.getBlockPos();
-					EntityType.LIGHTNING_BOLT.spawn(world, position, SpawnReason.TRIGGERED);
+					BlockPos position = victim.blockPosition();
+					EntityType.LIGHTNING_BOLT.spawn(world, position, EntitySpawnReason.TRIGGERED);
 				}
 			}
 		}
 	}
 
 	@Override
-	public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
+	public MapCodec<? extends EnchantmentEntityEffect> codec() {
 		return CODEC;
 	}
 }

common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/PoisonEnchantmentEffect.java

@@ -2,35 +2,34 @@ package dev.sillyangel.more_spear_enchantments.enchantment.effect;
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.enchantment.LevelBasedValue;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.world.item.enchantment.EnchantedItemInUse;
+import net.minecraft.world.phys.Vec3;
 
-public record PoisonEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect {
+public record PoisonEnchantmentEffect(LevelBasedValue duration) implements EnchantmentEntityEffect {
     public static final MapCodec<PoisonEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
             instance.group(
-                    EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(PoisonEnchantmentEffect::duration)
+                    LevelBasedValue.CODEC.fieldOf("duration").forGetter(PoisonEnchantmentEffect::duration)
             ).apply(instance, PoisonEnchantmentEffect::new)
     );
 
     @Override
-    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
+    public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) {
         if (target instanceof LivingEntity victim) {
-            if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-                int poisonDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks
-                int poisonAmplifier = level - 2; // Level 1 = Poison 0, Level 2 = Poison I, Level 3 = Poison II
+            if (context.owner() != null && context.owner() instanceof Player player) {
+                int poisonDuration = (int) (this.duration.calculate(level) * 50); // Convert to ticks
 
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.POISON,
+                victim.addEffect(new MobEffectInstance(
+                        MobEffects.POISON,
                         poisonDuration,
-                        poisonAmplifier,
+                        level,
                         false,
                         true
                 ));
@@ -39,7 +38,7 @@ public record PoisonEnchantmentEffect(EnchantmentLevelBasedValue duration) imple
     }
 
     @Override
-    public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
+    public MapCodec<? extends EnchantmentEntityEffect> codec() {
         return CODEC;
     }
 }

common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/VampiricEnchantmentEffect.java

@@ -0,0 +1,45 @@
+package dev.sillyangel.more_spear_enchantments.enchantment.effect;
+
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.item.enchantment.LevelBasedValue;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.world.item.enchantment.EnchantedItemInUse;
+import net.minecraft.world.phys.Vec3;
+
+public record VampiricEnchantmentEffect(LevelBasedValue healPercentage) implements EnchantmentEntityEffect {
+    public static final MapCodec<VampiricEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
+            instance.group(
+                    LevelBasedValue.CODEC.fieldOf("heal_percentage").forGetter(VampiricEnchantmentEffect::healPercentage)
+            ).apply(instance, VampiricEnchantmentEffect::new)
+    );
+
+    @Override
+    public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) {
+        if (target instanceof LivingEntity victim) {
+            if (context.owner() != null && context.owner() instanceof Player player) {
+                // Calculate heal amount based on a percentage of damage
+                // This is a simplified version - you may need to track actual damage dealt
+                float healPercent = this.healPercentage.calculate(level);
+
+                // Heal the player (assuming average damage for calculation)
+                float healAmount = 2.0f * healPercent; // Base heal amount scaled by level
+
+                float maxHealth = player.getMaxHealth();
+                float newHealth = Math.min(player.getHealth() + healAmount, maxHealth);
+                player.setHealth(newHealth);
+            }
+        }
+    }
+
+    @Override
+    public MapCodec<? extends EnchantmentEntityEffect> codec() {
+        return CODEC;
+    }
+}
+

common/src/main/java/dev/sillyangel/more_spear_enchantments/enchantment/effect/WitheringEnchantmentEffect.java

@@ -2,35 +2,34 @@ package dev.sillyangel.more_spear_enchantments.enchantment.effect;
 
 import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.effect.MobEffectInstance;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.enchantment.LevelBasedValue;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.world.item.enchantment.EnchantedItemInUse;
+import net.minecraft.world.phys.Vec3;
 
-public record WitheringEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect {
+public record WitheringEnchantmentEffect(LevelBasedValue duration) implements EnchantmentEntityEffect {
     public static final MapCodec<WitheringEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
             instance.group(
-                    EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(WitheringEnchantmentEffect::duration)
+                    LevelBasedValue.CODEC.fieldOf("duration").forGetter(WitheringEnchantmentEffect::duration)
             ).apply(instance, WitheringEnchantmentEffect::new)
     );
 
     @Override
-    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
+    public void apply(ServerLevel world, int level, EnchantedItemInUse context, Entity target, Vec3 pos) {
         if (target instanceof LivingEntity victim) {
-            if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-                int witherDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks
-                int witherAmplifier = level - 2; // Level 1 = Wither 0, Level 2 = Wither I, Level 3 = Wither II
+            if (context.owner() != null && context.owner() instanceof Player player) {
+                int witherDuration = (int) (this.duration.calculate(level) * 50); // Convert to ticks
 
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.WITHER,
+                victim.addEffect(new MobEffectInstance(
+                        MobEffects.WITHER,
                         witherDuration,
-                        witherAmplifier,
+                        level,
                         false,
                         true
                 ));
@@ -39,7 +38,7 @@ public record WitheringEnchantmentEffect(EnchantmentLevelBasedValue duration) im
     }
 
     @Override
-    public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
+    public MapCodec<? extends EnchantmentEntityEffect> codec() {
         return CODEC;
     }
 }

common/src/main/java/dev/sillyangel/more_spear_enchantments/util/ModTags.java

@@ -1,17 +1,17 @@
 package dev.sillyangel.more_spear_enchantments.util;
 
 import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.tag.TagKey;
-import net.minecraft.util.Identifier;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.world.item.Item;
+import net.minecraft.tags.TagKey;
+import net.minecraft.resources.Identifier;
 
 public class ModTags {
     public static class Blocks {
 
         private static TagKey<Block> createTag(String name) {
-            return TagKey.of(RegistryKeys.BLOCK, Identifier.of(MoreSpearEnchantments.MOD_ID, name));
+            return TagKey.create(Registries.BLOCK, Identifier.fromNamespaceAndPath(MoreSpearEnchantments.MOD_ID, name));
         }
     }
 
@@ -19,7 +19,7 @@ public class ModTags {
         public static final TagKey<Item> SPEARS = createTag("spears");
 
         private static TagKey<Item> createTag(String name) {
-            return TagKey.of(RegistryKeys.ITEM, Identifier.of(MoreSpearEnchantments.MOD_ID, name));
+            return TagKey.create(Registries.ITEM, Identifier.fromNamespaceAndPath(MoreSpearEnchantments.MOD_ID, name));
         }
     }
 }

common/src/main/resources/assets/more_spear_enchantments/lang/da_dk.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Tordenvejr",
+  "enchantment.more_spear_enchantments.withering": "Visnende",
+  "enchantment.more_spear_enchantments.crippling": "Lemlæstende",
+  "enchantment.more_spear_enchantments.poisoning": "Forgiftning",
+  "enchantment.more_spear_enchantments.vampiric": "Vampyrisk",
+  "enchantment.more_spear_enchantments.explosive": "Eksplosiv"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/de_de.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Donnernd",
+  "enchantment.more_spear_enchantments.withering": "Verdorrend",
+  "enchantment.more_spear_enchantments.crippling": "Verkrüppelnd",
+  "enchantment.more_spear_enchantments.poisoning": "Vergiftung",
+  "enchantment.more_spear_enchantments.vampiric": "Vampirisch",
+  "enchantment.more_spear_enchantments.explosive": "Explosiv"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/en_pt.json

@@ -2,5 +2,7 @@
   "enchantment.more_spear_enchantments.thundering": "Storm o' Thunder",
   "enchantment.more_spear_enchantments.withering": "Rot o' Doom",
   "enchantment.more_spear_enchantments.crippling": "Crippled Legs",
-  "enchantment.more_spear_enchantments.poisoning": "Venom'd Blade"
+  "enchantment.more_spear_enchantments.poisoning": "Venom'd Blade",
+  "enchantment.more_spear_enchantments.vampiric": "Blood Thirst",
+  "enchantment.more_spear_enchantments.explosive": "Powder Keg"
 }

common/src/main/resources/assets/more_spear_enchantments/lang/en_ud.json

@@ -2,5 +2,7 @@
   "enchantment.more_spear_enchantments.thundering": "ƃuᴉɹǝpunɥꓕ",
   "enchantment.more_spear_enchantments.withering": "ƃuᴉɹǝɥʇᴉM",
   "enchantment.more_spear_enchantments.crippling": "ƃuᴉlddᴉɹƆ",
-  "enchantment.more_spear_enchantments.poisoning": "ƃuᴉuosuᴉԀ"
+  "enchantment.more_spear_enchantments.poisoning": "ƃuᴉuosuᴉԀ",
+  "enchantment.more_spear_enchantments.vampiric": "ɔᴉɹᴉdɯɐΛ",
+  "enchantment.more_spear_enchantments.explosive": "ǝʌᴉsolԀxƎ"
 }

common/src/main/resources/assets/more_spear_enchantments/lang/en_us.json

@@ -2,6 +2,8 @@
   "enchantment.more_spear_enchantments.thundering": "Thundering",
   "enchantment.more_spear_enchantments.withering": "Withering",
   "enchantment.more_spear_enchantments.crippling": "Crippling",
-  "enchantment.more_spear_enchantments.poisoning": "Poisoning"
+  "enchantment.more_spear_enchantments.poisoning": "Poisoning",
+  "enchantment.more_spear_enchantments.vampiric": "Vampiric",
+  "enchantment.more_spear_enchantments.explosive": "Explosive"
 }
 

common/src/main/resources/assets/more_spear_enchantments/lang/es_mx.json

@@ -2,5 +2,7 @@
   "enchantment.more_spear_enchantments.thundering": "Tronante",
   "enchantment.more_spear_enchantments.withering": "Marchitante",
   "enchantment.more_spear_enchantments.crippling": "Lisiador",
-  "enchantment.more_spear_enchantments.poisoning": "Envenenamiento"
+  "enchantment.more_spear_enchantments.poisoning": "Envenenamiento",
+  "enchantment.more_spear_enchantments.vampiric": "Vampírico",
+  "enchantment.more_spear_enchantments.explosive": "Explosivo"
 }

common/src/main/resources/assets/more_spear_enchantments/lang/fr_fr.json

@@ -2,5 +2,7 @@
   "enchantment.more_spear_enchantments.thundering": "Tonnerre",
   "enchantment.more_spear_enchantments.withering": "Flétrissure",
   "enchantment.more_spear_enchantments.crippling": "Estropiant",
-  "enchantment.more_spear_enchantments.poisoning": "Empoisonnement"
+  "enchantment.more_spear_enchantments.poisoning": "Empoisonnement",
+  "enchantment.more_spear_enchantments.vampiric": "Vampirique",
+  "enchantment.more_spear_enchantments.explosive": "Explosif"
 }

common/src/main/resources/assets/more_spear_enchantments/lang/it_it.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Tuono",
+  "enchantment.more_spear_enchantments.withering": "Avvizzimento",
+  "enchantment.more_spear_enchantments.crippling": "Paralizzante",
+  "enchantment.more_spear_enchantments.poisoning": "Avvelenamento",
+  "enchantment.more_spear_enchantments.vampiric": "Vampirico",
+  "enchantment.more_spear_enchantments.explosive": "Esplosivo"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/ja_jp.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "雷鳴",
+  "enchantment.more_spear_enchantments.withering": "ウィザー",
+  "enchantment.more_spear_enchantments.crippling": "不自由",
+  "enchantment.more_spear_enchantments.poisoning": "毒",
+  "enchantment.more_spear_enchantments.vampiric": "吸血",
+  "enchantment.more_spear_enchantments.explosive": "爆発"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/ko_kr.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "천둥",
+  "enchantment.more_spear_enchantments.withering": "시들게 하기",
+  "enchantment.more_spear_enchantments.crippling": "불구",
+  "enchantment.more_spear_enchantments.poisoning": "중독",
+  "enchantment.more_spear_enchantments.vampiric": "흡혈",
+  "enchantment.more_spear_enchantments.explosive": "폭발"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/nl_nl.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Bliksem",
+  "enchantment.more_spear_enchantments.withering": "Verwelking",
+  "enchantment.more_spear_enchantments.crippling": "Verminken",
+  "enchantment.more_spear_enchantments.poisoning": "Vergiftiging",
+  "enchantment.more_spear_enchantments.vampiric": "Vampirisch",
+  "enchantment.more_spear_enchantments.explosive": "Explosief"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/no_no.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Torden",
+  "enchantment.more_spear_enchantments.withering": "Visning",
+  "enchantment.more_spear_enchantments.crippling": "Forkrøpling",
+  "enchantment.more_spear_enchantments.poisoning": "Forgiftning",
+  "enchantment.more_spear_enchantments.vampiric": "Vampyrisk",
+  "enchantment.more_spear_enchantments.explosive": "Eksplosiv"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/pl_pl.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Piorun",
+  "enchantment.more_spear_enchantments.withering": "Więdnięcie",
+  "enchantment.more_spear_enchantments.crippling": "Kaleczenie",
+  "enchantment.more_spear_enchantments.poisoning": "Zatrucie",
+  "enchantment.more_spear_enchantments.vampiric": "Wampiryczny",
+  "enchantment.more_spear_enchantments.explosive": "Wybuchowy"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/pt_br.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Trovão",
+  "enchantment.more_spear_enchantments.withering": "Murcha",
+  "enchantment.more_spear_enchantments.crippling": "Aleijante",
+  "enchantment.more_spear_enchantments.poisoning": "Envenenamento",
+  "enchantment.more_spear_enchantments.vampiric": "Vampírico",
+  "enchantment.more_spear_enchantments.explosive": "Explosivo"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/ru_ru.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Гром",
+  "enchantment.more_spear_enchantments.withering": "Иссушение",
+  "enchantment.more_spear_enchantments.crippling": "Увечье",
+  "enchantment.more_spear_enchantments.poisoning": "Отравление",
+  "enchantment.more_spear_enchantments.vampiric": "Вампиризм",
+  "enchantment.more_spear_enchantments.explosive": "Взрывной"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/sv_se.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Åska",
+  "enchantment.more_spear_enchantments.withering": "Vissning",
+  "enchantment.more_spear_enchantments.crippling": "Förlamande",
+  "enchantment.more_spear_enchantments.poisoning": "Förgiftning",
+  "enchantment.more_spear_enchantments.vampiric": "Vampyrisk",
+  "enchantment.more_spear_enchantments.explosive": "Explosiv"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/tr_tr.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Yıldırım",
+  "enchantment.more_spear_enchantments.withering": "Soldurucu",
+  "enchantment.more_spear_enchantments.crippling": "Sakat Bırakıcı",
+  "enchantment.more_spear_enchantments.poisoning": "Zehirleme",
+  "enchantment.more_spear_enchantments.vampiric": "Vampirik",
+  "enchantment.more_spear_enchantments.explosive": "Patlayıcı"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/uk_ua.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "Гримучий",
+  "enchantment.more_spear_enchantments.withering": "Висихаючий",
+  "enchantment.more_spear_enchantments.crippling": "Каліцтво",
+  "enchantment.more_spear_enchantments.poisoning": "Отруєння",
+  "enchantment.more_spear_enchantments.vampiric": "Вампіризм",
+  "enchantment.more_spear_enchantments.explosive": "Вибуховий"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/zh_cn.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "雷鸣",
+  "enchantment.more_spear_enchantments.withering": "凋零",
+  "enchantment.more_spear_enchantments.crippling": "致残",
+  "enchantment.more_spear_enchantments.poisoning": "中毒",
+  "enchantment.more_spear_enchantments.vampiric": "吸血",
+  "enchantment.more_spear_enchantments.explosive": "爆炸"
+}
+

common/src/main/resources/assets/more_spear_enchantments/lang/zh_tw.json

@@ -0,0 +1,9 @@
+{
+  "enchantment.more_spear_enchantments.thundering": "雷鳴",
+  "enchantment.more_spear_enchantments.withering": "凋零",
+  "enchantment.more_spear_enchantments.crippling": "致殘",
+  "enchantment.more_spear_enchantments.poisoning": "中毒",
+  "enchantment.more_spear_enchantments.vampiric": "吸血",
+  "enchantment.more_spear_enchantments.explosive": "爆炸"
+}
+

common/src/main/resources/data/minecraft/tags/enchantment/in_enchanting_table.json

@@ -0,0 +1,11 @@
+{
+  "replace": false,
+  "values": [
+    "more_spear_enchantments:crippling",
+    "more_spear_enchantments:poisoning",
+    "more_spear_enchantments:thundering",
+    "more_spear_enchantments:withering",
+    "more_spear_enchantments:vampiric",
+    "more_spear_enchantments:explosive"
+  ]
+}

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/datagen/ModItemTagProvider.java

@@ -1,22 +1,20 @@
 package dev.sillyangel.more_spear_enchantments.fabric.datagen;
 
 import dev.sillyangel.more_spear_enchantments.util.ModTags;
-import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider;
-import net.minecraft.item.Items;
-import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.registry.tag.ItemTags;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.world.item.Items;
 
 import java.util.concurrent.CompletableFuture;
 
 public class ModItemTagProvider extends FabricTagProvider.ItemTagProvider {
-    public ModItemTagProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> completableFuture) {
+    public ModItemTagProvider(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> completableFuture) {
         super(output, completableFuture);
     }
 
     @Override
-    protected void configure(RegistryWrapper.WrapperLookup wrapperLookup) {
+    protected void addTags(HolderLookup.Provider wrapperLookup) {
         valueLookupBuilder(ModTags.Items.SPEARS)
                 .add(Items.WOODEN_SPEAR)
                 .add(Items.STONE_SPEAR)

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentEffects.java

@@ -3,37 +3,41 @@ package dev.sillyangel.more_spear_enchantments.fabric.enchantment;
 import com.mojang.serialization.MapCodec;
 import dev.sillyangel.more_spear_enchantments.MoreSpearEnchantments;
 import dev.sillyangel.more_spear_enchantments.enchantment.effect.*;
-import net.minecraft.registry.Registries;
-import net.minecraft.registry.Registry;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.util.Identifier;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.Identifier;
+import net.minecraft.world.item.enchantment.effects.EnchantmentEntityEffect;
+import net.minecraft.world.item.enchantment.Enchantment;
 
 public class ModEnchantmentEffects {
-	public static final RegistryKey<Enchantment> THUNDERING = of("thundering");
-	public static final RegistryKey<Enchantment> WITHERING = of("withering");
-	public static final RegistryKey<Enchantment> POISONING = of("poisoning");
-	public static final RegistryKey<Enchantment> CRIPPLING = of("crippling");
+	public static final ResourceKey<Enchantment> THUNDERING = of("thundering");
+	public static MapCodec<LightningEnchantmentEffect> LIGHTNING_EFFECT = register("lightning_effect", LightningEnchantmentEffect.CODEC);
+	public static final ResourceKey<Enchantment> WITHERING = of("withering");
+	public static MapCodec<WitheringEnchantmentEffect> WITHERING_EFFECT = register("withering_effect", WitheringEnchantmentEffect.CODEC);
+	public static final ResourceKey<Enchantment> POISONING = of("poisoning");
+	public static MapCodec<PoisonEnchantmentEffect> POISONING_EFFECT = register("poisoning_effect", PoisonEnchantmentEffect.CODEC);
+	public static final ResourceKey<Enchantment> CRIPPLING = of("crippling");
+	public static MapCodec<CripplingEnchantmentEffect> CRIPPLING_EFFECT = register("crippling_effect", CripplingEnchantmentEffect.CODEC);
 
 
-	private static RegistryKey<Enchantment> of(String path) {
-		Identifier id = Identifier.of(MoreSpearEnchantments.MOD_ID, path);
-		return RegistryKey.of(RegistryKeys.ENCHANTMENT, id);
+	private static ResourceKey<Enchantment> of(String path) {
+		Identifier id = Identifier.fromNamespaceAndPath(MoreSpearEnchantments.MOD_ID, path);
+		return ResourceKey.create(Registries.ENCHANTMENT, id);
 	}
 
 	private static <T extends EnchantmentEntityEffect> MapCodec<T> register(String id, MapCodec<T> codec) {
-		return Registry.register(Registries.ENCHANTMENT_ENTITY_EFFECT_TYPE, Identifier.of(MoreSpearEnchantments.MOD_ID, id), codec);
+		return Registry.register(BuiltInRegistries.ENCHANTMENT_ENTITY_EFFECT_TYPE, Identifier.fromNamespaceAndPath(MoreSpearEnchantments.MOD_ID, id), codec);
 	}
 
 	public static void registerModEnchantmentEffects() {
 		MoreSpearEnchantments.LOGGER.info("Registering EnchantmentEffects for " + MoreSpearEnchantments.MOD_ID);
 
-		register("lightning", LightningEnchantmentEffect.CODEC);
-		register("poison", PoisonEnchantmentEffect.CODEC);
-		register("withering", WitheringEnchantmentEffect.CODEC);
-		register("crippling", CripplingEnchantmentEffect.CODEC);
+//		register("lightning", LightningEnchantmentEffect.CODEC);
+//		register("poison", PoisonEnchantmentEffect.CODEC);
+//		register("withering", WitheringEnchantmentEffect.CODEC);
+//		register("crippling", CripplingEnchantmentEffect.CODEC);
 	}
 }
 

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/ModEnchantmentGenerator.java

@@ -1,115 +1,158 @@
 package dev.sillyangel.more_spear_enchantments.fabric.enchantment;
 
 import dev.sillyangel.more_spear_enchantments.util.ModTags;
+import dev.sillyangel.more_spear_enchantments.enchantment.ModEnchantmentEffects;
 import dev.sillyangel.more_spear_enchantments.enchantment.effect.*;
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.fabricmc.fabric.api.datagen.v1.provider.FabricDynamicRegistryProvider;
 import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition;
-import net.minecraft.registry.RegistryWrapper;
-import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.RegistryKey;
-import net.minecraft.enchantment.Enchantment;
-import net.minecraft.enchantment.effect.EnchantmentEffectTarget;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.component.type.AttributeModifierSlot;
-import net.minecraft.component.EnchantmentEffectComponentTypes;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.enchantment.Enchantment;
+import net.minecraft.world.item.enchantment.EnchantmentTarget;
+import net.minecraft.world.item.enchantment.LevelBasedValue;
+import net.minecraft.world.item.enchantment.LevelBasedValue.Linear;
+import net.minecraft.world.entity.EquipmentSlotGroup;
+import net.minecraft.world.item.enchantment.EnchantmentEffectComponents;
 
 import java.util.concurrent.CompletableFuture;
 
 public class ModEnchantmentGenerator extends FabricDynamicRegistryProvider {
-	public ModEnchantmentGenerator(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registriesFuture) {
+	public ModEnchantmentGenerator(FabricDataOutput output, CompletableFuture<HolderLookup.Provider> registriesFuture) {
 		super(output, registriesFuture);
 		System.out.println("REGISTERING ENCHANTS");
 	}
 
 	@Override
-	protected void configure(RegistryWrapper.WrapperLookup registries, Entries entries) {
+	protected void configure(HolderLookup.Provider registries, Entries entries) {
 		// Our new enchantment, "Thundering."
-		register(entries, ModEnchantmentEffects.THUNDERING, Enchantment.builder(
+		register(entries, ModEnchantmentEffects.THUNDERING, Enchantment.enchantment(
 				Enchantment.definition(
-					registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS),
+					registries.lookupOrThrow(Registries.ITEM).getOrThrow(ModTags.Items.SPEARS),
 					// this is the "weight" or probability of our enchantment showing up in the table
 					10,
 					// the maximum level of the enchantment
 					3,
 					// base cost for level 1 of the enchantment, and min levels required for something higher
-					Enchantment.leveledCost(1, 10),
+					Enchantment.dynamicCost(1, 10),
 					// same fields as above but for max cost
-					Enchantment.leveledCost(1, 15),
+					Enchantment.dynamicCost(1, 15),
 					// anvil cost
 					5,
 					// valid slots
-					AttributeModifierSlot.HAND
+					EquipmentSlotGroup.HAND
 				)
 			)
-				.addEffect(
+				.withEffect(
 					// enchantment occurs POST_ATTACK
-					EnchantmentEffectComponentTypes.POST_ATTACK,
-					EnchantmentEffectTarget.ATTACKER,
-					EnchantmentEffectTarget.VICTIM,
-					new LightningEnchantmentEffect(EnchantmentLevelBasedValue.linear(0.4f, 0.2f)) // scale the enchantment linearly.
+					EnchantmentEffectComponents.POST_ATTACK,
+					EnchantmentTarget.ATTACKER,
+					EnchantmentTarget.VICTIM,
+					new LightningEnchantmentEffect(LevelBasedValue.perLevel(0.4f, 0.2f)) // scale the enchantment linearly.
 				)
 		);
-		register(entries, ModEnchantmentEffects.POISONING, Enchantment.builder(
+		register(entries, ModEnchantmentEffects.POISONING, Enchantment.enchantment(
 				Enchantment.definition(
-						registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS),
+						registries.lookupOrThrow(Registries.ITEM).getOrThrow(ModTags.Items.SPEARS),
 						10,
 						3,
-						Enchantment.leveledCost(1, 10),
-						Enchantment.leveledCost(1, 15),
+						Enchantment.dynamicCost(1, 10),
+						Enchantment.dynamicCost(1, 15),
 						5,
-						AttributeModifierSlot.HAND
+						EquipmentSlotGroup.HAND
 				)
 		)
-				.addEffect(
-					EnchantmentEffectComponentTypes.POST_ATTACK,
-					EnchantmentEffectTarget.ATTACKER,
-					EnchantmentEffectTarget.VICTIM,
-					new PoisonEnchantmentEffect(EnchantmentLevelBasedValue.linear(3.0f, 1.0f)) // 3s base, +1s per level
+				.withEffect(
+					EnchantmentEffectComponents.POST_ATTACK,
+					EnchantmentTarget.ATTACKER,
+					EnchantmentTarget.VICTIM,
+					new PoisonEnchantmentEffect(LevelBasedValue.perLevel(3.0f, 1.0f)) // 3s base, +1s per level
 				)
 		);
 		// Our new enchantment, "Withering."
-		register(entries, ModEnchantmentEffects.WITHERING, Enchantment.builder(
+		register(entries, ModEnchantmentEffects.WITHERING, Enchantment.enchantment(
 				Enchantment.definition(
-					registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS),
+					registries.lookupOrThrow(Registries.ITEM).getOrThrow(ModTags.Items.SPEARS),
 					10,
 					3,
-					Enchantment.leveledCost(1, 10),
-					Enchantment.leveledCost(1, 15),
+					Enchantment.dynamicCost(1, 10),
+					Enchantment.dynamicCost(1, 15),
 					5,
-					AttributeModifierSlot.HAND
+					EquipmentSlotGroup.HAND
 				)
 			)
-				.addEffect(
-					EnchantmentEffectComponentTypes.POST_ATTACK,
-					EnchantmentEffectTarget.ATTACKER,
-					EnchantmentEffectTarget.VICTIM,
-					new WitheringEnchantmentEffect(EnchantmentLevelBasedValue.linear(2.0f, 1.0f)) // 2s base, +1s per level
+				.withEffect(
+					EnchantmentEffectComponents.POST_ATTACK,
+					EnchantmentTarget.ATTACKER,
+					EnchantmentTarget.VICTIM,
+					new WitheringEnchantmentEffect(LevelBasedValue.perLevel(2.0f, 1.0f)) // 2s base, +1s per level
 				)
 		);
 		// Our new enchantment, "Crippling."
-		register(entries, ModEnchantmentEffects.CRIPPLING, Enchantment.builder(
+		register(entries, ModEnchantmentEffects.CRIPPLING, Enchantment.enchantment(
 				Enchantment.definition(
-					registries.getOrThrow(RegistryKeys.ITEM).getOrThrow(ModTags.Items.SPEARS),
+					registries.lookupOrThrow(Registries.ITEM).getOrThrow(ModTags.Items.SPEARS),
 					10,
 					3,
-					Enchantment.leveledCost(1, 10),
-					Enchantment.leveledCost(1, 15),
+					Enchantment.dynamicCost(1, 10),
+					Enchantment.dynamicCost(1, 15),
 					5,
-					AttributeModifierSlot.HAND
+					EquipmentSlotGroup.HAND
 				)
 			)
-				.addEffect(
-					EnchantmentEffectComponentTypes.POST_ATTACK,
-					EnchantmentEffectTarget.ATTACKER,
-					EnchantmentEffectTarget.VICTIM,
-					new CripplingEnchantmentEffect(EnchantmentLevelBasedValue.linear(2.0f, 1.0f)) // 2s base, +1s per leve
+                .withEffect(
+					EnchantmentEffectComponents.POST_ATTACK,
+					EnchantmentTarget.ATTACKER,
+					EnchantmentTarget.VICTIM,
+					new CripplingEnchantmentEffect(LevelBasedValue.perLevel(2.0f, 1.0f)) // 2s base, +1s per leve
+				)
+		);
+		// Our new enchantment, "Vampiric."
+		register(entries, ModEnchantmentEffects.VAMPIRIC, Enchantment.enchantment(
+				Enchantment.definition(
+					registries.lookupOrThrow(Registries.ITEM).getOrThrow(ModTags.Items.SPEARS),
+					5, // Lower weight (rarer)
+					3,
+					Enchantment.dynamicCost(10, 8),
+					Enchantment.dynamicCost(50, 8),
+					4,
+					EquipmentSlotGroup.HAND
+				)
+			)
+                .withEffect(
+					EnchantmentEffectComponents.POST_ATTACK,
+					EnchantmentTarget.ATTACKER,
+					EnchantmentTarget.VICTIM,
+					new VampiricEnchantmentEffect(LevelBasedValue.perLevel(0.5f, 0.5f)) // 0.5 base, +0.5 per level (50%, 100%, 150%)
+				)
+		);
+		// Our new enchantment, "Explosive."
+		register(entries, ModEnchantmentEffects.EXPLOSIVE, Enchantment.enchantment(
+				Enchantment.definition(
+					registries.lookupOrThrow(Registries.ITEM).getOrThrow(ModTags.Items.SPEARS),
+					2, // Very rare
+					3,
+					Enchantment.dynamicCost(20, 10),
+					Enchantment.dynamicCost(70, 10),
+					8,
+					EquipmentSlotGroup.HAND
+				)
+			)
+                .withEffect(
+					EnchantmentEffectComponents.POST_ATTACK,
+					EnchantmentTarget.ATTACKER,
+					EnchantmentTarget.VICTIM,
+					new ExplosiveEnchantmentEffect(
+						LevelBasedValue.perLevel(1.5f, 0.5f), // Power: 1.5, 2.0, 2.5
+						LevelBasedValue.perLevel(0.1f, 0.1f)  // Chance: 10%, 20%, 30%
+					)
 				)
 		);
 	}
 
-	private void register(Entries entries, RegistryKey<Enchantment> key, Enchantment.Builder builder, ResourceCondition... resourceConditions) {
-		entries.add(key, builder.build(key.getValue()), resourceConditions);
+	private void register(Entries entries, ResourceKey<Enchantment> key, Enchantment.Builder builder, ResourceCondition... resourceConditions) {
+		entries.add(key, builder.build(key.identifier()), resourceConditions); //idk, im going insane
 	}
 
 	@Override

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/CripplingEnchantmentEffect.java

@@ -1,52 +0,0 @@
-package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
-
-public record CripplingEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect {
-    public static final MapCodec<CripplingEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
-            instance.group(
-                    EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(CripplingEnchantmentEffect::duration)
-            ).apply(instance, CripplingEnchantmentEffect::new)
-    );
-
-    @Override
-    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
-        if (target instanceof LivingEntity victim) {
-            if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-                int Duration = (int) (this.duration.getValue(level) * 50); // Convert to ticks
-                int slownessAmplifier = level - 1; // Level 1 = Slowness 0, Level 2 = Slowness I, Level 3 = Slowness II
-                int weaknessAmplifier = level - 1; // Level 1 = Weakness 0, Level 2 = Weakness I, Level 3 = Weakness II
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.SLOWNESS,
-                        Duration,
-                        slownessAmplifier,
-                        false,
-                        true
-                ));
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.WEAKNESS,
-                        Duration,
-                        weaknessAmplifier,
-                        false,
-                        true
-                ));
-            }
-        }
-    }
-
-    @Override
-    public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
-        return CODEC;
-    }
-}

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/LightningEnchantmentEffect.java

@@ -1,43 +0,0 @@
-package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityType;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.SpawnReason;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
-
-public record LightningEnchantmentEffect(EnchantmentLevelBasedValue amount) implements EnchantmentEntityEffect {
-	public static final MapCodec<LightningEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
-			instance.group(
-					EnchantmentLevelBasedValue.CODEC.fieldOf("amount").forGetter(LightningEnchantmentEffect::amount)
-			).apply(instance, LightningEnchantmentEffect::new)
-	);
-
-	@Override
-	public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
-		if (target instanceof LivingEntity victim) {
-			if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-				float numStrikes = this.amount.getValue(level);
-
-				for (float i = 0; i < numStrikes; i++) {
-					BlockPos position = victim.getBlockPos();
-					EntityType.LIGHTNING_BOLT.spawn(world, position, SpawnReason.TRIGGERED);
-				}
-			}
-		}
-	}
-
-	@Override
-	public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
-		return CODEC;
-	}
-}
-

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/PoisonEnchantmentEffect.java

@@ -1,45 +0,0 @@
-package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
-
-public record PoisonEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect {
-    public static final MapCodec<PoisonEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
-            instance.group(
-                    EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(PoisonEnchantmentEffect::duration)
-            ).apply(instance, PoisonEnchantmentEffect::new)
-    );
-
-    @Override
-    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
-        if (target instanceof LivingEntity victim) {
-            if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-                int poisonDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks
-                int poisonAmplifier = level - 2; // Level 1 = Poison 0, Level 2 = Poison I, Level 3 = Poison II
-
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.POISON,
-                        poisonDuration,
-                        poisonAmplifier,
-                        false,
-                        true
-                ));
-            }
-        }
-    }
-
-    @Override
-    public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
-        return CODEC;
-    }
-}

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/enchantment/effect/WitheringEnchantmentEffect.java

@@ -1,46 +0,0 @@
-package dev.sillyangel.more_spear_enchantments.fabric.enchantment.effect;
-
-import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.server.world.ServerWorld;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.LivingEntity;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.enchantment.EnchantmentEffectContext;
-import net.minecraft.enchantment.EnchantmentLevelBasedValue;
-import net.minecraft.enchantment.effect.EnchantmentEntityEffect;
-import net.minecraft.util.math.Vec3d;
-
-public record WitheringEnchantmentEffect(EnchantmentLevelBasedValue duration) implements EnchantmentEntityEffect {
-    public static final MapCodec<WitheringEnchantmentEffect> CODEC = RecordCodecBuilder.mapCodec(instance ->
-            instance.group(
-                    EnchantmentLevelBasedValue.CODEC.fieldOf("duration").forGetter(WitheringEnchantmentEffect::duration)
-            ).apply(instance, WitheringEnchantmentEffect::new)
-    );
-
-    @Override
-    public void apply(ServerWorld world, int level, EnchantmentEffectContext context, Entity target, Vec3d pos) {
-        if (target instanceof LivingEntity victim) {
-            if (context.owner() != null && context.owner() instanceof PlayerEntity player) {
-                int witherDuration = (int) (this.duration.getValue(level) * 40); // Convert to ticks
-                int witherAmplifier = level - 2; // Level 1 = Wither 0, Level 2 = Wither I, Level 3 = Wither II
-
-                victim.addStatusEffect(new StatusEffectInstance(
-                        StatusEffects.WITHER,
-                        witherDuration,
-                        witherAmplifier,
-                        false,
-                        true
-                ));
-            }
-        }
-    }
-
-    @Override
-    public MapCodec<? extends EnchantmentEntityEffect> getCodec() {
-        return CODEC;
-    }
-}
-

fabric/src/main/java/dev/sillyangel/more_spear_enchantments/fabric/mixin/ExampleMixin.java

@@ -8,7 +8,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(MinecraftServer.class)
 public class ExampleMixin {
-	@Inject(at = @At("HEAD"), method = "loadWorld")
+	@Inject(at = @At("HEAD"), method = "loadLevel")
 	private void init(CallbackInfo info) {
 		// This code is injected into the start of MinecraftServer.loadWorld()V
 	}

gradle.properties

@@ -3,18 +3,16 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Mod properties
-mod_version = 1.0.1
+mod_version = 1.1.1
 maven_group = dev.sillyangel.more_spear_enchantments
 archives_name = more_spear_enchantments
 enabled_platforms = fabric,neoforge
 
 # Minecraft properties
 minecraft_version = 1.21.11
-yarn_mappings = 1.21.11+build.3
 
 # Dependencies
 architectury_api_version = 19.0.1
 fabric_loader_version = 0.18.4
 fabric_api_version = 0.140.2+1.21.11
 neoforge_version = 21.11.17-beta
-yarn_mappings_patch_neoforge_version = 1.21+build.6

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,8 +1,10 @@
 modLoader = "javafml"
 loaderVersion = "[10,)"
-issueTrackerURL = "https://git.sillyangel.dev/angel/more-spear-enchants-neoforge/issues"
+issueTrackerURL = "https://git.sillyangel.dev/angel/more-spear-enchants/issues"
+updateJSONURL= "https://api.modrinth.com/updates/more-spear-enchantments/forge_updates.json"
 license = "MIT"
 
+
 [[mods]]
 modId = "more_spear_enchantments"
 version = "${version}"

update.json

@@ -0,0 +1,11 @@
+{
+  "homepage": "https://modrinth.com/mod/more-spear-enchantments",
+  "1.21.11": {
+    "1.1.1": "added plugin support (paper, purpur, folia) - alpha\n- added new enchantments:\n  - 🩸 vampiric - lifesteal on hit (I~III)\n  - 💥 explosive - safe explosions on hit with chance and power scaling (I-III)\n- added 15 new translations (german, portuguese, italian, chinese, japanese, korean, russian, and more)\n- neoforge & forge only: switched update json to use the modrinth api instead of self hosted",
+    "1.1.0": "added to enchantment table (wow angel how did you forget, that is literally the whole point of the mod )\n, and switch to mojang mapping from yarn\n and the level of the book matches with the level of the effect, and each lvl duration is calculated by (level * 50) with 50 being ticks "
+  },
+  "promos": {
+    "1.21.11-latest": "1.1.1",
+    "1.21.11-recommended": "1.1.1"
+  }
+}