Add lapras assets

common/src/main/resources/assets/cobblemon/bedrock/pokemon/models/0131_lapras/lapras.geo.json

@@ -15,14 +15,6 @@
 					"name": "lapras",
 					"pivot": [0, 0, 0]
 				},
-				{
-					"name": "locator_root",
-					"parent": "lapras",
-					"pivot": [0, 0, 0],
-					"locators": {
-						"root": [0, 0, 0]
-					}
-				},
 				{
 					"name": "body",
 					"parent": "lapras",
@@ -37,11 +29,11 @@
 					}
 				},
 				{
-					"name": "locator_body",
+					"name": "locator_middle",
 					"parent": "body",
 					"pivot": [0, 0, 0],
 					"locators": {
-						"body": [0, 14, 0]
+						"middle": [0, 14, 0]
 					}
 				},
 				{
@@ -68,6 +60,14 @@
 						{"origin": [-15.25, 13.5, -7], "size": [3, 3, 3], "pivot": [-12.5, 13.5, -4.5], "rotation": [0, -15, 5], "uv": [12, 120], "mirror": true}
 					]
 				},
+				{
+					"name": "locator_seat_1",
+					"parent": "shell",
+					"pivot": [0, 24, 0],
+					"locators": {
+						"seat_1": [0, 24, 0]
+					}
+				},
 				{
 					"name": "shell2",
 					"parent": "shell",
@@ -138,6 +138,31 @@
 						{"origin": [-5.5, 30, -14.5], "size": [11, 10, 8], "inflate": 0.01, "uv": [0, 0]}
 					]
 				},
+				{
+					"name": "locator_item_face",
+					"parent": "head_angle",
+					"pivot": [0, 37.25, -21],
+					"rotation": [-22.5, 0, 0],
+					"locators": {
+						"item_face": [0, 37.25, -21]
+					}
+				},
+				{
+					"name": "locator_face",
+					"parent": "head_angle",
+					"pivot": [0, 36, -24.1],
+					"locators": {
+						"face": [0, 36, -24.1]
+					}
+				},
+				{
+					"name": "locator_item_hat",
+					"parent": "head_angle",
+					"pivot": [0, 40, -12],
+					"locators": {
+						"item_hat": [0, 40, -12]
+					}
+				},
 				{
 					"name": "locator_head",
 					"parent": "head_angle",
@@ -160,14 +185,6 @@
 					"parent": "head_angle",
 					"pivot": [0, 30.75, -11.15]
 				},
-				{
-					"name": "locator_face",
-					"parent": "eyes",
-					"pivot": [0, 36, -24.1],
-					"locators": {
-						"face": [0, 36, -24.1]
-					}
-				},
 				{
 					"name": "eye_right",
 					"parent": "eyes",
@@ -306,6 +323,14 @@
 						"jaw_lower": [0, 32.15, -21.5]
 					}
 				},
+				{
+					"name": "locator_item",
+					"parent": "jaw",
+					"pivot": [0, 32, -22.5],
+					"locators": {
+						"item": [0, 32, -22.5]
+					}
+				},
 				{
 					"name": "tongue",
 					"parent": "jaw",
@@ -345,6 +370,15 @@
 						{"origin": [-6.5, 1.5, 11], "size": [13, 10, 7], "uv": [78, 40]}
 					]
 				},
+				{
+					"name": "locator_tail",
+					"parent": "tail",
+					"pivot": [0, 5, 17],
+					"rotation": [0, 180, 0],
+					"locators": {
+						"tail": [0, 5, 17]
+					}
+				},
 				{
 					"name": "tail2",
 					"parent": "tail",
@@ -499,26 +533,19 @@
 					]
 				},
 				{
-					"name": "bone2",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "bone4",
-					"parent": "bone2",
-					"pivot": [0, 0, 0]
-				},
-				{
-					"name": "bone",
+					"name": "locator_root",
+					"parent": "lapras",
 					"pivot": [0, 0, 0],
 					"locators": {
-						"locator5": [0, 0, 0]
+						"root": [0, 0, 0]
 					}
 				},
 				{
-					"name": "bone5",
-					"pivot": [0, 0, 0],
+					"name": "locator_top",
+					"parent": "lapras",
+					"pivot": [0, 45.2, -6],
 					"locators": {
-						"locator6": [0, 0, 0]
+						"top": [0, 45.2, -6]
 					}
 				}
 			]

common/src/main/resources/data/cobblemon/species/generation1/lapras.json

@@ -51,24 +51,16 @@
     "fixed": false
   },
   "riding": {
-    "behaviour": null,
+    "behaviour": {
+      "key": "cobblemon:swim/generic"
+    },
     "seats": [
       {
         "offset": {
           "x": 0.0,
           "y": 0.4,
           "z": 0.0
-        },
-        "poseAnimations": [
-          {
-            "animations": [
-              {
-                "fileName": "trainer_generic",
-                "animationName": "animation.trainer_generic.idle"
-              }
-            ]
-          }
-        ]
+        }
       },
       {
         "offset": {