From 3595b0d94c6ca66799c76e14e4ced00bf89fe69b Mon Sep 17 00:00:00 2001
From: Droog71 <71droog71@gmail.com>
Date: Mon, 5 Oct 2020 02:43:50 -0400
Subject: [PATCH] Fixed missing setHardness call on turbine block. Fixed
 missing / wrong recipe JSON files.

---
 .../reactor_turbines/ReactorTurbines.java     |  3 +--
 .../init/ReactorTurbineBlocks.java            |  2 +-
 .../classic_reactor_turbine_recipe.json       | 24 ++++++++++++++++++
 .../classic_turbine_impeller_recipe.json      | 25 +++++++++++++++++++
 .../recipes/reactor_turbine_recipe.json       |  6 ++---
 .../recipes/turbine_impeller_recipe.json      |  6 ++---
 main/resources/mcmod.info                     |  2 +-
 7 files changed, 56 insertions(+), 12 deletions(-)
 create mode 100644 main/resources/assets/reactor_turbines/recipes/classic_reactor_turbine_recipe.json
 create mode 100644 main/resources/assets/reactor_turbines/recipes/classic_turbine_impeller_recipe.json

diff --git a/main/java/com/droog71/reactor_turbines/ReactorTurbines.java b/main/java/com/droog71/reactor_turbines/ReactorTurbines.java
index 8773db6..1618abd 100644
--- a/main/java/com/droog71/reactor_turbines/ReactorTurbines.java
+++ b/main/java/com/droog71/reactor_turbines/ReactorTurbines.java
@@ -6,7 +6,6 @@ import com.droog71.reactor_turbines.config.ConfigHandler;
 import com.droog71.reactor_turbines.init.ReactorTurbineBlocks;
 import com.droog71.reactor_turbines.init.ReactorTurbineItems;
 import com.droog71.reactor_turbines.init.ReactorTurbineSounds;
-
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fml.common.Mod;
@@ -21,7 +20,7 @@ public class ReactorTurbines
 {
     public static final String MODID = "reactor_turbines";
     public static final String NAME = "Reactor Turbines";
-    public static final String VERSION = "1.2.1";
+    public static final String VERSION = "1.2.2";
     private static Logger logger;
 
     @Instance
diff --git a/main/java/com/droog71/reactor_turbines/init/ReactorTurbineBlocks.java b/main/java/com/droog71/reactor_turbines/init/ReactorTurbineBlocks.java
index 909ebb8..b1d1591 100644
--- a/main/java/com/droog71/reactor_turbines/init/ReactorTurbineBlocks.java
+++ b/main/java/com/droog71/reactor_turbines/init/ReactorTurbineBlocks.java
@@ -22,7 +22,7 @@ public class ReactorTurbineBlocks
 	
 	public static void init() 
 	{
-		reactorTurbine = new ReactorTurbine("reactor_turbine",Material.IRON).setCreativeTab(ReactorTurbines.tabReactorTurbines);
+		reactorTurbine = new ReactorTurbine("reactor_turbine",Material.IRON).setHardness(1.0f).setCreativeTab(ReactorTurbines.tabReactorTurbines);
 		turbineTileEntity = new ReactorTurbineTileEntity();
 		GameRegistry.registerTileEntity(turbineTileEntity.getClass(), "reactor_turbines:turbineTileEntity");
 	}
diff --git a/main/resources/assets/reactor_turbines/recipes/classic_reactor_turbine_recipe.json b/main/resources/assets/reactor_turbines/recipes/classic_reactor_turbine_recipe.json
new file mode 100644
index 0000000..73ecbc1
--- /dev/null
+++ b/main/resources/assets/reactor_turbines/recipes/classic_reactor_turbine_recipe.json
@@ -0,0 +1,24 @@
+{ 
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "PIP",
+    "ITI",
+    "PIP"  ],
+  "key": {
+    "P": {
+        "item": "ic2:itemreactorplating",
+        "data": 0
+    },
+    "T": {
+        "item": "ic2:blockelectric",
+        "data": 9
+    },
+    "I": {
+        "item": "reactor_turbines:turbine_impeller"
+    }
+},
+  "result": {
+    "item": "reactor_turbines:reactor_turbine",
+    "data": 0
+  }
+}
diff --git a/main/resources/assets/reactor_turbines/recipes/classic_turbine_impeller_recipe.json b/main/resources/assets/reactor_turbines/recipes/classic_turbine_impeller_recipe.json
new file mode 100644
index 0000000..11cef88
--- /dev/null
+++ b/main/resources/assets/reactor_turbines/recipes/classic_turbine_impeller_recipe.json
@@ -0,0 +1,25 @@
+{ 
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "PVP",
+    "VBV",
+    "PVP"  ],
+  "key": {
+    "P": {
+        "item": "ic2:itemreactorplating",
+        "data": 0
+    },
+    "V": {
+        "item": "ic2:itemheatvent",
+        "data": 11
+    },
+    "B": {
+        "item": "ic2:itemmisc",
+        "data": 304
+    }
+},
+  "result": {
+    "item": "reactor_turbines:turbine_impeller",
+    "data": 0
+  }
+}
diff --git a/main/resources/assets/reactor_turbines/recipes/reactor_turbine_recipe.json b/main/resources/assets/reactor_turbines/recipes/reactor_turbine_recipe.json
index 216fa81..339f308 100644
--- a/main/resources/assets/reactor_turbines/recipes/reactor_turbine_recipe.json
+++ b/main/resources/assets/reactor_turbines/recipes/reactor_turbine_recipe.json
@@ -6,12 +6,10 @@
     "VPV"  ],
   "key": {
     "V": {
-        "item": "ic2:component_heat_vent",
-        "item": "ic2:itemreactorventspread"
+        "item": "ic2:component_heat_vent"
     },
     "P": {
-        "item": "ic2:plating",
-        "item": "ic2:itemreactorplating"
+        "item": "ic2:plating"
     },
     "R": {
         "item": "reactor_turbines:turbine_impeller"
diff --git a/main/resources/assets/reactor_turbines/recipes/turbine_impeller_recipe.json b/main/resources/assets/reactor_turbines/recipes/turbine_impeller_recipe.json
index 9200bea..40a634a 100644
--- a/main/resources/assets/reactor_turbines/recipes/turbine_impeller_recipe.json
+++ b/main/resources/assets/reactor_turbines/recipes/turbine_impeller_recipe.json
@@ -6,12 +6,10 @@
     " P "  ],
   "key": {
     "V": {
-        "item": "ic2:component_heat_vent",
-        "item": "ic2:itemreactorventspread"
+        "item": "ic2:component_heat_vent"
     },
     "P": {
-        "item": "ic2:plating",
-        "item": "ic2:itemreactorplating"
+        "item": "ic2:plating"
     }
 },
   "result": {
diff --git a/main/resources/mcmod.info b/main/resources/mcmod.info
index 85469e8..863d402 100644
--- a/main/resources/mcmod.info
+++ b/main/resources/mcmod.info
@@ -3,7 +3,7 @@
   "modid": "reactor_turbines",
   "name": "Reactor Turbines",
   "description": "Addon for IC2 nuclear reactors.",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "mcversion": "1.12.2",
   "url": "",
   "updateUrl": "",