From 7b3aedbc94ae3c4fafe59018582a7a159cd45b9e Mon Sep 17 00:00:00 2001
From: Andrew-71 <andrey.nikitin.vladimirovich@gmail.com>
Date: Thu, 19 Oct 2023 21:04:17 +0300
Subject: [PATCH] Change ceiling fan recipe

---
 CHANGELOG                                     |  4 +-
 .../recipes/decorations/ceiling_fan.json      | 39 +++++++------------
 .../data/new_soviet/recipes/ceiling_fan.json  | 13 +++----
 .../new_soviet/datagen/RecipeGenerator.java   | 13 +++----
 4 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 91cd50d..f1c2fe7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,7 +12,9 @@
 * Improved Radio
     * Re-made texture and model to better fit the USSR aesthetic
     * Added ability to waterlog radios
-* Re-made ceiling fan texture and model to better fit the USSR aesthetic
+* Improved ceiling fan
+    * Re-made texture and model to better fit the USSR aesthetic
+    * Changed crafting recipe to match new model
 * Added golden lamp crafting recipe
 * Several tiny fixes
     * Light bulb break noise is now in correct category
diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/ceiling_fan.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/ceiling_fan.json
index 5cf91b1..02efb14 100644
--- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/ceiling_fan.json
+++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/ceiling_fan.json
@@ -1,6 +1,18 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
+    "has_iron_ingot": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:iron_ingot"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
     "has_iron_nugget": {
       "conditions": {
         "items": [
@@ -13,42 +25,17 @@
       },
       "trigger": "minecraft:inventory_changed"
     },
-    "has_stick": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "minecraft:stick"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
-    },
     "has_the_recipe": {
       "conditions": {
         "recipe": "new_soviet:ceiling_fan"
       },
       "trigger": "minecraft:recipe_unlocked"
-    },
-    "has_white_wool": {
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "minecraft:white_wool"
-            ]
-          }
-        ]
-      },
-      "trigger": "minecraft:inventory_changed"
     }
   },
   "requirements": [
     [
       "has_iron_nugget",
-      "has_stick",
-      "has_white_wool",
+      "has_iron_ingot",
       "has_the_recipe"
     ]
   ],
diff --git a/src/main/generated/data/new_soviet/recipes/ceiling_fan.json b/src/main/generated/data/new_soviet/recipes/ceiling_fan.json
index e822786..cb1a684 100644
--- a/src/main/generated/data/new_soviet/recipes/ceiling_fan.json
+++ b/src/main/generated/data/new_soviet/recipes/ceiling_fan.json
@@ -2,19 +2,16 @@
   "type": "minecraft:crafting_shaped",
   "category": "misc",
   "key": {
+    "I": {
+      "item": "minecraft:iron_ingot"
+    },
     "N": {
       "item": "minecraft:iron_nugget"
-    },
-    "S": {
-      "item": "minecraft:stick"
-    },
-    "W": {
-      "item": "minecraft:white_wool"
     }
   },
   "pattern": [
-    " S ",
-    "WNW"
+    " I ",
+    "NNN"
   ],
   "result": {
     "item": "new_soviet:ceiling_fan"
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 a3f60d1..6a72392 100644
--- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
+++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java
@@ -175,17 +175,14 @@ public class RecipeGenerator extends FabricRecipeProvider {
 
     private void ceilingFanRecipe(Consumer<RecipeJsonProvider> exporter, ItemConvertible output) {
         ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1)
-                .pattern(" S ")
-                .pattern("WNW")
-                .input('S', Items.STICK)
+                .pattern(" I ")
+                .pattern("NNN")
+                .input('I', Items.IRON_INGOT)
                 .input('N', Items.IRON_NUGGET)
-                .input('W', Items.WHITE_WOOL)
                 .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET),
                         RecipeProvider.conditionsFromItem(Items.IRON_NUGGET))
-                .criterion(RecipeProvider.hasItem(Items.STICK),
-                        RecipeProvider.conditionsFromItem(Items.STICK))
-                .criterion(RecipeProvider.hasItem(Items.WHITE_WOOL),
-                        RecipeProvider.conditionsFromItem(Items.WHITE_WOOL))
+                .criterion(RecipeProvider.hasItem(Items.IRON_INGOT),
+                        RecipeProvider.conditionsFromItem(Items.IRON_INGOT))
                 .offerTo(exporter);
     }