Add new Mold and shape forms for small Gear and Turbine Blades

15 files changed, 9 insertions, 0 deletions

diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 45f24f4ce4..6e6a004156 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -150,6 +150,7 @@ public enum ItemList implements IItemContainer {
     Shape_Mold_Ring,
     Shape_Mold_Rod_Long,
     Shape_Mold_Rotor,
+    Shape_Mold_Turbine_Blade,
     Shape_Slicer_Flat,
     Shape_Slicer_Stripes,
     Shape_Extruder_Bottle,
@@ -177,6 +178,8 @@ public enum ItemList implements IItemContainer {
     Shape_Extruder_Saw,
     Shape_Extruder_Gear,
     Shape_Extruder_Rotor,
+    Shape_Extruder_Turbine_Blade,
+    Shape_Extruder_Small_Gear,
     Crate_Empty,
     Credit_Copper,
     Credit_Iron,
diff --git a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
index da01c21718..4a009f79ee 100644
--- a/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
+++ b/src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
@@ -185,6 +185,7 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         ItemList.Shape_Mold_Ring.set(addItem(tLastID = 322, "Mold (Ring)", "Mold for making Rings", new Object[0]));
         ItemList.Shape_Mold_Rod_Long.set(addItem(tLastID = 323, "Mold (Long Rod)", "Mold for making Long Rods", new Object[0]));
         ItemList.Shape_Mold_Rotor.set(addItem(tLastID = 324, "Mold (Rotor)", "Mold for making a Rotor", new Object[0]));
+        ItemList.Shape_Mold_Turbine_Blade.set(addItem(tLastID = 325, "Mold (Turbine Blade)", "Mold for making a Turbine Blade", new Object[0]));
 
         GT_ModHandler.removeRecipe(new ItemStack[]{new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass), null, new ItemStack(Blocks.glass)});
 
@@ -232,6 +233,8 @@ public class GT_MetaGenerated_Item_01 extends GT_MetaGenerated_Item_X32 {
         ItemList.Shape_Extruder_Gear.set(addItem(tLastID = 372, "Extruder Shape (Gear)", "Extruder Shape for making Gears", new Object[0]));
         ItemList.Shape_Extruder_Bottle.set(addItem(tLastID = 373, "Extruder Shape (Bottle)", "Extruder Shape for making Bottles", new Object[0]));
         ItemList.Shape_Extruder_Rotor.set(addItem(tLastID = 374, "Extruder Shape (Rotor)", "Extruder Shape for a Rotor", new Object[0]));
+        ItemList.Shape_Extruder_Small_Gear.set(addItem(tLastID = 375, "Extruder Shape (Small Gear)", "Extruder Shape for a Small Gear", new Object[0]));
+        ItemList.Shape_Extruder_Turbine_Blade.set(addItem(tLastID = 376, "Extruder Shape (Turbine Blade)", "Extruder Shape for a Turbine Blade", new Object[0]));
 
         //GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Bolt.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"x  ", aTextShape, aTextEmptyRow, 'P', ItemList.Shape_Empty});
         //GT_ModHandler.addCraftingRecipe(ItemList.Shape_Extruder_Cell.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{" x ", aTextShape, aTextEmptyRow, 'P', ItemList.Shape_Empty});
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
index 2e91fda06f..9708db1145 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java
@@ -44,12 +44,15 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi
                 }
                 GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(12L, new Object[]{aStack}), ItemList.Shape_Extruder_Pipe_Huge.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.pipeHuge, aMaterial.mSmeltInto, tAmount), 96 * tAmount, 8 * tVoltageMultiplier);
                 GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), ItemList.Shape_Extruder_Plate.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.plate, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), 8 * tVoltageMultiplier);
+                GT_Values.RA.addExtruderRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), ItemList.Shape_Extruder_Small_Gear.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.gearGtSmall, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), 8 * tVoltageMultiplier);
+                GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(6L, new Object[]{aStack}), ItemList.Shape_Extruder_Turbine_Blade.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial.mSmeltInto, tAmount), (int) Math.max(aMaterialMass * 1L * tAmount, tAmount), 8 * tVoltageMultiplier);
                 GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Ring.get(0L, new Object[0]),  aMaterial.getMolten(36L), GT_OreDictUnificator.get(OrePrefixes.ring, aMaterial, 1L), 100, 4 * tVoltageMultiplier);
                 GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Screw.get(0L, new Object[0]), aMaterial.getMolten(18L), GT_OreDictUnificator.get(OrePrefixes.screw, aMaterial, 1L), 50, 2 * tVoltageMultiplier);
                 GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rod.get(0L, new Object[0]),  aMaterial.getMolten(72L), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), 150 , 8 * tVoltageMultiplier);
                 GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Bolt.get(0L, new Object[0]), aMaterial.getMolten(18L), GT_OreDictUnificator.get(OrePrefixes.bolt, aMaterial, 1L), 50, 2 * tVoltageMultiplier);
                 GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Round.get(0L, new Object[0]),  aMaterial.getMolten(18L), GT_OreDictUnificator.get(OrePrefixes.round, aMaterial, 1L), 50 , 2 * tVoltageMultiplier);
                 GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Rod_Long.get(0L, new Object[0]),  aMaterial.getMolten(144L), GT_OreDictUnificator.get(OrePrefixes.stickLong, aMaterial, 1L), 300 , 8 * tVoltageMultiplier);
+                GT_Values.RA.addFluidSolidifierRecipe(ItemList.Shape_Mold_Turbine_Blade.get(0L, new Object[0]),  aMaterial.getMolten(864L), GT_OreDictUnificator.get(OrePrefixes.turbineBlade, aMaterial, 1L), 400 , 8 * tVoltageMultiplier);
 
                 if (tAmount * 2 <= 64)
                     GT_Values.RA.addExtruderRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), ItemList.Shape_Extruder_Rod.get(0L, new Object[0]), GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial.mSmeltInto, tAmount * 2), (int) Math.max(aMaterialMass * 2L * tAmount, tAmount), 6 * tVoltageMultiplier);
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png
index 7d4257adda..855dbae37d 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/300.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png
index 6d0b851404..7f04b405b4 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/318.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png
index 1e4f146938..f2f2fca912 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/319.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png
index 5ec6f2a7b2..9fcb969478 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/320.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png
index f1dd777923..8577b6dc61 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/321.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png
index a18c3277ee..2347de612c 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/322.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png
index 8fda77701a..2bddc5f15d 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/323.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png
index d992df4995..d2420b624d 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/324.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png
new file mode 100644
index 0000000000..0ba7b70c02
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/325.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png
index 929e82eead..1011f5d56c 100644
--- a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/374.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png
new file mode 100644
index 0000000000..356a6711aa
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/375.png
diff --git a/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png
new file mode 100644
index 0000000000..5c63811fb5
--- /dev/null
+++ b/src/main/resources/assets/gregtech/textures/items/gt.metaitem.01/376.png