fix: coloured backpack recipes

MrTJP · May 12, 2024 · 3af7fd5 · 3af7fd5
1 parent e2a8225
commit 3af7fd5
Show file tree

Hide file tree

Showing 18 changed files with 95 additions and 36 deletions.
diff --git a/exploration/src/main/generated/.cache/0aed8341631ecb057f97f8866d5170e4ddc46c8c b/exploration/src/main/generated/.cache/0aed8341631ecb057f97f8866d5170e4ddc46c8c
@@ -1,14 +1,15 @@
-// 1.19.2	2024-03-04T11:14:23.547941	ProjectRed-Exploration Recipes
+// 1.19.2	2024-05-12T13:08:16.608624	ProjectRed-Exploration Recipes
 516fc1e95323b31fb9ba7e0a14ebf236e38eb240 data/projectred_exploration/recipes/athame.json
 c580751c155e6c97873ca79fcefd56de6adb0f79 data/projectred_exploration/recipes/backpack_dye.json
 bffb872878c8c398815a8379ba3da55bdc2f403d data/projectred_exploration/recipes/basalt.json
 8424ef14c64b2fcb3a047ba07205e3f506bc9841 data/projectred_exploration/recipes/basalt_brick.json
 29da3a1779dce66c770a26e7ed76cbea93653a99 data/projectred_exploration/recipes/basalt_brick_wall.json
 5faf0b193cdb996aeab45fd276f65d8f37cb3eb8 data/projectred_exploration/recipes/basalt_cobble_wall.json
 a7b89ed7c2567ecc46f1bf9cba7ac985fe636696 data/projectred_exploration/recipes/basalt_wall.json
-b5ef92dbe2e06edc69c5701e794cf8b4d5e115df data/projectred_exploration/recipes/blue_backpack.json
-1534fd97d1fddc9d81fc765ac53798fca3d61080 data/projectred_exploration/recipes/brown_backpack.json
-53c3c28ca8fd31572fc5cc4b1495c27addd744a5 data/projectred_exploration/recipes/cyan_backpack.json
+f4e73c4de0c9f8f76519f7060c3561d14d801c5b data/projectred_exploration/recipes/black_backpack.json
+1e661c0a7f636375b4182e198270b5d7a88a2059 data/projectred_exploration/recipes/blue_backpack.json
+4be73d78f75ecafefea5aa597471f53ae7dee796 data/projectred_exploration/recipes/brown_backpack.json
+9885fbdf76c3ca29ba047274691c7fb73a5faea5 data/projectred_exploration/recipes/cyan_backpack.json
 ef7657b6fbe71d8bacf8d133fd4f02014b10fa0f data/projectred_exploration/recipes/diamond_sickle.json
 f4dfba6fd848afc45037e3461b267724df6a6f17 data/projectred_exploration/recipes/electrotine_block.json
 9d1606ac50f680514a4aacc97bd3d051a205d8ad data/projectred_exploration/recipes/electrotine_block_wall.json
@@ -17,17 +18,17 @@ ea0f98150adf3119687e07a01a863f70aa5d4c57 data/projectred_exploration/recipes/ele
 649cb806f4a28e83bbf9da291c59502e0efb160c data/projectred_exploration/recipes/electrotine_dust_from_nineblock.json
 99b9e93e3456ba774e6443534a77d1d94b223802 data/projectred_exploration/recipes/gold_saw.json
 612da094117b37fb571b8437a83895703c9a28b1 data/projectred_exploration/recipes/gold_sickle.json
-0cc6b01d8fb80d53fbb912747245d25dce719be1 data/projectred_exploration/recipes/gray_backpack.json
-4b981412622c77bef9a7ee0f959dcde5a7015338 data/projectred_exploration/recipes/green_backpack.json
+52104f0dfd5cb8a4ac27c95a66c2b032d1424a92 data/projectred_exploration/recipes/gray_backpack.json
+815dcee9a0edd3f0c28aad0462daf8055c56d390 data/projectred_exploration/recipes/green_backpack.json
 417650820c985d30b49de077890af44b90cf1b95 data/projectred_exploration/recipes/iron_sickle.json
