Skip to content

Commit

Permalink
Add Ball display rendering when holding out
Browse files Browse the repository at this point in the history
  • Loading branch information
@smell-of-curry
smell-of-curry committed Jun 20, 2024
1 parent c8996dd commit 21f19df
Show file tree
Hide file tree
Showing 32 changed files with 1,194 additions and 5 deletions.
22 changes: 21 additions & 1 deletion animations/ball.animation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,10 @@
"scale": {
"0.0": [1, 1, 1],
"2.125": [1, 1, 1],
"2.5": {"pre": [1, 1, 1], "post": [0.005, -0.0075, -0.0025]}
"2.5": {
"pre": [1, 1, 1],
"post": [0.005, -0.0075, -0.0025]
}
}
}
},
Expand Down Expand Up @@ -1001,6 +1004,23 @@
}
}
}
},
"animation.ball.hold_first_person": {
"loop": true,
"bones": {
"pokeball": {
"rotation": [0, 0, -117.5],
"position": [1, 25, -4]
}
}
},
"animation.ball.hold_third_person": {
"loop": true,
"bones": {
"pokeball": {
"position": [0, 21, -5]
}
}
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/beast.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:beastball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/beast",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/cherish.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:cherishball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/cherish",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/dive.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:diveball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/dive",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/dream.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:dreamball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/dream",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/dusk.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:duskball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/dusk",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/fast.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:fastball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/fast",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/friend.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:friendball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/friend",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
39 changes: 39 additions & 0 deletions attachables/balls/great.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"format_version": "1.16.100",
"minecraft:attachable": {
"description": {
"identifier": "pokeb:greatball",
"materials": {
"default": "zombie",
"enchanted": "entity_alphatest_glint"
},
"textures": {
"default": "textures/entity/ball/great",
"enchanted": "textures/misc/enchanted_item_glint"
},
"geometry": {
"default": "geometry.ball"
},
"animations": {
"first_person_main_hand": "animation.ball.hold_first_person",
"third_person_main_hand": "animation.ball.hold_third_person"
},
"scripts": {
"pre_animation": [
"v.main_hand = c.item_slot == 'main_hand' || c.item_slot == 'off_hand';"
],
"animate": [
{
"first_person_main_hand": "v.main_hand && c.is_first_person"
},
{
"third_person_main_hand": "v.main_hand && !c.is_first_person"
}
]
},
"render_controllers": [
"controller.render.default"
]
}
}
}
Loading

0 comments on commit 21f19df

Please sign in to comment.