Fixed various rks recipe spelling errors.

Waterpicker · Waterpicker · commit 1b3d572c8c0b · 2025-03-05T14:54:44.000-06:00
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/aloraichium_z_alolan.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/aloraichium_z_alolan.json
@@ -12,7 +12,7 @@
       "aspects": [
         "alolan"
       ],
-      "species": "minecraft:raichu",
+      "species": "cobblemon:raichu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/heracronite.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/heracronite.json
@@ -10,7 +10,7 @@
     "B": {
       "type": "time_capsule",
       "aspects": [],
-      "species": "cobblemon:heracros",
+      "species": "cobblemon:heracross",
       "strictAspects": false
     },
     "C": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/lopunnite.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/lopunnite.json
@@ -10,7 +10,7 @@
     "B": {
       "type": "time_capsule",
       "aspects": [],
-      "species": "cobblemon:lopuuny",
+      "species": "cobblemon:lopunny",
       "strictAspects": false
     },
     "C": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/lycanium_z.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/lycanium_z.json
@@ -10,7 +10,7 @@
     "B": {
       "type": "time_capsule",
       "aspects": [],
-      "species": "cobblemon:lycanrock",
+      "species": "cobblemon:lycanroc",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/marshadium_z.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/marshadium_z.json
@@ -10,7 +10,7 @@
     "B": {
       "type": "time_capsule",
       "aspects": [],
-      "species": "cobblemon:marashadow",
+      "species": "cobblemon:marshadow",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_belle.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_belle.json
@@ -12,7 +12,7 @@
       "aspects": [
         "belle"
       ],
-      "species": "minecraft:pikachu",
+      "species": "cobblemon:pikachu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_cosplayer.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_cosplayer.json
@@ -12,7 +12,7 @@
       "aspects": [
         "cosplayer"
       ],
-      "species": "minecraft:pikachu",
+      "species": "cobblemon:pikachu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_libre.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_libre.json
@@ -12,7 +12,7 @@
       "aspects": [
         "libre"
       ],
-      "species": "minecraft:pikachu",
+      "species": "cobblemon:pikachu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_original.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_original.json
@@ -12,7 +12,7 @@
       "aspects": [
         "original"
       ],
-      "species": "minecraft:pikachu",
+      "species": "cobblemon:pikachu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_phd.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_phd.json
@@ -12,7 +12,7 @@
       "aspects": [
         "phd"
       ],
-      "species": "minecraft:pikachu",
+      "species": "cobblemon:pikachu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_pop_star.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_pop_star.json
@@ -12,7 +12,7 @@
       "aspects": [
         "pop-star"
       ],
-      "species": "minecraft:pikachu",
+      "species": "cobblemon:pikachu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_rock_star.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/pikashunium_z_rock_star.json
@@ -12,7 +12,7 @@
       "aspects": [
         "rock-star"
       ],
-      "species": "minecraft:pikachu",
+      "species": "cobblemon:pikachu",
       "strictAspects": false
     },
     "X": {
diff --git a/common/src/main/generated/resources/data/generations_core/recipes/rks/venusaurite.json b/common/src/main/generated/resources/data/generations_core/recipes/rks/venusaurite.json
@@ -10,7 +10,7 @@
     "B": {
       "type": "time_capsule",
       "aspects": [],
-      "species": "cobblemon:venasuar",
+      "species": "cobblemon:venusaur",
       "strictAspects": false
     },
     "C": {
diff --git a/common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json b/common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/axe.json
@@ -56,101 +56,101 @@
     "generations_core:cursed_carved_pumpkin",
     "generations_core:scarecrow",
     "generations_core:box",
-    "generations_core:light_gray_couch_arm_left",
+    "generations_core:gray_couch_arm_left",
     "generations_core:yellow_couch_arm_left",
     "generations_core:magenta_couch_arm_left",
-    "generations_core:brown_couch_arm_left",
-    "generations_core:pink_couch_arm_left",
-    "generations_core:green_couch_arm_left",
-    "generations_core:red_couch_arm_left",
-    "generations_core:white_couch_arm_left",
-    "generations_core:orange_couch_arm_left",
-    "generations_core:lime_couch_arm_left",
+    "generations_core:light_blue_couch_arm_left",
     "generations_core:black_couch_arm_left",
-    "generations_core:purple_couch_arm_left",
-    "generations_core:gray_couch_arm_left",
+    "generations_core:lime_couch_arm_left",
+    "generations_core:light_gray_couch_arm_left",
     "generations_core:cyan_couch_arm_left",
-    "generations_core:light_blue_couch_arm_left",
+    "generations_core:red_couch_arm_left",
+    "generations_core:purple_couch_arm_left",
+    "generations_core:orange_couch_arm_left",
+    "generations_core:white_couch_arm_left",
+    "generations_core:pink_couch_arm_left",
     "generations_core:blue_couch_arm_left",
-    "generations_core:light_gray_couch_arm_right",
+    "generations_core:brown_couch_arm_left",
+    "generations_core:green_couch_arm_left",
+    "generations_core:gray_couch_arm_right",
     "generations_core:yellow_couch_arm_right",
     "generations_core:magenta_couch_arm_right",
-    "generations_core:brown_couch_arm_right",
-    "generations_core:pink_couch_arm_right",
-    "generations_core:green_couch_arm_right",
-    "generations_core:red_couch_arm_right",
-    "generations_core:white_couch_arm_right",
-    "generations_core:orange_couch_arm_right",
-    "generations_core:lime_couch_arm_right",
+    "generations_core:light_blue_couch_arm_right",
     "generations_core:black_couch_arm_right",
-    "generations_core:purple_couch_arm_right",
-    "generations_core:gray_couch_arm_right",
+    "generations_core:lime_couch_arm_right",
+    "generations_core:light_gray_couch_arm_right",
     "generations_core:cyan_couch_arm_right",
-    "generations_core:light_blue_couch_arm_right",
+    "generations_core:red_couch_arm_right",
+    "generations_core:purple_couch_arm_right",
+    "generations_core:orange_couch_arm_right",
+    "generations_core:white_couch_arm_right",
+    "generations_core:pink_couch_arm_right",
     "generations_core:blue_couch_arm_right",
-    "generations_core:light_gray_couch_corner_left",
+    "generations_core:brown_couch_arm_right",
+    "generations_core:green_couch_arm_right",
+    "generations_core:gray_couch_corner_left",
     "generations_core:yellow_couch_corner_left",
     "generations_core:magenta_couch_corner_left",
-    "generations_core:brown_couch_corner_left",
-    "generations_core:pink_couch_corner_left",
-    "generations_core:green_couch_corner_left",
-    "generations_core:red_couch_corner_left",
-    "generations_core:white_couch_corner_left",
-    "generations_core:orange_couch_corner_left",
-    "generations_core:lime_couch_corner_left",
+    "generations_core:light_blue_couch_corner_left",
     "generations_core:black_couch_corner_left",
-    "generations_core:purple_couch_corner_left",
-    "generations_core:gray_couch_corner_left",
+    "generations_core:lime_couch_corner_left",
+    "generations_core:light_gray_couch_corner_left",
     "generations_core:cyan_couch_corner_left",
-    "generations_core:light_blue_couch_corner_left",
+    "generations_core:red_couch_corner_left",
+    "generations_core:purple_couch_corner_left",
+    "generations_core:orange_couch_corner_left",
+    "generations_core:white_couch_corner_left",
+    "generations_core:pink_couch_corner_left",
     "generations_core:blue_couch_corner_left",
-    "generations_core:light_gray_couch_corner_right",
+    "generations_core:brown_couch_corner_left",
+    "generations_core:green_couch_corner_left",
+    "generations_core:gray_couch_corner_right",
     "generations_core:yellow_couch_corner_right",
     "generations_core:magenta_couch_corner_right",
-    "generations_core:brown_couch_corner_right",
-    "generations_core:pink_couch_corner_right",
-    "generations_core:green_couch_corner_right",
-    "generations_core:red_couch_corner_right",
-    "generations_core:white_couch_corner_right",
-    "generations_core:orange_couch_corner_right",
-    "generations_core:lime_couch_corner_right",
+    "generations_core:light_blue_couch_corner_right",
     "generations_core:black_couch_corner_right",
-    "generations_core:purple_couch_corner_right",
-    "generations_core:gray_couch_corner_right",
+    "generations_core:lime_couch_corner_right",
+    "generations_core:light_gray_couch_corner_right",
     "generations_core:cyan_couch_corner_right",
-    "generations_core:light_blue_couch_corner_right",
+    "generations_core:red_couch_corner_right",
+    "generations_core:purple_couch_corner_right",
+    "generations_core:orange_couch_corner_right",
+    "generations_core:white_couch_corner_right",
+    "generations_core:pink_couch_corner_right",
     "generations_core:blue_couch_corner_right",
-    "generations_core:light_gray_couch_middle",
+    "generations_core:brown_couch_corner_right",
+    "generations_core:green_couch_corner_right",
+    "generations_core:gray_couch_middle",
     "generations_core:yellow_couch_middle",
     "generations_core:magenta_couch_middle",
-    "generations_core:brown_couch_middle",
-    "generations_core:pink_couch_middle",
-    "generations_core:green_couch_middle",
-    "generations_core:red_couch_middle",
-    "generations_core:white_couch_middle",
-    "generations_core:orange_couch_middle",
-    "generations_core:lime_couch_middle",
+    "generations_core:light_blue_couch_middle",
     "generations_core:black_couch_middle",
-    "generations_core:purple_couch_middle",
-    "generations_core:gray_couch_middle",
+    "generations_core:lime_couch_middle",
+    "generations_core:light_gray_couch_middle",
     "generations_core:cyan_couch_middle",
-    "generations_core:light_blue_couch_middle",
+    "generations_core:red_couch_middle",
+    "generations_core:purple_couch_middle",
+    "generations_core:orange_couch_middle",
+    "generations_core:white_couch_middle",
+    "generations_core:pink_couch_middle",
     "generations_core:blue_couch_middle",
-    "generations_core:light_gray_couch_ottoman",
+    "generations_core:brown_couch_middle",
+    "generations_core:green_couch_middle",
+    "generations_core:gray_couch_ottoman",
     "generations_core:yellow_couch_ottoman",
     "generations_core:magenta_couch_ottoman",
-    "generations_core:brown_couch_ottoman",
-    "generations_core:pink_couch_ottoman",
-    "generations_core:green_couch_ottoman",
-    "generations_core:red_couch_ottoman",
-    "generations_core:white_couch_ottoman",
-    "generations_core:orange_couch_ottoman",
-    "generations_core:lime_couch_ottoman",
+    "generations_core:light_blue_couch_ottoman",
     "generations_core:black_couch_ottoman",
-    "generations_core:purple_couch_ottoman",
-    "generations_core:gray_couch_ottoman",
+    "generations_core:lime_couch_ottoman",
+    "generations_core:light_gray_couch_ottoman",
     "generations_core:cyan_couch_ottoman",
-    "generations_core:light_blue_couch_ottoman",
-    "generations_core:blue_couch_ottoman"
+    "generations_core:red_couch_ottoman",
+    "generations_core:purple_couch_ottoman",
+    "generations_core:orange_couch_ottoman",
+    "generations_core:white_couch_ottoman",
+    "generations_core:pink_couch_ottoman",
+    "generations_core:blue_couch_ottoman",
+    "generations_core:brown_couch_ottoman",
+    "generations_core:green_couch_ottoman"
   ]
 }
diff --git a/common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -804,38 +804,38 @@
     "generations_core:pink_elevator",
     "generations_core:desk",
     "generations_core:fridge",
-    "generations_core:light_gray_street_lamp",
+    "generations_core:gray_street_lamp",
     "generations_core:yellow_street_lamp",
     "generations_core:magenta_street_lamp",
-    "generations_core:brown_street_lamp",
-    "generations_core:pink_street_lamp",
-    "generations_core:green_street_lamp",
-    "generations_core:red_street_lamp",
-    "generations_core:white_street_lamp",
-    "generations_core:orange_street_lamp",
-    "generations_core:lime_street_lamp",
+    "generations_core:light_blue_street_lamp",
     "generations_core:black_street_lamp",
-    "generations_core:purple_street_lamp",
-    "generations_core:gray_street_lamp",
+    "generations_core:lime_street_lamp",
+    "generations_core:light_gray_street_lamp",
     "generations_core:cyan_street_lamp",
-    "generations_core:light_blue_street_lamp",
+    "generations_core:red_street_lamp",
+    "generations_core:purple_street_lamp",
+    "generations_core:orange_street_lamp",
+    "generations_core:white_street_lamp",
+    "generations_core:pink_street_lamp",
     "generations_core:blue_street_lamp",
-    "generations_core:light_gray_pc",
+    "generations_core:brown_street_lamp",
+    "generations_core:green_street_lamp",
+    "generations_core:gray_pc",
     "generations_core:yellow_pc",
     "generations_core:magenta_pc",
-    "generations_core:brown_pc",
-    "generations_core:pink_pc",
-    "generations_core:green_pc",
-    "generations_core:red_pc",
-    "generations_core:white_pc",
-    "generations_core:orange_pc",
-    "generations_core:lime_pc",
+    "generations_core:light_blue_pc",
     "generations_core:black_pc",
-    "generations_core:purple_pc",
-    "generations_core:gray_pc",
+    "generations_core:lime_pc",
+    "generations_core:light_gray_pc",
     "generations_core:cyan_pc",
-    "generations_core:light_blue_pc",
+    "generations_core:red_pc",
+    "generations_core:purple_pc",
+    "generations_core:orange_pc",
+    "generations_core:white_pc",
+    "generations_core:pink_pc",
     "generations_core:blue_pc",
+    "generations_core:brown_pc",
+    "generations_core:green_pc",
     "generations_core:empty_ball_display",
     "generations_core:poke_ball_display",
     "generations_core:great_ball_display",
diff --git a/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/RksRecipeProvider.java b/forge/src/main/java/generations/gg/generations/core/generationscore/forge/datagen/RksRecipeProvider.java
@@ -160,7 +160,7 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
         createMegaStone(GENGARITE, "gengar", exporter);
         createMegaStone(GARDEVOIRITE, "gardevoir", exporter);
         createMegaStone(AMPHAROSITE, "ampharos", exporter);
-        createMegaStone(VENUSAURITE, "venasuar", exporter);
+        createMegaStone(VENUSAURITE, "venusaur", exporter);
         createMegaStone(CHARIZARDITE_X, "charizard", exporter);
         createMegaStone(BLASTOISINITE, "blastoise", exporter);
         createMegaStone(MEWTWONITE_X, "mewtwo", exporter);
@@ -181,7 +181,7 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
         createMegaStone(ABSOLITE, "absol", exporter);
         createMegaStone(CHARIZARDITE_Y, "charizard", exporter);
         createMegaStone(ALAKAZITE, "alakazam", exporter);
-        createMegaStone(HERACRONITE, "heracros", exporter);
+        createMegaStone(HERACRONITE, "heracross", exporter);
         createMegaStone(MAWILITE, "mawile", exporter);
         createMegaStone(MANECTITE, "manectric", exporter);
         createMegaStone(GARCHOMPITE, "garchomp", exporter);
@@ -200,7 +200,7 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
         createMegaStone(GLALITITE, "glalie", exporter);
         createMegaStone(DIANCITE, "diancie", exporter);
         createMegaStone(CAMERUPTITE, "camerupt", exporter);
-        createMegaStone(LOPUNNNITE, "lopuuny", exporter);
+        createMegaStone(LOPUNNNITE, "lopunny", exporter);
         createMegaStone(SALAMENCITE, "salamence", exporter);
         createMegaStone(BEEDRILLITE, "beedrill", exporter);
 
@@ -229,8 +229,8 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
         createZCyrstal(INCINIUM_Z, "incinium", exporter);
         createZCyrstal(KOMMONIUM_Z, "kommoo", exporter);
         createZCyrstal(LUNALIUM_Z, "lunala", exporter);
-        createZCyrstal(LYCANIUM_Z, "lycanrock", exporter);
-        createZCyrstal(MARSHADIUM_Z, "marashadow", exporter);
+        createZCyrstal(LYCANIUM_Z, "lycanroc", exporter);
+        createZCyrstal(MARSHADIUM_Z, "marshadow", exporter);
         createZCyrstal(MEWNIUM_Z, "mew", exporter);
         createZCyrstal(MIMIKIUM_Z, "mimikyu", exporter);
         createZCyrstal(PIKANIUM_Z, "pikachu", exporter);
@@ -284,7 +284,7 @@ protected void buildRecipes(@NotNull Consumer<FinishedRecipe> exporter) {
     private <E> void createZCyrstal(RegistrySupplier<Item> result, String pokemon, String aspects, Consumer<FinishedRecipe> exporter) {
         ShapedRksRecipeJsonBuilder.create(result.get())
                 .input('A', Items.NETHERITE_SCRAP)
-                .input('B', new TimeCapsuleIngredient(new SpeciesKey(pokemon, Set.of(aspects)), false))
+                .input('B', new TimeCapsuleIngredient(new SpeciesKey(new ResourceLocation("cobblemon", pokemon), Set.of(aspects)), false))
                 .input('X', Z_INGOT.get())
                 .pattern("XXX")
                 .pattern("ABA")
