Merge branch 'z-fighting-b-gone' into 'main'

Pokedex Z-Fighting Begone

See merge request cable-mc/cobblemon!2289

CHANGELOG.md

@@ -288,6 +288,7 @@
 - Lowered the volume of Blitzle and Zebstrika's cry
 - Fixed Raichu (male) and Alolan Raichu (both genders) not displaying the correct Partner Cap when Pewter Crunchies are in the cosmetic slot.
 - Regional Foods will now prioritize being eaten instead of used for healing Pokémon, shift clicking will use it as healing
+- Resolved Z-Fighting on Pokédex Models
 
 ### Fixes
 - Fixed Croagunk's walkspeed

common/src/main/resources/assets/cobblemon/models/item/pokedex_red_model.json

@@ -21,8 +21,8 @@
 		},
 		{
 			"name": "frame_edge_left",
-			"from": [7, 1, 3],
-			"to": [7.6, 1, 13],
+			"from": [6.996, 1, 3],
+			"to": [7.586, 1, 13],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 8]},
 			"faces": {
 				"up": {"uv": [4.5, 0.5, 5, 5.5], "texture": "#all"}
@@ -30,11 +30,20 @@
 		},
 		{
 			"name": "screen_left",
-			"from": [1, 1, 4],
-			"to": [7.6, 1, 12],
+			"from": [1.996, 1, 3.975],
+			"to": [7.591, 1, 12.025],
 			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 8]},
 			"faces": {
-				"up": {"uv": [1, 4, 8, 12], "texture": "#screen"}
+				"up": {"uv": [2, 4, 8, 12], "texture": "#screen"}
+			}
+		},
+		{
+			"name": "lights",
+			"from": [0.99, 1, 4.99],
+			"to": [2.01, 1, 8.01],
+			"rotation": {"angle": -22.5, "axis": "z", "origin": [8, 0, 8]},
+			"faces": {
+				"up": {"uv": [1, 5, 2, 8], "texture": "#screen"}
 			}
 		},
 		{
@@ -52,8 +61,8 @@
 		},
 		{
 			"name": "frame_edge_right",
-			"from": [8.4, 1, 3],
-			"to": [9, 1, 13],
+			"from": [8.414, 1, 3],
+			"to": [9.004, 1, 13],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 8]},
 			"faces": {
 				"up": {"uv": [5, 0.5, 5.5, 5.5], "texture": "#all"}
@@ -61,8 +70,8 @@
 		},
 		{
 			"name": "screen_right",
-			"from": [8.4, 1, 4],
-			"to": [14, 1, 12],
+			"from": [8.409, 1, 3.975],
+			"to": [14.004, 1, 12.025],
 			"rotation": {"angle": 22.5, "axis": "z", "origin": [8, 0, 8]},
 			"faces": {
 				"up": {"uv": [8, 4, 14, 12], "texture": "#screen"}
@@ -115,13 +124,13 @@
 					"name": "frame_left",
 					"origin": [8, 8, 8],
 					"color": 0,
-					"children": [0, 1, 2]
+					"children": [0, 1, 2, 3]
 				},
 				{
 					"name": "frame_right",
 					"origin": [8, 8, 8],
 					"color": 0,
-					"children": [3, 4, 5]
+					"children": [4, 5, 6]
 				}
 			]
 		}

common/src/main/resources/assets/cobblemon/textures/block/type_gems/deepslate_crystal_core.png.mcmeta

@@ -0,0 +1,12 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 3,
+    "frames": [
+      { "index": 0, "time": 8 },
+      { "index": 0, "time": 32 },
+      { "index": 1, "time": 8 },
+      { "index": 1, "time": 32 }
+    ]
+  }
+}