Removed useless duration field in the enchantment

Starexify · Jan 14, 2025 · 4bad760 · 4bad760
1 parent 213f34d
commit 4bad760
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/src/generated/resources/data/big_swords/enchantment/soul_stealer.json b/src/generated/resources/data/big_swords/enchantment/soul_stealer.json
@@ -6,8 +6,7 @@
       {
         "affected": "victim",
         "effect": {
-          "type": "big_swords:soul_steal",
-          "duration": 0
+          "type": "big_swords:soul_steal"
         },
         "enchanted": "attacker"
       }

diff --git a/src/main/java/net/nova/big_swords/data/BSEnchantments.java b/src/main/java/net/nova/big_swords/data/BSEnchantments.java
@@ -37,7 +37,7 @@ public static void bootstrap(BootstrapContext<Enchantment> context) {
                         EnchantmentEffectComponents.POST_ATTACK,
                         EnchantmentTarget.ATTACKER,
                         EnchantmentTarget.VICTIM,
-                        new SoulStealEffect(0)
+                        new SoulStealEffect()
                 )
         );
     }

diff --git a/src/main/java/net/nova/big_swords/enchantments/effects/SoulStealEffect.java b/src/main/java/net/nova/big_swords/enchantments/effects/SoulStealEffect.java
@@ -1,8 +1,6 @@
 package net.nova.big_swords.enchantments.effects;
 
-import com.mojang.serialization.Codec;
 import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.particles.ParticleTypes;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
@@ -16,10 +14,8 @@
 import net.nova.big_swords.init.BSItems;
 import net.nova.big_swords.init.Tags;
 
-public record SoulStealEffect(int duration) implements EnchantmentEntityEffect {
-    public static final MapCodec<SoulStealEffect> CODEC = RecordCodecBuilder.mapCodec(
-            inst -> inst.group(Codec.INT.fieldOf("duration").forGetter(p_345622_ -> p_345622_.duration)).apply(inst, SoulStealEffect::new)
-    );
+public record SoulStealEffect() implements EnchantmentEntityEffect {
+    public static final MapCodec<SoulStealEffect> CODEC = MapCodec.unit(new SoulStealEffect());
 
     @Override
     public void apply(ServerLevel level, int pEnchantmentLevel, EnchantedItemInUse pItem, Entity entity, Vec3 pOrigin) {

diff --git a/src/main/java/net/nova/big_swords/item/ScytheItem.java b/src/main/java/net/nova/big_swords/item/ScytheItem.java
@@ -95,16 +95,9 @@ public boolean releaseUsing(ItemStack stack, Level level, LivingEntity entity, i
                             scytheHits(player, target);
                             entitiesHit++;
 
-                            int soulStealerEnchantment = stack.getEnchantmentLevel(BigSwordsR.getEnchantment(level, BSEnchantments.SOUL_STEALER));
-                            if (soulStealerEnchantment > 0) {
-                                SoulStealEffect soulStealEffect = new SoulStealEffect(200);
-                                soulStealEffect.apply((ServerLevel) level,
-                                        soulStealerEnchantment,
-                                        new EnchantedItemInUse(stack, entity.getEquipmentSlotForItem(stack), entity),
-                                        target,
-                                        target.position()
-                                );
-                            }
+                            int soulStealerEnchantmentLevel = stack.getEnchantmentLevel(BigSwordsR.getEnchantment(level, BSEnchantments.SOUL_STEALER));
+                            if (soulStealerEnchantmentLevel > 0)
+                                new SoulStealEffect().apply((ServerLevel) level, soulStealerEnchantmentLevel, new EnchantedItemInUse(stack, entity.getEquipmentSlotForItem(stack), entity), target, target.position());
                         }
                     }
                 }