Merge pull request bridge-core#90 from ink0rr/fix/geometry-id

Fix geometry id scrapper

Author: ExDrill

packages/minecraftBedrock/schema/general/vanilla/geometry.json

@@ -42,12 +42,12 @@
 		"geometry.dragon_head",
 		"geometry.elytra",
 		"geometry.ender_crystal",
+		"geometry.enderman",
 		"geometry.enderman.v1.8",
-		"geometry.enderman:geometry.humanoid",
 		"geometry.endermite",
 		"geometry.evocation_fang",
+		"geometry.evoker",
 		"geometry.evoker.v1.8",
-		"geometry.evoker:geometry.villager",
 		"geometry.experience_orb",
 		"geometry.fireball",
 		"geometry.fireworks_rocket",
@@ -66,13 +66,13 @@
 		"geometry.horse.v2",
 		"geometry.horse.v3",
 		"geometry.humanoid",
-		"geometry.humanoid.armor.boots:geometry.humanoid.armor1",
-		"geometry.humanoid.armor.chestplate:geometry.humanoid.armor1",
-		"geometry.humanoid.armor.helmet:geometry.humanoid.armor1",
-		"geometry.humanoid.armor.leggings:geometry.humanoid.armor2",
-		"geometry.humanoid.armor1:geometry.zombie",
-		"geometry.humanoid.armor2:geometry.zombie",
-		"geometry.humanoid.custom:geometry.humanoid",
+		"geometry.humanoid.armor.boots",
+		"geometry.humanoid.armor.chestplate",
+		"geometry.humanoid.armor.helmet",
+		"geometry.humanoid.armor.leggings",
+		"geometry.humanoid.armor1",
+		"geometry.humanoid.armor2",
+		"geometry.humanoid.custom",
 		"geometry.humanoid.customSlim",
 		"geometry.irongolem",
 		"geometry.item_sprite",
@@ -101,18 +101,18 @@
 		"geometry.pig.v1.8",
 		"geometry.pig.v3",
 		"geometry.piglin",
+		"geometry.pigzombie",
+		"geometry.pigzombie.baby",
 		"geometry.pigzombie.baby.v1.8",
-		"geometry.pigzombie.baby:geometry.pigzombie",
 		"geometry.pigzombie.v1.8",
-		"geometry.pigzombie:geometry.humanoid",
 		"geometry.pillager",
 		"geometry.player.armor.base",
-		"geometry.player.armor.boots:geometry.player.armor1",
-		"geometry.player.armor.chestplate:geometry.player.armor1",
-		"geometry.player.armor.helmet:geometry.player.armor1",
-		"geometry.player.armor.leggings:geometry.player.armor2",
-		"geometry.player.armor1:geometry.player.armor.base",
-		"geometry.player.armor2:geometry.player.armor.base",
+		"geometry.player.armor.boots",
+		"geometry.player.armor.chestplate",
+		"geometry.player.armor.helmet",
+		"geometry.player.armor.leggings",
+		"geometry.player.armor1",
+		"geometry.player.armor2",
 		"geometry.player_head",
 		"geometry.polarbear",
 		"geometry.pufferfish.large",
@@ -128,10 +128,10 @@
 		"geometry.ruler_idle",
 		"geometry.ruler_pointer_selected",
 		"geometry.salmon",
+		"geometry.sheep",
 		"geometry.sheep.sheared",
 		"geometry.sheep.sheared.v1.8",
-		"geometry.sheep.v1.8:geometry.sheep.sheared.v1.8",
-		"geometry.sheep:geometry.sheep.sheared",
+		"geometry.sheep.v1.8",
 		"geometry.shield",
 		"geometry.shulker",
 		"geometry.shulker.v1.8",
@@ -162,12 +162,12 @@
 		"geometry.tropicalfish_a",
 		"geometry.tropicalfish_b",
 		"geometry.turtle",
+		"geometry.vex",
 		"geometry.vex.v1.8",
-		"geometry.vex:geometry.humanoid",
 		"geometry.villager",
 		"geometry.villager.v1.8",
-		"geometry.villager.witch.v1.8:geometry.villager.v1.8",
-		"geometry.villager.witch:geometry.villager",
+		"geometry.villager.witch",
+		"geometry.villager.witch.v1.8",
 		"geometry.villager_v2",
 		"geometry.vindicator",
 		"geometry.vindicator.v1.8",
@@ -179,14 +179,14 @@
 		"geometry.wither_skull",
 		"geometry.wolf",
 		"geometry.wolf.armor",
+		"geometry.zombie",
 		"geometry.zombie.drowned",
 		"geometry.zombie.drowned.v1.16",
+		"geometry.zombie.husk",
 		"geometry.zombie.husk.v1.8",
-		"geometry.zombie.husk:geometry.zombie",
 		"geometry.zombie.v1.8",
+		"geometry.zombie.villager",
 		"geometry.zombie.villager.v1.8",
-		"geometry.zombie.villager:geometry.humanoid",
-		"geometry.zombie.villager_v2",
-		"geometry.zombie:geometry.humanoid"
+		"geometry.zombie.villager_v2"
 	]
-}
+}

scripts/vanillaData/data.ts

@@ -190,6 +190,7 @@ export const toScrape: ScraperSource = {
 			packType: 'resourcePack',
 			content: ['minecraft:geometry/0/description/identifier', '/'],
 			filter: (val: string) => val.startsWith('geometry.'),
+			map: (val: string) => val.split(':')[0],
 		},
 		{
 			id: 'biome_identifiers',