Skip to content

Commit c2b83c1

Browse files
authored
fix iron door recipes and recycling (GregTechCEu#1995)
1 parent 90fa53e commit c2b83c1

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

src/main/java/gregtech/loaders/MaterialInfoLoader.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import gregtech.api.unification.OreDictUnifier;
44
import gregtech.api.unification.material.Materials;
5-
import gregtech.api.unification.ore.OrePrefix;
65
import gregtech.api.unification.stack.ItemMaterialInfo;
76
import gregtech.api.unification.stack.MaterialStack;
87
import gregtech.common.ConfigHolder;
@@ -200,10 +199,10 @@ public static void init() {
200199
new ItemMaterialInfo(new MaterialStack(Bronze, M * 6 * 2 / 64), // 2 large pipe / 64
201200
new MaterialStack(Steel, M * 8 / 64))); // 8 steel plate / 64
202201

203-
if (ConfigHolder.recipes.hardIronRecipes) {
202+
if (ConfigHolder.recipes.hardAdvancedIronRecipes) {
204203
OreDictUnifier.registerOre(new ItemStack(Items.IRON_DOOR, 1), new ItemMaterialInfo(
205-
new MaterialStack(Materials.Iron, (37 * M) / 9), // dust tiny
206-
new MaterialStack(Materials.Steel, M / 9))); // dust tiny
204+
new MaterialStack(Materials.Iron, M * 4 + (M * 3 / 16)), // 4 iron plates + 1 iron bars
205+
new MaterialStack(Materials.Steel, M / 9))); // tiny steel dust
207206
} else {
208207
OreDictUnifier.registerOre(new ItemStack(Items.IRON_DOOR, 1), new ItemMaterialInfo(new MaterialStack(Materials.Iron, M * 2)));
209208
}

src/main/java/gregtech/loaders/recipe/VanillaOverrideRecipes.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,12 @@ private static void metalAdvancedRecipes() {
437437
'R', new UnificationEntry(OrePrefix.ring, Materials.Steel),
438438
'S', new UnificationEntry(OrePrefix.screw, Materials.Steel)
439439
);
440+
ASSEMBLER_RECIPES.recipeBuilder()
441+
.input(OrePrefix.plate, Materials.Iron, 4)
442+
.inputs(new ItemStack(Blocks.IRON_BARS))
443+
.fluidInputs(Materials.Steel.getFluid(L / 9))
444+
.outputs(new ItemStack(Items.IRON_DOOR))
445+
.duration(400).EUt(VA[ULV]).buildAndRegister();
440446

441447
ModHandler.removeRecipeByName(new ResourceLocation("minecraft:anvil"));
442448
ModHandler.addShapedRecipe("anvil", new ItemStack(Blocks.ANVIL), "BBB", "SBS", "PBP",

src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -845,11 +845,13 @@ private static void metalRecipes() {
845845
.outputs(new ItemStack(Blocks.IRON_TRAPDOOR))
846846
.duration(100).EUt(16).buildAndRegister();
847847

848-
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
849-
.input(OrePrefix.plate, Materials.Iron, 6)
850-
.circuitMeta(6)
851-
.outputs(new ItemStack(Items.IRON_DOOR))
852-
.duration(100).EUt(16).buildAndRegister();
848+
if (!ConfigHolder.recipes.hardAdvancedIronRecipes) {
849+
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
850+
.input(OrePrefix.plate, Materials.Iron, 6)
851+
.circuitMeta(6)
852+
.outputs(new ItemStack(Items.IRON_DOOR, 3))
853+
.duration(100).EUt(16).buildAndRegister();
854+
}
853855
}
854856

855857
/**

0 commit comments

Comments
 (0)