diff --git a/.gitignore b/.gitignore index faa4e463ad..913fbe08a4 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ common/src/main/resources/assets/cobblemon/showdown # Generated files */generated/resources/* /fabric/src/generated/resources/cobblemon-common.accesswidener +/.ignored/ \ No newline at end of file diff --git a/.ignored/assets/particles/particle_dummy.bbmodel b/.ignored/assets/particles/particle_dummy.bbmodel deleted file mode 100644 index 2878c625b6..0000000000 --- a/.ignored/assets/particles/particle_dummy.bbmodel +++ /dev/null @@ -1 +0,0 @@ -{"meta":{"format_version":"4.5","model_format":"bedrock","box_uv":true},"name":"particle_dummy","model_identifier":"particle_dummy","visible_box":[1,1,0],"variable_placeholders":"","variable_placeholder_buttons":[],"bedrock_animation_mode":"entity","timeline_setups":[],"unhandled_root_fields":{},"resolution":{"width":64,"height":64},"elements":[{"name":"torso","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4.5,0,-4],"to":[4.5,8,3],"autouv":0,"color":1,"inflate":0.01,"origin":[-2,0,-3],"uv_offset":[0,15],"faces":{"north":{"uv":[7,22,16,30],"texture":0},"east":{"uv":[0,22,7,30],"texture":0},"south":{"uv":[23,22,32,30],"texture":0},"west":{"uv":[16,22,23,30],"texture":0},"up":{"uv":[16,22,7,15],"texture":0},"down":{"uv":[25,15,16,22],"texture":0}},"type":"cube","uuid":"334fb311-db6f-eae0-8162-5faea9dc4f44"},{"name":"head","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4.5,8,-5],"to":[4.5,15,3],"autouv":0,"color":1,"origin":[-2,0,-3],"faces":{"north":{"uv":[8,8,17,15],"texture":0},"east":{"uv":[0,8,8,15],"texture":0},"south":{"uv":[25,8,34,15],"texture":0},"west":{"uv":[17,8,25,15],"texture":0},"up":{"uv":[17,8,8,0],"texture":0},"down":{"uv":[26,0,17,8],"texture":0}},"type":"cube","uuid":"96890ac8-4d56-c059-b239-4f8239dec5cf"},{"name":"spike1","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,9.5,2.5],"to":[0,12.5,5.5],"autouv":0,"color":1,"origin":[-2,0,-3],"uv_offset":[0,12],"faces":{"north":{"uv":[3,15,3,18],"texture":0},"east":{"uv":[0,15,3,18],"texture":0},"south":{"uv":[6,15,6,18],"texture":0},"west":{"uv":[3,15,6,18],"texture":0},"up":{"uv":[3,15,3,12],"texture":0},"down":{"uv":[3,12,3,15],"texture":0}},"type":"cube","uuid":"a2b3e413-f9f7-ad94-47a7-80681e738e5f"},{"name":"spike2","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[0,5.5,2.5],"to":[0,8.5,5.5],"autouv":0,"color":1,"origin":[-2,0,-3],"faces":{"north":{"uv":[3,3,3,6],"texture":0},"east":{"uv":[0,3,3,6],"texture":0},"south":{"uv":[6,3,6,6],"texture":0},"west":{"uv":[3,3,6,6],"texture":0},"up":{"uv":[3,3,3,0],"texture":0},"down":{"uv":[3,0,3,3],"texture":0}},"type":"cube","uuid":"a233c603-1856-9923-251b-c3eb2fd21642"},{"name":"tail1","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-2,0.25,2],"to":[2,4.25,7],"autouv":0,"color":1,"origin":[-2,0.25,-3],"uv_offset":[27,25],"faces":{"north":{"uv":[32,30,36,34],"texture":0},"east":{"uv":[27,30,32,34],"texture":0},"south":{"uv":[41,30,45,34],"texture":0},"west":{"uv":[36,30,41,34],"texture":0},"up":{"uv":[36,30,32,25],"texture":0},"down":{"uv":[40,25,36,30],"texture":0}},"type":"cube","uuid":"ffb7c35f-590f-c04a-c9fe-f48b7389f1b6"},{"name":"tail2","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-1.5,0.25,7],"to":[1.5,3.25,10],"autouv":0,"color":1,"origin":[-2,0.25,-3],"uv_offset":[32,19],"faces":{"north":{"uv":[35,22,38,25],"texture":0},"east":{"uv":[32,22,35,25],"texture":0},"south":{"uv":[41,22,44,25],"texture":0},"west":{"uv":[38,22,41,25],"texture":0},"up":{"uv":[38,22,35,19],"texture":0},"down":{"uv":[41,19,38,22],"texture":0}},"type":"cube","uuid":"94af8b0a-b12f-cdf3-f3ba-109955b7fba6"},{"name":"leg_left","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-5,0,-6.25],"to":[-2,4,-1.25],"autouv":0,"color":1,"origin":[-2,0,-1.25],"uv_offset":[0,30],"faces":{"north":{"uv":[5,35,8,39],"texture":0},"east":{"uv":[0,35,5,39],"texture":0},"south":{"uv":[13,35,16,39],"texture":0},"west":{"uv":[8,35,13,39],"texture":0},"up":{"uv":[8,35,5,30],"texture":0},"down":{"uv":[11,30,8,35],"texture":0}},"type":"cube","uuid":"5ca05047-a2ea-2162-c048-78243029d72a"},{"name":"leg_right","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[2,0,-6.25],"to":[5,4,-1.25],"autouv":0,"color":1,"origin":[2,0,-1.25],"uv_offset":[29,10],"faces":{"north":{"uv":[34,15,37,19],"texture":0},"east":{"uv":[29,15,34,19],"texture":0},"south":{"uv":[42,15,45,19],"texture":0},"west":{"uv":[37,15,42,19],"texture":0},"up":{"uv":[37,15,34,10],"texture":0},"down":{"uv":[40,10,37,15],"texture":0}},"type":"cube","uuid":"68e3eff6-2c4a-a9b1-974f-b9868d3381df"},{"name":"arm_left","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4.75,4.75,-6.5],"to":[-1.75,7.75,-2.5],"autouv":0,"color":1,"origin":[-1.75,-0.25,-2.5],"uv_offset":[16,30],"faces":{"north":{"uv":[20,34,23,37],"texture":0},"east":{"uv":[16,34,20,37],"texture":0},"south":{"uv":[27,34,30,37],"texture":0},"west":{"uv":[23,34,27,37],"texture":0},"up":{"uv":[23,34,20,30],"texture":0},"down":{"uv":[26,30,23,34],"texture":0}},"type":"cube","uuid":"cf009a5e-9531-1688-ebe1-13ee3b80a409"},{"name":"arm_right","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1.75,4.75,-6.5],"to":[4.75,7.75,-2.5],"autouv":0,"color":1,"origin":[1.75,-0.25,-2.5],"uv_offset":[26,0],"faces":{"north":{"uv":[30,4,33,7],"texture":0},"east":{"uv":[26,4,30,7],"texture":0},"south":{"uv":[37,4,40,7],"texture":0},"west":{"uv":[33,4,37,7],"texture":0},"up":{"uv":[33,4,30,0],"texture":0},"down":{"uv":[36,0,33,4],"texture":0}},"type":"cube","uuid":"8acd2eca-471d-015c-f451-8c59e4591524"},{"name":"ear_right","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[1.75,14.5,0],"to":[4.75,17.5,0],"autouv":0,"color":1,"origin":[-1.75,-0.5,-1],"uv_offset":[0,18],"faces":{"north":{"uv":[0,18,3,21],"texture":0},"east":{"uv":[0,18,0,21],"texture":0},"south":{"uv":[3,18,6,21],"texture":0},"west":{"uv":[3,18,3,21],"texture":0},"up":{"uv":[3,18,0,18],"texture":0},"down":{"uv":[6,18,3,18],"texture":0}},"type":"cube","uuid":"61a49e37-1a46-1596-9006-313a01c9ae6a"},{"name":"ear_left","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4.75,14.5,0],"to":[-1.75,17.5,0],"autouv":0,"color":1,"origin":[1.75,-0.5,-1],"faces":{"north":{"uv":[0,0,3,3],"texture":0},"east":{"uv":[0,0,0,3],"texture":0},"south":{"uv":[3,0,6,3],"texture":0},"west":{"uv":[3,0,3,3],"texture":0},"up":{"uv":[3,0,0,0],"texture":0},"down":{"uv":[6,0,3,0],"texture":0}},"type":"cube","uuid":"3941d0e3-9e24-b87e-6701-8a2fa7dbf669"},{"name":"eye_left","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[-4.5,11.5,-4.75],"to":[-4.5,13.5,-1.75],"autouv":0,"color":1,"inflate":0.01,"rotation":[-5,0,0],"origin":[-4.5,12.5,-3.25],"uv_offset":[0,37],"faces":{"north":{"uv":[3,40,3,42],"texture":0},"east":{"uv":[0,40,3,42],"texture":0},"south":{"uv":[6,40,6,42],"texture":0},"west":{"uv":[3,40,6,42],"texture":0},"up":{"uv":[3,40,3,37],"texture":0},"down":{"uv":[3,37,3,40],"texture":0}},"type":"cube","uuid":"a6247411-5887-c792-a762-72b3c6782c38"},{"name":"eye_right","box_uv":true,"rescale":false,"locked":false,"render_order":"default","allow_mirror_modeling":true,"from":[4.5,11.5,-4.75],"to":[4.5,13.5,-1.75],"autouv":0,"color":1,"mirror_uv":true,"inflate":0.01,"rotation":[-5,0,0],"origin":[4.5,12.5,-3.25],"uv_offset":[0,37],"faces":{"north":{"uv":[3,40,3,42],"texture":0},"east":{"uv":[6,40,3,42],"texture":0},"south":{"uv":[6,40,6,42],"texture":0},"west":{"uv":[3,40,0,42],"texture":0},"up":{"uv":[3,40,3,37],"texture":0},"down":{"uv":[3,37,3,40],"texture":0}},"type":"cube","uuid":"7bea4b9f-26fe-e076-855b-45bd70a40726"},{"name":"target","position":[0,7,-16],"rotation":[0,0,0],"ignore_inherited_scale":false,"visibility":true,"locked":false,"entity_type":"minecraft:pig","nbt":"{}","uuid":"d009ee65-8e98-edb1-b16f-a42918f6bd5d","type":"locator"},{"name":"center","position":[0,7,-1],"rotation":[0,0,-180],"ignore_inherited_scale":false,"visibility":true,"locked":false,"entity_type":"minecraft:pig","nbt":"{}","uuid":"a2c339d9-8f3c-dc52-c339-983a6df726f1","type":"locator"},{"name":"head_top","position":[0,16,-3],"rotation":[0,0,0],"ignore_inherited_scale":false,"visibility":true,"locked":false,"entity_type":"minecraft:pig","nbt":"{}","uuid":"01b4f221-1138-5b17-1e5a-e5c35f642e66","type":"locator"},{"name":"ground_center","position":[0,0,0],"rotation":[0,0,0],"ignore_inherited_scale":false,"visibility":true,"locked":false,"entity_type":"minecraft:pig","nbt":"{}","uuid":"75b22730-60a8-909b-fcdb-01563a2523e3","type":"locator"},{"name":"special_attack","position":[0,10,-6],"rotation":[0,0,0],"ignore_inherited_scale":false,"visibility":true,"locked":false,"entity_type":"minecraft:pig","nbt":"{}","uuid":"aee722f9-57d8-18d7-af6b-6013f222e424","type":"locator"}],"outliner":[{"name":"substitute","origin":[0,0,0],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"b95003a3-c4db-ca77-9b34-7e1f0fa16099","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":[{"name":"body","origin":[0,0,0],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"a892abb7-5175-ee1b-ca85-f99519efa6f6","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":[{"name":"torso","origin":[0,2,-1.75],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"bee4f7ea-f146-695f-97b7-9cd86cfaf12f","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["334fb311-db6f-eae0-8162-5faea9dc4f44","a233c603-1856-9923-251b-c3eb2fd21642",{"name":"head","origin":[0,8,0],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"3b6d7a80-3e60-bcca-0946-8c7b2fca20e0","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["96890ac8-4d56-c059-b239-4f8239dec5cf","a2b3e413-f9f7-ad94-47a7-80681e738e5f",{"name":"eye_right","origin":[4.5,12.5,-3.25],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"ebe227a7-4a6e-48cb-4976-6c5ae9ec693e","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["7bea4b9f-26fe-e076-855b-45bd70a40726"]},{"name":"eye_left","origin":[-4.5,12.5,-3.25],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"9037feed-e8ac-f76f-5bd7-5d02fa642e5a","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["a6247411-5887-c792-a762-72b3c6782c38"]},{"name":"ear_right","origin":[3.25,14.5,0],"rotation":[10,-15,-20],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"e97a05a1-e790-7dff-d666-9e84fac5ce63","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["61a49e37-1a46-1596-9006-313a01c9ae6a"]},{"name":"ear_left","origin":[-3.25,14.5,0],"rotation":[10,15,20],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"1d4fe8ab-dcd9-c1a4-4d23-57cf9d341aa5","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["3941d0e3-9e24-b87e-6701-8a2fa7dbf669"]},"01b4f221-1138-5b17-1e5a-e5c35f642e66","aee722f9-57d8-18d7-af6b-6013f222e424"]},{"name":"arm_right","origin":[3.25,6.25,-3],"rotation":[5.000000000000001,-15,-5.0462810376810065e-17],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"44c3b885-1d69-822f-9d32-6905273691b4","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["8acd2eca-471d-015c-f451-8c59e4591524"]},{"name":"arm_left","origin":[-3.25,6.25,-3],"rotation":[5.000000000000001,15,1.0597190179130113e-15],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"57937345-c380-b422-03f3-9ff6288a34f7","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["cf009a5e-9531-1688-ebe1-13ee3b80a409"]},{"name":"tail","origin":[0,2.25,3],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"eba9b85b-1802-f05d-7f60-821894d5d03f","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["ffb7c35f-590f-c04a-c9fe-f48b7389f1b6",{"name":"tail2","origin":[0,0.25,7],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"c46bc288-1169-d2d3-dc45-ec653342b50e","export":true,"mirror_uv":false,"isOpen":true,"locked":false,"visibility":true,"autouv":0,"children":["94af8b0a-b12f-cdf3-f3ba-109955b7fba6"]}]}]},{"name":"leg_right","origin":[3.5,2,-1.75],"rotation":[0,-15,0],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"400f7fe7-46ac-7ec5-6e88-30bfa17e000c","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["68e3eff6-2c4a-a9b1-974f-b9868d3381df"]},{"name":"leg_left","origin":[-3.5,2,-1.75],"rotation":[0,15,0],"bedrock_binding":"","color":0,"nbt":"{}","uuid":"da9ae244-d74a-aadc-f0cd-3c801fa2e71c","export":true,"mirror_uv":false,"isOpen":false,"locked":false,"visibility":true,"autouv":0,"children":["5ca05047-a2ea-2162-c048-78243029d72a"]}]},"d009ee65-8e98-edb1-b16f-a42918f6bd5d","a2c339d9-8f3c-dc52-c339-983a6df726f1","75b22730-60a8-909b-fcdb-01563a2523e3"]}],"textures":[{"path":"C:\\Users\\natej\\Documents\\Minecraft Mod Stuff\\cobblemon-assets\\blockbench\\pokemon\\special\\substitute\\substitute.png","name":"substitute.png","folder":"block","namespace":"","id":"0","particle":false,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"ac6d434c-7865-6a05-e17b-28d439ac8018","relative_path":"../../../../../../../Documents/Minecraft Mod Stuff/cobblemon-assets/blockbench/pokemon/special/substitute/substitute.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABjNJREFUeF7tWk+IVVUcPm8/8SacQEE0Q2HaCCZCyBREhMmIIG1aGKKtRIMRCUQIESGEEAdqmFWK5MJNBOJgLqJFQwRRCzcNJJYRNOBI82j2ynfiu3z39865c57v3ncWcy883r3vnnvO7/f9vt+/c1/HOefOXz/1FN88Pj0+1+E5720af8E9Wf3P/dtbcy92xxyvMe7X+w/88PHxMbe6ulbMo9ffXr1XzMk1MRcOfuP81oWvS+NUribOO1e+OfeUimEBKnf2yGUvyCAAVAkYAkCVJwgjBwAKYnEKAADwIQtOzh7z91/ZtrmwFu7jePjXsh+L+2p5CwSYYBUj8AQB82C+kQMAAVQYUJvWV6oSBLoAlafgqjTAgNJ6hADAfbCPB+aen7kxWhdYjwE2PhAAVU4ZZGMA3YqsAcB6WAD0njKxCf/HnB1S3C5MS5AdsSCI3x88+qdkRTKAStu5CUJIeQ2IeL5pRqxLN3UP9VcqRQAoeIwByhwFJpQJqlynbiYkAaC+qoqoJa0bMAbYoFq3AsPO16GPhxQL+erzjFO2xGoJrT2GVWqQ530MCPkqJon5qo4PjbEBkoFQo711g6Z9PQaKB8AKGBpcVQnGJteAxjUYM3Zu31JUlowtoVrCFlCDWDdlbOf9i+95BrAC5EMaoXUi5H8WRXYBTXGkui2w8IzOwdhBRrCoYhndOADqAifeOOMmJibcl99f9ropCHMzN/sAPTV7tPiNyn/41jm3srLirv1w1d/TKE+g0Tu8tnunv2ezg/6G86YrQ88A0vPY6yc9ABDeKgxlVTgoExoDEAHAjZ/mS00O6L1j++aibIaFMccfj5Z91ailNuUZRWXYeffMAQ+Apq1Q0NI8b1OcBje1uvVp0nptdc2NjY+Vusd33txTYhznaTo4+jog1gswPlRFb6sklVN/sX6s88ZiD9kWArFOt/B1QKwbZIaoiqagsB4pAGjcsb2BDcIKBN2mTlZU9gIqqK3RSVEbtS29Q62wZh7ME6slLAvoerUzAEKwEmNliOuUzRBbAisAjCXWYhp3mBlCcSS2x1BnaiwqQVvXQ2gLAIXU7TDkdBwUVl1gUIshFqkLMEU2WSaXCiGlNWhmO8FQ4fPz/d+98qff/sjfRgpEKsXxxXef+0ifSlkFQFvsOn3e6lDZDepmyOFXP3BLS0tucnLS3f7tq2IeMODo3uP+GopzDIDAcfOX68kAYD0tucmARgGwKYlByZbCMQDseNvfqx/bDAF27Nu9qy//q5VsltDtuqrslHov2Auo8vtfOugti8/i4qKbmpryNMfnx8d3i3ViewPrxYdYBcgAauNO3fGg1A1qcIPFecQA4H26hNJXo3osQDIDaIrV3kBBaCoglrIALY/Fzh76pPBrnHS7XbewsOCmp6ddr9crAh5Orty55Ot6dQerFEDQFMnxbIv5LIKfdpBN+j/WLG2IqP/OHPi4oD6tSRfgNV1h9t5nBQDa1mKc9hChGoHvFWhtjGd1ieZpJADo4hQYkZ3UxzeUJQC8JgCI9JxDFVIAcP73n8tu68v/v2AJ0Zvj6TKDpNBi0gFPiiCozwEETW1UmClOAcBzAMBuq9nu0bqAvjxRhW31V2fVF8Km1A5b6+EBMgHnBADnsD4trxZlbxBaLNQoYRwrxixbYiFBtVZXoVKsoXuMLJOxhlaWsVaXsrDr01aZAdq+uhuQ8X3Dg5WgFkfcsQEQqQDoy1P6uvYW9HV1E2WCbZCs1HXWAkEA2AY/z/6cNlDoE1DocGuLew8aHEMbHhogbVap+31hJQAUlLEhJSWxnsezyOlUAFaje1jLWwvb7Tl7P0WOVNcIAqBWtErYiUPvFVLeANepRKqySVkg9Bpb/0ES8ls+E3tjZKtCBsVhBK/r2b79gJQ9OrqG/SNECAjbHVLw1D2CuhSNzePrAE07OtDu1en2F8alZoamlRhm/qIQYhqKWTFW4KSkxmEEbPrZdf8f0LQAuefvA6Db7fqNyV6vtyHAKSkJ5TeK4mTehrBylZu1AOQOQrnXbxmQ2wK5128ZkNsCuddvGZDbArnXbxmQ2wK5128ZkNsCuddvGZDbArnXbxmQ2wK5128ZkNsCuddvGZDbArnX3/AMeAb6ikiM1yJ1/gAAAABJRU5ErkJggg=="},{"path":"C:\\Users\\natej\\Documents\\Minecraft Mod Stuff\\cobblemon-assets\\blockbench\\pokemon\\special\\substitute\\substitute_shiny.png","name":"substitute_shiny.png","folder":"","namespace":"","id":"1","particle":false,"render_mode":"default","render_sides":"auto","frame_time":1,"frame_order_type":"loop","frame_order":"","frame_interpolate":false,"visible":true,"mode":"bitmap","saved":true,"uuid":"bd5abdd6-c8c0-a175-7210-b3c3ddbb30f7","relative_path":"../../../../../../../Documents/Minecraft Mod Stuff/cobblemon-assets/blockbench/pokemon/special/substitute/substitute_shiny.png","source":"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAAAXNSR0IArs4c6QAABjxJREFUeF7tWj2IFVcYva9ZttjkGfMSVtioIIElSGIhkcCaymixWgQ0RZqEgBCbQJpNk8IijTYBGwNCII2FBix0C38qWQgJFkZEFkTIj5AleUl8yRaLzQvnypmc+d698+bt3nnu4AyIM+/eufN95zvf373bcs657798u4//ee379GaL9xxrz0y63sM192hlzW2ZnnR8xrw7N7p++gudCfd393G2jj4fX7yXrclvYi1c/678/87Rb27n5qlcVdy3li8e7FMxfIDKzR675gUZBYAiAUMAYL4FYewAQEEIQSs8Nz3hQSALrn72Zh9jr+x53utHBuD+19v/OMzHuFreAgEmWMUIvK6J9cYOAARQYUBtWl+pShAIAJUHWLjXC2BAab1CAGAc7OOFtQ+d+mG8LjCMATY+KANUcDLIxgDMIatwD4D1sgDomDKxCv/Hmi1SXD8AgWkJsiMWBPH7z7ceZa/THcAArGMvxpiQ9fGbBkSVozIAhi2s7mFjAC0KAIYxAOMEBCAoe6ziRa4zTN5Rx4f6GwBQa6kLkM7MIgoCY4ANqqMKWPX8Fn08pFjIV9czj+sU1RJae1SttK7vY4BSUgfVwkpZnR+ao2swz1va2+dxR3/K6AHAQwyEMtaLWYzKc5wBEDFjx94tWWXJGBCqJWwBlZodrW8/2NOnn2qK0vSkH0XOZ1FkhbHvhwosvKNrcA4DpGYRAFI5AOoCLx752nU6Hbdy/T2vm4Jw8OSPA+BfO/lG9huVn37ngut2u+7Pyx/5MS11CTR6h9cPdPyYzQ76G8aqrgw9AyAohGu/e8YDAOGtwlBWhQOdQ3MAIgDoXfokl9Nhze27p7KymXXCL3dXfdWopTZdchyVYevc/GseAE1bNiYolbXM1QrPWhvP1qfZHf61+thtnZrIdY/7P5zJMY7rVR0cfR0Q6wUYH8hzpWsscFE59Rfrx7quVobqdgQ9BGJKt/B1QKwbZIYoirygsF5lANC4Y3sDrsX4o0DQbVKyorAXUEE1pTFlWuFgLUvvUCusmQcKx2oJywK6aXIGQAhWYqwM8VxmM8TGBwWAwdVaTONOURyJ7TGkTI1ZJWjreghtASA9dTuMewEUVl1gVIux72AsYNldZZmcK4QYeZl/bScYKnzuXvndR/ttJ077YaRApFJcv51d8JG+LGUVAG2xU/q81aGwG9TNkP5bp93y8rKbnZ11re8WsnXAgMljX/hnKM45AALX2sXPSwOA72nDxKxTKQA2JTEo2VI4BoCdbzc51Y9thgA7dh9+eSD/q5VsltDtuqLsVHYs2Auo8n+8uuAti39LS0tubm7O0xz/Xrr/hPY2kmtgxFhRfIhVgHjPdp2QK3U8yHWDGtxgcV4xADhOl1D6ckx3jG2AZAbQFGuLLU25VewR5rKAFh+7jp/P/NpbuN12i4uLbn5+3vV6vSzg4ebBufczaxWBoCmS3R/bYrJIt9fGsicYKnZghZkTX2XUpzXpAnymKzw8+/HAfl8oFoRqBFhVN01wz+oSzVOVARB65FxAfReRndTH/1CWAPCZACDS44pRmoA9+GnV7do5lbmW7gHY/QBMGiWFlg16dl4WBHUADNDURoWZ4hQAvAcA7Ba43SCNlckaJO3ZIsZSVn0hkHLtMI+5dCKZgN8IAO5hfVqe84cdk4UaJVpagdDvVw5ACBWt1TWPlxFG9xj1yAzVoB7EFp0nsusLHaLYo7v1Uj/LYKEFtDjijk3Z/TkNqgSA0VwrS9tEKRNsg2RlTFkLBEthKrGe/TltoNAnoNDh1hb3HqBQ6CTJgoBnrQP4PDYA8EF2ZGX351jP413kdCoAoekeMeVpabs9ZxmQMjUGGaBWtEpYYULnCmVOgFMqsZE4MJAFaLHQHn+IunoKHDsxsqUu1inbIm9EuTLvDuwHlNmjIxD2DyFGOf3dNAAg5WnaUdTsXl2oyyuTGstY4mnNyVyAEThmxVjerj0ATwv5zfLdgSzQbref/EFErzf0jyc2ixIbkSOnJJR/VhQvLIU3gmjd3n0maF5klAaAulE2tbwNA1IjWrf1GgbUzWKp5W0YkBrRuq3XMKBuFkstb8OA1IjWbb2GAXWzWGp5GwakRrRu6zUMqJvFUsvbMCA1onVb7z+SsEiM9vjEDwAAAABJRU5ErkJggg=="}],"animations":[{"uuid":"b5b0f7bc-01af-219c-b532-71f07e73df5f","name":"animation.particle_dummy.hurt","loop":"once","override":false,"length":1,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"a892abb7-5175-ee1b-ca85-f99519efa6f6":{"name":"body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"fd13f3d0-082d-82ad-8ad6-2a69231a937b","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-32.5,"y":0,"z":0}],"uuid":"119c8ef9-db0c-052c-ff99-0b9b470ee9b1","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-36.25,"y":0,"z":0}],"uuid":"4c408109-c759-3d7b-5191-b8e6b35c54b4","time":0.1667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-36.25,"y":0,"z":0}],"uuid":"9c90a619-dae0-6736-1997-db6601a00949","time":0.2917,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"fca121d8-a520-85e3-f722-270a0c4abcef","time":0.4583333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-16.26,"y":0,"z":0}],"uuid":"06b61f3b-2321-34b8-fac9-6bb3fcab9310","time":0.4166666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-33.75,"y":0,"z":0}],"uuid":"824644fb-97d2-cdde-059b-d7f785ad5141","time":0.3333333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"680710a0-ca2f-4cf2-b0c3-9ab176b1cc4c","time":0.041666666666666664,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2.5,"z":0}],"uuid":"48c9518b-16a2-5492-bd0e-2a93c87156e6","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2.5,"z":2}],"uuid":"9fcb5075-e1d2-643d-a403-da6b282b3215","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2,"z":2}],"uuid":"fc5ee994-2238-f9c7-10b4-6b2abb0b20da","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2,"z":3}],"uuid":"eaf04a36-2cce-d676-56ae-63aea18c329f","time":0.375,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2.75,"z":0.5}],"uuid":"2155396c-7a7e-59c2-e3a7-a7fdd73fa10c","time":0.125,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2.75,"z":1.5}],"uuid":"54996540-3528-56cf-e6d2-8b5965d00d84","time":0.20833333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":3,"z":1}],"uuid":"90ebe504-d6db-0a46-3a29-c72f426ca2ab","time":0.1667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":"0","z":0}],"uuid":"6b4f1d83-ac3e-d75a-1692-ab8da6ef1edb","time":0.5,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]},"bee4f7ea-f146-695f-97b7-9cd86cfaf12f":{"name":"torso","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":10,"y":0,"z":0}],"uuid":"2956f564-fa88-2c7c-cac0-fe48f9215fff","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":10,"y":0,"z":0}],"uuid":"a6fa11f5-afc7-9d00-1329-68e291374ac0","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-16.59,"y":0,"z":0}],"uuid":"b30c39f8-aa86-79fa-d2de-91b574e2a001","time":0.3333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-25,"y":0,"z":0}],"uuid":"3bd358f4-2f4e-405d-1659-1e1891e72ca9","time":0.4167,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":10,"y":0,"z":0}],"uuid":"f7969ddc-5cc9-9b51-a821-6b05e250e6f6","time":0.5833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-2.5,"y":0,"z":0}],"uuid":"1fd0ff08-ab27-bb1b-fe7a-88eb23ae2095","time":0.625,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"2f2b5674-ae7d-a3b6-7b74-a56ed6bd3574","time":0.6667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]},"3b6d7a80-3e60-bcca-0946-8c7b2fca20e0":{"name":"head","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"88bfd944-c8ae-7907-9811-80a0b9514354","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"d86f1494-bebd-5916-2b82-fd8aed9223cf","time":0.1667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-7.5,"y":0,"z":0}],"uuid":"1093e944-05b1-f13f-60ae-285d7454c173","time":0.5,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-17.5,"y":0,"z":0}],"uuid":"2dd12204-ce53-18ed-6c6d-ce74300e5768","time":0.5833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"f2748666-c95c-6035-9911-9e6db7f5b3c5","time":0.625,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-2.5,"y":0,"z":0}],"uuid":"b48a0830-706e-0d7a-c23d-1bae21678708","time":0.6667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"23581f48-3435-9707-1f64-ce5102823c81","time":0.7083,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]},"eba9b85b-1802-f05d-7f60-821894d5d03f":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"03bdf477-b3c5-e524-9d77-209572b88c35","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":17.5,"y":0,"z":0}],"uuid":"a1843251-814c-44aa-684f-f721fe119754","time":0.0417,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":42.5,"y":0,"z":0}],"uuid":"0c6addda-fee0-c60c-e829-784c5257b325","time":0.2917,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":42.5,"y":0,"z":0}],"uuid":"28367dae-4aa5-96eb-57c2-cb35eaaa00d3","time":0.5833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":35,"y":0,"z":0}],"uuid":"87500cd7-0c3e-d404-9a7d-fd405888c5f6","time":0.7083,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"af0e2c38-ee33-88a1-f3d5-e798436e6acb","time":0.7917,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"8ec23cff-d1cd-3134-1383-67cc22bc626a","time":0.8333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"ddec1c7f-be96-4fc3-bb76-70bbac2c0093","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"3461a859-24ff-8605-be7c-cef42ffbd6bf","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"27b2da4b-7b88-7018-d0a3-a2ebfb51934b","time":0.0417,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":3,"z":0}],"uuid":"4f0f2939-4e72-5f1f-16aa-21eab9c0bb7b","time":0.2917,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":3,"z":0}],"uuid":"3f7695ff-3b0a-2514-d54c-209c0e93f760","time":0.5,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"2a50848f-3352-3a09-8093-ce0f6847d3de","time":0.5833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"50bdfd13-8c82-a9ac-4fd0-f788c017e4bb","time":0.7083,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"16570137-f81d-6623-e786-4ba37c7b26d6","name":"animation.particle_dummy.explosion_target","loop":"once","override":false,"length":2,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"multi_hit","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\multi_hit.json"},{"effect":"impact_normal","locator":"center","script":"","file":""}],"uuid":"49e8a44f-6fa2-81b7-2776-4dde8c20060c","time":0.0417,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"explosion_target","locator":"target","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\explosion\\explosion_target.json"}],"uuid":"7a251f25-c1db-718a-5d82-c46d6a7759f0","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"effective","file":""}],"uuid":"5326c0ed-0b2c-7962-7b53-2946bbe4bfe9","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"explosion1","file":""}],"uuid":"05160f14-7eaf-8f19-906d-587e0b2a60a3","time":0.0417,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"5c9485fc-9627-1b85-4169-c78c0e2eef39","name":"animation.particle_dummy.dragon_claw_target","loop":"once","override":false,"length":1.25,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"dragon_claw_target_scratch","locator":"target","script":"","file":""}],"uuid":"d98dbcd6-255e-7797-2a04-c5bb62f475d2","time":0.0417,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"impact_dragon","locator":"center","script":"","file":""},{"effect":"hit_dragon","locator":"center","script":"","file":""}],"uuid":"e0009e7f-0e6d-f136-e97d-ee2375b0fdf4","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"supereffective","file":""}],"uuid":"8edf3d34-fad9-8828-0fbd-f6e7702b3f7a","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"8f733a8f-4136-07de-3634-3756738e9b02","name":"animation.particle_dummy.flamethrower_actor","loop":"once","override":false,"length":2,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"flamethrower_actor","locator":"special_attack","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\flamethrower\\flamethrower_actor.particle.json"}],"uuid":"2181ee18-b821-16a8-48fa-15c22e52cd9c","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"f5f5333d-4b90-7ec0-83b2-305065d8dd02","name":"animation.particle_dummy.flamethrower_target","loop":"once","override":false,"length":2,"snapping":12,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"flamethrower_target","locator":"center","script":"","file":""},{"effect":"impact_fire","locator":"center","script":"","file":""},{"effect":"flamethrower_target_linger","locator":"center","script":"","file":""}],"uuid":"c577e2b8-791f-fb9c-2970-2b8fbbfd5c1a","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"effective","file":""}],"uuid":"84968907-4b0b-9d8c-9978-b48a8f539be7","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"ceef4678-37b6-3c73-2d31-a21a1896e21d","name":"animation.particle_dummy.sludge_bomb_target","loop":"once","override":false,"length":2,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"sludge_bomb_target_projectile_1","locator":"center","script":"","file":""},{"effect":"sludge_bomb_target_projectile_2","locator":"center","script":"","file":""}],"uuid":"8b3049f2-5d90-ef67-5b4c-6cd1b503558b","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"sludge_bomb_target_1","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon\\assets\\particles\\moves\\sludge_bomb\\sludge_bomb_target_1.particle.json"},{"effect":"sludge_bomb_target_2","locator":"center","script":"","file":""},{"effect":"hit_poison","locator":"center","script":"","file":""},{"effect":"impact_poison","locator":"center","script":"","file":""},{"effect":"sludge_bomb_target_smog","locator":"center","script":"","file":""}],"uuid":"ec89ed21-829c-35eb-8c8f-b4f924f1a17a","time":0.4583,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"squid_slide.mp3","file":""}],"uuid":"3f390e11-d653-f1d4-08f7-b78ad8c35adb","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"effective","file":""}],"uuid":"ba203439-060b-0b82-f888-75205a4f814a","time":0.375,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"75ba443c-d515-29f9-c7f6-2368aa32edb5","name":"animation.particle_dummy.hurt_delay","loop":"once","override":false,"length":1.375,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"a892abb7-5175-ee1b-ca85-f99519efa6f6":{"name":"body","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"88e8bee4-6a5c-7283-6d61-446b6c766fbf","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"1f2b9ae7-874d-29a6-25be-59a0bf7c3a51","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-32.5,"y":0,"z":0}],"uuid":"23cf45d1-ca14-c211-c67d-6528f5be3265","time":0.375,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-36.25,"y":0,"z":0}],"uuid":"5d3b22e1-c170-de45-d33e-b437896f3ebc","time":0.4583333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-36.25,"y":0,"z":0}],"uuid":"fc0ed9ab-3126-019f-bb60-0d1c0381c4a1","time":0.5833333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-32.5,"y":0,"z":0}],"uuid":"6d9b35f5-12c8-da7f-7828-31f32ddf58ea","time":0.7083333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"d33bf3fd-beb9-ceb8-889e-7d7183caeda5","time":0.7916666666666666,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"3cc95a30-88db-b376-48d6-9e51af59e165","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"423eb4e1-3845-2035-fa4d-57b9b3482d6d","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2.5,"z":0}],"uuid":"16169fe0-4904-5d43-c7d6-3d37545cb86e","time":0.375,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":3,"z":1}],"uuid":"3bbead48-0f59-b433-126a-f906594aa2ab","time":0.4583333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":2.5,"z":2}],"uuid":"42abe70e-a0b1-784a-d42e-3d1b106bc845","time":0.5416666666666666,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":1}],"uuid":"c7d4b2ba-01ab-38e7-3938-c778d16174a4","time":0.625,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"d7c7f7aa-fb19-f4ca-9a07-08339b122915","time":0.7083333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]},"bee4f7ea-f146-695f-97b7-9cd86cfaf12f":{"name":"torso","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"b4892c56-cec1-c893-f884-5be4b2b72d06","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":10,"y":0,"z":0}],"uuid":"83d3a6f0-ab58-d120-a033-7a03562f2719","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":10,"y":0,"z":0}],"uuid":"35d992d3-5d77-2893-6129-c36b5edcb3a0","time":0.375,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-16.59,"y":0,"z":0}],"uuid":"d705c400-456b-b347-81c3-a58982fa8d9c","time":0.625,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-25,"y":0,"z":0}],"uuid":"bbe14b05-77b9-949d-5873-57505a571d32","time":0.7083333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":10,"y":0,"z":0}],"uuid":"146df9db-0412-46bb-d8a9-50a86adf8e74","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-2.5,"y":0,"z":0}],"uuid":"b5e1bf04-3c3c-b517-f93d-fd7cdc56ae78","time":0.9166666666666666,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"d45a33e9-2476-7933-28f7-9e5c4a6c0afb","time":0.9583333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]},"3b6d7a80-3e60-bcca-0946-8c7b2fca20e0":{"name":"head","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"2ed0966b-846c-816f-0c16-902e0f1f17cf","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"3e3fa519-c0bd-cd20-299a-06ea039dcbfa","time":0.375,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"475c3686-02b9-ea60-f1a8-b7d748185dfa","time":0.4583333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-7.5,"y":0,"z":0}],"uuid":"45787e54-980b-dbd4-d347-f4e0c22a4cd2","time":0.7916666666666666,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-17.5,"y":0,"z":0}],"uuid":"110d0e86-e8c2-a10c-c426-dd14691d335a","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"0a76fd00-f41f-334d-ce83-5c7e21611691","time":0.9166666666666666,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":-2.5,"y":0,"z":0}],"uuid":"18b61c96-7e0a-ad63-1c6f-2ba3bf8df642","time":0.9583333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"2498d6cc-5262-f2e0-f19c-9d787e983afd","time":1,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]},"eba9b85b-1802-f05d-7f60-821894d5d03f":{"name":"tail","type":"bone","keyframes":[{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"63f9e44f-f8b2-c063-7a24-fee645922246","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"10ba4777-6d78-b4a9-2b65-c30913abc391","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":17.5,"y":0,"z":0}],"uuid":"2b63d91d-1c59-8a7b-5a54-ea108a7fbd9d","time":0.3333333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":42.5,"y":0,"z":0}],"uuid":"28c5f77b-abd0-e4f1-9ce9-268ad7660322","time":0.5833333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":42.5,"y":0,"z":0}],"uuid":"f996df4f-c786-62d2-5e07-aafb941dd7f6","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":35,"y":0,"z":0}],"uuid":"738ecabd-e7e8-c5cb-9507-b1ee5bcd456e","time":1,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"4df9d46a-29f4-0555-1799-a8bb709e4581","time":1.0833333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":5,"y":0,"z":0}],"uuid":"22398d04-cc84-e31a-48d2-45e84753059d","time":1.125,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"rotation","data_points":[{"x":0,"y":0,"z":0}],"uuid":"c2b19193-dfa0-708d-1185-4291185582fa","time":1.1666666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"af20cde8-9ee3-478e-b353-cc810c10d83b","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"f1b90412-fabd-45f2-efa3-143f64a1380e","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"c01ea41a-834f-b6da-e698-0241bbdf20b0","time":0.3333333333333333,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":3,"z":0}],"uuid":"65d7199a-a879-cdd6-53e0-e731d2996a1f","time":0.5833333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":3,"z":0}],"uuid":"ffcb42e2-77f7-dd61-e58c-1dbcb40269bd","time":0.7916666666666666,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"8438b752-3411-0c9f-e1d8-02b3959bce04","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"position","data_points":[{"x":0,"y":0,"z":0}],"uuid":"a0e53af6-cd11-1c7b-448a-76aae7108398","time":1,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"91e872f9-6f2b-0004-159b-405cdfc996da","name":"animation.particle_dummy.population_bomb_target","loop":"once","override":false,"length":2,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"population_bomb_multihit","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\multi_hit.json"}],"uuid":"eb5e5fb3-8267-1a9d-958c-7694095e4201","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"population_bomb_target_mice","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\population_bomb\\population_bomb_target_mice.particle.json"},{"effect":"cut","locator":"target","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\cut.particle.json"}],"uuid":"47cfda13-c917-fa82-a813-db6525426235","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"population_bomb_multihit","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\multi_hit.json"}],"uuid":"ba7ca22b-f40c-753c-1f10-2f2ef48d6767","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"population_bomb_target_mice","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\population_bomb\\population_bomb_target_mice.particle.json"},{"effect":"cut","locator":"target","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\cut.particle.json"}],"uuid":"18c562ff-6174-97cf-ad5b-b77be2bbdb9d","time":0.375,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"population_bomb_multihit","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\multi_hit.json"}],"uuid":"a6d12c0a-2186-a104-e78d-f18dbfb38275","time":0.5833333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"population_bomb_target_mice","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\population_bomb\\population_bomb_target_mice.particle.json"},{"effect":"cut","locator":"target","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\cut.particle.json"}],"uuid":"5db7c834-0bbb-34b3-d7c2-7002dc21dd49","time":0.6666666666666666,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"population_bomb_multihit","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\multi_hit.json"}],"uuid":"9fc4dcc2-263a-ab05-4ade-6f4ba972a58d","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"population_bomb_target_mice","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\population_bomb\\population_bomb_target_mice.particle.json"},{"effect":"cut","locator":"target","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\cut.particle.json"}],"uuid":"1e08b9e1-867d-2d3e-e43e-76cca6a68d18","time":0.9583333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"effective","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon_particles\\assets\\sounds\\effective.ogg"}],"uuid":"8a5ce160-1eeb-e188-2a6e-cee8319c6e46","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"effective","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon_particles\\assets\\sounds\\effective.ogg"}],"uuid":"49964ad4-bca6-4700-e695-ed59c907f0ae","time":0.2916666666666667,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"effective","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon_particles\\assets\\sounds\\effective.ogg"}],"uuid":"7b448650-eb06-e5b3-be37-ca73ce64d8c3","time":0.5833333333333334,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"effective","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon_particles\\assets\\sounds\\effective.ogg"}],"uuid":"d460b737-2d92-23d3-c0fd-e2546487e529","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"f5abf3dc-6651-6b2b-e13d-39b7f7e358d5","name":"animation.particle_dummy.crit_target","loop":"once","override":false,"length":2,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"crit_popup","locator":"head_top","script":"","file":""}],"uuid":"4fb1e631-3437-c95c-ecab-60c32b783b38","time":0.0833,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"869966a7-29d3-9ca5-d59b-ba6f3c0cf356","name":"animation.particle_dummy.synthesis","loop":"once","override":false,"length":3.5,"snapping":10,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"synthesis_sunlight","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon\\assets\\particles\\moves\\synthesis\\synthesis_sunlight.particle.json"},{"effect":"synthesis_sun","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon\\assets\\particles\\moves\\synthesis\\synthesis_sun.particle.json"}],"uuid":"f8025405-c7a9-e7a6-764e-5a3f19545f5b","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"shiny_glimmer","locator":"center","script":"","file":""},{"effect":"shiny_glimmer","locator":"center","script":"","file":""}],"uuid":"4facbec9-2e13-8534-424c-ad34519395f8","time":2,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"sound","data_points":[{"effect":"synthesis.mp3","file":""}],"uuid":"8989fc56-e7f1-29c1-2d1e-482dc9c8a3d0","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"96d2a623-b774-657b-a681-f527ed8865ea","name":"animation.particle_dummy.stat_up","loop":"once","override":false,"length":2,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"stat_up_lines","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon\\assets\\particles\\generic\\stat_up_lines.particle.json"},{"effect":"stat_up_circles","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon\\assets\\particles\\generic\\stat_up_circles.particle.json"}],"uuid":"9235b798-7054-235c-bee6-d366e0369a8d","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"9d10d9fd-1b1d-b337-fd34-357669216e2c","name":"animation.particle_dummy.stat_down","loop":"once","override":false,"length":2,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"stat_down_lines","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon\\assets\\particles\\generic\\stat_down_lines.particle.json"},{"effect":"stat_down_circles","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\cobblemon\\assets\\particles\\generic\\stat_down_circles.particle.json"}],"uuid":"9235b798-7054-235c-bee6-d366e0369a8d","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"878c62c0-5944-c693-667d-4b633c887b3b","name":"animation.particle_dummy.razor_leaf_actor","loop":"once","override":false,"length":2.5,"snapping":24,"selected":true,"saved":false,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"razor_leaf_actor_1","locator":"","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\razor_leaf\\razor_leaf_actor_1.particle.json"}],"uuid":"469241ea-54b0-eb33-a24c-7262424648b5","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"razor_leaf_actor_2","locator":"target","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\razor_leaf\\razor_leaf_actor_2.particle.json"}],"uuid":"a0e07cf9-fc00-8ea5-0873-91dc1c52f0e5","time":0.875,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}},{"uuid":"aa389380-6949-b1e8-d395-5b2b87b3f20c","name":"animation.particle_dummy.razor_leaf_target","loop":"once","override":false,"length":1.5,"snapping":24,"selected":false,"saved":true,"path":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particle_dummy.animation.json","anim_time_update":"","blend_weight":"","start_delay":"","loop_delay":"","animators":{"effects":{"name":"Effects","type":"effect","keyframes":[{"channel":"particle","data_points":[{"effect":"razor_leaf_target","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\moves\\razor_leaf\\razor_leaf_target.particle.json"}],"uuid":"273a979d-d20f-709c-1820-b842d872c689","time":0,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]},{"channel":"particle","data_points":[{"effect":"impact_grass","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\impact_grass.particle.json"},{"effect":"multi_hit_grass","locator":"center","script":"","file":"C:\\Users\\natej\\Pictures\\art\\minecraft\\cobblemon\\particles\\assets\\particles\\generic\\multi_hit_grass.particle.json"}],"uuid":"a60c6c23-de74-7eba-8dca-c50af68360ab","time":0.25,"color":-1,"interpolation":"linear","bezier_linked":true,"bezier_left_time":[-0.1,-0.1,-0.1],"bezier_left_value":[0,0,0],"bezier_right_time":[0.1,0.1,0.1],"bezier_right_value":[0,0,0]}]}}}]} \ No newline at end of file diff --git a/.ignored/assets/particles/textures/particle/bubble.png b/.ignored/assets/particles/textures/particle/bubble.png deleted file mode 100644 index 0444998e5f..0000000000 Binary files a/.ignored/assets/particles/textures/particle/bubble.png and /dev/null differ diff --git a/.ignored/assets/particles/textures/particle/lava_bubble.png b/.ignored/assets/particles/textures/particle/lava_bubble.png deleted file mode 100644 index 29257bb7fa..0000000000 Binary files a/.ignored/assets/particles/textures/particle/lava_bubble.png and /dev/null differ diff --git a/.ignored/assets/particles/textures/particle/lightbeam.png b/.ignored/assets/particles/textures/particle/lightbeam.png deleted file mode 100644 index d206190ad3..0000000000 Binary files a/.ignored/assets/particles/textures/particle/lightbeam.png and /dev/null differ diff --git a/.ignored/assets/particles/textures/particle/sleep_zzz.png b/.ignored/assets/particles/textures/particle/sleep_zzz.png deleted file mode 100644 index 6146c31642..0000000000 Binary files a/.ignored/assets/particles/textures/particle/sleep_zzz.png and /dev/null differ diff --git a/.ignored/assets/particles/textures/particle/smoke.png b/.ignored/assets/particles/textures/particle/smoke.png deleted file mode 100644 index 76aac18159..0000000000 Binary files a/.ignored/assets/particles/textures/particle/smoke.png and /dev/null differ diff --git a/.ignored/assets/particles/textures/particle/sparkle.png b/.ignored/assets/particles/textures/particle/sparkle.png deleted file mode 100644 index d8ee6a4f4d..0000000000 Binary files a/.ignored/assets/particles/textures/particle/sparkle.png and /dev/null differ diff --git a/.ignored/assets/particles/textures/particle/star.png b/.ignored/assets/particles/textures/particle/star.png deleted file mode 100644 index 75c89cd7cc..0000000000 Binary files a/.ignored/assets/particles/textures/particle/star.png and /dev/null differ diff --git a/.ignored/assets/particles/textures/particle/tailflame.png b/.ignored/assets/particles/textures/particle/tailflame.png deleted file mode 100644 index a2aec2be31..0000000000 Binary files a/.ignored/assets/particles/textures/particle/tailflame.png and /dev/null differ diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a5f38c616..9b755c69df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - You can now find Nether Fire Stone Ore in, surprisingly, the Nether. - Added effects for many Poké Balls when sending out Pokémon or capturing. - Added a new send-out ball toss animation that showcases the ball used for the Pokémon. +- Added simple move animations for Pokémon in battle with a proof of concept for more complicated animations. ### Changes - Pokémon now transition more smoothly between different poses. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt index f459d003b8..9f5d0c749c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonNetwork.kt @@ -13,6 +13,7 @@ import com.cobblemon.mod.common.api.net.NetworkPacket import com.cobblemon.mod.common.api.net.ServerNetworkPacketHandler import com.cobblemon.mod.common.client.net.PlayerInteractOptionsHandler import com.cobblemon.mod.common.client.net.SetClientPlayerDataHandler +import com.cobblemon.mod.common.client.net.animation.PlayPoseableAnimationHandler import com.cobblemon.mod.common.client.net.battle.BattleApplyPassResponseHandler import com.cobblemon.mod.common.client.net.battle.BattleCaptureEndHandler import com.cobblemon.mod.common.client.net.battle.BattleCaptureShakeHandler @@ -37,8 +38,10 @@ import com.cobblemon.mod.common.client.net.callback.party.OpenPartyCallbackHandl import com.cobblemon.mod.common.client.net.callback.partymove.OpenPartyMoveCallbackHandler import com.cobblemon.mod.common.client.net.data.DataRegistrySyncPacketHandler import com.cobblemon.mod.common.client.net.data.UnlockReloadPacketHandler +import com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler import com.cobblemon.mod.common.client.net.dialogue.DialogueClosedHandler import com.cobblemon.mod.common.client.net.dialogue.DialogueOpenedHandler +import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormEntityParticleHandler import com.cobblemon.mod.common.client.net.effect.SpawnSnowstormParticleHandler import com.cobblemon.mod.common.client.net.gui.InteractPokemonUIPacketHandler import com.cobblemon.mod.common.client.net.gui.SummaryUIPacketHandler @@ -48,7 +51,6 @@ import com.cobblemon.mod.common.client.net.pasture.PokemonPasturedHandler import com.cobblemon.mod.common.client.net.pasture.PokemonUnpasturedHandler import com.cobblemon.mod.common.client.net.pokemon.update.PokemonUpdatePacketHandler import com.cobblemon.mod.common.client.net.settings.ServerSettingsPacketHandler -import com.cobblemon.mod.common.client.net.sound.PokemonCryHandler import com.cobblemon.mod.common.client.net.sound.UnvalidatedPlaySoundS2CPacketHandler import com.cobblemon.mod.common.client.net.spawn.SpawnExtraDataEntityHandler import com.cobblemon.mod.common.client.net.starter.StarterUIPacketHandler @@ -73,6 +75,7 @@ import com.cobblemon.mod.common.client.net.trade.TradeOfferNotificationHandler import com.cobblemon.mod.common.client.net.trade.TradeStartedHandler import com.cobblemon.mod.common.client.net.trade.TradeUpdatedHandler import com.cobblemon.mod.common.net.messages.client.PlayerInteractOptionsPacket +import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket import com.cobblemon.mod.common.net.messages.client.battle.* import com.cobblemon.mod.common.net.messages.client.callback.OpenMoveCallbackPacket import com.cobblemon.mod.common.net.messages.client.callback.OpenPartyCallbackPacket @@ -85,6 +88,8 @@ import com.cobblemon.mod.common.net.messages.client.data.SpeciesRegistrySyncPack import com.cobblemon.mod.common.net.messages.client.data.UnlockReloadPacket import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueClosedPacket import com.cobblemon.mod.common.net.messages.client.dialogue.DialogueOpenedPacket +import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket +import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormParticlePacket import com.cobblemon.mod.common.net.messages.client.fossil.FossilRegistrySyncPacket import com.cobblemon.mod.common.net.messages.client.fossil.NaturalMaterialRegistrySyncPacket @@ -97,7 +102,6 @@ import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.Add import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.ClearEvolutionsPacket import com.cobblemon.mod.common.net.messages.client.pokemon.update.evolution.RemoveEvolutionPacket import com.cobblemon.mod.common.net.messages.client.settings.ServerSettingsPacket -import com.cobblemon.mod.common.net.messages.client.sound.PokemonCryPacket import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket import com.cobblemon.mod.common.net.messages.client.spawn.SpawnGenericBedrockPacket import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokeballPacket @@ -315,6 +319,8 @@ object CobblemonNetwork : NetworkManager { // Effects this.createClientBound(SpawnSnowstormParticlePacket.ID, SpawnSnowstormParticlePacket::decode, SpawnSnowstormParticleHandler) + this.createClientBound(SpawnSnowstormEntityParticlePacket.ID, SpawnSnowstormEntityParticlePacket::decode, SpawnSnowstormEntityParticleHandler) + this.createClientBound(RunPosableMoLangPacket.ID, RunPosableMoLangPacket::decode, RunPosableMoLangHandler) // Hax this.createClientBound(UnvalidatedPlaySoundS2CPacket.ID, UnvalidatedPlaySoundS2CPacket::decode, UnvalidatedPlaySoundS2CPacketHandler) @@ -339,7 +345,7 @@ object CobblemonNetwork : NetworkManager { this.createClientBound(PokemonUnpasturedPacket.ID, PokemonUnpasturedPacket::decode, PokemonUnpasturedHandler) // Behaviours - this.createClientBound(PokemonCryPacket.ID, PokemonCryPacket::decode, PokemonCryHandler) + this.createClientBound(PlayPoseableAnimationPacket.ID, PlayPoseableAnimationPacket::decode, PlayPoseableAnimationHandler) // Move select packets this.createClientBound(OpenMoveCallbackPacket.ID, OpenMoveCallbackPacket::decode, OpenMoveCallbackHandler) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt index 3206a7c789..e1567ff7ed 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/CobblemonSounds.kt @@ -129,6 +129,43 @@ object CobblemonSounds : PlatformRegistry, RegistryKey DoubleValue(params.getString(0) in format.ruleSet) } + + return queryStruct + } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt index 4c6b013f26..62a2dace80 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/molang/MoLangFunctions.kt @@ -19,7 +19,8 @@ import com.bedrockk.molang.runtime.value.MoValue import com.bedrockk.molang.runtime.value.StringValue import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.api.dialogue.PlayerDialogueFaceProvider -import com.cobblemon.mod.common.api.molang.MoLangFunctions.asMoLangValue +import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction +import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions import com.cobblemon.mod.common.util.isInt import com.cobblemon.mod.common.util.itemRegistry import net.minecraft.block.Block @@ -51,7 +52,30 @@ object MoLangFunctions { "is_number" to java.util.function.Function { params -> DoubleValue(params.get(0).asString().toDoubleOrNull() != null) }, "to_number" to java.util.function.Function { params -> DoubleValue(params.get(0).asString().toDoubleOrNull() ?: 0.0) }, "to_int" to java.util.function.Function { params -> DoubleValue(params.get(0).asString().toIntOrNull() ?: 0) }, - "to_string" to java.util.function.Function { params -> StringValue(params.get(0).asString()) } + "to_string" to java.util.function.Function { params -> StringValue(params.get(0).asString()) }, + "do_effect_walks" to java.util.function.Function { _ -> + DoubleValue(Cobblemon.config.walkingInBattleAnimations) + }, + "random" to java.util.function.Function { params -> + val options = mutableListOf() + var index = 0 + while (params.contains(index)) { + options.add(params.get(index)) + index++ + } + return@Function options.random() // Can throw an exception if they specified no args. They'd be idiots though. + }, + "curve" to java.util.function.Function { params -> + val curveName = params.getString(0) + val curve = WaveFunctions.functions[curveName] ?: throw IllegalArgumentException("Unknown curve: $curveName") + return@Function ObjectValue(curve) + }, + "array" to java.util.function.Function { params -> + val values = params.params + val array = ArrayStruct(hashMapOf()) + values.forEachIndexed { index, moValue -> array.setDirectly("$index", moValue) } + return@Function array + } ) val biomeFunctions = hashMapOf>() val worldFunctions = hashMapOf>() @@ -110,6 +134,11 @@ object MoLangFunctions { return this } + fun T.addFunction(name: String, function: java.util.function.Function): T { + this.functions[name] = function + return this + } + fun MoLangEnvironment.getQueryStruct(name: String = "query") = structs.getOrPut(name) { QueryStruct(hashMapOf()) } as QueryStruct fun MoLangRuntime.setup(): MoLangRuntime { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt index 801703f0e9..dbb0745b15 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/MoveTemplate.kt @@ -8,6 +8,12 @@ package com.cobblemon.mod.common.api.moves +import com.bedrockk.molang.runtime.struct.MoStruct +import com.bedrockk.molang.runtime.struct.QueryStruct +import com.bedrockk.molang.runtime.value.DoubleValue +import com.bedrockk.molang.runtime.value.StringValue +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunction +import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline import com.cobblemon.mod.common.api.moves.categories.DamageCategories import com.cobblemon.mod.common.api.moves.categories.DamageCategory import com.cobblemon.mod.common.api.types.ElementalType @@ -45,8 +51,22 @@ open class MoveTemplate( val pp: Int, val priority: Int, val critRatio: Double, - val effectChances: Array + val effectChances: Array, + val actionEffect: ActionEffectTimeline? ) { + val struct: MoStruct by lazy { + QueryStruct(hashMapOf()) + .addFunction("name") { StringValue(name) } + .addFunction("type") { StringValue(elementalType.name) } + .addFunction("damage_category") { StringValue(damageCategory.name) } + .addFunction("power") { DoubleValue(power) } + .addFunction("target") { StringValue(target.name) } + .addFunction("accuracy") { DoubleValue(accuracy) } + .addFunction("pp") { DoubleValue(pp) } + .addFunction("priority") { DoubleValue(priority) } + .addFunction("crit_ratio") { DoubleValue(critRatio) } + } + val displayName: MutableText get() = lang("move.$name") @@ -65,7 +85,8 @@ open class MoveTemplate( pp = 5, priority = 0, critRatio = 0.0, - effectChances = emptyArray() + effectChances = emptyArray(), + actionEffect = null ) companion object { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Moves.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Moves.kt index 4b0f5dec2e..4786668c36 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Moves.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/Moves.kt @@ -10,12 +10,15 @@ package com.cobblemon.mod.common.api.moves import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.api.data.DataRegistry +import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline +import com.cobblemon.mod.common.api.moves.animations.ActionEffects import com.cobblemon.mod.common.api.moves.categories.DamageCategories import com.cobblemon.mod.common.api.reactive.SimpleObservable import com.cobblemon.mod.common.api.types.ElementalTypes import com.cobblemon.mod.common.battles.MoveTarget import com.cobblemon.mod.common.battles.runner.ShowdownService import com.cobblemon.mod.common.net.messages.client.data.MovesRegistrySyncPacket +import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace import com.cobblemon.mod.common.util.cobblemonResource import com.google.gson.JsonArray import com.google.gson.JsonObject @@ -72,7 +75,18 @@ object Moves : DataRegistry { effectChances += secondaryMember.get("chance").asDouble } } - val move = MoveTemplate(id, num, elementalType, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray()) + val actionEffect = ActionEffects.actionEffects[id.asIdentifierDefaultingNamespace()] + ?: run { + ActionEffects.actionEffects["generic_move".asIdentifierDefaultingNamespace()] +// if (damageCategory == DamageCategories.STATUS) { +// ActionEffects.actionEffects[cobblemonResource("status")] +// } else { +// val type = elementalType.name.lowercase() +// val category = damageCategory.name.lowercase() +// ActionEffects.actionEffects["${category}_$type".asIdentifierDefaultingNamespace()] +// } + } + val move = MoveTemplate(id, num, elementalType, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray(), actionEffect) this.register(move) } catch (e: Exception) { Cobblemon.LOGGER.error("Caught exception trying to resolve the move '{}'", id, e) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt new file mode 100644 index 0000000000..cb3e93ca97 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffectTimeline.kt @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations + +import com.bedrockk.molang.Expression +import com.bedrockk.molang.runtime.MoLangRuntime +import com.bedrockk.molang.runtime.struct.VariableStruct +import com.cobblemon.mod.common.api.moves.animations.keyframes.ActionEffectKeyframe +import com.cobblemon.mod.common.api.scheduling.ScheduledTask +import com.cobblemon.mod.common.util.asExpression +import com.cobblemon.mod.common.util.resolveBoolean +import java.util.concurrent.CompletableFuture +import net.minecraft.entity.Entity + +/** + * An action effect will run and execute a series of 'keyframes', with each running once + * the previous has completed. The entire effect is considered complete for the given context + * once all the 'holds' provided in the context have been cleared or once every keyframe + * has finished. + * + * @author Hiroku + * @since October 20th, 2023 + */ +class ActionEffectTimeline( + val timeline: List = mutableListOf(), + val condition: Expression = "true".asExpression() +) { + companion object { + val NONE = ActionEffectTimeline() + } + + fun run(context: ActionEffectContext): CompletableFuture { + return if (timeline.isEmpty() || !context.runtime.resolveBoolean(condition)) { + CompletableFuture.completedFuture(Unit) + } else { + val finalFuture = CompletableFuture() + // .toList copy because I'm paranoid about iterators being trying to share between identical effects playing + chainKeyframes(context, timeline.toList().iterator(), finalFuture) + finalFuture + } + } + + fun chainKeyframes(context: ActionEffectContext, iterator: Iterator, finalFuture: CompletableFuture) { + if (!iterator.hasNext()) { + finalFuture.complete(Unit) + } else { + val keyframe = iterator.next() + context.currentKeyframes.add(keyframe) + keyframe.play(context) + .thenRun { context.currentKeyframes.remove(keyframe) } + .thenApply { chainKeyframes(context, iterator, finalFuture) } + } + } +} + +class ActionEffectContext( + val actionEffect: ActionEffectTimeline, + val holds: MutableSet = mutableSetOf(), + val providers: MutableList = mutableListOf(), + val runtime: MoLangRuntime, + var canBeInterrupted: Boolean = false, + var interrupted: Boolean = false, + var currentKeyframes: MutableList = mutableListOf() +) { + inline fun findOneProvider() = providers.filterIsInstance().firstOrNull() + + +} + +class UsersProvider(users: List): EntityProvider { + override val entities = users + constructor(vararg users: Entity): this(users.toList()) +} + +class TargetsProvider(targets: List): EntityProvider { + override val entities = targets + constructor(vararg targets: Entity): this(targets.toList()) +} + +interface EntityProvider { + val entities: List +} + +//class MoveAnimationKeyframe( +// val sound: Identifier? = null, +// val animation: List = listOf(), +// val effects: List = listOf() +//) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffects.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffects.kt new file mode 100644 index 0000000000..b8702258ae --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/ActionEffects.kt @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations + +import com.bedrockk.molang.Expression +import com.cobblemon.mod.common.api.data.JsonDataRegistry +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.moves.animations.keyframes.* +import com.cobblemon.mod.common.api.pokemon.stats.Stat +import com.cobblemon.mod.common.api.reactive.SimpleObservable +import com.cobblemon.mod.common.pokemon.adapters.CobblemonStatTypeAdapter +import com.cobblemon.mod.common.util.adapters.* +import com.cobblemon.mod.common.util.cobblemonResource +import com.google.gson.GsonBuilder +import com.google.gson.reflect.TypeToken +import java.awt.Color +import net.minecraft.predicate.NumberRange +import net.minecraft.resource.ResourceType +import net.minecraft.server.network.ServerPlayerEntity +import net.minecraft.util.Identifier +import net.minecraft.util.math.Box +import net.minecraft.util.math.Vec3d + +/** + * Data registry containing all of the [ActionEffectTimeline]s that can be triggered from various actions. + * + * @author Hiroku + * @since October 21st, 2023 + */ +object ActionEffects : JsonDataRegistry { + override val id: Identifier = cobblemonResource("action_effects") + override val type: ResourceType = ResourceType.SERVER_DATA + override val observable = SimpleObservable() + + init { + ActionEffectKeyframe.register("animation") + ActionEffectKeyframe.register("entity_molang") + ActionEffectKeyframe.register("molang") + ActionEffectKeyframe.register("parallel") + ActionEffectKeyframe.register("can_interrupt") + ActionEffectKeyframe.register("cannot_interrupt") + ActionEffectKeyframe.register("remove_holds") + ActionEffectKeyframe.register("add_holds") + ActionEffectKeyframe.register("move_to_target") + ActionEffectKeyframe.register("return_to_position") + ActionEffectKeyframe.register("pause") + ActionEffectKeyframe.register("save_position") + ActionEffectKeyframe.register("fork") + ActionEffectKeyframe.register("sequence") + ActionEffectKeyframe.register("run_action_effect") + ActionEffectKeyframe.register("entity_particles") + ActionEffectKeyframe.register("entity_sound") + } + + override val gson = GsonBuilder() + .disableHtmlEscaping() + .setPrettyPrinting() + .registerTypeAdapter(ActionEffectKeyframe::class.java, ActionEffectKeyframeAdapter) + .registerTypeAdapter(NumberRange.FloatRange::class.java, FloatNumberRangeAdapter) + .registerTypeAdapter(TypeToken.getParameterized(Collection::class.java, Box::class.java).type, BoxCollectionAdapter) + .registerTypeAdapter(Box::class.java, BoxAdapter) + .registerTypeAdapter(Vec3d::class.java, VerboseVec3dAdapter) + .registerTypeAdapter(Identifier::class.java, IdentifierAdapter) + .registerTypeAdapter(IntRange::class.java, VerboseIntRangeAdapter) + .registerTypeAdapter(Color::class.java, LiteralHexColorAdapter) + .registerTypeAdapter(Stat::class.java, CobblemonStatTypeAdapter) + .registerTypeAdapter(Expression::class.java, ExpressionAdapter) + .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter) + .registerTypeAdapter( + TypeToken.getParameterized( + TypeToken.get(List::class.java).type, + TypeToken.get(ActionEffectKeyframe::class.java).type + ).type, + SingleToPluralAdapter(ActionEffectKeyframe::class.java) { it } + ) + .create() + + override val typeToken: TypeToken = TypeToken.get(ActionEffectTimeline::class.java) + override val resourcePath = "action_effects" + + val actionEffects = mutableMapOf() + override fun reload(data: Map) { + actionEffects.clear() + actionEffects.putAll(data) + observable.emit(this) + } + + override fun sync(player: ServerPlayerEntity) {} +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ActionEffectKeyframe.kt new file mode 100644 index 0000000000..6e4c64ad32 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ActionEffectKeyframe.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import java.util.concurrent.CompletableFuture + +/** + * A single component of an action effect. When played it must return a completable future that completes + * when the action this keyframe represents is finished. [interrupt] is provided for when something successfully + * interrupts the effect so that if any cancellation logic is necessary, it can be provided. + * + * @author Hiroku + * @since October 26th, 2023 + */ +interface ActionEffectKeyframe { + companion object { + val types = mutableMapOf>() + + inline fun register(type: String) { + types[type] = T::class.java + } + } + + fun play(context: ActionEffectContext): CompletableFuture + fun interrupt(context: ActionEffectContext) {} + fun skip(): CompletableFuture = CompletableFuture.completedFuture(Unit) +} diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AddHoldsActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AddHoldsActionEffectKeyframe.kt new file mode 100644 index 0000000000..e9e01b8daf --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AddHoldsActionEffectKeyframe.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import java.util.concurrent.CompletableFuture + +/** + * An [ActionEffectKeyframe] that adds some holds from the context for future code to recognize as blocking some + * functionality from proceeding. + * + * @author Hiroku + * @since October 27th, 2023 + */ +class AddHoldsActionEffectKeyframe : ActionEffectKeyframe { + val holds = mutableSetOf() + override fun play(context: ActionEffectContext): CompletableFuture { + context.holds.addAll(holds) + return CompletableFuture.completedFuture(Unit) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AnimationActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AnimationActionEffectKeyframe.kt new file mode 100644 index 0000000000..54c5c45d44 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/AnimationActionEffectKeyframe.kt @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.bedrockk.molang.Expression +import com.cobblemon.mod.common.CobblemonNetwork.sendPacket +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.EntityProvider +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import com.cobblemon.mod.common.api.scheduling.delayedFuture +import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket +import com.cobblemon.mod.common.util.asExpressionLike +import java.util.concurrent.CompletableFuture +import net.minecraft.server.world.ServerWorld + +class AnimationActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe { + var delay = "0".asExpressionLike() + var visibilityRange = 200 + var animation: Set = setOf("physical") + var variables: List = listOf() + override val entityCondition = "q.entity.is_user".asExpressionLike() + + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + val entities = context.providers + .filterIsInstance() + .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } } + + val expressions = variables.map { it.originalString }.toSet() + + // Treat them as expressions if possible but otherwise yeah just send them as strings + val animation = animation.map { + try { + it.asExpressionLike().resolveString(context.runtime).takeIf { it != "0.0" } ?: it + } catch (e: Exception) { + it + } + }.toSet() + + for (entity in entities) { + val world = entity.world as ServerWorld + val players = world.getPlayers { it.distanceTo(entity) <= visibilityRange } + val pkt = PlayPoseableAnimationPacket(entity.id, animation = animation, expressions = expressions) + players.forEach { it.sendPacket(pkt) } + } + + return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CanInterruptActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CanInterruptActionEffectKeyframe.kt new file mode 100644 index 0000000000..7f2c66a391 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CanInterruptActionEffectKeyframe.kt @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import java.util.concurrent.CompletableFuture + +class CanInterruptActionEffectKeyframe : ConditionalActionEffectKeyframe() { + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + context.canBeInterrupted = true + return CompletableFuture.completedFuture(Unit) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CannotInterruptActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CannotInterruptActionEffectKeyframe.kt new file mode 100644 index 0000000000..54a8785b2c --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/CannotInterruptActionEffectKeyframe.kt @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import java.util.concurrent.CompletableFuture + +class CannotInterruptActionEffectKeyframe : ConditionalActionEffectKeyframe() { + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + context.canBeInterrupted = true + return CompletableFuture.completedFuture(Unit) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ConditionalActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ConditionalActionEffectKeyframe.kt new file mode 100644 index 0000000000..b418398db7 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ConditionalActionEffectKeyframe.kt @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.util.asExpressionLike +import java.util.concurrent.CompletableFuture + +abstract class ConditionalActionEffectKeyframe : ActionEffectKeyframe { + var condition: ExpressionLike = "true".asExpressionLike() + override fun play(context: ActionEffectContext): CompletableFuture { + return if (condition.resolveBoolean(context.runtime)) { + playWhenTrue(context) + } else { + skip() + } + } + + abstract fun playWhenTrue(context: ActionEffectContext): CompletableFuture +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityConditionalActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityConditionalActionEffectKeyframe.kt new file mode 100644 index 0000000000..6d97975123 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityConditionalActionEffectKeyframe.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.bedrockk.molang.runtime.struct.QueryStruct +import com.bedrockk.molang.runtime.value.DoubleValue +import com.bedrockk.molang.runtime.value.StringValue +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import net.minecraft.entity.Entity + +/** + * An action effect keyframe that plays for all entities for which the condition is true. + * + * @author Hiroku + * @since January 21st, 2024 + */ +interface EntityConditionalActionEffectKeyframe { + val entityCondition: ExpressionLike + fun test(context: ActionEffectContext, entity: Entity, isUser: Boolean): Boolean { + // TODO this should use the entity's own query struct + context.runtime.environment.getQueryStruct().addFunction("entity") { + QueryStruct(hashMapOf()) + .addFunction("uuid") { StringValue(entity.uuidAsString) } + .addFunction("is_user") { DoubleValue(isUser) } + } + return entityCondition.resolveBoolean(context.runtime) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityMoLangActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityMoLangActionEffectKeyframe.kt new file mode 100644 index 0000000000..dc2bb37236 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityMoLangActionEffectKeyframe.kt @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.CobblemonNetwork.sendPacket +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.EntityProvider +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import com.cobblemon.mod.common.api.scheduling.delayedFuture +import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket +import com.cobblemon.mod.common.util.asExpressionLike +import java.util.concurrent.CompletableFuture +import net.minecraft.server.world.ServerWorld + +/** + * An action effect keyframe that will run client-side MoLang for all entities that fit the entity condition. + * + * This MoLang executes within that entity's runtime, meaning you can trigger animations or locational particles + * or sounds. + * + * @author Hiroku + * @since October 30th, 2023 + */ +class EntityMoLangActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe { + var delay = "0".asExpressionLike() + val expressions = mutableSetOf() + val visibilityRange = 200 + override val entityCondition: ExpressionLike = "q.entity.is_user".asExpressionLike() + + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + val entities = context.providers + .filterIsInstance() + .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } } + + for (entity in entities) { + val world = entity.world as ServerWorld + val players = world.getPlayers { it.distanceTo(entity) <= visibilityRange } + val pkt = RunPosableMoLangPacket(entityId = entity.id, expressions = expressions) + players.forEach { it.sendPacket(pkt) } + } + + return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true) + } +} diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt new file mode 100644 index 0000000000..e48606bfaa --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntityParticlesActionEffectKeyframe.kt @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.CobblemonNetwork.sendPacket +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.EntityProvider +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import com.cobblemon.mod.common.api.scheduling.delayedFuture +import com.cobblemon.mod.common.entity.Poseable +import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket +import com.cobblemon.mod.common.util.asExpressionLike +import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace +import java.util.concurrent.CompletableFuture +import net.minecraft.server.world.ServerWorld + +/** + * Spawns particles on the entity based on the given particle effect and locator. + * + * @author Hiroku + * @since January 21st, 2024 + */ +class EntityParticlesActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe { + override val entityCondition = "q.entity.is_user".asExpressionLike() + var effect: String? = null + var locator: String = "root" + val delay: ExpressionLike = "0".asExpressionLike() + val visibilityRange = 200 + + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + val entities = context.providers + .filterIsInstance() + .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } } + + val effectIdentifier = try { + effect?.asExpressionLike()?.resolveString(context.runtime) + } catch (e: Exception) { + effect + }?.asIdentifierDefaultingNamespace() ?: return skip() + + entities.filter { it is Poseable }.forEach { entity -> + val packet = SpawnSnowstormEntityParticlePacket(effectIdentifier, entity.id, locator) + val players = (entity.world as ServerWorld).getPlayers { it.distanceTo(entity) <= visibilityRange } + packet.sendToPlayers(players) + } + + return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntitySoundActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntitySoundActionEffectKeyframe.kt new file mode 100644 index 0000000000..a016dfff3c --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/EntitySoundActionEffectKeyframe.kt @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.EntityProvider +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import com.cobblemon.mod.common.api.scheduling.delayedFuture +import com.cobblemon.mod.common.util.asExpressionLike +import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace +import java.util.concurrent.CompletableFuture +import net.minecraft.registry.RegistryKeys + +/** + * An action effect keyframe that plays a positioned sound for all matching entities. + * + * @author Hiroku + * @since January 21st, 2024 + */ +class EntitySoundActionEffectKeyframe : ConditionalActionEffectKeyframe(), EntityConditionalActionEffectKeyframe { + override val entityCondition = "q.entity.is_user".asExpressionLike() + var sound: String? = null + val delay: ExpressionLike = "0".asExpressionLike() + + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + val entities = context.providers + .filterIsInstance() + .flatMap { prov -> prov.entities.filter { test(context, it, isUser = prov is UsersProvider) } } + + val soundIdentifier = try { + sound?.asExpressionLike()?.resolveString(context.runtime)?.takeIf { it != "0.0" } ?: sound + } catch (e: Exception) { + sound + }?.asIdentifierDefaultingNamespace() ?: return skip() + + entities.forEach { entity -> + val soundEvent = entity.world.registryManager.get(RegistryKeys.SOUND_EVENT).get(soundIdentifier) ?: return skip() + entity.playSound(soundEvent, 1f, 1f) + } + + return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ForkActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ForkActionEffectKeyframe.kt new file mode 100644 index 0000000000..0e3f9de0c5 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ForkActionEffectKeyframe.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.util.asExpressionLike +import java.util.concurrent.CompletableFuture + +class ForkActionEffectKeyframe( + val condition: ExpressionLike = "true".asExpressionLike(), + val ifTrue: List = listOf(), + val ifFalse: List = listOf() +) : ActionEffectKeyframe { + override fun play(context: ActionEffectContext): CompletableFuture { + val future = CompletableFuture() + /* + * Using .toList() before running chainKeyframes because iterators can be weird about sharing, + * .toList() creates a copy of the list and then grabs its iterator so much safer (three parachutes) + */ + if (!condition.resolveBoolean(context.runtime)) { + context.actionEffect.chainKeyframes(context, ifFalse.toList().iterator(), future) + } else { + context.actionEffect.chainKeyframes(context, ifTrue.toList().iterator(), future) + } + + return future + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoLangActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoLangActionEffectKeyframe.kt new file mode 100644 index 0000000000..f6c29459e7 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoLangActionEffectKeyframe.kt @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.scheduling.delayedFuture +import com.cobblemon.mod.common.util.asExpressionLike +import java.util.concurrent.CompletableFuture + +/** + * An action effect keyframe that simply executes some MoLang on the effect context's runtime. + * + * @author Hiroku + * @since January 21st, 2024 + */ +class MoLangActionEffectKeyframe : ActionEffectKeyframe { + val expressions: ExpressionLike = "0".asExpressionLike() + val delay: ExpressionLike = "0".asExpressionLike() + override fun play(context: ActionEffectContext): CompletableFuture { + expressions.resolve(context.runtime) + return delayedFuture(seconds = delay.resolveFloat(context.runtime), serverThread = true) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoveToTargetActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoveToTargetActionEffectKeyframe.kt new file mode 100644 index 0000000000..2891efec49 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/MoveToTargetActionEffectKeyframe.kt @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline +import com.cobblemon.mod.common.api.moves.animations.ActionEffects +import com.cobblemon.mod.common.api.moves.animations.TargetsProvider +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import com.cobblemon.mod.common.api.scheduling.afterOnServer +import com.cobblemon.mod.common.entity.pokemon.PokemonEntity +import com.cobblemon.mod.common.entity.pokemon.ai.PokemonNavigation +import com.cobblemon.mod.common.util.asExpressionLike +import java.util.concurrent.CompletableFuture +import kotlin.math.pow +import kotlin.math.sqrt +import net.minecraft.util.Identifier + +class MoveToTargetActionEffectKeyframe : ActionEffectKeyframe { + val speed = 1F + val timeout = "4".asExpressionLike() + var proximity = -1F + val timeoutActionEffect: Identifier? = null + + override fun play(context: ActionEffectContext): CompletableFuture { + val user = context.findOneProvider()?.entities?.firstOrNull() as? PokemonEntity ?: return CompletableFuture.completedFuture(Unit) + val target = context.findOneProvider()?.entities?.firstOrNull() ?: return CompletableFuture.completedFuture(Unit) + + val future = CompletableFuture() + + var timedOut = false + + val proximity = this.proximity.takeIf { it != -1F } ?: (sqrt(2 * user.boundingBox.xLength.pow(2)) + 1.5F + sqrt(2 * target.boundingBox.xLength.pow(2))).toFloat() + + if (target.distanceTo(user) !in proximity..20F) { + future.complete(Unit) + return future + } + + val timeoutEffect = timeoutActionEffect?.let { ActionEffects.actionEffects[it] } ?: ActionEffectTimeline.NONE + + val nav = user.navigation + val navContext = PokemonNavigation.NavigationContext( + destinationProximity = proximity, + onArrival = { + if (!future.isDone && !timedOut) { + future.complete(Unit) + } + }, + onCannotReach = { + if (!future.isDone && !timedOut) { + timedOut = true + timeoutEffect.run(context).thenApply { future.complete(Unit) } + } + } + ) + + afterOnServer(seconds = timeout.resolveFloat(context.runtime)) { + if (!future.isDone && !timedOut) { + timedOut = true + timeoutEffect.run(context).thenApply { future.complete(Unit) } + nav.stop() + } + } + + nav.startMovingTo(target.x, target.y, target.z, speed.toDouble(), navContext) + return future + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ParallelActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ParallelActionEffectKeyframe.kt new file mode 100644 index 0000000000..fff351df42 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ParallelActionEffectKeyframe.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import java.util.concurrent.CompletableFuture + +class ParallelActionEffectKeyframe : ConditionalActionEffectKeyframe() { + var keyframes: MutableList = mutableListOf() + + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + return CompletableFuture.allOf( + *keyframes.map { + context.currentKeyframes.add(it) + it.play(context).thenRun { context.currentKeyframes.remove(it) } + }.toTypedArray() + ).thenApply {} // Map Void -> Unit at the end + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/PauseActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/PauseActionEffectKeyframe.kt new file mode 100644 index 0000000000..71d4cd9cc5 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/PauseActionEffectKeyframe.kt @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.scheduling.delayedFuture +import com.cobblemon.mod.common.util.asExpressionLike + +class PauseActionEffectKeyframe : ConditionalActionEffectKeyframe() { + val pause = "1".asExpressionLike() + override fun playWhenTrue(context: ActionEffectContext) = delayedFuture(seconds = pause.resolveFloat(context.runtime), serverThread = true) +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RemoveHoldsActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RemoveHoldsActionEffectKeyframe.kt new file mode 100644 index 0000000000..9af9c16a67 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RemoveHoldsActionEffectKeyframe.kt @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.scheduling.delayedFuture +import java.util.concurrent.CompletableFuture + +/** + * An [ActionEffectKeyframe] that clears some holds from the context, potentially marking the effect as + * complete as far as any blocked actions are concerned. If no holds are specified, then all holds are + * removed. + * + * @author Hiroku + * @since October 27th, 2023 + */ +class RemoveHoldsActionEffectKeyframe : ActionEffectKeyframe { + val delay = 0F + val holds = mutableSetOf() + override fun play(context: ActionEffectContext): CompletableFuture { + return delayedFuture(seconds = delay, serverThread = true).thenApply { + if (holds.isEmpty()) { + context.holds.clear() + } else { + context.holds.removeAll(holds) + } + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ReturnToPositionActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ReturnToPositionActionEffectKeyframe.kt new file mode 100644 index 0000000000..14d2401f89 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/ReturnToPositionActionEffectKeyframe.kt @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.molang.ObjectValue +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.ActionEffectTimeline +import com.cobblemon.mod.common.api.moves.animations.ActionEffects +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import com.cobblemon.mod.common.api.scheduling.after +import com.cobblemon.mod.common.entity.pokemon.PokemonEntity +import com.cobblemon.mod.common.entity.pokemon.ai.PokemonNavigation +import com.cobblemon.mod.common.util.asExpressionLike +import java.util.concurrent.CompletableFuture +import net.minecraft.util.Identifier +import net.minecraft.util.math.Vec3d + +class ReturnToPositionActionEffectKeyframe : ActionEffectKeyframe { + val speed = 1F + val timeout = "4".asExpressionLike() + val timeoutActionEffect: Identifier? = null + + override fun play(context: ActionEffectContext): CompletableFuture { + val user = context.findOneProvider()?.entities?.firstOrNull() as? PokemonEntity ?: return skip() + val future = CompletableFuture() + + val pos = (context.runtime.environment.getValue(setOf("${user.uuidAsString}-pos").iterator())?.value() as? ObjectValue<*>)?.obj as? Vec3d ?: return skip() + + var timedOut = false + + if (pos.distanceTo(user.pos) > 20) { + future.complete(Unit) + return future + } + + val timeoutEffect = timeoutActionEffect?.let { ActionEffects.actionEffects[it] } ?: ActionEffectTimeline.NONE + + val nav = user.navigation + val navContext = PokemonNavigation.NavigationContext( + onArrival = { + if (!future.isDone && !timedOut) { + future.complete(Unit) + } + }, + onCannotReach = { + if (!future.isDone && !timedOut) { + timedOut = true + timeoutEffect.run(context).thenApply { future.complete(Unit) } + } + } + ) + + after(seconds = timeout.resolveFloat(context.runtime), serverThread = true) { + if (!future.isDone && !timedOut) { + timedOut = true + timeoutEffect.run(context).thenApply { future.complete(Unit) } + nav.stop() + } + } + + nav.startMovingTo(pos.x, pos.y, pos.z, speed.toDouble(), navContext) + return future + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RunActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RunActionEffectKeyframe.kt new file mode 100644 index 0000000000..60615f900c --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/RunActionEffectKeyframe.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.ActionEffects +import java.util.concurrent.CompletableFuture +import net.minecraft.util.Identifier + +/** + * An action effect keyframe that simply runs another action effect based on an identifier. This action + * effect is marked complete only when the action effect it runs is complete unless [waitForActionEffect] is + * false. + * + * @author Hiroku + * @since January 21st, 2024 + */ +class RunActionEffectKeyframe : ConditionalActionEffectKeyframe() { + val actionEffect: Identifier? = null + val waitForActionEffect = true + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + return if (actionEffect != null) { + ActionEffects.actionEffects[actionEffect]?.run(context)?.takeIf { waitForActionEffect } ?: skip() + } else { + skip() + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SavePositionActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SavePositionActionEffectKeyframe.kt new file mode 100644 index 0000000000..fa460fa703 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SavePositionActionEffectKeyframe.kt @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.molang.ObjectValue +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.UsersProvider +import java.util.concurrent.CompletableFuture + +class SavePositionActionEffectKeyframe: ConditionalActionEffectKeyframe() { + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + val user = context.findOneProvider()?.entities?.firstOrNull() ?: return skip() + context.runtime.environment.setSimpleVariable("${user.uuidAsString}-pos", ObjectValue(user.pos)) + return skip() + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SequenceActionEffectKeyframe.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SequenceActionEffectKeyframe.kt new file mode 100644 index 0000000000..9845a6e2b6 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/moves/animations/keyframes/SequenceActionEffectKeyframe.kt @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.api.moves.animations.keyframes + +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import java.util.concurrent.CompletableFuture + +/** + * A sequence of action effects that are dependent on a condition. + * + * @author Hiroku + * @since October 29th, 2023 + */ +class SequenceActionEffectKeyframe(val keyframes: List = listOf()) : ConditionalActionEffectKeyframe() { + override fun playWhenTrue(context: ActionEffectContext): CompletableFuture { + val future = CompletableFuture() + context.actionEffect.chainKeyframes(context, keyframes.toList().iterator(), future) + return future + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/scheduling/SchedulingFunctions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/scheduling/SchedulingFunctions.kt index 622921ea45..5133e3f6cd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/scheduling/SchedulingFunctions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/scheduling/SchedulingFunctions.kt @@ -8,13 +8,27 @@ package com.cobblemon.mod.common.api.scheduling +import java.util.concurrent.CompletableFuture + @Deprecated("Use afterOnServer or afterOnClient; ambiguous side is not good for your health") @JvmOverloads + + fun after(ticks: Int = 0, seconds: Float = 0F, serverThread: Boolean = false, action: () -> Unit) { val scheduler = if (serverThread) ServerTaskTracker else ClientTaskTracker scheduler.after(seconds = seconds + ticks / 20F, action) } +fun delayedFuture(ticks: Int = 0, seconds: Float = 0F, serverThread: Boolean = false): CompletableFuture { + val future = CompletableFuture() + if (ticks == 0 && seconds == 0F) { + future.complete(Unit) + } else { + after(ticks = ticks, seconds = seconds, serverThread = serverThread) { future.complete(Unit) } + } + return future +} + /** * Delayed task is created to run on the main thread. This is for when the task * being completed after the delay does things like entity removal or other thread-unsafe actions. diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/MoLangCurve.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/MoLangCurve.kt index b70cd3b246..33f97d299e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/MoLangCurve.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/MoLangCurve.kt @@ -25,6 +25,7 @@ import com.mojang.serialization.DynamicOps import com.mojang.serialization.codecs.ListCodec import com.mojang.serialization.codecs.PrimitiveCodec import com.mojang.serialization.codecs.RecordCodecBuilder +import com.mojang.serialization.codecs.UnboundedMapCodec import kotlin.math.floor import net.minecraft.network.PacketByteBuf @@ -44,6 +45,7 @@ interface MoLangCurve : CodecMapped { registerSubtype(CurveType.LINEAR, LinearMoLangCurve::class.java, LinearMoLangCurve.CODEC) registerSubtype(CurveType.CATMULL_ROM, CatmullRomMoLangCurve::class.java, CatmullRomMoLangCurve.CODEC) registerSubtype(CurveType.BEZIER, BezierMoLangCurve::class.java, BezierMoLangCurve.CODEC) + registerSubtype(CurveType.BEZIER_CHAIN, BezierChainMoLangCurve::class.java, BezierChainMoLangCurve.CODEC) } } @@ -164,6 +166,103 @@ class CatmullRomMoLangCurve( } } +class BezierChainMoLangCurve( + override var name: String = "variable", + override var input: Expression = NumberExpression(0.5), + var nodes: Map = emptyMap() +) : MoLangCurve { + var nodePairs: List = emptyList() + + fun deriveNodePairs() { + val nodePairs = mutableListOf() + val sortedNodes = nodes.entries.sortedBy { it.key } + for (i in 1 until sortedNodes.size) { + val node1 = sortedNodes[i - 1] + val node2 = sortedNodes[i] + + nodePairs.add(BezierChainNodePair(node1.key, node2.key, node1.value, node2.value)) + } + this.nodePairs = nodePairs + } + + init { + deriveNodePairs() + } + + class BezierChainNode(var value: Double, var slope: Double) { + fun writeToBuffer(buffer: PacketByteBuf) { + buffer.writeDouble(value) + buffer.writeDouble(slope) + } + + fun readFromBuffer(buffer: PacketByteBuf) { + value = buffer.readDouble() + slope = buffer.readDouble() + } + + companion object { + val CODEC = RecordCodecBuilder.create { instance -> + instance.group( + PrimitiveCodec.DOUBLE.fieldOf("value").forGetter { it.value }, + PrimitiveCodec.DOUBLE.fieldOf("slope").forGetter { it.slope } + ).apply(instance, ::BezierChainNode) + } + } + } + + class BezierChainNodePair( + val startTime: Double, + val endTime: Double, + node1: BezierChainNode, + node2: BezierChainNode + ) { + val curve: CubedBezierCurve + init { + val v1 = node1.value + val v2 = node1.value + node1.slope / 3 + val v3 = node2.value - node2.slope / 3 + val v4 = node2.value + curve = CubedBezierCurve(v1, v2, v3, v4) + } + } + + class BezierChainPointData(val time: Double, val value: Double, val slope: Double) + + companion object { + val CODEC: Codec = RecordCodecBuilder.create { instance -> + instance.group( + PrimitiveCodec.STRING.fieldOf("type").forGetter { it.type.name }, + PrimitiveCodec.STRING.fieldOf("name").forGetter { it.name }, + EXPRESSION_CODEC.fieldOf("input").forGetter { it.input }, + UnboundedMapCodec(PrimitiveCodec.DOUBLE, BezierChainNode.CODEC).fieldOf("nodes").forGetter { it.nodes } + ).apply(instance) { _, name, input, nodes -> BezierChainMoLangCurve(name, input, nodes) } + } + } + + override val type: CurveType = CurveType.BEZIER_CHAIN + override fun resolve(runtime: MoLangRuntime, inputValue: Double): Double { + val position = inputValue.coerceIn(0.0, 1.0) + val nodePair = nodePairs.last { position >= it.startTime } + val curve = nodePair.curve + val t = (position - nodePair.startTime) / (nodePair.endTime - nodePair.startTime) + return curve.getY(t) + } + + override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) + override fun readFromBuffer(buffer: PacketByteBuf) { + name = buffer.readString() + input = MoLang.createParser(buffer.readString()).parseExpression() + nodes = buffer.readMap({ buffer.readDouble() }, { BezierChainNode(0.0, 0.0).also { it.readFromBuffer(buffer) } }) + deriveNodePairs() + } + + override fun writeToBuffer(buffer: PacketByteBuf) { + buffer.writeString(name) + buffer.writeString(input.getString()) + buffer.writeMap(nodes, { pb, key -> pb.writeDouble(key) }, { pb, value -> value.writeToBuffer(pb) }) + } +} + class BezierMoLangCurve( override var name: String = "variable", override var input: Expression = NumberExpression(0.5), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt index c83e83b5fc..5aaeacc219 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/api/snowstorm/ParticleMotion.kt @@ -17,6 +17,7 @@ import com.cobblemon.mod.common.api.data.ArbitrarilyMappedSerializableCompanion import com.cobblemon.mod.common.client.particle.ParticleStorm import com.cobblemon.mod.common.util.codec.EXPRESSION_CODEC import com.cobblemon.mod.common.util.getString +import com.cobblemon.mod.common.util.math.geometry.transformDirection import com.cobblemon.mod.common.util.resolveDouble import com.mojang.serialization.Codec import com.mojang.serialization.DynamicOps @@ -135,7 +136,13 @@ class InwardsMotionDirection : ParticleMotionDirection { } override val type = ParticleMotionDirectionType.INWARDS - override fun getDirectionVector(runtime: MoLangRuntime, storm: ParticleStorm, emitterPos: Vec3d, particlePos: Vec3d) = emitterPos.subtract(particlePos).normalize() + override fun getDirectionVector(runtime: MoLangRuntime, storm: ParticleStorm, emitterPos: Vec3d, particlePos: Vec3d): Vec3d { + return if (particlePos == emitterPos) { + Vec3d(storm.world.random.nextDouble() - 0.5, storm.world.random.nextDouble() - 0.5, storm.world.random.nextDouble() - 0.5) + } else { + particlePos.subtract(emitterPos) + }.normalize() + } override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) override fun readFromBuffer(buffer: PacketByteBuf) {} override fun writeToBuffer(buffer: PacketByteBuf) {} @@ -151,7 +158,11 @@ class OutwardsMotionDirection : ParticleMotionDirection { override val type = ParticleMotionDirectionType.OUTWARDS override fun getDirectionVector(runtime: MoLangRuntime, storm: ParticleStorm, emitterPos: Vec3d, particlePos: Vec3d): Vec3d { - return particlePos.subtract(emitterPos).normalize() + return if (particlePos == emitterPos) { + Vec3d(storm.world.random.nextDouble() - 0.5, storm.world.random.nextDouble() - 0.5, storm.world.random.nextDouble() - 0.5) + } else { + particlePos.subtract(emitterPos) + }.normalize() } override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) @@ -185,7 +196,7 @@ class CustomMotionDirection( runtime.resolveDouble(direction.second), runtime.resolveDouble(direction.third) ) - return if (storm.effect.space.localPosition) storm.transformDirection(v) else v + return storm.matrixWrapper.matrix.transformDirection(v) } override fun encode(ops: DynamicOps) = CODEC.encodeStart(ops, this) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt index c57fd23cb2..bb015386c1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/ShowdownInterpreter.kt @@ -39,15 +39,7 @@ import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction import com.cobblemon.mod.common.battles.dispatch.UntilDispatch import com.cobblemon.mod.common.battles.dispatch.WaitDispatch import com.cobblemon.mod.common.battles.interpreter.ContextManager -import com.cobblemon.mod.common.battles.interpreter.instructions.DamageInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.DeprecatedInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.DeprecatedSplitInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.FaintInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.IgnoredInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.MoveInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.TurnInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.UnknownInstruction -import com.cobblemon.mod.common.battles.interpreter.instructions.UpkeepInstruction +import com.cobblemon.mod.common.battles.interpreter.instructions.* import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket import com.cobblemon.mod.common.net.messages.client.battle.BattleMadeInvalidChoicePacket @@ -124,12 +116,13 @@ object ShowdownInterpreter { updateInstructionParser["upkeep"] = { _, _, _, _ -> UpkeepInstruction() } updateInstructionParser["faint"] = { battle, _, message, _ -> FaintInstruction(battle, message) } updateInstructionParser["move"] = { _, instructionSet, message, _ -> MoveInstruction(instructionSet, message) } - splitInstructionParser["-damage"] = { _, targetActor, _, publicMessage, privateMessage, _ -> - DamageInstruction(targetActor, publicMessage, privateMessage) + updateInstructionParser["-activate"] = { _, instructionSet, message, _ -> ActivateInstruction(instructionSet, message) } + updateInstructionParser["-ability"] = { _, instructionSet, message, _ -> AbilityInstruction(instructionSet, message) } + updateInstructionParser["-miss"] = { battle, instructionSet, message, _ -> MissInstruction(battle, instructionSet, message) } + splitInstructionParser["-damage"] = { _, targetActor, instructionSet, publicMessage, privateMessage, _ -> + DamageInstruction(instructionSet, targetActor, publicMessage, privateMessage) } - - // Note '-cureteam' is a legacy thing that is only used in generation 2 and 4 mods for heal bell and aromatherapy respectively as such we can just ignore that updateInstructions["|win|"] = this::handleWinInstruction @@ -143,11 +136,9 @@ object ShowdownInterpreter { updateInstructions["|-fail|"] = this::handleFailInstruction updateInstructions["|-start|"] = this::handleStartInstructions updateInstructions["|-block|"] = this::handleBlockInstructions - updateInstructions["|-activate|"] = this::handleActivateInstructions updateInstructions["|-curestatus|"] = this::handleCureStatusInstruction updateInstructions["|-fieldstart|"] = this::handleFieldStartInstructions updateInstructions["|-fieldend|"] = this::handleFieldEndInstructions - updateInstructions["|-ability|"] = this::handleAbilityInstructions updateInstructions["|-endability|"] = this::handleEndAbilityInstruction updateInstructions["|-nothing"] = { battle, _, _ -> battle.dispatchGo { battle.broadcastChatMessage(battleLang("nothing")) } @@ -169,7 +160,6 @@ object ShowdownInterpreter { updateInstructions["|-invertboost|"] = this::handleInvertBoostInstruction updateInstructions["|-status|"] = this::handleStatusInstruction updateInstructions["|-end|"] = this::handleEndInstruction - updateInstructions["|-miss|"] = this::handleMissInstruction updateInstructions["|-hitcount|"] = this::handleHitCountInstruction updateInstructions["|-item|"] = this::handleItemInstruction updateInstructions["|-enditem|"] = this::handleEndItemInstruction @@ -594,20 +584,6 @@ object ShowdownInterpreter { } } - /** - * Format: - * |-miss|SOURCE|TARGET - * - * The move used by the SOURCE Pokémon missed (maybe absent) the TARGET Pokémon. - */ - private fun handleMissInstruction(battle: PokemonBattle, message: BattleMessage, remainingLines: MutableList) { - battle.dispatchWaiting(1.5F) { - val pokemon = message.getBattlePokemon(0, battle) ?: return@dispatchWaiting - battle.broadcastChatMessage(battleLang("missed").red()) - battle.minorBattleActions[pokemon.uuid] = message - } - } - /** * Format: * |-immune|POKEMON @@ -663,7 +639,7 @@ object ShowdownInterpreter { val effectID = message.effectAt(1)?.id ?: return@dispatchWaiting val name = pokemon.getName() // Move may be null as it's not always given - val moveName = message.moveAt(2)?.displayName ?: run { println(message.argumentAt(2)); "(Unrecognized: ${message.argumentAt(2)})".text() } + val moveName = message.moveAt(2)?.displayName ?: run { "(Unrecognized: ${message.argumentAt(2)})".text() } val lang = when (effectID) { // TODO: in the games they use a generic image because there is a popup of the ability and the sprite of the mon, it may be good to have a similar system here @@ -995,46 +971,6 @@ object ShowdownInterpreter { } } - /** - * Format: - * |-activate|POKEMON|EFFECT - * - * A miscellaneous effect has activated.This is triggered whenever an effect could not be better described by one of the other minor messages. - */ - private fun handleActivateInstructions(battle: PokemonBattle, message: BattleMessage, remainingLines: MutableList){ - val pokemon = message.getBattlePokemon(0, battle) ?: return - val pokemonName = pokemon.getName() - val sourceName = message.getSourceBattlePokemon(battle)?.getName() ?: Text.literal("UNKNOWN") - val effect = message.effectAt(1) ?: return - val extraEffect = message.effectAt(2)?.typelessData ?: Text.literal("UNKNOWN") - broadcastOptionalAbility(battle, effect, pokemonName) - - battle.dispatch{ - this.lastCauser[battle.battleId] = message - battle.minorBattleActions[pokemon.uuid] = message - - val lang = when (effect.id) { - // Includes a 3rd argument being the magnitude level as a number - "magnitude" -> battleLang("activate.magnitude", message.argumentAt(2)?.toIntOrNull() ?: 1) - // Includes spited move and the PP it was reduced by - "spite", "eeriespell" -> battleLang("activate.spite", pokemonName, extraEffect, message.argumentAt(3)!!) - // Don't need additional lang, announced elsewhere - "toxicdebris", "shedskin" -> return@dispatch GO - // Add activation to each Pokemon's history - "destinybond" -> { - battle.activePokemon.mapNotNull { it.battlePokemon?.uuid }.forEach { battle.minorBattleActions[it] = message } - battleLang("activate.destinybond", pokemonName) - } - "focussash", "focusband" -> battleLang("activate.focusband", pokemonName, effect.typelessData) - "maxguard", "protect" -> battleLang("activate.protect", pokemonName) - "shadowforce", "hyperspacefury", "hyperspacehole" -> battleLang("activate.phantomforce", pokemonName) - else -> battleLang("activate.${effect.id}", pokemonName, sourceName, extraEffect) - } - battle.broadcastChatMessage(lang) - WaitDispatch(1F) - } - } - /** * Format: * |-fieldstart|CONDITION @@ -1092,54 +1028,6 @@ object ShowdownInterpreter { } } - /** - * Format: - * |-ability|POKEMON|ABILITY|(from)EFFECT - * - * The ABILITY of the POKEMON has been changed due to a move/ability EFFECT. - * - * Format: - * |-ability|POKEMON|ABILITY - * - * POKEMON has just switched-in, and its ability ABILITY is being announced to have a long-term effect. - */ - private fun handleAbilityInstructions(battle: PokemonBattle, message: BattleMessage, remainingLines: MutableList) { - val pokemon = message.getBattlePokemon(0, battle) ?: return - val pokemonName = pokemon.getName() - val effect = message.effectAt(1) ?: return - val optionalEffect = message.effect() - val optionalPokemon = message.getSourceBattlePokemon(battle) - val optionalPokemonName = optionalPokemon?.getName() - - // If there is an optional effect causing the activation, broadcast that instead of the standard effect - if (optionalEffect != null) { - broadcastAbility(battle, optionalEffect, pokemonName) - } else { - broadcastAbility(battle, effect, pokemonName) - } - - battle.dispatch { - this.lastCauser[battle.battleId] = message - - val lang = when (optionalEffect?.id) { - "trace" -> optionalPokemonName?.let { battleLang("ability.trace", pokemonName, it, effect.typelessData) } - "receiver", "powerofalchemy" -> optionalPokemonName?.let { battleLang("ability.receiver", it, effect.typelessData) } // Receiver and Power of Alchemy share the same text - else -> when (effect.id) { - "sturdy", "unnerve", "anticipation" -> battleLang("ability.${effect.id}", pokemonName) // Unique message - "airlock", "cloudnine" -> battleLang("ability.airlock") // Cloud Nine shares the same text as Air Lock - else -> null // Effect broadcasted by a succeeding instruction - } - } - - battle.minorBattleActions[pokemon.uuid] = message - if (lang != null) { - battle.broadcastChatMessage(lang) - return@dispatch WaitDispatch(1F) - } - else return@dispatch GO - } - } - fun broadcastOptionalAbility(battle: PokemonBattle, effect: Effect?, pokemonName: MutableText) { if (effect != null && effect.type == Effect.Type.ABILITY) broadcastAbility(battle, effect, pokemonName) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/CauserInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/CauserInstruction.kt new file mode 100644 index 0000000000..bc45f3db2c --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/CauserInstruction.kt @@ -0,0 +1,11 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.battles.dispatch + +interface CauserInstruction \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/InstructionSet.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/InstructionSet.kt index 96628f6b3e..66137095f8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/InstructionSet.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/dispatch/InstructionSet.kt @@ -9,9 +9,11 @@ package com.cobblemon.mod.common.battles.dispatch import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import org.objectweb.asm.tree.analysis.Interpreter class InstructionSet { val instructions: MutableList = mutableListOf() + fun getSubsequentInstructions(instruction: InterpreterInstruction): List { val index = instructions.indexOf(instruction) return instructions.subList(index + 1, instructions.size).toList() @@ -22,6 +24,31 @@ class InstructionSet { return instructions.subList(0, index).toList() } + inline fun getMostRecentInstruction(comparedTo: InterpreterInstruction, predicate: (T) -> Boolean = { true }): T? { + val index = instructions.indexOf(comparedTo) + return instructions.subList(0, index).filterIsInstance().lastOrNull(predicate) + } + + fun findInstructionsCausedBy(causerInstruction: CauserInstruction): List { + causerInstruction as InterpreterInstruction + val thisCauseIndex = instructions.indexOf(causerInstruction) + if (thisCauseIndex == instructions.size - 1) { + return emptyList() + } + val nextCauseIndex = getNextInstruction(causerInstruction)?.let { instructions.indexOf(it as InterpreterInstruction) } + return instructions.subList(thisCauseIndex + 1, nextCauseIndex ?: instructions.size) + } + + inline fun getNextInstruction(comparedTo: InterpreterInstruction, predicate: (T) -> Boolean = { true }): T? { + val index = instructions.indexOf(comparedTo) + if (instructions.last() == comparedTo) { + return null + } + return instructions.subList(index + 1, instructions.size).filterIsInstance().firstOrNull(predicate) + } + + fun getMostRecentCauser(comparedTo: InterpreterInstruction) = getMostRecentInstruction(comparedTo) + fun execute(battle: PokemonBattle) { instructions.forEach { it(battle) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/AbilityInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/AbilityInstruction.kt new file mode 100644 index 0000000000..5d2b58dae7 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/AbilityInstruction.kt @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.battles.interpreter.instructions + +import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage +import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.battles.ShowdownInterpreter +import com.cobblemon.mod.common.battles.dispatch.CauserInstruction +import com.cobblemon.mod.common.battles.dispatch.GO +import com.cobblemon.mod.common.battles.dispatch.InstructionSet +import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.battles.dispatch.WaitDispatch +import com.cobblemon.mod.common.util.battleLang + +/** + * Format: + * |-ability|POKEMON|ABILITY|(from)EFFECT + * + * The ABILITY of the POKEMON has been changed due to a move/ability EFFECT. + * + * Format: + * |-ability|POKEMON|ABILITY + * + * POKEMON has just switched-in, and its ability ABILITY is being announced to have a long-term effect. + */ +class AbilityInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : InterpreterInstruction, CauserInstruction { + override fun invoke(battle: PokemonBattle) { + val pokemon = message.getBattlePokemon(0, battle) ?: return + val pokemonName = pokemon.getName() + val effect = message.effectAt(1) ?: return + val optionalEffect = message.effect() + val optionalPokemon = message.getSourceBattlePokemon(battle) + val optionalPokemonName = optionalPokemon?.getName() + + // If there is an optional effect causing the activation, broadcast that instead of the standard effect + if (optionalEffect != null) { + ShowdownInterpreter.broadcastAbility(battle, optionalEffect, pokemonName) + } else { + ShowdownInterpreter.broadcastAbility(battle, effect, pokemonName) + } + + battle.dispatch { + ShowdownInterpreter.lastCauser[battle.battleId] = message + + val lang = when (optionalEffect?.id) { + "trace" -> optionalPokemonName?.let { battleLang("ability.trace", pokemonName, it, effect.typelessData) } + "receiver", "powerofalchemy" -> optionalPokemonName?.let { battleLang("ability.receiver", it, effect.typelessData) } // Receiver and Power of Alchemy share the same text + else -> when (effect.id) { + "sturdy", "unnerve", "anticipation" -> battleLang("ability.${effect.id}", pokemonName) // Unique message + "airlock", "cloudnine" -> battleLang("ability.airlock") // Cloud Nine shares the same text as Air Lock + else -> null // Effect broadcasted by a succeeding instruction + } + } + + battle.minorBattleActions[pokemon.uuid] = message + if (lang != null) { + battle.broadcastChatMessage(lang) + return@dispatch WaitDispatch(1F) + } + else return@dispatch GO + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt new file mode 100644 index 0000000000..fdfeb908aa --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/ActivateInstruction.kt @@ -0,0 +1,62 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.battles.interpreter.instructions + +import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage +import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.battles.ShowdownInterpreter +import com.cobblemon.mod.common.battles.dispatch.CauserInstruction +import com.cobblemon.mod.common.battles.dispatch.GO +import com.cobblemon.mod.common.battles.dispatch.InstructionSet +import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.battles.dispatch.WaitDispatch +import com.cobblemon.mod.common.util.battleLang +import net.minecraft.text.Text + +/** + * Format: + * |-activate|POKEMON|EFFECT + * + * A miscellaneous effect has activated.This is triggered whenever an effect could not be better described by one of the other minor messages. + */ +class ActivateInstruction(val instructionSet: InstructionSet, val message: BattleMessage) : InterpreterInstruction, CauserInstruction { + override fun invoke(battle: PokemonBattle) { + val pokemon = message.getBattlePokemon(0, battle) ?: return + val pokemonName = pokemon.getName() + val sourceName = message.getSourceBattlePokemon(battle)?.getName() ?: Text.literal("UNKNOWN") + val effect = message.effectAt(1) ?: return + val extraEffect = message.effectAt(2)?.typelessData ?: Text.literal("UNKNOWN") + ShowdownInterpreter.broadcastOptionalAbility(battle, effect, pokemonName) + + battle.dispatch{ + ShowdownInterpreter.lastCauser[battle.battleId] = message + battle.minorBattleActions[pokemon.uuid] = message + + val lang = when (effect.id) { + // Includes a 3rd argument being the magnitude level as a number + "magnitude" -> battleLang("activate.magnitude", message.argumentAt(2)?.toIntOrNull() ?: 1) + // Includes spited move and the PP it was reduced by + "spite", "eeriespell" -> battleLang("activate.spite", pokemonName, extraEffect, message.argumentAt(3)!!) + // Don't need additional lang, announced elsewhere + "toxicdebris", "shedskin" -> return@dispatch GO + // Add activation to each Pokemon's history + "destinybond" -> { + battle.activePokemon.mapNotNull { it.battlePokemon?.uuid }.forEach { battle.minorBattleActions[it] = message } + battleLang("activate.destinybond", pokemonName) + } + "focussash", "focusband" -> battleLang("activate.focusband", pokemonName, effect.typelessData) + "maxguard", "protect" -> battleLang("activate.protect", pokemonName) + "shadowforce", "hyperspacefury", "hyperspacehole" -> battleLang("activate.phantomforce", pokemonName) + else -> battleLang("activate.${effect.id}", pokemonName, sourceName, extraEffect) + } + battle.broadcastChatMessage(lang) + WaitDispatch(1F) + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt index b3b6fc1454..447eeb118d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/DamageInstruction.kt @@ -15,24 +15,34 @@ import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.api.text.red import com.cobblemon.mod.common.battles.ShowdownInterpreter import com.cobblemon.mod.common.battles.dispatch.GO +import com.cobblemon.mod.common.battles.dispatch.InstructionSet import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.battles.dispatch.UntilDispatch import com.cobblemon.mod.common.battles.dispatch.WaitDispatch +import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket import com.cobblemon.mod.common.net.messages.client.battle.BattleHealthChangePacket import com.cobblemon.mod.common.pokemon.evolution.progress.DamageTakenEvolutionProgress import com.cobblemon.mod.common.pokemon.evolution.progress.RecoilEvolutionProgress import com.cobblemon.mod.common.util.battleLang import com.cobblemon.mod.common.util.lang +import java.util.concurrent.CompletableFuture import kotlin.math.roundToInt import net.minecraft.text.Text class DamageInstruction( + val instructionSet: InstructionSet, val actor: BattleActor, val publicMessage: BattleMessage, val privateMessage: BattleMessage ) : InterpreterInstruction { + var future = CompletableFuture.completedFuture(Unit) + val battlePokemon = publicMessage.getBattlePokemon(0, actor.battle) + override fun invoke(battle: PokemonBattle) { - val battlePokemon = publicMessage.getBattlePokemon(0, battle) ?: return - if (privateMessage.optionalArgument("from")?.equals("recoil", true) == true) { + battlePokemon ?: return + val recoiling = privateMessage.optionalArgument("from")?.equals("recoil", true) == true + val lastCauser = instructionSet.getMostRecentCauser(comparedTo = this) + if (recoiling) { battlePokemon.effectedPokemon.let { pokemon -> if (RecoilEvolutionProgress.supports(pokemon)) { val newPercentage = privateMessage.argumentAt(1)?.split("/")?.getOrNull(0)?.toIntOrNull() ?: 0 @@ -48,10 +58,34 @@ class DamageInstruction( val newHealth = privateMessage.argumentAt(1)?.split(" ")?.get(0) ?: return val effect = privateMessage.effect() val pokemonName = battlePokemon.getName() - val sourceName = privateMessage.getSourceBattlePokemon(battle)?.getName() ?: Text.literal("UNKOWN") - ShowdownInterpreter.broadcastOptionalAbility(battle, effect, sourceName) + val sourceName = privateMessage.getSourceBattlePokemon(battle)?.getName() ?: Text.literal("UNKNOWN") + var causedFaint = newHealth == "0" battle.dispatch { + if (lastCauser is MoveInstruction && recoiling) { + UntilDispatch { "recoil" !in lastCauser.holds } + } else { + GO + } + } + + battle.dispatch { + if (!causedFaint) { + + battlePokemon.entity?.let { pokemonEntity -> + val pkt = PlayPoseableAnimationPacket(pokemonEntity.id, setOf("recoil"), emptySet()) + pkt.sendToPlayersAround( + x = pokemonEntity.x, + y = pokemonEntity.y, + z = pokemonEntity.z, + worldKey = pokemonEntity.world.registryKey, + distance = 50.0 + ) + } + } + + + ShowdownInterpreter.broadcastOptionalAbility(battle, effect, sourceName) val newHealthRatio: Float val remainingHealth = newHealth.split("/")[0].toInt() @@ -70,8 +104,7 @@ class DamageInstruction( battle.broadcastChatMessage(lang.red()) } - var causedFaint = false - if (newHealth == "0") { + if (causedFaint) { newHealthRatio = 0F battle.dispatch { battlePokemon.effectedPokemon.currentHealth = 0 @@ -102,7 +135,9 @@ class DamageInstruction( battle.minorBattleActions[battlePokemon.uuid] = privateMessage // If they faint from this damage then don't bother waiting for the damage to be applied. - if (causedFaint) { + if (lastCauser is MoveInstruction && lastCauser.actionEffect != null && !causedFaint) { + UntilDispatch { lastCauser.future.isDone } + } else if (causedFaint) { GO } else { WaitDispatch(1F) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MissInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MissInstruction.kt new file mode 100644 index 0000000000..a787c0f22b --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MissInstruction.kt @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.battles.interpreter.instructions + +import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage +import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.api.text.red +import com.cobblemon.mod.common.battles.dispatch.InstructionSet +import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.util.battleLang + +/** + * Format: + * |-miss|SOURCE|TARGET + * + * The move used by the SOURCE Pokémon missed (maybe absent) the TARGET Pokémon. + */ +class MissInstruction(val battle: PokemonBattle, val instructionSet: InstructionSet, val message: BattleMessage): InterpreterInstruction { + val target = message.getBattlePokemon(1, battle) + + override fun invoke(battle: PokemonBattle) { + battle.dispatchGo { + val pokemon = message.getBattlePokemon(0, battle) ?: return@dispatchGo + battle.broadcastChatMessage(battleLang("missed").red()) + battle.minorBattleActions[pokemon.uuid] = message + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt index b51b4d2ab7..d01fd5b651 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/battles/interpreter/instructions/MoveInstruction.kt @@ -8,30 +8,55 @@ package com.cobblemon.mod.common.battles.interpreter.instructions +import com.bedrockk.molang.runtime.MoLangRuntime +import com.bedrockk.molang.runtime.value.DoubleValue import com.cobblemon.mod.common.api.battles.interpreter.BattleMessage +import com.cobblemon.mod.common.api.battles.interpreter.Effect import com.cobblemon.mod.common.api.battles.model.PokemonBattle +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunction +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addStandardFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct import com.cobblemon.mod.common.api.moves.Moves +import com.cobblemon.mod.common.api.moves.animations.ActionEffectContext +import com.cobblemon.mod.common.api.moves.animations.TargetsProvider +import com.cobblemon.mod.common.api.moves.animations.UsersProvider import com.cobblemon.mod.common.battles.ShowdownInterpreter +import com.cobblemon.mod.common.battles.dispatch.CauserInstruction +import com.cobblemon.mod.common.battles.dispatch.GO import com.cobblemon.mod.common.battles.dispatch.InstructionSet import com.cobblemon.mod.common.battles.dispatch.InterpreterInstruction +import com.cobblemon.mod.common.battles.dispatch.UntilDispatch +import com.cobblemon.mod.common.battles.pokemon.BattlePokemon import com.cobblemon.mod.common.pokemon.evolution.progress.UseMoveEvolutionProgress import com.cobblemon.mod.common.util.battleLang +import java.util.concurrent.CompletableFuture class MoveInstruction( val instructionSet: InstructionSet, val message: BattleMessage -) : InterpreterInstruction { +) : InterpreterInstruction, CauserInstruction { + val effect = message.effectAt(1) ?: Effect.pure("", "") + val move = Moves.getByNameOrDummy(effect.id) + val actionEffect = move.actionEffect + + var future = CompletableFuture.completedFuture(Unit) + var holds = mutableSetOf() + + lateinit var userPokemon: BattlePokemon + var targetPokemon: BattlePokemon? = null + override fun invoke(battle: PokemonBattle) { - val userPokemon = message.getBattlePokemon(0, battle) ?: return - val targetPokemon = message.getBattlePokemon(2, battle) - val effect = message.effectAt(1) ?: return + userPokemon = message.getBattlePokemon(0, battle)!! + targetPokemon = message.getBattlePokemon(2, battle) + val targetPokemon = targetPokemon // So smart non-null casts can happen + val optionalEffect = message.effect() - val move = Moves.getByNameOrDummy(effect.id) val pokemonName = userPokemon.getName() ShowdownInterpreter.broadcastOptionalAbility(battle, optionalEffect, pokemonName) + battle.dispatch { UntilDispatch { instructionSet.getMostRecentInstruction(this)?.future?.isDone != false } } - battle.dispatchGo { + battle.dispatch { ShowdownInterpreter.lastCauser[battle.battleId] = message userPokemon.effectedPokemon.let { pokemon -> @@ -50,8 +75,50 @@ class MoveInstruction( battleLang("used_move", pokemonName, move.displayName) } battle.broadcastChatMessage(lang) - battle.majorBattleActions[userPokemon.uuid] = message + + val providers = mutableListOf(battle) + userPokemon.effectedPokemon.entity?.let { UsersProvider(it) }?.let(providers::add) + targetPokemon?.effectedPokemon?.entity?.let { TargetsProvider(it) }?.let(providers::add) + val runtime = MoLangRuntime().also { + battle.addQueryFunctions(it.environment.getQueryStruct()).addStandardFunctions() + } + + actionEffect ?: return@dispatch GO + val context = ActionEffectContext( + actionEffect = actionEffect, + runtime = runtime, + providers = providers + ) + + val subsequentInstructions = instructionSet.findInstructionsCausedBy(this) + val missedTargets = subsequentInstructions.filterIsInstance().mapNotNull { it.target } + + runtime.environment.getQueryStruct().addFunction("missed") { params -> + if (params.params.size == 0) { + return@addFunction DoubleValue(missedTargets.isNotEmpty()) + } else { + val entityUUID = params.getString(0) + return@addFunction DoubleValue(missedTargets.any { it.entity?.uuidAsString == entityUUID }) + } + } + + val hurtTargets = subsequentInstructions.filterIsInstance().mapNotNull { it.battlePokemon } + runtime.environment.getQueryStruct().addFunction("hurt") { params -> + if (params.params.size == 0) { + return@addFunction DoubleValue(hurtTargets.isNotEmpty()) + } else { + val entityUUID = params.getString(0) + return@addFunction DoubleValue(hurtTargets.any { it.entity?.uuidAsString == entityUUID }) + } + } + + runtime.environment.getQueryStruct().addFunction("move") { move.struct } + + this.future = actionEffect.run(context) + holds = context.holds // Reference so future things can check on this action effect's holds + future.thenApply { holds.clear() } + return@dispatch UntilDispatch { "effects" !in holds } } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt index 0fc1003043..131bca8ce8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/EmptyPokeBallClientDelegate.kt @@ -8,7 +8,10 @@ package com.cobblemon.mod.common.client.entity +import com.bedrockk.molang.runtime.value.DoubleValue import com.cobblemon.mod.common.api.entity.EntitySideDelegate +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct import com.cobblemon.mod.common.api.reactive.SettableObservable import com.cobblemon.mod.common.api.reactive.SimpleObservable import com.cobblemon.mod.common.api.scheduling.SchedulingTracker @@ -37,6 +40,11 @@ class EmptyPokeBallClientDelegate : PokeBallPoseableState(), EntitySideDelegate< this.currentEntity = entity age = entity.age initSubscriptions() + this.runtime.environment.getQueryStruct().addFunctions(mapOf( + "pokeball_type" to java.util.function.Function { + return@Function DoubleValue(currentEntity.pokeBall.name.toString()) + } + )) } override fun tick(entity: EmptyPokeBallEntity) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt index b824d1d7a7..b74dcb09a4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/entity/PokemonClientDelegate.kt @@ -8,9 +8,13 @@ package com.cobblemon.mod.common.client.entity +import com.bedrockk.molang.runtime.value.DoubleValue +import com.bedrockk.molang.runtime.value.StringValue import com.cobblemon.mod.common.CobblemonSounds import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.api.entity.PokemonSideDelegate +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct import com.cobblemon.mod.common.api.pokemon.PokemonSpecies import com.cobblemon.mod.common.api.scheduling.SchedulingTracker import com.cobblemon.mod.common.api.scheduling.afterOnClient @@ -91,7 +95,7 @@ class PokemonClientDelegate : PoseableEntityState(), PokemonSideD if (isDying) { val model = (currentModel ?: return) as PokemonPoseableModel val animation = try { - model.getFaintAnimation(currentEntity, this) + model.getAnimation(this, "faint", runtime) } catch (e: Exception) { e.printStackTrace() null @@ -222,6 +226,27 @@ class PokemonClientDelegate : PoseableEntityState(), PokemonSideD override fun initialize(entity: PokemonEntity) { this.currentEntity = entity this.age = entity.age + + this.runtime.environment.getQueryStruct().addFunctions(mapOf( + "in_battle" to java.util.function.Function { + return@Function DoubleValue(currentEntity.isBattling) + }, + "shiny" to java.util.function.Function { + return@Function DoubleValue(currentEntity.pokemon.shiny) + }, + "form" to java.util.function.Function { + return@Function StringValue(currentEntity.pokemon.form.name) + }, + "width" to java.util.function.Function { + return@Function DoubleValue(currentEntity.boundingBox.xLength) + }, + "height" to java.util.function.Function { + return@Function DoubleValue(currentEntity.boundingBox.yLength) + }, + "weight" to java.util.function.Function { + return@Function DoubleValue(currentEntity.pokemon.species.weight.toDouble()) + } + )) } override fun tick(entity: PokemonEntity) { @@ -248,12 +273,16 @@ class PokemonClientDelegate : PoseableEntityState(), PokemonSideD fun cry() { val model = currentModel ?: return if (model is PokemonPoseableModel) { - if (cryAnimation != null && cryAnimation in statefulAnimations) { + if (cryAnimation != null && (cryAnimation in statefulAnimations || cryAnimation == primaryAnimation)) { return } val animation = model.cryAnimation(currentEntity, this) ?: return - statefulAnimations.add(animation) + if (animation is PrimaryAnimation) { + addPrimaryAnimation(animation) + } else { + statefulAnimations.add(animation) + } cryAnimation = animation } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleGimmickButton.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleGimmickButton.kt index 56a4246f86..0a3c350379 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleGimmickButton.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/gui/battle/subscreen/BattleGimmickButton.kt @@ -138,7 +138,8 @@ abstract class BattleGimmickButton(gimmick: ShowdownMoveset.Gimmick, val x: Floa pp = gimmickTemplate?.pp ?: moveTemplate.pp, priority = gimmickTemplate?.priority ?: moveTemplate.priority, critRatio = gimmickTemplate?.critRatio ?: moveTemplate.critRatio, - effectChances = gimmickTemplate?.effectChances ?: moveTemplate.effectChances + effectChances = gimmickTemplate?.effectChances ?: moveTemplate.effectChances, + actionEffect = null ) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/animation/PlayPoseableAnimationHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/animation/PlayPoseableAnimationHandler.kt new file mode 100644 index 0000000000..357d32820f --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/animation/PlayPoseableAnimationHandler.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.client.net.animation + +import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler +import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.entity.Poseable +import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket +import com.cobblemon.mod.common.util.asExpression +import com.cobblemon.mod.common.util.resolve +import net.minecraft.client.MinecraftClient + +object PlayPoseableAnimationHandler : ClientNetworkPacketHandler { + override fun handle(packet: PlayPoseableAnimationPacket, client: MinecraftClient) { + val entity = client.world?.getEntityById(packet.entityId) ?: return + if (entity is Poseable) { + val delegate = entity.delegate + if (delegate is PoseableEntityState<*>) { + for (expr in packet.expressions) { + delegate.runtime.resolve(expr.asExpression()) + } + delegate.addFirstAnimation(packet.animation) + } + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/RunPosableMoLangHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/RunPosableMoLangHandler.kt new file mode 100644 index 0000000000..d0ae547a9f --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/RunPosableMoLangHandler.kt @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.client.net.effect + +import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler +import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.entity.Poseable +import com.cobblemon.mod.common.net.messages.client.effect.RunPosableMoLangPacket +import com.cobblemon.mod.common.util.asExpression +import com.cobblemon.mod.common.util.resolve +import net.minecraft.client.MinecraftClient + +object RunPosableMoLangHandler : ClientNetworkPacketHandler { + override fun handle(packet: RunPosableMoLangPacket, client: MinecraftClient) { + val entity = client.world?.getEntityById(packet.entityId) ?: return + if (entity is Poseable) { + val state = entity.delegate as? PoseableEntityState<*> ?: return + for (expression in packet.expressions.map { it.asExpression() }) { + state.runtime.resolve(expression) + } + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormEntityParticleHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormEntityParticleHandler.kt new file mode 100644 index 0000000000..2ae03c963e --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/effect/SpawnSnowstormEntityParticleHandler.kt @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.client.net.effect + +import com.bedrockk.molang.runtime.MoLangRuntime +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup +import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler +import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient +import com.cobblemon.mod.common.client.particle.BedrockParticleEffectRepository +import com.cobblemon.mod.common.client.particle.ParticleStorm +import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.entity.Poseable +import com.cobblemon.mod.common.net.messages.client.effect.SpawnSnowstormEntityParticlePacket +import net.minecraft.client.MinecraftClient +import net.minecraft.entity.Entity + +object SpawnSnowstormEntityParticleHandler : ClientNetworkPacketHandler { + override fun handle(packet: SpawnSnowstormEntityParticlePacket, client: MinecraftClient) { + val world = MinecraftClient.getInstance().world ?: return + val effect = BedrockParticleEffectRepository.getEffect(packet.effectId) ?: return + val entity = world.getEntityById(packet.entityId) as? Poseable ?: return + entity as Entity + val state = entity.delegate as PoseableEntityState<*> + val matrixWrapper = state.locatorStates[packet.locator] ?: state.locatorStates["root"]!! + + val particleRuntime = MoLangRuntime().setup().setupClient() + particleRuntime.environment.getQueryStruct().addFunction("entity") { state.runtime.environment.getQueryStruct() } + + val storm = ParticleStorm( + effect = effect, + matrixWrapper = matrixWrapper, + world = world, + runtime = particleRuntime, + sourceVelocity = { entity.velocity }, + sourceAlive = { !entity.isRemoved }, + sourceVisible = { !entity.isInvisible } + ) + + storm.spawn() + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/sound/PokemonCryHandler.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/net/sound/PokemonCryHandler.kt deleted file mode 100644 index adf09fa459..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/net/sound/PokemonCryHandler.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.client.net.sound - -import com.cobblemon.mod.common.api.net.ClientNetworkPacketHandler -import com.cobblemon.mod.common.client.entity.PokemonClientDelegate -import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.net.messages.client.sound.PokemonCryPacket -import net.minecraft.client.MinecraftClient - -object PokemonCryHandler : ClientNetworkPacketHandler { - override fun handle(packet: PokemonCryPacket, client: MinecraftClient) { - val entity = client.world?.getEntityById(packet.entityId) ?: return - if (entity is PokemonEntity) { - val delegate = entity.delegate as PokemonClientDelegate - delegate.cry() - } - } -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt index 0d748df09c..99a7f4dc53 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/SnowstormParticle.kt @@ -13,7 +13,6 @@ import com.bedrockk.molang.runtime.value.DoubleValue import com.cobblemon.mod.common.Cobblemon import com.cobblemon.mod.common.ModAPI import com.cobblemon.mod.common.api.snowstorm.ParticleMaterial -import com.cobblemon.mod.common.api.snowstorm.ParticleMaterials import com.cobblemon.mod.common.api.snowstorm.UVDetails import com.cobblemon.mod.common.client.particle.ParticleStorm import com.cobblemon.mod.common.util.resolveBoolean @@ -24,7 +23,8 @@ import kotlin.math.abs import net.minecraft.client.MinecraftClient import net.minecraft.client.particle.Particle import net.minecraft.client.particle.ParticleTextureSheet -import net.minecraft.client.particle.ParticleTextureSheet.* +import net.minecraft.client.particle.ParticleTextureSheet.NO_RENDER +import net.minecraft.client.particle.ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT import net.minecraft.client.render.BufferBuilder import net.minecraft.client.render.Camera import net.minecraft.client.render.VertexConsumer diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt index b1b2a7c541..0d36b44e15 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/BedrockAnimationReferenceFactory.kt @@ -36,6 +36,6 @@ object BedrockAnimationReferenceFactory : AnimationReferenceFactory { return model.bedrockStateful( animationGroup = split[0], animation = split[1] - ).setPreventsIdle(if (split.size == 3) split[2].toBoolean() else JsonPokemonPoseableModel.StatefulAnimationAdapter.preventsIdleDefault) + ) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt index caccc440a9..237033ff4a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPose.kt @@ -8,16 +8,33 @@ package com.cobblemon.mod.common.client.render.models.blockbench +import com.bedrockk.molang.runtime.MoLangRuntime +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup +import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation +import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatelessAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.quirk.SimpleQuirk import com.cobblemon.mod.common.entity.PoseType +import com.cobblemon.mod.common.util.asExpressionLike +import com.cobblemon.mod.common.util.resolveObject import com.google.gson.JsonArray import com.google.gson.JsonObject +import com.google.gson.JsonPrimitive import net.minecraft.entity.Entity import net.minecraft.util.math.Vec3d class JsonPose(model: PoseableEntityModel, json: JsonObject) { - val poseName = json.get("poseName").asString + class JsonPoseTransition(val from: String, val to: String, val animation: ExpressionLike) + + val runtime = MoLangRuntime().setup().setupClient().also { + it.environment.getQueryStruct().addFunctions(model.functions.functions) + } + + val poseName = json.get("poseName")?.asString ?: "pose" val poseTypes = (json.get("poseTypes")?.asJsonArray?.map { name -> PoseType.values().find { it.name.lowercase() == name.asString.lowercase() } ?: throw IllegalArgumentException("Unknown pose type ${name.asString}") @@ -47,18 +64,33 @@ class JsonPose(model: PoseableEntityModel, json: JsonObject) { } else if (animString.startsWith("bedrock")) { val split = animString.replace("bedrock(", "").replace(")", "").split(",").map(String::trim) return@mapNotNull model.bedrock(animationGroup = split[0], animation = split[1]) + } else { + try { + val expression = animString.asExpressionLike() + return@mapNotNull runtime.resolveObject(expression).obj as StatelessAnimation + } catch (exception: Exception) { + null + } } return@mapNotNull null }.toTypedArray() val quirks = (json.get("quirks")?.asJsonArray ?: JsonArray()).map { json -> + if (json is JsonPrimitive) { + return@map json.asString.asExpressionLike().resolveObject(runtime).obj as SimpleQuirk + } + json as JsonObject - val name = json.get("name").asString val animations: (state: PoseableEntityState) -> List> = { _ -> (json.get("animations")?.asJsonArray ?: JsonArray()).map { animJson -> - val split = - animJson.asString.replace("bedrock(", "").replace(")", "").split(",").map(String::trim) - model.bedrockStateful(animationGroup = split[0], animation = split[1]).setPreventsIdle(false) + try { + val expr = animJson.asString.asExpressionLike() + runtime.resolveObject(expr).obj as StatefulAnimation + } catch (e: Exception) { + val split = + animJson.asString.replace("bedrock(", "").replace(")", "").split(",").map(String::trim) + model.bedrockStateful(animationGroup = split[0], animation = split[1]) + } } } @@ -67,11 +99,26 @@ class JsonPose(model: PoseableEntityModel, json: JsonObject) { val maxSeconds = json.get("maxSecondsBetweenOccurrences")?.asFloat ?: 30F model.quirkMultiple( - name = name, secondsBetweenOccurrences = minSeconds to maxSeconds, condition = { true }, loopTimes = 1..loopTimes, animations = animations ) } + + val animations = json.get("namedAnimations")?.takeIf { it is JsonObject }?.asJsonObject?.let { + val map = mutableMapOf() + for ((key, value) in it.entrySet()) { + map[key] = value.asString.asExpressionLike() + } + map + } ?: mutableMapOf() + + val transitions = json.get("transitions")?.takeIf { it is JsonArray }?.asJsonArray?.map { + it as JsonObject + val from = it.get("from").asString + val to = it.get("to").asString + val animation = it.get("animation").asString.asExpressionLike() + JsonPoseTransition(from, to, animation) + } ?: emptyList() } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPoseableEntityModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPoseableEntityModel.kt index aa90f4f7b5..87307611cc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPoseableEntityModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/JsonPoseableEntityModel.kt @@ -87,7 +87,14 @@ abstract class JsonPoseableEntityModel(override val rootPart: Bone) idleAnimations = pose.idleAnimations, transformedParts = pose.transformedParts, quirks = pose.quirks.toTypedArray() - ) + ).also { + it.transitions.putAll( + pose.transitions + .mapNotNull, Pose) -> StatefulAnimation>> { + it.to to { _, _ -> it.animation.resolveObject(model.runtime).obj as StatefulAnimation } + }.toMap() + ) + } } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt index b32488665b..fbd360426c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/LocatorAccess.kt @@ -71,10 +71,6 @@ class LocatorAccess( fun update(matrixStack: MatrixStack, state: MutableMap) { matrixStack.push() joint.transform(matrixStack) - matrixStack.push() - matrixStack.scale(1F, -1F, 1F) - state.getOrPut("root") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) - matrixStack.pop() for ((name, locator) in locators) { matrixStack.push() diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt index c9a93734e4..279b76828e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityModel.kt @@ -8,20 +8,28 @@ package com.cobblemon.mod.common.client.render.models.blockbench +import com.bedrockk.molang.runtime.MoLangRuntime +import com.bedrockk.molang.runtime.struct.ArrayStruct +import com.bedrockk.molang.runtime.struct.QueryStruct +import com.bedrockk.molang.runtime.value.MoValue +import com.cobblemon.mod.common.Cobblemon.LOGGER +import com.cobblemon.mod.common.api.molang.ExpressionLike +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup +import com.cobblemon.mod.common.api.molang.ObjectValue import com.cobblemon.mod.common.api.scheduling.afterOnClient +import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient import com.cobblemon.mod.common.client.entity.PokemonClientDelegate +import com.cobblemon.mod.common.client.render.MatrixWrapper import com.cobblemon.mod.common.client.render.ModelLayer import com.cobblemon.mod.common.client.render.layer.CobblemonRenderLayers -import com.cobblemon.mod.common.client.render.models.blockbench.animation.PoseTransitionAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.animation.RotationFunctionStatelessAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatelessAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.animation.TranslationFunctionStatelessAnimation +import com.cobblemon.mod.common.client.render.models.blockbench.animation.* import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockAnimationRepository import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockStatefulAnimation import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockStatelessAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose @@ -29,11 +37,15 @@ import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk import com.cobblemon.mod.common.client.render.models.blockbench.quirk.SimpleQuirk import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction +import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.sineFunction import com.cobblemon.mod.common.entity.PoseType import com.cobblemon.mod.common.entity.Poseable import com.cobblemon.mod.common.entity.generic.GenericBedrockEntity import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.PokemonEntity +import com.cobblemon.mod.common.util.asExpressionLike +import com.cobblemon.mod.common.util.getDoubleOrNull +import com.cobblemon.mod.common.util.getStringOrNull import net.minecraft.client.model.ModelPart import net.minecraft.client.render.OverlayTexture import net.minecraft.client.render.RenderLayer @@ -82,6 +94,9 @@ abstract class PoseableEntityModel( @Transient var currentState: PoseableEntityState? = null + val animations = mutableMapOf() + val transitions = mutableMapOf() + /** * A list of [ModelPartTransformation] that record the original * This allows the original rotations to be reset. @@ -91,12 +106,218 @@ abstract class PoseableEntityModel( val relevantParts = mutableListOf() val relevantPartsByName = mutableMapOf() + @Transient + val functions = QueryStruct(hashMapOf()) + .addFunction("bedrock_primary") { params -> + val group = params.getString(0) + val animation = params.getString(1) + val anim = bedrockStateful(group, animation) + val excludedLabels = mutableSetOf() + var curve: WaveFunction = { t -> + if (t < 0.1) { + t * 10 + } else if (t < 0.9) { + 1F + } else { + 1F + } + } + for (index in 2 until params.params.size) { + val param = params.get(index) + if (param is ObjectValue<*>) { + curve = param.obj as WaveFunction + continue + } + + val label = params.getString(index) ?: continue + excludedLabels.add(label) + } + + return@addFunction ObjectValue(PrimaryAnimation(animation = anim, excludedLabels = excludedLabels, curve = curve)) + } + .addFunction("bedrock_stateful") { params -> + val group = params.getString(0) + val animation = params.getString(1) + val anim = bedrockStateful(group, animation) + return@addFunction ObjectValue(anim) + } + .addFunction("bedrock") { params -> + val group = params.getString(0) + val animation = params.getString(1) + val anim = bedrock(group, animation) + return@addFunction ObjectValue(anim) + } + .addFunction("look") { params -> + val boneName = params.getString(0) + val pitchMultiplier = params.getDoubleOrNull(1) ?: 1F + val yawMultiplier = params.getDoubleOrNull(2) ?: 1F + val maxPitch = params.getDoubleOrNull(3) ?: 70F + val minPitch = params.getDoubleOrNull(4) ?: -45F + val maxYaw = params.getDoubleOrNull(5) ?: 45F + ObjectValue( + SingleBoneLookAnimation( + frame = this, + bone = getPart(boneName), + pitchMultiplier = pitchMultiplier.toFloat(), + yawMultiplier = yawMultiplier.toFloat(), + maxPitch = maxPitch.toFloat(), + minPitch = minPitch.toFloat(), + maxYaw = maxYaw.toFloat() + ) + ) + } + .addFunction("quadruped_walk") { params -> + val periodMultiplier = params.getDoubleOrNull(0) ?: 0.6662F + val amplitudeMultiplier = params.getDoubleOrNull(1) ?: 1.4F + val leftFrontLeftName = params.getStringOrNull(2) ?: "leg_front_left" + val leftFrontRightName = params.getStringOrNull(3) ?: "leg_front_right" + val leftBackLeftName = params.getStringOrNull(4) ?: "leg_back_left" + val leftBackRightName = params.getStringOrNull(5) ?: "leg_back_right" + + ObjectValue( + QuadrupedWalkAnimation( + frame = this, + periodMultiplier = periodMultiplier.toFloat(), + amplitudeMultiplier = amplitudeMultiplier.toFloat(), + legFrontLeft = this.getPart(leftFrontLeftName), + legFrontRight = this.getPart(leftFrontRightName), + legBackLeft = this.getPart(leftBackLeftName), + legBackRight = this.getPart(leftBackRightName) + ) + ) + } + .addFunction("biped_walk") { params -> + val periodMultiplier = params.getDoubleOrNull(0) ?: 0.6662F + val amplitudeMultiplier = params.getDoubleOrNull(1) ?: 1.4F + val leftLegName = params.getStringOrNull(2) ?: "leg_left" + val rightLegName = params.getStringOrNull(3) ?: "leg_right" + + ObjectValue( + BipedWalkAnimation( + frame = this, + periodMultiplier = periodMultiplier.toFloat(), + amplitudeMultiplier = amplitudeMultiplier.toFloat(), + leftLeg = this.getPart(leftLegName), + rightLeg = this.getPart(rightLegName) + ) + ) + } + .addFunction("bimanual_swing") { params -> + val swingPeriodMultiplier = params.getDoubleOrNull(0) ?: 0.6662F + val amplitudeMultiplier = params.getDoubleOrNull(1) ?: 1F + val leftArmName = params.getStringOrNull(2) ?: "arm_left" + val rightArmName = params.getStringOrNull(3) ?: "arm_right" + + ObjectValue( + BimanualSwingAnimation( + frame = this, + swingPeriodMultiplier = swingPeriodMultiplier.toFloat(), + amplitudeMultiplier = amplitudeMultiplier.toFloat(), + leftArm = this.getPart(leftArmName), + rightArm = this.getPart(rightArmName) + ) + ) + } + .addFunction("sine_wing_flap") { params -> + // verticalShift = -14F.toRadians(), period = 0.9F, amplitude = 0.9F + val amplitude = params.getDoubleOrNull(0) ?: 0.9F + val period = params.getDoubleOrNull(1) ?: 0.9F + val verticalShift = params.getDoubleOrNull(2) ?: 0F + val axis = params.getStringOrNull(3) ?: "y" + val axisIndex = when (axis) { + "x" -> ModelPartTransformation.X_AXIS + "y" -> ModelPartTransformation.Y_AXIS + "z" -> ModelPartTransformation.Z_AXIS + else -> ModelPartTransformation.Y_AXIS + } + val wingLeft = params.getStringOrNull(4) ?: "wing_left" + val wingRight = params.getStringOrNull(5) ?: "wing_right" + + ObjectValue( + WingFlapIdleAnimation( + frame = this, + rotation = sineFunction(verticalShift = verticalShift.toFloat(), period = period.toFloat(), amplitude = amplitude.toFloat()), + axis = axisIndex, + leftWing = this.getPart(wingLeft), + rightWing = this.getPart(wingRight) + ) + ) + } + .addFunction("bedrock_quirk") { params -> + val animationGroup = params.getString(0) + val animationNames = params.get(1)?.let { if (it is ArrayStruct) it.map.values.map { it.asString() } else listOf(it.asString()) } ?: listOf() + val minSeconds = params.getDoubleOrNull(2) ?: 8F + val maxSeconds = params.getDoubleOrNull(3) ?: 30F + val loopTimes = params.getDoubleOrNull(4)?.toInt() ?: 1 + ObjectValue( + quirk( + secondsBetweenOccurrences = minSeconds.toFloat() to maxSeconds.toFloat(), + condition = { true }, + loopTimes = 1..loopTimes, + animation = { bedrockStateful(animationGroup, animationNames.random()) } + ) + ) + } + + @Transient + val runtime = MoLangRuntime().setup().setupClient().also { it.environment.getQueryStruct().addFunctions(functions.functions) } + /** Registers the different poses this model is capable of ahead of time. Should use [registerPose] religiously. */ abstract fun registerPoses() /** Gets the [PoseableEntityState] for an entity. */ abstract fun getState(entity: T): PoseableEntityState + fun getAnimation(state: PoseableEntityState<*>, name: String, runtime: MoLangRuntime): StatefulAnimation? { + val poseAnimations = state.currentPose?.let(this::getPose)?.animations ?: mapOf() + val animation = resolveFromAnimationMap(poseAnimations, name, runtime) + ?: resolveFromAnimationMap(animations, name, runtime) + ?: if (name == "cry" && this is PokemonPoseableModel) { + cryAnimation.invoke(state.getEntity() as PokemonEntity, state as PoseableEntityState) as? StatefulAnimation + } else if (name == "faint" && this is PokemonPoseableModel) { + getFaintAnimation(state.getEntity() as PokemonEntity, state as PoseableEntityState) as? StatefulAnimation + } else { + try { + name.asExpressionLike().resolveObject(runtime).obj as StatefulAnimation + } catch (exception: Exception) { + extractAnimation(name) + } + } + return animation + } + + /** + * Animation group : animation name [: primary] + * e.g. "particle_dummy:animation.particle_dummy.dragon_claw_target:primary" + * e.g. "particle_dummy:animation.particle.dummy.stat_up + */ + fun extractAnimation(string: String): StatefulAnimation? { + val group = string.substringBefore(":") + val animationName = string.substringAfter(":").substringBefore(":") + val isPrimary = string.endsWith(":primary") + if (animationName.isNotBlank() && animationName != string) { + val animation = BedrockAnimationRepository.tryGetAnimation(group, animationName) ?: return null + return if (isPrimary) { + PrimaryAnimation(BedrockStatefulAnimation(animation)) + } else { + BedrockStatefulAnimation(animation) + } + } else { + return null + } + } + + private fun resolveFromAnimationMap(map: Map, name: String, runtime: MoLangRuntime): StatefulAnimation? { + val animationExpression = map[name] ?: return null + return try { + animationExpression.resolveObject(runtime).obj as StatefulAnimation + } catch (e: Exception) { + LOGGER.error("Failed to create animation by name $name, most likely something wrong in the MoLang") + e.printStackTrace() + null + } + } + fun withLayerContext( buffer: VertexConsumerProvider, state: PoseableEntityState?, @@ -145,6 +366,7 @@ abstract class PoseableEntityModel( poseType: PoseType, condition: ((T) -> Boolean)? = null, transformTicks: Int = 10, + animations: MutableMap = mutableMapOf(), onTransitionedInto: (PoseableEntityState?) -> Unit = {}, idleAnimations: Array> = emptyArray(), transformedParts: Array = emptyArray(), @@ -156,6 +378,7 @@ abstract class PoseableEntityModel( condition, onTransitionedInto, transformTicks, + animations, idleAnimations, transformedParts, quirks @@ -169,6 +392,7 @@ abstract class PoseableEntityModel( poseTypes: Set, condition: ((T) -> Boolean)? = null, transformTicks: Int = 10, + animations: MutableMap = mutableMapOf(), onTransitionedInto: (PoseableEntityState?) -> Unit = {}, idleAnimations: Array> = emptyArray(), transformedParts: Array = emptyArray(), @@ -180,6 +404,7 @@ abstract class PoseableEntityModel( condition, onTransitionedInto, transformTicks, + animations, idleAnimations, transformedParts, quirks @@ -193,6 +418,7 @@ abstract class PoseableEntityModel( poseType: PoseType, condition: ((T) -> Boolean)? = null, transformTicks: Int = 10, + animations: MutableMap = mutableMapOf(), onTransitionedInto: (PoseableEntityState?) -> Unit = {}, idleAnimations: Array> = emptyArray(), transformedParts: Array = emptyArray(), @@ -204,6 +430,7 @@ abstract class PoseableEntityModel( condition, onTransitionedInto, transformTicks, + animations, idleAnimations, transformedParts, quirks @@ -436,7 +663,7 @@ abstract class PoseableEntityModel( val desirablePose = poses.values.firstOrNull { (entityPoseType == null || entityPoseType in it.poseTypes) && it.isSuitable(entity) } - ?: Pose("none", setOf(PoseType.NONE), null, {}, 0, emptyArray(), emptyArray(), emptyArray()) + ?: Pose("none", setOf(PoseType.NONE), null, {}, 0, mutableMapOf(), emptyArray(), emptyArray(), emptyArray()) // If this condition matches then it just no longer fits this pose if (pose != null && poseName != null) { @@ -467,7 +694,8 @@ abstract class PoseableEntityModel( } if (primaryAnimation != null) { - state.primaryOverridePortion = 1 - primaryAnimation.curve((state.animationSeconds - primaryAnimation.started) / primaryAnimation.duration) + val portion = (state.animationSeconds - primaryAnimation.started) / primaryAnimation.duration + state.primaryOverridePortion = 1 - primaryAnimation.curve(portion) if (!primaryAnimation.run(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, 1 - state.primaryOverridePortion)) { state.primaryAnimation = null state.primaryOverridePortion = 1F @@ -478,7 +706,7 @@ abstract class PoseableEntityModel( .filterNot { it.run(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, 1F) } state.statefulAnimations.removeAll(removedStatefuls) state.currentPose?.let { getPose(it) } - ?.idleStateful(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, state.primaryOverridePortion) + ?.idleStateful(entity, this, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch) if (entity != null) { updateLocators(state) } @@ -506,7 +734,7 @@ abstract class PoseableEntityModel( val desirablePoseType = desirablePose.poseTypes.first() if (state.statefulAnimations.none { it.isTransform }) { - val transition = previousPose.transitions[desirablePose] + val transition = previousPose.transitions[desirablePose.poseName] if (transition == null && previousPose.transformTicks > 0) { val primaryAnimation = PrimaryAnimation( PoseTransitionAnimation( @@ -543,18 +771,21 @@ abstract class PoseableEntityModel( fun updateLocators(state: PoseableEntityState) { val entity = context.request(RenderContext.ENTITY) ?: return val matrixStack = MatrixStack() + var scale = 1F // We could improve this to be generalized for other entities if (entity is PokemonEntity) { matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(180 - entity.bodyYaw)) matrixStack.push() matrixStack.scale(-1F, -1F, 1F) - val scale = entity.pokemon.form.baseScale * entity.pokemon.scaleModifier * (entity.delegate as PokemonClientDelegate).entityScaleModifier + scale = entity.pokemon.form.baseScale * entity.pokemon.scaleModifier * (entity.delegate as PokemonClientDelegate).entityScaleModifier + matrixStack.scale(scale, scale, scale) } else if (entity is EmptyPokeBallEntity) { matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(entity.yaw)) matrixStack.push() matrixStack.scale(1F, -1F, -1F) - matrixStack.scale(0.7F, 0.7F, 0.7F) + scale = 0.7F + matrixStack.scale(scale, scale, scale) } else if (entity is GenericBedrockEntity) { matrixStack.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(entity.yaw)) matrixStack.push() @@ -562,12 +793,27 @@ abstract class PoseableEntityModel( matrixStack.scale(1F, -1F, 1F) } + matrixStack.push() + matrixStack.scale(1F, -1F, 1F) + val states = state.locatorStates + states.getOrPut("root") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) + matrixStack.pop() + if (isForLivingEntityRenderer) { // Standard living entity offset, only God knows why Mojang did this. matrixStack.translate(0.0, -1.5, 0.0) } - locatorAccess.update(matrixStack, state.locatorStates) + // If we have the entity, put in an approximation of the target locator. If the model has one defined, + // this will be overridden. + matrixStack.push() + matrixStack.translate(0.0, -entity.boundingBox.yLength / 2.0 / scale + 1.5F, -entity.width * 0.6 / scale) + matrixStack.scale(1F, -1F, 1F) + states.getOrPut("target") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) + states.getOrPut("special_attack") { MatrixWrapper() }.updateMatrix(matrixStack.peek().positionMatrix) + matrixStack.pop() + + locatorAccess.update(matrixStack, states) } fun ModelPart.translation( @@ -606,21 +852,17 @@ abstract class PoseableEntityModel( fun bedrockStateful( animationGroup: String, animation: String, - animationPrefix: String = "animation.$animationGroup", - preventsIdleCheck: (T?, PoseableEntityState, StatelessAnimation) -> Boolean = { _, _, _ -> true } - ) = BedrockStatefulAnimation( + animationPrefix: String = "animation.$animationGroup" + ) = BedrockStatefulAnimation( BedrockAnimationRepository.getAnimation(animationGroup, "$animationPrefix.$animation"), - preventsIdleCheck ) fun quirk( - name: String, secondsBetweenOccurrences: Pair = 8F to 30F, loopTimes: IntRange = 1..1, condition: (state: PoseableEntityState) -> Boolean = { true }, animation: (state: PoseableEntityState) -> StatefulAnimation ) = SimpleQuirk( - name = name, secondsBetweenOccurrences = secondsBetweenOccurrences, loopTimes = loopTimes, condition = condition, @@ -628,16 +870,33 @@ abstract class PoseableEntityModel( ) fun quirkMultiple( - name: String, secondsBetweenOccurrences: Pair = 8F to 30F, loopTimes: IntRange = 1..1, condition: (state: PoseableEntityState) -> Boolean = { true }, animations: (state: PoseableEntityState) -> List> ) = SimpleQuirk( - name = name, secondsBetweenOccurrences = secondsBetweenOccurrences, loopTimes = loopTimes, condition = condition, animations = { animations(it) } ) + + val dummyAnimation = object : StatefulAnimation { + override val isTransform = false + override val duration: Float = 1F + + override fun run( + entity: T?, + model: PoseableEntityModel, + state: PoseableEntityState, + limbSwing: Float, + limbSwingAmount: Float, + ageInTicks: Float, + headYaw: Float, + headPitch: Float, + intensity: Float + ): Boolean { + return false + } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt index ddbbc76a99..6efc3a6414 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/PoseableEntityState.kt @@ -9,20 +9,46 @@ package com.cobblemon.mod.common.client.render.models.blockbench import com.bedrockk.molang.runtime.MoLangRuntime +import com.bedrockk.molang.runtime.struct.VariableStruct +import com.bedrockk.molang.runtime.value.DoubleValue +import com.bedrockk.molang.runtime.value.MoValue +import com.bedrockk.molang.runtime.value.StringValue +import com.cobblemon.mod.common.Cobblemon.LOGGER +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunction +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct +import com.cobblemon.mod.common.api.molang.ObjectValue +import com.cobblemon.mod.common.api.text.text +import com.cobblemon.mod.common.client.particle.BedrockParticleEffectRepository +import com.cobblemon.mod.common.client.particle.ParticleStorm +import com.cobblemon.mod.common.client.entity.GenericBedrockClientDelegate import com.cobblemon.mod.common.api.molang.MoLangFunctions.setup import com.cobblemon.mod.common.api.scheduling.Schedulable +import com.cobblemon.mod.common.client.ClientMoLangFunctions.setupClient import com.cobblemon.mod.common.client.render.MatrixWrapper import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatelessAnimation import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockParticleKeyframe +import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockStatefulAnimation import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockStatelessAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.client.render.models.blockbench.quirk.ModelQuirk import com.cobblemon.mod.common.client.render.models.blockbench.quirk.QuirkData +import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction +import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunctions +import com.cobblemon.mod.common.entity.Poseable +import com.cobblemon.mod.common.util.asExpression +import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace +import com.cobblemon.mod.common.util.resolve import java.util.concurrent.ConcurrentLinkedQueue +import net.minecraft.client.MinecraftClient +import net.minecraft.client.sound.PositionedSoundInstance +import net.minecraft.client.world.ClientWorld import net.minecraft.entity.Entity +import net.minecraft.sound.SoundCategory +import net.minecraft.sound.SoundEvent import net.minecraft.util.math.Vec3d /** @@ -35,13 +61,90 @@ import net.minecraft.util.math.Vec3d */ abstract class PoseableEntityState : Schedulable { var currentModel: PoseableEntityModel? = null + set(value) { + field = value + runtime.environment.getQueryStruct().addFunctions(value?.functions?.functions ?: hashMapOf()) + } var currentPose: String? = null var primaryAnimation: PrimaryAnimation? = null val statefulAnimations: MutableList> = mutableListOf() val quirks = mutableMapOf, QuirkData>() val poseParticles = mutableListOf() - val runtime = MoLangRuntime().setup().also { - it.environment.structs["query"] = it.environment.structs["variable"] + val runtime = MoLangRuntime().setup().setupClient().also { runtime -> + val reusableAnimTime = DoubleValue(0.0) // This gets called 500 million times so use a mutable value for runtime + runtime.environment.getQueryStruct().addFunctions(mapOf( + "anim_time" to java.util.function.Function { return@Function reusableAnimTime.also { it.value = animationSeconds.toDouble() } }, + "pose_type" to java.util.function.Function { return@Function StringValue((getEntity() as Poseable).getCurrentPoseType().name) }, + "pose" to java.util.function.Function { _ -> return@Function StringValue(currentPose ?: "") }, + "say" to java.util.function.Function { params -> MinecraftClient.getInstance().player?.sendMessage(params.getString(0).text()) ?: Unit }, + "sound" to java.util.function.Function { params -> + val entity = getEntity() ?: return@Function Unit + if (params.get(0) !is StringValue) { + return@Function Unit + } + val soundEvent = SoundEvent.of(params.getString(0).asIdentifierDefaultingNamespace()) + if (soundEvent != null) { + val volume = if (params.contains(1)) params.getDouble(1).toFloat() else 1F + val pitch = if (params.contains(2)) params.getDouble(2).toFloat() else 1F + MinecraftClient.getInstance().soundManager.play( + PositionedSoundInstance(soundEvent, SoundCategory.NEUTRAL, volume, pitch, entity.world.random, entity.x, entity.y, entity.z) + ) + } + }, + "play_animation" to java.util.function.Function { params -> + val animationParameter = params.get(0) + val animation = if (animationParameter is ObjectValue<*>) { + animationParameter.obj as BedrockStatefulAnimation + } else { + currentModel?.getAnimation(this, animationParameter.asString(), runtime) + } + if (animation != null) { + if (animation is PrimaryAnimation) { + addPrimaryAnimation(animation) + } else { + addStatefulAnimation(animation) + } + } + return@Function Unit + }, + "particle" to java.util.function.Function { params -> + val particlesParam = params.get(0) + val particles = mutableListOf() + when (particlesParam) { + is StringValue -> particles.add(particlesParam.value) + is VariableStruct -> particles.addAll(particlesParam.map.values.map { it.asString() }) + else -> return@Function Unit + } + + val effectIds = particles.map { it.asIdentifierDefaultingNamespace() } + for (effectId in effectIds) { + val locator = if (params.params.size > 1) params.getString(1) else "root" + val effect = BedrockParticleEffectRepository.getEffect(effectId) ?: run { + LOGGER.error("Unable to find a particle effect with id $effectId") + return@Function Unit + } + + val entity = getEntity() ?: return@Function Unit + val world = entity.world as ClientWorld + val matrixWrapper = locatorStates[locator] ?: locatorStates["root"]!! + + val particleRuntime = MoLangRuntime().setup().setupClient() + particleRuntime.environment.getQueryStruct().addFunction("entity") { runtime.environment.getQueryStruct() } + + val storm = ParticleStorm( + effect = effect, + matrixWrapper = matrixWrapper, + world = world, + runtime = particleRuntime, + sourceVelocity = { entity.velocity }, + sourceAlive = { !entity.isRemoved }, + sourceVisible = { !entity.isInvisible } + ) + + storm.spawn() + } + } + )) } val allStatefulAnimations: List> get() = statefulAnimations + quirks.flatMap { it.value.animations } @@ -76,6 +179,23 @@ abstract class PoseableEntityState : Schedulable { val renderQueue = ConcurrentLinkedQueue<() -> Unit>() + /** + * Scans through the set of animations provided and begins playing the first one that is registered + * on the entity. The goal is to have most-specific animations first and more generic ones last, so + * where detailed animations exist they will be used and where they don't there is still a fallback. + * + * E.g. ['thunderbolt', 'electric', 'special'] + */ + fun addFirstAnimation(animation: Set) { + val model = currentModel ?: return + val animation = animation.firstNotNullOfOrNull { model.getAnimation(this, it, runtime) } ?: return + if (animation is PrimaryAnimation) { + addPrimaryAnimation(animation) + } else { + addStatefulAnimation(animation) + } + } + fun isPosedIn(vararg poses: Pose) = poses.any { it.poseName == currentPose } fun isNotPosedIn(vararg poses: Pose) = poses.none { it.poseName == currentPose } @@ -155,7 +275,7 @@ abstract class PoseableEntityState : Schedulable { fun shouldIdleRun(idleAnimation: StatelessAnimation, requiredIntensity: Float): Boolean { val primaryAnimation = primaryAnimation return if (primaryAnimation != null) { - !primaryAnimation.prevents(idleAnimation) && this.primaryOverridePortion >= requiredIntensity + !primaryAnimation.prevents(idleAnimation) || this.primaryOverridePortion > requiredIntensity } else { true } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BimanualSwingAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BimanualSwingAnimation.kt index 7b4ea3a38a..e17e2ae6f3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BimanualSwingAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BimanualSwingAnimation.kt @@ -10,7 +10,12 @@ package com.cobblemon.mod.common.client.render.models.blockbench.animation import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.addRotation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame +import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone +import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.Y_AXIS +import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.Z_AXIS import net.minecraft.entity.Entity import net.minecraft.util.math.MathHelper @@ -22,22 +27,36 @@ import net.minecraft.util.math.MathHelper * @since December 21st, 2021 */ class BimanualSwingAnimation( - frame: BimanualFrame, + frame: ModelFrame, /** The multiplier to apply to the cosine movement of the arms. The smaller this value, the quicker the arms move. */ val swingPeriodMultiplier: Float = 0.6662F, /** The multiplier to apply to the swing of the entity. The larger this is, the further the arms move. */ - val amplitudeMultiplier: Float = 1F -) : StatelessAnimation(frame) { - override val targetFrame: Class = BimanualFrame::class.java + val amplitudeMultiplier: Float = 1F, + val leftArm: Bone?, + val rightArm: Bone? +) : StatelessAnimation(frame) { + constructor( + frame: BimanualFrame, + swingPeriodMultiplier: Float = 0.6662F, + amplitudeMultiplier: Float = 1F + ): this( + frame = frame, + swingPeriodMultiplier = swingPeriodMultiplier, + amplitudeMultiplier = amplitudeMultiplier, + leftArm = frame.leftArm, + rightArm = frame.rightArm + ) + + override val targetFrame: Class = ModelFrame::class.java override fun setAngles(entity: T?, model: PoseableEntityModel, state: PoseableEntityState?, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { // Movement swing - frame.rightArm.yaw += MathHelper.cos(limbSwing * swingPeriodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity - frame.leftArm.yaw += MathHelper.cos(limbSwing * swingPeriodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity + rightArm?.addRotation(Y_AXIS, MathHelper.cos(limbSwing * swingPeriodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity) + leftArm?.addRotation(Y_AXIS, MathHelper.cos(limbSwing * swingPeriodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity) // Idle sway - frame.rightArm.roll += 1.0f * (MathHelper.cos(ageInTicks * 0.09f) * 0.05f + 0.05f) * intensity - frame.rightArm.yaw += 1.0f * MathHelper.sin(ageInTicks * 0.067f) * 0.05f * intensity - frame.leftArm.roll += -1.0f * (MathHelper.cos(ageInTicks * 0.09f) * 0.05f + 0.05f) * intensity - frame.leftArm.yaw += -1.0f * MathHelper.sin(ageInTicks * 0.067f) * 0.05f * intensity + rightArm?.addRotation(Z_AXIS, 1.0f * (MathHelper.cos(ageInTicks * 0.09f) * 0.05f + 0.05f) * intensity) + rightArm?.addRotation(Y_AXIS, MathHelper.sin(ageInTicks * 0.067f) * 0.05f * intensity) + leftArm?.addRotation(Z_AXIS, -1.0f * (MathHelper.cos(ageInTicks * 0.09f) * 0.05f + 0.05f) * intensity) + leftArm?.addRotation(Y_AXIS, -1.0f * MathHelper.sin(ageInTicks * 0.067f) * 0.05f * intensity) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BipedWalkAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BipedWalkAnimation.kt index 94f5efbd0a..a88082581c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BipedWalkAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/BipedWalkAnimation.kt @@ -10,7 +10,11 @@ package com.cobblemon.mod.common.client.render.models.blockbench.animation import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.addRotation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone +import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.X_AXIS import net.minecraft.entity.Entity import net.minecraft.util.math.MathHelper @@ -23,15 +27,29 @@ import net.minecraft.util.math.MathHelper * @since December 21st, 2021 */ class BipedWalkAnimation( - frame: BipedFrame, + frame: ModelFrame, /** The multiplier to apply to the cosine movement of the legs. The smaller this value, the quicker the legs move. */ val periodMultiplier: Float = 0.6662F, /** The multiplier to apply to the stride of the entity. The larger this is, the further the legs move. */ - val amplitudeMultiplier: Float = 1.4F -) : StatelessAnimation(frame) { - override val targetFrame: Class = BipedFrame::class.java + val amplitudeMultiplier: Float = 1.4F, + val leftLeg: Bone?, + val rightLeg: Bone? +) : StatelessAnimation(frame) { + constructor( + frame: BipedFrame, + periodMultiplier: Float = 0.6662F, + amplitudeMultiplier: Float = 1.4F + ): this( + frame = frame, + periodMultiplier = periodMultiplier, + amplitudeMultiplier = amplitudeMultiplier, + leftLeg = frame.leftLeg, + rightLeg = frame.rightLeg + ) + + override val targetFrame: Class = ModelFrame::class.java override fun setAngles(entity: T?, model: PoseableEntityModel, state: PoseableEntityState?, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { - frame.rightLeg.pitch += MathHelper.cos(limbSwing * periodMultiplier + Math.PI.toFloat()) * limbSwingAmount * amplitudeMultiplier * intensity - frame.leftLeg.pitch += MathHelper.cos(limbSwing * periodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity + rightLeg?.addRotation(X_AXIS, MathHelper.cos(limbSwing * periodMultiplier + Math.PI.toFloat()) * limbSwingAmount * amplitudeMultiplier * intensity) + leftLeg?.addRotation(X_AXIS, MathHelper.cos(limbSwing * periodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt index 65908a29aa..2da7951993 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/PrimaryAnimation.kt @@ -10,6 +10,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.animation import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction import net.minecraft.entity.Entity @@ -34,11 +35,12 @@ class PrimaryAnimation( } }, val excludedLabels: Set = emptySet(), -) { - val duration = animation.duration + override val isTransform: Boolean = false +): StatefulAnimation { var started = -1F + override val duration: Float = animation.duration - fun run( + override fun run( entity: T?, model: PoseableEntityModel, state: PoseableEntityState, @@ -47,9 +49,9 @@ class PrimaryAnimation( ageInTicks: Float, headYaw: Float, headPitch: Float, - severity: Float + intensity: Float ): Boolean { - return animation.run(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, severity) + return animation.run(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity) } fun prevents(idleAnimation: StatelessAnimation) = idleAnimation.labels.intersect(excludedLabels).isEmpty() && "all" !in excludedLabels diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/QuadrupedWalkAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/QuadrupedWalkAnimation.kt index d0353b7085..b855c6c455 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/QuadrupedWalkAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/QuadrupedWalkAnimation.kt @@ -10,7 +10,11 @@ package com.cobblemon.mod.common.client.render.models.blockbench.animation import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.addRotation +import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.QuadrupedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone +import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.X_AXIS import net.minecraft.entity.Entity import net.minecraft.util.math.MathHelper @@ -23,17 +27,40 @@ import net.minecraft.util.math.MathHelper * @since December 4th, 2021 */ class QuadrupedWalkAnimation( - frame: QuadrupedFrame, + frame: ModelFrame, + val legFrontLeft: Bone?, + val legFrontRight: Bone?, + val legBackLeft: Bone?, + val legBackRight: Bone?, /** The multiplier to apply to the cosine movement of the legs. The smaller this value, the quicker the legs move. */ val periodMultiplier: Float = 0.6662F, /** The multiplier to apply to the stride of the entity. The larger this is, the further the legs move. */ val amplitudeMultiplier: Float = 1.4F -) : StatelessAnimation(frame) { - override val targetFrame: Class = QuadrupedFrame::class.java +) : StatelessAnimation(frame) { + constructor( + frame: QuadrupedFrame, + periodMultiplier: Float = 0.6662F, + amplitudeMultiplier: Float = 1.4F + ): this( + frame = frame, + legFrontLeft = frame.foreLeftLeg, + legFrontRight = frame.foreRightLeg, + legBackLeft = frame.hindLeftLeg, + legBackRight = frame.hindRightLeg, + periodMultiplier = periodMultiplier, + amplitudeMultiplier = amplitudeMultiplier + ) + + override val targetFrame: Class = ModelFrame::class.java override fun setAngles(entity: T?, model: PoseableEntityModel, state: PoseableEntityState?, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { - frame.hindRightLeg.pitch += MathHelper.cos(limbSwing * periodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity - frame.hindLeftLeg.pitch += MathHelper.cos(limbSwing * periodMultiplier + Math.PI.toFloat()) * limbSwingAmount * amplitudeMultiplier * intensity - frame.foreRightLeg.pitch += MathHelper.cos(limbSwing * periodMultiplier + Math.PI.toFloat()) * limbSwingAmount * amplitudeMultiplier * intensity - frame.foreLeftLeg.pitch += MathHelper.cos(limbSwing * periodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity + val hindRightLeg = legBackRight ?: return + val hindLeftLeg = legBackLeft ?: return + val foreRightLeg = legFrontRight ?: return + val foreLeftLeg = legFrontLeft ?: return + + hindRightLeg.addRotation(X_AXIS, MathHelper.cos(limbSwing * periodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity) + hindLeftLeg.addRotation(X_AXIS, MathHelper.cos(limbSwing * periodMultiplier + Math.PI.toFloat()) * limbSwingAmount * amplitudeMultiplier * intensity) + foreRightLeg.addRotation(X_AXIS, MathHelper.cos(limbSwing * periodMultiplier + Math.PI.toFloat()) * limbSwingAmount * amplitudeMultiplier * intensity) + foreLeftLeg.addRotation(X_AXIS, MathHelper.cos(limbSwing * periodMultiplier) * limbSwingAmount * amplitudeMultiplier * intensity) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt index ca329719ce..85b0b2edb0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/SingleBoneLookAnimation.kt @@ -12,6 +12,8 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityMo import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import com.cobblemon.mod.common.client.render.models.blockbench.addRotation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.X_AXIS import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.Y_AXIS import com.cobblemon.mod.common.util.math.geometry.toRadians @@ -25,14 +27,39 @@ import net.minecraft.entity.Entity * @author Hiroku * @since December 5th, 2021 */ -class SingleBoneLookAnimation(frame: HeadedFrame, val invertX: Boolean, val invertY: Boolean, val disableX: Boolean, val disableY: Boolean) : StatelessAnimation(frame) { - override val targetFrame: Class = HeadedFrame::class.java +class SingleBoneLookAnimation( + frame: ModelFrame, + val bone: Bone?, + val pitchMultiplier: Float = 1F, + val yawMultiplier: Float = 1F, + val maxPitch: Float = 70F, + val minPitch: Float = 45F, + val maxYaw: Float = 45F, +) : StatelessAnimation(frame) { + constructor( + frame: HeadedFrame, + invertX: Boolean, + invertY: Boolean, + disableX: Boolean, + disableY: Boolean + ): this( + frame = frame, + bone = frame.head, + pitchMultiplier = if (disableX) 0F else if (invertX) -1F else 1F, + yawMultiplier = if (disableY) 0F else if (invertY) -1F else 1F, + maxPitch = if (invertX) -45F else 45F, + minPitch = if (invertX) -70F else -45F, + maxYaw = if (invertY) -45F else 45F, + ) + + + override val targetFrame: Class = ModelFrame::class.java override var labels = setOf("look") override fun setAngles(entity: T?, model: PoseableEntityModel, state: PoseableEntityState?, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { - val pitch = (if (invertX) -1 else 1) * headPitch.coerceIn(-45F, 70F) - val yaw = (if (invertY) -1 else 1) * headYaw.coerceIn(-45F, 45F) - - (if (!disableX) frame.head.addRotation(X_AXIS, pitch.toRadians() * intensity)) - (if (!disableY) frame.head.addRotation(Y_AXIS, yaw.toRadians() * intensity)) + val head = bone ?: return + val pitch = pitchMultiplier * headPitch.coerceIn(minPitch, maxPitch) + val yaw = yawMultiplier * headYaw.coerceIn(-maxYaw, maxYaw) + head.addRotation(X_AXIS, pitch.toRadians() * intensity) + head.addRotation(Y_AXIS, yaw.toRadians() * intensity) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/WingFlapIdleAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/WingFlapIdleAnimation.kt index 43f80f8b38..066edc7e82 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/WingFlapIdleAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/animation/WingFlapIdleAnimation.kt @@ -12,19 +12,40 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityMo import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import com.cobblemon.mod.common.client.render.models.blockbench.addRotation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame +import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame +import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone import com.cobblemon.mod.common.client.render.models.blockbench.wavefunction.WaveFunction import net.minecraft.entity.Entity +import net.minecraft.item.BoneMealItem + class WingFlapIdleAnimation( - frame: BiWingedFrame, - val flapFunction: WaveFunction, - val timeVariable: (state: PoseableEntityState?, limbSwing: Float, ageInTicks: Float) -> Float?, + frame: ModelFrame, + val leftWing: Bone?, + val rightWing: Bone?, + val rotation: WaveFunction, + val timeVariable: (state: PoseableEntityState?, limbSwing: Float, ageInTicks: Float) -> Float? = { state, _, _ -> state?.animationSeconds ?: 0F }, val axis: Int -) : StatelessAnimation(frame) { - override val targetFrame = BiWingedFrame::class.java +) : StatelessAnimation(frame) { + constructor( + frame: BiWingedFrame, + flapFunction: WaveFunction, + timeVariable: (state: PoseableEntityState?, limbSwing: Float, ageInTicks: Float) -> Float?, + axis: Int + ): this( + frame = frame, + leftWing = frame.leftWing, + rightWing = frame.rightWing, + rotation = flapFunction, + timeVariable = timeVariable, + axis = axis + ) + + override val targetFrame = ModelFrame::class.java override fun setAngles(entity: T?, model: PoseableEntityModel, state: PoseableEntityState?, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { val time = timeVariable(state, limbSwing, ageInTicks) ?: 0F - frame.leftWing.addRotation(axis, flapFunction(time) * intensity) - frame.rightWing.addRotation(axis, -flapFunction(time) * intensity) + val angle = rotation(time) + leftWing?.addRotation(axis, angle) + rightWing?.addRotation(axis, -angle) } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt index fd73b0e290..1e94639c40 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimation.kt @@ -15,6 +15,8 @@ import com.bedrockk.molang.runtime.MoScope import com.bedrockk.molang.runtime.struct.QueryStruct import com.bedrockk.molang.runtime.value.DoubleValue import com.bedrockk.molang.runtime.value.MoValue +import com.cobblemon.mod.common.api.molang.MoLangFunctions.addFunctions +import com.cobblemon.mod.common.api.molang.MoLangFunctions.getQueryStruct import com.cobblemon.mod.common.api.snowstorm.BedrockParticleEffect import com.cobblemon.mod.common.api.text.text import com.cobblemon.mod.common.client.particle.ParticleStorm @@ -22,9 +24,11 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityMo import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import com.cobblemon.mod.common.client.render.models.blockbench.repository.RenderContext import com.cobblemon.mod.common.entity.pokemon.PokemonEntity +import com.cobblemon.mod.common.util.asExpression import com.cobblemon.mod.common.util.asIdentifierDefaultingNamespace import com.cobblemon.mod.common.util.getString import com.cobblemon.mod.common.util.math.geometry.toRadians +import com.cobblemon.mod.common.util.resolve import com.cobblemon.mod.common.util.resolveDouble import java.util.SortedMap import net.minecraft.client.MinecraftClient @@ -76,10 +80,16 @@ class BedrockParticleKeyframe( return } + val particleRuntime = MoLangRuntime() + + // Share the query struct from the entity so the particle can query entity properties + particleRuntime.environment.structs["query"] = state.runtime.environment.getQueryStruct() + val storm = ParticleStorm( effect = effect, matrixWrapper = matrixWrapper, world = world, + runtime = particleRuntime, sourceVelocity = { entity.velocity }, sourceAlive = { !entity.isRemoved && this in state.poseParticles }, sourceVisible = { !entity.isInvisible }, @@ -121,7 +131,7 @@ class BedrockInstructionKeyframe( val expressions: List ): BedrockEffectKeyframe(seconds) { override fun run(entity: T, state: PoseableEntityState) { - expressions.forEach { expression -> BedrockAnimation.runInstruction(entity, state, expression) } + expressions.forEach { expression -> state.runtime.resolve(expression) } } } @@ -132,64 +142,11 @@ data class BedrockAnimation( val boneTimelines: Map ) { companion object { - val functionMappings = hashMapOf>() val sharedRuntime = MoLangRuntime().also { - it.environment.structs["query"] = it.environment.structs["variable"] - it.environment.structs["script"] = QueryStruct(functionMappings) - } - - var context: InstructionContext? = null - - inline fun registerInstruction(name: String, crossinline function: (entity: T, state: PoseableEntityState, params: MoParams) -> Any) { - functionMappings[name] = java.util.function.Function { args -> - val ctx = context ?: return@Function Unit - if (ctx.entity is T) { - val ret = function(ctx.entity, ctx.state as PoseableEntityState, args) - if (ret is Unit) { - return@Function 0.0 - } else { - return@Function ret - } - } - Unit - } - } - - class InstructionContext(val entity: Entity, val state: PoseableEntityState<*>) - - fun runInstruction(entity: T, state: PoseableEntityState, expression: Expression) { - val ctx = InstructionContext(entity, state) - context = ctx - expression.evaluate(MoScope(), sharedRuntime.environment) - context = null - } - - init { - registerInstruction("say") { entity, _, params -> - MinecraftClient.getInstance().player?.sendMessage(params.getString(0).text()) - Unit - } - registerInstruction("sound") { entity, _, params -> - // Means we don't need to setup a sound registry entry for every single thing - val soundEvent = SoundEvent.of(params.getString(0).asIdentifierDefaultingNamespace()) - if (soundEvent != null) { - val volume = if (params.contains(1)) params.getDouble(1).toFloat() else 1F - val pitch = if (params.contains(2)) params.getDouble(2).toFloat() else 1F - MinecraftClient.getInstance().soundManager.play( - PositionedSoundInstance(soundEvent, SoundCategory.NEUTRAL, volume, pitch, entity.world.random, entity.x, entity.y, entity.z) - ) - } - Unit - } - registerInstruction("random") { entity, _, params -> - val options = mutableListOf() - var index = 0 - while (params.contains(index)) { - options.add(params.get(index)) - index++ - } - return@registerInstruction options.random() // Can throw an exception if they specified no args. They'd be idiots though. - } + val zero = DoubleValue(0.0) + it.environment.getQueryStruct().addFunctions(mapOf( + "anim_time" to java.util.function.Function { return@Function zero } + )) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimationRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimationRepository.kt index 220eabc288..fb15579023 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimationRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockAnimationRepository.kt @@ -55,6 +55,11 @@ object BedrockAnimationRepository { LOGGER.info("Loaded $animationCount animations from ${animationGroups.size} animation groups") } + fun tryGetAnimation(fileName: String, animationName: String): BedrockAnimation? { + val animationGroup = animationGroups[fileName] ?: return null + return animationGroup.animations[animationName] + } + fun getAnimation(fileName: String, animationName: String): BedrockAnimation { val animationGroup = animationGroups[fileName] ?: throw IllegalArgumentException("Unknown animation group: $fileName") diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt index d984cecd9d..b9cd1159d2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/bedrock/animation/BedrockStatefulAnimation.kt @@ -24,13 +24,7 @@ import net.minecraft.entity.Entity */ open class BedrockStatefulAnimation( val animation: BedrockAnimation, - var preventsIdleCheck: (T?, PoseableEntityState, StatelessAnimation) -> Boolean ) : StatefulAnimation { - fun setPreventsIdle(preventsIdle: Boolean): BedrockStatefulAnimation { - this.preventsIdleCheck = { _, _, _ -> preventsIdle } - return this - } - var startedSeconds = -1F var isTransformAnimation = false override val duration = animation.animationLength.toFloat() @@ -39,10 +33,6 @@ open class BedrockStatefulAnimation( override val isTransform: Boolean get() = isTransformAnimation - fun isTransformAnimation(value: Boolean) = this.also { - it.isTransformAnimation = value - } - fun andThen(action: (entity: T, PoseableEntityState) -> Unit) = this.also { it.afterAction = action } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/fossil/FossilModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/fossil/FossilModel.kt index 50749b4751..da6b5dc5a1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/fossil/FossilModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/fossil/FossilModel.kt @@ -29,12 +29,12 @@ class FossilModel(root: Bone) : PoseableEntityModel() { var yGrowthPoint = 0F var maxScale = 1F var yTranslation = 0F // Offset inside the tank - var animations: Array> = emptyArray() + var tankAnimations: Array> = emptyArray() var tankQuirks: Array> = emptyArray() override fun registerPoses() { registerPose( poseType = PoseType.SLEEP, - idleAnimations = animations, + idleAnimations = tankAnimations, quirks = tankQuirks ) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/AncientPokeBallModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/AncientPokeBallModel.kt index 8ed13c23b4..bb3bbcbeb6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/AncientPokeBallModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/AncientPokeBallModel.kt @@ -51,9 +51,9 @@ class AncientPokeBallModel(root: ModelPart) : PokeBallModel(root), PokeBallFrame transformTicks = 0 ) - shut.transitions[open] = { _, _ -> bedrockStateful("ancient_poke_ball", "open").andThen { entity, state -> state.setPose(open.poseName) } } - open.transitions[shut] = { _, _ -> bedrockStateful("ancient_poke_ball", "shut").andThen { entity, state -> state.setPose(shut.poseName) } } - midair.transitions[open] = shut.transitions[open]!! + shut.transitions[open.poseName] = { _, _ -> bedrockStateful("ancient_poke_ball", "open").andThen { entity, state -> state.setPose(open.poseName) } } + open.transitions[shut.poseName] = { _, _ -> bedrockStateful("ancient_poke_ball", "shut").andThen { entity, state -> state.setPose(shut.poseName) } } + midair.transitions[open.poseName] = shut.transitions[open.poseName]!! } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt index f23e0a99e9..21dad197d9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokeball/PokeBallModel.kt @@ -52,9 +52,9 @@ open class PokeBallModel(root: ModelPart) : PoseableEntityModel bedrockStateful("poke_ball", "open").andThen { entity, state -> state.setPose(open.poseName) } } - open.transitions[shut] = { _, _ -> bedrockStateful("poke_ball", "shut").andThen { entity, state -> state.setPose(shut.poseName) } } - midair.transitions[open] = shut.transitions[open]!! + shut.transitions[open.poseName] = { _, _ -> bedrockStateful("poke_ball", "open") } + open.transitions[shut.poseName] = { _, _ -> bedrockStateful("poke_ball", "shut") } + midair.transitions[open.poseName] = shut.transitions[open.poseName]!! } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt index c6d6bf0c6b..dfd271d3ba 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/JsonPokemonPoseableModel.kt @@ -8,19 +8,27 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon +import com.cobblemon.mod.common.api.molang.ExpressionLike import com.cobblemon.mod.common.client.render.models.blockbench.JsonPose import com.cobblemon.mod.common.client.render.models.blockbench.JsonPoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation -import com.cobblemon.mod.common.client.render.models.blockbench.bedrock.animation.BedrockStatefulAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.ModelFrame import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone -import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation import com.cobblemon.mod.common.client.render.models.blockbench.pose.Pose import com.cobblemon.mod.common.entity.pokemon.PokemonEntity +import com.cobblemon.mod.common.util.adapters.ExpressionLikeAdapter import com.cobblemon.mod.common.util.adapters.Vec3dAdapter -import com.google.gson.* +import com.google.gson.ExclusionStrategy +import com.google.gson.FieldAttributes +import com.google.gson.GsonBuilder +import com.google.gson.InstanceCreator +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonObject +import com.google.gson.JsonPrimitive import com.google.gson.annotations.SerializedName import com.google.gson.reflect.TypeToken import java.lang.reflect.Type @@ -53,6 +61,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod ).type, JsonPoseableEntityModel.StatefulAnimationAdapter { JsonPokemonPoseableModelAdapter.model!! } ) + .registerTypeAdapter(ExpressionLike::class.java, ExpressionLikeAdapter) .registerTypeAdapter(Pose::class.java, PoseAdapter) .registerTypeAdapter(JsonPokemonPoseableModel::class.java, JsonPokemonPoseableModelAdapter) .create() @@ -93,12 +102,11 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod get() = _profileTranslation ?: Vec3d(0.0, 0.0, 0.0) - val faint: Supplier>? = null val cry: Supplier>? = null override fun getFaintAnimation(pokemonEntity: PokemonEntity, state: PoseableEntityState) = faint?.get() - override val cryAnimation = CryProvider { _, _ -> cry?.get()?.also { if (it is BedrockStatefulAnimation) it.setPreventsIdle(false) } } + override val cryAnimation = CryProvider { _, _ -> cry?.get() } object JsonModelExclusion: ExclusionStrategy { override fun shouldSkipField(f: FieldAttributes): Boolean { @@ -116,7 +124,6 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod } object StatefulAnimationAdapter : JsonDeserializer>> { - var preventsIdleDefault = true override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): Supplier> { json as JsonPrimitive val animString = json.asString @@ -135,6 +142,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod } } } + object PoseAdapter : JsonDeserializer> { override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): Pose { val model = JsonPokemonPoseableModelAdapter.model!! @@ -142,6 +150,7 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod val pose = JsonPose(model, obj) val conditionsList = mutableListOf<(PokemonEntity) -> Boolean>() + val mustBeInBattle = json.get("isBattle")?.asBoolean if (mustBeInBattle != null) { conditionsList.add { mustBeInBattle == it.isBattling } @@ -153,73 +162,23 @@ class JsonPokemonPoseableModel(override val rootPart: Bone) : PokemonPoseableMod val poseCondition: ((PokemonEntity) -> Boolean)? = if (conditionsList.isEmpty()) null else conditionsList.reduce { acc, function -> { acc(it) && function(it) } } - val transformedParts = obj.get("transformedParts")?.asJsonArray?.map { - it as JsonObject - val partName = it.get("part").asString - val part = model.getPart(partName) - val transformation = ModelPartTransformation(part) - val rotation = it.get("rotation")?.asJsonArray?.let { Vec3d(it[0].asDouble, it[1].asDouble, it[2].asDouble) } ?: Vec3d.ZERO - val position = it.get("position")?.asJsonArray?.let { Vec3d(it[0].asDouble, it[1].asDouble, it[2].asDouble) } ?: Vec3d.ZERO - val isVisible = it.get("isVisible")?.asBoolean ?: true - return@map transformation.withPosition(position.x, position.y, position.z).withRotationDegrees(rotation.x, rotation.y, rotation.z).withVisibility(isVisible) - }?.toTypedArray() ?: arrayOf() - - val idleAnimations = (obj.get("animations")?.asJsonArray ?: JsonArray()).asJsonArray.mapNotNull { - val animString = it.asString - if (animString == "look") { - return@mapNotNull JsonPokemonPoseableModelAdapter.model!!.singleBoneLook() - } else { - val anim = animString.substringBefore("(") - - if(ANIMATION_FACTORIES.contains(anim)) { - return@mapNotNull ANIMATION_FACTORIES[anim]?.stateless(model, animString) - } - } - return@mapNotNull null - }.toTypedArray() - - val quirks = (obj.get("quirks")?.asJsonArray ?: JsonArray()).map { json -> - json as JsonObject - val name = json.get("name").asString - val animations: (state: PoseableEntityState) -> List> = { _ -> - (json.get("animations")?.asJsonArray ?: JsonArray()).map { animJson -> - val animString = animJson.asString - - val anim = animString.substringBefore("(") - - StatefulAnimationAdapter.preventsIdleDefault = false - val animation = if(ANIMATION_FACTORIES.contains(anim)) { - ANIMATION_FACTORIES[anim]?.stateful(model, animString) - } else { - null - } - StatefulAnimationAdapter.preventsIdleDefault = true - animation - }.filterNotNull() - } - - val loopTimes = json.get("loopTimes")?.asInt ?: 1 - val minSeconds = json.get("minSecondsBetweenOccurrences")?.asFloat ?: 8F - val maxSeconds = json.get("maxSecondsBetweenOccurrences")?.asFloat ?: 30F - - model.quirkMultiple( - name = name, - secondsBetweenOccurrences = minSeconds to maxSeconds, - condition = { true }, - loopTimes = 1..loopTimes, - animations = animations - ) - } - return Pose( poseName = pose.poseName, poseTypes = pose.poseTypes.toSet(), condition = poseCondition, + animations = pose.animations, transformTicks = pose.transformTicks, idleAnimations = pose.idleAnimations, transformedParts = pose.transformedParts, quirks = pose.quirks.toTypedArray() - ) + ).also { + it.transitions.putAll( + pose.transitions + .mapNotNull, Pose) -> StatefulAnimation>> { + it.to to { _, _ -> it.animation.resolveObject(model.runtime).obj as StatefulAnimation } + }.toMap() + ) + } } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/PokemonPoseableModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/PokemonPoseableModel.kt index 63313cba84..9a9e5db0ab 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/PokemonPoseableModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/PokemonPoseableModel.kt @@ -87,11 +87,6 @@ abstract class PokemonPoseableModel : PoseableEntityModel() { } open val cryAnimation: CryProvider = CryProvider { _, _ -> null } -// -// open fun getCryAnimation( -// pokemonEntity: PokemonEntity, -// state: PoseableEntityState -// ): StatefulAnimation? = null override fun setupEntityTypeContext(entity: PokemonEntity?) { entity?.let { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt index 89ed2ced02..69ac1ec912 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AerodactylModel.kt @@ -33,7 +33,7 @@ class AerodactylModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("aerodactyl", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("aerodactyl", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("aerodactyl", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt index 93ea5b1eef..12c1047f69 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/AlakazamModel.kt @@ -41,7 +41,7 @@ class AlakazamModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("alakazam", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("alakazam", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt index 18c931c057..e3ea1f9d1e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ArbokModel.kt @@ -51,10 +51,10 @@ class ArbokModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val tail4WaveSegment = WaveSegment(modelPart = tail4, length = 11F) val tail5WaveSegment = WaveSegment(modelPart = tail5, length = 11F) - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("arbok", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("arbok", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("arbok", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("arbok", "blink") } // TODO tongue_flick val wave = WaveAnimation( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt index 47e702c4a9..a1eb6f29cd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BeedrillModel.kt @@ -38,7 +38,7 @@ class BeedrillModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiWi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beedrill", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beedrill", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt deleted file mode 100644 index 91cc7ccacd..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BlastoiseModel.kt +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 - -import com.cobblemon.mod.common.client.render.models.blockbench.EarJoint -import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState -import com.cobblemon.mod.common.client.render.models.blockbench.RangeOfMotion -import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame -import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.frame.EaredFrame -import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel -import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation -import com.cobblemon.mod.common.entity.PoseType -import com.cobblemon.mod.common.entity.pokemon.PokemonEntity -import com.cobblemon.mod.common.util.math.geometry.toRadians -import net.minecraft.client.model.ModelPart -import net.minecraft.util.math.Vec3d -class BlastoiseModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame, BimanualFrame, EaredFrame { - override val rootPart = root.registerChildWithAllChildren("blastoise") - override val head = getPart("head_ai") - override val rightArm = getPart("arm_right") - override val leftArm = getPart("arm_left") - override val rightLeg = getPart("leg_right") - override val leftLeg = getPart("leg_left") - private val rightEar = getPart("ear_right") - private val leftEar = getPart("ear_left") - override val leftEarJoint = EarJoint(leftEar, ModelPartTransformation.Z_AXIS, RangeOfMotion(50F.toRadians(), 0F)) - override val rightEarJoint = EarJoint(rightEar, ModelPartTransformation.Z_AXIS, RangeOfMotion((-50F).toRadians(), 0F)) - - override val portraitScale = 1.7F - override val portraitTranslation = Vec3d(-0.5, 1.4, 0.0) - - override val profileScale = 0.63F - override val profileTranslation = Vec3d(0.0, 0.8, 0.0) - - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("blastoise", "cry").setPreventsIdle(false) } - - lateinit var sleep: PokemonPose - lateinit var standing: PokemonPose - lateinit var swimIdle: PokemonPose - lateinit var swimMove: PokemonPose - lateinit var walk: PokemonPose - - override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("blastoise", "blink").setPreventsIdle(false)} - sleep = registerPose( - poseType = PoseType.SLEEP, - transformTicks = 10, - idleAnimations = arrayOf(bedrock("blastoise", "sleep")) - ) - - standing = registerPose( - poseName = "standing", - poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.PORTRAIT, PoseType.STAND), - transformTicks = 10, - quirks = arrayOf(blink), - idleAnimations = arrayOf( - singleBoneLook(), - bedrock("blastoise", "ground_idle") - ) - ) - - swimIdle = registerPose( - poseName = "swim_idle", - poseTypes = setOf(PoseType.FLOAT), - transformTicks = 10, - quirks = arrayOf(blink), - idleAnimations = arrayOf( - bedrock("blastoise", "water_idle"), - singleBoneLook() - ) - ) - - swimMove = registerPose( - poseName = "swim_move", - poseTypes = setOf(PoseType.SWIM), - transformTicks = 10, - quirks = arrayOf(blink), - idleAnimations = arrayOf( - singleBoneLook(), - bedrock("blastoise", "water_swim") - ) - ) - - walk = registerPose( - poseType = PoseType.WALK, - transformTicks = 10, - quirks = arrayOf(blink), - idleAnimations = arrayOf( - singleBoneLook(), - bedrock("blastoise", "ground_walk") - ) - ) - } - - override fun getFaintAnimation( - pokemonEntity: PokemonEntity, - state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("blastoise", "faint") else null -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt index 888e58766f..87412dcee7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/BulbasaurModel.kt @@ -36,10 +36,10 @@ class BulbasaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bulbasaur", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bulbasaur", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bulbasaur", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bulbasaur", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt index 9745a4a127..3337ea9252 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ButterfreeModel.kt @@ -35,7 +35,7 @@ class ButterfreeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("butterfree", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("butterfree", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt index b3c9776e72..670a6bdeaf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CaterpieModel.kt @@ -34,10 +34,10 @@ class CaterpieModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("caterpie", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("caterpie", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("caterpie", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("caterpie", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt index 6f7eca3c04..f5b8e41dba 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ChanseyModel.kt @@ -33,7 +33,7 @@ class ChanseyModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chansey", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("chansey", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt index bd2c74b6d8..3b37aa3e97 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharizardModel.kt @@ -8,13 +8,11 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen1 -import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import com.cobblemon.mod.common.client.render.models.blockbench.createTransformation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BiWingedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.BimanualFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame -import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPoseableModel import com.cobblemon.mod.common.client.render.models.blockbench.pose.ModelPartTransformation.Companion.Y_AXIS @@ -22,9 +20,10 @@ import com.cobblemon.mod.common.entity.PoseType import com.cobblemon.mod.common.entity.PoseType.Companion.MOVING_POSES import com.cobblemon.mod.common.entity.PoseType.Companion.STATIONARY_POSES import com.cobblemon.mod.common.entity.PoseType.Companion.UI_POSES -import com.cobblemon.mod.common.entity.pokemon.PokemonEntity +import com.cobblemon.mod.common.util.asExpressionLike import net.minecraft.client.model.ModelPart import net.minecraft.util.math.Vec3d + class CharizardModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFrame, BimanualFrame, BiWingedFrame { override val rootPart = root.registerChildWithAllChildren("charizard") override val head = getPart("head_ai") @@ -47,13 +46,20 @@ class CharizardModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var flyIdle: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charizard", "cry").setPreventsIdle(false) } - override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charizard", "blink").setPreventsIdle(false)} + animations["physical"] = "q.bedrock_primary('charizard', 'physical', 'look', q.curve('symmetrical_wide'))".asExpressionLike() + animations["special"] = "q.bedrock_primary('charizard', 'special', 'look', q.curve('symmetrical_wide'))".asExpressionLike() + animations["status"] = "q.bedrock_primary('charizard', 'status', q.curve('symmetrical_wide'))".asExpressionLike() + animations["recoil"] = "q.bedrock_stateful('charizard', 'recoil')".asExpressionLike() + animations["cry"] = "q.bedrock_stateful('charizard', 'cry')".asExpressionLike() + + val faint = "q.bedrock_primary('charizard', 'faint', q.curve('one'))".asExpressionLike() + + val blink = quirk { bedrockStateful("charizard", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(blink), + animations = mutableMapOf("faint" to faint), idleAnimations = arrayOf(bedrock("charizard", "sleep")) ) @@ -61,16 +67,30 @@ class CharizardModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip poseName = "standing", poseTypes = STATIONARY_POSES - PoseType.HOVER + UI_POSES, quirks = arrayOf(blink), + condition = { !it.isBattling }, + animations = mutableMapOf("faint" to faint), idleAnimations = arrayOf( singleBoneLook(), bedrock("charizard", "ground_idle") ) ) + registerPose( + poseTypes = setOf(PoseType.STAND), + poseName = "battle_standing", + condition = { it.isBattling }, + animations = mutableMapOf("faint" to faint), + idleAnimations = arrayOf( + singleBoneLook(), + bedrock("charizard", "battle_idle") + ) + ) + walk = registerPose( poseName = "walk", poseTypes = MOVING_POSES - PoseType.FLY, quirks = arrayOf(blink), + animations = mutableMapOf("faint" to faint), idleAnimations = arrayOf( singleBoneLook(), bedrock("charizard", "ground_idle"), @@ -100,9 +120,4 @@ class CharizardModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip transformedParts = arrayOf(rootPart.createTransformation().addPosition(Y_AXIS, 6F)) ) } - - override fun getFaintAnimation( - pokemonEntity: PokemonEntity, - state: PoseableEntityState - ) = if (state.isPosedIn(standing, walk, sleep)) bedrockStateful("charizard", "faint") else null } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt index e44ba72d71..d789a14b64 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmanderModel.kt @@ -41,7 +41,7 @@ class CharmanderModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmander", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmander", "cry") } override fun registerPoses() { sleep = registerPose( @@ -49,7 +49,7 @@ class CharmanderModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi idleAnimations = arrayOf(bedrock("charmander", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("charmander", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("charmander", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt index ab7812fa37..d02414a574 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/CharmeleonModel.kt @@ -39,10 +39,10 @@ class CharmeleonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmeleon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charmeleon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charmeleon", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("charmeleon", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt index b4bb054caf..26a22528d6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefableModel.kt @@ -33,10 +33,10 @@ class ClefableModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefable", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefable", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("clefable", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("clefable", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt index 064db69b6c..51622413d9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ClefairyModel.kt @@ -33,10 +33,10 @@ class ClefairyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefairy", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clefairy", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("clefairy", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("clefairy", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt index 231455397d..aea57f9c46 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DiglettModel.kt @@ -32,7 +32,7 @@ class DiglettModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("diglett", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("diglett", "blink")} stand = registerPose( poseName = "stand", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt index 7e42a99c35..c9f62b598b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DittoModel.kt @@ -33,10 +33,10 @@ class DittoModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ditto", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ditto", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ditto", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ditto", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt index 0d03429615..bfacb6583b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DodrioModel.kt @@ -32,9 +32,9 @@ class DodrioModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("dodrio", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("dodrio", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink3") { bedrockStateful("dodrio", "blink3").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("dodrio", "blink1") } + val blink2 = quirk { bedrockStateful("dodrio", "blink2") } + val blink3 = quirk { bedrockStateful("dodrio", "blink3") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("dodrio", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt index 0afb07d189..05068e30f3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DoduoModel.kt @@ -32,10 +32,10 @@ class DoduoModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("doduo", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("doduo", "blink2").setPreventsIdle(false) } - val bite = quirk("bite") { bedrockStateful("doduo", "bite_quirk1").setPreventsIdle(false) } - val bite2 = quirk("bite2") { bedrockStateful("doduo", "bite_quirk2").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("doduo", "blink1") } + val blink2 = quirk { bedrockStateful("doduo", "blink2") } + val bite = quirk { bedrockStateful("doduo", "bite_quirk1") } + val bite2 = quirk { bedrockStateful("doduo", "bite_quirk2") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt index ae8ec43e49..223ecf91cc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragonairModel.kt @@ -32,7 +32,7 @@ class DragonairModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { // TODO dragonair swish override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dragonair", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("dragonair", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + MOVING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt index 0483eb71c0..847e2f4ba8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DragoniteModel.kt @@ -47,7 +47,7 @@ class DragoniteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiW lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dragonite", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("dragonite", "blink")} standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt index 2d60066190..7951ca5c05 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DratiniModel.kt @@ -30,7 +30,7 @@ class DratiniModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dratini", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("dratini", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + MOVING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt index ece83cd897..ad724e4406 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DrowzeeModel.kt @@ -38,7 +38,7 @@ class DrowzeeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("drowzee", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("drowzee", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("drowzee", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt index 4a6d8c6a58..e65607fc08 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/DugtrioModel.kt @@ -31,9 +31,9 @@ class DugtrioModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dugtrio", "blink").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("dugtrio", "blink2").setPreventsIdle(false)} - val blink3 = quirk("blink3") { bedrockStateful("dugtrio", "blink3").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("dugtrio", "blink")} + val blink2 = quirk { bedrockStateful("dugtrio", "blink2")} + val blink3 = quirk { bedrockStateful("dugtrio", "blink3")} registerPose( poseName = "stand", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt index 2b13a8c016..77cc9f3b22 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EeveeModel.kt @@ -49,12 +49,12 @@ class EeveeModel(root: ModelPart) : PokemonPoseableModel(), EaredFrame, HeadedFr lateinit var shoulderLeft: PokemonPose lateinit var shoulderRight: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("eevee", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("eevee", "cry") } val shoulderOffset = 4 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("eevee", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("eevee", "blink") } stand = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt index a6c195c0a6..6bbadcc843 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/EkansModel.kt @@ -53,14 +53,14 @@ class EkansModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ekans", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ekans", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ekans", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("ekans", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ekans", "blink") } registerPose( poseName = "normal", poseTypes = STATIONARY_POSES + MOVING_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt index 92d2287c49..b888307475 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectabuzzModel.kt @@ -38,7 +38,7 @@ class ElectabuzzModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("electabuzz", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("electabuzz", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt index 743423072f..31c91e9d9f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ElectrodeModel.kt @@ -29,7 +29,7 @@ class ElectrodeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("electrode", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("electrode", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt index dbc3d7c09b..645ca419db 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggcuteModel.kt @@ -33,12 +33,12 @@ class ExeggcuteModel(root: ModelPart) : PokemonPoseableModel() { lateinit var uiPortrait: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("exeggcute", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("exeggcute", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("exeggcute", "blink3").setPreventsIdle(false) } - val blink4 = quirk("blink") { bedrockStateful("exeggcute", "blink4").setPreventsIdle(false) } - val blink5 = quirk("blink") { bedrockStateful("exeggcute", "blink5").setPreventsIdle(false) } - val blink6 = quirk("blink") { bedrockStateful("exeggcute", "blink6").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("exeggcute", "blink") } + val blink2 = quirk { bedrockStateful("exeggcute", "blink2") } + val blink3 = quirk { bedrockStateful("exeggcute", "blink3") } + val blink4 = quirk { bedrockStateful("exeggcute", "blink4") } + val blink5 = quirk { bedrockStateful("exeggcute", "blink5") } + val blink6 = quirk { bedrockStateful("exeggcute", "blink6") } uiPortrait = registerPose( poseName = "portrait", poseType = PoseType.PORTRAIT, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt index da3f07af8f..e7800a920d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorAlolanModel.kt @@ -48,10 +48,10 @@ class ExeggutorAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink3").setPreventsIdle(false) } - val blink4 = quirk("blink") { bedrockStateful("exeggutor_alolan", "blink4").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("exeggutor_alolan", "blink") } + val blink2 = quirk { bedrockStateful("exeggutor_alolan", "blink2") } + val blink3 = quirk { bedrockStateful("exeggutor_alolan", "blink3") } + val blink4 = quirk { bedrockStateful("exeggutor_alolan", "blink4") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("exeggutor_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt index bdc0b9d36c..8a4e08a594 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ExeggutorModel.kt @@ -50,9 +50,9 @@ class ExeggutorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("exeggutor", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("exeggutor", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("exeggutor", "blink3").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("exeggutor", "blink") } + val blink2 = quirk { bedrockStateful("exeggutor", "blink2") } + val blink3 = quirk { bedrockStateful("exeggutor", "blink3") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("exeggutor", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt index efdf44f7b7..8059df67e8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdGalarianModel.kt @@ -35,10 +35,10 @@ class FarfetchdGalarianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd_galar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd_galar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("farfetchd_galar", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("farfetchd_galar", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt index a7110108f2..fa4c93c8d4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FarfetchdModel.kt @@ -37,13 +37,13 @@ class FarfetchdModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("farfetchd", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("farfetchd", "blink").setPreventsIdle(false) } - val leakflipidle = quirk("leakflipidle", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_idle").setPreventsIdle(false) } - val leakflipwalk = quirk("leakflipwalk", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_walk").setPreventsIdle(false) } - val wink = quirk("wink", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_wink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("farfetchd", "blink") } + val leakflipidle = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_idle") } + val leakflipwalk = quirk(secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("farfetchd", "quirk_leakflip_walk") } + val wink = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("farfetchd", "quirk_wink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt index 4b47560c1f..c35adb6ea7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FearowModel.kt @@ -44,10 +44,10 @@ class FearowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fearow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fearow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fearow", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("fearow", "blink") } stand = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt index f4d103d844..59de3fa4da 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/FlareonModel.kt @@ -31,7 +31,7 @@ class FlareonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flareon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flareon", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt index f8193be83e..294cb11585 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyModel.kt @@ -32,7 +32,7 @@ class GastlyModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("gastly", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gastly", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt index 7ee117e5e3..d8d649b160 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GastlyShinyModel.kt @@ -31,7 +31,7 @@ class GastlyShinyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("gastly_shiny", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gastly_shiny", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt index 20acfdac30..500d592925 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GeodudeModel.kt @@ -31,7 +31,7 @@ class GeodudeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("geodude", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("geodude", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("geodude", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt index a86fe7960b..a6e1ba5029 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolbatModel.kt @@ -33,10 +33,10 @@ class GolbatModel(root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var battleidle: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golbat", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golbat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golbat", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("golbat", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt index 15ead3a4b4..1f7419b5b4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolduckModel.kt @@ -33,7 +33,7 @@ class GolduckModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golduck", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("golduck", "blink")} standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt index de817c6453..63d7d173bc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GolemModel.kt @@ -36,7 +36,7 @@ class GolemModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golem", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("golem", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt index 6ee2f148f9..914c30a01c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GravelerModel.kt @@ -34,7 +34,7 @@ class GravelerModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("graveler", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("graveler", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt index 93b5ccb9d0..b1b7b01992 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrimerModel.kt @@ -31,7 +31,7 @@ class GrimerModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grimer", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("grimer", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt index ebddb1c022..315320a951 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GrowlitheModel.kt @@ -39,7 +39,7 @@ class GrowlitheModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("growlithe", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("growlithe", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("growlithe", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt index 12d69ce2ef..439e1aa732 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/GyaradosModel.kt @@ -61,7 +61,7 @@ class GyaradosModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override val profileTranslation = Vec3d(-0.1, 0.65, 0.0) override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gyarados", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("gyarados", "blink")} registerPose( poseName = "land", poseTypes = STANDING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt index b0e853cea3..d55c7ada08 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HaunterModel.kt @@ -32,7 +32,7 @@ class HaunterModel(root: ModelPart) : PokemonPoseableModel() { val offsetY = -3.0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("haunter", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("haunter", "blink")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt index ab2d34cfba..d838f75dae 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonchanModel.kt @@ -43,7 +43,7 @@ class HitmonchanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hitmonchan", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("hitmonchan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt index cceba24d49..aa18ef366d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HitmonleeModel.kt @@ -41,7 +41,7 @@ class HitmonleeModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bima lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hitmonlee", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("hitmonlee", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt index aa1f4235ae..40b06ef2ab 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HorseaModel.kt @@ -30,7 +30,7 @@ class HorseaModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("horsea", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("horsea", "blink") } standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt index 2af29a3d66..8f4d3c2f1f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/HypnoModel.kt @@ -38,7 +38,7 @@ class HypnoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFr lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hypno", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("hypno", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("hypno", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt index 97f12c6af6..f07b8519a0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/IvysaurModel.kt @@ -39,10 +39,10 @@ class IvysaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ivysaur", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ivysaur", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ivysaur", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ivysaur", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt index 21b454bb45..26fff984c4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JigglypuffModel.kt @@ -33,7 +33,7 @@ class JigglypuffModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("jigglypuff", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("jigglypuff", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("jigglypuff", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt index 272a26997b..bb09b4df6d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JolteonModel.kt @@ -31,7 +31,7 @@ class JolteonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("jolteon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("jolteon", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt index f6b2536551..aa139166e4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/JynxModel.kt @@ -31,7 +31,7 @@ class JynxModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("jynx", "blink").setPreventsIdle(false)} +// val blink = quirk { bedrockStateful("jynx", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt index d423b6fc6b..934d97e66e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KadabraModel.kt @@ -42,7 +42,7 @@ class KadabraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kadabra", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("kadabra", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt index f44f711299..9ff6429590 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KakunaModel.kt @@ -31,7 +31,7 @@ class KakunaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var standing: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kakuna", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kakuna", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt index 1dc7381e56..68b4f171ce 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KangaskhanModel.kt @@ -31,8 +31,8 @@ class KangaskhanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kangaskhan", "blink").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("kangaskhan", "blink2").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("kangaskhan", "blink")} + val blink2 = quirk { bedrockStateful("kangaskhan", "blink2")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt index 66c5a61cb7..0e2c02e5fe 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KoffingModel.kt @@ -29,7 +29,7 @@ class KoffingModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("koffing", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("koffing", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt index cc3412b250..7e948ee7a8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/KrabbyModel.kt @@ -31,9 +31,9 @@ class KrabbyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("krabby", "blink").setPreventsIdle(false)} - val snipLeft = quirk("blink") { bedrockStateful("krabby", "snip_left").setPreventsIdle(false)} - val snipRight = quirk("blink") { bedrockStateful("krabby", "snip_right").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("krabby", "blink")} + val snipLeft = quirk { bedrockStateful("krabby", "snip_left")} + val snipRight = quirk { bedrockStateful("krabby", "snip_right")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt index 99eabadce7..7dc66c05bc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LaprasModel.kt @@ -34,7 +34,7 @@ class LaprasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var underwaterMove: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lapras", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lapras", "blink") } landIdle = registerPose( poseName = "land_idle", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt index d68a72da74..15763bfbab 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/LickitungModel.kt @@ -39,7 +39,7 @@ class LickitungModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lickitung", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("lickitung", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt index f91b7f75a4..f72d3ad42b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachampModel.kt @@ -32,7 +32,7 @@ class MachampModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("machamp", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("machamp", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt index 0a184c3070..ff7ab6da7d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachokeModel.kt @@ -31,7 +31,7 @@ class MachokeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("machoke", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("machoke", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt index cb9a3b9a9a..d677b9ca2a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MachopModel.kt @@ -31,7 +31,7 @@ class MachopModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("machop", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("machop", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt index 03c3b42386..1bade8f58a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagikarpModel.kt @@ -33,7 +33,7 @@ class MagikarpModel(root: ModelPart) : PokemonPoseableModel() { override val profileTranslation = Vec3d(0.0, 0.40, 0.0) override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magikarp", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("magikarp", "blink")} registerPose( poseName = "land", poseTypes = STANDING_POSES + PoseType.PROFILE, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt index 441ab8587b..217c4a48fc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnemiteModel.kt @@ -31,7 +31,7 @@ class MagnemiteModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magnemite", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("magnemite", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("magnemite", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt index 426bda650d..fc9ea1a163 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MagnetonModel.kt @@ -31,7 +31,7 @@ class MagnetonModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magneton", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("magneton", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("magneton", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt index 6839b57fb9..d6450dd46d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MankeyModel.kt @@ -33,10 +33,10 @@ class MankeyModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mankey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mankey", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mankey", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mankey", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt index fa327778ad..c6e18cfe9d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthAlolanModel.kt @@ -42,7 +42,7 @@ class MeowthAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowth_alolan", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("meowth_alolan", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt index 8c6f109e1d..9d89420f59 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthGalarianModel.kt @@ -42,7 +42,7 @@ class MeowthGalarianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowth_galarian", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("meowth_galarian", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("meowth_galarian", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt index ad8ce38bdf..df5f859f80 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MeowthModel.kt @@ -42,7 +42,7 @@ class MeowthModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowth", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("meowth", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt index cf8224065c..0bfe2985b8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MetapodModel.kt @@ -29,10 +29,10 @@ class MetapodModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var standing: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metapod", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metapod", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("metapod", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("metapod", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("metapod", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt index fff2d99fdc..cc47043ce4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MewtwoModel.kt @@ -40,7 +40,7 @@ class MewtwoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bimanu lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mewtwo", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mewtwo", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt index 22d1879ea6..2b59b70dbf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MrmimeModel.kt @@ -35,7 +35,7 @@ class MrmimeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mr_mime", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("mr_mime", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt index 487f8545a6..06dfa90db5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/MukModel.kt @@ -31,7 +31,7 @@ class MukModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("muk", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("muk", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt index e3ebd04160..53af894807 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidokingModel.kt @@ -41,7 +41,7 @@ class NidokingModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidoking", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("nidoking", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt index 8e3598fa1b..6ef8205a1b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidoqueenModel.kt @@ -41,8 +41,8 @@ class NidoqueenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidoqueen", "blink").setPreventsIdle(false)} - val spg = quirk("SPG", secondsBetweenOccurrences = 600F to 900F) { bedrockStateful("nidoqueen", "spgs_happy_place").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("nidoqueen", "blink")} + val spg = quirk(secondsBetweenOccurrences = 600F to 900F) { bedrockStateful("nidoqueen", "spgs_happy_place") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt index b7464e68eb..ac7610f4a7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinaModel.kt @@ -40,7 +40,7 @@ class NidorinaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidorina", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("nidorina", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt index 045779c843..41825af24e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NidorinoModel.kt @@ -37,7 +37,7 @@ class NidorinoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nidorino", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("nidorino", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt index 32404315ad..7c15090ea1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesAlolanModel.kt @@ -47,7 +47,7 @@ class NinetalesAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ninetales_alolan", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("ninetales_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ninetales_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt index 86feb40436..b7d309c4ad 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/NinetalesModel.kt @@ -47,7 +47,7 @@ class NinetalesModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ninetales", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("ninetales", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ninetales", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt index 5d18836091..66e8a6b453 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OddishModel.kt @@ -33,7 +33,7 @@ class OddishModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("oddish", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("oddish", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt index edefb5010f..2d6f9dd83d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/OnixModel.kt @@ -37,10 +37,10 @@ class OnixModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("onix", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("onix", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("onix", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("onix", "blink") } ui = registerPose( poseName = "ui", poseTypes = UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt index 60147112d3..f7e86f9deb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ParasModel.kt @@ -36,7 +36,7 @@ class ParasModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("paras", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("paras", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES + SHOULDER_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt index 75558f4d5f..087627a751 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianAlolanModel.kt @@ -40,7 +40,7 @@ class PersianAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("persian_alolan", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("persian_alolan", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt index 49624eb604..c318bf03f4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PersianModel.kt @@ -40,7 +40,7 @@ class PersianModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("persian", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("persian", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt index 06ecf3d31c..1de63b212b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeotModel.kt @@ -44,7 +44,7 @@ class PidgeotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeot", "cry") } override fun registerPoses() { sleep = registerPose( @@ -52,7 +52,7 @@ class PidgeotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped idleAnimations = arrayOf(bedrock("pidgeot", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("pidgeot", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("pidgeot", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt index 940dcd1103..34356da4b2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeottoModel.kt @@ -46,14 +46,14 @@ class PidgeottoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeotto", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgeotto", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("pidgeotto", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("pidgeotto", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("pidgeotto", "blink")} stand = registerPose( poseName = "stand", poseTypes = STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt index 62b60d0c96..272a9c91f0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PidgeyModel.kt @@ -46,14 +46,14 @@ class PidgeyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidgey", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("pidgey", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("pidgey", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pidgey", "blink") } stand = registerPose( poseName = "standing", poseTypes = SHOULDER_POSES + UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt index e0e4946beb..22510176f0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PikachuModel.kt @@ -40,10 +40,10 @@ class PikachuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 1.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pikachu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pikachu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pikachu", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pikachu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt index b68ae03390..39231aaf96 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PinsirModel.kt @@ -29,7 +29,7 @@ class PinsirModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pinsir", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("pinsir", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt index 94199160f8..816e9db4b8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwagModel.kt @@ -31,7 +31,7 @@ class PoliwagModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poliwag", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("poliwag", "blink")} standing = registerPose( poseName = "standing", poseTypes = STANDING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt index a0e28da719..e7784d3b39 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwhirlModel.kt @@ -30,7 +30,7 @@ class PoliwhirlModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poliwhirl", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("poliwhirl", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt index e8abc4a06d..d151765690 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PoliwrathModel.kt @@ -30,7 +30,7 @@ class PoliwrathModel(root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poliwrath", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("poliwrath", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STANDING_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt index 43ff2bcc6a..9f451b14fd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaGalarianModel.kt @@ -38,11 +38,11 @@ class PonytaGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta_galar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta_galar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ponyta_galar", "blink").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta_galar", "quirk").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ponyta_galar", "blink") } + val quirk = quirk(secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta_galar", "quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt index f54360beaf..81d128cd1a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PonytaModel.kt @@ -41,11 +41,11 @@ class PonytaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ponyta", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ponyta", "blink").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta", "quirk1").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ponyta", "blink") } + val quirk = quirk(secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("ponyta", "quirk1") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt index 0d1af7f98d..30383ef4b1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PorygonModel.kt @@ -38,7 +38,7 @@ class PorygonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("porygonz", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("porygonz", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("porygon", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt index b42e333bbf..8dfa17dc68 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PrimeapeModel.kt @@ -33,10 +33,10 @@ class PrimeapeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primeape", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primeape", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("primeape", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("primeape", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt index 45d1dae8c9..93f5450ec4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/PsyduckModel.kt @@ -35,7 +35,7 @@ class PsyduckModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("psyduck", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("psyduck", "blink")} standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt index 471372c30d..9224e60ba8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuAlolanModel.kt @@ -34,10 +34,10 @@ class RaichuAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu_alolan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu_alolan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raichu_alolan", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("raichu_alolan", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt index dfb8b51e55..fdd5d0cbb1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaichuModel.kt @@ -34,10 +34,10 @@ class RaichuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raichu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raichu", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("raichu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt index d94619e3cb..7d82b9f031 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashGalarianModel.kt @@ -36,10 +36,10 @@ class RapidashGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash_galar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash_galar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rapidash_galar", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("rapidash_galar", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt index bbc6299132..3bc6013b63 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RapidashModel.kt @@ -42,10 +42,10 @@ class RapidashModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose lateinit var battling: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rapidash", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rapidash", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("rapidash", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rapidash", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt index 32258aade7..387645a95d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateAlolanModel.kt @@ -40,10 +40,10 @@ class RaticateAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate_alolan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate_alolan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raticate_alolan", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("raticate_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("raticate_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt index fee57c98bf..ced6ee4609 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RaticateModel.kt @@ -40,14 +40,14 @@ class RaticateModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Eare lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raticate", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("raticate", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("raticate", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("raticate", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt index 45065f766b..3fae5248e1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataAlolanModel.kt @@ -44,10 +44,10 @@ class RattataAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata_alolan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata_alolan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rattata_alolan", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("rattata_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rattata_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt index 39bd0d8f7e..70b3e83f01 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/RattataModel.kt @@ -44,14 +44,14 @@ class RattataModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rattata", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rattata", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("rattata", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("rattata", "blink")} standing = registerPose( poseName = "standing", poseTypes = setOf(PoseType.NONE, PoseType.PROFILE, PoseType.STAND, PoseType.FLOAT, PoseType.PORTRAIT, PoseType.SHOULDER_LEFT, PoseType.SHOULDER_RIGHT), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt index 7f6a15b4dc..05e247f312 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandshrewModel.kt @@ -35,7 +35,7 @@ class SandshrewModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sandshrew", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("sandshrew", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt index 72bd832650..f5e6ac0ca1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SandslashModel.kt @@ -33,7 +33,7 @@ class SandslashModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sandslash", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("sandslash", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt index f4ee59d94a..bd2ce9e289 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ScytherModel.kt @@ -44,7 +44,7 @@ class ScytherModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scyther", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("scyther", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES - PoseType.HOVER, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt index 5eebf8b96d..37f44ad580 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SeadraModel.kt @@ -32,7 +32,7 @@ class SeadraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("seadra", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("seadra", "blink")} standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt index 23bcd124ee..7a2e0505ad 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowbroModel.kt @@ -33,9 +33,9 @@ class SlowbroModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slowbro", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("slowbro", "blink2").setPreventsIdle(false) } - val bite = quirk("bite", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("slowbro", "bite_quirk").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("slowbro", "blink1") } + val blink2 = quirk { bedrockStateful("slowbro", "blink2") } + val bite = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("slowbro", "bite_quirk") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt index 79babdec74..f921012f40 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SlowpokeModel.kt @@ -40,7 +40,7 @@ class SlowpokeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slowpoke", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("slowpoke", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt index 7ca4e85d91..a36d5274d4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SpearowModel.kt @@ -45,10 +45,10 @@ class SpearowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spearow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spearow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("spearow", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("spearow", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt index db7a3f5ee9..5061fa46ba 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/SquirtleModel.kt @@ -42,10 +42,10 @@ class SquirtleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var swim: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squirtle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squirtle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("squirtle", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("squirtle", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt index 3d4fd4d337..7a6835d636 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TaurosModel.kt @@ -31,10 +31,10 @@ class TaurosModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tauros", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tauros", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tauros", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("tauros", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt index 6873a2f8fb..b31c5db3c8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacoolModel.kt @@ -32,7 +32,7 @@ class TentacoolModel(root: ModelPart) : PokemonPoseableModel() { lateinit var watersleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tentacool", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("tentacool", "blink")} standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt index 535c2ab602..946401036e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/TentacruelModel.kt @@ -32,7 +32,7 @@ class TentacruelModel(root: ModelPart) : PokemonPoseableModel() { lateinit var watersleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tentacruel", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("tentacruel", "blink")} standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt index 3385dd8b13..7465d1989f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VaporeonModel.kt @@ -33,7 +33,7 @@ class VaporeonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swimIdle: PokemonPose lateinit var swimMove: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vaporeon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vaporeon", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt index b8759330b7..aa9b461de0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VenusaurModel.kt @@ -40,10 +40,10 @@ class VenusaurModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venusaur", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venusaur", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("turtwig", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("turtwig", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt index 550eb7db85..9f178cbb13 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VileplumeModel.kt @@ -33,7 +33,7 @@ class VileplumeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vileplume", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("vileplume", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt index fa3db8732f..ac9807292b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VoltorbModel.kt @@ -29,7 +29,7 @@ class VoltorbModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("voltorb", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("voltorb", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt index 6d696cd22c..695102230d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixAlolanModel.kt @@ -40,7 +40,7 @@ class VulpixAlolanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vulpix_alolan", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("vulpix_alolan", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("vulpix_alolan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt index 6506ae7625..0dfae61bd3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/VulpixModel.kt @@ -40,7 +40,7 @@ class VulpixModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vulpix", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("vulpix", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("vulpix", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt index 7637c2d038..75d3ec5a7b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WartortleModel.kt @@ -50,10 +50,10 @@ class WartortleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var swimIdle: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wartortle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wartortle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wartortle", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("wartortle", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt index 40f04dea37..9347e7cf9c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeedleModel.kt @@ -34,10 +34,10 @@ class WeedleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("weedle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("weedle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("weedle", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("weedle", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("weedle", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt index ef8f574f34..8ffd753f1a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WeezingModel.kt @@ -29,8 +29,8 @@ class WeezingModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("weezing", "blink").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("weezing", "blink2").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("weezing", "blink")} + val blink2 = quirk { bedrockStateful("weezing", "blink2")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt index 79b5f16455..0065f7d4e5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/WigglytuffModel.kt @@ -31,7 +31,7 @@ class WigglytuffModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wigglytuff", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("wigglytuff", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("wigglytuff", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt index f2868955cb..09f0b1ac12 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen1/ZubatModel.kt @@ -39,10 +39,10 @@ class ZubatModel(root: ModelPart) : PokemonPoseableModel() { val shoulderOffset = 0 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("zubat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("zubat", "cry") } override fun registerPoses() { - val twitch = quirk("twitch") { bedrockStateful("zubat", "eartwitch").setPreventsIdle(false) } + val twitch = quirk { bedrockStateful("zubat", "eartwitch") } sleep = registerPose( poseType = PoseType.SLEEP, transformedParts = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt index 975a06de2e..2ebe14fb34 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AipomModel.kt @@ -38,10 +38,10 @@ class AipomModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aipom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aipom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("aipom", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("aipom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("aipom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt index 844aeda41e..071480a0aa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/AmpharosModel.kt @@ -33,12 +33,12 @@ class AmpharosModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ampharos", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ampharos", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ampharos", "blink").setPreventsIdle(false) } - val glow = quirk("glow") { bedrockStateful("ampharos", "quirk_glow").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("ampharos", "quirk_toes").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ampharos", "blink") } + val glow = quirk { bedrockStateful("ampharos", "quirk_glow") } + val quirk = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("ampharos", "quirk_toes") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ampharos", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt index 7016171268..0b777c6d96 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BayleefModel.kt @@ -31,10 +31,10 @@ class BayleefModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bayleef", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bayleef", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bayleef", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bayleef", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("bayleef", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt index 455219382a..19a686c242 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/BellossomModel.kt @@ -32,7 +32,7 @@ class BellossomModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bellossom", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bellossom", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES + SHOULDER_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt index b5a01edc94..8505aefe6f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChikoritaModel.kt @@ -31,10 +31,10 @@ class ChikoritaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chikorita", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chikorita", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chikorita", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("chikorita", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("chikorita", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt index 50ee820832..3818e9c382 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ChinchouModel.kt @@ -27,7 +27,7 @@ class ChinchouModel (root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chinchou", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("chinchou", "blink")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt index 5aea466843..e006bd6e28 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CleffaModel.kt @@ -36,10 +36,10 @@ class CleffaModel(root: ModelPart) : PokemonPoseableModel() { lateinit var leftShoulder: PokemonPose lateinit var rightShoulder: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cleffa", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cleffa", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cleffa", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cleffa", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt index c7e8620297..49623ebdbd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CrobatModel.kt @@ -31,10 +31,10 @@ class CrobatModel(root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crobat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crobat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("crobat", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("crobat", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt index 22d9aebd6d..d271ce3ba1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CroconawModel.kt @@ -46,10 +46,10 @@ class CroconawModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip val wateroffset = -10 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("croconaw", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("croconaw", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("croconaw", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("croconaw", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt index deafd237f8..63765b396a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/CyndaquilModel.kt @@ -31,10 +31,10 @@ class CyndaquilModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("cyndaquil", "battle_cry").setPreventsIdle(false) else bedrockStateful("cyndaquil", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("cyndaquil", "battle_cry") else bedrockStateful("cyndaquil", "cry") } override fun registerPoses() { -// val sneeze = quirk("sneeze") { bedrockStateful("cyndaquil", "sneeze_quirk").setPreventsIdle(false) } +// val sneeze = quirk { bedrockStateful("cyndaquil", "sneeze_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt index fb60ece63f..e27971c79c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/DonphanModel.kt @@ -34,7 +34,7 @@ class DonphanModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("donphan", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("donphan", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt index 1532803b03..9ca83a206b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ElekidModel.kt @@ -37,7 +37,7 @@ class ElekidModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bimanua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("elekid", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("elekid", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt index 628da3d671..8a8d1b47cc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/EspeonModel.kt @@ -31,10 +31,10 @@ class EspeonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espeon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espeon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("espeon", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("espeon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt index 683e3dae73..4b9c517148 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FeraligatrModel.kt @@ -46,10 +46,10 @@ class FeraligatrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B val wateroffset = -10 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("feraligatr", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("feraligatr", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("feraligatr", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("feraligatr", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt index cec1701f48..7b5c890c5d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/FlaaffyModel.kt @@ -33,10 +33,10 @@ class FlaaffyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flaaffy", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flaaffy", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("flaaffy", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("flaaffy", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("flaaffy", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt index 13260acf53..2921b423c1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ForretressModel.kt @@ -30,7 +30,7 @@ class ForretressModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("forretress", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("forretress", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt index e49ffa54d9..668a25b08c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GligarModel.kt @@ -37,7 +37,7 @@ class GligarModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gligar", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gligar", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt index ede54c6ef3..3cef7d3865 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/GranbullModel.kt @@ -33,10 +33,10 @@ class GranbullModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("granbull", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("granbull", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("granbull", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("granbull", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("granbull", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt index a4295ba6dd..c24cae22b4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HitmontopModel.kt @@ -32,10 +32,10 @@ class HitmontopModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hitmontop", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hitmontop", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hitmontop", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("hitmontop", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("hitmontop", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt index e9f2fa1b2d..c374144c11 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/HoothootModel.kt @@ -30,11 +30,11 @@ class HoothootModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hoothoot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("hoothoot", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("hoothoot", "blink").setPreventsIdle(false)} - val quirk = quirk("quirk") { bedrockStateful("hoothoot", "quirk_foot").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("hoothoot", "blink")} + val quirk = quirk { bedrockStateful("hoothoot", "quirk_foot")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt index c210777261..4d76c2ee6d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/IgglybuffModel.kt @@ -29,7 +29,7 @@ class IgglybuffModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("igglybuff", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("igglybuff", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt index b4c79c461c..a23f626896 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/KingdraModel.kt @@ -34,7 +34,7 @@ class KingdraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kingdra", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("kingdra", "blink") } standing = registerPose( poseName = "standing", poseType = PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt index 8d550e79b3..24d689b0c2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/LanturnModel.kt @@ -27,7 +27,7 @@ class LanturnModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lanturn", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("lanturn", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt index 65a77ce9a1..1f5b6f4aa4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoModel.kt @@ -33,7 +33,7 @@ class MagcargoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magcargo", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("magcargo", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt index bcdf32d7a4..0974ac3e76 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MagcargoShinyModel.kt @@ -33,7 +33,7 @@ class MagcargoShinyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magcargo_shiny", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("magcargo_shiny", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt index d443584e92..12434ab91d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MareepModel.kt @@ -39,10 +39,10 @@ class MareepModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var shearedsleep: PokemonPose lateinit var shearedbattleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mareep", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mareep", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mareep", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mareep", "blink") } sleep = registerPose( poseName = "unsheared_sleep", poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt index 223f6a0806..f276ee1077 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MeganiumModel.kt @@ -31,10 +31,10 @@ class MeganiumModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meganium", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meganium", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meganium", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("meganium", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("meganium", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt index 47ba7c834f..992e7032c9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MiltankModel.kt @@ -37,7 +37,7 @@ class MiltankModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("miltank", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("miltank", "cry") } override fun registerPoses() { sleep = registerPose( @@ -45,7 +45,7 @@ class MiltankModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe idleAnimations = arrayOf(bedrock("miltank", "ground_sleep")) ) - val blink = quirk("blink") { bedrockStateful("miltank", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("miltank", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt index 384e55f1fd..eb29414526 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MisdreavusModel.kt @@ -29,7 +29,7 @@ class MisdreavusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("misdreavus", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("misdreavus", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt index dd7aafc828..319765e7d8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/MurkrowModel.kt @@ -34,7 +34,7 @@ class MurkrowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var fly: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("murkrow", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("murkrow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt index 9d0462c8c1..ba4462b8fa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NatuModel.kt @@ -31,7 +31,7 @@ class NatuModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("natu", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("natu", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt index a5600c64f5..455682ca33 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/NoctowlModel.kt @@ -41,10 +41,10 @@ class NoctowlModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("noctowl", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("noctowl", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("noctowl", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("noctowl", "blink")} standing = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt index 43dc688099..33a5ce999f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PhanpyModel.kt @@ -36,7 +36,7 @@ class PhanpyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("phanpy", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("phanpy", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt index 4d37b55778..5e7a009fd8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PichuModel.kt @@ -38,10 +38,10 @@ class PichuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 0.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pichu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pichu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pichu", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pichu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt index c785b5aefa..c85dfc1659 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/PinecoModel.kt @@ -30,7 +30,7 @@ class PinecoModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pineco", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("pineco", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt index dc6daea178..c9c295b347 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/Porygon2Model.kt @@ -38,7 +38,7 @@ class Porygon2Model(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("porygon2", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("porygon2", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("porygon2", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt index 67823addfd..1c1e0bbace 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuagsireModel.kt @@ -40,10 +40,10 @@ class QuagsireModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quagsire", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quagsire", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quagsire", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("quagsire", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt index 6f265e4e4d..e1c453cc12 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/QuilavaModel.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen2 +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose @@ -31,10 +32,10 @@ class QuilavaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("quilava", "battle_cry").setPreventsIdle(false) else bedrockStateful("quilava", "cry").setPreventsIdle(true) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("quilava", "battle_cry") else PrimaryAnimation(bedrockStateful("quilava", "cry")) } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quilava", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("quilava", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt index 4c3297af7a..227d4f5fde 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ScizorModel.kt @@ -48,7 +48,7 @@ class ScizorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scizor", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("scizor", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt index d615d795ef..2b7ebbbbd1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/ShuckleModel.kt @@ -32,7 +32,7 @@ class ShuckleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ditto", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("ditto", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt index fa79e662fc..098fa89050 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlowkingModel.kt @@ -33,8 +33,8 @@ class SlowkingModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slowking", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("slowking", "blink2").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("slowking", "blink") } + val blink2 = quirk { bedrockStateful("slowking", "blink2") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt index f3135793b7..b874f5d959 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaModel.kt @@ -33,7 +33,7 @@ class SlugmaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slugma", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("slugma", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt index 03e9d78bcf..aa49ed5487 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SlugmaShinyModel.kt @@ -33,7 +33,7 @@ class SlugmaShinyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var shiny_walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("slugma_shiny", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("slugma_shiny", "blink") } shiny_sleep = registerPose( poseName = "shiny_sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt index 3992da91c1..05e9c7c535 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SmoochumModel.kt @@ -31,7 +31,7 @@ class SmoochumModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("smoochum", "blink").setPreventsIdle(false) } +// val blink = quirk { bedrockStateful("smoochum", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt index f80d6f6989..518ce105a1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SneaselModel.kt @@ -38,7 +38,7 @@ class SneaselModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sneasel", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("sneasel", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt index d0105ef856..ba06694e98 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SnubbullModel.kt @@ -38,7 +38,7 @@ class SnubbullModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snubbull", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snubbull", "cry") } override fun registerPoses() { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt index 257a21a383..e920349d3a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/StantlerModel.kt @@ -36,7 +36,7 @@ class StantlerModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("stantler", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("stantler", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt index 7b80daf072..fbcf17518e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SteelixModel.kt @@ -34,11 +34,11 @@ class SteelixModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("steelix", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("steelix", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("steelix", "blink").setPreventsIdle(false) } - val jitter = quirk("jitter") { bedrockStateful("steelix", "quirk_jawjitter").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("steelix", "blink") } + val jitter = quirk { bedrockStateful("steelix", "quirk_jawjitter") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("steelix", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt index 1da28b17a7..7981953f8c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/SudowoodoModel.kt @@ -40,7 +40,7 @@ class SudowoodoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sudowoodo", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("sudowoodo", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt index 1e653803e5..a28f35b582 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TeddiursaModel.kt @@ -30,10 +30,10 @@ class TeddiursaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("teddiursa", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("teddiursa", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("teddiursa", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("teddiursa", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt index 9629a9b5be..de04a88c7c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TotodileModel.kt @@ -49,12 +49,12 @@ class TotodileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip val wateroffset = -10 val shoulderOffset = 5.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("totodile", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("totodile", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("totodile", "blink").setPreventsIdle(false)} - val sleepQuirk = quirk("sleep_quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "sleep_quirk").setPreventsIdle(false)} - val biteyQuirk = quirk("bite_quirk", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "bitey_quirk").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("totodile", "blink")} + val sleepQuirk = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "sleep_quirk")} + val biteyQuirk = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("totodile", "bitey_quirk")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt index 0b6ae30f05..f90e4bc5a0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyphlosionModel.kt @@ -31,10 +31,10 @@ class TyphlosionModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("typhlosion", "battle_cry").setPreventsIdle(false) else bedrockStateful("typhlosion", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("typhlosion", "battle_cry") else bedrockStateful("typhlosion", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("typhlosion", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("typhlosion", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt index d3a19b882c..f70f83b575 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/TyrogueModel.kt @@ -39,10 +39,10 @@ class TyrogueModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 3 -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tyrogue", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tyrogue", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tyrogue", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tyrogue", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("tyrogue", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt index eaf98ecbda..5545d12b66 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UmbreonModel.kt @@ -31,10 +31,10 @@ class UmbreonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("umbreon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("umbreon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("umbreon", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("umbreon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt index fa303d315f..2c050d4561 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/UrsaringModel.kt @@ -38,7 +38,7 @@ class UrsaringModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ursaring", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ursaring", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt index 4e90479893..dcbcaf142b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperModel.kt @@ -41,11 +41,11 @@ class WooperModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var float: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper", "cry") } val shoulderOffset = 2.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wooper", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("wooper", "blink") } sleep = registerPose( poseName = "sleep", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt index 2cd1956654..a9fd90f656 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/WooperPaldeanModel.kt @@ -41,11 +41,11 @@ class WooperPaldeanModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame lateinit var float: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper_paldean", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooper_paldean", "cry") } val shoulderOffset = 2.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wooper_paldean", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("wooper_paldean", "blink") } sleep = registerPose( poseName = "sleep", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt index a4d2f809ea..09ccae843e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen2/XatuModel.kt @@ -27,7 +27,7 @@ class XatuModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("xatu", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("xatu", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt index 8c5ace867b..d79b020036 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BarboachModel.kt @@ -31,7 +31,7 @@ class BarboachModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("barboach", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("barboach", "blink") } watersleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt index f7997443a8..7c18f9e435 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BeldumModel.kt @@ -31,11 +31,11 @@ class BeldumModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beldum", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("beldum", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("beldum", "blink").setPreventsIdle(false)} - val quirk = quirk("quirk") { bedrockStateful("beldum", "quirk_spin").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("beldum", "blink")} + val quirk = quirk { bedrockStateful("beldum", "quirk_spin")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt index e5c9be5959..ddaa239567 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BlazikenModel.kt @@ -36,10 +36,10 @@ class BlazikenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("blaziken", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("blaziken", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("blaziken", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("blaziken", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt index 09d409ba0b..d130d007fd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/BreloomModel.kt @@ -40,10 +40,10 @@ class BreloomModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var sleeping: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("breloom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("breloom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("breloom", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("breloom", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt index 8b89cb609c..f73833c6e5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacneaModel.kt @@ -36,7 +36,7 @@ class CacneaModel (root: ModelPart) : PokemonPoseableModel(), BimanualFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cacnea", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cacnea", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cacnea", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt index d80e55f31b..5fd115e761 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CacturneModel.kt @@ -38,7 +38,7 @@ class CacturneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bim lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cacturne", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cacturne", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cacturne", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt index 2b06c79bf8..cd4c0eb759 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CameruptModel.kt @@ -36,7 +36,7 @@ class CameruptModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("camerupt", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("camerupt", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt index 982c57b4a6..51b01bad10 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ChimechoModel.kt @@ -30,7 +30,7 @@ class ChimechoModel(root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chimecho", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("chimecho", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("chimecho", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt index 1ffe931d94..bbc5363e5f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ClaydolModel.kt @@ -33,7 +33,7 @@ class ClaydolModel(root: ModelPart) : PokemonPoseableModel() { idleAnimations = arrayOf(bedrock("claydol", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("claydol", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("claydol", "blink") } standing = registerPose( poseName = "hover", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt index e79c9f5b50..a72ee71d0e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/CombuskenModel.kt @@ -36,10 +36,10 @@ class CombuskenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("combusken", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("combusken", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("combusken", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("combusken", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt index 19f518d82c..e802ca0b12 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/DusclopsModel.kt @@ -33,7 +33,7 @@ class DusclopsModel (root: ModelPart) : PokemonPoseableModel() { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dusclops", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("dusclops", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt index d901ed4020..4ae39a0655 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GardevoirModel.kt @@ -38,10 +38,10 @@ class GardevoirModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gardevoir", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gardevoir", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gardevoir", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gardevoir", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt index 94fa2ccaa3..ebf957c458 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/GrovyleModel.kt @@ -36,7 +36,7 @@ class GrovyleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grovyle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grovyle", "cry") } override fun registerPoses() { sleep = registerPose( @@ -44,7 +44,7 @@ class GrovyleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe idleAnimations = arrayOf(bedrock("grovyle", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("grovyle", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("grovyle", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt index e109218808..e81e0932e8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/IllumiseModel.kt @@ -39,7 +39,7 @@ class IllumiseModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("illumise", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("illumise", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt index 99ee78f31b..9e041136ea 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/KirliaModel.kt @@ -38,10 +38,10 @@ class KirliaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kirlia", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("kirlia", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kirlia", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("kirlia", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt index fafcd059bf..c2e5916915 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneGalarianModel.kt @@ -36,7 +36,7 @@ class LinooneGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedFra lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("linoone_galarian", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("linoone_galarian", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt index ab1229439b..7dbaf06a5b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LinooneModel.kt @@ -33,7 +33,7 @@ class LinooneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("linoone", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("linoone", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("linoone", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt index 76595c9009..670c78e3bc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LombreModel.kt @@ -47,7 +47,7 @@ class LombreModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped val wateroffset = 1 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lombre", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lombre", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt index 07fe0e7435..b68c499439 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LotadModel.kt @@ -44,7 +44,7 @@ class LotadModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { val wateroffset = -2 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charmander", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("charmander", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt index c3cbb0ea44..2fb9b582db 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LudicoloModel.kt @@ -41,7 +41,7 @@ class LudicoloModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ludicolo", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ludicolo", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt index 43b24c8187..b03f5fc61b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/LuvdiscModel.kt @@ -33,7 +33,7 @@ class LuvdiscModel (root: ModelPart) : PokemonPoseableModel() { lateinit var swim: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("luvdisc", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("luvdisc", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("luvdisc", "ground_sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt index c2d2f61c67..000ad2e431 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MarshtompModel.kt @@ -36,10 +36,10 @@ class MarshtompModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("marshtomp", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("marshtomp", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("marshtomp", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("marshtomp", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt index c844aaebe0..5a6ee8d8ab 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MasquerainModel.kt @@ -28,7 +28,7 @@ class MasquerainModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var standing: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("masquerain", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("masquerain", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt index 2bd2cd9348..ebb6f400cd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MawileModel.kt @@ -36,7 +36,7 @@ class MawileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mawile", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mawile", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("mawile", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt index 1c3dce4500..b7038fb0d7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetagrossModel.kt @@ -31,10 +31,10 @@ class MetagrossModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metagross", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metagross", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("metagross", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("metagross", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt index 72dc4097ab..7402eb2c38 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MetangModel.kt @@ -31,10 +31,10 @@ class MetangModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metang", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("metang", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("metang", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("metang", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt index 4e4b7c3fff..dccd3b2905 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MightyenaModel.kt @@ -38,13 +38,13 @@ class MightyenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mightyena", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mightyena", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mightyena", "blink").setPreventsIdle(false) } - val laugh_out_battle = quirk("laugh_out_battle", secondsBetweenOccurrences = 120F to 240F) { bedrockStateful("mightyena", "quirk").setPreventsIdle(false) } - val laugh_in_battle = quirk("laugh_in_battle", secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "quirk").setPreventsIdle(false) } - val sleep_quirk = quirk("sleep_quirk", secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "sleep_quirk").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mightyena", "blink") } + val laugh_out_battle = quirk(secondsBetweenOccurrences = 120F to 240F) { bedrockStateful("mightyena", "quirk") } + val laugh_in_battle = quirk(secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "quirk") } + val sleep_quirk = quirk(secondsBetweenOccurrences = 30F to 60F) { bedrockStateful("mightyena", "sleep_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt index 2741df921d..614833b311 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MinunModel.kt @@ -36,7 +36,7 @@ class MinunModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedFr lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("minun", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("minun", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt index ff24d225af..1fae009fcb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/MudkipModel.kt @@ -39,10 +39,10 @@ class MudkipModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var float: PokemonPose lateinit var swim: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudkip", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudkip", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mudkip", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mudkip", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt index 2489f63fb1..5566492fce 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NincadaModel.kt @@ -36,11 +36,11 @@ class NincadaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nincada", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nincada", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nincada", "blink").setPreventsIdle(false) } - val flutter = quirk("wing_flutter") { bedrockStateful("nincada", "quirk_wingflutter").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("nincada", "blink") } + val flutter = quirk { bedrockStateful("nincada", "quirk_wingflutter") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt index dd9daf04a7..3174e13a13 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NinjaskModel.kt @@ -35,11 +35,11 @@ class NinjaskModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ninjask", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ninjask", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ninjask", "blink").setPreventsIdle(false) } - val barrelRoll = quirk("run_quirk") { bedrockStateful("ninjask", "run_quirk").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ninjask", "blink") } + val barrelRoll = quirk { bedrockStateful("ninjask", "run_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt index 60f5abbee6..c1acbcb722 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NumelModel.kt @@ -36,7 +36,7 @@ class NumelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("numel", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("numel", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt index 422ca58d30..6f50d05795 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/NuzleafModel.kt @@ -38,7 +38,7 @@ class NuzleafModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nuzleaf", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("nuzleaf", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt index 5111e8eadc..5f2d761f32 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PelipperModel.kt @@ -43,7 +43,7 @@ class PelipperModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWi val wateroffset = -6 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pelipper", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pelipper", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, condition = { !it.isTouchingWater }, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt index dd2c0305b9..738667eaf5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PlusleModel.kt @@ -36,7 +36,7 @@ class PlusleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("plusle", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("plusle", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt index c9bdc11c08..212e34a8bf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/PoochyenaModel.kt @@ -38,10 +38,10 @@ class PoochyenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("poochyena", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("poochyena", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poochyena", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("poochyena", "blink") } standing = registerPose( poseName = "standing", poseTypes = UI_POSES + STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt index dd7407cb63..b3307e6cfb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/RaltsModel.kt @@ -38,10 +38,10 @@ class RaltsModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ralts", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ralts", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ralts", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ralts", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt index dc2965d4da..a5027c5b7c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SceptileModel.kt @@ -36,14 +36,14 @@ class SceptileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sceptile", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sceptile", "cry") } override fun registerPoses() { sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("sceptile", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("sceptile", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("sceptile", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt index 2532b53e5e..b946576cd8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SeedotModel.kt @@ -32,7 +32,7 @@ class SeedotModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("seedot", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("seedot", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt index 17b5b0bcd8..69923271a6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShedinjaModel.kt @@ -33,10 +33,10 @@ class ShedinjaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shedinja", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shedinja", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shedinja", "blink_WIP").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("shedinja", "blink_WIP") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt index 3e0334d334..84384c9101 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShiftryModel.kt @@ -38,7 +38,7 @@ class ShiftryModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shiftry", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("shiftry", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt index 7e2e241cef..9b2f70353d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ShroomishModel.kt @@ -40,10 +40,10 @@ class ShroomishModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleeping: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroomish", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroomish", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shroomish", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("shroomish", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt index 6601909e22..c86188f763 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SurskitModel.kt @@ -35,7 +35,7 @@ class SurskitModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val wateroffset = -8 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("surskit", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("surskit", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt index 78980171b7..5627b9b66d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwampertModel.kt @@ -39,10 +39,10 @@ class SwampertModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swampert", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swampert", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("swampert", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("swampert", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt index 842588a98b..90dffe287d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/SwellowModel.kt @@ -38,10 +38,10 @@ class SwellowModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swellow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("swellow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("swellow", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("swellow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("swellow", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt index 8ea2166f15..e20b3acf36 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TaillowModel.kt @@ -38,10 +38,10 @@ class TaillowModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("taillow", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("taillow", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("taillow", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("taillow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("taillow", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt index 38d12739ad..0e0711cc67 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TorchicModel.kt @@ -36,10 +36,10 @@ class TorchicModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torchic", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torchic", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torchic", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("torchic", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt index 2599f1ed8b..0c1742113b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/TreeckoModel.kt @@ -36,7 +36,7 @@ class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("treecko", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("treecko", "cry") } override fun registerPoses() { sleep = registerPose( @@ -44,7 +44,7 @@ class TreeckoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe idleAnimations = arrayOf(bedrock("treecko", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("treecko", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("treecko", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt index ba618b3fdc..f962975df7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/VolbeatModel.kt @@ -39,7 +39,7 @@ class VolbeatModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("volbeat", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("volbeat", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt index 3e37dced36..5c2de9f9cd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WailordModel.kt @@ -34,7 +34,7 @@ class WailordModel(root: ModelPart) : PokemonPoseableModel() { val offsetY = 0.0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wailord", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("wailord", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt index 9050c12298..c58d68c494 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/WingullModel.kt @@ -43,7 +43,7 @@ class WingullModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWin val wateroffset = -9 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wingull", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("wingull", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, condition = { !it.isTouchingWater }, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt index c6e1ecf1f4..c24b0d894b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonGalarianModel.kt @@ -36,7 +36,7 @@ class ZigzagoonGalarianModel (root: ModelPart) : PokemonPoseableModel(), HeadedF lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("zigzagoon_galarian", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("zigzagoon_galarian", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt index 542b39b3b2..9633856e08 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen3/ZigzagoonModel.kt @@ -40,7 +40,7 @@ class ZigzagoonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffsetZ = -0.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("zigzagoon", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("zigzagoon", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("zigzagoon", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt index 50f534f8a0..1ccdf01da9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/AmbipomModel.kt @@ -38,10 +38,10 @@ class AmbipomModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ambipom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ambipom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ambipom", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ambipom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("ambipom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt index 8d641995a2..f0b238a3d3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BibarelModel.kt @@ -44,7 +44,7 @@ class BibarelModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr val wateroffset = -1 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bibarel", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bibarel", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt index 1bba8e403b..aa7ff751c2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BidoofModel.kt @@ -48,7 +48,7 @@ class BidoofModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru val wateroffset = -2 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bidoof", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bidoof", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt index 712e5aa2d0..a1a8a78a8e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BonslyModel.kt @@ -39,7 +39,7 @@ class BonslyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var battlesleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bonsly", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bonsly", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt index 8b44f37389..d118c6c995 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BuizelModel.kt @@ -38,7 +38,7 @@ class BuizelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped // lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("buizel", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("buizel", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("buizel", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt index ed99d7b67d..cef52a72dc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/BunearyModel.kt @@ -36,10 +36,10 @@ class BunearyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("buneary", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("buneary", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("buneary", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("buneary", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt index 475aa39674..ad2a11b69b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CarnivineModel.kt @@ -29,7 +29,7 @@ class CarnivineModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame{ lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("carnivine", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("carnivine", "blink") } standing = registerPose( poseName = "standing", poseTypes = ALL_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt index 035cf0f1df..9af288dc05 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChatotModel.kt @@ -46,7 +46,7 @@ class ChatotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var walk: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chatot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chatot", "cry") } override fun registerPoses() { @@ -56,7 +56,7 @@ class ChatotModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF // idleAnimations = arrayOf(bedrock("chatot", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("chatot", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("chatot", "blink") } stand = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt index 7d7cd3dc77..0acd192459 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChimcharModel.kt @@ -39,10 +39,10 @@ class ChimcharModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chimchar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chimchar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chimchar", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("chimchar", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt index 41ddcc0692..4be03418a3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ChinglingModel.kt @@ -36,11 +36,11 @@ class ChinglingModel(root: ModelPart) : PokemonPoseableModel() { lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chingling", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chingling", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chingling", "blink").setPreventsIdle(false) } - val sleepquirk = quirk("sleepquirk") { bedrockStateful("chingling", "sleep_quirk").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("chingling", "blink") } + val sleepquirk = quirk { bedrockStateful("chingling", "sleep_quirk") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(sleepquirk), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt index 39de9bb465..4ad676c323 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/CombeeModel.kt @@ -30,9 +30,9 @@ class CombeeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("combee", "blink_right").setPreventsIdle(false) } - val blink2 = quirk("blink") { bedrockStateful("combee", "blink_gender").setPreventsIdle(false) } - val blink3 = quirk("blink") { bedrockStateful("combee", "blink_left").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("combee", "blink_right") } + val blink2 = quirk { bedrockStateful("combee", "blink_gender") } + val blink3 = quirk { bedrockStateful("combee", "blink_left") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt index 591c6f10ba..9e3848862d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifblimModel.kt @@ -29,7 +29,7 @@ class DrifblimModel (root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("drifblim", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("drifblim", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt index c4ea36fb54..270248f5ef 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DrifloonModel.kt @@ -29,7 +29,7 @@ class DrifloonModel (root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk(name = "blink") { bedrockStateful("drifloon", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("drifloon", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt index 28f52ab643..50649ec28b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/DusknoirModel.kt @@ -33,7 +33,7 @@ class DusknoirModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dusknoir", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("dusknoir", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt index 5b2fea6c6e..c7ca923232 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ElectivireModel.kt @@ -38,7 +38,7 @@ class ElectivireModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("electivire", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("electivire", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt index 9c1e1b843c..9e86f7daeb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/EmpoleonModel.kt @@ -38,10 +38,10 @@ class EmpoleonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var swim: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("empoleon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("empoleon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("empoleon", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("empoleon", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("empoleon", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt index 8cf1ee718d..d5cac46bd6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/FloatzelModel.kt @@ -38,7 +38,7 @@ class FloatzelModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip // lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("floatzel", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("floatzel", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("floatzel", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt index 1617bf7218..bf27a5af82 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GabiteModel.kt @@ -37,7 +37,7 @@ class GabiteModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gabite", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gabite", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt index d4fd723bd2..4797b229bb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GalladeModel.kt @@ -9,6 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen4 import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.PokemonPose @@ -33,11 +34,11 @@ class GalladeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gallade", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gallade", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gallade", "blink").setPreventsIdle(false) } - val quirk = quirk("quirk", secondsBetweenOccurrences = 10F to 60F) { bedrockStateful("gallade", "battle_quirk").setPreventsIdle(true) } + val blink = quirk { bedrockStateful("gallade", "blink") } + val quirk = quirk(secondsBetweenOccurrences = 10F to 60F) { PrimaryAnimation(bedrockStateful("gallade", "battle_quirk")) } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("gallade", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt index 081f68a53d..9acb6bda2f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GarchompModel.kt @@ -39,7 +39,7 @@ class GarchompModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("garchomp", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("garchomp", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt index d248a27f7a..0f46f8875d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GibleModel.kt @@ -34,7 +34,7 @@ class GibleModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bimanual lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gible", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gible", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt index acc0ce8374..3d230adf2e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GlaceonModel.kt @@ -31,10 +31,10 @@ class GlaceonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glaceon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glaceon", "cry") } override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("glaceon", "blink").setPreventsIdle(false)} +// val blink = quirk { bedrockStateful("glaceon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt index 9fc3b7443b..93645485c2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GliscorModel.kt @@ -36,7 +36,7 @@ class GliscorModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gliscor", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gliscor", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt index c394d0bbd6..bd53b375a5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/GrotleModel.kt @@ -38,11 +38,11 @@ class GrotleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grotle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grotle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grotle", "blink").setPreventsIdle(false) } - val shake = quirk("shake", secondsBetweenOccurrences = 30F to 360F) { bedrockStateful("grotle", "quirk").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("grotle", "blink") } + val shake = quirk(secondsBetweenOccurrences = 30F to 360F) { bedrockStateful("grotle", "quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt index cbf1f6f290..8e52439535 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/HonchkrowModel.kt @@ -43,7 +43,7 @@ class HonchkrowModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("honchkrow", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("honchkrow", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt index b53b7e00d3..3bdbc28704 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/InfernapeModel.kt @@ -41,10 +41,10 @@ class InfernapeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("infernape", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("infernape", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("infernape", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("infernape", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt index 0492499dd3..8f42ec8e16 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketotModel.kt @@ -44,7 +44,7 @@ class KricketotModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, Hea val shoulderOffsetZ = 0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kricketot", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("kricketot", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("kricketot", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt index 7aa21a8e4c..7e2899cc48 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/KricketuneModel.kt @@ -42,7 +42,7 @@ class KricketuneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var fly: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kricketune", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("kricketune", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("kricketune", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt index a4766a78c7..4a9a7f819b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LeafeonModel.kt @@ -31,10 +31,10 @@ class LeafeonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("leafeon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("leafeon", "cry") } override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("leafeon", "blink").setPreventsIdle(false)} +// val blink = quirk { bedrockStateful("leafeon", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt index 0494b93606..ad4f07ac60 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LickilickyModel.kt @@ -40,7 +40,7 @@ class LickilickyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var battleidle: PokemonPose lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lickilicky", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lickilicky", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("lickilicky", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt index c8fb7d97ec..688b2a312c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LopunnyModel.kt @@ -36,9 +36,9 @@ class LopunnyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lopunny", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lopunny", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lopunny", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lopunny", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt index 099a6ece1c..8b38226635 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LucarioModel.kt @@ -38,10 +38,10 @@ class LucarioModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lucario", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lucario", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lucario", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lucario", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt index 3f1e6f2a6b..f6b84e6645 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxioModel.kt @@ -37,7 +37,7 @@ class LuxioModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var sleep: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("luxio", "blink").setPreventsIdle(false) } +// val blink = quirk { bedrockStateful("luxio", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("luxio", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt index 7ae98d29e9..6a0c4beb98 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/LuxrayModel.kt @@ -36,7 +36,7 @@ class LuxrayModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("luxray", "blink").setPreventsIdle(false) } +// val blink = quirk { bedrockStateful("luxray", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt index 90b90f47d2..e9863b9231 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MagnezoneModel.kt @@ -29,7 +29,7 @@ class MagnezoneModel(root: ModelPart) : PokemonPoseableModel() { override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("magnezone", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("magnezone", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("magnezone", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt index 50103181b3..037ff4bef9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MamoswineModel.kt @@ -42,7 +42,7 @@ class MamoswineModel(root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { idleAnimations = arrayOf(bedrock("mamoswine", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("mamoswine", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mamoswine", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt index c0de414362..2f321f4bdc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MimejrModel.kt @@ -31,7 +31,7 @@ class MimejrModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mimejr", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mimejr", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt index 3e3ce5cdee..55f29c7ce1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MismagiusModel.kt @@ -29,7 +29,7 @@ class MismagiusModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mismagius", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mismagius", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt index b92116ba16..585a0467d3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MonfernoModel.kt @@ -39,10 +39,10 @@ class MonfernoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("monferno", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("monferno", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("monferno", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("monferno", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt index f3cf6c9c79..868bab0e69 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/MunchlaxModel.kt @@ -31,7 +31,7 @@ class MunchlaxModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("munchlax", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("munchlax", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt index 188100f80e..e6762e4dc0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PachirisuModel.kt @@ -36,7 +36,7 @@ class PachirisuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pachirisu", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pachirisu", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt index 991e8a58e9..7dbcdd0838 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PiplupModel.kt @@ -38,10 +38,10 @@ class PiplupModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var swim: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("piplup", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("piplup", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("piplup", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("piplup", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("piplup", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt index 41f6b2f813..4454a539f0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PorygonzModel.kt @@ -35,13 +35,13 @@ class PorygonzModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("porygonz", "blink").setPreventsIdle(false) } - val twitch1 = quirk("twitch1") { bedrockStateful("porygonz", "twitch1").setPreventsIdle(false) } - val twitch2 = quirk("twitch2") { bedrockStateful("porygonz", "twitch2").setPreventsIdle(false) } - val twitch3 = quirk("twitch3") { bedrockStateful("porygonz", "twitch3").setPreventsIdle(false) } - val twitch4 = quirk("twitch4") { bedrockStateful("porygonz", "twitch4").setPreventsIdle(false) } - val twitch5 = quirk("twitch5") { bedrockStateful("porygonz", "twitch5").setPreventsIdle(false) } - val twitch6 = quirk("twitch6") { bedrockStateful("porygonz", "twitch6").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("porygonz", "blink") } + val twitch1 = quirk { bedrockStateful("porygonz", "twitch1") } + val twitch2 = quirk { bedrockStateful("porygonz", "twitch2") } + val twitch3 = quirk { bedrockStateful("porygonz", "twitch3") } + val twitch4 = quirk { bedrockStateful("porygonz", "twitch4") } + val twitch5 = quirk { bedrockStateful("porygonz", "twitch5") } + val twitch6 = quirk { bedrockStateful("porygonz", "twitch6") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(twitch1, twitch2, twitch3, twitch4, twitch5, twitch6), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt index fca46c9859..9886e3f398 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/PrinplupModel.kt @@ -38,10 +38,10 @@ class PrinplupModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var swim: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("prinplup", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("prinplup", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("prinplup", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("prinplup", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("prinplup", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt index 2c698712a1..20e6d3861f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ProbopassModel.kt @@ -33,7 +33,7 @@ class ProbopassModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("probopass", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("probopass", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt index 343a8098a1..cb9bb8b8f5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/RioluModel.kt @@ -38,10 +38,10 @@ class RioluModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("riolu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("riolu", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("riolu", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("riolu", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt index 866d6a28b6..071be999ce 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/ShinxModel.kt @@ -36,7 +36,7 @@ class ShinxModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("shinx", "blink").setPreventsIdle(false) } +// val blink = quirk { bedrockStateful("shinx", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt index 923b2408fa..7dc10b76be 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraptorModel.kt @@ -47,7 +47,7 @@ class StaraptorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi // idleAnimations = arrayOf(bedrock("staraptor", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("staraptor", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("staraptor", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt index c6a452b5d3..3bcf2a5cf5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StaraviaModel.kt @@ -42,14 +42,14 @@ class StaraviaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("staravia", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("staravia", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("staravia", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("staravia", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("staravia", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt index 0491910a70..44dde7eede 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/StarlyModel.kt @@ -48,7 +48,7 @@ class StarlyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("starly", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("starly", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("starly", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt index b1d7470988..cf01b57e6f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TangrowthModel.kt @@ -29,7 +29,7 @@ class TangrowthModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tangrowth", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tangrowth", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt index bf4cbd725c..362d9180a6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraCherryModel.kt @@ -37,10 +37,10 @@ class TorterraCherryModel (root: ModelPart) : PokemonPoseableModel(), HeadedFram lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra_cherry", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra_cherry", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torterra_cherry", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("torterra_cherry", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("torterra_cherry", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt index 9bbe272d61..1c6964d7e8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TorterraModel.kt @@ -37,10 +37,10 @@ class TorterraModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torterra", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torterra", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("torterra", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("torterra", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt index 3cedec7279..d81cd67142 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/TurtwigModel.kt @@ -43,10 +43,10 @@ class TurtwigModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad val shoulderOffset = 3 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("turtwig", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("turtwig", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("turtwig", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("turtwig", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("turtwig", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt index 5eba991452..a7eec595c0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/VespiquenModel.kt @@ -31,8 +31,8 @@ class VespiquenModel (root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink") { bedrockStateful("vespiquen", "blink").setPreventsIdle(false) } - val wingsleep = quirk("wingsleep") { bedrockStateful("vespiquen", "sleep_flap").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("vespiquen", "blink") } + val wingsleep = quirk { bedrockStateful("vespiquen", "sleep_flap") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt index 4a961cad1c..68edeecd61 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen4/WeavileModel.kt @@ -38,7 +38,7 @@ class WeavileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("weavile", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("weavile", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt index 8ed754b051..02480af048 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BoldoreModel.kt @@ -34,7 +34,7 @@ class BoldoreModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boldore", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boldore", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt index a4ddbff78d..9ec8a3cca9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/BouffalantModel.kt @@ -30,7 +30,7 @@ class BouffalantModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charmander", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("charmander", "blink")} // bouffalant does not have a blink!! someone fix pls standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt index 726c91ca3e..5c73f03a8a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ChandelureModel.kt @@ -29,7 +29,7 @@ class ChandelureModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { -// val blink = quirk("blink") { bedrockStateful("chandelure", "blink").setPreventsIdle(false) } +// val blink = quirk { bedrockStateful("chandelure", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt index a7a49d6424..b4d5bc95f9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CofagrigusModel.kt @@ -31,10 +31,10 @@ class CofagrigusModel (root: ModelPart) : PokemonPoseableModel() { lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cofagrigus", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cofagrigus", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cofagrigus", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cofagrigus", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt index 0f5f9890c5..c578d2b531 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ConkeldurrModel.kt @@ -34,7 +34,7 @@ class ConkeldurrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("conkeldurr", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("conkeldurr", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt index 0c10c9b339..71ee5d4c9a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CottoneeModel.kt @@ -30,10 +30,10 @@ class CottoneeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame{ lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cottonee", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cottonee", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cottonee", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cottonee", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt index f38276ce45..58dd0c3bd3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CrustleModel.kt @@ -31,7 +31,7 @@ class CrustleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crustle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crustle", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt index 91529b0970..f73b6f6db8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/CryogonalModel.kt @@ -32,7 +32,7 @@ class CryogonalModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cryogonal", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cryogonal", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt index bc3d268406..568638a1da 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DewottModel.kt @@ -41,10 +41,10 @@ class DewottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dewott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dewott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dewott", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("dewott", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt index d3a720f50d..22e7a5b5ec 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DurantModel.kt @@ -29,7 +29,7 @@ class DurantModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("durant", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("durant", "blink") } standing = registerPose( poseName = "standing", quirks = arrayOf(blink), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt index 1dc1306421..ccce1f5469 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/DwebbleModel.kt @@ -31,7 +31,7 @@ class DwebbleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dwebble", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dwebble", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt index 429ba15d73..ac85acc662 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmboarModel.kt @@ -37,10 +37,10 @@ class EmboarModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("emboar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("emboar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("emboar", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("emboar", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt index 3ff07914e4..26f1ff3e28 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/EmolgaModel.kt @@ -43,7 +43,7 @@ class EmolgaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var flying: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("emolga", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("emolga", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES - PoseType.HOVER, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt index 97c0b25c2f..5351e2ae42 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GalvantulaModel.kt @@ -27,8 +27,8 @@ class GalvantulaModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("galvantula", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("galvantula", "blink2").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("galvantula", "blink1") } + val blink2 = quirk { bedrockStateful("galvantula", "blink2") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt index b58482d9a2..eb8e1493b5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GigalithModel.kt @@ -39,7 +39,7 @@ class GigalithModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gigalith", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gigalith", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt index 3c2d9a5304..aa1f6b03b8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolettModel.kt @@ -41,7 +41,7 @@ class GolettModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golett", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("golett", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt index 8fb94cfadc..1a177ced93 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GolurkModel.kt @@ -34,7 +34,7 @@ class GolurkModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golurk", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("golurk", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt index 0e9d042838..2a1c1e227f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/GurdurrModel.kt @@ -34,7 +34,7 @@ class GurdurrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gurdurr", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gurdurr", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt index 87a3c532cd..2f2b72136e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HeatmorModel.kt @@ -37,7 +37,7 @@ class HeatmorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("heatmor", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("heatmor", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("heatmor", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt index 72f7a9178f..d2d08d2cb9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/HerdierModel.kt @@ -36,10 +36,10 @@ class HerdierModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("herdier", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("herdier", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("herdier", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("herdier", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt index 3a461069f6..c65e3a3912 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/JoltikModel.kt @@ -27,8 +27,8 @@ class JoltikModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("joltik", "blink1").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("joltik", "blink2").setPreventsIdle(false) } + val blink1 = quirk { bedrockStateful("joltik", "blink1") } + val blink2 = quirk { bedrockStateful("joltik", "blink2") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt index 5778229c09..17df1eeec4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LampentModel.kt @@ -29,7 +29,7 @@ class LampentModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lampent", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lampent", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt index de8f88e399..b46de53117 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LillipupModel.kt @@ -36,10 +36,10 @@ class LillipupModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lillipup", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("lillipup", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("lillipup", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lillipup", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt index cc2ce48265..6603342d20 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/LitwickModel.kt @@ -29,7 +29,7 @@ class LitwickModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("litwick", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("litwick", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt index 06b8485c7c..f282d8f502 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/MaractusModel.kt @@ -36,10 +36,10 @@ class MaractusModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bima lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maractus", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maractus", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("maractus", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("maractus", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt index 134b33378b..909576429b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/OshawottModel.kt @@ -39,10 +39,10 @@ class OshawottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("oshawott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("oshawott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("oshawott", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("oshawott", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt index 249b681f01..1b969bc1a8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PatratModel.kt @@ -30,10 +30,10 @@ class PatratModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("patrat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("patrat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("patrat", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("patrat", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt index 05022142fb..55d22b0d53 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PidoveModel.kt @@ -44,14 +44,14 @@ class PidoveModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidove", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pidove", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("pidove", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("pidove", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pidove", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt index 70b0abaad8..b89fd403ee 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/PigniteModel.kt @@ -37,10 +37,10 @@ class PigniteModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pignite", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pignite", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pignite", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pignite", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt index 3d3b5a015f..b95debfea5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/RoggenrolaModel.kt @@ -34,10 +34,10 @@ class RoggenrolaModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("roggenrola", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("roggenrola", "cry") } override fun registerPoses() { - val twitch = quirk("twitch", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("roggenrola", "quirk_twitch").setPreventsIdle(false) } + val twitch = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("roggenrola", "quirk_twitch") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("roggenrola", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt index 4deae21806..d957ed4008 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SamurottModel.kt @@ -38,10 +38,10 @@ class SamurottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("samurott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("samurott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("samurott", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("samurott", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt index 96953d3d3f..163e0f8657 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ScolipedeModel.kt @@ -29,10 +29,10 @@ class ScolipedeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scolipede", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scolipede", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scolipede", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("scolipede", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt index 0c322124f9..3019930e64 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SerperiorModel.kt @@ -30,10 +30,10 @@ class SerperiorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("serperior", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("serperior", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("serperior", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("serperior", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("serperior", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt index 2fa00b58d5..2acc7e123d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/ServineModel.kt @@ -35,10 +35,10 @@ class ServineModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("servine", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("servine", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("servine", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("servine", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt index f8265002fe..2edb7b7e24 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/SnivyModel.kt @@ -35,10 +35,10 @@ class SnivyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snivy", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("snivy", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("snivy", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("snivy", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt index 94405818a8..4cfc39c9ec 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/StoutlandModel.kt @@ -36,10 +36,10 @@ class StoutlandModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qu lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stoutland", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stoutland", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("stoutland", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("stoutland", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STATIONARY_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt index 1448884cb8..790842b5af 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TepigModel.kt @@ -36,10 +36,10 @@ class TepigModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tepig", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tepig", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tepig", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tepig", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt index 3e1c2be0e7..b0c0566f05 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TimburrModel.kt @@ -34,7 +34,7 @@ class TimburrModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("timburr", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("timburr", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt index 8831bf209f..1cabeeac79 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/TranquillModel.kt @@ -44,14 +44,14 @@ class TranquillModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tranquill", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tranquill", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("tranquill", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("tranquill", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tranquill", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt index 3cf41004d2..72dd3b6427 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/UnfezantModel.kt @@ -48,7 +48,7 @@ class UnfezantModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("unfezant", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("unfezant", "cry") } override fun registerPoses() { // sleep = registerPose( @@ -56,7 +56,7 @@ class UnfezantModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip // idleAnimations = arrayOf(bedrock("unfezant", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("unfezant", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("unfezant", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt index 24ca3d9eaa..b171dad65b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/VenipedeModel.kt @@ -28,11 +28,11 @@ class VenipedeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venipede", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("venipede", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("venipede", "blink").setPreventsIdle(false) } - val twitch = quirk("twitch") { bedrockStateful("venipede", "twitch").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("venipede", "blink") } + val twitch = quirk { bedrockStateful("venipede", "twitch") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt index d70bb5214f..c1335d71ae 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WatchogModel.kt @@ -30,10 +30,10 @@ class WatchogModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("watchog", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("watchog", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("watchog", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("watchog", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt index eaf4939372..79cdab0eca 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhimsicottModel.kt @@ -38,10 +38,10 @@ class WhimsicottModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whimsicott", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whimsicott", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("whimsicott", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("whimsicott", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt index 96909c8c45..1399250587 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/WhirlipedeModel.kt @@ -29,10 +29,10 @@ class WhirlipedeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whirlipede", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("whirlipede", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("whirlipede", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("whirlipede", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt index 30e39fbae6..a1c9ecc6a7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen5/YamaskModel.kt @@ -34,7 +34,7 @@ class YamaskModel (root: ModelPart) : PokemonPoseableModel(), BimanualFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamask", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamask", "cry") } override fun registerPoses() { sleep = registerPose( @@ -42,7 +42,7 @@ class YamaskModel (root: ModelPart) : PokemonPoseableModel(), BimanualFrame { idleAnimations = arrayOf(bedrock("yamask", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("yamask", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("yamask", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt index 34eb9636cf..423f4385af 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AegislashModel.kt @@ -27,10 +27,10 @@ class AegislashModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aegislash", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("aegislash", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("aegislash", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("aegislash", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt index 0294915343..abeb3ef73b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/AvaluggModel.kt @@ -45,10 +45,10 @@ class AvaluggModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame, H val wateroffset = -3.5 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("avalugg", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("avalugg", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("avalugg", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("avalugg", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("avalugg", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt index 9f188e07b3..c58c325985 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BergmiteModel.kt @@ -37,10 +37,10 @@ class BergmiteModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bergmite", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bergmite", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bergmite", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bergmite", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("bergmite", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt index 555bcafcd6..5f2d6d174c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BraixenModel.kt @@ -41,10 +41,10 @@ class BraixenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("braixen", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("braixen", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("braixen", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("braixen", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt index 2172b47143..2ee0a450ac 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/BunnelbyModel.kt @@ -31,12 +31,12 @@ class BunnelbyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bunnelby", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bunnelby", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bunnelby", "blink").setPreventsIdle(false) } - val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("bunnelby", "quirk_sleep").setPreventsIdle(false) } - val sleep2 = quirk("sleep2", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("bunnelby", "quirk_sleep2").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bunnelby", "blink") } + val sleep1 = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("bunnelby", "quirk_sleep") } + val sleep2 = quirk(secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("bunnelby", "quirk_sleep2") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt index 5a8c2fb3e3..c79c00cbc8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChesnaughtModel.kt @@ -40,10 +40,10 @@ class ChesnaughtModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chesnaught", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chesnaught", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chesnaught", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("chesnaught", "blink")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt index 62a42560df..fb1f87c63f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ChespinModel.kt @@ -36,10 +36,10 @@ class ChespinModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chespin", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("chespin", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("chespin", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("chespin", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt index 9647887e5b..2d174ac7a1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DelphoxModel.kt @@ -42,10 +42,10 @@ class DelphoxModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var battleidle: PokemonPose lateinit var battlewalk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("delphox", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("delphox", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("delphox", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("delphox", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt index bb5152c310..a04b3c694c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DiggersbyModel.kt @@ -32,10 +32,10 @@ class DiggersbyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose lateinit var portrait: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("diggersby", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("diggersby", "cry") } override fun registerPoses() { - val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("diggersby", "quirk_sleep").setPreventsIdle(false) } + val sleep1 = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("diggersby", "quirk_sleep") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt index 2307510a81..d4176e4f90 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DoubladeModel.kt @@ -27,10 +27,10 @@ class DoubladeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("doublade", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("doublade", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("doublade", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("doublade", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt index 4b6e27eaba..eaf09a812e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/DragalgeModel.kt @@ -29,10 +29,10 @@ class DragalgeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dragalge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dragalge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dragalge", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("dragalge", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt index f4546cb73b..3ec2e25971 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FennekinModel.kt @@ -33,10 +33,10 @@ class FennekinModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fennekin", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fennekin", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fennekin", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("fennekin", "blink") } standing = registerPose( poseName = "standing", poseTypes = setOf(PoseType.NONE, PoseType.STAND, PoseType.PORTRAIT, PoseType.PROFILE), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt index 3ab2304617..1906befda5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchinderModel.kt @@ -44,14 +44,14 @@ class FletchinderModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchinder", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchinder", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("fletchinder", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("fletchinder", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("fletchinder", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt index f304082c96..2c6356a1d7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FletchlingModel.kt @@ -44,14 +44,14 @@ class FletchlingModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchling", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fletchling", "cry") } override fun registerPoses() { // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("fletchling", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("fletchling", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("fletchling", "blink") } stand = registerPose( poseName = "standing", poseTypes = PoseType.SHOULDER_POSES + PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt index aae7702453..fc09e17590 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FroakieModel.kt @@ -41,10 +41,10 @@ class FroakieModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("froakie", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("froakie", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("froakie", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("froakie", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt index f4bc7f8cc8..3456608a46 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/FrogadierModel.kt @@ -41,10 +41,10 @@ class FrogadierModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("frogadier", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("frogadier", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("frogadier", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("frogadier", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt index ba68234c27..9abd417fa9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GourgeistModel.kt @@ -32,10 +32,10 @@ class GourgeistModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gourgeist", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("gourgeist", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("gourgeist", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("gourgeist", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.UI_POSES + PoseType.STAND, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt index 6523ce3213..a9fff48bc1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/GreninjaModel.kt @@ -44,10 +44,10 @@ class GreninjaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("greninja", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("greninja", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("greninja", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("greninja", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt index 6c08f3f62e..ee61d0aa12 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/HonedgeModel.kt @@ -27,10 +27,10 @@ class HonedgeModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("honedge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("honedge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("honedge", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("honedge", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt index 36d5b700cd..7754189a4e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PhantumpModel.kt @@ -33,10 +33,10 @@ class PhantumpModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("phantump", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("phantump", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("phantump", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("phantump", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("phantump", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt index 8ea04def83..c2ecae714a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/PumpkabooModel.kt @@ -30,10 +30,10 @@ class PumpkabooModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pumpkaboo", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("pumpkaboo", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("pumpkaboo", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("pumpkaboo", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt index 0f6f405ac7..b188eb6ee7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/QuilladinModel.kt @@ -39,10 +39,10 @@ class QuilladinModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quilladin", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quilladin", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quilladin", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("quilladin", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt index c5b20de014..621c7e5d88 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/ScatterbugModel.kt @@ -32,11 +32,11 @@ class ScatterbugModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scatterbug", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scatterbug", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scatterbug", "blink").setPreventsIdle(false) } - val lookquirk = quirk("lookquirk") { bedrockStateful("scatterbug", "quirk").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("scatterbug", "blink") } + val lookquirk = quirk { bedrockStateful("scatterbug", "quirk") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt index f06d71c6aa..262744905e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SkrelpModel.kt @@ -29,10 +29,10 @@ class SkrelpModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skrelp", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skrelp", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("skrelp", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("skrelp", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt index cd8fa98c5d..1d10e34cd9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SpewpaModel.kt @@ -32,11 +32,11 @@ class SpewpaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spewpa", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("spewpa", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("spewpa", "blink").setPreventsIdle(false) } - val fluff = quirk("fluff", secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("spewpa", "quirk_fluff").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("spewpa", "blink") } + val fluff = quirk(secondsBetweenOccurrences = 60F to 360F) { bedrockStateful("spewpa", "quirk_fluff") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt index 6a19a25999..49721576ac 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/SylveonModel.kt @@ -31,10 +31,10 @@ class SylveonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sylveon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sylveon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sylveon", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("sylveon", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt index 76c2c486ee..350326b96a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TalonflameModel.kt @@ -42,7 +42,7 @@ class TalonflameModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("talonflame", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("talonflame", "cry") } override fun registerPoses() { // sleep = registerPose( @@ -50,7 +50,7 @@ class TalonflameModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B // idleAnimations = arrayOf(bedrock("talonflame", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("talonflame", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("talonflame", "blink")} stand = registerPose( poseName = "stand", poseTypes = PoseType.STATIONARY_POSES - PoseType.HOVER - PoseType.FLOAT + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt index df877c428e..4ccd2ab780 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/TrevenantModel.kt @@ -31,10 +31,10 @@ class TrevenantModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("trevenant", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("trevenant", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("trevenant", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("trevenant", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("trevenant", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt index 1159163ea2..fa1df70ce8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen6/VivillonModel.kt @@ -35,10 +35,10 @@ class VivillonModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BiWi lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vivillon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("vivillon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("vivillon", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("vivillon", "blink")} sleep = registerPose( poseName = "sleep", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt index 197c55be35..c1448f02b2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BewearModel.kt @@ -43,10 +43,10 @@ class BewearModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bewear", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("bewear", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("bewear", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("bewear", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt index 4fe47cb64e..64e05f9b76 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/BrionneModel.kt @@ -36,10 +36,10 @@ class BrionneModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var battleidle: PokemonPose // lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("brionne", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("brionne", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("brionne", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("brionne", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("brionne", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt index 84273f5b96..c87cd4ca48 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ComfeyModel.kt @@ -38,7 +38,7 @@ class ComfeyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biman val shoulderOffset = 1.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("comfey", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("comfey", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("comfey", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt index 83e678c9a5..4b296b0a8b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DartrixModel.kt @@ -45,7 +45,7 @@ class DartrixModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWing lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dartrix", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dartrix", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt index 04c12bfefb..a84023f421 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/DecidueyeModel.kt @@ -50,10 +50,10 @@ class DecidueyeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var hover: PokemonPose lateinit var fly: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("decidueye", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("decidueye", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("decidueye", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("decidueye", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES - PoseType.HOVER + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt index 8814ed5386..388980c4f3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/GolisopodModel.kt @@ -36,10 +36,10 @@ class GolisopodModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golisopod", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("golisopod", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("golisopod", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("golisopod", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt index 883c57bd6c..a639b34724 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/IncineroarModel.kt @@ -40,10 +40,10 @@ class IncineroarModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, B lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("incineroar", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("incineroar", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("incineroar", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("incineroar", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt index 57dcf6adad..3db315814a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/KomalaModel.kt @@ -24,10 +24,10 @@ class KomalaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose -// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("komala", "cry").setPreventsIdle(false) } +// override val cryAnimation = CryProvider { _, _ -> bedrockStateful("komala", "cry") } override fun registerPoses() { - val doze = quirk("doze", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("komala", "quirk_doze_off").setPreventsIdle(false)} + val doze = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("komala", "quirk_doze_off")} standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt index 9d127f5480..a3eb631ec2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/LittenModel.kt @@ -38,10 +38,10 @@ class LittenModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("litten", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("litten", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("litten", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("litten", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt index 46bf5e813d..fdbdb79e64 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MimikyuModel.kt @@ -36,7 +36,7 @@ class MimikyuModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mimikyu", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mimikyu", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt index 6dfcfbab37..76cb684ba6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MorelullModel.kt @@ -26,7 +26,7 @@ class MorelullModel(root: ModelPart) : PokemonPoseableModel() { lateinit var standing: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("morelull", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("morelull", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt index 8badc97c79..dbdd208add 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudbrayModel.kt @@ -36,10 +36,10 @@ class MudbrayModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudbray", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudbray", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mudbray", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mudbray", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt index 0454f35968..1ccd18acba 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/MudsdaleModel.kt @@ -36,10 +36,10 @@ class MudsdaleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudsdale", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mudsdale", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mudsdale", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mudsdale", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt index 9160a17044..148ee84e4f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PoipoleModel.kt @@ -41,7 +41,7 @@ class PoipoleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biman lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("poipole", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("poipole", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt index a655995eed..018a36a43c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PopplioModel.kt @@ -42,10 +42,10 @@ class PopplioModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffset = 1 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("popplio", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("popplio", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("popplio", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("popplio", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("popplio", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt index 0e2290ff49..dbc780ade6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/PrimarinaModel.kt @@ -36,10 +36,10 @@ class PrimarinaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primarina", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("primarina", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("primarina", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("primarina", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt index 5b46c3f563..312a3b4a15 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/RowletModel.kt @@ -45,10 +45,10 @@ class RowletModel(root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWinge lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rowlet", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rowlet", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rowlet", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("rowlet", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES - PoseType.HOVER + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt index d3805abdaa..999085b39f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/ShiinoticModel.kt @@ -38,7 +38,7 @@ class ShiinoticModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shiinotic", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("shiinotic", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt index 6418a3bb0a..1d8401486d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/SteeneeModel.kt @@ -40,7 +40,7 @@ class SteeneeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biman lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("steenee", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("steenee", "blink")} standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt index b9c330075d..ed77a6a1b5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/StuffulModel.kt @@ -39,10 +39,10 @@ class StuffulModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stufful", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("stufful", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("stufful", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("stufful", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt index 0afb448ea1..bab10cf83b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TorracatModel.kt @@ -38,10 +38,10 @@ class TorracatModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torracat", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("torracat", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("torracat", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("torracat", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt index b25f21c071..16627f17de 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/TsareenaModel.kt @@ -36,7 +36,7 @@ class TsareenaModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tsareena", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tsareena", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt index 0a6a46bc77..fd3af172ff 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WimpodModel.kt @@ -38,12 +38,12 @@ class WimpodModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var swimming: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wimpod", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wimpod", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wimpod", "blink").setPreventsIdle(false)} - val leftTwitch = quirk("left_twitch") { bedrockStateful("wimpod", "twitch_quirk_left").setPreventsIdle(false)} - val rightTwitch = quirk("right_twitch") { bedrockStateful("wimpod", "twitch_quirk_right").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("wimpod", "blink")} + val leftTwitch = quirk { bedrockStateful("wimpod", "twitch_quirk_left")} + val rightTwitch = quirk { bedrockStateful("wimpod", "twitch_quirk_right")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt index f5b23fc851..ef383676e2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen7/WishiwashiSoloModel.kt @@ -30,7 +30,7 @@ class WishiwashiSoloModel (root: ModelPart) : PokemonPoseableModel(){ lateinit var watersleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wishiwashi_solo", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("wishiwashi_solo", "blink") } watersleep = registerPose( poseType = PoseType.SLEEP, condition = { it.isTouchingWater }, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt index b7286795a4..811989739f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/AlcremieModel.kt @@ -42,7 +42,7 @@ class AlcremieModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bim val shoulderOffset = 5.5 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("alcremie", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("alcremie", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("alcremie", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt index 8170250d7c..f6cc681564 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ArrokudaModel.kt @@ -33,8 +33,8 @@ class ArrokudaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var waterbattleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("arrokuda", "blink").setPreventsIdle(false)} - val flop = quirk("flop") { bedrockStateful("arrokuda", "ground_quirk").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("arrokuda", "blink")} + val flop = quirk { bedrockStateful("arrokuda", "ground_quirk")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt index df1533d41f..9484b165db 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BarraskewdaModel.kt @@ -33,7 +33,7 @@ class BarraskewdaModel (root: ModelPart) : PokemonPoseableModel() { lateinit var waterbattleidle: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("barraskewda", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("barraskewda", "blink")} sleep = registerPose( poseName = "sleeping", transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt index 1f3a9b1079..6ad79c1615 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/BoltundModel.kt @@ -33,10 +33,10 @@ class BoltundModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boltund", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("boltund", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("boltund", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("boltund", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("boltund", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt index f74ddb6283..ba739b5184 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CinderaceModel.kt @@ -36,10 +36,10 @@ class CinderaceModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cinderace", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cinderace", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cinderace", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cinderace", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt index f45e2cc4a4..9ad538f07c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorviknightModel.kt @@ -45,10 +45,10 @@ class CorviknightModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corviknight", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corviknight", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("corviknight", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("corviknight", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("corviknight", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt index 900e71d556..39a54672fd 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/CorvisquireModel.kt @@ -40,11 +40,11 @@ class CorvisquireModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corvisquire", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("corvisquire", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("corvisquire", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("corvisquire", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("corvisquire", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt index fae0b7d24c..8f6c335460 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DrizzileModel.kt @@ -39,10 +39,10 @@ class DrizzileModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("drizzile", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("drizzile", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("drizzile", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("drizzile", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt index f80dea4950..259449064a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/DubwoolModel.kt @@ -43,10 +43,10 @@ class DubwoolModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var shearedstanding: PokemonPose lateinit var shearedwalk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dubwool", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dubwool", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dubwool", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("dubwool", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt index e817c56fd5..adb336afbc 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/EiscueModel.kt @@ -32,7 +32,7 @@ class EiscueModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("eiscue_ice", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("eiscue_ice", "blink")} sleep = registerPose( poseType = PoseType.SLEEP, transformTicks = 10, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt index e142747fa7..df447770c1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/FalinksModel.kt @@ -29,12 +29,12 @@ class FalinksModel (root: ModelPart) : PokemonPoseableModel(){ lateinit var uipose: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("falinks", "blink").setPreventsIdle(false) } - val blink2 = quirk("blink2") { bedrockStateful("falinks", "blink2").setPreventsIdle(false) } - val blink3 = quirk("blink3") { bedrockStateful("falinks", "blink3").setPreventsIdle(false) } - val blink4 = quirk("blink4") { bedrockStateful("falinks", "blink4").setPreventsIdle(false) } - val blink5 = quirk("blink5") { bedrockStateful("falinks", "blink5").setPreventsIdle(false) } - val blink6 = quirk("blink6") { bedrockStateful("falinks", "blink6").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("falinks", "blink") } + val blink2 = quirk { bedrockStateful("falinks", "blink2") } + val blink3 = quirk { bedrockStateful("falinks", "blink3") } + val blink4 = quirk { bedrockStateful("falinks", "blink4") } + val blink5 = quirk { bedrockStateful("falinks", "blink5") } + val blink6 = quirk { bedrockStateful("falinks", "blink6") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt index 6129ca6e1c..b202dce1ec 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/GrookeyModel.kt @@ -40,10 +40,10 @@ class GrookeyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bipe lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grookey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grookey", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grookey", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("grookey", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt index 8e1e289edc..3ff158de32 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/InteleonModel.kt @@ -38,10 +38,10 @@ class InteleonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("inteleon", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("inteleon", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("inteleon", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("inteleon", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt index 0abd9cc10c..b3bb813e1c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/KleavorModel.kt @@ -34,7 +34,7 @@ class KleavorModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("kleavor", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("kleavor", "blink")} standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt index 1fc42b7d07..17e67294ab 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/NickitModel.kt @@ -39,14 +39,14 @@ class NickitModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nickit", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nickit", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("nickit", "blink").setPreventsIdle(false)} - val glanceleft = quirk("glanceleft") { bedrockStateful("nickit", "quirk_shiftyglance_left").setPreventsIdle(false)} - val glanceright = quirk("glanceright") { bedrockStateful("nickit", "quirk_shiftyglance_right").setPreventsIdle(false)} - val eartwitchleft = quirk("eartwitchleft") { bedrockStateful("nickit", "quirk_eartwitch_left").setPreventsIdle(false)} - val eartwitchright = quirk("eartwitchright") { bedrockStateful("nickit", "quirk_eartwitch_right").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("nickit", "blink")} + val glanceleft = quirk { bedrockStateful("nickit", "quirk_shiftyglance_left")} + val glanceright = quirk { bedrockStateful("nickit", "quirk_shiftyglance_right")} + val eartwitchleft = quirk { bedrockStateful("nickit", "quirk_eartwitch_left")} + val eartwitchright = quirk { bedrockStateful("nickit", "quirk_eartwitch_right")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt index 0b9c85f7cd..eb45e53df3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ObstagoonModel.kt @@ -34,7 +34,7 @@ class ObstagoonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("obstagoon", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("obstagoon", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt index 5c520ea9e9..7f4abdc860 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/PerrserkerModel.kt @@ -41,7 +41,7 @@ class PerrserkerModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("perrserker", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("perrserker", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt index 9fa9fba11a..2e5970e034 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RabootModel.kt @@ -36,10 +36,10 @@ class RabootModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raboot", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("raboot", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("raboot", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("raboot", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt index cb529ca141..8059ec29f1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RillaboomModel.kt @@ -41,10 +41,10 @@ class RillaboomModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rillaboom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rillaboom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rillaboom", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("rillaboom", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt index 4cd2b40ece..0738724834 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/RookideeModel.kt @@ -38,10 +38,10 @@ class RookideeModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, BiWi lateinit var fly: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rookidee", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("rookidee", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("rookidee", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("rookidee", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("rookidee", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt index a98c857161..8b58c55b1a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ScorbunnyModel.kt @@ -38,10 +38,10 @@ class ScorbunnyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi // lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scorbunny", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("scorbunny", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("scorbunny", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("scorbunny", "blink") } // sleep = registerPose( // poseType = PoseType.SLEEP, // idleAnimations = arrayOf(bedrock("scorbunny", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt index 1fa7cb8395..5780ebfaa9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SirfetchdModel.kt @@ -9,6 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen8 import com.cobblemon.mod.common.client.render.models.blockbench.animation.BipedWalkAnimation +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.frame.BipedFrame import com.cobblemon.mod.common.client.render.models.blockbench.frame.HeadedFrame import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.CryProvider @@ -34,11 +35,11 @@ class SirfetchdModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sirfetchd", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sirfetchd", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sirfetchd", "blink").setPreventsIdle(false) } - val swag = quirk("swag") { bedrockStateful("sirfetchd", "quirk").setPreventsIdle(true) } + val blink = quirk { bedrockStateful("sirfetchd", "blink") } + val swag = quirk { PrimaryAnimation(bedrockStateful("sirfetchd", "quirk")) } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt index d8231db523..f92b83ed27 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/SobbleModel.kt @@ -36,10 +36,10 @@ class SobbleModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Biped lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sobble", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sobble", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sobble", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("sobble", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt index 459b05da52..e496231aac 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThievulModel.kt @@ -37,11 +37,11 @@ class ThievulModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thievul", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thievul", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("thievul", "blink").setPreventsIdle(false)} - val sleepquirk = quirk("sleepquirk") { bedrockStateful("thievul", "quirk_sleep").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("thievul", "blink")} + val sleepquirk = quirk { bedrockStateful("thievul", "quirk_sleep")} sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt index 763e5bce11..36dc260c85 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/ThwackeyModel.kt @@ -42,10 +42,10 @@ class ThwackeyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thwackey", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("thwackey", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("thwackey", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("thwackey", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt index 0e88c66cda..4635fbeb0b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/UrsalunaModel.kt @@ -37,7 +37,7 @@ class UrsalunaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ursaluna", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ursaluna", "cry") } override fun registerPoses() { // sleep = registerPose( @@ -45,7 +45,7 @@ class UrsalunaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua // idleAnimations = arrayOf(bedrock("ursaluna", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("ursaluna", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ursaluna", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt index f8833480f4..0207265cc4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WoolooModel.kt @@ -40,10 +40,10 @@ class WoolooModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadru lateinit var shearedstanding: PokemonPose lateinit var shearedwalk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooloo", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("wooloo", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wooloo", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("wooloo", "blink") } standing = registerPose( poseName = "standing", poseTypes = setOf(PoseType.NONE, PoseType.STAND, PoseType.PORTRAIT, PoseType.PROFILE), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt index d8a4303578..c0a867a099 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/WyrdeerModel.kt @@ -36,7 +36,7 @@ class WyrdeerModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("wyrdeer", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("wyrdeer", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt index 4621a5eeb1..21c997c302 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen8/YamperModel.kt @@ -36,10 +36,10 @@ class YamperModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamper", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("yamper", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("yamper", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("yamper", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt index 4449292a5c..86fd1fe07f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/AnnihilapeModel.kt @@ -38,10 +38,10 @@ class AnnihilapeModel (root: ModelPart) : PokemonPoseableModel(), BipedFrame, Bi lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("annihilape", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("annihilape", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("annihilape", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("annihilape", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt index c05d0a631c..bd508da057 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ArmarougeModel.kt @@ -43,10 +43,10 @@ class ArmarougeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("armarouge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("armarouge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("armarouge", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("armarouge", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("armarouge", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt index 5482d1c16f..101b50a87d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CeruledgeModel.kt @@ -48,10 +48,10 @@ class CeruledgeModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ceruledge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("ceruledge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ceruledge", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ceruledge", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, transformedParts = arrayOf( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt index 6f180fb513..167507739c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetitanModel.kt @@ -35,10 +35,10 @@ class CetitanModel(root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetitan", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetitan", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cetitan", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cetitan", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cetitan", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt index 2989757e4f..6d942ee8a3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CetoddleModel.kt @@ -35,10 +35,10 @@ class CetoddleModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetoddle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("cetoddle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("cetoddle", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("cetoddle", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("cetoddle", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt index 7349b3b22e..7ec7663db9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CharcadetModel.kt @@ -42,10 +42,10 @@ class CharcadetModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walking: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charcadet", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("charcadet", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("charcadet", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("charcadet", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("charcadet", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt index 72a7ddd957..2cd784fff0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ClodsireModel.kt @@ -38,10 +38,10 @@ class ClodsireModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clodsire", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("clodsire", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("clodsire", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("clodsire", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt index e09e5cfe8c..498555ae99 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/CrocalorModel.kt @@ -31,10 +31,10 @@ class CrocalorModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame{ lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crocalor", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("crocalor", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("crocalor", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("crocalor", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("crocalor", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt index cdf8510225..96e858ceb4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/DachsbunModel.kt @@ -39,10 +39,10 @@ class DachsbunModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quad lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dachsbun", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("dachsbun", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("dachsbun", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("dachsbun", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt index 90106be189..f8e9b05437 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/EspathraModel.kt @@ -35,10 +35,10 @@ class EspathraModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espathra", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("espathra", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("espathra", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("espathra", "blink") } sleep = registerPose( poseName = "sleep", poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt index 015e74de5f..4e5c50f36b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FidoughModel.kt @@ -39,10 +39,10 @@ class FidoughModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Quadr lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fidough", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fidough", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fidough", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("fidough", "blink") } standing = registerPose( poseName = "standing", poseTypes = STATIONARY_POSES + UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt index 673f06618e..fc2a28d0c9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FlittleModel.kt @@ -41,10 +41,10 @@ class FlittleModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { val shoulderOffsetX = 6 val shoulderOffsetY = 6 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flittle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("flittle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("flittle", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("flittle", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("flittle", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt index 264864cf99..f9f36f65bb 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FloragatoModel.kt @@ -31,10 +31,10 @@ class FloragatoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("floragato", "battle_cry").setPreventsIdle(false) else bedrockStateful("floragato", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { entity, _ -> if (entity.isBattling) bedrockStateful("floragato", "battle_cry") else bedrockStateful("floragato", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("floragato", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("floragato", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("floragato", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt index 19bc4f962b..748b61fa2a 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/FuecocoModel.kt @@ -33,10 +33,10 @@ class FuecocoModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fuecoco", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("fuecoco", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("fuecoco", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("fuecoco", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("fuecoco", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt index 2b1143f29e..b245cc0de1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GarganaclModel.kt @@ -41,7 +41,7 @@ class GarganaclModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var walk: PokemonPose lateinit var portrait: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("garganacl", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("garganacl", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt index c9ded882ad..07428a7b33 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmetModel.kt @@ -30,10 +30,10 @@ class GlimmetModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmet", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmet", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("glimmet", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("glimmet", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("glimmet", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt index 979e869972..6de8ceda36 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GlimmoraModel.kt @@ -31,10 +31,10 @@ class GlimmoraModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmora", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("glimmora", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("glimmora", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("glimmora", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("glimmora", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt index 66a3e620ed..bb162554a5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/GrafaiaiModel.kt @@ -30,10 +30,10 @@ class GrafaiaiModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grafaiai", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("grafaiai", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("grafaiai", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("grafaiai", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt index 1eb0f1ce7a..b32920aaa1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/IronleavesModel.kt @@ -34,7 +34,7 @@ class IronleavesModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("ironleaves", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("ironleaves", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt index d54435c9f4..9b6b6b2cd9 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/LechonkModel.kt @@ -40,7 +40,7 @@ class LechonkModel (root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { // idleAnimations = arrayOf(bedrock("lechonk", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("lechonk", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("lechonk", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt index 8374f00715..094590a8b5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MabosstiffModel.kt @@ -36,10 +36,10 @@ class MabosstiffModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Q lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mabosstiff", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("mabosstiff", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("mabosstiff", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("mabosstiff", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt index e2355f3d1b..b92f9f9fff 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MaschiffModel.kt @@ -36,10 +36,10 @@ class MaschiffModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Qua lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maschiff", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("maschiff", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("maschiff", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("maschiff", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt index 0c7694855d..be3f150b40 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdModel.kt @@ -34,9 +34,9 @@ class MausholdModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("maushold_four", "blink1").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("maushold_four", "blink2").setPreventsIdle(false)} - val blink3 = quirk("blink3") { bedrockStateful("maushold_four", "blink3").setPreventsIdle(false)} + val blink1 = quirk { bedrockStateful("maushold_four", "blink1")} + val blink2 = quirk { bedrockStateful("maushold_four", "blink2")} + val blink3 = quirk { bedrockStateful("maushold_four", "blink3")} val head2 = object : HeadedFrame { override val rootPart = this@MausholdModel.rootPart diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt index 8270b1c2a5..c7164ecae3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MausholdfourModel.kt @@ -34,10 +34,10 @@ class MausholdfourModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("maushold_four", "blink1").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("maushold_four", "blink2").setPreventsIdle(false)} - val blink3 = quirk("blink3") { bedrockStateful("maushold_four", "blink3").setPreventsIdle(false)} - val blink4 = quirk("blink4") { bedrockStateful("maushold_four", "blink4").setPreventsIdle(false)} + val blink1 = quirk { bedrockStateful("maushold_four", "blink1")} + val blink2 = quirk { bedrockStateful("maushold_four", "blink2")} + val blink3 = quirk { bedrockStateful("maushold_four", "blink3")} + val blink4 = quirk { bedrockStateful("maushold_four", "blink4")} val head2 = object : HeadedFrame { override val rootPart = this@MausholdfourModel.rootPart diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt index 79a1cdcc30..557d97b713 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/MeowscaradaModel.kt @@ -31,14 +31,14 @@ class MeowscaradaModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meowscarada", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("meowscarada", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("meowscarada", "blink").setPreventsIdle(false) } - val sleep1 = quirk("sleep1", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk").setPreventsIdle(false) } - val sleep2 = quirk("sleep2", secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("meowscarada", "sleep_quirk2").setPreventsIdle(false) } - val sleep3 = quirk("sleep3", secondsBetweenOccurrences = 20F to 60F) { bedrockStateful("meowscarada", "sleep_quirk3").setPreventsIdle(false) } - val sleep4 = quirk("sleep4", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk4").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("meowscarada", "blink") } + val sleep1 = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk") } + val sleep2 = quirk(secondsBetweenOccurrences = 30F to 120F) { bedrockStateful("meowscarada", "sleep_quirk2") } + val sleep3 = quirk(secondsBetweenOccurrences = 20F to 60F) { bedrockStateful("meowscarada", "sleep_quirk3") } + val sleep4 = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("meowscarada", "sleep_quirk4") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt index 603dcc1a37..8a44709e44 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NacliModel.kt @@ -31,7 +31,7 @@ class NacliModel(root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nacli", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("nacli", "cry") } override fun registerPoses() { sleep = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt index fa4ee4f844..3160a6f0c4 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/NaclstackModel.kt @@ -36,7 +36,7 @@ class NaclstackModel(root: ModelPart) : PokemonPoseableModel(), QuadrupedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("naclstack", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("naclstack", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt index 9495b0cda7..b5abc5f1ea 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/OinkologneModel.kt @@ -42,7 +42,7 @@ class OinkologneModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Q // idleAnimations = arrayOf(bedrock("oinkologne", "sleep")) // ) - val blink = quirk("blink") { bedrockStateful("oinkologne", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("oinkologne", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt index a16a823c7a..bac8735601 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaquavalModel.kt @@ -39,10 +39,10 @@ class QuaquavalModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaquaval", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaquaval", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quaquaval", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("quaquaval", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("quaquaval", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt index 6387b9d868..f7cdeb5c8f 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxlyModel.kt @@ -47,10 +47,10 @@ class QuaxlyModel(root: ModelPart) : PokemonPoseableModel(), HeadedFrame, BipedF val wateroffset = -10 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxly", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxly", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quaxly", "blink").setPreventsIdle(false)} + val blink = quirk { bedrockStateful("quaxly", "blink")} sleep = registerPose( poseName = "sleeping", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt index 1dc5e23f58..c739ca7b30 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/QuaxwellModel.kt @@ -34,10 +34,10 @@ class QuaxwellModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxwell", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("quaxwell", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("quaxwell", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("quaxwell", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("quaxwell", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt index fc3d7d9ba5..afd81ff7a0 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/RevavroomModel.kt @@ -28,10 +28,10 @@ class RevavroomModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("revavroom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("revavroom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("revavroom", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("revavroom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("revavroom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt index ef00ab7045..2ec7855e79 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/ShroodleModel.kt @@ -28,10 +28,10 @@ class ShroodleModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walking: PokemonPose lateinit var sleeping: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroodle", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("shroodle", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("shroodle", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("shroodle", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt index fdd99b1b2b..e61799e0e2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SkeledirgeModel.kt @@ -29,10 +29,10 @@ class SkeledirgeModel (root: ModelPart) : PokemonPoseableModel() { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skeledirge", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("skeledirge", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("skeledirge", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("skeledirge", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("skeledirge", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt index dd99b9695b..76469a0eb2 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SprigatitoModel.kt @@ -31,12 +31,12 @@ class SprigatitoModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sprigatito", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("sprigatito", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("sprigatito", "blink").setPreventsIdle(false) } - val earTwitchRight = quirk("ear_twitch_right", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-left").setPreventsIdle(false) } - val earTwitchLeft = quirk("ear_twitch_left", secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-right").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("sprigatito", "blink") } + val earTwitchRight = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-left") } + val earTwitchLeft = quirk(secondsBetweenOccurrences = 60F to 120F) { bedrockStateful("sprigatito", "quirk_ear-twitch-right") } sleep = registerPose( poseType = PoseType.SLEEP, quirks = arrayOf(earTwitchRight, earTwitchLeft), diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt index bcb9093eb4..0d5c1eca09 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/SquawkabillyModel.kt @@ -46,12 +46,12 @@ class SquawkabillyModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, lateinit var shoulderLeft: PokemonPose lateinit var shoulderRight: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squawkabilly", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("squawkabilly", "cry") } val shoulderOffsetX = -1.0 val shoulderOffsetY = 0 override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("squawkabilly", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("squawkabilly", "blink") } standing = registerPose( poseName = "standing", diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt index a14dffc4c8..d082484499 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TandemausModel.kt @@ -33,12 +33,12 @@ class TandemausModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var walk: PokemonPose // lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tandemaus", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tandemaus", "cry") } override fun registerPoses() { - val blink1 = quirk("blink1") { bedrockStateful("tandemaus", "blink1").setPreventsIdle(false)} - val blink2 = quirk("blink2") { bedrockStateful("tandemaus", "blink2").setPreventsIdle(false)} + val blink1 = quirk { bedrockStateful("tandemaus", "blink1")} + val blink2 = quirk { bedrockStateful("tandemaus", "blink2")} val head2 = object : HeadedFrame { override val rootPart = this@TandemausModel.rootPart diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt index 81217b840c..a74a16849d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TatsugiriModel.kt @@ -30,7 +30,7 @@ class TatsugiriModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame { lateinit var standing: PokemonPose lateinit var walk: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tatsugiri", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tatsugiri", "cry") } override fun registerPoses() { standing = registerPose( diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt index d06345d4b8..303cf3963c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatinkModel.kt @@ -45,10 +45,10 @@ class TinkatinkModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi val shoulderOffset = 1 - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatink", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatink", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tinkatink", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tinkatink", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt index e63dcb2606..01f56c6821 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatonModel.kt @@ -39,10 +39,10 @@ class TinkatonModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bip lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkaton", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkaton", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tinkaton", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tinkaton", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("tinkaton", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt index 2a86bba30e..7efb7227f5 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/TinkatuffModel.kt @@ -39,10 +39,10 @@ class TinkatuffModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, Bi lateinit var sleep: PokemonPose lateinit var battleidle: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatuff", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("tinkatuff", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("tinkatuff", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("tinkatuff", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("tinkatuff", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt index 7237781cea..079e8d9dcf 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/VaroomModel.kt @@ -28,10 +28,10 @@ class VaroomModel (root: ModelPart) : PokemonPoseableModel() { lateinit var walk: PokemonPose lateinit var sleep: PokemonPose - override val cryAnimation = CryProvider { _, _ -> bedrockStateful("varoom", "cry").setPreventsIdle(false) } + override val cryAnimation = CryProvider { _, _ -> bedrockStateful("varoom", "cry") } override fun registerPoses() { - val blink = quirk("blink") { bedrockStateful("varoom", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("varoom", "blink") } sleep = registerPose( poseType = PoseType.SLEEP, idleAnimations = arrayOf(bedrock("varoom", "sleep")) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt index a6b2e5dc92..822bfe68ec 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/gen9/WalkingwakeModel.kt @@ -52,7 +52,7 @@ class WalkingwakeModel (root: ModelPart) : PokemonPoseableModel(), HeadedFrame, idleAnimations = arrayOf(bedrock("walkingwake", "sleep")) ) - val blink = quirk("blink") { bedrockStateful("walkingwake", "blink").setPreventsIdle(false) } + val blink = quirk { bedrockStateful("walkingwake", "blink") } standing = registerPose( poseName = "standing", poseTypes = PoseType.STATIONARY_POSES + PoseType.UI_POSES, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt index e96c917070..b1601d6de8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pose/Pose.kt @@ -8,6 +8,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.pose +import com.cobblemon.mod.common.api.molang.ExpressionLike import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation @@ -21,26 +22,27 @@ import net.minecraft.entity.Entity * A pose for a model. */ class Pose( - val poseName: String, + var poseName: String, val poseTypes: Set, val condition: ((T) -> Boolean)?, val onTransitionedInto: (PoseableEntityState?) -> Unit = {}, val transformTicks: Int, + val animations: MutableMap = mutableMapOf(), val idleAnimations: Array>, val transformedParts: Array, val quirks: Array> ) { fun isSuitable(entity: T) = condition?.invoke(entity) ?: true - val transitions = mutableMapOf, (Pose, Pose) -> StatefulAnimation>() + val transitions = mutableMapOf, Pose) -> StatefulAnimation>() fun idleStateless(model: PoseableEntityModel, state: PoseableEntityState?, limbSwing: Float = 0F, limbSwingAmount: Float = 0F, ageInTicks: Float = 0F, headYaw: Float = 0F, headPitch: Float = 0F, intensity: Float) { idleAnimations.forEach { it.apply(null, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity) } } - fun idleStateful(entity: T?, model: PoseableEntityModel, state: PoseableEntityState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { + fun idleStateful(entity: T?, model: PoseableEntityModel, state: PoseableEntityState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float) { idleAnimations.filter { state.shouldIdleRun(it, 0F) }.forEach { idleAnimation -> - idleAnimation.apply(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity * state.getIdleIntensity(idleAnimation)) + idleAnimation.apply(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, state.getIdleIntensity(idleAnimation)) } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/ModelQuirk.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/ModelQuirk.kt index 1523e59600..65e32eb86e 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/ModelQuirk.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/ModelQuirk.kt @@ -12,7 +12,7 @@ import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityMo import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState import net.minecraft.entity.Entity -abstract class ModelQuirk>(val name: String) { +abstract class ModelQuirk> { abstract fun createData(): D protected abstract fun tick(state: PoseableEntityState, data: D) fun tick(entity: T?, model: PoseableEntityModel, state: PoseableEntityState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt index 26374d5832..bef3cd6777 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/QuirkData.kt @@ -10,13 +10,18 @@ package com.cobblemon.mod.common.client.render.models.blockbench.quirk import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityModel import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation import net.minecraft.entity.Entity -open class QuirkData(val name: String) { +open class QuirkData { val animations = mutableListOf>() + var primaryAnimation: PrimaryAnimation? = null open fun run(entity: T?, model: PoseableEntityModel, state: PoseableEntityState, limbSwing: Float, limbSwingAmount: Float, ageInTicks: Float, headYaw: Float, headPitch: Float, intensity: Float) { + if (primaryAnimation != null && state.primaryAnimation != primaryAnimation) { + primaryAnimation = null + } animations.removeIf { !it.run(entity, model, state, limbSwing, limbSwingAmount, ageInTicks, headYaw, headPitch, intensity) } } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt index 889eaec9d8..be4ade62d1 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirk.kt @@ -9,20 +9,21 @@ package com.cobblemon.mod.common.client.render.models.blockbench.quirk import com.cobblemon.mod.common.client.render.models.blockbench.PoseableEntityState +import com.cobblemon.mod.common.client.render.models.blockbench.animation.PrimaryAnimation import com.cobblemon.mod.common.client.render.models.blockbench.animation.StatefulAnimation import com.cobblemon.mod.common.util.math.random import kotlin.random.Random import net.minecraft.entity.Entity + class SimpleQuirk( - name: String, private val secondsBetweenOccurrences: Pair, val condition: (state: PoseableEntityState) -> Boolean = { true }, val loopTimes: IntRange = 1..1, val animations: (state: PoseableEntityState) -> Iterable> -) : ModelQuirk>(name) { - override fun createData(): SimpleQuirkData = SimpleQuirkData(name) +) : ModelQuirk>() { + override fun createData(): SimpleQuirkData = SimpleQuirkData() override fun tick(state: PoseableEntityState, data: SimpleQuirkData) { - if (data.animations.isNotEmpty()) { + if (data.animations.isNotEmpty() || data.primaryAnimation != null) { return } @@ -31,7 +32,7 @@ class SimpleQuirk( } if (data.remainingLoops > 0) { - data.animations.addAll(animations(state)) + applyAnimations(state, data) data.remainingLoops-- } @@ -40,12 +41,22 @@ class SimpleQuirk( // Is it time? if (data.nextOccurrenceSeconds <= state.animationSeconds) { data.remainingLoops = loopTimes.random() - 1 - data.animations.addAll(animations(state)) + applyAnimations(state, data) data.nextOccurrenceSeconds = -1F } } else { - data.nextOccurrenceSeconds = state.animationSeconds + Random.nextFloat() * secondsBetweenOccurrences.random() + data.nextOccurrenceSeconds = state.animationSeconds + secondsBetweenOccurrences.random() } } } + + private fun applyAnimations(state: PoseableEntityState, data: SimpleQuirkData) { + val (primary, stateful) = animations(state).partition { it is PrimaryAnimation } + data.animations.addAll(stateful) + if (primary.isNotEmpty()) { + val primaryAnimation = primary.first() as PrimaryAnimation + data.primaryAnimation = primaryAnimation + state.addPrimaryAnimation(primaryAnimation) + } + } } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirkData.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirkData.kt index b3d16b3d61..294cfc2190 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirkData.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/quirk/SimpleQuirkData.kt @@ -9,7 +9,7 @@ package com.cobblemon.mod.common.client.render.models.blockbench.quirk import net.minecraft.entity.Entity -class SimpleQuirkData(name: String) : QuirkData(name) { +class SimpleQuirkData : QuirkData() { var nextOccurrenceSeconds = -1F var remainingLoops = 0 } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/FossilModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/FossilModelRepository.kt index cf907ea6d5..746fc222b6 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/FossilModelRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/FossilModelRepository.kt @@ -48,7 +48,7 @@ object FossilModelRepository : VaryingModelRepository() { model.yGrowthPoint = yGrowthPoint // Refactor this bullshit to not mention pokemon at all, it should be common to anything using animation factories. // Even better: move to molang functions, this is ass - model.animations = animations.mapNotNull { + model.tankAnimations = animations.mapNotNull { val animString = it.asString val anim = animString.substringBefore("(") if (JsonPokemonPoseableModel.ANIMATION_FACTORIES.contains(anim)) { @@ -61,20 +61,17 @@ object FossilModelRepository : VaryingModelRepository() { // borrowed code from JsonPokemonPoseableModel's PoseAdapter Deserializer val tankQuirks = (jsonObject.get("quirks")?.asJsonArray ?: JsonArray()).map { json -> json as JsonObject - val name = json.get("name").asString val quirkAnimations: (state: PoseableEntityState) -> List> = { _ -> (json.get("animations")?.asJsonArray ?: JsonArray()).mapNotNull { animJson -> val animString = animJson.asString val anim = animString.substringBefore("(") - JsonPokemonPoseableModel.StatefulAnimationAdapter.preventsIdleDefault = false val animation = if (JsonPokemonPoseableModel.ANIMATION_FACTORIES.contains(anim)) { JsonPokemonPoseableModel.ANIMATION_FACTORIES[anim]?.stateful(model, animString) } else { null } - JsonPokemonPoseableModel.StatefulAnimationAdapter.preventsIdleDefault = true animation } } @@ -83,7 +80,6 @@ object FossilModelRepository : VaryingModelRepository() { val maxSeconds = json.get("maxSecondsBetweenOccurrences")?.asFloat ?: 30F model.quirkMultiple( - name = name, secondsBetweenOccurrences = minSeconds to maxSeconds, condition = { true }, loopTimes = 1..loopTimes, diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt index fdcef235dd..bcd1c158a3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/repository/PokemonModelRepository.kt @@ -22,7 +22,6 @@ import com.cobblemon.mod.common.client.render.models.blockbench.pokemon.gen9.* import com.cobblemon.mod.common.client.render.models.blockbench.pose.Bone import com.cobblemon.mod.common.entity.pokemon.PokemonEntity import com.cobblemon.mod.common.util.cobblemonResource -import com.cobblemon.mod.common.util.fromJson import com.google.gson.JsonObject object PokemonModelRepository : VaryingModelRepository() { @@ -45,7 +44,6 @@ object PokemonModelRepository : VaryingModelRepository pose.poseName = poseName } + } } } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt index 40bc823989..16581edd7d 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/wavefunction/WaveFunction.kt @@ -99,3 +99,28 @@ fun parabolaFunction( } } +object WaveFunctions { + val functions = mutableMapOf( + "symmetrical" to { t -> + if (t < 0.1) { + t * 10 + } else if (t < 0.9) { + 1F + } else { + 1F - (t - 0.9F) * 10 + } + }, + "symmetrical_wide" to { t -> + if (t < 0.2) { + val t2 = t * 5 + 0.5F * sin(PI*(t2 - 0.5F)) + 0.5F + } else if (t < 0.8) { + 1F + } else { + val t2 = (1 - t) * 5 + 0.5F * sin(PI*(t2 - 0.5F)) + 0.5F + } + }, + "one" to { 1F } + ) +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt index f102c5d785..d3ec433f6b 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/client/render/pokeball/PokeBallPoseableState.kt @@ -48,23 +48,23 @@ abstract class PokeBallPoseableState : PoseableEntityState( EmptyPokeBallEntity.CaptureState.FALL -> {} EmptyPokeBallEntity.CaptureState.SHAKE -> { doLater { - setStatefulAnimations(currentModel!!.bedrockStateful(group, "bounce").setPreventsIdle(false)) + setStatefulAnimations(currentModel!!.bedrockStateful(group, "bounce")) } shakeEmitter .pipe(Observable.emitWhile { stateEmitter.get() == EmptyPokeBallEntity.CaptureState.SHAKE }) .subscribe { val bob = "bob${Random.Default.nextInt(6) + 1}" - doLater { setStatefulAnimations(currentModel!!.bedrockStateful(group, bob).setPreventsIdle(false)) } + doLater { setStatefulAnimations(currentModel!!.bedrockStateful(group, bob)) } } } EmptyPokeBallEntity.CaptureState.CAPTURED -> { doLater { - setStatefulAnimations(currentModel!!.bedrockStateful(group, "capture").setPreventsIdle(false)) + setStatefulAnimations(currentModel!!.bedrockStateful(group, "capture")) } } EmptyPokeBallEntity.CaptureState.CAPTURED_CRITICAL -> { doLater { - setStatefulAnimations(currentModel!!.bedrockStateful(group, "critical").setPreventsIdle(false)) + setStatefulAnimations(currentModel!!.bedrockStateful(group, "critical")) } } else -> {} diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt b/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt index 62e99ed7f7..938ac076f7 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/config/CobblemonConfig.kt @@ -222,4 +222,7 @@ class CobblemonConfig { @NodeCategory(Category.World) var maxInsertedFossilItems = 2 + + @NodeCategory(Category.Battles) + var walkingInBattleAnimations = false } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt b/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt index 16a8e9b40a..2c5d5f3888 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/data/CobblemonDataProvider.kt @@ -20,6 +20,7 @@ import com.cobblemon.mod.common.api.events.CobblemonEvents import com.cobblemon.mod.common.api.fossil.Fossils import com.cobblemon.mod.common.api.fossil.NaturalMaterials import com.cobblemon.mod.common.api.moves.Moves +import com.cobblemon.mod.common.api.moves.animations.ActionEffects import com.cobblemon.mod.common.api.pokeball.PokeBalls import com.cobblemon.mod.common.api.pokemon.PokemonSpecies import com.cobblemon.mod.common.api.pokemon.feature.GlobalSpeciesFeatures @@ -57,6 +58,7 @@ object CobblemonDataProvider : DataProvider { this.register(SpeciesFeatures) this.register(GlobalSpeciesFeatures) this.register(SpeciesFeatureAssignments) + this.register(ActionEffects) this.register(Moves) this.register(Abilities) this.register(PokemonSpecies) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt index d632dd012a..d65b388e01 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonEntity.kt @@ -40,7 +40,7 @@ import com.cobblemon.mod.common.entity.pokeball.EmptyPokeBallEntity import com.cobblemon.mod.common.entity.pokemon.ai.PokemonMoveControl import com.cobblemon.mod.common.entity.pokemon.ai.PokemonNavigation import com.cobblemon.mod.common.entity.pokemon.ai.goals.* -import com.cobblemon.mod.common.net.messages.client.sound.PokemonCryPacket +import com.cobblemon.mod.common.net.messages.client.animation.PlayPoseableAnimationPacket import com.cobblemon.mod.common.net.messages.client.sound.UnvalidatedPlaySoundS2CPacket import com.cobblemon.mod.common.net.messages.client.spawn.SpawnPokemonPacket import com.cobblemon.mod.common.net.messages.client.ui.InteractPokemonUIPacket @@ -55,6 +55,10 @@ import com.cobblemon.mod.common.pokemon.ai.FormPokemonBehaviour import com.cobblemon.mod.common.pokemon.evolution.variants.ItemInteractionEvolution import com.cobblemon.mod.common.util.* import com.cobblemon.mod.common.world.gamerules.CobblemonGameRules +import java.util.EnumSet +import java.util.Optional +import java.util.UUID +import java.util.concurrent.CompletableFuture import net.minecraft.entity.* import net.minecraft.entity.ai.control.MoveControl import net.minecraft.entity.ai.goal.EatGrassGoal @@ -73,7 +77,6 @@ import net.minecraft.entity.passive.PassiveEntity import net.minecraft.entity.passive.TameableShoulderEntity import net.minecraft.entity.player.PlayerEntity import net.minecraft.fluid.FluidState -import net.minecraft.item.Item import net.minecraft.item.ItemStack import net.minecraft.item.ItemUsage import net.minecraft.item.Items @@ -102,10 +105,6 @@ import net.minecraft.util.math.Vec3d import net.minecraft.world.EntityView import net.minecraft.world.World import net.minecraft.world.event.GameEvent -import java.util.EnumSet -import java.util.Optional -import java.util.UUID -import java.util.concurrent.CompletableFuture @Suppress("unused") open class PokemonEntity( @@ -909,7 +908,7 @@ open class PokemonEntity( fun cry() { if(this.isSilent) return - val pkt = PokemonCryPacket(id) + val pkt = PlayPoseableAnimationPacket(id, setOf("cry"), emptySet()) world.getEntitiesByClass(ServerPlayerEntity::class.java, Box.of(pos, 64.0, 64.0, 64.0), { true }).forEach { it.sendPacket(pkt) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt index 2e08b42472..03a0401ade 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/PokemonServerDelegate.kt @@ -14,6 +14,7 @@ import com.cobblemon.mod.common.api.pokemon.stats.Stats import com.cobblemon.mod.common.api.pokemon.status.Statuses import com.cobblemon.mod.common.battles.BattleRegistry import com.cobblemon.mod.common.entity.PoseType +import com.cobblemon.mod.common.entity.pokemon.ai.PokemonMoveControl import com.cobblemon.mod.common.pokemon.Pokemon import com.cobblemon.mod.common.pokemon.activestate.ActivePokemonState import com.cobblemon.mod.common.pokemon.activestate.SentOutState @@ -167,7 +168,7 @@ class PokemonServerDelegate : PokemonSideDelegate { fun updatePoseType() { val isSleeping = entity.pokemon.status?.status == Statuses.SLEEP && entity.behaviour.resting.canSleep - val isMoving = entity.dataTracker.get(PokemonEntity.MOVING) + val isMoving = (entity.moveControl as? PokemonMoveControl)?.isMoving == true val isPassenger = entity.hasVehicle() val isUnderwater = entity.getIsSubmerged() val isFlying = entity.getBehaviourFlag(PokemonBehaviourFlag.FLYING) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt index 51afe547ec..c75588d17c 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/PokemonNavigation.kt @@ -47,7 +47,8 @@ class PokemonNavigation(val world: World, val pokemonEntity: PokemonEntity) : Mo val onRecalculate: (dueToDistance: Boolean) -> Unit = {}, val onArrival: () -> Unit = {}, val onCannotReach: () -> Unit = {}, - val sprinting: Boolean = false + val sprinting: Boolean = false, + val destinationProximity: Float = 0.5F ) var navigationContext = NavigationContext() @@ -75,6 +76,19 @@ class PokemonNavigation(val world: World, val pokemonEntity: PokemonEntity) : Mo override fun continueFollowingPath() { val vec3d = this.pos + val targetVec = targetPos?.toVec3d()?.add(0.5, 0.0, 0.5) + if (targetVec != null && targetVec.distanceTo(vec3d) <= navigationContext.destinationProximity && currentPath != null) { + currentPath = null + cachedCurrentNode = null + navigationContext.onArrival() + // If we arrived at a not-flying destination + val node = currentPath?.currentNode?.type + if (node != null && node != PathNodeType.OPEN && pokemonEntity.couldStopFlying()) { + pokemonEntity.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false) + } + return + } + nodeReachProximity = if (entity.width > 0.75f) entity.width / 2.0f else 0.75f - entity.width / 2.0f val currentNode = currentPath!!.currentNode @@ -100,6 +114,7 @@ class PokemonNavigation(val world: World, val pokemonEntity: PokemonEntity) : Mo if (closeEnough || entity.navigation.canJumpToNext(currentPath!!.currentNode.type) && shouldJumpToNextNode(vec3d)) { currentPath!!.next() if (currentPath!!.isFinished) { + currentPath = null navigationContext.onArrival() // If we arrived at a not-flying destination if (currentNode.type != PathNodeType.OPEN && pokemonEntity.couldStopFlying()) { @@ -213,6 +228,8 @@ class PokemonNavigation(val world: World, val pokemonEntity: PokemonEntity) : Mo override fun startMovingAlong(path: Path?, speed: Double): Boolean { if (path != null && path.length > 0) { val node = path.getNode(0)!! +// pokemonEntity.discard() +// return false // If we just started moving and it's to an open node, fly if (node.type == PathNodeType.OPEN && pokemonEntity.form.behaviour.moving.fly.canFly && !pokemonEntity.isFlying()) { pokemonEntity.setBehaviourFlag(PokemonBehaviourFlag.FLYING, true) @@ -307,6 +324,8 @@ class PokemonNavigation(val world: World, val pokemonEntity: PokemonEntity) : Mo super.stop() this.currentNodeDistance = -1F this.cachedCurrentNode = null + currentPath = null + nodeMaker.clear() // In case a path is cancelled instead of completed, check if we should stop flying if (pokemonEntity.couldStopFlying() && !isAirborne(pokemonEntity.world, pokemonEntity.blockPos)) { pokemonEntity.setBehaviourFlag(PokemonBehaviourFlag.FLYING, false) diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonFollowOwnerGoal.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonFollowOwnerGoal.kt index d3bd4089b7..64dfb591b3 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonFollowOwnerGoal.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonFollowOwnerGoal.kt @@ -27,6 +27,7 @@ class PokemonFollowOwnerGoal( fun canMove() = entity.behaviour.moving.walk.canWalk || entity.behaviour.moving.fly.canFly// TODO probably depends on whether we're underwater or not override fun canStart() = super.canStart() && canMove() + && !entity.isBusy && entity.tethering == null override fun shouldContinue() = super.shouldContinue() && canMove() diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonInBattleMovementGoal.kt b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonInBattleMovementGoal.kt index 56037a9f57..c712bfa3d8 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonInBattleMovementGoal.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/entity/pokemon/ai/goals/PokemonInBattleMovementGoal.kt @@ -18,6 +18,11 @@ class PokemonInBattleMovementGoal(val entity: PokemonEntity, val range: Int) : G return entity.isBattling && getClosestPokemonEntity() != null && entity.getCurrentPoseType() != PoseType.SLEEP } + override fun start() { + super.start() + entity.navigation.stop() + } + private fun getClosestPokemonEntity(): PokemonEntity? { entity.battleId?.let { BattleRegistry.getBattle(it) }?.let { battle -> return battle.sides.find { it -> it.activePokemon.any { it.battlePokemon?.effectedPokemon == entity.pokemon } }?. @@ -29,7 +34,6 @@ class PokemonInBattleMovementGoal(val entity: PokemonEntity, val range: Int) : G override fun tick() { val closestPokemonEntity = getClosestPokemonEntity() if (closestPokemonEntity != null) { - entity.navigation.stop() entity.lookControl.lookAt(closestPokemonEntity.x, closestPokemonEntity.eyeY, closestPokemonEntity.z) } } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/animation/PlayPoseableAnimationPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/animation/PlayPoseableAnimationPacket.kt new file mode 100644 index 0000000000..3f1ee38e18 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/animation/PlayPoseableAnimationPacket.kt @@ -0,0 +1,44 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.net.messages.client.animation + +import com.cobblemon.mod.common.api.net.NetworkPacket +import com.cobblemon.mod.common.util.cobblemonResource +import net.minecraft.network.PacketByteBuf +import net.minecraft.util.Identifier + +/** + * Packet sent to arbitrarily play the first animation of the given set that exists on the given entity. MoLang + * expressions are also sent to setup any MoLang variables that are needed for the animation. + * + * @author Hiroku + * @since October 21st, 2023 + */ +class PlayPoseableAnimationPacket( + val entityId: Int, + val animation: Set, + val expressions: Set +) : NetworkPacket { + override val id: Identifier = ID + + companion object { + val ID = cobblemonResource("play_poseable_animation") + fun decode(buffer: PacketByteBuf) = PlayPoseableAnimationPacket( + buffer.readInt(), + buffer.readList { buffer.readString() }.toSet(), + buffer.readList { buffer.readString() }.toSet() + ) + } + + override fun encode(buffer: PacketByteBuf) { + buffer.writeInt(entityId) + buffer.writeCollection(animation) { pb, value -> pb.writeString(value) } + buffer.writeCollection(expressions) { pb, value -> pb.writeString(value) } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/MovesRegistrySyncPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/MovesRegistrySyncPacket.kt index 952b37e3b6..7479e640aa 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/MovesRegistrySyncPacket.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/data/MovesRegistrySyncPacket.kt @@ -50,7 +50,7 @@ class MovesRegistrySyncPacket(moves: List) : DataRegistrySyncPacke repeat(buffer.readVarInt()) { effectChances += buffer.readDouble() } - return MoveTemplate(name, num, type, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray()) + return MoveTemplate(name, num, type, damageCategory, power, target, accuracy, pp, priority, critRatio, effectChances.toTypedArray(), null) } override fun synchronizeDecoded(entries: Collection) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/effect/RunPosableMoLangPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/effect/RunPosableMoLangPacket.kt new file mode 100644 index 0000000000..0ed016a107 --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/effect/RunPosableMoLangPacket.kt @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.net.messages.client.effect + +import com.cobblemon.mod.common.api.net.NetworkPacket +import com.cobblemon.mod.common.util.cobblemonResource +import net.minecraft.network.PacketByteBuf + +/** + * Packet sent to run some MoLang in the MoLang environment associated with the given + * entity (which we're assuming is a posable entity). + * + * The expressions are given as strings instead of Expressions because if we make it + * Expressions and you constructed it from code instead of string parsing then it won't + * encode-decode properly, and you'll report a bug. Reason why that is: only way to + * serialize an Expression is to use the originalString property it was parsed from, + * so if you didn't parse from string that'll be blank and meaningless. + * + * Handled by [com.cobblemon.mod.common.client.net.effect.RunPosableMoLangHandler]. + * + * @author Hiroku + * @since October 27th, 2023 + */ +class RunPosableMoLangPacket( + val entityId: Int, + val expressions: Set +) : NetworkPacket { + companion object { + val ID = cobblemonResource("run_posable_molang") + fun decode(buffer: PacketByteBuf) = RunPosableMoLangPacket( + buffer.readInt(), + buffer.readList { pb -> pb.readString() }.toSet() + ) + } + + override val id = ID + override fun encode(buffer: PacketByteBuf) { + buffer.writeInt(entityId) + buffer.writeCollection(expressions) { pb, value -> pb.writeString(value) } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/effect/SpawnSnowstormEntityParticlePacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/effect/SpawnSnowstormEntityParticlePacket.kt new file mode 100644 index 0000000000..63a420513d --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/effect/SpawnSnowstormEntityParticlePacket.kt @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.net.messages.client.effect + +import com.cobblemon.mod.common.api.net.NetworkPacket +import com.cobblemon.mod.common.util.cobblemonResource +import net.minecraft.network.PacketByteBuf +import net.minecraft.util.Identifier + +/** + * Packet that spawns a snowstorm particle effect on a specified entity and specified locator. + * + * @author Hiroku + * @since January 21st, 2024 + */ +class SpawnSnowstormEntityParticlePacket(val effectId: Identifier, val entityId: Int, val locator: String = "root") : NetworkPacket { + companion object { + val ID = cobblemonResource("spawn_snowstorm_entity_particle") + + fun decode(buffer: PacketByteBuf) = SpawnSnowstormEntityParticlePacket(buffer.readIdentifier(), buffer.readInt(), buffer.readString()) + } + + override val id = ID + + override fun encode(buffer: PacketByteBuf) { + buffer.writeIdentifier(effectId) + buffer.writeInt(entityId) + buffer.writeString(locator) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/PokemonCryPacket.kt b/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/PokemonCryPacket.kt deleted file mode 100644 index 1bb7e46365..0000000000 --- a/common/src/main/kotlin/com/cobblemon/mod/common/net/messages/client/sound/PokemonCryPacket.kt +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2023 Cobblemon Contributors - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at https://mozilla.org/MPL/2.0/. - */ - -package com.cobblemon.mod.common.net.messages.client.sound - -import com.cobblemon.mod.common.api.net.NetworkPacket -import com.cobblemon.mod.common.util.cobblemonResource -import net.minecraft.network.PacketByteBuf - -/** - * Packet sent to the client to indicate the specified Pokémon is doing its cry. This is intended - * to find and play a cry animation (which should have the cry sound effect linked) - * - * Handled by [com.cobblemon.mod.common.client.net.sound.PokemonCryHandler]. - * - * @author Hiroku - * @since July 17th, 2023 - */ -class PokemonCryPacket(val entityId: Int) : NetworkPacket { - companion object { - val ID = cobblemonResource("pokemon_cry") - - fun decode(buffer: PacketByteBuf) = PokemonCryPacket(buffer.readInt()) - } - - override val id = ID - override fun encode(buffer: PacketByteBuf) { - buffer.writeInt(entityId) - } -} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt b/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt index 4ec8cffd00..b59f4923db 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/particle/SnowstormParticleReader.kt @@ -87,7 +87,17 @@ object SnowstormParticleReader { v3 = nodes[3] ) } - "bezier_chain" -> TODO("Bezier Chain curves are not implemented yet") + "bezier_chain" -> { + val input = curveJson.get("input").asString.asExpression() + val nodes = curveJson.get("nodes").asJsonObject.entrySet().map { (key, value) -> + key.toDouble() to (value as JsonObject).let { BezierChainMoLangCurve.BezierChainNode(it.get("value").asDouble, it.get("slope").asDouble) } + }.toMap() + BezierChainMoLangCurve( + name = variableName, + input = input, + nodes = nodes + ) + } "linear" -> { val input = curveJson.get("input").asString.asExpression() val horizontalRange = curveJson.get("horizontal_range").asString.asExpression() @@ -131,7 +141,7 @@ object SnowstormParticleReader { fun resolveDirection(json: JsonObject) { val directionProperty = json.get("direction") ?: let { - direction = CustomMotionDirection() + direction = OutwardsMotionDirection() return } direction = if (directionProperty.isJsonArray) { diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt index b3939500fd..de047ca970 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/JsonExtensions.kt @@ -60,4 +60,14 @@ fun JsonElement.asNbt(): NbtElement = JsonOps.INSTANCE.convertTo(NbtOps.INSTANCE fun > Array.getFromJSON(element: JsonElement, name: String): T { val type = (element as JsonObject).get(name).asString return first { type.equals(it.name, ignoreCase = true) } +} + +fun JsonObject.getFirst(vararg names: String): JsonElement? { + for (name in names) { + val element = get(name) + if (element != null) { + return element + } + } + return null } \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/MiscUtils.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/MiscUtils.kt index f25d2516be..9e46549a65 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/MiscUtils.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/MiscUtils.kt @@ -66,6 +66,8 @@ fun Random.nextBetween(min: Int, max: Int): Int { return nextInt(max - min + 1) + min } +infix fun A.toDF(b: B): com.mojang.datafixers.util.Pair = com.mojang.datafixers.util.Pair(this, b) + fun isUuid(string: String) : Boolean { return Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}\$").matches(string) } diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt index 2b881ad838..49094d0a19 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/MoLangExtensions.kt @@ -13,6 +13,7 @@ import com.bedrockk.molang.MoLang import com.bedrockk.molang.ast.NumberExpression import com.bedrockk.molang.runtime.MoLangEnvironment import com.bedrockk.molang.runtime.MoLangRuntime +import com.bedrockk.molang.runtime.MoParams import com.bedrockk.molang.runtime.MoScope import com.bedrockk.molang.runtime.struct.VariableStruct import com.bedrockk.molang.runtime.value.MoValue @@ -143,3 +144,7 @@ fun List.resolveDouble(runtime: MoLangRuntime) = resolve(runtime).as fun List.resolveInt(runtime: MoLangRuntime) = resolveDouble(runtime).toInt() fun List.resolveBoolean(runtime: MoLangRuntime) = resolveDouble(runtime) == 1.0 fun List.resolveObject(runtime: MoLangRuntime) = resolve(runtime) as ObjectValue<*> + +fun MoParams.getStringOrNull(index: Int) = if (params.size > index) getString(index) else null +fun MoParams.getDoubleOrNull(index: Int) = if (params.size > index) getDouble(index) else null +fun MoParams.getBooleanOrNull(index: Int) = if (params.size > index) getDouble(index) == 1.0 else null \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/ActionEffectKeyframeAdapter.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/ActionEffectKeyframeAdapter.kt new file mode 100644 index 0000000000..bcec16ec5e --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/ActionEffectKeyframeAdapter.kt @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.util.adapters + +import com.cobblemon.mod.common.api.moves.animations.keyframes.ActionEffectKeyframe +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import com.google.gson.JsonObject +import java.lang.reflect.Type + +/** + * Map adapter for [ActionEffectKeyframe] + * + * @author Hiroku + * @since October 21st, 2023 + */ +object ActionEffectKeyframeAdapter : JsonDeserializer { + override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): ActionEffectKeyframe { + return if (json.isJsonPrimitive) { + val clazz = ActionEffectKeyframe.types[json.asString] + ?: throw IllegalArgumentException("Unrecognized action effect keyframe type: ${json.asJsonPrimitive}") + clazz.getConstructor().newInstance() + } else { + json as JsonObject + val typeString = json.get("type").asString + val clazz = ActionEffectKeyframe.types[typeString] + ?: throw IllegalArgumentException("Unrecognized action effect keyframe type: $typeString") + ctx.deserialize(json, clazz) + } + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/SingleToPluralAdapter.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/SingleToPluralAdapter.kt new file mode 100644 index 0000000000..970c3013dd --- /dev/null +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/adapters/SingleToPluralAdapter.kt @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2023 Cobblemon Contributors + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + */ + +package com.cobblemon.mod.common.util.adapters + +import com.google.gson.JsonDeserializationContext +import com.google.gson.JsonDeserializer +import com.google.gson.JsonElement +import java.lang.reflect.Type + +/** + * Generic adapter for converting a field that is intended to be an iterable but we support entering single + * values in the JSON for succinctness. You have to provide the class of the elements and a way of converting + * a list of elements into the collection type you want. + * + * @author Hiroku + * @since October 29th, 2023 + */ +class SingleToPluralAdapter>(val clazz: Class, val converter: (List) -> C) : JsonDeserializer { + override fun deserialize(json: JsonElement, type: Type, ctx: JsonDeserializationContext): C { + return (if (json.isJsonArray) { + json.asJsonArray.map { ctx.deserialize(it, clazz) } + } else { + listOf(ctx.deserialize(json, clazz)) + }).let(converter) + } +} \ No newline at end of file diff --git a/common/src/main/kotlin/com/cobblemon/mod/common/util/math/geometry/Matrix4fExtensions.kt b/common/src/main/kotlin/com/cobblemon/mod/common/util/math/geometry/Matrix4fExtensions.kt index 12b43a1b1f..3de3cd3177 100644 --- a/common/src/main/kotlin/com/cobblemon/mod/common/util/math/geometry/Matrix4fExtensions.kt +++ b/common/src/main/kotlin/com/cobblemon/mod/common/util/math/geometry/Matrix4fExtensions.kt @@ -26,7 +26,16 @@ fun Matrix4f.transformPosition(pos: Vec3d): Vec3d { } fun Matrix4f.transformDirection(direction: Vec3d): Vec3d { - val rot = this.getRotation(AxisAngle4d()) - val v = rot.transform(Vector3d(direction.x, direction.y, direction.z)) - return Vec3d(v.x, v.y, v.z) + val origin = Vector4f(0F, 0F, 0F, 1F) + transform(origin) + origin.mul(1 / origin.w) + val originVec = Vec3d(origin.x.toDouble(), origin.y.toDouble(), origin.z.toDouble()) + val magnitude = direction.length() + val vector = Vector4f(direction.x.toFloat(), direction.y.toFloat(), direction.z.toFloat(), 1F) + this.transform(vector) + vector.mul(1 / vector.w) + return Vec3d(vector.x.toDouble(), vector.y.toDouble(), vector.z.toDouble()) + .subtract(originVec) + .normalize() + .multiply(magnitude) } \ No newline at end of file diff --git a/.ignored/assets/particles/particles/generic/cut.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/cut.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/cut.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/cut.particle.json diff --git a/.ignored/assets/particles/particles/generic/heal_circles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/heal_circles.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/heal_circles.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/heal_circles.particle.json diff --git a/.ignored/assets/particles/particles/generic/heal_sparkles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/heal_sparkles.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/heal_sparkles.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/heal_sparkles.particle.json diff --git a/.ignored/assets/particles/particles/generic/hit.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/hit.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit.particle.json diff --git a/.ignored/assets/particles/particles/generic/hit_dragon.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_dragon.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/hit_dragon.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_dragon.particle.json diff --git a/.ignored/assets/particles/particles/generic/hit_poison.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_poison.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/hit_poison.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/hit_poison.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_bug.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_bug.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_bug.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_bug.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_dark.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_dark.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_dark.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_dark.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_dragon.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_dragon.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_dragon.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_dragon.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_electric.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_electric.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_electric.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_electric.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_fairy.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_fairy.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_fairy.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_fairy.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_fighting.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_fighting.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_fighting.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_fighting.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_fire.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_fire.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_fire.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_fire.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_flying.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_flying.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_flying.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_flying.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_ghost.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_ghost.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_ghost.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_ghost.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_grass.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_grass.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_grass.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_grass.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_ground.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_ground.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_ground.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_ground.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_ice.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_ice.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_ice.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_ice.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_normal.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_normal.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_normal.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_normal.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_poison.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_poison.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_poison.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_poison.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_psychic.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_psychic.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_psychic.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_psychic.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_rock.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_rock.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_rock.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_rock.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_steel.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_steel.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_steel.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_steel.particle.json diff --git a/.ignored/assets/particles/particles/generic/impact_water.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_water.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/impact_water.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/impact_water.particle.json diff --git a/.ignored/assets/particles/particles/generic/multi_hit.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/multi_hit.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/multi_hit.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/multi_hit.particle.json diff --git a/.ignored/assets/particles/particles/generic/multi_hit_grass.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/multi_hit_grass.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/multi_hit_grass.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/multi_hit_grass.particle.json diff --git a/.ignored/assets/particles/particles/generic/shiny.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/shiny.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny.particle.json diff --git a/.ignored/assets/particles/particles/generic/shiny_burst.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_burst.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/shiny_burst.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_burst.particle.json diff --git a/.ignored/assets/particles/particles/generic/shiny_glimmer.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_glimmer.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/shiny_glimmer.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_glimmer.particle.json diff --git a/.ignored/assets/particles/particles/generic/shiny_ring.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_ring.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/shiny_ring.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_ring.particle.json diff --git a/.ignored/assets/particles/particles/generic/shiny_send_out.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_send_out.animation.json similarity index 100% rename from .ignored/assets/particles/particles/generic/shiny_send_out.animation.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/shiny_send_out.animation.json diff --git a/.ignored/assets/particles/particles/generic/sleep_bubbles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_bubbles.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/sleep_bubbles.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_bubbles.particle.json diff --git a/.ignored/assets/particles/particles/generic/sleep_zzz.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_zzz.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/sleep_zzz.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/sleep_zzz.particle.json diff --git a/.ignored/assets/particles/particles/generic/stat_down_circles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_circles.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/stat_down_circles.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_circles.particle.json diff --git a/.ignored/assets/particles/particles/generic/stat_down_lines.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_lines.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/stat_down_lines.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_down_lines.particle.json diff --git a/.ignored/assets/particles/particles/generic/stat_up.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/stat_up.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up.particle.json diff --git a/.ignored/assets/particles/particles/generic/stat_up_circles.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_circles.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/stat_up_circles.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_circles.particle.json diff --git a/.ignored/assets/particles/particles/generic/stat_up_lines.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_lines.particle.json similarity index 100% rename from .ignored/assets/particles/particles/generic/stat_up_lines.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/generic/stat_up_lines.particle.json diff --git a/.ignored/assets/particles/particles/misc/spewpa_confetti.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/misc/spewpa_confetti.json similarity index 100% rename from .ignored/assets/particles/particles/misc/spewpa_confetti.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/misc/spewpa_confetti.json diff --git a/.ignored/assets/particles/particles/misc/test.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/misc/test.particle.json similarity index 100% rename from .ignored/assets/particles/particles/misc/test.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/misc/test.particle.json diff --git a/.ignored/assets/particles/particles/moves/dragon_claw/dragon_claw_aura.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragon_claw/dragon_claw_aura.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/dragon_claw/dragon_claw_aura.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragon_claw/dragon_claw_aura.particle.json diff --git a/.ignored/assets/particles/particles/moves/dragon_claw/dragon_claw_hand.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragon_claw/dragon_claw_hand.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/dragon_claw/dragon_claw_hand.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragon_claw/dragon_claw_hand.particle.json diff --git a/.ignored/assets/particles/particles/moves/dragon_claw/dragon_claw_target_scratch.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragon_claw/dragon_claw_target_scratch.particle.json similarity index 96% rename from .ignored/assets/particles/particles/moves/dragon_claw/dragon_claw_target_scratch.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragon_claw/dragon_claw_target_scratch.particle.json index f3a2248938..e4776388c8 100644 --- a/.ignored/assets/particles/particles/moves/dragon_claw/dragon_claw_target_scratch.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/dragon_claw/dragon_claw_target_scratch.particle.json @@ -2,7 +2,7 @@ "format_version": "1.10.0", "particle_effect": { "description": { - "identifier": "cobblemon:dragon_claw_scratch", + "identifier": "cobblemon:dragon_claw_target_scratch", "basic_render_parameters": { "material": "particles_alpha", "texture": "textures/particles/scratch" diff --git a/.ignored/assets/particles/particles/moves/explosion/explosion_burst_fire.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_burst_fire.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/explosion/explosion_burst_fire.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_burst_fire.particle.json diff --git a/.ignored/assets/particles/particles/moves/explosion/explosion_burst_flash.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_burst_flash.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/explosion/explosion_burst_flash.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_burst_flash.particle.json diff --git a/.ignored/assets/particles/particles/moves/explosion/explosion_charge_accretion.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_charge_accretion.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/explosion/explosion_charge_accretion.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_charge_accretion.particle.json diff --git a/.ignored/assets/particles/particles/moves/explosion/explosion_charge_light.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_charge_light.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/explosion/explosion_charge_light.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_charge_light.particle.json diff --git a/.ignored/assets/particles/particles/moves/explosion/explosion_debris_smoke.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_debris_smoke.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/explosion/explosion_debris_smoke.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_debris_smoke.particle.json diff --git a/.ignored/assets/particles/particles/moves/explosion/explosion_target.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_target.particle.json similarity index 97% rename from .ignored/assets/particles/particles/moves/explosion/explosion_target.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_target.particle.json index 8132d51900..b8c8fdc100 100644 --- a/.ignored/assets/particles/particles/moves/explosion/explosion_target.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/explosion/explosion_target.particle.json @@ -2,7 +2,7 @@ "format_version": "1.10.0", "particle_effect": { "description": { - "identifier": "cobblemon:explosion_target_burst_fire", + "identifier": "cobblemon:explosion_target", "basic_render_parameters": { "material": "particles_blend", "texture": "cobblemon:textures/particle/impact-fire" diff --git a/.ignored/assets/particles/particles/moves/flamethrower/flamethrower_actor.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_actor.particle.json similarity index 86% rename from .ignored/assets/particles/particles/moves/flamethrower/flamethrower_actor.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_actor.particle.json index 301b71e948..ffd37aa299 100644 --- a/.ignored/assets/particles/particles/moves/flamethrower/flamethrower_actor.particle.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_actor.particle.json @@ -10,24 +10,24 @@ }, "components": { "minecraft:emitter_rate_steady": { - "spawn_rate": 32, + "spawn_rate": 50, "max_particles": 100 }, "minecraft:emitter_lifetime_once": { "active_time": 1.25 }, "minecraft:emitter_shape_point": { - "direction": ["math.random(-1,1)*0.2", "math.random(-0.6,-0.5)*-0.6", -1] + "direction": [0, "math.random(-0.1,0.1)", -1.0] }, "minecraft:particle_lifetime_expression": { - "max_lifetime": 0.5 + "max_lifetime": 0.8 }, "minecraft:particle_initial_spin": { "rotation": "90*math.random_integer(1,4)" }, - "minecraft:particle_initial_speed": "math.random(6,12)", + "minecraft:particle_initial_speed": "math.random(8,14)", "minecraft:particle_motion_dynamic": { - "linear_acceleration": [0, "math.random(9,12)", 0], + "linear_acceleration": [0, "math.random(1,4)", 0], "linear_drag_coefficient": "math.random(0.5 ,1)" }, "minecraft:particle_appearance_billboard": { diff --git a/.ignored/assets/particles/particles/moves/flamethrower/flamethrower_target.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/flamethrower/flamethrower_target.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target.particle.json diff --git a/.ignored/assets/particles/particles/moves/flamethrower/flamethrower_target_linger.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target_linger.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/flamethrower/flamethrower_target_linger.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/flamethrower/flamethrower_target_linger.particle.json diff --git a/.ignored/assets/particles/particles/moves/population_bomb/population_bomb_target_mice.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/population_bomb/population_bomb_target_mice.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/population_bomb/population_bomb_target_mice.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/population_bomb/population_bomb_target_mice.particle.json diff --git a/.ignored/assets/particles/particles/moves/razor_leaf/razor_leaf_actor_1.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/razor_leaf/razor_leaf_actor_1.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/razor_leaf/razor_leaf_actor_1.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/razor_leaf/razor_leaf_actor_1.particle.json diff --git a/.ignored/assets/particles/particles/moves/razor_leaf/razor_leaf_actor_2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/razor_leaf/razor_leaf_actor_2.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/razor_leaf/razor_leaf_actor_2.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/razor_leaf/razor_leaf_actor_2.particle.json diff --git a/.ignored/assets/particles/particles/moves/razor_leaf/razor_leaf_target.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/razor_leaf/razor_leaf_target.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/razor_leaf/razor_leaf_target.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/razor_leaf/razor_leaf_target.particle.json diff --git a/.ignored/assets/particles/particles/moves/sand_tomb/sand_tomb_1.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_tomb/sand_tomb_1.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/sand_tomb/sand_tomb_1.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_tomb/sand_tomb_1.particle.json diff --git a/.ignored/assets/particles/particles/moves/sand_tomb/sand_tomb_2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_tomb/sand_tomb_2.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/sand_tomb/sand_tomb_2.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sand_tomb/sand_tomb_2.particle.json diff --git a/.ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_1.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_1.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_1.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_1.particle.json diff --git a/.ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_2.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_2.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_2.particle.json diff --git a/.ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_projectile_1.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_projectile_1.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_projectile_1.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_projectile_1.particle.json diff --git a/.ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_projectile_2.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_projectile_2.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_projectile_2.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_projectile_2.particle.json diff --git a/.ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_smog.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_smog.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/sludge_bomb/sludge_bomb_target_smog.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/sludge_bomb/sludge_bomb_target_smog.particle.json diff --git a/.ignored/assets/particles/particles/moves/synthesis/synthesis_accretion.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/synthesis/synthesis_accretion.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/synthesis/synthesis_accretion.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/synthesis/synthesis_accretion.particle.json diff --git a/.ignored/assets/particles/particles/moves/synthesis/synthesis_sun.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/synthesis/synthesis_sun.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/synthesis/synthesis_sun.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/synthesis/synthesis_sun.particle.json diff --git a/.ignored/assets/particles/particles/moves/synthesis/synthesis_sunlight.particle.json b/common/src/main/resources/assets/cobblemon/bedrock/particles/moves/synthesis/synthesis_sunlight.particle.json similarity index 100% rename from .ignored/assets/particles/particles/moves/synthesis/synthesis_sunlight.particle.json rename to common/src/main/resources/assets/cobblemon/bedrock/particles/moves/synthesis/synthesis_sunlight.particle.json diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0006_charizard/charizard.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0006_charizard/charizard.animation.json index d8e123b893..bd33a35b6e 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0006_charizard/charizard.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0006_charizard/charizard.animation.json @@ -154,6 +154,1813 @@ } } }, + "animation.charizard.battle_idle": { + "loop": true, + "animation_length": 4, + "bones": { + "torso": { + "rotation": [12.5, 0, 0], + "position": [0, "-0.1*(math.sin(q.anim_time*90*3-90)*1+1)", -0.75] + }, + "neck": { + "rotation": ["9.2745+1*(math.sin(q.anim_time*90*3)*1+1)+1*(math.sin(q.anim_time*90*3/2)*1+1)", 7.83467, -2.21473], + "position": [0, "-0.05*(math.sin(q.anim_time*90*3-60)*1+1)", -0.75] + }, + "tail": { + "rotation": [-5, "4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", 0] + }, + "tail2": { + "rotation": [30, "6*(math.sin(q.anim_time*90*3-90)*1)+6*(math.sin(q.anim_time*90*3/2-90)*1)", 0] + }, + "tail3": { + "rotation": [-20, "6*(math.sin(q.anim_time*90*3-90)*1)+6*(math.sin(q.anim_time*90*3/2-90)*1)", 0] + }, + "fire": { + "rotation": [ + "10+6*(math.sin(q.anim_time*90*3*2-90)*1-1)+6*(math.sin(q.anim_time*90*3/2-90)*1-1)", + 0, + "30+20*(math.sin(q.anim_time*90*3-150)*1-1)+6*(math.sin(q.anim_time*90*3/2-90)*1-1)" + ] + }, + "arm_left": { + "rotation": [14.28791, -11.00374, "34.7968+2*(math.sin(q.anim_time*90*3)*1+1)"] + }, + "forearm_left": { + "rotation": [0, "65-2*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)+4*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)", 0] + }, + "finger_left1": { + "rotation": [0, 15, "45-15*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)-15*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)"] + }, + "finger_left3": { + "rotation": [-5, -15, "60-15*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)-15*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)"] + }, + "finger_left2": { + "rotation": [0, 0, "45-15*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)-15*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)"] + }, + "arm_right": { + "rotation": [9.80539, -9.96823, "-41.493-2*(math.sin(q.anim_time*90*3)*1+1)"] + }, + "forearm_right": { + "rotation": [0, "-35+2*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)-4*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)", 0] + }, + "finger_right1": { + "rotation": [0, -15, "-45+15*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)+15*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)"] + }, + "finger_right3": { + "rotation": [-5, 15, "-60+15*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)+15*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)"] + }, + "finger_right2": { + "rotation": [0, 0, "-45+15*math.clamp(-math.sin(q.anim_time*90*3/2)*1+1,0,1)+15*math.clamp(math.sin(q.anim_time*90*3/2)*1+1,0,1)"] + }, + "wing_right": { + "rotation": ["-math.clamp(1*(math.sin(q.anim_time*90*3+90)*1-1),-10,0)", "20*2-1*(math.sin(q.anim_time*90*3)*1+1)", 0] + }, + "wing_right3": { + "rotation": [0, "-25*2-2*(math.sin(q.anim_time*90*3-90)*1+1)", 0] + }, + "wing_left": { + "rotation": ["-math.clamp(1*(math.sin(q.anim_time*90*3+90)*1-1),-10,0)", "-20*2+1*(math.sin(q.anim_time*90*3)*1+1)", 0] + }, + "wing_left3": { + "rotation": [0, "25*2+2*(math.sin(q.anim_time*90*3-90)*1+1)", 0] + }, + "neck2": { + "rotation": [10, 0, 0] + }, + "jaw": { + "rotation": ["5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0] + }, + "wing_left2": { + "rotation": [0, "10*2+2*(math.sin(q.anim_time*90*3-90)*1+1)", 0] + }, + "wing_right2": { + "rotation": [0, "-10*2-2*(math.sin(q.anim_time*90*3-90)*1+1)", 0] + }, + "body": { + "rotation": [0, -12.5, 0] + }, + "head_ai": { + "rotation": [-20, 0, 0] + }, + "leg_right": { + "rotation": [0, 40, 0] + }, + "leg_left": { + "rotation": [0, -40, 0], + "position": [0, 0, 1.5] + }, + "torso2": { + "rotation": ["2+math.sin(q.anim_time*90*3-90)", 5, 0] + } + } + }, + "animation.charizard.physical": { + "animation_length": 3, + "bones": { + "torso": { + "rotation": { + "0.0": [12.5, 0, 0], + "0.8333": [-6.2, 1.63, 3.23], + "1.125": [-9.448, 16.58523, 3.78587], + "1.25": { + "pre": [28.10383, -15.49902, 9.03736], + "post": [28.10383, -15.49902, 9.03736], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [28.10383, -15.49902, 9.03736], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [12.5, 0, 0] + }, + "position": { + "0.0": [0, 0, -0.75], + "0.4167": { + "pre": [0, -0.5, -0.75], + "post": [0, -0.5, -0.75], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, -0.42, -0.75], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, -0.65, -0.75], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [0, 1.25, -0.75], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [1, -1.25, -2.5], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0.65, -1.06, -2.72], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0.33, 0.04, -2.69], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 0, -0.75] + } + }, + "neck": { + "rotation": { + "0.0": [11.2745, 7.83467, -2.21473], + "0.8333": { + "pre": [-6.2255, 7.83467, -2.21473], + "post": [-6.2255, 7.83467, -2.21473], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [-6.2255, 7.83467, -2.21473], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-13.91, 25.33, -2.21], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [-4.56, 12.2, -2.21], + "lerp_mode": "catmullrom" + }, + "2.5": [11.2745, 7.83467, -2.21473] + }, + "position": { + "0.0": [0, -0.0067, -0.75], + "2.5": [0, -0.0067, -0.75] + } + }, + "tail": { + "rotation": { + "0.0": [-5, 0, 0], + "1.0417": { + "pre": [-4.48128, 9.89479, 1.17426], + "post": [-4.48128, 9.89479, 1.17426], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [-3.80058, -21.40441, 11.02538], + "lerp_mode": "catmullrom" + }, + "2.9583": [-5, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [30, -12, 0], + "1.125": { + "pre": [30, 18, 7.5], + "post": [30, 18, 7.5], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [20, -19.5, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [30, -12, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-20, -12, 0], + "0.8333": { + "pre": [-7.5, -34.5, 0], + "post": [-7.5, -34.5, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-5.96, 21.13, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-7.5, -37, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [-15.06, -0.03, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [-20, -12, 0] + } + }, + "fire": { + "rotation": [-14, 0, -12] + }, + "arm_left": { + "rotation": { + "0.0": [14.28791, -11.00374, 36.7968], + "1.0417": { + "pre": [14.17478, 8.39433, 41.69139], + "post": [14.17478, 8.39433, 41.69139], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [14.19, -16.88, 40.99], + "lerp_mode": "catmullrom" + }, + "2.4167": [14.28791, -11.00374, 36.7968] + }, + "position": { + "0.0": [0, 0, 0], + "1.0417": { + "pre": [0, 0, -2.5], + "post": [0, 0, -2.5], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 1.75], + "lerp_mode": "catmullrom" + }, + "2.4167": [0, 0, 0] + } + }, + "forearm_left": { + "rotation": { + "0.0": [0, 67, 0], + "1.0417": { + "pre": [0, 79.5, 0], + "post": [0, 79.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, 12, 0], + "lerp_mode": "catmullrom" + }, + "2.75": [0, 67, 0] + } + }, + "finger_left1": { + "rotation": [0, 15, 15] + }, + "finger_left3": { + "rotation": [-5, -15, 30] + }, + "finger_left2": { + "rotation": [0, 0, 15] + }, + "arm_right": { + "rotation": { + "0.0": { + "post": [9.80539, -9.96823, -43.493], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [-2.69461, 12.53177, -43.493], + "lerp_mode": "catmullrom" + }, + "1.0833": [-87.69, 12.53, 24.01], + "1.2083": [-76.86, -129.69, 0.68], + "1.3333": [-76.86, -129.69, 0.68], + "1.5": { + "pre": [-71.98, -125.09, 9.01], + "post": [-71.98, -125.09, 9.01], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [6.72, -89.74, -25.47], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [4.82757, -4.64043, -44.73245], + "lerp_mode": "catmullrom" + }, + "2.8333": [9.80539, -9.96823, -43.493] + }, + "position": { + "0.0": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": [0, 0, 1.5], + "1.1667": [0, -1, -3.25], + "1.375": { + "pre": [1.25, -1, -3.25], + "post": [1.25, -1, -3.25], + "lerp_mode": "catmullrom" + }, + "2.375": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "forearm_right": { + "rotation": { + "0.0": [0, -37, 0], + "1.0417": { + "pre": [0, -32, 0], + "post": [0, -32, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, -9.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, -9.5, 0], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [0, -53.09, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, -37, 0] + } + }, + "finger_right1": { + "rotation": { + "0.0": [0, -15, -15], + "1.0833": [0, -15, 10], + "1.2917": [0, -15, -47.5], + "1.625": [0, -15, -47.5], + "2.2917": [0, -15, -15] + } + }, + "finger_right3": { + "rotation": { + "0.0": [-5, 15, -30], + "1.0833": [-5, 15, -30], + "1.1667": [-7.75768, 11.25865, -57.17316], + "1.2917": [-5, 15, -85], + "1.625": [-5, 15, -85], + "2.2917": [-5, 15, -30] + } + }, + "finger_right2": { + "rotation": { + "0.0": [0, 0, -15], + "1.0833": [0, 0, -15], + "1.2917": [0, 0, -65], + "1.625": [0, 0, -65], + "2.2917": [0, 0, -15] + } + }, + "wing_right": { + "rotation": { + "0.0": [0, 39, 0], + "1.125": { + "pre": [0, 64, 10], + "post": [0, 64, 10], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [0, 9, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 44, 0], + "lerp_mode": "catmullrom" + }, + "2.7083": [0, 39, 0] + } + }, + "wing_right3": { + "rotation": { + "0.0": [0, -50, 0], + "1.25": { + "pre": [0, -22.5, 0], + "post": [0, -22.5, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [0, -52.5, 0], + "lerp_mode": "catmullrom" + }, + "2.7083": [0, -50, 0] + } + }, + "wing_left": { + "rotation": { + "0.0": [0, -39, 0], + "1.0833": { + "pre": [0, -1.5, 0], + "post": [0, -1.5, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [0, -43.04, 0], + "lerp_mode": "catmullrom" + }, + "2.5417": [0, -39, 0] + } + }, + "wing_left3": { + "rotation": { + "0.0": [0, 50, 0], + "1.0833": { + "pre": [0, 75, 0], + "post": [0, 75, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 29.26, 0], + "lerp_mode": "catmullrom" + }, + "2.8333": [0, 50, 0] + } + }, + "neck2": { + "rotation": { + "0.0": [10, 0, 0], + "0.9583": [27.5, 0, 0], + "1.3333": [35.74, 0, 0], + "2.5": [10, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [1.5359, 0, 0], + "0.75": [1.5359, 0, 0], + "1.125": [21.54, 0, 0], + "1.625": [1.5359, 0, 0], + "2.5": [1.5359, 0, 0] + } + }, + "wing_left2": { + "rotation": { + "0.0": [0, 20, 0], + "1.125": { + "pre": [0, 37.5, 0], + "post": [0, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [0, 30, 0], + "lerp_mode": "catmullrom" + }, + "2.7083": [0, 20, 0] + } + }, + "wing_right2": { + "rotation": { + "0.0": [0, -20, 0], + "1.3333": { + "pre": [0, -17.5, 0], + "post": [0, -17.5, 0], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [0, -40, 0], + "lerp_mode": "catmullrom" + }, + "2.7083": [0, -20, 0] + } + }, + "body": { + "rotation": [0, -12.5, 0] + }, + "leg_right": { + "rotation": { + "0.0": [0, 40, 0], + "0.3333": [0, 40, 0], + "0.625": [0, 50, 0], + "0.9583": [0, 50, 0], + "1.125": [-15, 50, 0], + "1.1667": [0, 17.5, 0], + "1.7083": [0, 17.5, 0], + "2.0": [0, 24.32, 0], + "2.1667": [0, 40, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.3333": [0, 0, 0], + "0.5417": [0, 1.75, 1.79], + "0.625": [0, 0, 2.5], + "0.9583": [0, 0, 2.5], + "1.125": [0, 0.75, 2.5], + "1.1667": [0, 0, -2.25], + "1.7083": [0, 0, -2.25], + "2.0833": [0, 2, -0.9], + "2.1667": [0, 0, 0] + } + }, + "leg_left": { + "rotation": [0, -40, 0], + "position": [0, 0, 1.5] + }, + "head": { + "rotation": { + "0.0": [-20, 0, 0], + "0.5833": { + "pre": [-2.5, 0, 0], + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-6.32, -15, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-33.6, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [-20, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4583": [-20, 0, 0] + } + }, + "torso2": { + "rotation": { + "0.0": [1, 5, 0], + "1.0833": { + "pre": [5.97709, 7.52725, -0.52199], + "post": [5.97709, 7.52725, -0.52199], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [0.97709, -7.47275, 4.47801], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [0.99, 3.55, -0.27], + "lerp_mode": "catmullrom" + }, + "2.5": [1, 5, 0] + } + } + } + }, + "animation.charizard.special": { + "animation_length": 3, + "bones": { + "torso": { + "rotation": { + "0.0": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [14.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-1.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [26, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": [28.92, 0, 0], + "1.4583": [27.47, 0, 0], + "1.5417": [27.83, 0, 0], + "1.625": [25.78, 0, 0], + "1.7083": [26, 0, 0], + "2.0417": [28.5, 0, 0], + "2.5": [12.5, 0, 0], + "2.875": [12.5, 0, 0] + }, + "position": { + "0.0": [0, 0, -0.75], + "0.8333": [0, 0, -0.75], + "1.0417": [0, 0, 0.25], + "1.2917": [0, 0, -1.75], + "1.3333": [0, -0.1, -1.69], + "1.375": [0, 0.01, -1.63], + "1.4583": [0, -0.09, -1.5], + "1.5833": [0, 0.03, -1.31], + "1.9583": [0, 0, -1.25], + "2.7917": [0, 0, -0.75] + } + }, + "neck": { + "rotation": { + "0.0": [11.2745, 7.83467, -2.21473], + "0.9583": [-21.23, 7.83, -2.21], + "1.2083": [18.77, 7.83, -2.21], + "1.25": [20.22, 7.83, -2.21], + "1.2917": [19.02, 7.83, -2.21], + "1.4167": [19.21, 7.83, -2.21], + "1.5833": [16.94, 7.83, -2.21], + "1.7083": [16.93, 7.83, -2.21], + "2.4167": [8.7745, 7.83467, -2.21473], + "2.75": [11.2745, 7.83467, -2.21473] + }, + "position": { + "0.0": [0, -0.0067, -0.75], + "0.9583": [0, -0.01, 0], + "1.2917": [0, -0.01, -1.25], + "2.125": [0, -0.01, -1.25], + "2.5": [0, -0.0067, -0.75] + } + }, + "tail": { + "rotation": { + "0.0": [-5, 0, 0], + "0.7917": { + "pre": [-5, 15, 0], + "post": [-5, 15, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-5, -6.33, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [-5, 5.3, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [-5, -1.33, 0], + "lerp_mode": "catmullrom" + }, + "2.75": [-5, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [30, -12, 0], + "1.0417": { + "pre": [12.5, 13, 0], + "post": [12.5, 13, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [30, -4.5, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [30, 5.5, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [30, -2, 0], + "lerp_mode": "catmullrom" + }, + "2.875": [30, -12, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-20, -12, 0], + "0.9167": { + "pre": [-20, 28, 0], + "post": [-20, 28, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-10, -29.5, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [-20, 15.5, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [-20, -17, 0], + "lerp_mode": "catmullrom" + }, + "2.8333": [-20, -12, 0] + } + }, + "fire": { + "rotation": [-14, 0, -12] + }, + "arm_left": { + "rotation": { + "0.0": [14.28791, -11.00374, 36.7968], + "0.8333": [1.79, 49, 36.8], + "1.0833": [-30.71, 54, 36.8], + "1.3333": [-73.21, "-18.5+3*math.sin(q.anim_time*90*20)", 26.8], + "2.1667": [-35.71, -18.5, 36.8], + "2.375": [-4.13, -13.77, 39.3], + "2.625": [14.28791, -5.00374, "39.2968+3*math.sin(q.anim_time*90*5)"], + "3.0": [14.28791, -11.00374, 36.7968] + }, + "position": { + "0.0": [0, 0, 0], + "0.9167": { + "pre": [0, 0, -1], + "post": [0, 0, -1], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, 0, 1.34], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 0, 1.34], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 0, 0] + } + }, + "forearm_left": { + "rotation": { + "0.0": [0, 67, 0], + "0.875": { + "pre": [0, 79.5, 0], + "post": [0, 79.5, 0], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [0, 79.5, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [0, 37, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 37, 0], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [0, 69.5, 0], + "lerp_mode": "catmullrom" + }, + "2.6667": [0, 67, 0] + } + }, + "finger_left1": { + "rotation": { + "0.0": [0, 15, 15], + "1.0": [0, 15, 52.5], + "1.4167": [0, 15, -2.5], + "2.625": [0, 15, 15] + } + }, + "finger_left3": { + "rotation": { + "0.0": [-5, -15, 30], + "1.0833": [-5, -15, 27.79], + "1.4167": [-5, -15, 7.5], + "2.625": [-5, -15, 30] + } + }, + "finger_left2": { + "rotation": { + "0.0": [0, 0, 15], + "1.0": [0, 0, 30], + "1.4167": [0, 0, -7.5], + "2.625": [0, 0, 15] + } + }, + "arm_right": { + "rotation": { + "0.0": [9.80539, -9.96823, -43.493], + "0.8333": [-10.19, -74.97, -30.99], + "1.0833": [-32.69, -77.47, -30.99], + "1.3333": [-80.19, "27.53-3*math.sin(q.anim_time*90*20)", -30.99], + "2.2083": [-45.19, 27.53, -30.99], + "2.375": [-28.32, 6.94, -34.82], + "2.625": [9.80539, -7.46823, "-48.493-3*math.sin(q.anim_time*90*5)"], + "3.0": [9.80539, -9.96823, -43.493] + }, + "position": { + "0.0": [0, 0, 0], + "0.9167": { + "pre": [0, 0, 0.25], + "post": [0, 0, 0.25], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, 0, 1.35], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 0, 1.35], + "lerp_mode": "catmullrom" + }, + "2.75": [0, 0, 0] + } + }, + "forearm_right": { + "rotation": { + "0.0": [0, -37, 0], + "1.0417": { + "pre": [0, -52, 0], + "post": [0, -52, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, -29.5, 0], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [0, -39.5, 0], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [0, -42, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, -37, 0] + } + }, + "finger_right1": { + "rotation": { + "0.0": [0, -15, -15], + "1.0": [0, -15, -57.5], + "1.4167": [0, -15, 10], + "2.625": [0, -15, -15] + } + }, + "finger_right3": { + "rotation": { + "0.0": [-5, 15, -30], + "1.0833": [-5, 15, -41.47], + "1.4167": [-5, 15, -2.5], + "2.625": [-5, 15, -30] + } + }, + "finger_right2": { + "rotation": { + "0.0": [0, 0, -15], + "1.0": [0, 0, -45], + "1.4167": [0, 0, 5], + "2.625": [0, 0, -15] + } + }, + "wing_right": { + "rotation": { + "0.0": [0, 39, 0], + "0.9583": { + "pre": [0, 11.5, 0], + "post": [0, 11.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, 40.87, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [0, 45.05, 0], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [0, 59, 0], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [0, 39, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 39, 0] + } + }, + "wing_right3": { + "rotation": { + "0.0": [0, -50, 0], + "0.9583": [0, -62.5, 0], + "1.5": [0, "-22.5-3*math.sin(q.anim_time*90*20-50)", 0], + "2.6667": [0, -52.5, 0], + "3.0": [0, -50, 0] + } + }, + "wing_left": { + "rotation": { + "0.0": [0, -39, 0], + "0.9583": { + "pre": [0, -14, 0], + "post": [0, -14, 0], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, -40.87, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [0, -45.05, 0], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [0, -54, 0], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [0, -39, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, -39, 0] + } + }, + "wing_left3": { + "rotation": { + "0.0": [0, 50, 0], + "0.9583": [0, 62.5, 0], + "1.5": [0, "22.5+3*math.sin(q.anim_time*90*20)", 0], + "2.6667": [0, 50, 0], + "3.0": [0, 50, 0] + } + }, + "neck2": { + "rotation": { + "0.0": [10, 0, 0], + "0.75": { + "pre": [37.5, 0, 0], + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.375": [10, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [1.5359, 0, 0], + "1.0417": [1.54, 0, 0], + "1.2083": { + "pre": [46.54, 0, 0], + "post": [46.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [44.98, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [56.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [50.77, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [46.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4583": [1.54, 0, 0] + } + }, + "wing_left2": { + "rotation": { + "0.0": [0, 20, 0], + "1.125": { + "pre": [0, 37.5, 0], + "post": [0, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, 16.93, 0], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [0, 32.75, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [0, 17.7, 0], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [0, 33.16, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 20, 0] + } + }, + "wing_right2": { + "rotation": [0, -20, 0] + }, + "body": { + "rotation": [0, -12.5, 0] + }, + "leg_right": { + "rotation": [0, 40, 0], + "position": { + "0.0": [0, 0, 0], + "0.75": [0, 0, 0], + "1.125": [0, 1.55, 0], + "1.1667": [0, 0, 0] + } + }, + "leg_left": { + "rotation": [0, -40, 0], + "position": [0, 0, 1.5] + }, + "torso2": { + "rotation": { + "0.0": [1, 5, 0], + "1.0833": { + "pre": [11, 5, 0], + "post": [11, 5, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-1.5, 5, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [1, 5, 0] + } + }, + "head": { + "rotation": { + "0.0": [-20, 0, 0], + "0.2917": { + "pre": [-14.42, 0, 0], + "post": [-14.42, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [20, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-45.1934, -2.91008, -0.93336], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [-47.47993, 0.41187, -0.51929], + "lerp_mode": "catmullrom" + }, + "2.3333": { + "post": [-15.66, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6667": { + "post": [-21.44, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [-20, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.5417": [0, 0, 0], + "0.5833": [-0.1, 0, 0], + "1.0833": [-0.1, 0, 0], + "1.125": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.5417": [0, 0, 0], + "0.5833": [0.1, 0, 0], + "1.0833": [0.1, 0, 0], + "1.125": [0, 0, 0] + } + } + } + }, + "animation.charizard.status": { + "animation_length": 3, + "bones": { + "torso": { + "rotation": { + "0.0": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2083": { + "post": [14.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-1.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [1, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0417": [8.5, 0, 0], + "2.5": [12.5, 0, 0], + "2.875": [12.5, 0, 0] + }, + "position": { + "0.0": [0, 0, -0.75], + "0.8333": { + "pre": [0, -0.5, -0.25], + "post": [0, -0.5, -0.25], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [0, 0.4, -1.15], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [0, 0.4, -1.15], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [0, 0, -1.25], + "lerp_mode": "catmullrom" + }, + "2.7917": [0, 0, -0.75] + } + }, + "neck": { + "rotation": { + "0.0": [11.2745, 7.83467, -2.21473], + "0.9583": { + "pre": [-21.23, 7.83, -2.21], + "post": [-21.23, 7.83, -2.21], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [1.27, 7.83, -7.21], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [-8.25, 7.83, 5.29], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [8.7745, 7.83467, -2.21473], + "lerp_mode": "catmullrom" + }, + "2.75": [11.2745, 7.83467, -2.21473] + }, + "position": { + "0.0": [0, -0.0067, -0.75], + "0.9583": [0, -1.31, 0], + "1.2917": [0, -0.01, -1.25], + "2.125": [0, -0.01, -1.25], + "2.5": [0, -0.0067, -0.75] + } + }, + "tail": { + "rotation": { + "0.0": [-5, 0, 0], + "0.7917": { + "pre": [-5, 15, 0], + "post": [-5, 15, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-5, -6.33, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [-5, 5.3, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [-5, -1.33, 0], + "lerp_mode": "catmullrom" + }, + "2.75": [-5, 0, 0] + } + }, + "tail2": { + "rotation": { + "0.0": [30, -12, 0], + "1.0417": { + "pre": [12.5, 13, 0], + "post": [12.5, 13, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [30, -4.5, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [30, 5.5, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [30, -2, 0], + "lerp_mode": "catmullrom" + }, + "2.875": [30, -12, 0] + } + }, + "tail3": { + "rotation": { + "0.0": [-20, -12, 0], + "0.9167": { + "pre": [-20, 28, 0], + "post": [-20, 28, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-10, -29.5, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [-20, 15.5, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [-20, -17, 0], + "lerp_mode": "catmullrom" + }, + "2.8333": [-20, -12, 0] + } + }, + "fire": { + "rotation": [-14, 0, -12] + }, + "arm_left": { + "rotation": { + "0.0": [14.28791, -11.00374, 36.7968], + "1.0833": [-56.07937, 54.8634, 2.50044], + "1.3333": [-128.21, "-18.5+3*math.sin(q.anim_time*90*20)", 26.8], + "2.0": [-93.21, -18.5, 36.8], + "2.625": [14.28791, -5.00374, "39.2968+3*math.sin(q.anim_time*90*5)"], + "3.0": [14.28791, -11.00374, 36.7968] + }, + "position": { + "0.0": [0, 0, 0], + "0.9167": { + "pre": [0, 0, -1], + "post": [0, 0, -1], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, 0, 1.34], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 0, 1.34], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 0, 0] + } + }, + "forearm_left": { + "rotation": { + "0.0": [0, 67, 0], + "0.875": { + "pre": [0, 79.5, 0], + "post": [0, 79.5, 0], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [0, 79.5, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [0, 37, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 37, 0], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [0, 69.5, 0], + "lerp_mode": "catmullrom" + }, + "2.6667": [0, 67, 0] + } + }, + "finger_left1": { + "rotation": { + "0.0": [0, 15, 15], + "1.0": [0, 15, 52.5], + "1.4167": [0, 15, -2.5], + "2.625": [0, 15, 15] + } + }, + "finger_left3": { + "rotation": { + "0.0": [-5, -15, 30], + "1.0833": [-5, -15, 27.79], + "1.4167": [-5, -15, 7.5], + "2.625": [-5, -15, 30] + } + }, + "finger_left2": { + "rotation": { + "0.0": [0, 0, 15], + "1.0": [0, 0, 30], + "1.4167": [0, 0, -7.5], + "2.625": [0, 0, 15] + } + }, + "arm_right": { + "rotation": { + "0.0": [9.80539, -9.96823, -43.493], + "1.0833": [-73.26549, -67.28296, 21.58174], + "1.3333": [-105.19, "27.53-3*math.sin(q.anim_time*90*20)", -30.99], + "2.0": [-100.19, 27.53, -30.99], + "2.625": [9.80539, -7.46823, "-48.493-3*math.sin(q.anim_time*90*5)"], + "3.0": [9.80539, -9.96823, -43.493] + }, + "position": { + "0.0": [0, 0, 0], + "0.9167": { + "pre": [0, 0, 0.25], + "post": [0, 0, 0.25], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, 0, 1.35], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 0, 1.35], + "lerp_mode": "catmullrom" + }, + "2.75": [0, 0, 0] + } + }, + "forearm_right": { + "rotation": { + "0.0": [0, -37, 0], + "1.0417": { + "pre": [0, -52, 0], + "post": [0, -52, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [0, -29.5, 0], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [0, -39.5, 0], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [0, -42, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, -37, 0] + } + }, + "finger_right1": { + "rotation": { + "0.0": [0, -15, -15], + "1.0": [0, -15, -57.5], + "1.4167": [0, -15, 10], + "2.625": [0, -15, -15] + } + }, + "finger_right3": { + "rotation": { + "0.0": [-5, 15, -30], + "1.0833": [-5, 15, -41.47], + "1.4167": [-5, 15, -2.5], + "2.625": [-5, 15, -30] + } + }, + "finger_right2": { + "rotation": { + "0.0": [0, 0, -15], + "1.0": [0, 0, -45], + "1.4167": [0, 0, 5], + "2.625": [0, 0, -15] + } + }, + "wing_right": { + "rotation": { + "0.0": [0, 39, 0], + "0.9583": { + "pre": [0, 11.5, 0], + "post": [0, 11.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, 40.87, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [0, 45.05, 0], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [0, 59, 0], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [0, 39, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 39, 0] + } + }, + "wing_right3": { + "rotation": { + "0.0": [0, -50, 0], + "0.9583": [0, -62.5, 0], + "1.5": [0, "-22.5-3*math.sin(q.anim_time*90*20-50)", 0], + "2.6667": [0, -52.5, 0], + "3.0": [0, -50, 0] + } + }, + "wing_left": { + "rotation": { + "0.0": [0, -39, 0], + "0.9583": { + "pre": [0, -14, 0], + "post": [0, -14, 0], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [0, -40.87, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [0, -45.05, 0], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [0, -54, 0], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [0, -39, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, -39, 0] + } + }, + "wing_left3": { + "rotation": { + "0.0": [0, 50, 0], + "0.9583": [0, 62.5, 0], + "1.5": [0, "22.5+3*math.sin(q.anim_time*90*20)", 0], + "2.6667": [0, 50, 0], + "3.0": [0, 50, 0] + } + }, + "neck2": { + "rotation": { + "0.0": [10, 0, 0], + "0.8333": { + "pre": [37.5, 0, 0], + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.375": [10, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [1.5359, 0, 0], + "1.0417": [1.54, 0, 0], + "1.1667": { + "pre": [46.54, 0, 0], + "post": [46.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [44.98, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [56.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [50.77, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [46.54, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.125": [1.54, 0, 0] + } + }, + "wing_left2": { + "rotation": { + "0.0": [0, 20, 0], + "1.125": { + "pre": [0, 37.5, 0], + "post": [0, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, 16.93, 0], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [0, 32.75, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [0, 17.7, 0], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [0, 33.16, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 20, 0] + } + }, + "wing_right2": { + "rotation": [0, -20, 0] + }, + "body": { + "rotation": [0, -12.5, 0] + }, + "leg_right": { + "rotation": [0, 40, 0], + "position": { + "0.0": [0, 0, 0], + "0.4167": [0, 0, 0], + "0.7917": [0, 1.55, 0], + "0.8333": [0, 0, 0] + } + }, + "leg_left": { + "rotation": [0, -40, 0], + "position": [0, 0, 1.5] + }, + "torso2": { + "rotation": { + "0.0": [1, 5, 0], + "0.25": { + "pre": [11, 5, 0], + "post": [11, 5, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-1.86, 5, 0.35], + "lerp_mode": "catmullrom" + }, + "2.9583": [1, 5, 0] + } + }, + "head": { + "rotation": { + "0.0": [-20, 0, 0], + "0.2917": { + "pre": [-14.42, 0, 0], + "post": [-14.42, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [20, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-45.1934, -2.91008, -0.93336], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [-47.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [-47.47993, 0.41187, -0.51929], + "lerp_mode": "catmullrom" + }, + "2.3333": { + "post": [-15.66, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6667": { + "post": [-21.44, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [-20, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.5417": [0, 0, 0], + "0.5833": [-0.1, 0, 0], + "1.0833": [-0.1, 0, 0], + "1.125": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.5417": [0, 0, 0], + "0.5833": [0.1, 0, 0], + "1.0833": [0.1, 0, 0], + "1.125": [0, 0, 0] + } + } + }, + "sound_effects": { + "1.0833": { + "effect": "pokemon.charizard.cry" + } + } + }, + "animation.charizard.recoil": { + "animation_length": 1.5, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": [-12, 0, 0], + "0.4583": { + "pre": [2.24067, 0, 0], + "post": [2.24067, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [2.24067, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": [0, 0, 0] + } + }, + "torso2": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": [4.98, 0, 0], + "0.4167": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [1.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": [0, 0, 0] + } + }, + "neck": { + "rotation": { + "0.0": [0, 0, 0], + "0.0833": { + "pre": [-25, 0, 0], + "post": [-25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "neck2": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [5, 0, 0], + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [14.85, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": [0, 0, 0] + } + }, + "head": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [10, 0, 0], + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-10, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": [0, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, 0], + "0.125": [-0.1, 0, 0], + "0.1667": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0": [0.1, 0, 0], + "0.125": [0.1, 0, 0], + "0.1667": [0, 0, 0] + } + }, + "tail": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": { + "pre": [17.5, 0, 0], + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [15.38, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": [0, 0, 0] + } + }, + "arm_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, -30, 0], + "post": [0, -30, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": [0, 0, 0] + } + }, + "forearm_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [0, -17.5, 0], + "1.125": [0, 0, 0] + } + }, + "arm_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [0, 30, 0], + "post": [0, 30, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": [0, 0, 0] + } + }, + "forearm_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [0, 17.5, 0], + "1.125": [0, 0, 0] + } + } + } + }, "animation.charizard.air_idle": { "loop": true, "bones": { @@ -498,9 +2305,9 @@ "2.2": [64.24451, 5.55636, -3.94049] }, "position": { - "0.0": [0, "-0.1*(math.sin(q.anim_time*90*3-90)*1+1)", 1], - "0.1": [0, "1-0.1*(math.sin(q.anim_time*90*3-90)*1+1)", -1], - "2.2": [0, "0.0937-0.1*(math.sin(q.anim_time*90*3-90)*1+1)", -1.42262] + "0.0": [0, "-0.1*(math.sin(q.anim_time*90*3-90)*1+1)", 0.1], + "0.1": [0, "1.9-0.1*(math.sin(q.anim_time*90*3-90)*1+1)", -1], + "2.2": [0, "4.0472-0.1*(math.sin(q.anim_time*90*3-90)*1+1)", 0.14107] } }, "neck": { @@ -969,9 +2776,10 @@ "1.35": [-1, -4.3, 2], "1.4": [-1, -8.3, 2], "1.45": [-1, -7.3, 2], - "1.5": [-1, -8.3, 2], - "1.55": [-1, -7, 2], - "1.8": [-2, -7, 0] + "1.5": [-1, -4.1, 2], + "1.55": [-1, -1.9, 2], + "1.8": [-2, -1.9, 0], + "2.15": [-2, -7, 0] } }, "head_ai": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0009_blastoise/blastoise.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0009_blastoise/blastoise.animation.json index 2ad6601485..3210d59162 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0009_blastoise/blastoise.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/0009_blastoise/blastoise.animation.json @@ -3,551 +3,910 @@ "animations": { "animation.blastoise.ground_idle": { "loop": true, + "animation_length": 4, "bones": { - "tail": { - "rotation": [0, "4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", 0] - }, - "arm_right": { - "rotation": [0, -10, "-40+1.5*(math.sin(q.anim_time*90*3)*1+1)"] - }, - "leg_right": { - "position": [0, 0, 2] - }, - "leg_left": { - "position": [0, 0, 2] - }, - "arm_right3": { - "rotation": [0, -15, -15] - }, - "head_angle": { - "rotation": [5, 0, 0] - }, - "arm_right2": { - "rotation": [0, -15, -15] - }, - "arm_left": { - "rotation": [0, 10, "40-1.5*(math.sin(q.anim_time*90*3)*1+1)"] - }, - "arm_left2": { - "rotation": [0, 15, 15] - }, - "arm_left3": { - "rotation": [0, 15, 15] + "body2": { + "position": [0, -1.5, 0] }, "torso": { - "rotation": [10, 0, 0], - "position": [0, "-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", 0] + "rotation": ["17.5+1*math.sin(q.anim_time*90*2-60)", "0.5*math.cos(q.anim_time*90*1)", "1*math.sin(q.anim_time*90*0.5)"], + "position": [0, "-0.15*(math.sin(q.anim_time*90*2-90)*1+1)", "0.25*(math.sin(q.anim_time*90*2-90)*1+1)"] + }, + "arm_rotate_left": { + "rotation": [0, 12.5, 0] + }, + "arm_left": { + "rotation": ["39.2403-2*(math.sin(q.anim_time*90*2)*1+1)", -16.32555, 22.4403], + "position": [-1, 0, -0.1] + }, + "elbow_left": { + "rotation": ["19.6888-2*(math.sin(q.anim_time*90*2-60)*1+1)", -1.3027, -11.09368] + }, + "hand_left": { + "rotation": [9.8511, 1.72794, "-9.8511+math.sin(q.anim_time*90*2-110)*2"] + }, + "fingers_left": { + "rotation": [17.5, 0, 0] + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": ["39.2403-2*(math.sin(q.anim_time*90*2)*1+1)", 16.32555, -22.4403], + "position": [1, 0, -0.1] + }, + "elbow_right": { + "rotation": ["19.6888-2*(math.sin(q.anim_time*90*2-60)*1+1)", 1.3027, 11.0937] + }, + "hand_right": { + "rotation": [9.8511, -1.72794, "9.8511-math.sin(q.anim_time*90*2-110)*2"] + }, + "fingers_right": { + "rotation": [17.5, 0, 0] + }, + "head_angle": { + "rotation": [-12.5, 0, 0] }, "jaw": { - "rotation": ["5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0] + "rotation": [0, 0, 0] + }, + "shell_cannon_right": { + "rotation": [-30, 0, 0] + }, + "leg_right": { + "rotation": ["-15-2*(math.sin(q.anim_time*90*2-60)*1+1)", 27.5, 0], + "position": ["0.05*(math.sin(q.anim_time*90*2-60)*1+1)", "-0.22*(math.sin(q.anim_time*90*2-60)*1+1)", "0.11*(math.sin(q.anim_time*90*2-60)*1+1)"] + }, + "knee_right": { + "rotation": ["15+2*(math.sin(q.anim_time*90*2-60)*1+1)", 0, 0] + }, + "shell_cannon_left": { + "rotation": [-30, 0, 0] + }, + "leg_left": { + "rotation": ["-15-2*(math.sin(q.anim_time*90*2-60)*1+1)", -27.5, 0], + "position": ["-0.05*(math.sin(q.anim_time*90*2-60)*1+1)", "-0.22*(math.sin(q.anim_time*90*2-60)*1+1)", "0.11*(math.sin(q.anim_time*90*2-60)*1+1)"] + }, + "knee_left": { + "rotation": ["15+2*(math.sin(q.anim_time*90*2-60)*1+1)", 0, 0] + }, + "tail_bend": { + "rotation": [15, "2*math.sin(q.anim_time*90*1-60)", "2*math.sin(q.anim_time*90*1-190)"] + }, + "tail_end": { + "rotation": ["15+3*math.sin(q.anim_time*90*2-90)", 0, "6*math.sin(q.anim_time*90*1-250)"] }, "head": { - "rotation": [-10, 0, 0] + "rotation": ["-1+2*math.sin(q.anim_time*90*2-160)", 0, "-2*math.sin(q.anim_time*90*0.5)"] + }, + "tail_base": { + "rotation": [0, "-2*(math.sin(q.anim_time*90*1-150)*1)", "4*(math.sin(q.anim_time*90*1-60)*1)"] + }, + "cannon_right": { + "position": [0, 0, 3] + }, + "cannon_left": { + "position": [0, 0, 3] + } + } + }, + "animation.blastoise.battle_idle": { + "loop": true, + "animation_length": 4, + "bones": { + "body2": { + "position": [0, -1.5, 0] + }, + "torso": { + "rotation": ["25+1*(math.sin(q.anim_time*90*2-60)*1+1)", "0+0.5*math.cos(q.anim_time*90*1)", "0+1*math.sin(q.anim_time*90*0.5)"], + "position": [0, "-0.15*(math.sin(q.anim_time*90*2-90)*1+1)", "-0.1+0.25*(math.sin(q.anim_time*90*2-30)*1+1)"] + }, + "arm_rotate_left": { + "rotation": [0, 12.5, 0] + }, + "arm_left": { + "rotation": ["18.0158-2*(math.sin(q.anim_time*90*2)*1+1)", -7.28336, 4.19087], + "position": [-0.5, 0, 0] + }, + "elbow_left": { + "rotation": [2.5, 0, 0] + }, + "hand_left": { + "rotation": [7.5, 0, 0] + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": ["18.0158-2*(math.sin(q.anim_time*90*2)*1+1)", 7.28336, -4.19087], + "position": [0.5, 0, 0] + }, + "elbow_right": { + "rotation": [2.5, 0, 0] + }, + "hand_right": { + "rotation": [7.5, 0, 0] + }, + "head_angle": { + "rotation": [-12.5, 0, 0] + }, + "jaw": { + "rotation": ["15+5*math.sin(q.anim_time*90*2-210)", 0, 0] + }, + "shell_cannon_right": { + "rotation": [-30, 0, 0] + }, + "leg_right": { + "rotation": ["-15-2*(math.sin(q.anim_time*90*2-60)*1+1)", 37.5, 0], + "position": ["0.05*(math.sin(q.anim_time*90*2-60)*1+1)", "-0.22*(math.sin(q.anim_time*90*2-60)*1+1)", "0.11*(math.sin(q.anim_time*90*2-60)*1+1)"] + }, + "knee_right": { + "rotation": ["15+2*(math.sin(q.anim_time*90*2-60)*1+1)", 0, 0] + }, + "shell_cannon_left": { + "rotation": [-30, 0, 0] + }, + "leg_left": { + "rotation": ["-15-2*(math.sin(q.anim_time*90*2-60)*1+1)", -37.5, 0], + "position": ["-0.05*(math.sin(q.anim_time*90*2-60)*1+1)", "-0.22*(math.sin(q.anim_time*90*2-60)*1+1)", "0.11*(math.sin(q.anim_time*90*2-60)*1+1)"] + }, + "knee_left": { + "rotation": ["15+2*(math.sin(q.anim_time*90*2-70)*1+1)", 0, 0] + }, + "tail_bend": { + "rotation": [15, "2*math.sin(q.anim_time*90*1-60)", "2*math.sin(q.anim_time*90*1-190)"] + }, + "tail_end": { + "rotation": ["15+3*math.sin(q.anim_time*90*2-90)", 0, "6*math.sin(q.anim_time*90*1-250)"] + }, + "head": { + "rotation": ["-8.5+2*math.sin(q.anim_time*90*2-160)", 0, "0-2*math.sin(q.anim_time*90*0.5)"] + }, + "tail_base": { + "rotation": [0, "-2*(math.sin(q.anim_time*90*1-150)*1)", "4*(math.sin(q.anim_time*90*1-60)*1)"] + }, + "cannon_left": { + "rotation": [-0.7503, 17.01572, 0.30669] + }, + "right_toe_out": { + "rotation": [0, 12.5, 0] + }, + "right_toe_in": { + "rotation": [0, -12.5, 0] + }, + "left_toe_out": { + "rotation": [0, -12.5, 0] + }, + "left_toe_in": { + "rotation": [0, 12.5, 0] + }, + "cannon_right": { + "rotation": [-0.7503, -17.01572, -0.30669] } } }, "animation.blastoise.ground_walk": { "loop": true, + "animation_length": 4, "bones": { - "body": { - "rotation": [ - "math.clamp(math.sin(query.anim_time*180*4/2+20)*1,0.2,2)+math.clamp(-math.sin(query.anim_time*180*4/2+20)*1,0.2,2)+10", - "math.sin(query.anim_time*90*4+20)*10", - "math.sin(query.anim_time*90*4+20)*2" - ], - "position": [ - 0, - "-math.clamp(math.sin(-query.anim_time*90*4+45/2)*0.6,0.1,1)-math.clamp(math.sin(-query.anim_time*90*4+45/2+180)*0.6,0.1,1)+0.7", - "-math.clamp(math.sin(query.anim_time*90*4)*0.8,0.1,0.7)-math.clamp(math.sin(-query.anim_time*90*4)*0.8,0.1,0.7)+0.2" - ] + "body2": { + "position": { + "0.0": [0, -1.5, 0], + "0.25": [0, -1.5, 0], + "0.2917": [0, -1.8, 0], + "0.3333": [0, -1.2, 0], + "0.375": [0, -1.6, 0], + "0.4583": [0, -1.4, 0], + "0.5833": [0, -1.6, 0], + "0.7917": [0, -1.5, 0], + "1.25": [0, -1.5, 0], + "1.2917": [0, -1.8, 0], + "1.3333": [0, -1.2, 0], + "1.375": [0, -1.6, 0], + "1.4583": [0, -1.4, 0], + "1.5833": [0, -1.6, 0], + "1.7917": [0, -1.5, 0], + "2.25": [0, -1.5, 0], + "2.2917": [0, -1.8, 0], + "2.3333": [0, -1.2, 0], + "2.375": [0, -1.6, 0], + "2.4583": [0, -1.4, 0], + "2.5833": [0, -1.6, 0], + "2.7917": [0, -1.5, 0], + "3.25": [0, -1.5, 0], + "3.2917": [0, -1.8, 0], + "3.3333": [0, -1.2, 0], + "3.375": [0, -1.6, 0], + "3.4583": [0, -1.4, 0], + "3.5833": [0, -1.6, 0], + "3.7917": [0, -1.5, 0] + } }, - "tail": { - "rotation": [0, "math.sin(query.anim_time*90*4-90)*8", 0] + "torso": { + "rotation": ["17.5+4*math.sin(q.anim_time*90*4-60)", "12*math.cos(q.anim_time*90*2)", "5*math.sin(q.anim_time*90*2)"], + "position": [0, "0.9+math.clamp(1*math.sin(q.anim_time*90*4+60),0,2)", "-0.3+0.5*math.cos(q.anim_time*90*4+120)"] }, - "arm_right": { - "rotation": [0, "-math.sin(query.anim_time*90*4+30)*10", -40] - }, - "arm_right3": { - "rotation": [0, "-20-math.sin(query.anim_time*90*4+30)*2", -15] - }, - "leg_right": { - "rotation": [ - "-math.clamp(math.sin(query.anim_time*90*4+45+180)*10,-1,10)+math.clamp(-math.sin(query.anim_time*90*4+20)*12,5,12)-15", - "math.clamp(math.sin(query.anim_time*90*4+20+180)*10,0,30)", - 0 - ], - "position": [ - 0, - "-math.clamp(-math.sin(query.anim_time*90*4+20+180)*0.4,0.3,3)+math.clamp(-math.sin(query.anim_time*90*4-30)*0.8,0.5,1)+math.clamp(-math.sin(query.anim_time*90*4-35+180)*3,1,3)-1.3", - "-math.clamp(math.sin(query.anim_time*90*4+180)*0.2,-0.5,1)-math.clamp(math.sin(query.anim_time*90*4+180)*0.4,-0.8,0)+1.4" - ] - }, - "leg_left": { - "rotation": [ - "-math.clamp(math.sin(query.anim_time*90*4+45)*10,-1,10)+math.clamp(-math.sin(query.anim_time*90*4+180+20)*12,5,12)-15", - "-math.clamp(math.sin(query.anim_time*90*4+20)*10,0,30)", - 0 - ], - "position": [ - 0, - "-math.clamp(-math.sin(query.anim_time*90*4+20)*0.4,0.3,3)+math.clamp(-math.sin(query.anim_time*90*4-30+180)*0.8,0.5,1)+math.clamp(-math.sin(query.anim_time*90*4-35)*3,1,3)-1.3", - "-math.clamp(math.sin(query.anim_time*90*4)*0.2,-0.5,1)-math.clamp(math.sin(query.anim_time*90*4)*0.4,-0.8,0)+1.4" - ] - }, - "head_angle": { - "rotation": [5, 0, 0] - }, - "arm_right2": { - "rotation": [0, "-15-math.sin(query.anim_time*90*4+30)*4", -15] + "arm_rotate_left": { + "rotation": [0, 12.5, 0] }, "arm_left": { - "rotation": [0, "-math.sin(query.anim_time*90*4+30)*10", 40] + "rotation": ["39.2403-2*math.sin(q.anim_time*90*4)", "-16.3256-4*math.cos(q.anim_time*90*4)", 22.4403], + "position": [-1, 0, -0.1] }, - "arm_left2": { - "rotation": [0, "15-math.sin(query.anim_time*90*4+30)*4", 15] + "elbow_left": { + "rotation": ["19.6888-2*(math.sin(q.anim_time*90*4-60)*1+1)", -1.3027, -11.09368] }, - "arm_left3": { - "rotation": [0, "20-math.sin(query.anim_time*90*4+30)*2", 15] + "hand_left": { + "rotation": [9.8511, 1.72794, "-9.8511+math.sin(q.anim_time*90*2-110)*2"] + }, + "fingers_left": { + "rotation": [17.5, 0, 0] + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": ["39.2403-2*math.sin(q.anim_time*90*4)", "16.3256+4*math.cos(q.anim_time*90*4)", -22.4403], + "position": [1, 0, -0.1] + }, + "elbow_right": { + "rotation": ["19.6888-2*(math.sin(q.anim_time*90*4-60)*1+1)", 1.3027, 11.0937] + }, + "hand_right": { + "rotation": [9.8511, -1.72794, "9.8511-math.sin(q.anim_time*90*2-110)*2"] + }, + "fingers_right": { + "rotation": [17.5, 0, 0] + }, + "head_angle": { + "rotation": [-12.5, 0, 0] + }, + "jaw": { + "rotation": [0, 0, 0] + }, + "shell_cannon_right": { + "rotation": [-30, 0, 0] + }, + "leg_right": { + "rotation": { + "0.0": { + "post": [4.8, 26.38, 4.77], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [9.16329, 25.70885, 6.53894], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [4.08469, 23.45696, 11.66984], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [-24.32, 19.73, 4.18], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-25.64985, 21.01706, 3.44594], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-15.27, 27.5, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [9.16329, 25.70885, 6.53894], + "lerp_mode": "catmullrom" + }, + "2.5833": { + "post": [4.08469, 23.45696, 11.66984], + "lerp_mode": "catmullrom" + }, + "3.0417": { + "post": [-25.64985, 21.01706, 3.44594], + "lerp_mode": "catmullrom" + }, + "3.25": { + "post": [-15.27, 27.5, 0], + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": [4.8, 26.38, 4.77], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [0.01, 0.95, 3.74], + "0.25": [0.01, 1.27, 5.51], + "0.6667": [0.01, 2.93, 2.55], + "0.9583": [0.01, 3.24, 0.48], + "1.0": [0.01, 3.23, 0.18], + "1.1667": [0.01, 3.17, -1], + "1.25": [0.01, -0.03, -1.59], + "2.25": [0.01, 1.27, 5.51], + "2.6667": [0.01, 2.93, 2.55], + "2.9583": [0.01, 3.24, 0.48], + "3.1667": [0.01, 3.17, -1], + "3.25": [0.01, -0.03, -1.59], + "4.0": [0.01, 0.95, 3.74] + } + }, + "knee_right": { + "rotation": { + "0.0": { + "post": [0.7, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [0.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [30.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [36.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [15.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [30.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": { + "post": [36.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.25": { + "post": [15.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": [0.7, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "shell_cannon_left": { + "rotation": [-30, 0, 0] + }, + "leg_left": { + "rotation": { + "0.0": { + "post": [-24.32, -19.73, -4.18], + "lerp_mode": "catmullrom" + }, + "0.0417": { + "post": [-25.64985, -21.01706, -3.44594], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [-15.27, -27.5, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [9.16329, -25.70885, -6.53894], + "lerp_mode": "catmullrom" + }, + "1.5833": { + "post": [4.08469, -23.45696, -11.66984], + "lerp_mode": "catmullrom" + }, + "2.0417": { + "post": [-25.64985, -21.01706, -3.44594], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [-15.27, -27.5, 0], + "lerp_mode": "catmullrom" + }, + "3.25": { + "post": [9.16329, -25.70885, -6.53894], + "lerp_mode": "catmullrom" + }, + "3.5833": { + "post": [4.08469, -23.45696, -11.66984], + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": [-24.32, -19.73, -4.18], + "lerp_mode": "catmullrom" + }, + "4.0417": { + "post": [-25.64985, -21.01706, -3.44594], + "lerp_mode": "catmullrom" + } + }, + "position": { + "0.0": [-0.01, 3.23, 0.18], + "0.1667": [-0.01, 3.17, -1], + "0.25": [-0.01, -0.03, -1.59], + "1.25": [-0.01, 1.27, 5.51], + "1.6667": [-0.01, 2.93, 2.55], + "1.9583": [-0.01, 3.24, 0.48], + "2.1667": [-0.01, 3.17, -1], + "2.25": [-0.01, -0.03, -1.59], + "3.25": [-0.01, 1.27, 5.51], + "3.6667": [-0.01, 2.93, 2.55], + "3.9583": [-0.01, 3.24, 0.48], + "4.0": [-0.01, 3.23, 0.18] + } + }, + "knee_left": { + "rotation": { + "0.0": { + "post": [36.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.25": { + "post": [15.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [30.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [36.94, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [15.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.25": { + "post": [0.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.5": { + "post": [30.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "4.0": { + "post": [36.94, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "tail_bend": { + "rotation": [15, "2*math.sin(q.anim_time*90*2-60)", "-8*math.sin(q.anim_time*90*2)"] + }, + "tail_end": { + "rotation": ["15+4*math.sin(q.anim_time*90*4-90)", 0, "17*math.sin(q.anim_time*90*2-250)"] }, "head": { - "rotation": [-10, "-math.sin(query.anim_time*90*4+20)*10", 0] + "rotation": ["-1+2*math.sin(q.anim_time*90*4-160)", "-12*math.cos(q.anim_time*90*2-20)", "-8*math.sin(q.anim_time*90*2-60)"] + }, + "tail_base": { + "rotation": [0, "-6*math.sin(q.anim_time*90*2-90)", "-8*math.sin(q.anim_time*90*2)"] + }, + "right_toe_in": { + "rotation": { + "0.0": [-11.25, 0, 0], + "0.25": [-15, 0, 0], + "0.75": [0, 0, 0], + "1.0": [0, 0, 0], + "1.25": [0, 0, 0], + "2.25": [-15, 0, 0], + "2.75": [0, 0, 0], + "3.0": [0, 0, 0], + "3.25": [0, 0, 0], + "4.0": [-11.25, 0, 0] + } + }, + "right_toe_front": { + "rotation": { + "0.0": [-9.37, 0, 0], + "0.25": [-12.5, 0, 0], + "0.5417": [0, 0, 0], + "1.0": [0, 0, 0], + "1.25": [0, 0, 0], + "2.25": [-12.5, 0, 0], + "2.5417": [0, 0, 0], + "3.0": [0, 0, 0], + "3.25": [0, 0, 0], + "4.0": [-9.37, 0, 0] + } + }, + "left_toe_in": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.25": [-15, 0, 0], + "1.75": [0, 0, 0], + "2.0": [0, 0, 0], + "2.25": [0, 0, 0], + "3.25": [-15, 0, 0], + "3.75": [0, 0, 0], + "4.0": [0, 0, 0] + } + }, + "left_toe_front": { + "rotation": { + "0.0": [0, 0, 0], + "0.25": [0, 0, 0], + "1.25": [-12.5, 0, 0], + "1.5417": [0, 0, 0], + "2.0": [0, 0, 0], + "2.25": [0, 0, 0], + "3.25": [-12.5, 0, 0], + "3.5417": [0, 0, 0], + "4.0": [0, 0, 0] + } + }, + "cannon_right": { + "position": [0, 0, 3] + }, + "cannon_left": { + "position": [0, 0, 3] + } + } + }, + "animation.blastoise.ground_run": { + "loop": true, + "animation_length": 4, + "bones": { + "body2": { + "rotation": [90, "math.mod(q.anim_time*2, 1)*360", 0], + "position": [0, -14, 0] + }, + "torso": { + "rotation": [-7.5, 0, 0] + }, + "shell": { + "rotation": [0, 0, 0] + }, + "arm_left": { + "position": [0, -16, 0], + "scale": 0 + }, + "arm_right": { + "position": [0, -16, 0], + "scale": 0 + }, + "cannon_right": { + "scale": 0 + }, + "cannon_left": { + "scale": 0 + }, + "head_angle": { + "rotation": [-90, 0, 0], + "position": [0, -12, 0], + "scale": 0 + }, + "tail_base": { + "rotation": [-45, 0, 0], + "position": [0, 15, 0], + "scale": 0 + }, + "leg_right": { + "rotation": [0, 0, 45], + "position": [8, 8, 8], + "scale": 0 + }, + "leg_left": { + "rotation": [0, 0, -45], + "position": [-8, 8, 8], + "scale": 0 + }, + "body": { + "rotation": [0, 0, "5*math.sin(q.anim_time*90*1)"], + "position": ["1*math.sin(q.anim_time*90*1-60)", 0, 0] } } }, "animation.blastoise.water_idle": { "loop": true, "bones": { - "body": { - "rotation": ["89.5-math.clamp(math.sin(q.anim_time*90*2)*2,0,2)-math.clamp(math.sin(q.anim_time*90*2)*2,-2,0)", 0, 0], - "position": [0, -3, 0] + "body2": { + "rotation": ["32-math.sin(q.anim_time*90*0.5+130)*3", 0, "-math.cos(q.anim_time*90*0.5+130)*1"], + "position": ["0-math.cos(q.anim_time*90*0.5+70)*0.2", "0.5+math.sin(q.anim_time*90*1+70)*0.2", "0+math.cos(q.anim_time*90*0.5+70)*0.2"] }, - "tail": { - "rotation": [ - "-87.5+math.clamp(math.sin(q.anim_time*90*2-25)*1,0,2)+math.clamp(math.sin(q.anim_time*90*2-25)*1,-2,0)+2*(math.sin(q.anim_time*90*2)*1)+2*(math.sin(q.anim_time*90*2/3)*1)", - 0, - "4*(math.sin(q.anim_time*90*2)*1)+4*(math.sin(q.anim_time*90*2/3)*1)" - ], - "position": [0, -1, 0] + "torso": { + "rotation": [17.5, 0, 0], + "position": [0, 0, 0] }, - "head": { - "rotation": ["-180+math.clamp(math.sin(q.anim_time*90*2+25)*2,0,2)+math.clamp(math.sin(q.anim_time*90*2+25)*2,-2,0)", 0, 0], - "position": [0, 3.75, -4.75] - }, - "arm_right": { - "rotation": [ - -90, - "-30-math.clamp(math.sin(q.anim_time*90*2+90)*1.5,0,1)-math.clamp(math.sin(q.anim_time*90*2+90)*2.5,0,6)-math.clamp(math.sin(q.anim_time*90*2+90)*1.5,-1,0)-math.clamp(math.sin(q.anim_time*90*2+90)*2,-4,-0)", - "15+math.sin(q.anim_time*90*2/3+90)*6" - ], - "position": [-1, -2, 2.75] - }, - "leg_right": { - "rotation": [ - "-10-math.clamp(math.sin(q.anim_time*90*2+70)*3,0,1)-math.clamp(math.sin(q.anim_time*90*2+70)*5,0,6)-math.clamp(math.sin(q.anim_time*90*2+70)*3,-1,0)-math.clamp(math.sin(q.anim_time*90*2+70)*4,-4,-0)", - 0, - "10-math.sin(q.anim_time*90*2/3)*6" - ], - "position": [0, 0, 1] - }, - "leg_left": { - "rotation": [ - "-10-math.clamp(math.sin(q.anim_time*90*2+70)*3,0,1)-math.clamp(math.sin(q.anim_time*90*2+70)*5,0,6)-math.clamp(math.sin(q.anim_time*90*2+70)*3,-1,0)-math.clamp(math.sin(q.anim_time*90*2+70)*4,-4,-0)", - 0, - "-10+math.sin(q.anim_time*90*2/3)*6" - ], - "position": [0, 0, 1] - }, - "arm_right3": { - "rotation": [ - 0, - "-10-math.sin(q.anim_time*90*2/3+90)*2", - "-15-math.clamp(math.sin(q.anim_time*90*2+90)*1.5,0,1)-math.clamp(math.sin(q.anim_time*90*2+90)*2.5,0,6)-math.clamp(math.sin(q.anim_time*90*2+90)*1.5,-1,0)-math.clamp(math.sin(q.anim_time*90*2+90)*2,-4,-0)" - ] - }, - "cannon_right0": { - "rotation": [-30, 0, 15] - }, - "arm_right2": { - "rotation": [ - 0, - "-10-math.sin(q.anim_time*90*2/3+90)*2", - "-15-math.clamp(math.sin(q.anim_time*90*2+90)*1.5,0,1)-math.clamp(math.sin(q.anim_time*90*2+90)*2.5,0,6)-math.clamp(math.sin(q.anim_time*90*2+90)*1.5,-1,0)-math.clamp(math.sin(q.anim_time*90*2+90)*2,-4,-0)" - ] + "arm_rotate_left": { + "rotation": [0, 12.5, 0] }, "arm_left": { - "rotation": [ - -90, - "30+math.clamp(math.sin(q.anim_time*90*2+90)*1.5,0,1)+math.clamp(math.sin(q.anim_time*90*2+90)*2.5,0,6)+math.clamp(math.sin(q.anim_time*90*2+90)*1.5,-1,0)+math.clamp(math.sin(q.anim_time*90*2+90)*2,-4,-0)", - "-15-math.sin(q.anim_time*90*2/3+90)*6" - ], - "position": [1, -2, 2.75] + "rotation": ["24.2403-2*math.sin(q.anim_time*90*1)", -16.32555, 22.4403], + "position": [-1, 0, -0.1] }, - "arm_left2": { - "rotation": [ - 0, - "10+math.sin(q.anim_time*90*2/3+90)*2", - "15+math.clamp(math.sin(q.anim_time*90*2+90)*1.5,0,1)+math.clamp(math.sin(q.anim_time*90*2+90)*2.5,0,6)+math.clamp(math.sin(q.anim_time*90*2+90)*1.5,-1,0)+math.clamp(math.sin(q.anim_time*90*2+90)*2,-4,-0)" - ] + "elbow_left": { + "rotation": ["4.6888-2*math.sin(q.anim_time*90*1-60)", -1.3027, -11.09368] }, - "arm_left3": { - "rotation": [ - 0, - "10+math.sin(q.anim_time*90*2/3+90)*2", - "15+math.clamp(math.sin(q.anim_time*90*2+90)*1.5,0,1)+math.clamp(math.sin(q.anim_time*90*2+90)*2.5,0,6)+math.clamp(math.sin(q.anim_time*90*2+90)*1.5,-1,0)+math.clamp(math.sin(q.anim_time*90*2+90)*2,-4,-0)" - ] + "hand_left": { + "rotation": [9.8511, 1.72794, "-9.8511+math.sin(q.anim_time*90*1-110)*2"] }, - "cannon_left0": { - "rotation": [-30, 0, -15] + "fingers_left": { + "rotation": [17.5, 0, 0] }, - "jaw": { - "rotation": ["5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0] + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": ["24.2403-2*math.sin(q.anim_time*90*1)", 16.32555, -22.4403], + "position": [1, 0, -0.1] + }, + "elbow_right": { + "rotation": ["4.6888-2*math.sin(q.anim_time*90*1-60)", 1.3027, 11.09368] + }, + "hand_right": { + "rotation": [9.8511, -1.72794, "9.8511-math.sin(q.anim_time*90*1-110)*2"] + }, + "fingers_right": { + "rotation": [17.5, 0, 0] }, "head_angle": { - "rotation": [5, 0, 0] + "rotation": ["-40+math.sin(q.anim_time*90*0.5+190)*2", 0, "math.cos(q.anim_time*90*0.5+130)*1"], + "position": [0, 1.0799, -1.18054] }, - "head_correction": { - "rotation": [90, 0, 0] + "jaw": { + "rotation": [0, 0, 0] + }, + "shell_cannon_right": { + "rotation": [-30, 0, 0] + }, + "leg_right": { + "rotation": ["-25.0161+math.sin(q.anim_time*90*0.5+70)*4", 23.49852, -6.10545], + "position": [0.01122, 0.86186, 0.50702] + }, + "knee_right": { + "rotation": ["17.5+math.sin(q.anim_time*90*0.5-20)*15", 0, 0] + }, + "shell_cannon_left": { + "rotation": [-30, 0, 0] + }, + "leg_left": { + "rotation": ["-25.072-math.sin(q.anim_time*90*0.5+70)*4", -23.96939, 6.29305], + "position": [-0.01122, 0.86186, 0.50702] + }, + "knee_left": { + "rotation": ["17.5-math.sin(q.anim_time*90*0.5-20)*15", 0, 0] + }, + "tail_bend": { + "rotation": [15, "1*math.sin(q.anim_time*90*1-60)", "1*math.sin(q.anim_time*90*1-190)"] + }, + "tail_end": { + "rotation": ["15+3*math.sin(q.anim_time*90*1-90)", 0, "6*math.sin(q.anim_time*90*1-250)"] + }, + "head": { + "rotation": [-1, 0, 0] + }, + "tail_base": { + "rotation": [0, "-1*(math.sin(q.anim_time*90*1-150)*1)", "1*(math.sin(q.anim_time*90*1-60)*1)"] + }, + "foot_right": { + "rotation": ["5-math.sin(q.anim_time*90*0.5-20)*5", 0, 0] + }, + "foot_left": { + "rotation": ["5+math.sin(q.anim_time*90*0.5-20)*5", 0, 0] + }, + "cannon_right": { + "position": [0, 0, 6.7], + "scale": [1, 1, 0.9] + }, + "cannon_left": { + "position": [0, 0, 6.7], + "scale": [1, 1, 0.9] } } }, "animation.blastoise.water_swim": { "loop": true, + "animation_length": 8, "bones": { - "body": { - "rotation": [90, "-math.sin(q.anim_time*90*8+90)*1.5", "math.sin(q.anim_time*90*8+90)*0.5"], - "position": [ - 0, - "-3+math.clamp(math.sin(q.anim_time*90*2)*0.2,0,1)+math.clamp(math.sin(q.anim_time*90*4)*0.3,-1,0)", - "-math.sin(q.anim_time*90*4+90)*0.2" - ] + "body2": { + "rotation": ["59.5-math.sin(q.anim_time*90*0.5+130)*2", "0-math.cos(q.anim_time*90*0.5+20)*3", "0-math.cos(q.anim_time*90*2+20)*2"], + "position": ["0-math.cos(q.anim_time*90*0.5+70)*2", "0.5+math.sin(q.anim_time*90*1+70)*0.2", "0+math.cos(q.anim_time*90*1+70)*0.9"] }, - "tail": { - "rotation": [-87.5, 0, "-math.sin(q.anim_time*90*8+20)*4"], - "position": [0, -1, 0] + "torso": { + "rotation": [17.5, 0, 0], + "position": [0, 0, 0] }, - "head": { - "rotation": [-180, 0, 0], - "position": [0, 3.75, -4.5] - }, - "arm_right": { - "rotation": [0, -10, "-40+(math.sin(q.anim_time*90*4+90)*1-1)*2"] - }, - "leg_right": { - "rotation": [0, 0, "(math.sin(q.anim_time*90*8+90)*1)*20+5"], - "position": [0, 0, 1] - }, - "leg_left": { - "rotation": [0, 0, "-(math.sin(q.anim_time*90*8+90)*1)*20-5"], - "position": [0, 0, 1] - }, - "arm_right3": { - "rotation": [0, -2.5, "-5+(math.sin(q.anim_time*90*4+150)*1-1)*2"] - }, - "cannon_right0": { - "rotation": [-30, 0, 15] - }, - "arm_right2": { - "rotation": [0, -2.5, "-10+(math.sin(q.anim_time*90*4+120)*1-1)*2"] + "arm_rotate_left": { + "rotation": [0, 12.5, 0] }, "arm_left": { - "rotation": [0, 10, "40-(math.sin(q.anim_time*90*4+90)*1-1)*2"] + "rotation": ["59.596-2*math.sin(q.anim_time*90*1)", -12.62175, -4.16744], + "position": [-1, 0, -0.1] }, - "arm_left2": { - "rotation": [0, 2.5, "10-(math.sin(q.anim_time*90*4+120)*1-1)*2"] + "elbow_left": { + "rotation": ["4.6888-2*math.sin(q.anim_time*90*1-60)", -1.3027, -31.09368] }, - "arm_left3": { - "rotation": [0, 2.5, "5-(math.sin(q.anim_time*90*4+150)*1-1)*2"] + "hand_left": { + "rotation": [9.8511, 1.72794, "-9.8511+math.sin(q.anim_time*90*1-110)*2"] }, - "cannon_left0": { - "rotation": [-30, 0, -15] + "fingers_left": { + "rotation": [17.5, 0, 0] + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": ["59.596-2*math.sin(q.anim_time*90*1)", 12.62175, 4.16744], + "position": [1, 0, -0.1] + }, + "elbow_right": { + "rotation": ["4.6888-2*math.sin(q.anim_time*90*1-60)", 1.3027, 31.09368] + }, + "hand_right": { + "rotation": [9.8511, -1.72794, "9.8511-math.sin(q.anim_time*90*1-110)*2"] + }, + "fingers_right": { + "rotation": [17.5, 0, 0] }, "head_angle": { - "rotation": [2.5, 0, 0] + "rotation": ["-67.5+math.sin(q.anim_time*90*0.5+150)*4", "math.sin(q.anim_time*90*2+70)*1", "0+math.cos(q.anim_time*90*0.5+130)*3"], + "position": [0, 6.28269, -2.62654] }, - "head_correction": { - "rotation": [90, 0, 0] + "jaw": { + "rotation": [0, 0, 0] + }, + "shell_cannon_right": { + "rotation": [0, 0, 0] + }, + "leg_right": { + "rotation": ["-2.572+math.sin(q.anim_time*90*2+70)*8", 23.96939, -6.29305], + "position": [0.01122, "-1.8509-math.sin(q.anim_time*90*2+120)*1", "2.2043+math.sin(q.anim_time*90*2+120)*1"] + }, + "knee_right": { + "rotation": ["17.5+math.sin(q.anim_time*90*2-20)*15", 0, 0] + }, + "shell_cannon_left": { + "rotation": [0, 0, 0] + }, + "leg_left": { + "rotation": ["-2.572-math.sin(q.anim_time*90*2+70)*8", -23.96939, 6.29305], + "position": [-0.01122, "-1.8509+math.sin(q.anim_time*90*2+120)*1", "2.2043-math.sin(q.anim_time*90*2+120)*1"] + }, + "knee_left": { + "rotation": ["17.5-math.sin(q.anim_time*90*2-20)*15", 0, 0] + }, + "tail_bend": { + "rotation": [15, "1*math.sin(q.anim_time*90*1-60)", "1*math.sin(q.anim_time*90*1-190)"] + }, + "tail_end": { + "rotation": ["15+3*math.sin(q.anim_time*90*1-90)", 0, "6*math.sin(q.anim_time*90*1-250)"] + }, + "head": { + "rotation": [-1, 0, 0] + }, + "tail_base": { + "rotation": [0, "-1*(math.sin(q.anim_time*90*1-150)*1)", "1*(math.sin(q.anim_time*90*1-60)*1)"] + }, + "foot_right": { + "rotation": ["5-math.sin(q.anim_time*90*2-20)*5", 0, 0] + }, + "foot_left": { + "rotation": ["5+math.sin(q.anim_time*90*2-20)*5", 0, 0] + }, + "cannon_right": { + "position": [0, 0, 7], + "scale": 0 + }, + "cannon_left": { + "position": [0, 0, 7], + "scale": 0 } } }, "animation.blastoise.sleep": { "loop": true, "bones": { - "body": { - "rotation": [87.5, 0, 0], - "position": [0, -9, 0] + "body2": { + "rotation": [60, 2.5, 0], + "position": [0, -9.7, -7] }, "torso": { - "rotation": [0, "math.clamp(math.sin(q.anim_time*90*0.5)*0.8,-0.7,0.7)", 0], - "position": [0, 0, -0.25] + "rotation": [25, "0.5*math.sin(q.anim_time*90*0.5)", 0] + }, + "arm_rotate_left": { + "rotation": [0, 12.5, 0] + }, + "arm_left": { + "rotation": ["-49.1406-1*math.sin(q.anim_time*90*0.5)", -14.71331, "-3.607+1*math.sin(q.anim_time*90*0.5)"], + "position": [0.40815, -6.25947, -2.73979] + }, + "elbow_left": { + "rotation": [2.6638, 4.06765, -15.09283] + }, + "hand_left": { + "rotation": [2.34709, -0.80658, -14.8172] + }, + "fingers_left": { + "rotation": [17.5, 0, 0] + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": ["-50.4786+1*math.sin(q.anim_time*90*0.5)", 21.12039, "1.5267+1*math.sin(q.anim_time*90*0.5)"], + "position": [1.23184, -5.50849, -2.13444] + }, + "elbow_right": { + "rotation": [1.12353, -4.6763, 35.14256] + }, + "hand_right": { + "rotation": [1.38485, 0.39951, 27.26338] + }, + "fingers_right": { + "rotation": [17.5, 0, 0] + }, + "head_angle": { + "rotation": [-66.83056, -10.21756, 9.19398], + "position": [0.08254, 4.32234, -1.66738] }, "jaw": { - "rotation": ["5+math.sin(q.anim_time*90*1)*3", 0, 0] + "rotation": [0, 0, 0] }, - "ear_right": { - "rotation": [-4.5, 14.5, -3.5] + "shell_cannon_right": { + "rotation": [-30, 0, 0] }, - "ear_left": { - "rotation": [5, 5, -18.5] + "leg_right": { + "rotation": [43.28793, 23.91544, 23.30462], + "position": [0, 1, 1.73205] }, - "eyelid_right": { - "position": [-0.1, 0, -0.1] + "knee_right": { + "rotation": [25, 0, 0] + }, + "shell_cannon_left": { + "rotation": [-30, 0, 0] + }, + "leg_left": { + "rotation": [43.28793, -23.91544, -23.30462], + "position": [0, 1, 1.73205] + }, + "knee_left": { + "rotation": [25, 0, 0] + }, + "tail_bend": { + "rotation": [7.5, 0, "0+6*math.sin(q.anim_time*90*0.5-190)"] + }, + "tail_end": { + "rotation": ["10+3*math.sin(q.anim_time*90*1-90)", 0, "6*math.sin(q.anim_time*90*0.5-250)"] + }, + "head": { + "rotation": ["-1+1*math.sin(q.anim_time*90*0.5-160)", 0, "-0.5*math.cos(q.anim_time*90*1)"] + }, + "tail_base": { + "rotation": [-50, "-2*(math.sin(q.anim_time*90*0.5-150)*1)", "4*(math.sin(q.anim_time*90*0.5-60)*1)"], + "position": [0.03926, 1.00031, 1.11707] + }, + "cannon_right": { + "position": [0, 0, 7.2] + }, + "cannon_left": { + "position": [0, 0, 7.2] }, "eyelid_left": { "position": [0.1, 0, -0.1] }, - "arm_right": { - "rotation": ["-45+math.clamp(math.sin(q.anim_time*90*0.5)*0.8,-0.7,0.7)", -30, "8.5+math.clamp(math.sin(q.anim_time*90*0.5)*0.8,-0.7,0.7)"], - "position": [0, -0.25, 1.5] - }, - "arm_right2": { - "rotation": [-10.75, -34.25, 23.25], - "position": [-0.75, 0.75, -0.5] - }, - "arm_right3": { - "rotation": [-6.75, -23.75, 31.5], - "position": [-0.75, 0.75, 0] - }, - "arm_left": { - "rotation": ["-45-math.clamp(math.sin(q.anim_time*90*0.5)*0.8,-0.7,0.7)", 27.5, "-4+math.clamp(math.sin(q.anim_time*90*0.5)*0.8,-0.7,0.7)"], - "position": [0, -0.75, 1.5] - }, - "arm_left2": { - "rotation": [-14, 24.75, -17.5], - "position": [0.25, 0, 0] - }, - "arm_left3": { - "rotation": [-6.75, 14, -29.25], - "position": [0.25, 0, 0] - }, - "tail": { - "rotation": [-130, 0, "4*(math.sin(q.anim_time*90*2)*1)+4*(math.sin(q.anim_time*90*2/1)*1)"] - }, - "leg_right": { - "rotation": [-49.5, 74.5, -54.5] - }, - "leg_left": { - "rotation": [-79.25, -77.5, 93.75] - }, - "head": { - "rotation": [13.25, -80.5, -32], - "position": [0, 0, 1] - } - } - }, - "animation.blastoise.faint": { - "loop": true, - "animation_length": 4.6, - "bones": { - "tail": { - "rotation": { - "0.0": [0, "4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", 0], - "0.05": [0, "35+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", 0], - "0.55": [0, "-17.5+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", 0], - "0.8": [-8.73213, "-32.1932+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", 4.68033], - "1.2": [-51.52075, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799], - "1.65": [-66.52075, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799], - "1.85": [-96.52075, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799], - "2.1": [25.97925, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799], - "2.35": [33.47925, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799], - "2.55": [-89.02075, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799], - "2.6": [-91.52075, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799], - "2.65": [-81.52075, "9.9+4*(math.sin(q.anim_time*90*3)*1)+4*(math.sin(q.anim_time*90*3/2)*1)", -14.52799] - } - }, - "arm_right": { - "rotation": { - "0.0": [0, -10, "-40+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "0.3": [-6.80797, 19.67847, "-2.7335+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "0.4": [-40.20157, 5.73848, -10.96102], - "0.8": [-23.77595, -50.02149, "-58.504+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.1": [-17.63999, -31.26352, "-67.7872+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.25": [-18.54292, -22.58661, "-65.0771+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.6": [-29.06815, 9.4844, "-30.1119+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.8": [8.72465, 53.80984, "8.9929+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.9": [-96.6407, -10.23427, "-19.2214+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.95": [-96.54233, -2.78371, "-20.0874+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "2.05": [-96.6407, -10.23427, "-19.2214+1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "2.35": [-97.85809, -19.52872, "-12.8043+1.5*(math.sin(q.anim_time*90*3)*1+1)"] - }, - "position": { - "0.0": [0, 0, 0], - "0.4": [0, -1, 2], - "0.8": [-1, -2, 1], - "1.6": [-1.09201, -0.49457, 1.25347], - "1.9": [-1.08597, -2.58061, 2.91194], - "2.05": [-1.08597, -2.58061, 2.91194], - "2.35": [-1.03412, -2.59378, 1.61127] - } - }, - "leg_right": { - "rotation": { - "0.0": [0, 0, 0], - "0.15": [0, -15, -17.5], - "0.7": [0, 0, 0], - "1.55": [7.5, 0, 12.5], - "1.75": [111.52885, -40.28276, -14.41054], - "1.95": [166.52885, -40.28276, -14.41054], - "2.2": [176.52885, -40.28276, -14.41054], - "2.5": [84.68978, -62.72122, -11.92392], - "2.55": [97.18978, -62.72122, -11.92392], - "2.6": [92.18978, -62.72122, -11.92392] - }, - "position": { - "0.0": [0, 0, 2], - "0.15": [-1, 0, 2], - "0.7": [0, 0, 2], - "1.55": [0, 0, 2], - "1.85": [1, 1, 1], - "2.5": [3, -2, 1] - } - }, - "leg_left": { - "rotation": { - "0.0": [0, 0, 0], - "0.1": [-19.10836, -8.08585, -38.78328], - "0.2": [22.70493, -10.43189, -46.13426], - "0.4": [40.84644, -26.41134, -53.95065], - "0.7": [-0.24846, -57.2492, 2.0111], - "1.55": [30.15494, -61.40413, -30.62752], - "1.75": [99.01921, -5.41811, -11.34034], - "1.95": [161.70412, -0.22325, 5.53499], - "2.2": [176.70412, -0.22325, 5.53499], - "2.5": [76.70412, -0.22325, 5.53499], - "2.55": [96.70412, -0.22325, 5.53499], - "2.6": [91.70412, -0.22325, 5.53499] - }, - "position": { - "0.0": [0, 0, 2], - "0.1": [-1, 4, 5], - "0.2": [-1, 4, 9], - "0.4": [-1, 2, 11], - "0.7": [0, 0, 11], - "1.55": [0, 0, 11], - "1.85": [2, 0, 10], - "2.5": [1, -2, 9] - } - }, - "arm_right3": { - "rotation": [0, -15, -15] - }, - "arm_right2": { - "rotation": [0, -15, -15] - }, - "arm_left": { - "rotation": { - "0.0": [0, 10, "40-1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "0.2": [1.25707, -17.66237, -10.09337], - "0.5": [-25.57021, -11.05464, "35.7767-1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.0": [-25.57, -11.05, "35.7767-1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.6": [-0.79964, -38.22961, "17.73-1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.8": [-11.89514, -47.10253, "32.7162-1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.9": [-106.13315, 8.98314, "14.8764-1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "1.95": [-106.00389, -5.43713, "19.0192-1.5*(math.sin(q.anim_time*90*3)*1+1)"], - "2.0": [-105.97354, 4.17788, "16.2678-1.5*(math.sin(q.anim_time*90*3)*1+1)"] - }, - "position": { - "0.0": [0, 0, 0], - "1.0": [0, 0, 1], - "1.6": [0, 0, 1], - "1.9": [1.21565, -3.45321, 3.14419] - } - }, - "arm_left2": { - "rotation": [0, 15, 15] - }, - "arm_left3": { - "rotation": [0, 15, 15] - }, - "torso": { - "rotation": { - "0.0": [20, 0, 0], - "0.1": [11.56936, -10.98772, -16.48612], - "0.2": [15.90184, -22.66067, -21.83974], - "0.4": [17.61698, -31.77335, -15.75768], - "0.7": [27.1397, -33.66053, -1.0576], - "1.0": [49.6397, -33.66053, -1.0576], - "1.5": [59.46162, -27.27558, -5.6279], - "1.6": [61.96162, -27.27558, -5.6279], - "1.8": [103.15614, -26.62832, 2.75618], - "2.0": [108.15614, -26.62832, 2.75618], - "2.35": [88.15614, -26.62832, 2.75618] - }, - "position": { - "0.0": [0, "-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", -2], - "0.1": [-3, "2-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", 0], - "0.2": [-3, "2-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", 2], - "0.4": [-2, "2-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", 3], - "0.7": [2, "1-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", 3], - "1.0": [2, "-1-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", 0], - "1.5": [4, "-2-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", -2], - "1.6": [4, "-2-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", -2], - "1.8": [6, "-8.4-0.15*(math.sin(q.anim_time*90*3-90)*1+1)", -5] - } - }, - "jaw": { - "rotation": { - "0.0": ["5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0], - "0.3": ["67.5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0], - "1.25": ["-5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0], - "1.5": ["-5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0], - "1.6": ["67.5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0], - "1.8": ["-5+math.sin(q.anim_time*90*1.5-60)*4", 0, 0] - } - }, - "body": { - "position": { - "0.0": [0, 0, 0], - "1.1": [0, 0, 0], - "1.15": [0, -0.3, 0], - "1.2": [0, -0.1, 0], - "1.25": [0, -0.3, 0], - "1.3": [0, -0.1, 0], - "1.35": [0, -0.5, 0], - "1.4": [0, 0, 0] - } - }, "eyelid_right": { - "position": { - "0.0": [0, 0, 0], - "0.05": [-0.1, 0, -0.1], - "0.65": [-0.1, 0, -0.1], - "0.7": [0, 0, 0], - "1.5": [0, 0, 0], - "1.55": [-0.1, 0, -0.1] - } + "position": [-0.1, 0, -0.1] }, - "eyelid_left": { - "position": { - "0.0": [0, 0, 0], - "0.05": [0.1, 0, -0.1], - "0.65": [0.1, 0, -0.1], - "0.7": [0, 0, 0], - "1.5": [0, 0, 0], - "1.55": [0.1, 0, -0.1] - } + "ear_left": { + "rotation": [-3.65084, 31.72363, 13.0549], + "position": [0, 0, -2.7] }, - "head": { - "rotation": { - "0.0": [-15, 0, 0], - "0.2": [-29.14743, -7.43547, -13.06431], - "0.4": [-30.98124, -9.84655, -17.49524], - "1.05": [-7.47755, 32.99281, 0.93746], - "1.55": [-7.47755, 32.99281, 0.93746], - "1.8": [-123.18063, 45.21212, -48.83023], - "1.85": [-77.98177, 84.44825, 3.013], - "1.9": [-158.33029, 75.15191, -78.05001], - "1.95": [-154.20201, 77.44202, -73.80173], - "2.35": [-32.26456, 79.79004, 49.08663] - }, - "position": { - "0.0": [0, 0, 0], - "0.7": [0, 0, 0], - "1.15": [-1, 0, -2.6], - "1.45": [0, 0, 0], - "1.8": [-4.03031, 5.80368, 0.27186], - "1.85": [-4.15926, 5.57414, 3.26029], - "2.35": [-3.94507, 4.65043, -0.15001] - } + "foot_right": { + "rotation": [17.5, 0, 0] + }, + "foot_left": { + "rotation": [17.5, 0, 0] } } }, @@ -571,7 +930,7 @@ } }, "animation.blastoise.cry": { - "animation_length": 1.5, + "animation_length": 3, "bones": { "head": { "rotation": { @@ -579,23 +938,39 @@ "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.125": { - "post": [-7.5, 0, 0], + "0.25": { + "post": [10, 0, 0], "lerp_mode": "catmullrom" }, - "0.2917": { - "post": [-5, 0, 0], + "0.5": { + "post": [1.85, 0, 0], "lerp_mode": "catmullrom" }, - "0.4583": { - "post": [-7.5, 0, 0], + "0.7083": { + "post": [-6.83, 0, 0], "lerp_mode": "catmullrom" }, - "0.9167": { - "post": [-5, 0, 0], + "1.0": { + "post": [0, 0, 0], "lerp_mode": "catmullrom" }, "1.25": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5833": { + "post": [-18, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.3333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.75": { "post": [0, 0, 0], "lerp_mode": "catmullrom" } @@ -603,88 +978,3616 @@ }, "jaw": { "rotation": { + "0.5833": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + } + } + }, + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": { + "pre": [2.5, 0, 0], + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [9, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [10.09, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [9, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 0, 0] + }, + "position": { + "0.625": [0, 0, 0], + "1.3333": [0, "-0.2*math.sin(q.anim_time*90*70)", 0], + "1.7083": [0, 0, 0] + } + }, + "head_angle": { + "rotation": { + "0.8333": [0, 0, 0], + "1.3333": ["-1*math.sin(q.anim_time*90*50)", 0, 0], + "1.7083": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0833": [0, 0, 0], + "0.125": [0.1, 0, -0.1], + "0.4583": [0.1, 0, -0.1], + "0.5": [0, 0, 0] + } + }, + "eyelid_right": { + "position": { + "0.0833": [0, 0, 0], + "0.125": [-0.1, 0, -0.1], + "0.4583": [-0.1, 0, -0.1], + "0.5": [0, 0, 0] + } + }, + "arm_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": { + "pre": [-5, 0, 0], + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [3.69, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [5.4, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 0, 0] + } + }, + "arm_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": { + "pre": [-5, 0, 0], + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [3.69, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [5.4, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 0, 0] + } + }, + "elbow_left": { + "rotation": { + "1.0417": [0, 0, 0], + "1.625": [10, 0, 0], + "2.7083": [0, 0, 0] + } + }, + "elbow_right": { + "rotation": { + "1.0417": [0, 0, 0], + "1.625": [10, 0, 0], + "2.7083": [0, 0, 0] + } + } + }, + "sound_effects": { + "0.5833": { + "effect": "pokemon.blastoise.cry" + } + } + }, + "animation.blastoise.faint": { + "animation_length": 3, + "bones": { + "body2": { + "rotation": { + "1.9167": [0, 0, 0], + "2.0": { + "pre": [-11.46531, -1.5431, -0.11591], + "post": [-11.46531, -1.5431, -0.11591], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-2.42, 1.4, 1.5], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [0, -1.4, 0], + "lerp_mode": "catmullrom" + }, + "2.7083": { + "post": [0, -1.9, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [0, -2, 0] + }, + "position": { + "0.0": [0, -1.5, 0], + "1.4167": [0, -1.5, 0], + "1.4583": [0, -2.5, 0], + "1.5": [0, -0.7, 0], + "1.5417": [0, -1.8, 0], + "1.5833": [0, -1.23, 0], + "1.6667": [0, -1.5, 0], + "1.9167": [0, -1.5, 0], + "2.0417": { + "pre": [0, 4.9, 0.4], + "post": [0, 4.9, 0.4], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [0, 1.8, 1.7], + "lerp_mode": "catmullrom" + }, + "2.375": [0, -1.41, 0.79], + "2.4167": { + "pre": [0, 0.37, 0.64], + "post": [0, 0.37, 0.64], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [0, 0.13, 0.32], + "lerp_mode": "catmullrom" + }, + "2.5": [0, -1.5, 0], + "2.5417": [0, -2.5, -0.4], + "2.5833": [0, -0.9, -0.7], + "2.625": [0, -1.8, -0.8], + "2.6667": [0, -1.5, -0.9], + "2.7083": [0, -1.6, -1], + "2.75": [0, -1.6, -1], + "2.8333": [0, -1.65, -1], + "2.9167": [0, -1.6, -1] + } + }, + "torso": { + "rotation": { + "0.0": [16.63397, 0.5, 0], + "0.4167": { + "pre": [21.55441, -2.4202, 2.32587], + "post": [21.55441, -2.4202, 2.32587], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-2.73411, 1.17849, -4.49648], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [14.13397, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [12.41432, -0.0381, 2.42853], + "lerp_mode": "catmullrom" + }, + "1.5": { + "post": [-11.41114, 0.97067, 2.29554], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [-6.94207, 0.47532, -0.1551], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [-3.53719, 1.47795, -0.17159], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [11.83955, -1.44655, -1.11633], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [10.06, 0.49, -0.17], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [12.95809, 0.48703, -0.11308], + "lerp_mode": "catmullrom" + }, + "2.375": { + "post": [42.55945, 0.44577, 0.22644], + "lerp_mode": "catmullrom" + }, + "2.5": [88.55936, 0.19593, 0.45999], + "2.5417": { + "pre": [80.78044, 0.06173, -2.63087], + "post": [80.78044, 0.06173, -2.63087], + "lerp_mode": "catmullrom" + }, + "2.5833": { + "post": [83, 0.19593, 1.35999], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [81.05936, 0.19593, 1.35999], + "lerp_mode": "catmullrom" + }, + "2.6667": [81.06, 0.2, 0.46] + }, + "position": { + "0.0": [0, 0, 0], + "0.4167": { + "pre": [0, -0.5, 0], + "post": [0, -0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [0, -0.17, -0.11], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [0, -1, 0], + "lerp_mode": "catmullrom" + }, + "1.0": { + "post": [0, 0.45, 0.73], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0.45, 2.73], + "lerp_mode": "catmullrom" + }, + "1.375": [0, -4.1, 6.3], + "1.9583": [0, -4.1, 6.3], + "2.2917": [0, -4.1, 0.97], + "2.5": [0, -4.1, -5.43] + } + }, + "arm_rotate_left": { + "rotation": [0, 12.5, 0] + }, + "arm_left": { + "rotation": { + "0.0": { + "post": [37.2403, -16.32555, 22.4403], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [47.74618, -14.54135, 5.98436], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [37.2403, -16.32555, 22.4403], + "lerp_mode": "catmullrom" + }, + "1.5833": { + "post": [8.74643, -29.32145, 51.03401], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [22.67413, -17.04682, 16.7486], + "lerp_mode": "catmullrom" + }, + "1.9583": [-5.26, -16.33, 22.44], + "2.0833": [-20.26, -16.33, 22.44] + }, + "position": { + "0.0": { + "post": [-1, 0, -0.1], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [-1, 0, -0.1], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-1, 0, -0.1], + "lerp_mode": "catmullrom" + }, + "1.6667": [-1, 0.67, -0.1], + "1.7917": [-1, -0.97, -0.1], + "1.875": [-1, 2.3, -0.1], + "1.9583": [-1, 0, -0.1], + "2.0833": [-1, -13, -4.2] + }, + "scale": { + "1.9583": [1, 1, 1], + "2.0": [0.7015, 1.2015, 0.7015], + "2.1667": [0, 0, 0] + } + }, + "elbow_left": { + "rotation": { + "0.0": [19.42085, -1.3027, -11.09368], + "0.5417": { + "pre": [18.98367, 3.85132, -25.83005], + "post": [18.98367, 3.85132, -25.83005], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [19.29164, -3.74053, -4.35182], + "lerp_mode": "catmullrom" + }, + "1.9583": [6.98866, -0.86138, -3.26893] + } + }, + "hand_left": { + "rotation": { + "0.0": [9.8511, 1.72794, -11.73049], + "0.875": { + "pre": [19.06158, 5.90639, -23.54037], + "post": [19.06158, 5.90639, -23.54037], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [19.49218, -4.20402, 4.74472], + "lerp_mode": "catmullrom" + }, + "2.0": [-2.57688, 0.02615, -7.02828] + } + }, + "fingers_left": { + "rotation": [17.5, 0, 0] + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": { + "0.0": { + "post": [37.2403, 16.32555, -22.4403], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [47.74618, 14.54135, -5.98436], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [37.2403, 16.32555, -22.4403], + "lerp_mode": "catmullrom" + }, + "1.5833": { + "post": [8.74643, 29.32145, -51.03401], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [22.67413, 17.04682, -16.7486], + "lerp_mode": "catmullrom" + }, + "1.9583": [-5.26, 16.33, -22.44], + "2.0833": [-20.26, 16.33, -22.44] + }, + "position": { + "0.0": { + "post": [1, 0, -0.1], + "lerp_mode": "catmullrom" + }, + "0.6667": { + "post": [1, 0, -0.1], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [1, 0, -0.1], + "lerp_mode": "catmullrom" + }, + "1.6667": [1, 0.67, -0.1], + "1.7917": [1, -0.97, -0.1], + "1.875": [1, 2.3, -0.1], + "1.9583": [1, 0, -0.1], + "2.0833": [1, -13, -0.1] + }, + "scale": { + "1.9583": [1, 1, 1], + "2.0": [0.7015, 1.2015, 0.7015], + "2.1667": [0, 0, 0] + } + }, + "elbow_right": { + "rotation": { + "0.0": [19.42085, 1.3027, 11.09368], + "0.5417": { + "pre": [18.98367, -3.85132, 25.83005], + "post": [18.98367, -3.85132, 25.83005], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [19.29164, 3.74053, 4.35182], + "lerp_mode": "catmullrom" + }, + "1.9583": [6.98866, 0.86138, 3.26893] + } + }, + "hand_right": { + "rotation": { + "0.0": [9.8511, -1.72794, 11.73049], + "0.875": { + "pre": [19.06158, -5.90639, 23.54037], + "post": [19.06158, -5.90639, 23.54037], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [19.49218, 4.20402, -4.74472], + "lerp_mode": "catmullrom" + }, + "2.0": [-2.57688, -0.02615, 7.02828] + } + }, + "fingers_right": { + "rotation": [17.5, 0, 0] + }, + "head_angle": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.1667": { + "pre": [9.71634, 5.87314, -4.8866], + "post": [9.71634, 5.87314, -4.8866], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [12.89385, -3.8515, -5.1794], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [25.94375, -3.25825, 5.31637], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [26.99591, -0.18881, 2.63983], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [10.76, 0.02, 0.2], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [30.07189, -0.03908, 0.36384], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [16.31, 0.01, 0.23], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [35.97787, 0.03947, 0.15015], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [-2.25645, -0.00829, 0.09842], + "lerp_mode": "catmullrom" + }, + "2.0417": [-82.25292, -0.48823, -0.27341] + }, + "position": { + "1.9583": [0, 0, 0], + "2.0833": [0, -11.7, 6.2] + }, + "scale": { + "1.9583": [1, 1, 1], + "2.0417": [0, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [0, 0, 0], + "0.3333": [29.18, 0, 0], + "1.0833": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [25, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5833": { + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9583": [-5, 0, 0] + } + }, + "shell_cannon_right": { + "rotation": { + "0.0": [-30, 0, 0], + "1.7083": [-30, 0, 0], + "1.7917": [-35, 0, 0], + "1.9167": [0, 0, 0] + } + }, + "leg_right": { + "rotation": { + "0.0": [-15.26795, 27.5, 0], + "0.4583": [-20.90099, 27.38656, -2.59775], + "0.8333": [-20.90099, 27.38656, -2.59775], + "1.1667": [-20.9, 27.39, -2.6], + "1.4167": [-112.75416, 19.03407, -66.90134], + "1.9583": [-92.84141, 7.98081, -66.45893], + "2.0833": [-172.61607, 29.39398, -93.58145] + }, + "position": { + "0.0": [0.0067, -0.02947, 0.01474], + "0.4583": [0.01, -0.73, 0.01], + "0.8333": [0.01, -0.73, 0.01], + "1.1667": [0.01, 0.77, 2.81], + "1.4167": [0.01, -5.53, 7.91], + "1.9583": [0.01, -5.53, 7.91], + "2.0833": [10.31, -5.53, 12.91] + }, + "scale": { + "1.9583": [1, 1, 1], + "2.0": [0.5149, 2.0149, 0.5149], + "2.0833": [0, 0, 0] + } + }, + "knee_right": { + "rotation": { + "0.0": [15.26795, 0, 0], + "0.4583": { + "pre": [21.89096, -1.1031, 3.28088], + "post": [21.89096, -1.1031, 3.28088], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [21.89096, -1.1031, 3.28088], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [8.59219, 0.71569, -3.38645], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [15.81, 0.72, -3.39], + "lerp_mode": "catmullrom" + }, + "1.9167": [-1.72297, 3.50385, 5.20369] + } + }, + "shell_cannon_left": { + "rotation": { + "0.0": [-30, 0, 0], + "1.7083": [-30, 0, 0], + "1.7917": [-35, 0, 0], + "1.9167": [0, 0, 0] + } + }, + "leg_left": { + "rotation": { + "0.0": [-15.26795, -27.5, 0], + "0.4583": [-20.90099, -27.38656, 2.59775], + "0.8333": [-20.90099, -27.38656, 2.59775], + "1.1667": [-20.9, -27.39, 2.6], + "1.4167": [-112.75416, -19.03407, 66.90134], + "1.9583": [-92.84141, -7.98081, 66.45893], + "2.0833": [-172.61607, -29.39398, 93.58145] + }, + "position": { + "0.0": [-0.0067, -0.02947, 0.01474], + "0.4583": [-0.01, -0.73, 0.01], + "0.8333": [-0.01, -0.73, 0.01], + "1.1667": [-0.01, 0.77, 2.81], + "1.4167": [-0.01, -5.53, 7.91], + "1.9583": [-0.01, -5.53, 7.91], + "2.0833": [-10.31, -5.53, 12.91] + }, + "scale": { + "1.9583": [1, 1, 1], + "2.0": [0.5149, 2.0149, 0.5149], + "2.0833": [0, 0, 0] + } + }, + "knee_left": { + "rotation": { + "0.0": [15.26795, 0, 0], + "0.4583": { + "pre": [21.89096, 1.1031, -3.28088], + "post": [21.89096, 1.1031, -3.28088], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [21.89096, 1.1031, -3.28088], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [8.59219, -0.71569, 3.38645], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [15.81, -0.72, 3.39], + "lerp_mode": "catmullrom" + }, + "1.9167": [-1.72297, -3.50385, -5.20369] + } + }, + "tail_bend": { + "rotation": [15, -1.73205, 0.3473] + }, + "tail_end": { + "rotation": [12, 0, 5.63816] + }, + "head": { + "rotation": [-1.68404, 0, 0] + }, + "tail_base": { + "rotation": { + "0.0": [0, 1, -3.4641], + "0.6667": [0, 1, -3.46], + "0.8333": [-35, 1, -3.46] + }, + "position": { + "0.6667": [0, 0, 0], + "0.8333": [0, 8.3, 0] + }, + "scale": { + "0.6667": [1, 1, 1], + "0.8333": [0, 0, 0] + } + }, + "cannon_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": { + "pre": [0, 9, 0], + "post": [0, 9, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [2, -6, -8], + "lerp_mode": "catmullrom" + }, + "1.5417": [2, 3, -8] + }, + "position": { + "0.0": [0, 0, 3], + "1.5417": [0, 0, 3], + "1.625": [0, 0, 1], + "1.7083": [0, 0, 2.9] + }, + "scale": { + "1.7083": [1, 1, 1], + "1.7917": [0, 0, 0] + } + }, + "cannon_left": { + "rotation": { + "0.125": [0, 0, 0], + "0.75": { + "pre": [0, -8, 0], + "post": [0, -8, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 5, 0], + "lerp_mode": "catmullrom" + }, + "1.5833": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 3], + "1.5417": [0, 0, 3], + "1.625": [0, 0, 1], + "1.7083": [0, 0, 2.9] + }, + "scale": { + "1.7083": [1, 1, 1], + "1.7917": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "0.5833": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "0.625": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "1.4583": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "1.5": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.7917": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.8333": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]} + } + }, + "eyelid_right": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "0.5833": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "0.625": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.0": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "1.4583": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "1.5": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.7917": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.8333": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]} + } + } + } + }, + "animation.blastoise.quirk_ground_idle": { + "animation_length": 3, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.3333": { + "pre": [-0.5, 3.5, 1.5], + "post": [-0.5, 3.5, 1.5], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [3.64, -0.08, -0.5], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [1.5, -1, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0.92, -0.81, 0.07], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [-1.49, -2.47, -1.95], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 0, 0] + } + }, + "arm_left": { + "rotation": { + "0.0": [0, 0, 0], + "1.625": { + "pre": [0, 0, 7.5], + "post": [0, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 0, -17.5], + "lerp_mode": "catmullrom" + }, + "3.0": [0, 0, 0] + }, + "position": { + "1.5417": [0, 0, 0], + "1.8333": { + "pre": [0, 0, 1], + "post": [0, 0, 1], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [-0.8, 0, 1], + "lerp_mode": "catmullrom" + }, + "2.75": [0, 0, 0] + } + }, + "elbow_left": { + "rotation": { + "0.0": [0, 0, 0], + "1.375": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.375": { + "post": [-5, 0, 7.5], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 0, 0] + } + }, + "hand_left": { + "rotation": { + "0.0": [0, 0, 0], + "1.0": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [-12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5417": [0, 0, 0] + } + }, + "arm_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.5": { + "pre": [10, 0, -2], + "post": [10, 0, -2], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-8.63, 0, -0.87], + "lerp_mode": "catmullrom" + }, + "2.0": [0, 0, 0] + } + }, + "elbow_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.2917": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [-5, -5, -10], + "lerp_mode": "catmullrom" + }, + "1.7917": [0, 0, 0] + } + }, + "hand_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.5417": { + "pre": [5, 0, 0], + "post": [5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5": [0, 0, 0] + } + }, + "shell_cannon_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": [2, 0, 0], + "0.5833": [-2, 0, 0], + "0.7917": [-2, 0, 0], + "0.9583": [2, 0, 0], + "1.1667": [0, 0, 0] + } + }, + "cannon_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.2917": { + "pre": [0, 3, 0], + "post": [0, 3, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [0, -0.12, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, -2, 0], + "lerp_mode": "catmullrom" + }, + "2.125": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.25": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5417": { + "post": [0, 0, 2.4], + "lerp_mode": "catmullrom" + }, + "1.375": [0, 0, 0] + } + }, + "shell_cannon_left": { + "rotation": { + "1.875": [0, 0, 0], + "2.25": [-2, 0, 0], + "2.4167": [1, 0, 0], + "2.5833": [0, 0, 0] + } + }, + "cannon_left": { + "rotation": [0, 0, 0], + "position": { + "0.0": [0, 0, 0], + "1.6667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [0, 0, 3.2], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [0, 0, -0.8], + "lerp_mode": "catmullrom" + }, + "2.375": [0, 0, 0] + } + }, + "head_angle": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.2917": { + "post": [0, 0, 0.5], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [0, 0, -4], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [0, 0, 2], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 2, -1.5], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [0, 2, 2], + "lerp_mode": "catmullrom" + }, + "2.5417": { + "post": [0, 0, -2], + "lerp_mode": "catmullrom" + }, + "3.0": [0, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [0, 0, 0], + "0.4167": [10, 0, 0], + "0.7083": [0, 0, 0], + "1.7917": [0, 0, 0], + "2.0": [10, 0, 0], + "2.2917": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "0.25": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "0.2917": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.375": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.4167": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "1.625": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "1.6667": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]} + } + }, + "eyelid_right": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "0.25": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "0.2917": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.375": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.4167": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "1.625": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "1.6667": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]} + } + } + } + }, + "animation.blastoise.quirk_battle_idle": { + "animation_length": 3, + "bones": { + "shell_cannon_left": { + "rotation": { + "0.2917": [0, 0, 0], + "0.5417": [2, 0, 0], + "0.8333": [-2, 0, 0], + "1.2917": [-2, 0, 0], + "1.9583": [0, 0, 0] + } + }, + "cannon_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": { + "pre": [0, 2, 0], + "post": [0, 2, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, -1.57, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, -16.87, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, -17.02, 6], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, -15, 0], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0417": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.5417": [0, 0, -0.7], + "0.6667": [0, 0, 0], + "0.7917": [0, 0, 0], + "0.9167": [0, 0, -2], + "1.125": [0, 0, -2], + "1.4583": [0, 0, 0] + } + }, + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": { + "pre": [0, 0, 1], + "post": [0, 0, 1], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, 0, -2], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, 0, -2], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0, 0, 1], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 0, 0] + } + }, + "arm_left": { + "rotation": { + "0.0": [0, 0, 0], + "1.1667": { + "pre": [22.5, 0, 0], + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.7917": [0, 0, 0] + } + }, + "elbow_left": { + "rotation": { + "0.0": [0, 0, 0], + "1.1667": { + "pre": [0, 0, -10], + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 0, -10], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [0, 0, -1.2], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 0, 0] + } + }, + "fingers_left": { + "rotation": { + "0.0": [0, 0, 0], + "0.625": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [0, 0, -17.5], + "lerp_mode": "catmullrom" + }, + "2.1667": [0, 0, 0] + } + }, + "head_angle": { + "rotation": { + "0.0": [0, 0, 0], + "0.4167": { + "pre": [-5, 0, 0], + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-1.29, -0.87, -3.38], + "lerp_mode": "catmullrom" + }, + "3.0": [0, 0, 0] + } + } + } + }, + "animation.blastoise.quirk_battle_idle2": { + "animation_length": 3, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.375": { + "pre": [0, 0, -1], + "post": [0, 0, -1], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, 0, 2], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, 0, 2], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0, 0, -1], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 0, 0] + } + }, + "arm_right": { + "rotation": { + "0.0": [0, 0, 0], + "1.1667": { + "pre": [22.5, 0, 0], + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.7917": [0, 0, 0] + } + }, + "elbow_right": { + "rotation": { + "0.0": [0, 0, 0], + "1.1667": { + "pre": [0, 0, 10], + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [0, 0, 10], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [0, 0, 1.2], + "lerp_mode": "catmullrom" + }, + "2.9167": [0, 0, 0] + } + }, + "hand_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.625": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 15], + "lerp_mode": "catmullrom" + }, + "1.9167": [0, 0, 0] + } + }, + "shell_cannon_right": { + "rotation": { + "0.2917": [0, 0, 0], + "0.5417": [2, 0, 0], + "0.8333": [-2, 0, 0], + "1.2917": [-2, 0, 0], + "1.9583": [0, 0, 0] + } + }, + "cannon_right": { + "rotation": { + "0.0": [0, 0, 0], + "0.1667": { + "pre": [0, -2, 0], + "post": [0, -2, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, 1.57, 0], + "lerp_mode": "catmullrom" + }, + "0.75": { + "post": [0, 15, 0], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [0, 16.87, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [0, 17.02, -6], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, 15, 0], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0417": [0, 0, 0] + }, + "position": { + "0.0": [0, 0, 0], + "0.5417": [0, 0, -0.7], + "0.6667": [0, 0, 0], + "0.7917": [0, 0, 0], + "0.9167": [0, 0, -2], + "1.125": [0, 0, -2], + "1.4583": [0, 0, 0] + } + }, + "head_angle": { + "rotation": { + "0.0": [0, 0, 0], + "0.4167": { + "pre": [-5, 0, 0], + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-1.29, 0.87, 3.38], + "lerp_mode": "catmullrom" + }, + "3.0": [0, 0, 0] + } + } + } + }, + "animation.blastoise.physical": { + "animation_length": 3, + "bones": { + "body2": { + "position": [0, -1.5, 0] + }, + "torso": { + "rotation": { + "0.0": [25.13397, 0.5, 0], + "0.375": { + "pre": [29.13, 0.5, 0], + "post": [29.13, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [12.13, 7.5, 9], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [12.13, 7.5, 9], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [36.13, -15.5, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [36.13, -15.5, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [33.41318, -3.70293, 3.40858], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [25.55003, 0.86667, -1.55775], + "lerp_mode": "catmullrom" + }, + "3.0": [25.13397, 0.5, 0] + }, + "position": { + "0.0": [0, 0, 0.025], + "0.2083": { + "pre": [0, -1.1, 0.02], + "post": [0, -1.1, 0.02], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [0, -1.1, 0.02], + "lerp_mode": "catmullrom" + }, + "0.875": { + "post": [0, 2.5, 0.02], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0, 2.5, 0.02], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0.8, -6.58], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [0, 0.8, -6.58], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [0, 0.94, -2.76], + "lerp_mode": "catmullrom" + }, + "2.375": { + "post": [0, 0, 0.025], + "lerp_mode": "catmullrom" + }, + "2.875": [0, 0, 0.025] + } + }, + "arm_rotate_left": { + "rotation": [0, 12.5, 0] + }, + "arm_left": { + "rotation": { + "0.0": [16.0158, -7.28336, 4.19087], + "0.375": { + "pre": [38.5158, -7.28336, -13.30913], + "post": [38.5158, -7.28336, -13.30913], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [48.52, -19.78, -10.81], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [24.01972, -13.69426, -3.88167], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [54.04893, -11.07335, -11.5145], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [47.30612, -16.42735, -6.90658], + "lerp_mode": "catmullrom" + }, + "2.375": { + "post": [13.80259, -7.20135, 4.28932], + "lerp_mode": "catmullrom" + }, + "2.9583": [16.0158, -7.28336, 4.19087] + }, + "position": { + "0.0": [-0.5, 0, 0], + "0.375": { + "pre": [-0.5, 0, 0], + "post": [-0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-1.4, 0, -0.5], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-1.4, 0, -0.5], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [-1.4, 0, -0.5], + "lerp_mode": "catmullrom" + }, + "2.7917": [-0.5, 0, 0] + } + }, + "elbow_left": { + "rotation": { + "0.0": [2.5, 0, 0], + "1.0833": { + "pre": [2.5, 0, 0], + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [33.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [33.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.7917": [2.5, 0, 0] + } + }, + "hand_left": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.75": { + "pre": [15.5, 0, 0], + "post": [15.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [9.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [30.23, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [4.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.875": [7.5, 0, 0] + } + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": { + "0.0": [16.0158, 7.28336, -4.19087], + "0.625": { + "pre": [36.02, 7.28, -4.19], + "post": [36.02, 7.28, -4.19], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-11.48, -0.72, -4.19], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [51.02, -9.72, 12.81], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [51.02, -9.72, 12.81], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [16.0158, 7.28336, -4.19087], + "lerp_mode": "catmullrom" + }, + "2.875": [16.0158, 7.28336, -4.19087] + }, + "position": { + "0.0": [0.5, 0, 0], + "0.625": { + "pre": [0.5, 0, 0], + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0.5, 0.4, 0.8], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0.5, 0.6, -2.1], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [0.5, 0.6, -2.1], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [0.9, 0.6, -0.2], + "lerp_mode": "catmullrom" + }, + "2.875": [0.5, 0, 0] + }, + "scale": { + "1.1667": [1, 1, 1], + "1.2083": [1, 1.7, 1], + "1.25": [1, 1, 1] + } + }, + "elbow_right": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.625": { + "pre": [24.98, 0, 0], + "post": [24.98, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.0417": { + "post": [-2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [39.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [39.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.375": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [2.5, 0, 0] + } + }, + "hand_right": { + "rotation": { + "0.0": [7.5, 0, 0], + "1.125": { + "pre": [-9.5, 0, 0], + "post": [-9.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [26.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.3333": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9167": [7.5, 0, 0] + } + }, + "head_angle": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.625": { + "pre": [12.5, 0, 0], + "post": [12.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-5, -5.5, -4], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-22.5, 16, -10], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-9.45, 17.91, -4.85], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-8.9, 20, -0.5], + "lerp_mode": "catmullrom" + }, + "2.0417": { + "post": [-15.48, 7.76, -2.12], + "lerp_mode": "catmullrom" + }, + "2.375": { + "post": [-12.48341, 0.64904, 0.12901], + "lerp_mode": "catmullrom" + }, + "2.75": { + "post": [-12.51664, -0.34031, -0.09283], + "lerp_mode": "catmullrom" + }, + "3.0": [-12.5, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [17.5, 0, 0], + "0.3333": { + "pre": [0.5, 0, 0], + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [50.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [17.1394, -0.11856, 0.03311], + "lerp_mode": "catmullrom" + }, + "3.0": [17.5, 0, 0] + } + }, + "shell_cannon_right": { + "rotation": { + "0.0": [-30, 0, 0], + "0.2917": { + "pre": [-27, 0, 0], + "post": [-27, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-28, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.875": [-30, 0, 0] + } + }, + "leg_right": { + "rotation": { + "0.0": [-15.26795, 37.5, 0], + "0.4167": [-15.27, 34.5, 0], + "0.6667": { + "pre": [-7.77, 37.5, 0], + "post": [-7.77, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-58.77, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.25": [-15.27, 19.5, 0], + "1.8333": [-15.27, 19.5, 0], + "2.0": { + "pre": [-20.26932, 25.5, 0], + "post": [-20.26932, 25.5, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [-20.26932, 31.2, 0], + "lerp_mode": "catmullrom" + }, + "2.375": [-15.26795, 37.5, 0] + }, + "position": { + "0.0": [0.0067, -0.02947, 0.01474], + "0.4167": [0.01, -0.03, 0.01], + "1.0": { + "pre": [0.01, 4.97, 3.01], + "post": [0.01, 4.97, 3.01], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0.01, 4.97, 3.01], + "lerp_mode": "catmullrom" + }, + "1.25": [0.01, -0.03, -5.99], + "1.8333": [0.01, -0.03, -5.99], + "2.0417": { + "pre": [0.01, 2.57, -2.65], + "post": [0.01, 2.57, -2.65], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [0.01, 1.4, -0.63], + "lerp_mode": "catmullrom" + }, + "2.375": [0.0067, -0.02947, 0.01474] + } + }, + "knee_right": { + "rotation": { + "0.0": [15.26795, 0, 0], + "0.3333": [15.27, 0, 0], + "1.0833": [45.27, 0, 0], + "1.25": [15.27, 0, 0], + "1.8333": [15.27, 0, 0], + "1.9167": { + "pre": [9.27, 0, 0], + "post": [9.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [23.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.375": [15.27, 0, 0] + } + }, + "shell_cannon_left": { + "rotation": { + "0.0": [-30, 0, 0], + "0.2917": { + "pre": [-27, 0, 0], + "post": [-27, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-28, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.875": [-30, 0, 0] + } + }, + "leg_left": { + "rotation": { + "0.0": [-15.26795, -37.5, 0], + "0.2917": [-15.27, -37.5, 0], + "0.9583": { + "pre": [-7.27, -37.5, 0], + "post": [-7.27, -37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-7.27, -37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-8.22446, -45.42749, 1.43797], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [-8.22446, -45.42749, 1.43797], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-15.26795, -37.5, 0], + "lerp_mode": "catmullrom" + }, + "2.5": [-15.26795, -37.5, 0] + }, + "position": { + "0.0": [-0.0067, -0.02947, 0.01474], + "0.2917": [-0.01, -0.03, 0.01], + "0.9583": { + "pre": [0.29, 0.87, -0.39], + "post": [0.29, 0.87, -0.39], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [0.29, 0.87, -0.39], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0.29, 0.87, -0.99], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [0.29, 0.87, -0.99], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-0.0067, -0.02947, 0.01474], + "lerp_mode": "catmullrom" + }, + "2.5": [-0.0067, -0.02947, 0.01474] + } + }, + "knee_left": { + "rotation": { + "0.0": [15.26795, 0, 0], + "0.2917": [15.27, 0, 0], + "0.9583": { + "pre": [8.27, 0, 0], + "post": [8.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [8.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [8.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [8.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [15.26795, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5": [15.26795, 0, 0] + } + }, + "tail_bend": { + "rotation": { + "0.0": [15, -1.73205, 0.3473], + "0.7083": { + "pre": [14.33702, -4.78125, 11.97366], + "post": [14.33702, -4.78125, 11.97366], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [14.86332, 2.67853, -16.07521], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [14.57657, -4.09819, 9.23901], + "lerp_mode": "catmullrom" + }, + "2.9167": [15, -1.73205, 0.3473] + } + }, + "tail_end": { + "rotation": [12, 0, 5.63816] + }, + "head": { + "rotation": [-9.18404, 0, 0] + }, + "tail_base": { + "rotation": { + "0.0": [0, 1, -3.4641], + "0.5": { + "pre": [0.16394, 4.82663, -0.24112], + "post": [0.16394, 4.82663, -0.24112], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [-0.38332, 6.12671, -9.61949], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-24.88771, 11.16786, -6.32718], + "lerp_mode": "catmullrom" + }, + "2.7083": [0, 1, -3.4641] + } + }, + "cannon_left": { + "rotation": { + "0.0": [-0.7503, 17.01572, 0.30669], + "0.2083": { + "pre": [-0.7503, 17.01572, 0.30669], + "post": [-0.7503, 17.01572, 0.30669], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-0.75, -0.48, 0.31], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-0.68777, -0.5654, -6.49327], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [2.25294, -1.28894, -5.09347], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [2.25294, -1.28894, -5.09347], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-0.80654, -0.00004, -9.51776], + "lerp_mode": "catmullrom" + }, + "2.5417": { + "post": [-0.7503, 18.01572, 0.30669], + "lerp_mode": "catmullrom" + }, + "2.9167": [-0.7503, 17.01572, 0.30669] + }, + "position": { "0.0": { "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.125": { - "post": [27.5, 0, 0], + "0.2083": { + "post": [0, 0, 0], "lerp_mode": "catmullrom" }, + "0.5": [0, 0, 0], + "0.8333": { + "pre": [0, 0, 3.9], + "post": [0, 0, 3.9], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [0, 0, 3.9], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [0, 0, 6.3], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [0, 0, 3.9], + "lerp_mode": "catmullrom" + }, + "2.2917": [0, 0, 0] + } + }, + "right_toe_out": { + "rotation": { + "0.0": [0, 12.5, 0], "0.2917": { - "post": [12.5, 0, 0], + "pre": [0, 0, 0], + "post": [0, 0, 0], "lerp_mode": "catmullrom" }, - "0.4583": { - "post": [22.5, 0, 0], + "0.5833": { + "post": [-17.5, 0, 0], "lerp_mode": "catmullrom" }, - "0.9167": { - "post": [15, 0, 0], + "0.8333": { + "post": [0.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-11.5, 0, 0], "lerp_mode": "catmullrom" }, "1.25": { "post": [0, 0, 0], "lerp_mode": "catmullrom" - } + }, + "1.7083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": [0, 12.5, 0] + } + }, + "right_toe_in": { + "rotation": { + "0.0": [0, -12.5, 0], + "0.2917": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-11.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": [0, -12.5, 0] + } + }, + "left_toe_out": { + "rotation": [0, -12.5, 0] + }, + "left_toe_in": { + "rotation": [0, 12.5, 0] + }, + "cannon_right": { + "rotation": { + "0.0": [-0.7503, -17.01572, -0.30669], + "0.2083": { + "pre": [-0.7503, -17.01572, -0.30669], + "post": [-0.7503, -17.01572, -0.30669], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [-0.75, 0.48, -0.31], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [-0.68777, 0.5654, 6.49327], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [2.25294, 1.28894, 5.09347], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [2.25294, 1.28894, 5.09347], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-0.80654, 0.00004, 9.51776], + "lerp_mode": "catmullrom" + }, + "2.5417": { + "post": [-0.7503, -18.01572, -0.30669], + "lerp_mode": "catmullrom" + }, + "2.9167": [-0.7503, -17.01572, -0.30669] + }, + "position": { + "0.0": [0, 0, 0], + "0.2083": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0, 0, 3.9], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [0, 0, 3.9], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [0, 0, 6.3], + "lerp_mode": "catmullrom" + }, + "2.0": { + "post": [0, 0, 3.9], + "lerp_mode": "catmullrom" + }, + "2.2917": [0, 0, 0] + } + }, + "body": { + "position": { + "1.25": [0, 0, 0], + "1.2917": [0, -1.2, 0], + "1.3333": [0, 0.1, 0], + "1.375": [0, -0.8, 0], + "1.4167": [0, 0.1, 0], + "1.4583": [0, -0.4, 0], + "1.5417": [0, 0, 0], + "1.625": [0, -0.2, 0], + "1.7083": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0833": [0, 0, 0], + "0.125": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "0.7083": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "0.75": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}, + "2.0833": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "2.125": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "2.2917": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "2.3333": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]} + } + }, + "eyelid_right": { + "position": { + "0.0833": [0, 0, 0], + "0.125": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "0.7083": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "0.75": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}, + "2.0833": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "2.125": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "2.2917": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "2.3333": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]} + } + }, + "foot_right": { + "rotation": { + "0.4167": [0, 0, 0], + "0.625": [10, 0, 0], + "1.25": [0, 0, 0], + "1.7917": [0, 0, 0], + "1.9167": [10, 0, 0], + "2.4583": [0, 0, 0] + } + }, + "right_toe_front": { + "rotation": { + "0.0": [0, 0, 0], + "0.2917": { + "pre": [0, 0, 0], + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [-17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [0.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [-11.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [0, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.25": [0, 0, 0] } - } - }, - "sound_effects": { - "0.0": { - "effect": "pokemon.blastoise.cry" } } }, - "animation.blastoise.render": { - "loop": true, + "animation.blastoise.special": { + "animation_length": 3, "bones": { - "blastoise": { - "rotation": [0, -160, 0] - }, - "body": { - "rotation": [0, 22.5, 0] + "body2": { + "position": [0, -1.5, 0] }, "torso": { + "rotation": { + "0.0": [25.13397, 0.5, 0], + "0.25": { + "pre": [24.13397, 0.5, 0], + "post": [24.13397, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.5833": { + "post": [34.13, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [35.88, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [35.13, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [10.11302, -0.11496, -3.94709], + "lerp_mode": "catmullrom" + }, + "1.5833": { + "post": [9.19329, -4.79924, -0.17155], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [23.77733, -5.13557, -3.53955], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [29.5107, -1.63915, -6.78008], + "lerp_mode": "catmullrom" + }, + "2.5417": { + "post": [23.63397, 0.9, 2], + "lerp_mode": "catmullrom" + }, + "3.0": [25.13397, 0.5, 0] + }, + "position": { + "0.0": [0, 0, 0.025], + "0.5417": [0, 0.1, 0.02], + "1.2917": [0, -0.7, 0.02], + "1.3333": { + "pre": [0, -0.01, -0.62], + "post": [0, -0.01, -0.62], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [0, 0.7, 1.63], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0, 0, 2.42], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, -0.5, 2.42], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [0, 0.5, 1.11], + "lerp_mode": "catmullrom" + }, + "2.6667": { + "post": [0, -0.1, 0.025], + "lerp_mode": "catmullrom" + }, + "2.875": [0, 0, 0.025] + } + }, + "arm_rotate_left": { + "rotation": [0, 12.5, 0] + }, + "arm_left": { + "rotation": { + "0.0": [16.0158, -7.28336, 4.19087], + "0.3333": { + "pre": [10.0158, -7.28336, 4.19087], + "post": [10.0158, -7.28336, 4.19087], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [59.27789, -3.44948, -16.57084], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [59.27789, -3.44948, -11.57084], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [47.53, -13.69, -15.25], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [40.81, 0.81, -11.85], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [16.0158, -7.28336, 4.19087], + "lerp_mode": "catmullrom" + }, + "3.0": [16.0158, -7.28336, 4.19087] + }, + "position": { + "0.0": [-0.5, 0, 0], + "0.3333": { + "pre": [-0.5, 0, 0], + "post": [-0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [-1.05705, 0.40199, -0.42202], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [-1.05705, 0.40199, -0.42202], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [-0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [-0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [-0.5, 0, 0] + } + }, + "elbow_left": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.5417": { + "pre": [0.5, 0, 0], + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [29.90245, 6.30675, -10.81428], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [29.90245, 6.30675, -10.81428], + "lerp_mode": "catmullrom" + }, + "2.7083": [2.5, 0, 0] + } + }, + "hand_left": { + "rotation": [7.5, 0, 0] + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": { + "0.0": [16.0158, 7.28336, -4.19087], + "0.3333": { + "pre": [10.0158, 7.28336, -4.19087], + "post": [10.0158, 7.28336, -4.19087], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [59.27789, 3.44948, 16.57084], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [59.27789, 3.44948, 11.57084], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [47.53, 13.69, 15.25], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [40.81, -0.81, 11.85], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [16.0158, 7.28336, -4.19087], + "lerp_mode": "catmullrom" + }, + "3.0": [16.0158, 7.28336, -4.19087] + }, + "position": { + "0.0": [0.5, 0, 0], + "0.3333": { + "pre": [0.5, 0, 0], + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [1.05705, 0.40199, -0.42202], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [1.05705, 0.40199, -0.42202], + "lerp_mode": "catmullrom" + }, + "1.875": { + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [0.5, 0, 0] + } + }, + "elbow_right": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.5417": { + "pre": [0.5, 0, 0], + "post": [0.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [29.90245, -6.30675, 10.81428], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [29.90245, -6.30675, 10.81428], + "lerp_mode": "catmullrom" + }, + "2.7917": [2.5, 0, 0] + } + }, + "hand_right": { "rotation": [7.5, 0, 0] }, "head_angle": { - "rotation": [-126.75911, 71.36898, -108.42018] + "rotation": { + "0.0": [-12.5, 0, 0], + "0.2917": { + "pre": [-1.99984, -0.01063, -0.03324], + "post": [-1.99984, -0.01063, -0.03324], + "lerp_mode": "catmullrom" + }, + "0.7083": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-22.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [12.88377, -1.76161, 4.76588], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [-6.53082, 7.4762, 3.19987], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [-12.84016, 0.64206, 2.105], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [-12.53665, -1.48742, -2.20261], + "lerp_mode": "catmullrom" + }, + "3.0": [-12.5, 0, 0] + } }, - "arm_right": { - "rotation": [0, -10, -12.5] + "jaw": { + "rotation": { + "0.0": [17.5, 0, 0], + "0.3333": { + "pre": [3.50058, -0.05121, -0.11082], + "post": [3.50058, -0.05121, -0.11082], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [39.58044, -0.06783, 0.17675], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-5.41782, -0.11088, -0.16043], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-5.41782, -0.11088, -0.16043], + "lerp_mode": "catmullrom" + }, + "2.2083": { + "post": [22.5814, -0.07169, -0.01648], + "lerp_mode": "catmullrom" + }, + "2.9167": [17.5, 0, 0] + } }, - "arm_right2": { - "rotation": [3.10627, -29.76116, -10.13286] - }, - "arm_right3": { - "rotation": [0, -12, 0] - }, - "arm_left": { - "rotation": [0, 10, 22.5] - }, - "arm_left2": { - "rotation": [0, 22.5, 0] - }, - "arm_left3": { - "rotation": [0, 15, 0] - }, - "cannon_right": { - "rotation": [-12.98705, 14.71314, -32.26469], - "position": [0, -3.7, 0] - }, - "cannon_left": { - "rotation": [-14.92774, 4.29771, 30.75906], - "position": [0, -3.7, 0] - }, - "tail": { - "rotation": [-65, 0, 0] + "shell_cannon_right": { + "rotation": { + "0.0": [-30, 0, 0], + "1.25": { + "pre": [-30, 0, 0], + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [-37, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [-37, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-37, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [-29, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [-30, 0, 0] + } }, "leg_right": { - "rotation": [10, 0, 0] + "rotation": { + "0.0": [-15.26795, 37.5, 0], + "1.2083": [-29.27, 37.5, 0], + "1.4167": { + "pre": [-27.77, 25, 0], + "post": [-27.77, 25, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [-27.77, 25, 0], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [-15.27, 37.5, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [-15.27, 37.5, 0] + }, + "position": { + "0.0": [0.0067, -0.02947, 0.01474], + "1.2083": [0.31, -1.64, 0.69], + "1.4167": { + "pre": [0.01, -1.43, 1.21], + "post": [0.01, -1.43, 1.21], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0.01, -1.43, 1.21], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [0.01, -0.03, 0.01], + "lerp_mode": "catmullrom" + }, + "2.9583": [0.01, -0.03, 0.01] + } + }, + "knee_right": { + "rotation": { + "0.0": [15.26795, 0, 0], + "1.2083": [29.27, 0, 0], + "1.4167": [15.26795, 0, 0] + } + }, + "shell_cannon_left": { + "rotation": { + "0.0": [-30, 0, 0], + "1.25": { + "pre": [-30, 0, 0], + "post": [-30, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [-37, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.75": { + "post": [-37, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-37, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [-29, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [-30, 0, 0] + } }, "leg_left": { - "rotation": [-10, 0, 0] + "rotation": { + "0.0": [-15.26795, -37.5, 0], + "1.2083": [-29.27, -37.5, 0], + "1.375": [11.96631, -41.64114, -11.88172], + "1.7083": [12.45716, -41.88461, -12.60312], + "2.0833": [11.96631, -41.64114, -11.88172], + "2.25": { + "pre": [-3.51, -36.52, -10.34], + "post": [-3.51, -36.52, -10.34], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [-18.58107, -32.08371, -7.82735], + "lerp_mode": "catmullrom" + }, + "2.7083": [-15.27, -37.5, 0] + }, + "position": { + "0.0": [-0.0067, -0.02947, 0.01474], + "1.2083": [-0.31, -1.64, 0.69], + "1.375": { + "pre": [-0.01, 2.3, 4.46], + "post": [-0.01, 2.3, 4.46], + "lerp_mode": "catmullrom" + }, + "1.5417": { + "post": [-0.01, 1.47, 5.41], + "lerp_mode": "catmullrom" + }, + "1.8333": { + "post": [-0.01, 1.47, 5.41], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-0.01, 1.47, 5.41], + "lerp_mode": "catmullrom" + }, + "2.5": { + "post": [-0.01, 1.67, 2.16], + "lerp_mode": "catmullrom" + }, + "2.7083": [-0.01, -0.03, 0.01] + } + }, + "knee_left": { + "rotation": { + "0.0": [15.26795, 0, 0], + "1.2083": { + "pre": [29.27, 0, 0], + "post": [29.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [2.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [2.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.75": [2.27, 0, 0], + "1.9583": [2.27, 0, 0], + "2.0833": { + "pre": [2.27, 0, 0], + "post": [2.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [28.07, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.7083": [15.27, 0, 0] + } + }, + "tail_bend": { + "rotation": { + "0.0": [15, -1.73205, 0.3473], + "0.8333": { + "pre": [14.79945, -3.01846, 5.18324], + "post": [14.79945, -3.01846, 5.18324], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [15.02702, -1.473, -0.61895], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [14.58306, -3.92861, 8.6645], + "lerp_mode": "catmullrom" + }, + "2.5417": { + "post": [14.94248, -2.1428, 1.88633], + "lerp_mode": "catmullrom" + }, + "2.9167": [15, -1.73205, 0.3473] + } + }, + "tail_end": { + "rotation": [12, 0, 5.63816] + }, + "head": { + "rotation": [-9.18404, 0, 0] + }, + "tail_base": { + "rotation": { + "0.0": [0, 1, -3.4641], + "1.0": { + "pre": [-0.01529, -1.57135, -0.3998], + "post": [-0.01529, -1.57135, -0.3998], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [-0.19563, 4.30235, -7.41701], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [0.00033, 0.93597, -3.3878], + "lerp_mode": "catmullrom" + }, + "2.9583": [0, 1, -3.4641] + } + }, + "cannon_left": { + "rotation": { + "0.0": [-0.7503, 17.01572, 0.30669], + "0.2917": { + "pre": [-1.75, 15.02, 0.31], + "post": [-1.75, 15.02, 0.31], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-5.67953, 25.92658, -3.66491], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [10.5455, 25.46221, 22.41454], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-8.75, 17.52, -12.19], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-3.54, 5.54, 0.31], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [-3.54, 13.04, 0.31], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [-2.28, 8.84, 0.31], + "lerp_mode": "catmullrom" + }, + "3.0": [-0.7503, 17.01572, 0.30669] + }, + "position": { + "0.0": [0, 0, 0], + "1.25": [0, 0, 0], + "1.2917": { + "pre": [0, 0, 1.8], + "post": [0, 0, 1.8], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, 0, 7.2], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, 0, 4.39], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0, 0, 6.43], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 0, 5], + "lerp_mode": "catmullrom" + }, + "2.4583": [0, 0, 0] + }, + "scale": { + "1.25": [1, 1, 1], + "1.2917": { + "pre": [1.2, 1.2, 0.74], + "post": [1.2, 1.2, 0.74], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [1, 1, 1], + "lerp_mode": "catmullrom" + }, + "2.125": [1, 1, 1] + } + }, + "right_toe_out": { + "rotation": [0, 12.5, 0] + }, + "right_toe_in": { + "rotation": [0, -12.5, 0] + }, + "left_toe_out": { + "rotation": [0, -12.5, 0] + }, + "left_toe_in": { + "rotation": { + "0.0": [0, 12.5, 0], + "1.2083": [0, 12.5, 0], + "1.5417": [-8, 12.5, 0], + "2.125": [-8, 12.5, 0], + "2.4583": [0, 12.5, 0] + } + }, + "cannon_right": { + "rotation": { + "0.0": [-0.7503, -17.01572, -0.30669], + "0.2917": { + "pre": [-1.75, -15.02, -0.31], + "post": [-1.75, -15.02, -0.31], + "lerp_mode": "catmullrom" + }, + "0.625": { + "post": [-5.67953, -25.92658, 3.66491], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [10.5455, -25.46221, -22.41454], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [-8.75, -17.52, 12.19], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-3.54, -5.54, -0.31], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [-3.54, -13.04, -0.31], + "lerp_mode": "catmullrom" + }, + "2.4167": { + "post": [-2.28, -8.84, -0.31], + "lerp_mode": "catmullrom" + }, + "3.0": [-0.7503, -17.01572, -0.30669] + }, + "position": { + "0.0": [0, 0, 0], + "1.25": [0, 0, 0], + "1.2917": { + "pre": [0, 0, 1.8], + "post": [0, 0, 1.8], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [0, 0, 7.2], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, 0, 4.39], + "lerp_mode": "catmullrom" + }, + "1.625": { + "post": [0, 0, 6.43], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [0, 0, 5], + "lerp_mode": "catmullrom" + }, + "2.4583": [0, 0, 0] + }, + "scale": { + "1.25": [1, 1, 1], + "1.2917": { + "pre": [1.2, 1.2, 0.74], + "post": [1.2, 1.2, 0.74], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [1, 1, 1], + "lerp_mode": "catmullrom" + }, + "2.125": [1, 1, 1] + } + }, + "eyelid_left": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "0.3333": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "0.375": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.2917": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "1.5": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "1.5417": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]} + } + }, + "eyelid_right": { + "position": { + "0.0": [0, 0, 0], + "0.0417": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "0.3333": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "0.375": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]}, + "1.25": {"pre": [0, 0, 0], "post": [0, 0, 0]}, + "1.2917": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "1.5": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "1.5417": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]} + } + }, + "foot_right": { + "rotation": { + "1.25": [0, 0, 0], + "1.4167": { + "pre": [10, 0, 0], + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [10, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5833": [0, 0, 0] + } + } + } + }, + "animation.blastoise.status": { + "animation_length": 3, + "bones": { + "body2": { + "position": { + "0.0": [0, -1.5, 0], + "1.1667": [0, -1.5, 0], + "1.25": [0, "-1.5+0.2*math.sin(q.anim_time*90*45)", 0], + "2.5": [0, -1.5, 0] + } + }, + "torso": { + "rotation": { + "0.0": [25.13397, 0.5, 0], + "0.4583": { + "pre": [32.13397, 0.5, 1], + "post": [32.13397, 0.5, 1], + "lerp_mode": "catmullrom" + }, + "0.9583": { + "post": [6.13397, 0.5, -2.5], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [6.13397, 0.5, -2.5], + "lerp_mode": "catmullrom" + }, + "1.2917": { + "post": [39.9961, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "1.7917": { + "post": [39.9961, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [39.9961, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "2.625": { + "post": [26.13397, 0.5, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [25.13397, 0.5, 0] + }, + "position": { + "0.0": [0, 0, 0.025], + "0.4583": { + "pre": [0, -0.7, 0.02], + "post": [0, -0.7, 0.02], + "lerp_mode": "catmullrom" + }, + "1.0833": { + "post": [0, 1.5, 0.02], + "lerp_mode": "catmullrom" + }, + "1.25": [0, 0, 0.025] + } + }, + "arm_rotate_left": { + "rotation": [0, 12.5, 0] + }, + "arm_left": { + "rotation": { + "0.0": [16.0158, -7.28336, 4.19087], + "0.2917": { + "pre": [11.0158, -7.28336, -4.80913], + "post": [11.0158, -7.28336, -4.80913], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [37.77259, -16.76229, 16.09339], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [53.5158, -7.28336, 4.19087], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-3.9842, -7.28336, -5.80913], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-3.9842, -7.28336, 4.19087], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-3.9842, -7.28336, 4.19087], + "lerp_mode": "catmullrom" + }, + "3.0": [16.0158, -7.28336, 4.19087] + }, + "position": [-0.5, 0, 0] + }, + "elbow_left": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.4583": { + "pre": [1.25, 0, 0], + "post": [1.25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [32.5, 0, -20], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5417": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [2.5, 0, 0] + } + }, + "hand_left": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.5417": { + "pre": [15, 0, 0], + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [2, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [2, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [7.5, 0, 0] + } + }, + "arm_rotate_right": { + "rotation": [0, -12.5, 0] + }, + "arm_right": { + "rotation": { + "0.0": [16.0158, 7.28336, -4.19087], + "0.2917": { + "pre": [11.0158, 7.28336, 4.80913], + "post": [11.0158, 7.28336, 4.80913], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [37.77259, 16.76229, -16.09339], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [53.5158, 7.28336, -4.19087], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [-3.9842, 7.28336, 5.80913], + "lerp_mode": "catmullrom" + }, + "1.7083": { + "post": [-3.9842, 7.28336, -4.19087], + "lerp_mode": "catmullrom" + }, + "2.1667": { + "post": [-3.9842, 7.28336, -4.19087], + "lerp_mode": "catmullrom" + }, + "3.0": [16.0158, 7.28336, -4.19087] + }, + "position": [0.5, 0, 0] + }, + "elbow_right": { + "rotation": { + "0.0": [2.5, 0, 0], + "0.4583": { + "pre": [1.25, 0, 0], + "post": [1.25, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.7917": { + "post": [32.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [32.5, 0, 20], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [2.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5417": { + "post": [7.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [2.5, 0, 0] + } + }, + "hand_right": { + "rotation": { + "0.0": [7.5, 0, 0], + "0.5417": { + "pre": [15, 0, 0], + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.125": { + "post": [15, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [2, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [2, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.9583": [7.5, 0, 0] + } + }, + "head_angle": { + "rotation": { + "0.0": [-12.5, 0, 0], + "0.625": { + "pre": [18.5, 0, 0], + "post": [18.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [-21.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.375": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.0833": { + "post": [-27.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.5833": { + "post": [-9.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [-12.5, 0, 0] + } + }, + "jaw": { + "rotation": { + "0.0": [17.5, 0, 0], + "0.5": { + "pre": [37.5, 0, 0], + "post": [37.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-5, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": { + "post": [45, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.6667": { + "post": [27, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.125": { + "post": [45, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "3.0": [17.5, 0, 0] + } + }, + "shell_cannon_right": { + "rotation": { + "0.0": [-30, 0, 0], + "0.5": { + "pre": [-28, 0, 0], + "post": [-28, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-25, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-35, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [-35, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6667": [-30, 0, 0] + } + }, + "leg_right": { + "rotation": { + "0.0": [-15.26795, 37.5, 0], + "0.5417": [-15.27, 37.5, 0], + "1.0833": [-6.27, 37.5, 0], + "1.25": [-15.27, 37.5, 0] + }, + "position": { + "0.0": [0.0067, -0.02947, 0.01474], + "0.5417": [0.01, -0.03, 0.01], + "1.0833": [-0.29, 0.97, -0.19], + "1.25": [0.01, -0.03, 0.01] + } + }, + "knee_right": { + "rotation": { + "0.0": [15.26795, 0, 0], + "0.5417": [15.27, 0, 0], + "1.0833": [4.77, 0, 0], + "1.25": [15.27, 0, 0] + } + }, + "shell_cannon_left": { + "rotation": { + "0.0": [-30, 0, 0], + "0.5": { + "pre": [-28, 0, 0], + "post": [-28, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-25, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.3333": { + "post": [-35, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.2917": { + "post": [-35, 0, 0], + "lerp_mode": "catmullrom" + }, + "2.6667": [-30, 0, 0] + } + }, + "leg_left": { + "rotation": { + "0.3333": [-15.26795, -37.5, 0], + "0.7917": { + "pre": [-23.52, -37.5, 0], + "post": [-23.52, -37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-30.27, -37.5, 0], + "lerp_mode": "catmullrom" + }, + "1.25": [-15.26795, -37.5, 0] + }, + "position": { + "0.3333": [-0.0067, -0.02947, 0.01474], + "0.7917": { + "pre": [-0.01, 1.95, 0.01], + "post": [-0.01, 1.95, 0.01], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-0.01, 3.57, 0.01], + "lerp_mode": "catmullrom" + }, + "1.25": [-0.0067, -0.02947, 0.01474] + } + }, + "knee_left": { + "rotation": { + "0.3333": [15.27, 0, 0], + "0.75": { + "pre": [42.77, 0, 0], + "post": [42.77, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [30.27, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.25": [15.27, 0, 0] + } + }, + "tail_bend": { + "rotation": { + "0.0": [15, -1.73205, 0.3473], + "0.5": { + "pre": [15, -2.07, 4.67], + "post": [15, -2.07, 4.67], + "lerp_mode": "catmullrom" + }, + "0.9167": { + "post": [15, -1.73, -7.15], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [15, 3.27, 0.35], + "lerp_mode": "catmullrom" + }, + "1.9583": { + "post": [15, -1.73, -4.65], + "lerp_mode": "catmullrom" + }, + "2.4583": { + "post": [15, -1.73, 0.35], + "lerp_mode": "catmullrom" + }, + "2.9167": [15, -1.73205, 0.3473] + } + }, + "tail_end": { + "rotation": [12, 0, 5.63816] + }, + "head": { + "rotation": [-9.18404, 0, 0] + }, + "tail_base": { + "rotation": { + "0.0": [0, 1, -3.4641], + "1.0417": { + "pre": [0, -1, -6.54], + "post": [0, -1, -6.54], + "lerp_mode": "catmullrom" + }, + "1.4167": { + "post": [0, -1, 15.46], + "lerp_mode": "catmullrom" + }, + "1.9167": { + "post": [0, -1, -6.04], + "lerp_mode": "catmullrom" + }, + "2.3333": { + "post": [0, -1, 6.46], + "lerp_mode": "catmullrom" + }, + "3.0": [0, 1, -3.4641] + } + }, + "cannon_left": { + "rotation": { + "0.0": [-0.7503, 17.01572, 0.30669], + "0.25": { + "pre": [-0.7503, 12.01572, 0.30669], + "post": [-0.7503, 12.01572, 0.30669], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [-4.9, 17.02, 0.31], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [-0.7503, 4.51572, 0.30669], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [-0.7503, 4.51572, 0.30669], + "lerp_mode": "catmullrom" + }, + "2.5833": { + "post": [-0.7503, 18.01572, 0.30669], + "lerp_mode": "catmullrom" + }, + "3.0": [-0.7503, 17.01572, 0.30669] + }, + "position": { + "0.875": [0, 0, 0], + "1.4583": { + "pre": [0, 0, 2.7], + "post": [0, 0, 2.7], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0, 0, 2.7], + "lerp_mode": "catmullrom" + }, + "2.7917": [0, 0, 0] + } + }, + "right_toe_out": { + "rotation": [0, 12.5, 0] + }, + "right_toe_in": { + "rotation": [0, -12.5, 0] + }, + "left_toe_out": { + "rotation": [0, -12.5, 0] + }, + "left_toe_in": { + "rotation": [0, 12.5, 0] + }, + "cannon_right": { + "rotation": { + "0.0": [-0.7503, -17.01572, -0.30669], + "0.25": { + "pre": [-0.7503, -12.01572, -0.30669], + "post": [-0.7503, -12.01572, -0.30669], + "lerp_mode": "catmullrom" + }, + "1.2083": { + "post": [-4.9, -17.02, -0.31], + "lerp_mode": "catmullrom" + }, + "1.4583": { + "post": [-0.7503, -4.51572, -0.30669], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [-0.7503, -4.51572, -0.30669], + "lerp_mode": "catmullrom" + }, + "2.5833": { + "post": [-0.7503, -18.01572, -0.30669], + "lerp_mode": "catmullrom" + }, + "3.0": [-0.7503, -17.01572, -0.30669] + }, + "position": { + "0.875": [0, 0, 0], + "1.4583": { + "pre": [0, 0, 2.7], + "post": [0, 0, 2.7], + "lerp_mode": "catmullrom" + }, + "2.25": { + "post": [0, 0, 2.7], + "lerp_mode": "catmullrom" + }, + "2.7917": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.2917": [0, 0, 0], + "0.3333": {"pre": [0, 0, 0], "post": [0.1, 0, -0.1]}, + "1.1667": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "1.2083": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]} + } + }, + "eyelid_right": { + "position": { + "0.2917": [0, 0, 0], + "0.3333": {"pre": [0, 0, 0], "post": [-0.1, 0, -0.1]}, + "1.1667": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "1.2083": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]} + } + } + } + }, + "animation.blastoise.recoil": { + "animation_length": 1.5, + "bones": { + "torso": { + "rotation": { + "0.0": [0, 0, 0], + "0.125": { + "pre": [-8, 1, 0], + "post": [-8, 1, 0], + "lerp_mode": "catmullrom" + }, + "0.8333": { + "post": [1, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "head_angle": { + "rotation": { + "0.0": [0, 0, 0], + "0.0417": { + "pre": [17.5, 0, 0], + "post": [17.5, 0, 0], + "lerp_mode": "catmullrom" + }, + "0.4583": { + "post": [-5.4, 1.5, 0], + "lerp_mode": "catmullrom" + }, + "1.1667": { + "post": [-0.3, 0, 0], + "lerp_mode": "catmullrom" + }, + "1.5": [0, 0, 0] + } + }, + "eyelid_left": { + "position": { + "0.0": [0.1, 0, -0.1], + "0.25": {"pre": [0.1, 0, -0.1], "post": [0.1, 0, -0.1]}, + "0.2917": {"pre": [0.1, 0, -0.1], "post": [0, 0, 0]} + } + }, + "eyelid_right": { + "position": { + "0.0": [-0.1, 0, -0.1], + "0.25": {"pre": [-0.1, 0, -0.1], "post": [-0.1, 0, -0.1]}, + "0.2917": {"pre": [-0.1, 0, -0.1], "post": [0, 0, 0]} + } } } } diff --git a/.ignored/assets/particles/particle_dummy.animation.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/special/particle_dummy.animation.json similarity index 94% rename from .ignored/assets/particles/particle_dummy.animation.json rename to common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/special/particle_dummy.animation.json index 664c66622d..74c4828d28 100644 --- a/.ignored/assets/particles/particle_dummy.animation.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/animations/special/particle_dummy.animation.json @@ -105,11 +105,11 @@ } }, "particle_effects": { - "0.0417": { + "0.0833": { "effect": "dragon_claw_target_scratch", "locator": "target" }, - "0.0833": [ + "0.1667": [ { "effect": "impact_dragon", "locator": "center" @@ -121,9 +121,6 @@ ] } }, - "flamethrower_actor": { - "loop": true - }, "animation.particle_dummy.flamethrower_actor": { "animation_length": 2, "particle_effects": { @@ -291,7 +288,7 @@ }, "particle_effects": { "0.0": { - "effect": "population_bomb_multihit", + "effect": "multi_hit", "locator": "center" }, "0.0833": [ @@ -305,7 +302,7 @@ } ], "0.2917": { - "effect": "population_bomb_multihit", + "effect": "multi_hit", "locator": "center" }, "0.375": [ @@ -319,7 +316,7 @@ } ], "0.5833": { - "effect": "population_bomb_multihit", + "effect": "multi_hit", "locator": "center" }, "0.6667": [ @@ -333,7 +330,7 @@ } ], "0.875": { - "effect": "population_bomb_multihit", + "effect": "multi_hit", "locator": "center" }, "0.9583": [ @@ -348,20 +345,11 @@ ] } }, - "animation.particle_dummy.crit_target": { - "animation_length": 2, - "particle_effects": { - "0.0833": { - "effect": "crit_popup", - "locator": "head_top" - } - } - }, "animation.particle_dummy.synthesis": { "animation_length": 3.5, "sound_effects": { "0.0": { - "effect": "synthesis.mp3" + "effect": "synthesis" } }, "particle_effects": { diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0006_charizard/charizard.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0006_charizard/charizard.geo.json index 0c5f18a453..824880dfd7 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0006_charizard/charizard.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0006_charizard/charizard.geo.json @@ -13,7 +13,12 @@ "bones": [ { "name": "charizard", - "pivot": [0, 0, 0] + "pivot": [0, 0, 0], + "locators": { + "target": [0, 14, -9], + "ground_center": [0, 0, 0], + "center": [0, 14, -1] + } }, { "name": "body", @@ -23,15 +28,22 @@ { "name": "torso", "parent": "body", - "pivot": [0, 12.5, -0.5], + "pivot": [0, 7.5, -0.5], "cubes": [ - {"origin": [-5.5, 13, -5], "size": [11, 7, 9], "uv": [88, 30]}, {"origin": [-6.5, 4, -5.5], "size": [13, 9, 10], "uv": [0, 24]} ] }, { - "name": "neck", + "name": "torso2", "parent": "torso", + "pivot": [0, 12.75, 0.75], + "cubes": [ + {"origin": [-5.5, 13, -5], "size": [11, 7, 9], "uv": [88, 30]} + ] + }, + { + "name": "neck", + "parent": "torso2", "pivot": [0, 20, -0.5], "cubes": [ {"origin": [-2, 19, -2.5], "size": [4, 5, 4], "inflate": 0.02, "uv": [94, 55]} @@ -48,108 +60,82 @@ { "name": "head", "parent": "neck2", - "pivot": [0, 28, -0.5], + "pivot": [0, 28.5, -1], "rotation": [-22.5, 0, 0] }, { "name": "head_ai", "parent": "head", - "pivot": [0, 28, -0.5], + "pivot": [0, 28.5, -1], "rotation": [22.5, 0, 0], "cubes": [ - {"origin": [-3, 28, -4.5], "size": [6, 6, 7], "uv": [71, 24]}, - {"origin": [-2.5, 30, -10], "size": [5, 3, 6], "inflate": 0.02, "uv": [93, 46]}, - {"origin": [-2.5, 29, -9.5], "size": [0, 1, 1], "inflate": 0.01, "pivot": [-2.5, 30, -9.5], "rotation": [45, 0, 0], "uv": [7, 25]}, - {"origin": [2.5, 29, -9.5], "size": [0, 1, 1], "inflate": 0.01, "pivot": [2.5, 30, -9.5], "rotation": [45, 0, 0], "uv": [7, 24], "mirror": true}, - {"origin": [-2.5, 32, 2.25], "size": [1, 2, 6], "pivot": [-2, 32.75, 2.5], "rotation": [5, -5, 0], "uv": [81, 49]}, - {"origin": [1.5, 32, 2.25], "size": [1, 2, 6], "pivot": [2, 32.75, 2.5], "rotation": [5, 5, 0], "uv": [81, 49], "mirror": true} - ] + {"origin": [-3, 28.5, -4.5], "size": [6, 6, 7], "uv": [71, 24]}, + {"origin": [-2.5, 30.5, -10], "size": [5, 3, 6], "inflate": 0.02, "uv": [93, 46]}, + {"origin": [-2.5, 29.5, -9.5], "size": [0, 1, 1], "inflate": 0.01, "pivot": [-2.5, 30.5, -9.5], "rotation": [45, 0, 0], "uv": [7, 25]}, + {"origin": [2.5, 29.5, -9.5], "size": [0, 1, 1], "inflate": 0.01, "pivot": [2.5, 30.5, -9.5], "rotation": [45, 0, 0], "uv": [7, 24], "mirror": true}, + {"origin": [-2.5, 32.5, 2.25], "size": [1, 2, 6], "pivot": [-2, 33.25, 2.5], "rotation": [5, -5, 0], "uv": [81, 49]}, + {"origin": [1.5, 32.5, 2.25], "size": [1, 2, 6], "pivot": [2, 33.25, 2.5], "rotation": [5, 5, 0], "uv": [81, 49], "mirror": true} + ], + "locators": { + "special_attack": { + "offset": [0, 29, -8], + "rotation": [5, 0, 0] + }, + "head_top": [0, 35, -2] + } }, { "name": "eyes", "parent": "head_ai", - "pivot": [0, 35.17388, -2.88268] + "pivot": [0, 35.67388, -2.88268] }, { "name": "eye_right", "parent": "eyes", - "pivot": [-3.01, 32.25, -2.25], + "pivot": [-3.01, 32.75, -2.25], "rotation": [10, 0, 0], "cubes": [ - {"origin": [-3.01, 31.25, -4.25], "size": [0, 2, 3], "uv": [36, 25]} + {"origin": [-3.01, 31.75, -4.25], "size": [0, 2, 3], "uv": [36, 25]} ] }, { "name": "eyelid_right", "parent": "eye_right", - "pivot": [-2.405, 32.25, -2.75], + "pivot": [-2.405, 32.75, -2.75], "cubes": [ - {"origin": [-2.91, 31.25, -4.25], "size": [1, 2, 3], "inflate": 0.01, "uv": [120, 27]} + {"origin": [-2.91, 31.75, -4.25], "size": [1, 2, 3], "inflate": 0.01, "uv": [120, 27]} ] }, { "name": "eye_left", "parent": "eyes", - "pivot": [3.01, 32.25, -2.75], + "pivot": [3.01, 32.75, -2.75], "rotation": [10, 0, 0], "cubes": [ - {"origin": [3.01, 31.25, -4.25], "size": [0, 2, 3], "uv": [36, 23], "mirror": true} + {"origin": [3.01, 31.75, -4.25], "size": [0, 2, 3], "uv": [36, 23], "mirror": true} ] }, { "name": "eyelid_left", "parent": "eye_left", - "pivot": [2.41, 32.25, -2.75], + "pivot": [2.41, 32.75, -2.75], "cubes": [ - {"origin": [1.91, 31.25, -4.25], "size": [1, 2, 3], "inflate": 0.01, "uv": [120, 22], "mirror": true} + {"origin": [1.91, 31.75, -4.25], "size": [1, 2, 3], "inflate": 0.01, "uv": [120, 22], "mirror": true} ] }, { "name": "jaw", "parent": "head_ai", - "pivot": [0, 30, -4], + "pivot": [0, 30.5, -4], "cubes": [ - {"origin": [-2.5, 28.025, -9.75], "size": [5, 2, 6], "uv": [36, 26]}, - {"origin": [-2.25, 29.75, -9.55], "size": [0, 1, 1], "pivot": [-2.5, 30, -9.5], "rotation": [-45, 0, 0], "uv": [7, 27]}, - {"origin": [2.25, 29.75, -9.55], "size": [0, 1, 1], "pivot": [2.5, 30, -9.5], "rotation": [-45, 0, 0], "uv": [7, 27], "mirror": true} - ] - }, - { - "name": "tail", - "parent": "torso", - "pivot": [0, 7.875, 4.5], - "cubes": [ - {"origin": [-3, 4.05, 2.5], "size": [6, 6, 13], "uv": [46, 24]} - ] - }, - { - "name": "tail2", - "parent": "tail", - "pivot": [0, 6.5, 15.5], - "cubes": [ - {"origin": [-2, 4.1, 14.5], "size": [4, 5, 13], "uv": [60, 46]} - ] - }, - { - "name": "tail3", - "parent": "tail2", - "pivot": [0, 6, 27.5], - "cubes": [ - {"origin": [-1, 4.15, 26.5], "size": [2, 4, 11], "uv": [5, 49]} - ] - }, - { - "name": "fire", - "parent": "tail3", - "pivot": [0, 7.75, 36.5], - "cubes": [ - {"origin": [0, 7.75, 33], "size": [0, 12, 7], "uv": [62, -7]}, - {"origin": [0, 7.75, 33], "size": [0, 12, 7], "pivot": [0, 7.75, 36.5], "rotation": [0, 90, 0], "uv": [62, 5]} + {"origin": [-2.5, 28.525, -9.75], "size": [5, 2, 6], "uv": [36, 26]}, + {"origin": [-2.25, 30.25, -9.55], "size": [0, 1, 1], "pivot": [-2.5, 30.5, -9.5], "rotation": [-45, 0, 0], "uv": [7, 27]}, + {"origin": [2.25, 30.25, -9.55], "size": [0, 1, 1], "pivot": [2.5, 30.5, -9.5], "rotation": [-45, 0, 0], "uv": [7, 27], "mirror": true} ] }, { "name": "arm_right", - "parent": "torso", + "parent": "torso2", "pivot": [-5.5, 20, -1], "cubes": [ {"origin": [-11.5, 19, -2], "size": [6, 2, 3], "uv": [31, 59]} @@ -197,7 +183,7 @@ }, { "name": "arm_left", - "parent": "torso", + "parent": "torso2", "pivot": [5.5, 20, -1], "cubes": [ {"origin": [5.5, 19, -2], "size": [6, 2, 3], "uv": [110, 59], "mirror": true} @@ -245,7 +231,7 @@ }, { "name": "wing_right", - "parent": "torso", + "parent": "torso2", "pivot": [-2, 17, 4], "cubes": [ {"origin": [-8, 13, 4], "size": [6, 10, 0], "uv": [50, 10]} @@ -269,7 +255,7 @@ }, { "name": "wing_left", - "parent": "torso", + "parent": "torso2", "pivot": [2, 17, 4], "cubes": [ {"origin": [2, 13, 4], "size": [6, 10, 0], "uv": [50, 0], "mirror": true} @@ -291,6 +277,39 @@ {"origin": [17, 11, 4], "size": [16, 22, 0], "uv": [94, 0], "mirror": true} ] }, + { + "name": "tail", + "parent": "torso", + "pivot": [0, 7.875, 4.5], + "cubes": [ + {"origin": [-3, 4.05, 2.5], "size": [6, 6, 13], "uv": [46, 24]} + ] + }, + { + "name": "tail2", + "parent": "tail", + "pivot": [0, 6.5, 15.5], + "cubes": [ + {"origin": [-2, 4.1, 14.5], "size": [4, 5, 13], "uv": [60, 46]} + ] + }, + { + "name": "tail3", + "parent": "tail2", + "pivot": [0, 6, 27.5], + "cubes": [ + {"origin": [-1, 4.15, 26.5], "size": [2, 4, 11], "uv": [5, 49]} + ] + }, + { + "name": "fire", + "parent": "tail3", + "pivot": [0, 7.75, 36.5], + "cubes": [ + {"origin": [0, 7.75, 33], "size": [0, 12, 7], "uv": [62, -7]}, + {"origin": [0, 7.75, 33], "size": [0, 12, 7], "pivot": [0, 7.75, 36.5], "rotation": [0, 90, 0], "uv": [62, 5]} + ] + }, { "name": "leg_right", "parent": "body", diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0009_blastoise/blastoise.geo.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0009_blastoise/blastoise.geo.json index 4e6a91035c..dab74ea443 100644 --- a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0009_blastoise/blastoise.geo.json +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0009_blastoise/blastoise.geo.json @@ -4,11 +4,11 @@ { "description": { "identifier": "geometry.blastoise", - "texture_width": 128, - "texture_height": 64, + "texture_width": 256, + "texture_height": 256, "visible_bounds_width": 5, - "visible_bounds_height": 3.5, - "visible_bounds_offset": [0, 1.25, 0] + "visible_bounds_height": 4.5, + "visible_bounds_offset": [0, 1.75, 0] }, "bones": [ { @@ -18,212 +18,472 @@ { "name": "body", "parent": "blastoise", - "pivot": [0, 16, 0] + "pivot": [0, 24, 2], + "locators": { + "target": [0, 25, -19], + "center": { + "offset": [0, 14, -1], + "rotation": [0, 0, -180] + }, + "ground_center": [0, 0, 0] + } + }, + { + "name": "body2", + "parent": "body", + "pivot": [0, 24, 2] }, { "name": "torso", - "parent": "body", - "pivot": [0, 16, 0], + "parent": "body2", + "pivot": [0, 14, 0], "cubes": [ - {"origin": [-9, 5, -6.5], "size": [18, 22, 13], "uv": [0, 0]} + {"origin": [-15.5, 14, -8.5], "size": [31, 24, 11], "uv": [0, 37]}, + {"origin": [-13.5, 6, -5.5], "size": [27, 8, 11], "inflate": 0.02, "uv": [84, 37]}, + {"origin": [-9, 38, -3], "size": [18, 2, 1], "uv": [88, 78]} + ] + }, + { + "name": "shell", + "parent": "torso", + "pivot": [-4, 21, 10], + "rotation": [10, 0, 0], + "cubes": [ + {"origin": [-17.5, 16, 1.5], "size": [35, 21, 16], "inflate": 0.01, "uv": [0, 0]}, + {"origin": [-14.5, 8.03038, 1.6527], "size": [29, 8, 16], "inflate": 0.01, "uv": [72, 83]}, + {"origin": [-9.5, 37, 3.5], "size": [19, 8, 14], "inflate": 0.01, "uv": [88, 56]} + ] + }, + { + "name": "shell_lip", + "parent": "shell", + "pivot": [-4, 21, 10], + "cubes": [ + {"origin": [-9.5, 42, 0.5], "size": [19, 4, 5], "uv": [116, 122]}, + {"origin": [-19.5, 14, 0.5], "size": [39, 22, 5], "uv": [0, 72]}, + {"origin": [6.5, 6.03038, 0.4027], "size": [10, 8, 5], "uv": [127, 153]}, + {"origin": [-16.5, 6.03038, 0.4027], "size": [10, 8, 5], "uv": [97, 149]}, + {"origin": [-10.5, 6.03038, 5.1527], "size": [21, 4, 5], "uv": [102, 20]}, + {"origin": [-7.5, 42, 5.5], "size": [15, 4, 2], "uv": [157, 140]} + ] + }, + { + "name": "shell_lip_fold_left", + "parent": "shell_lip", + "pivot": [9.5, 46, 10], + "rotation": [0, 0, 45], + "cubes": [ + {"origin": [9.5, 42, 0.5], "size": [14, 4, 5], "inflate": 0.01, "uv": [146, 87]}, + {"origin": [12.5, 42, -2.5], "size": [11, 4, 3], "inflate": 0.01, "uv": [28, 160]} + ] + }, + { + "name": "arm_hole_left", + "parent": "shell_lip_fold_left", + "pivot": [16, 46, -2.5], + "rotation": [45, 0, 0], + "cubes": [ + {"origin": [12.5, 42, -13.5], "size": [11, 4, 11], "uv": [83, 122]} + ] + }, + { + "name": "arm_rotate_left", + "parent": "arm_hole_left", + "pivot": [18.5, 46, -8] + }, + { + "name": "arm_left", + "parent": "arm_rotate_left", + "pivot": [18.5, 46, -4.5], + "cubes": [ + {"origin": [14.5, 44, -12], "size": [8, 8, 8], "uv": [146, 21]} + ] + }, + { + "name": "elbow_left", + "parent": "arm_left", + "pivot": [18.5, 51, -8], + "cubes": [ + {"origin": [15, 50, -11.5], "size": [7, 7, 7], "uv": [0, 154]} + ] + }, + { + "name": "hand_left", + "parent": "elbow_left", + "pivot": [18.5, 56, -8], + "cubes": [ + {"origin": [15.5, 55, -11], "size": [6, 5, 6], "uv": [50, 161]} + ] + }, + { + "name": "fingers_left", + "parent": "hand_left", + "pivot": [18.5, 60, -7], + "cubes": [ + {"origin": [17.25, 59.5, -8], "size": [0, 3, 2], "pivot": [17, 59.5, -7], "rotation": [0, -27.5, 0], "uv": [56, 97]}, + {"origin": [19.75, 59.5, -8], "size": [0, 3, 2], "pivot": [19.75, 59.5, -7], "rotation": [0, 42.5, 0], "uv": [39, 97]}, + {"origin": [6.5, 59.5, 15.25], "size": [0, 3, 2], "pivot": [-19.5, 59.5, -9], "rotation": [0, 45, 0], "uv": [86, 0]} + ] + }, + { + "name": "shell_lip_fold_right", + "parent": "shell_lip", + "pivot": [-9.5, 46, 10], + "rotation": [0, 0, -45], + "cubes": [ + {"origin": [-23.5, 42, -2.5], "size": [11, 4, 3], "inflate": 0.01, "uv": [159, 120]}, + {"origin": [-23.5, 42, 0.5], "size": [14, 4, 5], "inflate": 0.01, "uv": [146, 78]} + ] + }, + { + "name": "arm_hole_right", + "parent": "shell_lip_fold_right", + "pivot": [-16, 46, -2.5], + "rotation": [45, 0, 0], + "cubes": [ + {"origin": [-23.5, 42, -13.5], "size": [11, 4, 11], "uv": [94, 107]} + ] + }, + { + "name": "arm_rotate_right", + "parent": "arm_hole_right", + "pivot": [-18.5, 46, -8] + }, + { + "name": "arm_right", + "parent": "arm_rotate_right", + "pivot": [-18.5, 46, -4.5], + "cubes": [ + {"origin": [-22.5, 44, -12], "size": [8, 8, 8], "uv": [36, 144]} + ] + }, + { + "name": "elbow_right", + "parent": "arm_right", + "pivot": [-18.5, 51, -8], + "cubes": [ + {"origin": [-22, 50, -11.5], "size": [7, 7, 7], "uv": [68, 150]} + ] + }, + { + "name": "hand_right", + "parent": "elbow_right", + "pivot": [-18.5, 56, -8], + "cubes": [ + {"origin": [-21.5, 55, -11], "size": [6, 5, 6], "uv": [160, 44]} + ] + }, + { + "name": "fingers_right", + "parent": "hand_right", + "pivot": [-18.5, 60, -7], + "cubes": [ + {"origin": [-17.25, 59.5, -8], "size": [0, 3, 2], "pivot": [-17, 59.5, -7], "rotation": [0, 27.5, 0], "uv": [84, 56]}, + {"origin": [-19.75, 59.5, -8], "size": [0, 3, 2], "pivot": [-19.75, 59.5, -7], "rotation": [0, -42.5, 0], "uv": [83, 70]}, + {"origin": [-6.5, 59.5, 15.25], "size": [0, 3, 2], "pivot": [19.5, 59.5, -9], "rotation": [0, -45, 0], "uv": [0, 70]} + ] + }, + { + "name": "shell_fold_right", + "parent": "shell", + "pivot": [-9.5, 45, 17.5], + "rotation": [0, 0, -45] + }, + { + "name": "shell_cannon_right", + "parent": "shell_fold_right", + "pivot": [-9.5, 36, 17.5], + "cubes": [ + {"origin": [-20.5, 36, 9.5], "size": [11, 9, 8], "uv": [38, 127]}, + {"origin": [-20.5, 36, 3.5], "size": [11, 1, 6], "inflate": 0.01, "uv": [154, 69]}, + {"origin": [-20.5, 36, 3.5], "size": [1, 8, 6], "uv": [90, 162]}, + {"origin": [-10.5, 36, 3.5], "size": [1, 8, 6], "uv": [135, 131]}, + {"origin": [-20.5, 44, 3.5], "size": [11, 1, 6], "uv": [149, 37]} + ] + }, + { + "name": "cannon_right", + "parent": "shell_cannon_right", + "pivot": [-15, 41, 8.5], + "cubes": [ + {"origin": [-17, 39, -4], "size": [4, 4, 14], "uv": [135, 135]}, + {"origin": [-16.5, 39.5, -5], "size": [3, 3, 1], "uv": [92, 56]}, + {"origin": [-17.5, 38.5, -12], "size": [5, 5, 7], "uv": [157, 153]} + ] + }, + { + "name": "shell_fold_left", + "parent": "shell", + "pivot": [9.5, 45, 17.5], + "rotation": [0, 0, 45] + }, + { + "name": "shell_cannon_left", + "parent": "shell_fold_left", + "pivot": [9.5, 36, 17.5], + "cubes": [ + {"origin": [9.5, 36, 9.5], "size": [11, 9, 8], "uv": [0, 124]}, + {"origin": [9.5, 36, 3.5], "size": [11, 1, 6], "inflate": 0.01, "uv": [92, 137]}, + {"origin": [19.5, 36, 3.5], "size": [1, 8, 6], "uv": [84, 56]}, + {"origin": [9.5, 36, 3.5], "size": [1, 8, 6], "uv": [0, 0]}, + {"origin": [9.5, 44, 3.5], "size": [11, 1, 6], "uv": [102, 29]} + ] + }, + { + "name": "cannon_left", + "parent": "shell_cannon_left", + "pivot": [15, 41, 8.5], + "cubes": [ + {"origin": [13, 39, -4], "size": [4, 4, 14], "uv": [113, 131]}, + {"origin": [13.5, 39.5, -5], "size": [3, 3, 1], "uv": [8, 0]}, + {"origin": [12.5, 38.5, -12], "size": [5, 5, 7], "uv": [39, 99]} ] }, { "name": "head", "parent": "torso", - "pivot": [0, 25, -2.25] + "pivot": [0, 38, -6.25], + "locators": { + "head_top": [0, 51, -7] + } }, { "name": "head_correction", "parent": "head", - "pivot": [0, 25, -2.25] + "pivot": [0, 38, -6.25] }, { "name": "head_ai", "parent": "head_correction", - "pivot": [0, 25, -2.25] + "pivot": [0, 38, -6.25] }, { "name": "head_angle", "parent": "head_ai", - "pivot": [0, 25, -2.25], + "pivot": [0, 38, -6.25], "cubes": [ - {"origin": [-5, 25, -7.75], "size": [10, 9, 9], "uv": [0, 35]}, - {"origin": [-4.5, 27, -10.75], "size": [9, 3, 3], "inflate": 0.01, "uv": [58, 41]}, - {"origin": [-3.25, 26.5, -10.25], "size": [1, 1, 0], "pivot": [-2.75, 27, -10.25], "rotation": [15, 15, 45], "uv": [0, 0]}, - {"origin": [2.25, 26.5, -10.25], "size": [1, 1, 0], "pivot": [2.75, 27, -10.25], "rotation": [15, -15, -45], "uv": [0, 1], "mirror": true} + {"origin": [-6.5, 38, -12.75], "size": [13, 12, 13], "uv": [0, 99]} + ], + "locators": { + "special_attack": [0, 48, -25] + } + }, + { + "name": "muzzle", + "parent": "head_angle", + "pivot": [0, 40, -14.75], + "cubes": [ + {"origin": [-5.5, 41, -17.25], "size": [11, 4, 5], "inflate": 0.01, "uv": [157, 131]}, + {"origin": [1.75, 40.75, -16.25], "size": [2, 2, 0], "inflate": 0.01, "pivot": [2.5, 41, -16.75], "rotation": [0, 0, 45], "uv": [12, 14]}, + {"origin": [-3.75, 40.75, -16.25], "size": [2, 2, 0], "inflate": 0.01, "pivot": [-2.5, 41, -16.75], "rotation": [0, 0, -45], "uv": [0, 0]} + ] + }, + { + "name": "jaw", + "parent": "muzzle", + "pivot": [0, 41, -12.75], + "cubes": [ + {"origin": [-5.5, 38, -14.75], "size": [11, 3, 2], "inflate": 0.01, "uv": [68, 127]}, + {"origin": [-4.5, 38, -16.75], "size": [9, 3, 2], "uv": [73, 37]}, + {"origin": [2, 40.75, -16.25], "size": [1, 1, 0], "pivot": [2.75, 41, -16.25], "rotation": [0, 0, -45], "uv": [4, 1]}, + {"origin": [3.25, 40.25, -16], "size": [1, 1, 0], "pivot": [3.5, 41, -15.75], "rotation": [30.68206, -27.03402, -52.54628], "uv": [4, 0]}, + {"origin": [-4.25, 40.25, -16], "size": [1, 1, 0], "pivot": [-3.5, 41, -15.75], "rotation": [30.68206, 27.03402, 52.54628], "uv": [0, 2]}, + {"origin": [-3, 40.75, -16.25], "size": [1, 1, 0], "pivot": [-2.75, 41, -16.25], "rotation": [0, 0, 45], "uv": [2, 2]} ] }, { "name": "eyelid_left", "parent": "head_angle", - "pivot": [3.41, 31, -7.16], + "pivot": [3.81, 45, -8.81], "cubes": [ - {"origin": [1.91, 30, -7.66], "size": [3, 2, 1], "inflate": 0.01, "uv": [32, 54], "mirror": true} + {"origin": [2.4, 45, -12.65], "size": [4, 2, 2], "inflate": 0.01, "uv": [0, 99]} ] }, { "name": "eyelid_right", "parent": "head_angle", - "pivot": [-3.41, 31, -7.16], + "pivot": [-3.81, 45, -8.81], "cubes": [ - {"origin": [-4.91, 30, -7.66], "size": [3, 2, 1], "inflate": 0.01, "uv": [24, 54]} + {"origin": [-6.4, 45, -12.65], "size": [4, 2, 2], "inflate": 0.01, "uv": [86, 11]} ] }, { "name": "ears", "parent": "head_angle", - "pivot": [0, 34, -2.25] - }, - { - "name": "ear_right", - "parent": "ears", - "pivot": [-3.5, 33.25, -1.75], - "rotation": [0, 0, -30], - "cubes": [ - {"origin": [-4.25, 32.75, -3], "size": [4, 4, 0], "pivot": [0, 0, -0.25], "rotation": [0, 25, 0], "uv": [8, 53]} - ] + "pivot": [0, 49, -3.25] }, { "name": "ear_left", "parent": "ears", - "pivot": [3.5, 33.25, -1.75], - "rotation": [0, 0, 30], + "pivot": [6.5, 49.25, -5.75], + "rotation": [0, 0, 45], "cubes": [ - {"origin": [0.25, 32.75, -3], "size": [4, 4, 0], "pivot": [0, 0, -0.25], "rotation": [0, -25, 0], "uv": [16, 53]} + {"origin": [2.25, 48.75, -7], "size": [5, 4, 0], "pivot": [3, 16, -4.25], "rotation": [0, -57.5, 0], "uv": [85, 42]} ] }, { - "name": "jaw", - "parent": "head_angle", - "pivot": [0, 27, -7.5], + "name": "ear_right", + "parent": "ears", + "pivot": [-6.5, 49.25, -5.75], + "rotation": [0, 0, -45], "cubes": [ - {"origin": [-4.5, 25, -9.5], "size": [9, 2, 2], "inflate": 0.01, "uv": [54, 47]}, - {"origin": [-4, 25, -10.5], "size": [8, 2, 1], "uv": [57, 51]}, - {"origin": [-2.75, 26.25, -10.25], "size": [1, 1, 0], "pivot": [-2.25, 26.75, -10.25], "rotation": [-5, 5, -45], "uv": [2, 0]}, - {"origin": [-3.75, 26.25, -10], "size": [1, 1, 0], "pivot": [-3.25, 26.75, -10], "rotation": [-15, 15, -45], "uv": [0, 2]}, - {"origin": [1.75, 26.25, -10.25], "size": [1, 1, 0], "pivot": [2.25, 26.75, -10.25], "rotation": [-5, -5, 45], "uv": [2, 2], "mirror": true}, - {"origin": [2.75, 26.25, -10], "size": [1, 1, 0], "pivot": [3.25, 26.75, -10], "rotation": [-15, -15, 45], "uv": [2, 1], "mirror": true} + {"origin": [-7.25, 48.75, -7], "size": [5, 4, 0], "pivot": [-3, 16, -4.25], "rotation": [0, 57.5, 0], "uv": [0, 42]} ] }, { - "name": "arm_right", + "name": "tail_rotate", "parent": "torso", - "pivot": [-9, 25, -1.5], + "pivot": [0, 9, 1.5] + }, + { + "name": "tail_base", + "parent": "tail_rotate", + "pivot": [0, 9, 1.5], + "rotation": [40, 0, 0], "cubes": [ - {"origin": [-13, 20, -4.5], "size": [6, 5, 6], "uv": [80, 30]} + {"origin": [-4, 2, -0.5], "size": [8, 8, 8], "uv": [144, 0]} ] }, { - "name": "arm_right2", - "parent": "arm_right", - "pivot": [-13, 22.5, 1.5], + "name": "tail_bend", + "parent": "tail_base", + "pivot": [0, 2, -0.5], "cubes": [ - {"origin": [-18, 20, -4.5], "size": [5, 5, 6], "uv": [106, 19]} + {"origin": [-3, -3, -0.5], "size": [6, 5, 6], "uv": [86, 0]} ] }, { - "name": "arm_right3", - "parent": "arm_right2", - "pivot": [-18, 22.5, 1.5], + "name": "tail_end", + "parent": "tail_bend", + "pivot": [0, -3, -0.5], "cubes": [ - {"origin": [-23, 20, -4.5], "size": [5, 5, 6], "uv": [58, 30]}, - {"origin": [-24.66733, 23, -4.80697], "size": [3, 0, 2], "pivot": [-22.21321, 22.5, -3.90958], "rotation": [15, -35, -20], "uv": [47, 6]}, - {"origin": [-25.75, 23, -3], "size": [3, 0, 3], "pivot": [-23, 22.5, -1.5], "rotation": [0, 0, -15], "uv": [52, 6]}, - {"origin": [-24.66733, 23, -0.19303], "size": [3, 0, 2], "pivot": [-22.21321, 22.5, 0.90958], "rotation": [-15, 35, -20], "uv": [53, 9]} - ] - }, - { - "name": "arm_left", - "parent": "torso", - "pivot": [9, 25, -1.5], - "cubes": [ - {"origin": [7, 20, -4.5], "size": [6, 5, 6], "uv": [104, 30], "mirror": true} - ] - }, - { - "name": "arm_left2", - "parent": "arm_left", - "pivot": [13, 22.5, 1.5], - "cubes": [ - {"origin": [13, 20, -4.5], "size": [5, 5, 6], "uv": [62, 19], "mirror": true} - ] - }, - { - "name": "arm_left3", - "parent": "arm_left2", - "pivot": [18, 22.5, 1.5], - "cubes": [ - {"origin": [18, 20, -4.5], "size": [5, 5, 6], "uv": [84, 19], "mirror": true}, - {"origin": [21.66733, 23, -4.80697], "size": [3, 0, 2], "pivot": [22.21321, 22.5, -3.90958], "rotation": [15, 35, 20], "uv": [47, 8], "mirror": true}, - {"origin": [22.75, 23, -3], "size": [3, 0, 3], "pivot": [23, 22.5, -1.5], "rotation": [0, 0, 15], "uv": [46, 10], "mirror": true}, - {"origin": [21.66733, 23, -0.19303], "size": [3, 0, 2], "pivot": [22.21321, 22.5, 0.90958], "rotation": [-15, -35, 20], "uv": [53, 11], "mirror": true} - ] - }, - { - "name": "cannon_right0", - "parent": "torso", - "pivot": [-7, 25.75, 6.5] - }, - { - "name": "cannon_right", - "parent": "cannon_right0", - "pivot": [-7, 26.75, 3.75], - "rotation": [-55, 2.5, -42.5], - "cubes": [ - {"origin": [-10.5, 26.75, 1.75], "size": [7, 5, 6], "uv": [76, 41]}, - {"origin": [-8.25, 28, -2.25], "size": [2, 2, 4], "uv": [38, 42]}, - {"origin": [-8.75, 27.5, -6.25], "size": [3, 3, 4], "uv": [29, 35]} - ] - }, - { - "name": "cannon_left0", - "parent": "torso", - "pivot": [7, 25.75, 6.5] - }, - { - "name": "cannon_left", - "parent": "cannon_left0", - "pivot": [7, 26.75, 3.75], - "rotation": [-55, -2.5, 42.5], - "cubes": [ - {"origin": [3.5, 26.75, 1.75], "size": [7, 5, 6], "uv": [102, 41], "mirror": true}, - {"origin": [6.25, 28, -2.25], "size": [2, 2, 4], "uv": [38, 48], "mirror": true}, - {"origin": [5.75, 27.5, -6.25], "size": [3, 3, 4], "uv": [43, 35], "mirror": true} - ] - }, - { - "name": "tail", - "parent": "torso", - "pivot": [0, 6.5, 6.5], - "cubes": [ - {"origin": [0, 4.5, 5.5], "size": [0, 6, 8], "uv": [49, -8]} + {"origin": [0, -8, -0.5], "size": [0, 5, 5], "uv": [0, 32]} ] }, { "name": "leg_right", - "parent": "body", - "pivot": [-7.5, 8.5, -2], - "rotation": [0, 5, 0], + "parent": "body2", + "pivot": [-13, 11, -5], "cubes": [ - {"origin": [-11, 0, -6], "size": [7, 11, 8], "uv": [62, 0]}, - {"origin": [-10, 0, -10], "size": [0, 3, 4], "pivot": [-10, 1.5, -6], "rotation": [0, 30, 0], "uv": [0, 34]}, - {"origin": [-7.5, 0, -12], "size": [0, 4, 6], "uv": [0, 3]}, - {"origin": [-5, 0, -10], "size": [0, 3, 4], "pivot": [-5, 1.5, -6], "rotation": [0, -30, 0], "uv": [4, -4]}, - {"origin": [-7.5, 0, -2], "size": [0, 3, 4], "pivot": [-7.5, 1.5, 2], "rotation": [-180, 0, 180], "uv": [0, 31]} + {"origin": [-18, 6, -11], "size": [10, 9, 11], "uv": [52, 107]} + ] + }, + { + "name": "knee_right", + "parent": "leg_right", + "pivot": [-13, 6, -10], + "cubes": [ + {"origin": [-17, 3, -10], "size": [8, 3, 10], "uv": [0, 141]} + ] + }, + { + "name": "foot_right", + "parent": "knee_right", + "pivot": [-13, 3, -10], + "cubes": [ + {"origin": [-17, 0, -10], "size": [8, 3, 10], "inflate": 0.01, "uv": [140, 56]} + ] + }, + { + "name": "right_toes", + "parent": "foot_right", + "pivot": [-17, 0, -10] + }, + { + "name": "right_toe_out", + "parent": "right_toes", + "pivot": [-17, 0, -10], + "rotation": [0, 27.5, 0], + "cubes": [ + {"origin": [-17, 0, -13], "size": [0, 2, 3], "uv": [0, 43]} + ] + }, + { + "name": "right_toe_in", + "parent": "right_toes", + "pivot": [-9, 0, -10], + "rotation": [0, -27.5, 0], + "cubes": [ + {"origin": [-9, 0, -13], "size": [0, 2, 3], "uv": [6, 11]} + ] + }, + { + "name": "right_toe_front", + "parent": "right_toes", + "pivot": [-13, 0, -10], + "cubes": [ + {"origin": [-13, 0, -16], "size": [0, 3, 6], "uv": [73, 39]} + ] + }, + { + "name": "right_toe_back", + "parent": "foot_right", + "pivot": [-13, 0, 0], + "cubes": [ + {"origin": [-13, 0, 0], "size": [0, 2, 3], "uv": [84, 53]} ] }, { "name": "leg_left", - "parent": "body", - "pivot": [7.5, 8.5, -2], - "rotation": [0, -5, 0], + "parent": "body2", + "pivot": [13, 11, -5], "cubes": [ - {"origin": [4, 0, -6], "size": [7, 11, 8], "uv": [92, 0]}, - {"origin": [5, 0, -10], "size": [0, 3, 4], "pivot": [5, 1.5, -6], "rotation": [0, 30, 0], "uv": [0, 49]}, - {"origin": [7.5, 0, -12], "size": [0, 4, 6], "uv": [0, -1]}, - {"origin": [10, 0, -10], "size": [0, 3, 4], "pivot": [10, 1.5, -6], "rotation": [0, -30, 0], "uv": [0, 37]}, - {"origin": [7.5, 0, -2], "size": [0, 3, 4], "pivot": [7.5, 1.5, 2], "rotation": [-180, 0, 180], "uv": [0, 37]} + {"origin": [8, 6, -11], "size": [10, 9, 11], "uv": [102, 0]} + ] + }, + { + "name": "knee_left", + "parent": "leg_left", + "pivot": [13, 6, -10], + "cubes": [ + {"origin": [9, 3, -10], "size": [8, 3, 10], "uv": [138, 107]} + ] + }, + { + "name": "foot_left", + "parent": "knee_left", + "pivot": [13, 3, -10], + "cubes": [ + {"origin": [9, 0, -10], "size": [8, 3, 10], "inflate": 0.01, "uv": [66, 137]} + ] + }, + { + "name": "left_toes", + "parent": "foot_left", + "pivot": [17, 0, -10] + }, + { + "name": "left_toe_out", + "parent": "left_toes", + "pivot": [17, 0, -10], + "rotation": [0, -27.5, 0], + "cubes": [ + {"origin": [17, 0, -13], "size": [0, 2, 3], "uv": [0, 11]} + ] + }, + { + "name": "left_toe_in", + "parent": "left_toes", + "pivot": [9, 0, -10], + "rotation": [0, 27.5, 0], + "cubes": [ + {"origin": [9, 0, -13], "size": [0, 2, 3], "uv": [8, 1]} + ] + }, + { + "name": "left_toe_front", + "parent": "left_toes", + "pivot": [13, 0, -10], + "cubes": [ + {"origin": [13, 0, -16], "size": [0, 3, 6], "uv": [73, 36]} + ] + }, + { + "name": "left_toe_back", + "parent": "foot_left", + "pivot": [13, 0, 0], + "cubes": [ + {"origin": [13, 0, 0], "size": [0, 2, 3], "uv": [0, 0]} ] } ] diff --git a/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/blastoise.json b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/blastoise.json new file mode 100644 index 0000000000..748f609d9a --- /dev/null +++ b/common/src/main/resources/assets/cobblemon/bedrock/pokemon/posers/blastoise.json @@ -0,0 +1,68 @@ +{ + "portraitScale": 1.3, + "portraitTranslation": [-0.7, 2.1, 0], + "profileScale": 0.4, + "profileTranslation": [-0.1, 1.1, 0], + "animations": { + "faint": "q.bedrock_primary('blastoise', 'faint', q.curve('one'))", + "cry": "q.bedrock_stateful('blastoise', 'cry')", + "recoil": "q.bedrock_stateful('blastoise', 'recoil')", + "physical": "q.bedrock_primary('blastoise', 'physical', q.curve('symmetrical_wide'))", + "special": "q.bedrock_primary('blastoise', 'special', q.curve('symmetrical_wide'))", + "status": "q.bedrock_primary('blastoise', 'status', q.curve('symmetrical_wide'))" + }, + "poses": { + "battle-standing": { + "poseTypes": ["STAND"], + "isBattle": true, + "animations": [ + "q.look('head_ai')", + "q.bedrock('blastoise', 'battle_idle')" + ], + "quirks": [ + "q.bedrock_quirk('blastoise', 'blink')", + "q.bedrock_quirk('blastoise', q.array('quirk_battle_idle', 'quirk_battle_idle2'), 30, 60, 1)" + ] + }, + "standing": { + "poseTypes": ["STAND", "NONE", "PORTRAIT", "PROFILE"], + "isBattle": false, + "animations": [ + "q.look('head_ai')", + "q.bedrock('blastoise', 'ground_idle')" + ], + "quirks": [ + "q.bedrock_quirk('blastoise', 'blink')", + "q.bedrock_quirk('blastoise', 'quirk_ground_idle', 20, 60, 1)" + ] + }, + "walking": { + "poseTypes": ["WALK"], + "animations": [ + "q.look('head_ai')", + "q.bedrock('blastoise', 'ground_walk')" + ], + "quirks": ["q.bedrock_quirk('blastoise', 'blink')"] + }, + "float": { + "poseTypes": ["FLOAT"], + "animations": [ + "q.look('head_ai')", + "q.bedrock('blastoise', 'water_idle')" + ], + "quirks": ["q.bedrock_quirk('blastoise', 'blink')"] + }, + "swim": { + "poseTypes": ["SWIM"], + "animations": [ + "q.look('head_ai')", + "q.bedrock('blastoise', 'water_swim')" + ], + "quirks": ["q.bedrock_quirk('blastoise', 'blink')"] + }, + "sleep": { + "poseTypes": ["SLEEP"], + "animations": ["q.bedrock('blastoise', 'sleep')"] + } + } +} \ No newline at end of file diff --git a/common/src/main/resources/assets/cobblemon/particles/snowstorm.json b/common/src/main/resources/assets/cobblemon/particles/snowstorm.json index 988327ccd1..1bae5b3f5e 100644 --- a/common/src/main/resources/assets/cobblemon/particles/snowstorm.json +++ b/common/src/main/resources/assets/cobblemon/particles/snowstorm.json @@ -2,24 +2,62 @@ "textures": [ "cobblemon:bigsparkle", "cobblemon:bubble", + "cobblemon:bubble_large", "cobblemon:cherry_petal", "cobblemon:confetti", + "cobblemon:crit", + "cobblemon:cut", + "cobblemon:drip", + "cobblemon:electricity", + "cobblemon:energyball", + "cobblemon:fang", + "cobblemon:fist", + "cobblemon:foot", "cobblemon:goo", + "cobblemon:hit", + "cobblemon:impact-bug", + "cobblemon:impact-dark", + "cobblemon:impact-dragon", + "cobblemon:impact-electric", + "cobblemon:impact-fairy", + "cobblemon:impact-fighting", + "cobblemon:impact-fire", + "cobblemon:impact-flying", + "cobblemon:impact-ghost", + "cobblemon:impact-grass", + "cobblemon:impact-ground", + "cobblemon:impact-ice", + "cobblemon:impact-normal", + "cobblemon:impact-poison", + "cobblemon:impact-psychic", + "cobblemon:impact-rock", + "cobblemon:impact-steel", + "cobblemon:impact-water", "cobblemon:lava_bubble", "cobblemon:lightbeam", + "cobblemon:maus", "cobblemon:obscuringsmoke", + "cobblemon:ooze", + "cobblemon:orb", "cobblemon:pokeball_smoke", + "cobblemon:ripple", + "cobblemon:sand_tomb_1", + "cobblemon:sand_tomb_2", + "cobblemon:scratch", "cobblemon:shiny_lava_bubble", + "cobblemon:slash", "cobblemon:sleep_zzz", - "cobblemon:bubble", - "cobblemon:confetti", - "cobblemon:cherry_petal", "cobblemon:smoke", "cobblemon:sparkle", "cobblemon:speedlines", "cobblemon:star", + "cobblemon:stat_up", + "cobblemon:swipe", "cobblemon:tailflame", "cobblemon:vanilla_smoke", + "cobblemon:waterjet", + "cobblemon:waterjet_head", + "cobblemon:white_bubble", "cobblemon:glowing_dots_cyan", "cobblemon:glowing_smoke_cyan", "cobblemon:glowing_sparkle_yellow", diff --git a/common/src/main/resources/assets/cobblemon/sounds.json b/common/src/main/resources/assets/cobblemon/sounds.json index d57e84daba..1b3624c8af 100644 --- a/common/src/main/resources/assets/cobblemon/sounds.json +++ b/common/src/main/resources/assets/cobblemon/sounds.json @@ -185,6 +185,75 @@ "cobblemon:block/tumblestone/tumblestone_step_4" ] }, + "flamethrower": { + "sounds": [ "cobblemon:attacks/flamethrower" ] + }, + "effective": { + "sounds": [ "cobblemon:effective" ] + }, + "fuse": { + "sounds": [ "cobblemon:fuse" ] + }, + "notveryeffective": { + "sounds": [ "cobblemon:notveryeffective" ] + }, + "supereffective": { + "sounds": [ "cobblemon:supereffective" ] + }, + "impact.normal": { + "sounds": [ "cobblemon:attacks/impacts/impact_normal" ] + }, + "impact.ice": { + "sounds": [ "cobblemon:attacks/impacts/impact_ice" ] + }, + "impact.water": { + "sounds": [ "cobblemon:attacks/impacts/impact_water" ] + }, + "impact.fire": { + "sounds": [ "cobblemon:attacks/impacts/impact_fire" ] + }, + "impact.electric": { + "sounds": [ "cobblemon:attacks/impacts/impact_electric" ] + }, + "impact.grass": { + "sounds": [ "cobblemon:attacks/impacts/impact_grass" ] + }, + "impact.fighting": { + "sounds": [ "cobblemon:attacks/impacts/impact_fighting" ] + }, + "impact.poison": { + "sounds": [ "cobblemon:attacks/impacts/impact_poison" ] + }, + "impact.ground": { + "sounds": [ "cobblemon:attacks/impacts/impact_ground" ] + }, + "impact.flying": { + "sounds": [ "cobblemon:attacks/impacts/impact_flying" ] + }, + "impact.psychic": { + "sounds": [ "cobblemon:attacks/impacts/impact_psychic" ] + }, + "impact.bug": { + "sounds": [ "cobblemon:attacks/impacts/impact_bug" ] + }, + "impact.rock": { + "sounds": [ "cobblemon:attacks/impacts/impact_rock" ] + }, + "impact.ghost": { + "sounds": [ "cobblemon:attacks/impacts/impact_ghost" ] + }, + "impact.dragon": { + "sounds": [ "cobblemon:attacks/impacts/impact_dragon" ] + }, + "impact.dark": { + "sounds": [ "cobblemon:attacks/impacts/impact_dark" ] + }, + "impact.steel": { + "sounds": [ "cobblemon:attacks/impacts/impact_steel" ] + }, + "impact.fairy": { + "sounds": [ "cobblemon:attacks/impacts/impact_fairy" ] + }, "pokemon.bulbasaur.ambient": { "sounds": [ "cobblemon:pokemon/bulbasaur/bulbasaur_ambient" ] }, diff --git a/.ignored/assets/particles/sounds/flamethrower.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower.ogg similarity index 100% rename from .ignored/assets/particles/sounds/flamethrower.ogg rename to common/src/main/resources/assets/cobblemon/sounds/attacks/flamethrower.ogg diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_bug.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_bug.ogg new file mode 100644 index 0000000000..afec1b6431 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_bug.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_dark.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_dark.ogg new file mode 100644 index 0000000000..aa1516690d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_dark.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_dragon.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_dragon.ogg new file mode 100644 index 0000000000..e09ddc9636 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_dragon.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_electric.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_electric.ogg new file mode 100644 index 0000000000..23644fff23 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_electric.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fairy.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fairy.ogg new file mode 100644 index 0000000000..830b251af8 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fairy.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fighting.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fighting.ogg new file mode 100644 index 0000000000..a6dab367b9 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fighting.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fire.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fire.ogg new file mode 100644 index 0000000000..1ec7dd0cbc Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_fire.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_flying.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_flying.ogg new file mode 100644 index 0000000000..15247ce9ce Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_flying.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ghost.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ghost.ogg new file mode 100644 index 0000000000..05f269d09c Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ghost.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_grass.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_grass.ogg new file mode 100644 index 0000000000..fbda9ca121 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_grass.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ground.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ground.ogg new file mode 100644 index 0000000000..050701cb50 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ground.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ice.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ice.ogg new file mode 100644 index 0000000000..33ee6f4958 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_ice.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_normal.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_normal.ogg new file mode 100644 index 0000000000..7e42649b4d Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_normal.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_poison.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_poison.ogg new file mode 100644 index 0000000000..74edd63584 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_poison.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_psychic.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_psychic.ogg new file mode 100644 index 0000000000..785ee206ad Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_psychic.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_rock.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_rock.ogg new file mode 100644 index 0000000000..9297d0a6d4 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_rock.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_steel.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_steel.ogg new file mode 100644 index 0000000000..68f618a5b0 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_steel.ogg differ diff --git a/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_water.ogg b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_water.ogg new file mode 100644 index 0000000000..25b7bb4642 Binary files /dev/null and b/common/src/main/resources/assets/cobblemon/sounds/attacks/impacts/impact_water.ogg differ diff --git a/.ignored/assets/particles/sounds/effective.ogg b/common/src/main/resources/assets/cobblemon/sounds/effective.ogg similarity index 100% rename from .ignored/assets/particles/sounds/effective.ogg rename to common/src/main/resources/assets/cobblemon/sounds/effective.ogg diff --git a/.ignored/assets/particles/sounds/fuse.ogg b/common/src/main/resources/assets/cobblemon/sounds/fuse.ogg similarity index 100% rename from .ignored/assets/particles/sounds/fuse.ogg rename to common/src/main/resources/assets/cobblemon/sounds/fuse.ogg diff --git a/.ignored/assets/particles/sounds/notveryeffective.ogg b/common/src/main/resources/assets/cobblemon/sounds/notveryeffective.ogg similarity index 100% rename from .ignored/assets/particles/sounds/notveryeffective.ogg rename to common/src/main/resources/assets/cobblemon/sounds/notveryeffective.ogg diff --git a/.ignored/assets/particles/sounds/supereffective.ogg b/common/src/main/resources/assets/cobblemon/sounds/supereffective.ogg similarity index 100% rename from .ignored/assets/particles/sounds/supereffective.ogg rename to common/src/main/resources/assets/cobblemon/sounds/supereffective.ogg diff --git a/.ignored/assets/particles/textures/particle/bubble_large.png b/common/src/main/resources/assets/cobblemon/textures/particle/bubble_large.png similarity index 100% rename from .ignored/assets/particles/textures/particle/bubble_large.png rename to common/src/main/resources/assets/cobblemon/textures/particle/bubble_large.png diff --git a/.ignored/assets/particles/textures/particle/crit.png b/common/src/main/resources/assets/cobblemon/textures/particle/crit.png similarity index 100% rename from .ignored/assets/particles/textures/particle/crit.png rename to common/src/main/resources/assets/cobblemon/textures/particle/crit.png diff --git a/.ignored/assets/particles/textures/particle/cut.png b/common/src/main/resources/assets/cobblemon/textures/particle/cut.png similarity index 100% rename from .ignored/assets/particles/textures/particle/cut.png rename to common/src/main/resources/assets/cobblemon/textures/particle/cut.png diff --git a/.ignored/assets/particles/textures/particle/drip.png b/common/src/main/resources/assets/cobblemon/textures/particle/drip.png similarity index 100% rename from .ignored/assets/particles/textures/particle/drip.png rename to common/src/main/resources/assets/cobblemon/textures/particle/drip.png diff --git a/.ignored/assets/particles/textures/particle/electricity.png b/common/src/main/resources/assets/cobblemon/textures/particle/electricity.png similarity index 100% rename from .ignored/assets/particles/textures/particle/electricity.png rename to common/src/main/resources/assets/cobblemon/textures/particle/electricity.png diff --git a/.ignored/assets/particles/textures/particle/energyball.png b/common/src/main/resources/assets/cobblemon/textures/particle/energyball.png similarity index 100% rename from .ignored/assets/particles/textures/particle/energyball.png rename to common/src/main/resources/assets/cobblemon/textures/particle/energyball.png diff --git a/.ignored/assets/particles/textures/particle/fang.png b/common/src/main/resources/assets/cobblemon/textures/particle/fang.png similarity index 100% rename from .ignored/assets/particles/textures/particle/fang.png rename to common/src/main/resources/assets/cobblemon/textures/particle/fang.png diff --git a/.ignored/assets/particles/textures/particle/fist.png b/common/src/main/resources/assets/cobblemon/textures/particle/fist.png similarity index 100% rename from .ignored/assets/particles/textures/particle/fist.png rename to common/src/main/resources/assets/cobblemon/textures/particle/fist.png diff --git a/.ignored/assets/particles/textures/particle/foot.png b/common/src/main/resources/assets/cobblemon/textures/particle/foot.png similarity index 100% rename from .ignored/assets/particles/textures/particle/foot.png rename to common/src/main/resources/assets/cobblemon/textures/particle/foot.png diff --git a/.ignored/assets/particles/textures/particle/hit.png b/common/src/main/resources/assets/cobblemon/textures/particle/hit.png similarity index 100% rename from .ignored/assets/particles/textures/particle/hit.png rename to common/src/main/resources/assets/cobblemon/textures/particle/hit.png diff --git a/.ignored/assets/particles/textures/particle/impact-bug.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-bug.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-bug.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-bug.png diff --git a/.ignored/assets/particles/textures/particle/impact-dark.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-dark.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-dark.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-dark.png diff --git a/.ignored/assets/particles/textures/particle/impact-dragon.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-dragon.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-dragon.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-dragon.png diff --git a/.ignored/assets/particles/textures/particle/impact-electric.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-electric.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-electric.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-electric.png diff --git a/.ignored/assets/particles/textures/particle/impact-fairy.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-fairy.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-fairy.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-fairy.png diff --git a/.ignored/assets/particles/textures/particle/impact-fighting.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-fighting.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-fighting.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-fighting.png diff --git a/.ignored/assets/particles/textures/particle/impact-fire.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-fire.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-fire.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-fire.png diff --git a/.ignored/assets/particles/textures/particle/impact-flying.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-flying.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-flying.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-flying.png diff --git a/.ignored/assets/particles/textures/particle/impact-ghost.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-ghost.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-ghost.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-ghost.png diff --git a/.ignored/assets/particles/textures/particle/impact-grass.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-grass.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-grass.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-grass.png diff --git a/.ignored/assets/particles/textures/particle/impact-ground.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-ground.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-ground.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-ground.png diff --git a/.ignored/assets/particles/textures/particle/impact-ice.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-ice.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-ice.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-ice.png diff --git a/.ignored/assets/particles/textures/particle/impact-normal.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-normal.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-normal.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-normal.png diff --git a/.ignored/assets/particles/textures/particle/impact-poison.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-poison.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-poison.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-poison.png diff --git a/.ignored/assets/particles/textures/particle/impact-psychic.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-psychic.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-psychic.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-psychic.png diff --git a/.ignored/assets/particles/textures/particle/impact-rock.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-rock.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-rock.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-rock.png diff --git a/.ignored/assets/particles/textures/particle/impact-steel.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-steel.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-steel.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-steel.png diff --git a/.ignored/assets/particles/textures/particle/impact-water.png b/common/src/main/resources/assets/cobblemon/textures/particle/impact-water.png similarity index 100% rename from .ignored/assets/particles/textures/particle/impact-water.png rename to common/src/main/resources/assets/cobblemon/textures/particle/impact-water.png diff --git a/.ignored/assets/particles/textures/particle/leaf.png b/common/src/main/resources/assets/cobblemon/textures/particle/leaf.png similarity index 100% rename from .ignored/assets/particles/textures/particle/leaf.png rename to common/src/main/resources/assets/cobblemon/textures/particle/leaf.png diff --git a/.ignored/assets/particles/textures/particle/maus.png b/common/src/main/resources/assets/cobblemon/textures/particle/maus.png similarity index 100% rename from .ignored/assets/particles/textures/particle/maus.png rename to common/src/main/resources/assets/cobblemon/textures/particle/maus.png diff --git a/.ignored/assets/particles/textures/particle/ooze.png b/common/src/main/resources/assets/cobblemon/textures/particle/ooze.png similarity index 100% rename from .ignored/assets/particles/textures/particle/ooze.png rename to common/src/main/resources/assets/cobblemon/textures/particle/ooze.png diff --git a/.ignored/assets/particles/textures/particle/orb.png b/common/src/main/resources/assets/cobblemon/textures/particle/orb.png similarity index 100% rename from .ignored/assets/particles/textures/particle/orb.png rename to common/src/main/resources/assets/cobblemon/textures/particle/orb.png diff --git a/.ignored/assets/particles/textures/particle/ripple.png b/common/src/main/resources/assets/cobblemon/textures/particle/ripple.png similarity index 100% rename from .ignored/assets/particles/textures/particle/ripple.png rename to common/src/main/resources/assets/cobblemon/textures/particle/ripple.png diff --git a/.ignored/assets/particles/textures/particle/sand_tomb_1.png b/common/src/main/resources/assets/cobblemon/textures/particle/sand_tomb_1.png similarity index 100% rename from .ignored/assets/particles/textures/particle/sand_tomb_1.png rename to common/src/main/resources/assets/cobblemon/textures/particle/sand_tomb_1.png diff --git a/.ignored/assets/particles/textures/particle/sand_tomb_2.png b/common/src/main/resources/assets/cobblemon/textures/particle/sand_tomb_2.png similarity index 100% rename from .ignored/assets/particles/textures/particle/sand_tomb_2.png rename to common/src/main/resources/assets/cobblemon/textures/particle/sand_tomb_2.png diff --git a/.ignored/assets/particles/textures/particle/scratch.png b/common/src/main/resources/assets/cobblemon/textures/particle/scratch.png similarity index 100% rename from .ignored/assets/particles/textures/particle/scratch.png rename to common/src/main/resources/assets/cobblemon/textures/particle/scratch.png diff --git a/.ignored/assets/particles/textures/particle/shiny.png b/common/src/main/resources/assets/cobblemon/textures/particle/shiny.png similarity index 100% rename from .ignored/assets/particles/textures/particle/shiny.png rename to common/src/main/resources/assets/cobblemon/textures/particle/shiny.png diff --git a/.ignored/assets/particles/textures/particle/shiny_bw.png b/common/src/main/resources/assets/cobblemon/textures/particle/shiny_bw.png similarity index 100% rename from .ignored/assets/particles/textures/particle/shiny_bw.png rename to common/src/main/resources/assets/cobblemon/textures/particle/shiny_bw.png diff --git a/.ignored/assets/particles/textures/particle/shiny_bw_square.png b/common/src/main/resources/assets/cobblemon/textures/particle/shiny_bw_square.png similarity index 100% rename from .ignored/assets/particles/textures/particle/shiny_bw_square.png rename to common/src/main/resources/assets/cobblemon/textures/particle/shiny_bw_square.png diff --git a/.ignored/assets/particles/textures/particle/shiny_send_out.gif b/common/src/main/resources/assets/cobblemon/textures/particle/shiny_send_out.gif similarity index 100% rename from .ignored/assets/particles/textures/particle/shiny_send_out.gif rename to common/src/main/resources/assets/cobblemon/textures/particle/shiny_send_out.gif diff --git a/.ignored/assets/particles/textures/particle/shiny_square.png b/common/src/main/resources/assets/cobblemon/textures/particle/shiny_square.png similarity index 100% rename from .ignored/assets/particles/textures/particle/shiny_square.png rename to common/src/main/resources/assets/cobblemon/textures/particle/shiny_square.png diff --git a/.ignored/assets/particles/textures/particle/slash.png b/common/src/main/resources/assets/cobblemon/textures/particle/slash.png similarity index 100% rename from .ignored/assets/particles/textures/particle/slash.png rename to common/src/main/resources/assets/cobblemon/textures/particle/slash.png diff --git a/.ignored/assets/particles/textures/particle/stat_up.png b/common/src/main/resources/assets/cobblemon/textures/particle/stat_up.png similarity index 100% rename from .ignored/assets/particles/textures/particle/stat_up.png rename to common/src/main/resources/assets/cobblemon/textures/particle/stat_up.png diff --git a/.ignored/assets/particles/textures/particle/swipe.png b/common/src/main/resources/assets/cobblemon/textures/particle/swipe.png similarity index 100% rename from .ignored/assets/particles/textures/particle/swipe.png rename to common/src/main/resources/assets/cobblemon/textures/particle/swipe.png diff --git a/.ignored/assets/particles/textures/particle/waterjet.png b/common/src/main/resources/assets/cobblemon/textures/particle/waterjet.png similarity index 100% rename from .ignored/assets/particles/textures/particle/waterjet.png rename to common/src/main/resources/assets/cobblemon/textures/particle/waterjet.png diff --git a/.ignored/assets/particles/textures/particle/waterjet_head.png b/common/src/main/resources/assets/cobblemon/textures/particle/waterjet_head.png similarity index 100% rename from .ignored/assets/particles/textures/particle/waterjet_head.png rename to common/src/main/resources/assets/cobblemon/textures/particle/waterjet_head.png diff --git a/.ignored/assets/particles/textures/particle/white_bubble.png b/common/src/main/resources/assets/cobblemon/textures/particle/white_bubble.png similarity index 100% rename from .ignored/assets/particles/textures/particle/white_bubble.png rename to common/src/main/resources/assets/cobblemon/textures/particle/white_bubble.png diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise.png index cc570c4c26..f5c355bc4a 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise.png differ diff --git a/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise_shiny.png b/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise_shiny.png index 3f5fdde2f6..827ae5a4b8 100644 Binary files a/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise_shiny.png and b/common/src/main/resources/assets/cobblemon/textures/pokemon/0009_blastoise/blastoise_shiny.png differ diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/dragonclaw.json b/common/src/main/resources/data/cobblemon/action_effects/moves/dragonclaw.json new file mode 100644 index 0000000000..3b41e64e14 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/dragonclaw.json @@ -0,0 +1,27 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["dragonclaw", "scratch", "physical"], + "delay": 1.02 + }, + { + "type": "entity_molang", + "entityCondition": "q.entity.is_user == false", + "expressions": ["q.play_animation(q.bedrock_stateful('particle_dummy', 'dragon_claw_target'))"], + "delay": 0.1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 2 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/flamethrower.json b/common/src/main/resources/data/cobblemon/action_effects/moves/flamethrower.json new file mode 100644 index 0000000000..5447017030 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/flamethrower.json @@ -0,0 +1,32 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["flamethrower", "fire", "special"], + "delay": 1.15 + }, + { + "type": "entity_molang", + "expressions": ["q.play_animation(q.bedrock_stateful('particle_dummy', 'flamethrower_actor'))"], + "delay": 0.6 + }, + { + "type": "entity_molang", + "expressions": ["q.play_animation(q.bedrock_stateful('particle_dummy', 'flamethrower_target'))"], + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "delay": 0.1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 1.9 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/generic/physical_normal.json b/common/src/main/resources/data/cobblemon/action_effects/moves/generic/physical_normal.json new file mode 100644 index 0000000000..6ac4556570 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/generic/physical_normal.json @@ -0,0 +1,28 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["physical"], + "delay": 1.2 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "entity_molang", + "entityCondition": "q.entity.is_user == false", + "expressions": ["q.sound('impact_normal');"] + }, + { + "type": "entity_molang", + "expressions": ["q.particle('cobblemon:impact_normal', 'target')"], + "entityCondition": "q.entity.is_user == false", + "delay": 2 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/generic_move.json b/common/src/main/resources/data/cobblemon/action_effects/moves/generic_move.json new file mode 100644 index 0000000000..787211689e --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/generic_move.json @@ -0,0 +1,42 @@ +{ + "timeline": [ + { + "type": "add_holds", + "holds": ["effects"] + }, + { + "type": "animation", + "animation": ["q.move.name", "q.move.damage_category"], + "delay": 1.2 + }, + { + "type": "sequence", + "condition": "q.move.damage_category != 'status'", + "keyframes": [ + { + "type": "entity_sound", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "sound": "'cobblemon:impact.' + q.move.type" + }, + { + "type": "entity_particles", + "entityCondition": "q.entity.is_user == false && q.missed(q.entity.uuid) == false", + "effect": "'cobblemon:impact_' + q.move.type", + "locator": "target" + } + ] + }, + { + "type": "pause", + "pause": 0.1 + }, + { + "type": "remove_holds", + "holds": ["effects"] + }, + { + "type": "pause", + "pause": 2 + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/action_effects/moves/oldscratch.json b/common/src/main/resources/data/cobblemon/action_effects/moves/oldscratch.json new file mode 100644 index 0000000000..d33a00aa67 --- /dev/null +++ b/common/src/main/resources/data/cobblemon/action_effects/moves/oldscratch.json @@ -0,0 +1,33 @@ +{ + "timeline": [ + { + "type": "sequence", + "condition": "q.do_effect_walks", + "keyframes": [ + "save_position", + "move_to_target", + "pause" + ] + }, + { + "type": "animation", + "animation": ["scratch", "physical"], + "variables": [ + "v.animation='cobblemon:scratch'" + ], + "delay": "q.do_effect_walks ? 3 : 1" + }, + { + "type": "remove_holds", + "holds": ["damage"] + }, + { + "type": "sequence", + "condition": "q.do_effect_walks", + "keyframes": [ + "return_to_position", + "pause" + ] + } + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json index 4ab3cade84..b050466824 100644 --- a/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json +++ b/common/src/main/resources/data/cobblemon/species/generation1/blastoise.json @@ -335,10 +335,10 @@ ], "preEvolution": "wartortle", "evolutions": [], - "baseScale": 1.3, + "baseScale": 0.9, "hitbox": { - "width": 1.1, - "height": 2.1, + "width": 1.8, + "height": 2.75, "fixed": false }, "baseFriendship": 50, diff --git a/deps/local/com/bedrockk/molang/1.1.10/molang-1.1.10.jar b/deps/local/com/bedrockk/molang/1.1.11/molang-1.1.11.jar similarity index 84% rename from deps/local/com/bedrockk/molang/1.1.10/molang-1.1.10.jar rename to deps/local/com/bedrockk/molang/1.1.11/molang-1.1.11.jar index 9bb4acb9b3..a92d2815b5 100644 Binary files a/deps/local/com/bedrockk/molang/1.1.10/molang-1.1.10.jar and b/deps/local/com/bedrockk/molang/1.1.11/molang-1.1.11.jar differ diff --git a/deps/local/com/bedrockk/molang/1.1.10/molang-1.1.10.pom b/deps/local/com/bedrockk/molang/1.1.11/molang-1.1.11.pom similarity index 92% rename from deps/local/com/bedrockk/molang/1.1.10/molang-1.1.10.pom rename to deps/local/com/bedrockk/molang/1.1.11/molang-1.1.11.pom index 2fd2b4f560..6b11b3ee7b 100644 --- a/deps/local/com/bedrockk/molang/1.1.10/molang-1.1.10.pom +++ b/deps/local/com/bedrockk/molang/1.1.11/molang-1.1.11.pom @@ -4,5 +4,5 @@ 4.0.0 local.com.bedrockk molang - 1.1.10 + 1.1.11 diff --git a/deps/local/com/bedrockk/molang/1.1.9/molang-1.1.9.jar b/deps/local/com/bedrockk/molang/1.1.9/molang-1.1.9.jar deleted file mode 100644 index 5cfbd48ce4..0000000000 Binary files a/deps/local/com/bedrockk/molang/1.1.9/molang-1.1.9.jar and /dev/null differ diff --git a/deps/local/com/bedrockk/molang/1.1.9/molang-1.1.9.pom b/deps/local/com/bedrockk/molang/1.1.9/molang-1.1.9.pom deleted file mode 100644 index 3a65988544..0000000000 --- a/deps/local/com/bedrockk/molang/1.1.9/molang-1.1.9.pom +++ /dev/null @@ -1,8 +0,0 @@ - - - 4.0.0 - local.com.bedrockk - molang - 1.1.9 - diff --git a/deps/local/com/bedrockk/molang/maven-metadata-local.xml b/deps/local/com/bedrockk/molang/maven-metadata-local.xml index 0fa7d350dc..5343483710 100644 --- a/deps/local/com/bedrockk/molang/maven-metadata-local.xml +++ b/deps/local/com/bedrockk/molang/maven-metadata-local.xml @@ -3,10 +3,10 @@ local.com.bedrockk molang - 1.1.10 + 1.1.11 - 1.1.10 + 1.1.11 - 20231949238999 + 20231949239999 diff --git a/gradle/libs.versions.yml b/gradle/libs.versions.yml index 17940fff31..feac89aeac 100644 --- a/gradle/libs.versions.yml +++ b/gradle/libs.versions.yml @@ -29,7 +29,7 @@ versions: # common graal: 22.3.0 - molang: 1.1.10 + molang: 1.1.11 # test junit: 5.9.0 diff --git a/utilityscripts/cobblemon_cry_checker.py b/utilityscripts/cobblemon_cry_checker.py index dc1591e30d..0f4154f280 100644 --- a/utilityscripts/cobblemon_cry_checker.py +++ b/utilityscripts/cobblemon_cry_checker.py @@ -87,7 +87,7 @@ def main(print_missing_models=False, print_missing_animations=False): invalid_model_files.append(("Missing import", model_file_path.replace( '../common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/', ""))) - elif f'override val cryAnimation = CryProvider {{ _, _ -> bedrockStateful("{sanitized_pokemon_name_lower}", "cry").setPreventsIdle(false) }}' not in content: + elif f'override val cryAnimation = CryProvider {{ _, _ -> bedrockStateful("{sanitized_pokemon_name_lower}", "cry") }}' not in content: if "override val cryAnimation = CryProvider {" not in content or 'bedrockStateful("' not in content: invalid_model_files.append(("Missing cryAnimation override", model_file_path.replace( '../common/src/main/kotlin/com/cobblemon/mod/common/client/render/models/blockbench/pokemon/',