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

Jump to bottom

Add steam machine hull assembler recipes #1052

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Add steam machine hull assembler recipes #1052

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
31cda01
Added Multiple Steam Machine Hulls
Dioxop Oct 21, 2024
ae202d7
Apply Spotless
Dioxop Oct 21, 2024
1106655
Merge branch 'master' into Add-Steam-Machine-hull-assembler-recipes
Dream-Master Oct 21, 2024
2423a5e
Applied recommended changes
Dioxop Oct 21, 2024
1eab734
Merge branch 'Add-Steam-Machine-hull-assembler-recipes' of https://gi…
Dioxop Oct 21, 2024
de32349
Merge branch 'master' into Add-Steam-Machine-hull-assembler-recipes
Dioxop Oct 22, 2024
f388892
Merge branch 'master' into Add-Steam-Machine-hull-assembler-recipes
Dream-Master Oct 26, 2024
0b80bd0
Merge branch 'master' into Add-Steam-Machine-hull-assembler-recipes
Dream-Master Nov 7, 2024
38226c8
Merge branch 'master' into Add-Steam-Machine-hull-assembler-recipes
Dream-Master Nov 16, 2024
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
41 changes: 40 additions & 1 deletion src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,40 @@ public void run() {
makeElectricMachinePartRecipes();
makeCircuitPartRecipes();

// Bronze Hull
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 8),
GTUtility.getIntegratedCircuit(6))
.itemOutputs(ItemList.Hull_Bronze.get(1)).duration(2 * SECONDS + 10).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

// Bricked Bronze Hull
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This conflicts with the Bronze Hull above if you are making a lot of them, since the only thing differentiating them is the addition of Bricks in this Recipe. Having them both on circuit 6 shouldn’t be done.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are the exact rules for a new recipe? Does it need to have at least two different items or a different circuit?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If any combinations of items (regardless of their amount) in a recipe can make another recipe, that's a conflict. If there's a conflict the recipe has to be changed to fix it, though this usually means changing the circuit.

GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 5),
new ItemStack(Blocks.brick_block, 3),
GTUtility.getIntegratedCircuit(6))
.itemOutputs(ItemList.Hull_Bronze_Bricks.get(1)).duration(2 * SECONDS + 10).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

// Steel Hull
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 8),
GTUtility.getIntegratedCircuit(6))
.itemOutputs(ItemList.Hull_HP.get(1)).duration(2 * SECONDS + 10).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

// Bricked Wrought Iron Hull
GTValues.RA.stdBuilder()
.itemInputs(
GTOreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 5),
new ItemStack(Blocks.brick_block, 3),
GTUtility.getIntegratedCircuit(6))
.itemOutputs(ItemList.Hull_HP_Bricks.get(1)).duration(2 * SECONDS + 10).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

GTValues.RA.stdBuilder()
.itemInputs(
GTModHandler.getModItem(IndustrialCraft2.ID, "blockAlloyGlass", 1L, 0),
Expand Down Expand Up @@ -969,7 +1003,11 @@ public void run() {
.itemOutputs(ItemList.Casing_Firebricks.get(4L)).fluidInputs(Materials.Concrete.getMolten(4608L))
.duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);

GTValues.RA.stdBuilder().itemInputs(new ItemStack(Blocks.brick_block), Materials.AnyBronze.getPlates(6))
GTValues.RA.stdBuilder()
.itemInputs(
new ItemStack(Blocks.brick_block),
Materials.AnyBronze.getPlates(6),
GTUtility.getIntegratedCircuit(16))
.itemOutputs(ItemList.Casing_BronzePlatedBricks.get(1L)).duration(10 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);

Expand Down Expand Up @@ -10291,6 +10329,7 @@ private void makeSolderingAlloyRecipes() {
.itemOutputs(GTModHandler.getModItem(Computronics.ID, "computronics.dockingUpgrade", 1L, 0))
.fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS)
.eut(TierEU.RECIPE_HV).addTo(assemblerRecipes);

}
}
}
Expand Down