fix discontinuous cast

Author: TUsama

src/main/java/com/robertx22/mine_and_slash/database/data/spells/components/Spell.java

@@ -51,6 +51,7 @@
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.Level;
@@ -157,28 +158,80 @@ public WeaponTypes getWeapon(LivingEntity en) {
     }
 
     public final void onCastingTick(SpellCastContext ctx) {
-        int timesToCast = (int) ctx.spell.getConfig().times_to_cast;
-        if (timesToCast > 1) {
-            int castTimeTicks = (int) getCastTimeTicks(ctx);
-            // if i didnt do this then cast time reduction would reduce amount of spell hits.
-            int castEveryXTicks = castTimeTicks / timesToCast;
-            if (timesToCast > 1) {
+
+        int timesToCast = ctx.spell.getConfig().times_to_cast;
+        if (timesToCast > 1){
+
+
+            if (ctx.caster instanceof ServerPlayer player){
+
+                if (ctx.ticksInUse > 0){
+                    //do more precise time calculation here, so we don't miss each single cast.
+                    SpellCastingData spellCastingData = Load.player(player).spellCastingData;
+                    //already done all casts
+                    if (spellCastingData.castTimesDone >= timesToCast) {
+                        return;
+                    }
+
+                    //don't invoke getCastTimeTicks(ctx) to get the imprecise tick!
+                    //for internal calc, use the precise one
+                    float allCastsTime = ctx.event.data.getNumber(EventData.CAST_TICKS).number;
+                    float singleCastTime = allCastsTime / timesToCast;
+                    float usedCastedTime = spellCastingData.castTimesDone * singleCastTime;
+
+
+
+                    //when it's last tick but there are still casts not finished
+                    if (ctx.isLastCastTick && spellCastingData.castTimesDone < timesToCast) {
+                        int leftTimes = timesToCast - spellCastingData.castTimesDone;
+                        for (int i = 0; i < leftTimes; i++) {
+                            this.cast(ctx);
+                            spellCastingData.castTimesDone++;
+                        }
+                        return;
+                    }
+
+
+                    int hitTime = 0;
+                    while (ctx.ticksInUse - usedCastedTime >= singleCastTime) {
+                        hitTime++;
+                        usedCastedTime += singleCastTime;
+                    }
+                    for (int time = hitTime; time > 0; time--) {
+                        this.cast(ctx);
+                        spellCastingData.castTimesDone++;
+                    }
+
+
+                }
+
+            } else {
+                int castTimeTicks = (int) getCastTimeTicks(ctx);
+
+
+                // if i didnt do this then cast time reduction would reduce amount of spell hits.
+                int castEveryXTicks = castTimeTicks / timesToCast;
+
                 if (castEveryXTicks < 1) {
                     castEveryXTicks = 1;
                 }
-            }
-            if (ctx.ticksInUse > 0 && ctx.ticksInUse % castEveryXTicks == 0) {
-                this.cast(ctx);
+
+                if (ctx.ticksInUse > 0 && ctx.ticksInUse % castEveryXTicks == 0) {
+                    this.cast(ctx);
+                }
+
             }
         } else if (timesToCast < 1) {
             ExileLog.get().warn("Times to cast spell is: " + timesToCast + " . this seems like a bug.");
         }
+
+        ctx.castedThisTick = true;
     }
 
     public void cast(SpellCastContext ctx) {
         LivingEntity caster = ctx.caster;
-        ctx.castedThisTick = true;
-        /*
+
+     /*
         if (MMORPG.RUN_DEV_TOOLS_REMOVE_WHEN_DONE && this.config.swing_arm) {
             //    caster.swingTime = -1; // this makes sure hand swings
             //   caster.swing(InteractionHand.MAIN_HAND);
@@ -195,9 +248,10 @@ public final int getChargeCooldownTicks(SpellCastContext ctx) {
         return (int) ctx.event.data.getNumber(EventData.CHARGE_COOLDOWN_TICKS).number;
     }
 
-    public final int getCastTimeTicks(SpellCastContext ctx) {
+    public int getCastTimeTicks(SpellCastContext ctx) {
         // if it casts 5 times a cast, it should take at least 5 ticks to cast it
-        return MathHelper.clamp((int) ctx.event.data.getNumber(EventData.CAST_TICKS).number, config.times_to_cast, 10000);
+        //Clefal: we can actually allow multiple cast on 1 tick. But we at least need to let the cast time a little longer than the real cast time.
+        return ((int) Math.ceil(ctx.event.data.getNumber(EventData.CAST_TICKS).number));
     }
 
     @Override
@@ -277,7 +331,7 @@ public final List<Component> GetTooltipString(StatRangeInfo info) {
         if (casttime == 0) {
             list.add(Words.INSTANT_CAST.locName().withStyle(ChatFormatting.GREEN));
         } else {
-            list.add(Words.CAST_TIME.locName(casttime / 20).withStyle(ChatFormatting.GREEN));
+            list.add(Words.CAST_TIME.locName(Math.round(casttime / 20.0f * 100f) / 100f).withStyle(ChatFormatting.GREEN));
         }
 
         Set<String> radiuses = new LinkedHashSet<>();

src/main/java/com/robertx22/mine_and_slash/saveclasses/spells/SpellCastingData.java

@@ -223,6 +223,7 @@ public SpellInputBufferEntry(int number) {
 
     public int castTickLeft = 0;
     public int castTicksDone = 0;
+    public int castTimesDone;
     public int spellTotalCastTicks = 0;
     public CalculatedSpellData calcSpell = null;
     public Boolean casting = false;
@@ -317,6 +318,7 @@ public void cancelCast(LivingEntity entity) {
                 castTickLeft = 0;
                 spellTotalCastTicks = 0;
                 castTicksDone = 0;
+                castTimesDone = 0;
                 this.casting = false;
 
                 if (entity instanceof ServerPlayer p) {
@@ -386,7 +388,6 @@ public void onTimePass(LivingEntity entity) {
                 tryCast(ctx);
 
                 lastSpell = spell;
-
                 castTickLeft--;
                 castTicksDone++;
 
@@ -430,6 +431,7 @@ public void setToCast(SpellCastContext ctx) {
         this.castTickLeft = ctx.spell.getCastTimeTicks(ctx);
         this.spellTotalCastTicks = this.castTickLeft;
         this.castTicksDone = 0;
+        castTimesDone = 0;
         this.casting = true;
 
         if (ctx.caster instanceof ServerPlayer p) {

src/main/java/com/robertx22/mine_and_slash/uncommon/effectdatas/rework/action/DecreaseNumberByPercentEffect.java

@@ -21,6 +21,7 @@ public DecreaseNumberByPercentEffect(String num) {
     @Override
     public void activate(EffectEvent event, EffectSides statSource, StatData data, Stat stat) {
         event.data.getNumber(num_id).number -= event.data.getOriginalNumber(num_id).number * data.getValue() / 100F;
+        event.data.getNumber(num_id).number = Math.round(event.data.getNumber(num_id).number * 100.0f) / 100.0f;
     }
 
     @Override