commit 9d9d62776d26129815963d80349999bb2439be1d Author: Camotoy <20743703+Camotoy@users.noreply.github.com> Date: Mon Mar 1 13:09:48 2021 -0500 Initial commit Co-Authored-By: Kas-tle <26531652+Kas-tle@users.noreply.github.com> diff --git a/animations/armor_stand.animation.json b/animations/armor_stand.animation.json new file mode 100644 index 0000000..8af04dc --- /dev/null +++ b/animations/armor_stand.animation.json @@ -0,0 +1,28 @@ +{ + "format_version": "1.8.0", + "animations": { + "animation.armor_stand.geyser_pose": { + "loop": true, + "bones": { + "head": { + "rotation": ["math.mod(math.floor(query.mark_variant / 1000000), 1000)", "math.mod(math.floor(query.mark_variant / 1000), 1000)", "math.mod(query.mark_variant, 1000)"] + }, + "geyser_chest": { + "rotation": ["math.mod(math.floor(query.variant / 1000000), 1000)", "math.mod(math.floor(query.variant / 1000), 1000)", "math.mod(query.variant, 1000)"] + }, + "leftarm": { + "rotation": ["math.mod(math.floor(query.trade_tier / 1000000), 1000)", "math.mod(math.floor(query.trade_tier / 1000), 1000)", "math.mod(query.trade_tier, 1000)"] + }, + "rightarm": { + "rotation": ["math.mod(math.floor(query.max_trade_tier / 1000000), 1000)", "math.mod(math.floor(query.max_trade_tier / 1000), 1000)", "math.mod(query.max_trade_tier, 1000)"] + }, + "leftleg": { + "rotation": ["math.mod(math.floor(query.skin_id / 1000000), 1000)", "math.mod(math.floor(query.skin_id / 1000), 1000)", "math.mod(query.skin_id, 1000)"] + }, + "rightleg": { + "rotation": ["math.mod(math.floor(query.life_span / 1000000), 1000)", "math.mod(math.floor(query.life_span / 1000), 1000)", "math.mod(query.life_span, 1000)"] + } + } + } + } +} diff --git a/entity/armor_stand.entity.json b/entity/armor_stand.entity.json new file mode 100755 index 0000000..8ebcc84 --- /dev/null +++ b/entity/armor_stand.entity.json @@ -0,0 +1,50 @@ +{ + "format_version": "1.10.0", + "minecraft:client_entity": { + "description": { + "identifier": "minecraft:armor_stand", + "min_engine_version": "1.8.0", + "materials": { + "default": "armor_stand" + }, + "textures": { + "default": "textures/entity/armor_stand" + }, + "animations": { + "default_pose": "animation.armor_stand.default_pose", + "no_pose": "animation.armor_stand.no_pose", + "solemn_pose": "animation.armor_stand.solemn_pose", + "athena_pose": "animation.armor_stand.athena_pose", + "brandish_pose": "animation.armor_stand.brandish_pose", + "honor_pose": "animation.armor_stand.honor_pose", + "entertain_pose": "animation.armor_stand.entertain_pose", + "salute_pose": "animation.armor_stand.salute_pose", + "riposte_pose": "animation.armor_stand.riposte_pose", + "zombie_pose": "animation.armor_stand.zombie_pose", + "cancan_a_pose": "animation.armor_stand.cancan_a_pose", + "cancan_b_pose": "animation.armor_stand.cancan_b_pose", + "hero_pose": "animation.armor_stand.hero_pose", + "wiggle": "animation.armor_stand.wiggle", + "controller.pose": "controller.animation.armor_stand.pose", + "controller.wiggling": "controller.animation.armor_stand.wiggle", + "geyser_pose": "animation.armor_stand.geyser_pose" + }, + "scripts": { + "initialize": [ + "variable.armor_stand.pose_index = 0;", + "variable.armor_stand.hurt_time = 0;" + ], + "animate": [ + "controller.pose", + "controller.wiggling", + {"geyser_pose": "query.is_bribed"} + ] + }, + "geometry": { + "default": "geometry.armor_stand" + }, + "render_controllers": [ "controller.render.armor_stand" ], + "enable_attachables": true + } + } +} diff --git a/manifest.json b/manifest.json new file mode 100755 index 0000000..f80d867 --- /dev/null +++ b/manifest.json @@ -0,0 +1,18 @@ +{ + "format_version": 2, + "header": { + "description": "Geyser Vanilla Assets", + "name": "Geyser Vanilla Assets", + "uuid": "5d8f8e98-7a2a-11eb-9439-0242ac130002", + "version": [1, 0, 30], + "min_engine_version": [ 1, 16, 0 ] + }, + "modules": [ + { + "description": "Geyser Vanilla Assets", + "type": "resources", + "uuid": "72e9b0ca-7a2a-11eb-9439-0242ac130002", + "version": [1, 0, 30] + } + ] +} diff --git a/models/entity/armor_stand.geo.json b/models/entity/armor_stand.geo.json new file mode 100644 index 0000000..da6a23b --- /dev/null +++ b/models/entity/armor_stand.geo.json @@ -0,0 +1,120 @@ +{ + "format_version": "1.12.0", + "minecraft:geometry": [ + { + "description": { + "identifier": "geometry.armor_stand", + "texture_width": 64, + "texture_height": 64, + "visible_bounds_width": 2, + "visible_bounds_height": 3.5, + "visible_bounds_offset": [0, 1.25, 0] + }, + "bones": [ + { + "name": "baseplate", + "pivot": [0, 0, 0] + }, + { + "name": "geyser_baseplate", + "parent": "baseplate", + "pivot": [0, 0, 0], + "cubes": [ + {"origin": [-6, 0, -6], "size": [12, 1, 12], "uv": [0, 32]} + ] + }, + { + "name": "waist", + "parent": "baseplate", + "pivot": [0, 12, 0] + }, + { + "name": "body", + "parent": "waist", + "pivot": [0, 24, 0] + }, + { + "name": "geyser_chest", + "parent": "body", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [-6, 21, -1.5], "size": [12, 3, 3], "uv": [0, 26]}, + {"origin": [-3, 14, -1], "size": [2, 7, 2], "uv": [16, 0]}, + {"origin": [1, 14, -1], "size": [2, 7, 2], "uv": [48, 16]}, + {"origin": [-4, 12, -1], "size": [8, 2, 2], "uv": [0, 48]} + ] + }, + { + "name": "head", + "parent": "body", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [-1, 24, -1], "size": [2, 7, 2], "uv": [0, 0]} + ] + }, + { + "name": "hat", + "parent": "head", + "pivot": [0, 24, 0], + "cubes": [ + {"origin": [-4, 24, -4], "size": [8, 8, 8], "uv": [32, 0]} + ] + }, + { + "name": "leftarm", + "parent": "body", + "pivot": [5, 22, 0], + "mirror": true + }, + { + "name": "geyser_leftarm", + "parent": "leftarm", + "pivot": [5, 22, 0], + "cubes": [ + {"origin": [5, 12, -1], "size": [2, 12, 2], "uv": [32, 16], "mirror": true} + ] + }, + { + "name": "leftitem", + "parent": "leftarm", + "pivot": [6, 15, 1] + }, + { + "name": "leftleg", + "parent": "body", + "pivot": [1.9, 12, 0], + "mirror": true, + "cubes": [ + {"origin": [0.9, 1, -1], "size": [2, 11, 2], "uv": [40, 16]} + ] + }, + { + "name": "rightarm", + "parent": "body", + "pivot": [-5, 22, 0] + }, + { + "name": "geyser_rightarm", + "parent": "rightarm", + "pivot": [-5, 22, 0], + "cubes": [ + {"origin": [-7, 12, -1], "size": [2, 12, 2], "uv": [24, 0]} + ] + }, + { + "name": "rightitem", + "parent": "rightarm", + "pivot": [-6, 15, 1] + }, + { + "name": "rightleg", + "parent": "body", + "pivot": [-1.9, 12, 0], + "cubes": [ + {"origin": [-2.9, 1, -1], "size": [2, 11, 2], "uv": [8, 0]} + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/render_controllers/armor_stand.render_controllers.json b/render_controllers/armor_stand.render_controllers.json new file mode 100755 index 0000000..5c6ea2b --- /dev/null +++ b/render_controllers/armor_stand.render_controllers.json @@ -0,0 +1,22 @@ +{ + "format_version": "1.8.0", + "render_controllers": { + "controller.render.armor_stand": { + "geometry": "geometry.default", + "part_visibility": [ + { "*": true }, + { "geyser_leftarm": "!(query.is_angry)" }, + { "geyser_rightarm": "!(query.is_angry)" }, + { "geyser_baseplate": "!(query.is_admiring)" } + ], + "materials": [ { "*": "Material.default" } ], + "textures": [ "texture.default" ], + "overlay_color": { + "r": "this", + "g": "this", + "b": "this", + "a": "0.0" + } + } + } +}