feat: update models, textures and add animation to the baby emperor

This commit is contained in:
TheClashFruit 2023-12-31 12:27:02 +01:00
parent 7d2e7c8e16
commit 377ef98b68
Signed by: TheClashFruit
GPG key ID: D61666AC77D1C29F
5 changed files with 360 additions and 132 deletions

View file

@ -25,10 +25,7 @@ import org.jetbrains.annotations.Nullable;
import software.bernie.geckolib.animatable.GeoEntity;
import software.bernie.geckolib.core.animatable.GeoAnimatable;
import software.bernie.geckolib.core.animatable.instance.AnimatableInstanceCache;
import software.bernie.geckolib.core.animation.AnimatableManager;
import software.bernie.geckolib.core.animation.AnimationController;
import software.bernie.geckolib.core.animation.AnimationState;
import software.bernie.geckolib.core.animation.RawAnimation;
import software.bernie.geckolib.core.animation.*;
import software.bernie.geckolib.core.object.PlayState;
import software.bernie.geckolib.util.GeckoLibUtil;
@ -75,12 +72,14 @@ public class BabyEmperorEntity extends AnimalEntity implements GeoEntity {
}
protected <E extends BabyEmperorEntity> PlayState predicate(final AnimationState<E> event) {
// if(event.isMoving())
// return event.setAndContinue(
// RawAnimation.begin().thenLoop("animation.baby_emperor.walk")
// );
if(event.isMoving())
return event.setAndContinue(
RawAnimation.begin().thenLoop("animation.arctic.baby_emperor.walking")
);
return PlayState.STOP;
event.getController().setAnimation(RawAnimation.begin().then("animation.arctic.baby_emperor.idle.raise_arms", Animation.LoopType.LOOP));
return PlayState.CONTINUE;
}
@Override

View file

@ -1,7 +1,189 @@
{
"format_version": "1.8.0",
"animations": {
"animation.arctic.baby_emperor.idle.raise_arms": {
"animation_length": 1.25,
"bones": {
"Body": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.625": {
"vector": [-1, 0, 0],
"easing": "easeOutBack"
},
"1.25": {
"vector": [0, 0, 0],
"easing": "easeInOutBack"
}
}
},
"LeftArm": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0, -15, -35],
"easing": "easeOutBack"
},
"0.75": {
"vector": [0, -15, -35],
"easing": "easeInOutBack"
},
"1.25": {
"vector": [0, 0, 0],
"easing": "easeInOutBack"
}
}
},
"RightArm": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0, 15, 35],
"easing": "easeOutBack"
},
"0.75": {
"vector": [0, 15, 35],
"easing": "easeInOutBack"
},
"1.25": {
"vector": [0, 0, 0],
"easing": "easeInOutBack"
}
}
},
"Foots": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.625": {
"vector": [1, 0, 0],
"easing": "easeOutBack"
},
"1.25": {
"vector": [0, 0, 0],
"easing": "easeInOutBack"
}
}
}
}
},
"animation.arctic.baby_emperor.walking": {
"loop": true,
"animation_length": 1,
"bones": {
"LeftFoot": {
"rotation": {
"0.5": {
"vector": [0, 0, 0]
},
"0.75": {
"vector": [-10, 0, 0],
"easing": "easeInBack"
},
"0.9583": {
"vector": [0, 0, 0],
"easing": "easeInBack"
}
},
"position": {
"0.5": {
"vector": [0, 0, 0]
},
"0.75": {
"vector": [0, 0.5, 0],
"easing": "easeInBack"
},
"1.0": {
"vector": [0, 0, 0],
"easing": "easeInBack"
}
}
},
"RightFoot": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.25": {
"vector": [-10, 0, 0],
"easing": "easeInBack"
},
"0.4583": {
"vector": [0, 0, 0],
"easing": "easeInBack"
}
},
"position": {
"0.0": {
"vector": [0, 0, 0]
},
"0.25": {
"vector": [0, 0.5, 0],
"easing": "easeInBack"
},
"0.5": {
"vector": [0, 0, 0],
"easing": "easeInBack"
}
}
},
"Body": {
"rotation": {
"0.0": {
"vector": [-2.5, 0, 0.10912]
},
"0.5": {
"vector": [1, 0, 0.10912],
"easing": "easeInOutBack"
},
"1.0": {
"vector": [-2.5, 0, 0.10912],
"easing": "easeInCubic"
}
}
},
"LeftArm": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0, 0, -7.5],
"easing": "easeInOutCubic"
},
"1.0": {
"vector": [0, 0, 0],
"easing": "easeInOutCubic"
}
}
},
"RightArm": {
"rotation": {
"0.0": {
"vector": [0, 0, 0]
},
"0.5": {
"vector": [0, 0, 7.5],
"easing": "easeInOutCubic"
},
"1.0": {
"vector": [0, 0, 0],
"easing": "easeInOutCubic"
}
}
}
}
},
"animation.arctic.baby_emperor.running": {
"loop": true
}
},
"geckolib_format_version": 2
}

