Fretux/KnockedBack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7 from Fretuks/implement-gripping-execution-animation

Browse Source 
Play execution animation during player executions
This commit is contained in:
Fretux
2026-01-07 17:49:57 +01:00
committed by GitHub
parent 976e73201e 10e6137e5d
commit da33479b6c
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/fretux/knockedback/client/PlayerAnimationHandler.java
+11 -9
View File
@@ -6,6 +6,7 @@ import dev.kosmx.playerAnim.api.layered.ModifierLayer;
import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationAccess;
import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry; import dev.kosmx.playerAnim.minecraftApi.PlayerAnimationRegistry;
import net.fretux.knockedback.KnockedBack; import net.fretux.knockedback.KnockedBack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.player.AbstractClientPlayer; import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
@@ -19,8 +20,8 @@ import java.util.UUID;
@Mod.EventBusSubscriber(modid = KnockedBack.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE) @Mod.EventBusSubscriber(modid = KnockedBack.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.FORGE)
public class PlayerAnimationHandler { public class PlayerAnimationHandler {
private static final ResourceLocation GRIP_ANIMATION_ID = private static final ResourceLocation EXECUTION_ANIMATION_ID =
ResourceLocation.fromNamespaceAndPath(KnockedBack.MOD_ID, "animation.model.gripping"); ResourceLocation.fromNamespaceAndPath(KnockedBack.MOD_ID, "animation.model.execution");
private static final Map<UUID, ModifierLayer<IAnimation>> layers = new HashMap<>(); private static final Map<UUID, ModifierLayer<IAnimation>> layers = new HashMap<>();
private static final Map<UUID, Boolean> activeStates = new HashMap<>(); private static final Map<UUID, Boolean> activeStates = new HashMap<>();
@@ -28,18 +29,19 @@ public class PlayerAnimationHandler {
public static void onPlayerTick(TickEvent.PlayerTickEvent event) { public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
if (event.phase != TickEvent.Phase.END) return; if (event.phase != TickEvent.Phase.END) return;
if (!(event.player instanceof AbstractClientPlayer player)) return; if (!(event.player instanceof AbstractClientPlayer player)) return;
if (Minecraft.getInstance().player != player) return;
UUID playerId = player.getUUID(); UUID playerId = player.getUUID();
boolean shouldGrip = ClientGrippedState.isGripped(playerId); boolean shouldPlayExecution = ClientExecutionState.isExecuting();
boolean wasGripping = activeStates.getOrDefault(playerId, false); boolean wasPlaying = activeStates.getOrDefault(playerId, false);
if (shouldGrip == wasGripping) return; if (shouldPlayExecution == wasPlaying) return;
activeStates.put(playerId, shouldGrip); activeStates.put(playerId, shouldPlayExecution);
ModifierLayer<IAnimation> layer = layers.computeIfAbsent(playerId, id -> { ModifierLayer<IAnimation> layer = layers.computeIfAbsent(playerId, id -> {
ModifierLayer<IAnimation> newLayer = new ModifierLayer<>(); ModifierLayer<IAnimation> newLayer = new ModifierLayer<>();
PlayerAnimationAccess.getPlayerAnimLayer(player).addAnimLayer(0, newLayer); PlayerAnimationAccess.getPlayerAnimLayer(player).addAnimLayer(0, newLayer);
return newLayer; return newLayer;
}); });
if (shouldGrip) { if (shouldPlayExecution) {
var animation = PlayerAnimationRegistry.getAnimation(GRIP_ANIMATION_ID); var animation = PlayerAnimationRegistry.getAnimation(EXECUTION_ANIMATION_ID);
if (animation != null) { if (animation != null) {
layer.setAnimation(new KeyframeAnimationPlayer(animation)); layer.setAnimation(new KeyframeAnimationPlayer(animation));
} }
@@ -47,4 +49,4 @@ public class PlayerAnimationHandler {
layer.setAnimation(null); layer.setAnimation(null);
} }
} }
} }