-845b3a0f7aa118ba2263c26d2552a33fec13c422 data/projectred_exploration/recipes/light_blue_backpack.json
-9388d2fe3e585473d67900ec85a56a6162cb7c12 data/projectred_exploration/recipes/light_gray_backpack.json
-c20139a5ae9ce213cae270244d8dfe77fbe4da4d data/projectred_exploration/recipes/lime_backpack.json
-363f59bc4db8f555dc823b2a42aa073cd833bc27 data/projectred_exploration/recipes/magenta_backpack.json
+78031516e6cfcb1515be58acf6d1a273896e402b data/projectred_exploration/recipes/light_blue_backpack.json
+8359f46bb1c133ef2a2566f39cb967c8cc44b795 data/projectred_exploration/recipes/light_gray_backpack.json
+8fdd81913172ece1bedda794d5b1ba79544fcd5d data/projectred_exploration/recipes/lime_backpack.json
+9d2fa7b429b3124747a8f15a16e1aa3c50bd119c data/projectred_exploration/recipes/magenta_backpack.json
 4e114595836fa28d08d27aff8bfc742cbd06ae36 data/projectred_exploration/recipes/marble_brick.json
 0ba50afd6cd5b0a2dd2b3ca86e1f2530c6e5a0f8 data/projectred_exploration/recipes/marble_brick_wall.json
 42e6ec6574368ebb262cbab16f0215ce91c68b52 data/projectred_exploration/recipes/marble_wall.json
-729f631fe42902860056f32449244ecb756ee644 data/projectred_exploration/recipes/orange_backpack.json
+cb491c2a40e7a50098bafbfb051d68a18fa9fe6e data/projectred_exploration/recipes/orange_backpack.json
 5a0a0c6ab3e93d0ae234823b48fa66829a50ef77 data/projectred_exploration/recipes/peridot_axe.json
 3c6693564927d3750dc85525faf3117a19b91518 data/projectred_exploration/recipes/peridot_block.json
 ed768fbd04cc5576de326f8b5c72e7ae5068f20d data/projectred_exploration/recipes/peridot_block_wall.json
@@ -44,13 +45,13 @@ c7d2651976143b2f2291ceafc16e7c905feb7eb8 data/projectred_exploration/recipes/per
 ab328a30bb5c5f11ea3c9eabc01af037d052c881 data/projectred_exploration/recipes/peridot_shovel.json
 198af25f92429514ab0517736be51cd92e7cf94f data/projectred_exploration/recipes/peridot_sickle.json
 ca495e85a2bab6477dbd71fe25a8758f6e3d0e6e data/projectred_exploration/recipes/peridot_sword.json
-195913166d141e21916ec96bb24042df856f7089 data/projectred_exploration/recipes/pink_backpack.json
-82328b007b75858accb067906b3c2b5d74eefcac data/projectred_exploration/recipes/purple_backpack.json
+b94fe6b34e64e736edfd8c57112e615e6133fb93 data/projectred_exploration/recipes/pink_backpack.json
+ca15a8900e8340f0cda344ddcc7c7261d5b2db19 data/projectred_exploration/recipes/purple_backpack.json
 d0f867fc87bfcfcb49cafc64c7727aa99c58524e data/projectred_exploration/recipes/raw_silver_block.json
 4f40453e0046a71705b431de7e3d72e925de15fa data/projectred_exploration/recipes/raw_silver_from_nineblock.json
 e89bb0c2515f603135f2de50d1503e343c4fd399 data/projectred_exploration/recipes/raw_tin_block.json
 efee17d4f20fd8084d6fb6f4bcd098b07e722124 data/projectred_exploration/recipes/raw_tin_from_nineblock.json
-866cc8c6bad927204281ea72f7ade66eecf35978 data/projectred_exploration/recipes/red_backpack.json
+653f9339f5a1fbec688aca56e01af603f561ac5b data/projectred_exploration/recipes/red_backpack.json
 a5b68914ee96aed435b2ed9b72917047b820b25e data/projectred_exploration/recipes/ruby_axe.json
 0e1a99055c5ec032304bf00604d6690cd3bad45d data/projectred_exploration/recipes/ruby_block.json
 99913b72d89cda5de6a876ae85a7c392caf2d6cd data/projectred_exploration/recipes/ruby_block_wall.json
