PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2025-02-13 08:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '1.21' into 1.21.3

Browse source 
# Conflicts:
#	gradle.properties
#	src/main/java/com/minelittlepony/client/render/EquineRenderManager.java
#	src/main/java/com/minelittlepony/client/render/entity/feature/PassengerFeature.java
This commit is contained in:
Sollace 2024-12-15 18:57:34 +01:00
commit 9ef39b936c
No known key found for this signature in database
GPG key ID: E52FACE7B5C773DB
5 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -86,7 +86,7 @@ processResources {
filesMatching("fabric.mod.json") { filesMatching("fabric.mod.json") {
expand "version": project.version.toString(), expand "version": project.version.toString(),
"minecraftVersion": ">=${project.minecraft_version}", "minecraftVersion": project.minecraft_version_range,
"loaderVersion": ">=${project.loader_version}", "loaderVersion": ">=${project.loader_version}",
"fabricVersion": ">=${project.fabric_version}", "fabricVersion": ">=${project.fabric_version}",
"kirinVersion": ">=${project.kirin_version}", "kirinVersion": ">=${project.kirin_version}",

1
gradle.properties
View file

@ -15,6 +15,7 @@ org.gradle.daemon=false
description=Mine Little Pony turns players and mobs into ponies. Press F9 ingame to access settings. description=Mine Little Pony turns players and mobs into ponies. Press F9 ingame to access settings.
# Publishing # Publishing
minecraft_version_range=>=1.21.3 <1.21.4
modrinth_loader_type=fabric modrinth_loader_type=fabric
modrinth_project_id=JBjInUXM modrinth_project_id=JBjInUXM

2
src/main/java/com/minelittlepony/client/mixin/MixinPlayerEntity.java
View file

@ -28,6 +28,6 @@ abstract class MixinPlayerEntity implements RegistrationHandler {
@Inject(method = "tick()V", at = @At("TAIL")) @Inject(method = "tick()V", at = @At("TAIL"))
private void onTick(CallbackInfo info) { private void onTick(CallbackInfo info) {
syncedPony.synchronize((PlayerEntity)(Object)this); getSyncedPony().synchronize((PlayerEntity)(Object)this);
} }
} }

16
src/main/java/com/minelittlepony/client/render/entity/feature/PassengerFeature.java
View file

@ -54,15 +54,19 @@ public class PassengerFeature<
boolean left boolean left
) { ) {
matrices.push(); matrices.push();
float scale = 1/state.attributes.size.scaleFactor();
final double parrotModelHeight = 1.5;
getContextModel().transform(state, BodyPart.BACK, matrices); getContextModel().transform(state, BodyPart.BACK, matrices);
getContextModel().body.rotate(matrices); getContextModel().body.rotate(matrices);
float scale = 1 / state.attributes.size.scaleFactor();
matrices.scale(scale, scale, scale); matrices.translate(0, -1.28, 0);
matrices.translate(
left ? 0.25F : -0.25F,
state.isInSneakingPose ? -1.7F : -1.5F, 0
);
matrices.multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(left ? -5 : 5)); matrices.multiply(RotationAxis.NEGATIVE_Z.rotationDegrees(left ? -5 : 5));
matrices.translate(0, parrotModelHeight, 0);
matrices.scale(scale, scale, scale);
matrices.translate(left ? 0.25 : -0.25, -parrotModelHeight, 0.45);
parrotState.age = state.age; parrotState.age = state.age;
parrotState.limbFrequency = state.limbFrequency; parrotState.limbFrequency = state.limbFrequency;
parrotState.limbAmplitudeMultiplier = state.limbAmplitudeMultiplier; parrotState.limbAmplitudeMultiplier = state.limbAmplitudeMultiplier;

24
src/main/java/com/minelittlepony/client/transform/PonyTransformation.java
View file

@ -31,7 +31,6 @@ public enum PonyTransformation {
if (attributes.isCrouching) stack.translate(0, 0.1F, 0); if (attributes.isCrouching) stack.translate(0, 0.1F, 0);
break; break;
case BACK: case BACK:
translateForRider(stack);
break; break;
default: default:
} }
@ -69,7 +68,8 @@ public enum PonyTransformation {
stack.scale(1.1F, 1, 1.1F); stack.scale(1.1F, 1, 1.1F);
break; break;
case BACK: case BACK:
translateForRider(stack); stack.translate(0, -0.08F, -0.05F);
if (attributes.isLyingDown) stack.translate(0, -0.1F, 0);
break; break;
default: default:
} }
@ -107,7 +107,7 @@ public enum PonyTransformation {
stack.scale(0.9F, 1.12F, 0.9F); stack.scale(0.9F, 1.12F, 0.9F);
break; break;
case BACK: case BACK:
translateForRider(stack); stack.translate(0, -0.14F, -0.04F);
break; break;
} }
} }
@ -143,7 +143,7 @@ public enum PonyTransformation {
stack.scale(1.15F, 1.12F, 1.15F); stack.scale(1.15F, 1.12F, 1.15F);
break; break;
case BACK: case BACK:
translateForRider(stack); stack.translate(0, -0.15F, -0.04F);
break; break;
} }
} }
@ -173,7 +173,6 @@ public enum PonyTransformation {
stack.scale(1, 0.81F, 1); stack.scale(1, 0.81F, 1);
break; break;
case BACK: case BACK:
translateForRider(stack);
break; break;
default: default:
} }
@ -199,6 +198,7 @@ public enum PonyTransformation {
break; break;
case BODY: case BODY:
case TAIL: case TAIL:
case BACK:
stack.translate(0, -0.1F, 0); stack.translate(0, -0.1F, 0);
break; break;
case LEGS: case LEGS:
@ -206,9 +206,6 @@ public enum PonyTransformation {
stack.scale(1, 1.18F, 1); stack.scale(1, 1.18F, 1);
if (attributes.isGoingFast) stack.translate(0, 0.05F, 0); if (attributes.isGoingFast) stack.translate(0, 0.05F, 0);
break; break;
case BACK:
translateForRider(stack);
break;
} }
} }
}, },
@ -234,6 +231,7 @@ public enum PonyTransformation {
break; break;
case BODY: case BODY:
case TAIL: case TAIL:
case BACK:
stack.translate(0, -0.1F, 0); stack.translate(0, -0.1F, 0);
break; break;
case LEGS: case LEGS:
@ -241,9 +239,6 @@ public enum PonyTransformation {
stack.scale(1, 1.18F, 1); stack.scale(1, 1.18F, 1);
if (attributes.isGoingFast) stack.translate(0, 0.05F, 0); if (attributes.isGoingFast) stack.translate(0, 0.05F, 0);
break; break;
case BACK:
translateForRider(stack);
break;
} }
} }
}, },
@ -273,6 +268,10 @@ public enum PonyTransformation {
stack.scale(1.4F, 1.3F, 1); stack.scale(1.4F, 1.3F, 1);
if (attributes.isCrouching) stack.translate(0, -0.05F, 0); if (attributes.isCrouching) stack.translate(0, -0.05F, 0);
break; break;
case BACK:
stack.translate(0, 0.07F, 0);
if (attributes.isCrouching) stack.translate(0, -0.05F, 0);
break;
case TAIL: case TAIL:
stack.translate(0, -0.1F, 0); stack.translate(0, -0.1F, 0);
break; break;
@ -281,9 +280,6 @@ public enum PonyTransformation {
stack.scale(1.1F, 0.8F, 1.1F); stack.scale(1.1F, 0.8F, 1.1F);
if (attributes.isLyingDown) stack.translate(0, -0.1F, 0); if (attributes.isLyingDown) stack.translate(0, -0.1F, 0);
break; break;
case BACK:
translateForRider(stack);
break;
} }
} }
}; };