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.

Sign up for GitHub

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

Fix Remaining Recipe Conflicts as of #996 #1049

Merged
merged 1 commit into from
Jun 27, 2022
Merged

Fix Remaining Recipe Conflicts as of #996 #1049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/main/java/gregtech/loaders/recipe/VanillaStandardRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ private static void redstoneRecipes() {
'P', new ItemStack(Blocks.WOODEN_SLAB, 1, GTValues.W)
);

ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(16).inputs(new ItemStack(Blocks.PLANKS, 8, GTValues.W)).input(dust, Redstone).outputs(new ItemStack(Blocks.NOTEBLOCK)).buildAndRegister();
ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(16).inputs(new ItemStack(Blocks.PLANKS, 8, GTValues.W)).input(dust, Redstone).circuitMeta(1).outputs(new ItemStack(Blocks.NOTEBLOCK)).buildAndRegister();
ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(16).inputs(new ItemStack(Blocks.PLANKS, 8, GTValues.W)).input(gem, Diamond).outputs(new ItemStack(Blocks.JUKEBOX)).buildAndRegister();
}

Expand All @@ -855,6 +855,7 @@ private static void metalRecipes() {
ASSEMBLER_RECIPES.recipeBuilder()
.input(dust, Redstone)
.input(plate, Iron, 4)
.circuitMeta(1)
.outputs(new ItemStack(Items.COMPASS))
.duration(400).EUt(4).buildAndRegister();

Expand Down Expand Up @@ -1056,7 +1057,7 @@ private static void miscRecipes() {

ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(4).circuitMeta(1).input("wool", 1).inputs(new ItemStack(Items.STICK, 8)).outputs(new ItemStack(Items.PAINTING)).buildAndRegister();
ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(4).inputs(new ItemStack(Items.LEATHER)).inputs(new ItemStack(Items.STICK, 8)).outputs(new ItemStack(Items.ITEM_FRAME)).buildAndRegister();
ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(4).input("plankWood", 6).inputs(new ItemStack(Items.STICK)).outputs(new ItemStack(Items.SIGN, 3)).buildAndRegister();
ASSEMBLER_RECIPES.recipeBuilder().duration(100).EUt(4).input("plankWood", 6).inputs(new ItemStack(Items.STICK)).circuitMeta(1).outputs(new ItemStack(Items.SIGN, 3)).buildAndRegister();

ASSEMBLER_RECIPES.recipeBuilder().duration(10).EUt(2).inputs(new ItemStack(Items.BRICK, 3)).outputs(new ItemStack(Items.FLOWER_POT)).buildAndRegister();

Expand All @@ -1083,15 +1084,15 @@ private static void miscRecipes() {
.input(OrePrefix.stick, Iron, 12)
.input(stick, Wood)
.input(dust, Redstone)
.circuitMeta(3)
.circuitMeta(4)
.outputs(new ItemStack(Blocks.DETECTOR_RAIL, 12))
.duration(200).EUt(VA[LV]).buildAndRegister();

ASSEMBLER_RECIPES.recipeBuilder()
.input(stick, Iron, 12)
.input(stick, Wood, 2)
.inputs(new ItemStack(Blocks.REDSTONE_TORCH))
.circuitMeta(3)
.circuitMeta(4)
.outputs(new ItemStack(Blocks.ACTIVATOR_RAIL, 12))
.duration(200).EUt(VA[LV]).buildAndRegister();

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/loaders/recipe/chemistry/AssemblerRecipeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public static void init() {

ASSEMBLER_RECIPES.recipeBuilder().duration(200).EUt(VA[LV])
.input(plate, Wood, 3)
.circuitMeta(4)
.circuitMeta(6)
.fluidInputs(Glue.getFluid(20))
.output(pipeNormalFluid, Wood)
.buildAndRegister();
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/gregtech/loaders/recipe/chemistry/LCRCombined.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,14 @@ static void init() {
.fluidOutputs(Acetone.getFluid(2000))
.fluidOutputs(Oxygen.getFluid(1000))
.duration(400).EUt(VA[HV]).buildAndRegister();

LARGE_CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(4))
.fluidInputs(Oxygen.getFluid(7000))
.fluidInputs(Nitrogen.getFluid(2000))
.fluidInputs(Hydrogen.getFluid(6000))
.fluidOutputs(DinitrogenTetroxide.getFluid(1000))
.fluidOutputs(Water.getFluid(3000))
.duration(1100).EUt(VA[HV]).buildAndRegister();
}
}
10 changes: 1 addition & 9 deletions src/main/java/gregtech/loaders/recipe/chemistry/ReactorRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ public static void init() {
CHEMICAL_RECIPES.recipeBuilder()
.fluidInputs(Hydrogen.getFluid(6000))
.fluidInputs(CarbonDioxide.getFluid(1000))
.notConsumable(new IntCircuitIngredient(2))
.fluidOutputs(Water.getFluid(1000))
.fluidOutputs(Methanol.getFluid(1000))
.duration(120).EUt(96).buildAndRegister();
Expand Down Expand Up @@ -501,15 +502,6 @@ public static void init() {
.fluidOutputs(DinitrogenTetroxide.getFluid(1000))
.duration(640).EUt(VA[LV]).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.notConsumable(new IntCircuitIngredient(3))
.fluidInputs(Oxygen.getFluid(7000))
.fluidInputs(Nitrogen.getFluid(2000))
.fluidInputs(Hydrogen.getFluid(6000))
.fluidOutputs(DinitrogenTetroxide.getFluid(1000))
.fluidOutputs(Water.getFluid(3000))
.duration(1100).EUt(VA[HV]).buildAndRegister();

CHEMICAL_RECIPES.recipeBuilder()
.input(dust, SodiumHydroxide, 3)
.fluidInputs(SulfuricAcid.getFluid(1000))
Expand Down