@@ -95,7 +96,7 @@ aaaf54f311c8b7c0730bb52f4c14d7b4587a50de data/projectred_exploration/recipes/str
 3d679e8e776418981c57e29e3b6d2909b8fa4624 data/projectred_exploration/recipes/tin_ingot_from_nineblock.json
 a8b49d5b4a38d5f2f3a0fa1a41e5c0881c1284a1 data/projectred_exploration/recipes/tin_ingot_from_raw_tin_smelting.json
 88d663776697ca2996d58d97ef2c5bc94829ea8b data/projectred_exploration/recipes/tin_ingot_from_tin_ore_smelting.json
-ce3a40d106fb63552eee5d84dea28be0f5694032 data/projectred_exploration/recipes/white_backpack.json
+cb98188ef77b9420ff33b16eb36533e26267b803 data/projectred_exploration/recipes/white_backpack.json
 38dbf984da79493395fbaceda5f359cd9a262793 data/projectred_exploration/recipes/wood_sickle.json
 571f740df980fb4f565ca1bde50e7a32cc2adf40 data/projectred_exploration/recipes/wool_gin.json
-0b64ec445ce98d8b4b26be177071d305d744e8b2 data/projectred_exploration/recipes/yellow_backpack.json
+344ed363e368115ba5de67c1b252e936d9fff949 data/projectred_exploration/recipes/yellow_backpack.json
diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/black_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/black_backpack.json
@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "key": {
+    "C": {
+      "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/black"
+    }
+  },
+  "pattern": [
+    "CCC",
+    "CDC",
+    "CCC"
+  ],
+  "result": {
+    "item": "projectred_exploration:black_backpack"
+  }
+}
diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/blue_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/blue_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/blue"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/brown_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/brown_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/brown"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/cyan_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/cyan_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/cyan"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/gray_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/gray_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/gray"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/green_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/green_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/green"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/light_blue_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/light_blue_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/light_blue"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/light_gray_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/light_gray_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/light_gray"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/lime_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/lime_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/lime"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/magenta_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/magenta_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/magenta"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/orange_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/orange_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/orange"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/pink_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/pink_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/pink"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/purple_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/purple_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/purple"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/red_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/red_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/red"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/white_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/white_backpack.json
@@ -3,14 +3,11 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
-    },
-    "D": {
-      "tag": "forge:dyes/white"
     }
   },
   "pattern": [
     "CCC",
-    "CDC",
+    "C C",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/generated/data/projectred_exploration/recipes/yellow_backpack.json b/exploration/src/main/generated/data/projectred_exploration/recipes/yellow_backpack.json
@@ -3,11 +3,14 @@
   "key": {
     "C": {
       "item": "projectred_core:woven_cloth"
+    },
+    "D": {
+      "tag": "forge:dyes/yellow"
     }
   },
   "pattern": [
     "CCC",
-    "C C",
+    "CDC",
     "CCC"
   ],
   "result": {

diff --git a/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java b/exploration/src/main/java/mrtjp/projectred/exploration/data/ExplorationRecipeProvider.java
@@ -159,7 +159,7 @@ protected void registerRecipes() {
         bootsRecipe(PERIDOT_BOOTS.get(), PERIDOT_GEM_TAG);
 
         // Backpacks
-        for (int i = 0; i < 15; i++) {
+        for (int i = 0; i < 16; i++) {
             backpackRecipe(getBackpackByColor(i));
         }
 
@@ -305,7 +305,7 @@ private void backpackRecipe(Item backpack) {
         ShapedRecipeBuilder builder = shapedRecipe(backpack)
                 .key('C', WOVEN_CLOTH_ITEM.get());
 
-        if (color != DyeColor.WHITE) { // White is default and doesn't need a dye
+        if (color == DyeColor.WHITE) { // White is default and doesn't need a dye
             builder.patternLine("CCC")
                     .patternLine("C C")
                     .patternLine("CCC");