View file

@ -7,12 +7,20 @@
"texture_width": 64,
"texture_height": 64,
"visible_bounds_width": 2,
"visible_bounds_height": 3.5,
"visible_bounds_offset": [0, 1.25, 0]
"visible_bounds_height": 2.5,
"visible_bounds_offset": [0, 0.75, 0]
},
"bones": [
{
"name": "Body",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [-3.75, 0.55, -2.8], "size": [7.5, 10, 6], "pivot": [0, 0, 0], "rotation": [1, 0, 0], "uv": [0, 0]}
]
},
{
"name": "Head",
"parent": "Body",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [-3, 10.5, -2.75], "size": [6, 5, 5.5], "uv": [0, 16]}
@ -26,16 +34,9 @@
{"origin": [-1, 11.35, -4], "size": [2, 1, 2], "pivot": [0, 11.6, -2], "rotation": [7.5, 0, 0], "uv": [22, 3]}
]
},
{
"name": "BodyAll",
"pivot": [0, 5.5, 0],
"cubes": [
{"origin": [-4, 0.5, -3], "size": [8, 10, 6], "uv": [0, 0]}
]
},
{
"name": "Tail",
"parent": "BodyAll",
"parent": "Body",
"pivot": [0, 0.5, 2.5],
"cubes": [
{"origin": [-1.5, 0.5, 2.5], "size": [3, 1, 2], "pivot": [0, 0.5, 2.5], "rotation": [-5, 0, 0], "uv": [22, 0]}
@ -43,43 +44,44 @@
},
{
"name": "Arms",
"parent": "BodyAll",
"parent": "Body",
"pivot": [-4, 10.5, 0]
},
{
"name": "RightArm",
"parent": "Arms",
"pivot": [4, 10.5, 0],
"cubes": [
{"origin": [3.25, 2.2, -2.75], "size": [1, 8.25, 5.5], "pivot": [4, 10.5, 0], "rotation": [0, 0, -5], "uv": [24, 11]}
]
},
{
"name": "LeftArm",
"parent": "Arms",
"pivot": [-4, 10.5, 0],
"pivot": [4, 10.5, 0],
"cubes": [
{"origin": [-4.25, 2.2, -2.75], "size": [1, 8.25, 5.5], "pivot": [-4, 10.5, 0], "rotation": [0, 0, 5], "uv": [17, 21]}
{"origin": [3.25, 2.2, -1.5], "size": [1, 8.25, 3.5], "pivot": [4, 10.5, 0], "rotation": [-2.5, 0, -5], "uv": [26, 13]}
]
},
{
"name": "Feet",
"name": "RightArm",
"parent": "Arms",
"pivot": [-4, 10.5, 0],
"cubes": [
{"origin": [-4.25, 2.2, -1.5], "size": [1, 8.25, 3.5], "pivot": [-4, 10.5, 0], "rotation": [-2.5, 0, 5], "uv": [19, 23]}
]
},
{
"name": "Foots",
"parent": "Body",
"pivot": [0, 0, 0]
},
{
"name": "LeftFoot",
"parent": "Feet",
"parent": "Foots",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [0.5, 0, -3.75], "size": [3, 1, 6], "pivot": [0, 0, 0], "rotation": [2.5, -2.5, 0], "uv": [0, 28]}
{"origin": [0.5, 0, -4.25], "size": [3, 1, 6.5], "pivot": [0, 0, 0], "rotation": [2.5, -2.5, 0], "uv": [0, 28]}
]
},
{
"name": "RightFoot",
"parent": "Feet",
"parent": "Foots",
"pivot": [0, 0, 0],
"cubes": [
{"origin": [-3.5, 0, -3.75], "size": [3, 1, 6], "pivot": [0, 0, 0], "rotation": [2.5, 2.5, 0], "uv": [28, 0]}
{"origin": [-3.5, 0, -4.25], "size": [3, 1, 6.5], "pivot": [0, 0, 0], "rotation": [2.5, 2.5, 0], "uv": [28, 0]}
]
}
]

