Skip to content

1.21.11 support #16

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.

Sign up for GitHub

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

Merged
enjarai merged 3 commits into from
Jan 5, 2026
Merged

1.21.11 support #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab9eb6b
Ported to 1.21.11, tested with LAN successfully.
pq-on-tempe2 Jan 4, 2026
93725ae
Small fix that fixes things (aligns with https://github.com/FabricMC/…
pq-on-tempe2 Jan 5, 2026
78a9f02
mrraow
enjarai Jan 5, 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
10 changes: 5 additions & 5 deletions fabric/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Fabric Properties
# check these on https://fabricmc.net/develop
yarn_mappings=1.21.10+build.3
yarn_mappings=1.21.11+build.3
loader_version=0.18.4

# Mod Properties
mod_version=1.0.6
archives_base_name=headpats

# Dependencies
fabric_version=0.138.4+1.21.10
fabric_version=0.140.2+1.21.11

deps.cicada=0.14.3+1.21.9-1.21.10
deps.cardinal-components-api=7.2.0
deps.modmenu=16.0.0-rc.2
deps.yacl=3.8.1+1.21.10-fabric
deps.cardinal-components-api=7.3.0
deps.modmenu=17.0.0-beta.1
deps.yacl=3.8.1+1.21.11-fabric
10 changes: 5 additions & 5 deletions fabric/src/main/java/dev/enjarai/headpats/PetRendering.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public static void modifyHandMatrix(PlayerEntity player, float tickDelta, Matrix
var petTime = MathHelper.lerp(tickDelta, (float) petting.prevPettingTicks, (float) petting.pettingTicks);
var multiplier = MathHelper.lerp(tickDelta, petting.prevPettingMultiplier, petting.pettingMultiplier);
matrices.translate(player.getMainArm() == Arm.RIGHT ? 1 : -1, -1, 0);
matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(MathHelper.sin(petTime * 0.4f) * 16.0f * multiplier));
matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees((float) Math.sin(petTime * 0.4f) * 16.0f * multiplier));
matrices.translate(player.getMainArm() == Arm.RIGHT ? -1 : 1, 1, 0);
}
}
Expand All @@ -45,10 +45,10 @@ public static void setPetAngles(EntityRenderState state, ModelPart rightArm, Mod

if (arm == Arm.RIGHT) {
rightArm.pitch = rightArm.pitch * (1 - pettingMultiplier) - pettingMultiplier * 2.1f;
rightArm.yaw = rightArm.yaw * (1 - pettingMultiplier) - MathHelper.sin(pettingTime * 0.4f) * pettingMultiplier * 0.5f;
rightArm.yaw = rightArm.yaw * (1 - pettingMultiplier) - (float) Math.sin(pettingTime * 0.4f) * pettingMultiplier * 0.5f;
} else {
leftArm.pitch = leftArm.pitch * (1 - pettingMultiplier) - pettingMultiplier * 2.1f;
leftArm.yaw = leftArm.yaw * (1 - pettingMultiplier) - MathHelper.sin(pettingTime * 0.4f) * pettingMultiplier * 0.5f;
leftArm.yaw = leftArm.yaw * (1 - pettingMultiplier) - (float) Math.sin(pettingTime * 0.4f) * pettingMultiplier * 0.5f;
}
}

Expand All @@ -57,7 +57,7 @@ public static void setPetAngles(EntityRenderState state, ModelPart rightArm, Mod

if (pettedMultiplier > 0) {
head.pitch += pettedMultiplier * 0.4f;
head.roll = -MathHelper.sin(pettedTime * 0.4f) * pettedMultiplier * 0.15f;
head.roll = -(float) Math.sin(pettedTime * 0.4f) * pettedMultiplier * 0.15f;
} else {
head.roll = 0;
}
Expand All @@ -81,7 +81,7 @@ public static void fixFirstPersonAngles(PlayerEntity player, float tickDelta, Mo
var petTime = MathHelper.lerp(tickDelta, (float) petting.prevPettedTicks, (float) petting.pettedTicks);
var multiplier = MathHelper.lerp(tickDelta, petting.prevPettedMultiplier, petting.pettedMultiplier);

return -MathHelper.sin(petTime * 0.4f) * multiplier * 0.1f * (float) finalFirstPersonSwayStrength;
return -(float) Math.sin(petTime * 0.4f) * multiplier * 0.1f * (float) finalFirstPersonSwayStrength;
}

return null;
Expand Down
6 changes: 3 additions & 3 deletions fabric/src/main/java/dev/enjarai/headpats/mixin/BipedEntityModelMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ public class BipedEntityModelMixin<T extends LivingEntityRenderState> {
@Shadow @Final public ModelPart head;

@Inject(
method = "setAngles(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;)V",
method = "animateArms(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;)V", //"setAngles(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;)V",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/render/entity/model/BipedEntityModel;animateArms(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;F)V"
value = "HEAD"
//target = "Lnet/minecraft/client/render/entity/model/BipedEntityModel;animateArms(Lnet/minecraft/client/render/entity/state/BipedEntityRenderState;F)V"
)
)
protected void positionModelParts(BipedEntityRenderState bipedEntityRenderState, CallbackInfo ci) {
Expand Down
4 changes: 2 additions & 2 deletions fabric/src/main/java/dev/enjarai/headpats/mixin/CameraMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import net.minecraft.client.render.Camera;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.world.BlockView;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -25,7 +25,7 @@ public class CameraMixin {
ordinal = 1
)
)
private void calculateRoll(BlockView area, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) {
private void calculateRoll(World world, Entity focusedEntity, boolean thirdPerson, boolean inverseView, float tickDelta, CallbackInfo ci) {
if (focusedEntity instanceof PlayerEntity player) {
newRoll = PetRendering.getCameraRoll(player, tickDelta);
}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true

minecraft_version=1.21.10
minecraft_version=1.21.11

maven_group=dev.enjarai

publish_target_min=1.21.10
publish_target_max=1.21.10
publish_target_min=1.21.11
publish_target_max=1.21.11
mod_modrinth=vETxChiy
mod_github=enjarai/headpats
git_branch=master
Loading