More minor bug fixes. Should be build ready.

Author: CravenCraft

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/BasicAttackMixin.java

@@ -8,21 +8,17 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import tictim.paraglider.forge.capability.PlayerMovementProvider;
-import yesman.epicfight.main.EpicFightMod;
 import yesman.epicfight.skill.BasicAttack;
 import yesman.epicfight.skill.Skill;
 import yesman.epicfight.world.capabilities.entitypatch.player.ServerPlayerPatch;
 
 @Mixin(BasicAttack.class)
 public abstract class BasicAttackMixin extends Skill {
 
-    //TODO: Major issue with attacking stamina and dodging stamina. Look into later
     public BasicAttackMixin(Builder<? extends Skill> builder) {
         super(builder);
     }
 
-    // TODO: Mainly working now. Isn't working for the first swing, but the second. Maybe it has to do with combo count?
-    //       Or set attacking to true?
     @Inject(method = "executeOnServer", at = @At("TAIL"), remap = false)
     private void getPlayerPatch(ServerPlayerPatch executor, FriendlyByteBuf args, CallbackInfo ci) {
         StaminaOverride botwStamina = ((StaminaOverride) PlayerMovementProvider.of(executor.getOriginal()).stamina());

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/SkillMixin.java

@@ -2,20 +2,19 @@
 
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.FriendlyByteBuf;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import yesman.epicfight.skill.Skill;
-import yesman.epicfight.world.capabilities.entitypatch.player.ServerPlayerPatch;
 
 import java.util.ArrayList;
 
 @Mixin(Skill.class)
 public abstract class SkillMixin {
 
+    @Shadow protected float consumption;
+
     /**
      * Removes all attribute modifiers that add health or stamina. The Paragliders mod already
      * adds this, and this would make things more unbalanced.
@@ -38,9 +37,4 @@ private ListTag removeStaminaAndHealthAttributes(ListTag listTag) {
 
         return listTag;
     }
-
-    @Inject(at = @At("HEAD"), method = "executeOnServer", remap = false)
-    private void modifyExecuteOnServer(ServerPlayerPatch executor, FriendlyByteBuf args, CallbackInfo ci) {
-        // TODO: Might be able to cancel some skills like the basic attack here.
-    }
 }

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/SkillResourceMixin.java

@@ -11,7 +11,7 @@
 public abstract class SkillResourceMixin {
 
     @Redirect(at = @At(value = "INVOKE", target = "Lyesman/epicfight/world/capabilities/entitypatch/player/PlayerPatch;hasStamina(F)Z"), remap = false, method = "lambda$static$6")
-    private static boolean testRedirect(PlayerPatch playerPatch, float amount) {
+    private static boolean removeStamina(PlayerPatch playerPatch, float amount) {
         if (PlayerMovementProvider.of(playerPatch.getOriginal()).stamina().isDepleted()) {
             return false;
         }

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/identity/MeteorSlamSkillMixin.java

@@ -54,7 +54,7 @@ private void modifyStaminaSources(SkillContainer container, SkillExecuteEvent ev
         else {
             this.consumption = (float) (MathUtils.getAttackStaminaCost(serverPlayerPatch.getOriginal()) * ConfigManager.SERVER_CONFIG.meteorSlamMultiplier());
             ((StaminaOverride) playerMovement.stamina()).performingAction(true);
-            serverPlayerPatch.setStamina(this.consumption);
+            ((StaminaOverride) playerMovement.stamina()).setActionStaminaCost((int) this.consumption);
         }
     }
 

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/mover/DemolitionLeapMixin.java

@@ -34,7 +34,8 @@ private void modifyCharginStaminaCost(PlayerPatch<?> caster, CallbackInfo ci) {
             if (caster.getStamina() > totalStaminaConsumption) {
                 if (playerMovement instanceof ServerPlayerMovement) {
                     ((StaminaOverride) playerMovement.stamina()).performingAction(true);
-                    caster.setStamina(this.consumption);
+                    ((StaminaOverride) playerMovement.stamina()).setActionStaminaCost((int) this.consumption);
+//                    caster.setStamina(this.consumption);
                 }
 
                 caster.setChargingAmount(caster.getChargingAmount() + 5);

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/passive/EmergencyEscapeSkillMixin.java

@@ -1,6 +1,5 @@
 package com.cravencraft.epicparagliders.mixins.epicfight.skills.passive;
 
-import com.cravencraft.epicparagliders.EpicParaglidersMod;
 import com.cravencraft.epicparagliders.capabilities.StaminaOverride;
 import com.cravencraft.epicparagliders.utils.MathUtils;
 import org.spongepowered.asm.mixin.Mixin;
@@ -56,7 +55,6 @@ private void getPlayerPatch(SkillContainer container, SkillConsumeEvent event, C
 
             if (!container.getExecuter().getOriginal().isCreative() && playerMovement.stamina().isDepleted() && container.getStack() > 0) {
                 if (!container.getExecuter().isLogicalClient()) {
-                    EpicParaglidersMod.LOGGER.info("PERFORMING EMERGENCY ESCAPE DODGE.");
                     ((StaminaOverride) playerMovement.stamina()).performingAction(true);
                     ((StaminaOverride) playerMovement.stamina()).setActionStaminaCost((int) actualConsumption);
                     this.setStackSynchronize((ServerPlayerPatch)container.getExecuter(), container.getStack() - 1);

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/passive/HyperVitalitySkillMixin.java

@@ -18,7 +18,6 @@
 import yesman.epicfight.skill.SkillSlots;
 import yesman.epicfight.skill.passive.HyperVitalitySkill;
 import yesman.epicfight.skill.passive.PassiveSkill;
-import yesman.epicfight.skill.weaponinnate.LiechtenauerSkill;
 import yesman.epicfight.world.capabilities.entitypatch.player.PlayerPatch;
 import yesman.epicfight.world.entity.eventlistener.SkillConsumeEvent;
 
@@ -53,7 +52,7 @@ private void getPlayerPatch(SkillContainer container, SkillConsumeEvent event, C
 
                         // Since the liechtenauer skill can be disabled once enabled, this prevents the skill from draining
                         // stamina again to disable it.
-                        if (!container.isActivated() && event.getSkill() instanceof LiechtenauerSkill) {
+                        if (!container.isActivated()) {
                             ((StaminaOverride) playerMovement.stamina()).performingAction(true);
                             ((StaminaOverride) playerMovement.stamina()).setActionStaminaCost((int) (MathUtils.getAttackStaminaCost(playerpatch.getOriginal()) * ConfigManager.SERVER_CONFIG.hyperVitalityMultiplier()));
                             EpicFightNetworkManager.sendToPlayer(SPSkillExecutionFeedback.executed(container.getSlotId()), (ServerPlayer)playerpatch.getOriginal());

src/main/java/com/cravencraft/epicparagliders/mixins/epicfight/skills/passive/StaminaPillagerSkillMixin.java

@@ -1,6 +1,5 @@
 package com.cravencraft.epicparagliders.mixins.epicfight.skills.passive;
 
-import com.cravencraft.epicparagliders.EpicParaglidersMod;
 import com.cravencraft.epicparagliders.config.ConfigManager;
 import com.cravencraft.epicparagliders.capabilities.StaminaOverride;
 import com.cravencraft.epicparagliders.utils.MathUtils;
@@ -38,7 +37,7 @@ private void getPlayerPatch(DealtDamageEvent.Damage event, CallbackInfo ci) {
 
             int trueTotalMissing = (int) (MathUtils.calculateTriangularNumber(botwStamina.getTotalActionStaminaCost()) + (playerMovement.stamina().maxStamina() - playerMovement.stamina().stamina()));
             botwStamina.performingAction(true);
-            event.getPlayerPatch().setStamina(-(int) (MathUtils.calculateModifiedTriangularRoot(trueTotalMissing, staminaPillagerPercentModifier)));
+            botwStamina.setActionStaminaCost(-(int) (MathUtils.calculateModifiedTriangularRoot(trueTotalMissing, staminaPillagerPercentModifier)));
         }
         ci.cancel();
     }

src/main/resources/mixins.epicparagliders.json

@@ -10,6 +10,7 @@
     "epicfight.capabilities.ServerPlayerPatchMixin",
     "epicfight.skills.AirAttackMixin",
     "epicfight.skills.BasicAttackMixin",
+    "epicfight.skills.SkillMixin",
     "epicfight.skills.SkillResourceMixin",
     "epicfight.skills.dodge.DodgeSkillMixin",
     "epicfight.skills.guard.GuardSkillMixin",
@@ -20,7 +21,6 @@
     "epicfight.skills.passive.EnduranceSkillMixin",
     "epicfight.skills.passive.ForbiddenStrengthSkillMixin",
     "epicfight.skills.passive.HyperVitalitySkillMixin",
-    "epicfight.skills.SkillMixin",
     "epicfight.skills.passive.StaminaPillagerSkillMixin",
     "epicfight.skills.passive.TechnicianSkillMixin",
     "paragliders.stamina.BotWStaminaMixin",