diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java b/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java index 05a808e..591d0e5 100644 --- a/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java +++ b/src/main/java/re/imc/geysermodelenginepackgenerator/ExtensionMain.java @@ -54,10 +54,7 @@ public class ExtensionMain implements Extension { GeyserUtils.addProperty(id, entity + ":" + bone, Boolean.class); }); - GeyserUtils.addProperty(id, "modelengine:anim_idle", Boolean.class); - GeyserUtils.addProperty(id, "modelengine:anim_spawn", Boolean.class); - GeyserUtils.addProperty(id, "modelengine:anim_walk", Boolean.class); - GeyserUtils.addProperty(id, "modelengine:anim_stop", Boolean.class); + GeyserUtils.addProperty(id, "modelengine:anim", Integer.class); GeyserUtils.registerProperties(id); } diff --git a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java index 4117f29..0103d1c 100644 --- a/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java +++ b/src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java @@ -15,7 +15,13 @@ public class AnimationController { ], "transitions": [ { - "idle": "query.property('modelengine:anim_idle')" + "idle": "query.property('modelengine:anim') == 2" + }, + { + "walk": "query.property('modelengine:anim') == 3" + }, + { + "stop": "query.property('modelengine:anim') == 0" } ] }, @@ -25,13 +31,13 @@ public class AnimationController { ], "transitions": [ { - "spawn": "query.property('modelengine:anim_spawn')" + "spawn": "query.property('modelengine:anim') == 1" }, { - "walk": "query.property('modelengine:anim_walk')" + "walk": "query.property('modelengine:anim') == 3" }, { - "stop": "query.property('modelengine:anim_stop')" + "stop": "query.property('modelengine:anim') == 0" } ] }, @@ -41,26 +47,26 @@ public class AnimationController { ], "transitions": [ { - "spawn": "query.property('modelengine:anim_spawn')" + "spawn": "query.property('modelengine:anim') == 1" }, { - "stop": "query.property('modelengine:anim_stop')" + "stop": "query.property('modelengine:anim') == 0" }, { - "idle": "query.property('modelengine:anim_idle')" + "idle": "query.property('modelengine:anim') == 2" } ] }, "stop": { "transitions": [ { - "idle": "query.property('modelengine:anim_idle')" + "idle": "query.property('modelengine:anim') == 2" }, { - "spawn": "query.property('modelengine:anim_spawn')" + "spawn": "query.property('modelengine:anim') == 1" }, { - "walk": "query.property('modelengine:anim_walk')" + "walk": "query.property('modelengine:anim') == 3" } ] }