View file

@ -11,8 +11,27 @@
"visible_bounds_offset": [0, 0.75, 0]
},
"bones": [
{
"name": "Body",
"pivot": [0, 10, 15.5],
"cubes": [
{
"origin": [-7, 0, -3.5],
"size": [14, 9, 21],
"uv": {
"north": {"uv": [35, 12], "uv_size": [14, 9]},
"east": {"uv": [21, 0], "uv_size": [9, 21]},
"south": {"uv": [35, 12], "uv_size": [14, 9]},
"west": {"uv": [21, 0], "uv_size": [9, 21]},
"up": {"uv": [21, 0], "uv_size": [14, 21]},
"down": {"uv": [21, 21], "uv_size": [14, -21]}
}
}
]
},
{
"name": "Head",
"parent": "Body",
"pivot": [0, 1.75, 0],
"rotation": [-6, 5, 0],
"cubes": [
@ -28,51 +47,51 @@
]
},
{
"name": "Whiskas",
"name": "Whiskers",
"parent": "Head",
"pivot": [0, 1.75, 0]
"pivot": [0, 2, 0]
},
{
"name": "Left",
"parent": "Whiskas",
"pivot": [-2, 3.5, -11.5],
"rotation": [0, -5, -7.5],
"parent": "Whiskers",
"pivot": [-2, 3.75, -11.5],
"rotation": [0.43688, -4.98093, -12.519],
"cubes": [
{
"origin": [-6.75, 3.25, -11.52],
"origin": [-6.75, 3.5, -11.52],
"size": [5, 0.5, 0],
"uv": {
"north": {"uv": [8, 11], "uv_size": [-6, 1]},
"east": {"uv": [1, 10], "uv_size": [0, 3]},
"south": {"uv": [1, 10], "uv_size": [1, 5]},
"south": {"uv": [1, 9], "uv_size": [0, 0]},
"west": {"uv": [6, 10], "uv_size": [0, 3]},
"up": {"uv": [1, 10], "uv_size": [5, 0]},
"down": {"uv": [6, 10], "uv_size": [5, 0]}
}
},
{
"origin": [-6.75, 4, -11.52],
"origin": [-6.75, 4.25, -11.52],
"size": [5, 0.5, 0],
"pivot": [-2, 3.5, -11.5],
"pivot": [-2, 3.75, -11.5],
"rotation": [0, 0, 5],
"uv": {
"north": {"uv": [8, 11], "uv_size": [-6, 1]},
"east": {"uv": [1, 10], "uv_size": [0, 3]},
"south": {"uv": [1, 10], "uv_size": [1, 5]},
"south": {"uv": [1, 9], "uv_size": [0, 0]},
"west": {"uv": [6, 10], "uv_size": [0, 3]},
"up": {"uv": [1, 10], "uv_size": [5, 0]},
"down": {"uv": [6, 10], "uv_size": [5, 0]}
}
},
{
"origin": [-6.75, 2.5, -11.52],
"origin": [-6.75, 2.75, -11.52],
"size": [5, 0.5, 0],
"pivot": [-2, 3.5, -11.5],
"pivot": [-2, 3.75, -11.5],
"rotation": [0, 0, -5],
"uv": {
"north": {"uv": [8, 11], "uv_size": [-6, 1]},
"east": {"uv": [1, 10], "uv_size": [0, 3]},
"south": {"uv": [1, 10], "uv_size": [1, 5]},
"south": {"uv": [1, 9], "uv_size": [0, 0]},
"west": {"uv": [6, 10], "uv_size": [0, 3]},
"up": {"uv": [1, 10], "uv_size": [5, 0]},
"down": {"uv": [6, 10], "uv_size": [5, 0]}
@ -82,45 +101,45 @@
},
{
"name": "Right",
"parent": "Whiskas",
"pivot": [2, 3.5, -11.5],
"rotation": [0, 5, 7.5],
"parent": "Whiskers",
"pivot": [2, 3.75, -11.5],
"rotation": [0.43688, 4.98093, 12.519],
"cubes": [
{
"origin": [1.75, 4, -11.52],
"origin": [1.75, 4.25, -11.52],
"size": [5, 0.5, 0],
"pivot": [2, 3.5, -11.5],
"pivot": [2, 3.75, -11.5],
"rotation": [0, 0, -5],
"uv": {
"north": {"uv": [2, 11], "uv_size": [6, 1]},
"east": {"uv": [1, 6], "uv_size": [0, 3]},
"south": {"uv": [1, 10], "uv_size": [1, 5]},
"south": {"uv": [1, 9], "uv_size": [0, 0]},
"west": {"uv": [6, 6], "uv_size": [0, 3]},
"up": {"uv": [1, 6], "uv_size": [5, 0]},
"down": {"uv": [6, 6], "uv_size": [5, 0]}
}
},
{
"origin": [1.75, 3.25, -11.52],
"origin": [1.75, 3.5, -11.52],
"size": [5, 0.5, 0],
"uv": {
"north": {"uv": [2, 11], "uv_size": [6, 1]},
"east": {"uv": [1, 6], "uv_size": [0, 3]},
"south": {"uv": [1, 10], "uv_size": [1, 5]},
"south": {"uv": [1, 9], "uv_size": [0, 0]},
"west": {"uv": [6, 6], "uv_size": [0, 3]},
"up": {"uv": [1, 6], "uv_size": [5, 0]},
"down": {"uv": [6, 6], "uv_size": [5, 0]}
}
},
{
"origin": [1.75, 2.5, -11.52],
"origin": [1.75, 2.75, -11.52],
"size": [5, 0.5, 0],
"pivot": [2, 3.5, -11.5],
"pivot": [2, 3.75, -11.5],
"rotation": [0, 0, 5],
"uv": {
"north": {"uv": [2, 11], "uv_size": [6, 1]},
"east": {"uv": [1, 6], "uv_size": [0, 3]},
"south": {"uv": [1, 10], "uv_size": [1, 5]},
"south": {"uv": [1, 9], "uv_size": [0, 0]},
"west": {"uv": [6, 6], "uv_size": [0, 3]},
"up": {"uv": [1, 6], "uv_size": [5, 0]},
"down": {"uv": [6, 6], "uv_size": [5, 0]}
@ -129,27 +148,53 @@
]
},
{
"name": "Body",
"pivot": [0, 10, 15.5],
"name": "Foots",
"parent": "Body",
"pivot": [0, 0, 15]
},
{
"name": "RightFoot",
"parent": "Foots",
"pivot": [-4.75, 0.5, 15],
"cubes": [
{"origin": [-7, 0, -3.5], "size": [14, 7, 21], "uv": [0, 0]},
{"origin": [-1.5, 6, 17], "size": [3, 1, 5], "uv": [-1, -1]}
{"origin": [-6.5, -0.25, 15], "size": [4, 1.5, 7], "pivot": [-4.75, 0.5, 15], "rotation": [0, -7.5, 0], "uv": [33, 39]}
]
},
{
"name": "bone2",
"pivot": [0, 0, 0],
"name": "LeftFoot",
"parent": "Foots",
"pivot": [4.5, 0.5, 15],
"cubes": [
{"origin": [-10, 0, -5], "size": [4, 1.5, 7], "uv": [0, 46]},
{"origin": [6, 0, -5], "size": [4, 1.5, 7], "uv": [17, 47]}
{"origin": [2.5, -0.25, 15], "size": [4, 1.5, 7], "pivot": [4.5, 0.5, 15], "rotation": [0, 7.5, 0], "uv": [30, 28]}
]
},
{
"name": "bone3",
"pivot": [0, 0, 15],
"name": "Arms",
"parent": "Body",
"pivot": [0, 0, 0]
},
{
"name": "RightArm",
"parent": "Arms",
"pivot": [-4.75, 0.5, -3.5],
"cubes": [
{"origin": [-10.5, 0, 11], "size": [4, 1.5, 7], "uv": [33, 39]},
{"origin": [6.5, 0, 11], "size": [4, 1.5, 7], "uv": [30, 28]}
{"origin": [-6.5, -0.25, -9], "size": [4, 1.5, 7], "pivot": [-4.75, 0.5, -3.5], "rotation": [0, 7.5, 0], "uv": [0, 46]}
]
},
{
"name": "LeftArm",
"parent": "Arms",
"pivot": [-4.75, 0.5, -3.5],
"cubes": [
{"origin": [2.5, -0.25, -9], "size": [4, 1.5, 7], "pivot": [4.5, 0.5, -3.5], "rotation": [0, -7.5, 0], "uv": [17, 47]}
]
},
{
"name": "Tail",
"parent": "Body",
"pivot": [0, 7, 17.25],
"cubes": [
{"origin": [-1.5, 6, 17], "size": [3, 1, 5], "uv": [0, 0]}
]
}
]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB