Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/re/imc/geysermodelenginepackgenerator/generator/AnimationController.java
This commit is contained in:
zimzaza4
2024-07-22 01:39:14 +08:00

View File

@@ -54,10 +54,7 @@ public class ExtensionMain implements Extension {
GeyserUtils.addProperty(id, entity + ":" + bone, Boolean.class); GeyserUtils.addProperty(id, entity + ":" + bone, Boolean.class);
}); });
GeyserUtils.addProperty(id, "modelengine:anim_idle", Boolean.class); GeyserUtils.addProperty(id, "modelengine:anim", Integer.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.registerProperties(id); GeyserUtils.registerProperties(id);
} }