Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add the Rotor Extruder Shape #139

Merged
merged 2 commits into from
Sep 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/java/gregtech/common/items/MetaItem1.java
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/gregtech/common/items/MetaItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 2 additions & 0 deletions src/main/resources/assets/gregtech/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "gregtech:items/metaitems/shape.extruder.rotor"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.