Add the Rotor Extruder Shape (#139)

GregTechCEu · Sep 8, 2021 · 7f3c8c4 · 7f3c8c4
1 parent cd26e72
commit 7f3c8c4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 1 deletion.
diff --git a/src/main/java/gregtech/common/items/MetaItem1.java b/src/main/java/gregtech/common/items/MetaItem1.java
@@ -97,6 +97,7 @@ public void registerSubItems() {
         SHAPE_EXTRUDERS[23] = SHAPE_EXTRUDER_FOIL = addItem(54, "shape.extruder.foil").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
         SHAPE_EXTRUDERS[24] = SHAPE_EXTRUDER_GEAR_SMALL = addItem(55, "shape.extruder.gear_small").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
         SHAPE_EXTRUDERS[25] = SHAPE_EXTRUDER_ROD_LONG = addItem(56, "shape.extruder.rod_long").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
+        SHAPE_EXTRUDERS[26] = SHAPE_EXTRUDER_ROTOR = addItem(57, "shape.extruder.rotor").setMaterialInfo(new ItemMaterialInfo(new MaterialStack(Materials.Steel, GTValues.M * 4)));
 
         // Spray Cans: ID 61-77
         SPRAY_EMPTY = addItem(61, "spray.empty")

diff --git a/src/main/java/gregtech/common/items/MetaItems.java b/src/main/java/gregtech/common/items/MetaItems.java
@@ -71,7 +71,7 @@ private MetaItems() {
     public static MetaItem<?>.MetaValueItem SHAPE_MOLD_GEAR_SMALL;
     public static MetaItem<?>.MetaValueItem SHAPE_MOLD_ROTOR;
 
-    public static final MetaItem<?>.MetaValueItem[] SHAPE_EXTRUDERS = new MetaValueItem[26];
+    public static final MetaItem<?>.MetaValueItem[] SHAPE_EXTRUDERS = new MetaValueItem[27];
     public static MetaItem<?>.MetaValueItem SHAPE_EXTRUDER_PLATE;
     public static MetaItem<?>.MetaValueItem SHAPE_EXTRUDER_ROD;
     public static MetaItem<?>.MetaValueItem SHAPE_EXTRUDER_BOLT;
@@ -98,6 +98,7 @@ private MetaItems() {
     public static MetaItem<?>.MetaValueItem SHAPE_EXTRUDER_FOIL;
     public static MetaItem<?>.MetaValueItem SHAPE_EXTRUDER_GEAR_SMALL;
     public static MetaItem<?>.MetaValueItem SHAPE_EXTRUDER_ROD_LONG;
+    public static MetaItem<?>.MetaValueItem SHAPE_EXTRUDER_ROTOR;
 
     public static MetaItem<?>.MetaValueItem SPRAY_EMPTY;
 

diff --git a/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java b/src/main/java/gregtech/loaders/oreprocessing/PartsRecipeHandler.java
@@ -326,6 +326,14 @@ public static void processRotor(OrePrefix rotorPrefix, Material material, IngotP
                     .EUt(20)
                     .buildAndRegister();
         }
+
+        RecipeMaps.EXTRUDER_RECIPES.recipeBuilder()
+                .notConsumable(MetaItems.SHAPE_EXTRUDER_ROTOR)
+                .input(ingot, material, 5)
+                .output(rotor, material)
+                .duration((int) material.getAverageMass() * 5)
+                .EUt(material.getBlastTemperature() >= 2800 ? 256 : 64)
+                .buildAndRegister();
     }
 
     public static void processStick(OrePrefix stickPrefix, Material material, DustProperty property) {

diff --git a/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/CraftingRecipeLoader.java
@@ -165,6 +165,7 @@ private static void loadCraftingRecipes() {
         ModHandler.addShapedRecipe("shape/extruder/shape_extruder_plate", MetaItems.SHAPE_EXTRUDER_PLATE.getStackForm(), "x  ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_FOIL.getStackForm());
         ModHandler.addShapedRecipe("shape/extruder/shape_extruder_gear_small", MetaItems.SHAPE_EXTRUDER_GEAR_SMALL.getStackForm(), " x ", " S ", "   ", 'S', MetaItems.SHAPE_EXTRUDER_RING.getStackForm());
         ModHandler.addShapedRecipe("shape/extruder/shape_extruder_foil", MetaItems.SHAPE_EXTRUDER_FOIL.getStackForm(), "   ", " S ", "  x", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
+        ModHandler.addShapedRecipe("shape/extruder/shape_extruder_rotor", MetaItems.SHAPE_EXTRUDER_ROTOR.getStackForm(), "   ", " S ", "x  ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
 
         ModHandler.addShapedRecipe("shape/mold/shape_mold_rotor", MetaItems.SHAPE_MOLD_ROTOR.getStackForm(), "  h", " S ", "   ", 'S', MetaItems.SHAPE_EMPTY.getStackForm());
         ModHandler.addShapedRecipe("shape/mold/shape_mold_gear_small", MetaItems.SHAPE_MOLD_GEAR_SMALL.getStackForm(), "   ", "   ", "h S", 'S', MetaItems.SHAPE_EMPTY.getStackForm());

diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang
@@ -204,6 +204,8 @@ metaitem.shape.extruder.foil.name=Extruder Shape (Foil)
 metaitem.shape.extruder.foil.tooltip=Extruder Shape for making Foils from Non-Metals
 metaitem.shape.extruder.rod_long.name=Extruder Shape (Long Rod)
 metaitem.shape.extruder.rod_long.tooltip=Extruder Shape for making Long Rods
+metaitem.shape.extruder.rotor.name=Extruder Shape (Rotor)
+metaitem.shape.extruder.rotor.tooltip=Extruder Shape for making Rotors
 
 metaitem.spray.empty.name=Spray Can (Empty)
 metaitem.spray.empty.tooltip=Can be filled with sprays of various colors

diff --git a/src/main/resources/assets/gregtech/models/item/metaitems/shape.extruder.rotor.json b/src/main/resources/assets/gregtech/models/item/metaitems/shape.extruder.rotor.json
@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "gregtech:items/metaitems/shape.extruder.rotor"
+  }
+}
diff --git a/...ain/resources/assets/gregtech/textures/items/metaitems/shape.extruder.rotor.png b/...ain/resources/assets/gregtech/textures/items/metaitems/shape.extruder.rotor.png