Backport datagen fixes to 1.20.1

cassiancc · May 21, 2024 · 83396d0 · 83396d0
1 parent cddc592
commit 83396d0
Show file tree

Hide file tree

Showing 28 changed files with 12 additions and 140 deletions.
diff --git a/src/main/resources/assets/pyrite/blockstates/nostalgia_grass_slab.json b/src/main/resources/assets/pyrite/blockstates/nostalgia_grass_slab.json
@@ -4,7 +4,7 @@
         "model": "pyrite:block/nostalgia_grass_slab"
       },
       "type=double": {
-        "model": "pyrite:block/nostalgia_grass_top"
+        "model": "pyrite:block/nostalgia_grass_turf"
       },
       "type=top": {
         "model": "pyrite:block/nostalgia_grass_slab_top"

diff --git a/src/main/resources/data/pyrite/recipes/cut_copper_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/cut_copper_slab_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/cut_copper_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/cut_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/cut_exposed_copper_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/cut_exposed_copper_slab_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/cut_exposed_copper_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/cut_exposed_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/cut_oxidized_copper_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/cut_oxidized_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/cut_weathered_copper_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/cut_weathered_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_copper_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_copper_slab_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_copper_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_exposed_copper_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_exposed_copper_slab_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_exposed_copper_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_exposed_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_exposed_copper_wall_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_exposed_copper_wall_stonecutting.json
@@ -1,7 +1,7 @@
 {
     "type": "minecraft:stonecutting",
     "ingredient": {
-      "item": "minecraft:cut_exposed_copper"
+      "item": "minecraft:exposed_cut_copper"
     },
     "result": "pyrite:cut_exposed_copper_wall",
     "count": 1

diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_oxidized_copper_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_oxidized_copper_slab_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_oxidized_copper_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_oxidized_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_weathered_copper_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_weathered_copper_slab_stonecutting.json
diff --git a/...main/resources/data/pyrite/recipes/from_cut_cut_weathered_copper_stairs_stonecutting.json b/...main/resources/data/pyrite/recipes/from_cut_cut_weathered_copper_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/from_cut_cut_weathered_copper_wall_stonecutting.json b/src/main/resources/data/pyrite/recipes/from_cut_cut_weathered_copper_wall_stonecutting.json
@@ -1,7 +1,7 @@
 {
     "type": "minecraft:stonecutting",
     "ingredient": {
-      "item": "pyrite:cut_weathered_copper"
+      "item": "minecraft:weathered_cut_copper"
     },
     "result": "pyrite:cut_weathered_copper_wall",
     "count": 1

diff --git a/src/main/resources/data/pyrite/recipes/nostalgia_brick_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/nostalgia_brick_slab_stonecutting.json
@@ -1,7 +1,7 @@
 {
     "type": "minecraft:stonecutting",
     "ingredient": {
-      "item": "pyrite:nostalgia_brick"
+      "item": "pyrite:nostalgia_bricks"
     },
     "result": "pyrite:nostalgia_brick_slab",
     "count": 2

diff --git a/src/main/resources/data/pyrite/recipes/nostalgia_brick_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/nostalgia_brick_stairs_stonecutting.json
@@ -1,7 +1,7 @@
 {
     "type": "minecraft:stonecutting",
     "ingredient": {
-      "item": "pyrite:nostalgia_brick"
+      "item": "pyrite:nostalgia_bricks"
     },
     "result": "pyrite:nostalgia_brick_stairs",
     "count": 1

diff --git a/src/main/resources/data/pyrite/recipes/redstone_button.json b/src/main/resources/data/pyrite/recipes/redstone_button.json
@@ -6,7 +6,7 @@
         ],
         "key": {
           "C": {
-            "item": "pyrite:redstone_block"
+            "item": "minecraft:redstone_block"
           }
         },
         "result": {

diff --git a/src/main/resources/data/pyrite/recipes/redstone_door.json b/src/main/resources/data/pyrite/recipes/redstone_door.json
@@ -8,7 +8,7 @@
         ],
         "key": {
           "C": {
-            "item": "pyrite:redstone_block"
+            "item": "minecraft:redstone_block"
           }
         },
         "result": {

diff --git a/src/main/resources/data/pyrite/recipes/redstone_pressure_plate.json b/src/main/resources/data/pyrite/recipes/redstone_pressure_plate.json
@@ -6,12 +6,12 @@
         ],
         "key": {
           "C": {
-            "item": "pyrite:redstone_block"
+            "item": "minecraft:redstone_block"
           }
         },
         "result": {
           "item": "pyrite:redstone_pressure_plate",
           "id": "pyrite:redstone_pressure_plate",
           "count": 1
         }
-      }  }
+      }  
diff --git a/src/main/resources/data/pyrite/recipes/redstone_trapdoor.json b/src/main/resources/data/pyrite/recipes/redstone_trapdoor.json
@@ -7,7 +7,7 @@
         ],
         "key": {
           "C": {
-            "item": "pyrite:redstone_block"
+            "item": "minecraft:redstone_block"
           }
         },
         "result": {

diff --git a/src/main/resources/data/pyrite/recipes/smooth_quartz_slab_stonecutting.json b/src/main/resources/data/pyrite/recipes/smooth_quartz_slab_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/smooth_quartz_stairs_stonecutting.json b/src/main/resources/data/pyrite/recipes/smooth_quartz_stairs_stonecutting.json
diff --git a/src/main/resources/data/pyrite/recipes/smooth_quartz_wall_gate_stonecutting.json b/src/main/resources/data/pyrite/recipes/smooth_quartz_wall_gate_stonecutting.json
@@ -1,7 +1,7 @@
 {
     "type": "minecraft:stonecutting",
     "ingredient": {
-      "item": "pyrite:smooth_quartz"
+      "item": "minecraft:smooth_quartz"
     },
     "result": "pyrite:smooth_quartz_wall_gate",
     "count": 1

diff --git a/src/main/resources/data/pyrite/recipes/smooth_quartz_wall_stonecutting.json b/src/main/resources/data/pyrite/recipes/smooth_quartz_wall_stonecutting.json
@@ -1,7 +1,7 @@
 {
     "type": "minecraft:stonecutting",
     "ingredient": {
-      "item": "pyrite:smooth_quartz"
+      "item": "minecraft:smooth_quartz"
     },
     "result": "pyrite:smooth_quartz_wall",
     "count": 1

diff --git a/src/main/resources/data/pyrite/recipes/smooth_redstone.json b/src/main/resources/data/pyrite/recipes/smooth_redstone.json