-
-
Notifications
You must be signed in to change notification settings - Fork 83
Fix: Classic Walking Animation #1261
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
SprainedSpark89
wants to merge
131
commits into
ViaVersion:ver/26.2
Choose a base branch
from
SprainedSpark89:main
base: ver/26.2
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 130 commits
Commits
Show all changes
131 commits
Select commit
Hold shift + click to select a range
b5fe80b
may i introduce the worst fork ever!
SprainedSpark89 03ced03
Merge branch 'ViaVersion:main' into main
SprainedSpark89 30610df
stripped some comments
SprainedSpark89 76ae48d
Merge branch 'main' of https://github.com/SprainedSpark89/ViaFabricPlus
SprainedSpark89 4d34a1f
even less comments
SprainedSpark89 bcd8269
Merge branch 'ViaVersion:main' into main
SprainedSpark89 d3ec984
Merge branch 'ViaVersion:main' into main
SprainedSpark89 a0a0b8f
Merge branch 'ViaVersion:main' into main
SprainedSpark89 af8803f
Merge branch 'ViaVersion:main' into main
SprainedSpark89 e51cbad
Merge branch 'ViaVersion:main' into main
SprainedSpark89 d4a3386
Merge branch 'ViaVersion:main' into main
SprainedSpark89 b370911
Merge branch 'ViaVersion:main' into main
SprainedSpark89 c38bba2
Merge branch 'ViaVersion:main' into main
SprainedSpark89 86997cb
Merge branch 'ViaVersion:main' into main
SprainedSpark89 501af86
Move to Mojang (official) mappings
florianreuth 8480ef4
Merge branch 'main' into new
SprainedSpark89 6087347
Merge pull request #5 from SprainedSpark89/new
SprainedSpark89 64b8f03
Remapped to mojang
SprainedSpark89 57d12fa
Merge branch 'ViaVersion:main' into main
SprainedSpark89 9a06638
Merge branch 'ViaVersion:main' into main
SprainedSpark89 12d938b
Merge branch 'ViaVersion:main' into main
SprainedSpark89 fc8d8fe
Merge branch 'ViaVersion:main' into main
SprainedSpark89 aacb634
Merge branch 'ViaVersion:main' into main
SprainedSpark89 0bceaf7
Merge branch 'ViaVersion:main' into main
SprainedSpark89 811c900
Merge branch 'ViaVersion:main' into main
SprainedSpark89 b7b20a8
Merge branch 'ViaVersion:main' into main
SprainedSpark89 7e049b4
Merge branch 'ViaVersion:main' into main
SprainedSpark89 a901bc5
Merge branch 'ViaVersion:main' into main
SprainedSpark89 14a5e95
Merge branch 'ViaVersion:main' into main
SprainedSpark89 2f41e86
Merge branch 'ViaVersion:main' into main
SprainedSpark89 b080950
Merge branch 'ViaVersion:main' into main
SprainedSpark89 8c51ee8
Merge branch 'ViaVersion:main' into main
SprainedSpark89 19345e5
Merge branch 'ViaVersion:main' into main
SprainedSpark89 714f4cb
Merge branch 'ViaVersion:main' into main
SprainedSpark89 9d8fc30
Merge branch 'ViaVersion:main' into main
SprainedSpark89 be40769
Merge branch 'ViaVersion:main' into main
SprainedSpark89 5670d8c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 199fb2e
Merge branch 'ViaVersion:main' into main
SprainedSpark89 391d8d9
Merge branch 'ViaVersion:main' into main
SprainedSpark89 4db4ce7
Merge branch 'ViaVersion:main' into main
SprainedSpark89 def89ed
Merge branch 'ViaVersion:main' into main
SprainedSpark89 ec89b4e
Merge branch 'ViaVersion:main' into main
SprainedSpark89 58398f7
Merge branch 'ViaVersion:main' into main
SprainedSpark89 885e671
Merge branch 'ViaVersion:main' into main
SprainedSpark89 aeed9f6
Merge branch 'ViaVersion:main' into main
SprainedSpark89 d9293d1
Merge branch 'ViaVersion:main' into main
SprainedSpark89 2b4492d
Merge branch 'ViaVersion:main' into main
SprainedSpark89 d46e1ef
Merge branch 'ViaVersion:main' into main
SprainedSpark89 6107999
Merge branch 'ViaVersion:main' into main
SprainedSpark89 6619838
Merge branch 'ViaVersion:main' into main
SprainedSpark89 a139b94
Merge branch 'ViaVersion:main' into main
SprainedSpark89 681ae12
Merge branch 'ViaVersion:main' into main
SprainedSpark89 8418342
Merge branch 'ViaVersion:main' into main
SprainedSpark89 739cf0d
Merge branch 'ViaVersion:main' into main
SprainedSpark89 fe78175
Merge branch 'ViaVersion:main' into main
SprainedSpark89 d617d36
Merge branch 'ViaVersion:main' into main
SprainedSpark89 5b569e0
Merge branch 'ViaVersion:main' into main
SprainedSpark89 50d681c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 dd9fa33
Merge branch 'ViaVersion:main' into main
SprainedSpark89 8dc5f7a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 90a98e4
Merge branch 'ViaVersion:main' into main
SprainedSpark89 17832d2
Merge branch 'ViaVersion:main' into main
SprainedSpark89 1c30c86
Merge branch 'ViaVersion:main' into main
SprainedSpark89 0c8bf79
Merge branch 'ViaVersion:main' into main
SprainedSpark89 b010410
Merge branch 'ViaVersion:main' into main
SprainedSpark89 92ee2bf
Merge branch 'ViaVersion:main' into main
SprainedSpark89 18dcd7a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 3ba9310
Merge branch 'ViaVersion:main' into main
SprainedSpark89 846533a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 a43cd0c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 c0fa128
Merge branch 'ViaVersion:main' into main
SprainedSpark89 45fa6b5
Merge branch 'ViaVersion:main' into main
SprainedSpark89 35a720c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 d605f3d
Merge branch 'ViaVersion:main' into main
SprainedSpark89 d36c29a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 b735332
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 494021f
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 775acd3
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 425a4bb
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 f0338bc
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 090b445
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 cfe6298
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 ed96570
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 68df653
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 2389223
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 a031494
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 84a0d8b
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 4b3300b
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 cb51e4f
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 00b3476
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 6a766ad
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 b6f6f5d
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 bd95347
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 25491f5
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 a720348
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 12a0607
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 0b3363e
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 7277267
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 5e18d84
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 e8cc0f2
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 dc38b7c
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 2367d24
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 590db94
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 8e2414e
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 9cfb9a3
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 cc8abed
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 efcfa96
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 c3db8a2
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 3760471
Accounted for CameraRenderState Move
SprainedSpark89 7afd894
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 ea08567
New Setting to attempt to reduce random bobbing
SprainedSpark89 7638114
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 10ea862
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 db8e26e
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 9153d7c
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 11d683a
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 87977ee
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 d796464
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 3ca112f
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 b74e392
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 b27d1e9
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 c2f1f83
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 e1a8d3c
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 8558991
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 f923ded
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 c45f8d0
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 f97b4fd
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 006e988
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 2dd19db
Major fix
SprainedSpark89 b779b90
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 30574d7
Fixed Package
SprainedSpark89 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
35 changes: 35 additions & 0 deletions
35
...rsion/viafabricplus/visuals/injection/mixin/classic/animation_jump/MixinLivingEntity.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package com.viaversion.viafabricplus.visuals.injection.mixin.classic.animation_jump; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Redirect; | ||
|
|
||
| import com.viaversion.viafabricplus.visuals.settings.VisualSettings; | ||
|
|
||
| import net.minecraft.world.entity.Entity; | ||
| import net.minecraft.world.entity.EntityType; | ||
| import net.minecraft.world.entity.LivingEntity; | ||
| import net.minecraft.world.entity.WalkAnimationState; | ||
| import net.minecraft.world.level.Level; | ||
|
|
||
| @Mixin(LivingEntity.class) | ||
| public abstract class MixinLivingEntity extends Entity { | ||
|
|
||
| protected MixinLivingEntity(EntityType<?> type, Level level) { | ||
| super(type, level); | ||
| } | ||
|
|
||
| @Redirect( | ||
| method = "handleDamageEvent", | ||
| at = @At( | ||
| value = "INVOKE", | ||
| target = "Lnet/minecraft/world/entity/WalkAnimationState;setSpeed(F)V" | ||
| ) | ||
| ) | ||
| private void noAnimationDamageSpeed(WalkAnimationState animation, float speed) { | ||
| if(!VisualSettings.INSTANCE.disableDamageAnimationJump.isEnabled()) { | ||
| animation.setSpeed(speed); | ||
| } | ||
| // Prevent damage animation from affecting walk speed | ||
| } | ||
| } |
41 changes: 41 additions & 0 deletions
41
...bricplus/visuals/injection/mixin/classic/walking_animation/MixinLivingEntityRenderer.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| package io.github.sprainedspark89.c0._30ify.client.mixin; | ||
|
|
||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.injection.At; | ||
| import org.spongepowered.asm.mixin.injection.Inject; | ||
| import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; | ||
|
|
||
| import net.minecraft.client.renderer.SubmitNodeCollector; | ||
| import net.minecraft.client.renderer.entity.LivingEntityRenderer; | ||
| import net.minecraft.client.renderer.entity.state.LivingEntityRenderState; | ||
| import net.minecraft.client.renderer.state.level.CameraRenderState; | ||
| import com.mojang.blaze3d.vertex.PoseStack; | ||
|
|
||
| @Mixin(LivingEntityRenderer.class) | ||
| // Nostalgic tweaks was a reference while making this code, i don't really don't do modern modding, so it was quite a good reference to help do this! | ||
| // check it out!: https://github.com/Nostalgica-Reverie/Nostalgic-Tweaks/blob/1.21/common/src/main/java/mod/adrenix/nostalgic/mixin/tweak/animation/player/LivingEntityRendererMixin.java | ||
| // https://github.com/Nostalgica-Reverie/Nostalgic-Tweaks/blob/1.21/common/src/main/java/mod/adrenix/nostalgic/helper/animation/ClassicWalkHelper.java | ||
| // this code also takes a bit from c0.30 and birevan's port they made for me, thx if i haven't said that before again | ||
| public class MixinLivingEntityRenderer { | ||
|
|
||
| @Inject( | ||
| method = "Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;submit(Lnet/minecraft/client/renderer/entity/state/LivingEntityRenderState;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/SubmitNodeCollector;Lnet/minecraft/client/renderer/state/level/CameraRenderState;)V", // targets the render method | ||
| at = @At( | ||
| ordinal = 1, | ||
| value = "INVOKE", | ||
| target = "Lcom/mojang/blaze3d/vertex/PoseStack;translate(FFF)V" | ||
| ) | ||
| ) | ||
| public <S extends LivingEntityRenderState> void oldBobbing(S livingEntityRenderState, PoseStack matrixStack, SubmitNodeCollector orderedRenderCommandQueue, CameraRenderState cameraRenderState, CallbackInfo callback) { | ||
|
|
||
| float pos = livingEntityRenderState.walkAnimationPos; | ||
| float speed = livingEntityRenderState.walkAnimationSpeed; | ||
|
|
||
| matrixStack.translate( | ||
| 0.0F, | ||
| -Math.abs(Math.cos(pos * 0.6662F)) * 0.3125F * speed, | ||
| 0.0F | ||
| ); | ||
|
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.