Skip to content
Open
Show file tree
Hide file tree
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 Nov 8, 2025
03ced03
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Nov 8, 2025
30610df
stripped some comments
SprainedSpark89 Nov 8, 2025
76ae48d
Merge branch 'main' of https://github.com/SprainedSpark89/ViaFabricPlus
SprainedSpark89 Nov 8, 2025
4d34a1f
even less comments
SprainedSpark89 Nov 8, 2025
bcd8269
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Nov 12, 2025
d3ec984
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Nov 15, 2025
a0a0b8f
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Nov 20, 2025
af8803f
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Nov 22, 2025
e51cbad
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Nov 26, 2025
d4a3386
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Nov 28, 2025
b370911
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 2, 2025
c38bba2
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 3, 2025
86997cb
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 6, 2025
501af86
Move to Mojang (official) mappings
florianreuth Dec 8, 2025
8480ef4
Merge branch 'main' into new
SprainedSpark89 Dec 11, 2025
6087347
Merge pull request #5 from SprainedSpark89/new
SprainedSpark89 Dec 11, 2025
64b8f03
Remapped to mojang
SprainedSpark89 Dec 11, 2025
57d12fa
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 12, 2025
9a06638
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 13, 2025
12d938b
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 14, 2025
fc8d8fe
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 14, 2025
aacb634
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 14, 2025
0bceaf7
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 17, 2025
811c900
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 18, 2025
b7b20a8
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 20, 2025
7e049b4
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 20, 2025
a901bc5
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 20, 2025
14a5e95
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 20, 2025
2f41e86
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 20, 2025
b080950
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 20, 2025
8c51ee8
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 21, 2025
19345e5
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 26, 2025
714f4cb
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 26, 2025
9d8fc30
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 28, 2025
be40769
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Dec 29, 2025
5670d8c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 4, 2026
199fb2e
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 4, 2026
391d8d9
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 6, 2026
4db4ce7
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 10, 2026
def89ed
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 11, 2026
ec89b4e
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 11, 2026
58398f7
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 11, 2026
885e671
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 17, 2026
aeed9f6
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 18, 2026
d9293d1
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 19, 2026
2b4492d
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 22, 2026
d46e1ef
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 24, 2026
6107999
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 25, 2026
6619838
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Jan 30, 2026
a139b94
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 2, 2026
681ae12
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 7, 2026
8418342
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 7, 2026
739cf0d
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 10, 2026
fe78175
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 13, 2026
d617d36
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 15, 2026
5b569e0
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 16, 2026
50d681c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 16, 2026
dd9fa33
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 16, 2026
8dc5f7a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 18, 2026
90a98e4
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 19, 2026
17832d2
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 20, 2026
1c30c86
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Feb 25, 2026
0c8bf79
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 2, 2026
b010410
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 3, 2026
92ee2bf
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 4, 2026
18dcd7a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 11, 2026
3ba9310
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 14, 2026
846533a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 15, 2026
a43cd0c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 15, 2026
c0fa128
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 18, 2026
45fa6b5
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 21, 2026
35a720c
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 21, 2026
d605f3d
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 24, 2026
d36c29a
Merge branch 'ViaVersion:main' into main
SprainedSpark89 Mar 26, 2026
b735332
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Mar 31, 2026
494021f
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 1, 2026
775acd3
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 3, 2026
425a4bb
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 5, 2026
f0338bc
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 6, 2026
090b445
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 9, 2026
cfe6298
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 9, 2026
ed96570
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 9, 2026
68df653
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 9, 2026
2389223
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 9, 2026
a031494
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 13, 2026
84a0d8b
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Apr 20, 2026
4b3300b
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 2, 2026
cb51e4f
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 4, 2026
00b3476
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 9, 2026
6a766ad
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 9, 2026
b6f6f5d
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 9, 2026
bd95347
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 19, 2026
25491f5
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 20, 2026
a720348
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 23, 2026
12a0607
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 23, 2026
0b3363e
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 25, 2026
7277267
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 May 31, 2026
5e18d84
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 1, 2026
e8cc0f2
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 5, 2026
dc38b7c
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 6, 2026
2367d24
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 7, 2026
590db94
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 13, 2026
8e2414e
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 14, 2026
9cfb9a3
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 14, 2026
cc8abed
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 19, 2026
efcfa96
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 19, 2026
c3db8a2
Merge branch 'ViaVersion:ver/26.1' into main
SprainedSpark89 Jun 19, 2026
3760471
Accounted for CameraRenderState Move
SprainedSpark89 Jun 19, 2026
7afd894
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 19, 2026
ea08567
New Setting to attempt to reduce random bobbing
SprainedSpark89 Jun 20, 2026
7638114
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 21, 2026
10ea862
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 21, 2026
db8e26e
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 22, 2026
9153d7c
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 22, 2026
11d683a
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 23, 2026
87977ee
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 28, 2026
d796464
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jun 29, 2026
3ca112f
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 2, 2026
b74e392
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 4, 2026
b27d1e9
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 5, 2026
c2f1f83
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 6, 2026
e1a8d3c
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 6, 2026
8558991
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 7, 2026
f923ded
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 9, 2026
c45f8d0
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 10, 2026
f97b4fd
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 12, 2026
006e988
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 15, 2026
2dd19db
Major fix
SprainedSpark89 Jul 19, 2026
b779b90
Merge branch 'ViaVersion:ver/26.2' into main
SprainedSpark89 Jul 25, 2026
30574d7
Fixed Package
SprainedSpark89 Jul 25, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package io.github.sprainedspark89.c0._30ify.client.mixin;
Comment thread
SprainedSpark89 marked this conversation as resolved.
Outdated

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
);

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public final class VisualSettings extends SettingGroup {
// a1.0.15 -> c0_28/c0_30
public final VersionedBooleanSetting replaceCreativeInventory = new VersionedBooleanSetting(this, Component.translatable("visual_settings.viafabricplus.replace_creative_inventory_with_classic_inventory"), ProtocolVersionRange.andOlder(LegacyProtocolVersion.c0_28toc0_30));
public final VersionedBooleanSetting oldWalkingAnimation = new VersionedBooleanSetting(this, Component.translatable("visual_settings.viafabricplus.old_walking_animation"), ProtocolVersionRange.andOlder(LegacyProtocolVersion.c0_28toc0_30));
public final VersionedBooleanSetting disableDamageAnimationJump = new VersionedBooleanSetting(this, Component.translatable("visual_settings.viafabricplus.disable_damage_animation_jump"), ProtocolVersionRange.andOlder(LegacyProtocolVersion.c0_28toc0_30));

public VisualSettings() {
super(Component.translatable("setting_group_name.viafabricplus.visual"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"client": [
"classic.creative_menu.MixinCreativeModeInventoryScreen",
"classic.walking_animation.MixinHumanoidModel",
"classic.walking_animation.MixinLivingEntityRenderer",
"classic.animation_jump.MixinLivingEntity",
"filter_game_mode_selections.MixinGameModeSwitcherScreen",
"filter_game_mode_selections.MixinGameModeSwitcherScreen_GameModeIcon",
"force_unicode_font.MixinLanguageManager",
Expand Down