From 2606dc1f6694ba86726fefa76cfe3488012d67ce Mon Sep 17 00:00:00 2001
From: Andrew-71 <andrey.nikitin.vladimirovich@gmail.com>
Date: Sun, 28 Apr 2024 10:45:42 +0300
Subject: [PATCH] Change whitewash recipe

---
 CHANGELOG                                     |  6 +++--
 .../whitewash_item.json                       | 17 ++++++++++--
 .../new_soviet/recipes/whitewash_item.json    | 27 ++++++++++---------
 .../new_soviet/datagen/RecipeGenerator.java   |  7 ++++-
 4 files changed, 40 insertions(+), 17 deletions(-)
 rename src/main/generated/data/new_soviet/advancements/recipes/{building_blocks => misc}/whitewash_item.json (70%)

diff --git a/CHANGELOG b/CHANGELOG
index 8a410d0..62a939d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -78,7 +78,8 @@ Due to sheer amount of changes, many may be undocumented. We hope you enjoy this
     * Now uses screwdriver to change sound
     * Sound names now translatable
     * Added a questionable sound option
-* At least 2 new advancements
+* Whitewash can now be applied to concrete and some other blocks with a brush
+* Added new advancements
 * Bug fixes
     * Added many of the missing crafting recipes
     * Stone-cutting recipe for slabs now gives 2 blocks
@@ -91,4 +92,5 @@ Due to sheer amount of changes, many may be undocumented. We hope you enjoy this
 * Technical changes
     * Changed parts of file structure for models and textures
     * Removed some unused textures intended for later updates
-    * Moved to newer Fabric, Loom etc. versions. Took a while to figure out how to update Gradle :D
\ No newline at end of file
+    * Moved to newer Fabric, Loom etc. versions. Took a while to figure out how to update Gradle :D
+    * Source-sets main and client have been merged to fix mixins
\ No newline at end of file
diff --git a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/whitewash_item.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/whitewash_item.json
similarity index 70%
rename from src/main/generated/data/new_soviet/advancements/recipes/building_blocks/whitewash_item.json
rename to src/main/generated/data/new_soviet/advancements/recipes/misc/whitewash_item.json
index e8e4cdd..c7f40ea 100644
--- a/src/main/generated/data/new_soviet/advancements/recipes/building_blocks/whitewash_item.json
+++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/whitewash_item.json
@@ -1,12 +1,24 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
+    "has_bucket": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "new_soviet:whitewash_item"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_quartz": {
       "conditions": {
         "items": [
           {
             "items": [
-              "minecraft:quartz"
+              "new_soviet:whitewash_item"
             ]
           }
         ]
@@ -24,7 +36,7 @@
         "items": [
           {
             "items": [
-              "minecraft:white_dye"
+              "new_soviet:whitewash_item"
             ]
           }
         ]
@@ -36,6 +48,7 @@
     [
       "has_quartz",
       "has_white_dye",
+      "has_bucket",
       "has_the_recipe"
     ]
   ],
diff --git a/src/main/generated/data/new_soviet/recipes/whitewash_item.json b/src/main/generated/data/new_soviet/recipes/whitewash_item.json
index c10a27c..4c2c6df 100644
--- a/src/main/generated/data/new_soviet/recipes/whitewash_item.json
+++ b/src/main/generated/data/new_soviet/recipes/whitewash_item.json
@@ -1,21 +1,24 @@
 {
-  "type": "minecraft:crafting_shaped",
-  "category": "building",
-  "key": {
-    "X": {
+  "type": "minecraft:crafting_shapeless",
+  "category": "misc",
+  "ingredients": [
+    {
       "item": "minecraft:quartz"
     },
-    "Y": {
+    {
+      "item": "minecraft:quartz"
+    },
+    {
       "item": "minecraft:white_dye"
+    },
+    {
+      "item": "minecraft:white_dye"
+    },
+    {
+      "item": "minecraft:bucket"
     }
-  },
-  "pattern": [
-    "XY",
-    "YX"
   ],
   "result": {
-    "count": 6,
     "item": "new_soviet:whitewash_item"
-  },
-  "show_notification": true
+  }
 }
\ No newline at end of file
diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
index e4630fa..21c5115 100644
--- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
+++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
@@ -1146,6 +1146,11 @@ public class RecipeGenerator extends FabricRecipeProvider {
                 .criterion(FabricRecipeProvider.hasItem(Items.WHEAT), FabricRecipeProvider.conditionsFromItem(NSE_Items.GRAIN_PATTERN))
                 .offerTo(exporter);
 
-        crissCrossRecipe(exporter, NSE_Items.WHITEWASH_ITEM, Items.QUARTZ, Items.WHITE_DYE, 6);
+        ShapelessRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.WHITEWASH_ITEM)
+                .input(Items.QUARTZ, 2).input(Items.WHITE_DYE, 2).input(Items.BUCKET)
+                .criterion(FabricRecipeProvider.hasItem(Items.QUARTZ), FabricRecipeProvider.conditionsFromItem(NSE_Items.WHITEWASH_ITEM))
+                .criterion(FabricRecipeProvider.hasItem(Items.WHITE_DYE), FabricRecipeProvider.conditionsFromItem(NSE_Items.WHITEWASH_ITEM))
+                .criterion(FabricRecipeProvider.hasItem(Items.BUCKET), FabricRecipeProvider.conditionsFromItem(NSE_Items.WHITEWASH_ITEM))
+                .offerTo(exporter);
     }
 }
\ No newline at end of file