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

Various recipe fixes and tweaks #788

Merged
merged 17 commits into from
Jan 12, 2024
Merged

Various recipe fixes and tweaks #788

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
d9f6c58
Fix [Nuclear Control] Advanced Panel Extender recipe.
AbdielKavash Jan 1, 2024
c2f5bd4
Merge remote-tracking branch 'origin/RecipeFixes' into RecipeFixes
AbdielKavash Jan 5, 2024
0cf6875
Add [Thaumic Bases] Quicksilver Block and Brick smelting and Fluid Ex…
AbdielKavash Jan 5, 2024
0e77edb
Add [Chisel] Hempcrete mixer recipes for all colors.
AbdielKavash Jan 5, 2024
85a4b7d
Add [ProjectRed] Item Crafting Extension Chip, Network Latency Pipe r…
AbdielKavash Jan 5, 2024
00dc4ca
Add a direct crafting recipe for [Tinker's Mechworks] full Spool of W…
AbdielKavash Jan 5, 2024
79e21fb
Separated [Logistics Pipes] Blank Module crafting from [ProjectRed] N…
AbdielKavash Jan 5, 2024
4256e63
Replaced Reinforced Plates in [Steve's Carts] Blank Upgrade with Stee…
AbdielKavash Jan 5, 2024
f111430
Add recipes for many [Hardcore Ender Expansion] decorative blocks.
AbdielKavash Jan 5, 2024
91184bf
Add assembler bulk recipes for remaining [Chisel] blocks.
AbdielKavash Jan 5, 2024
4d4d537
Merge branch 'master' into RecipeFixes
Dream-Master Jan 7, 2024
8824508
Merge branch 'GTNewHorizons:master' into RecipeFixes
AbdielKavash Jan 9, 2024
64e0de2
Merge branch 'master' into RecipeFixes
Dream-Master Jan 10, 2024
faa567b
Merge branch 'master' into RecipeFixes
Dream-Master Jan 11, 2024
b270fa7
Merge branch 'GTNewHorizons:master' into RecipeFixes
AbdielKavash Jan 12, 2024
5236727
Cleanup: [ProjectRed].
AbdielKavash Jan 12, 2024
60d82ad
Cleanup: [Logistics Pipes].
AbdielKavash Jan 12, 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
10 changes: 6 additions & 4 deletions src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1183,10 +1183,12 @@ public void run() {
}

if (Chisel.isModLoaded()) {
GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Chisel.ID, "hempcretesand", 1L))
.fluidInputs(Materials.Water.getFluid(100L))
.itemOutputs(GT_ModHandler.getModItem(Chisel.ID, "hempcrete", 1L)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(mixerRecipes);
for (int meta = 0; meta < 16; ++meta) {
GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(Chisel.ID, "hempcretesand", 1L, meta))
.fluidInputs(Materials.Water.getFluid(100L))
.itemOutputs(GT_ModHandler.getModItem(Chisel.ID, "hempcrete", 1L, meta)).duration(5 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(mixerRecipes);
}
}
}
}
114 changes: 108 additions & 6 deletions src/main/java/com/dreammaster/scripts/ScriptLogisticPipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,6 @@ public List<String> getDependencies() {

@Override
public void loadRecipes() {
addShapelessRecipe(
getModItem(LogisticsPipes.ID, "item.itemModule", 1, 0, missing),
getModItem(ProjectRedCore.ID, "projectred.core.part", 1, 44, missing));
addShapelessRecipe(
getModItem(ProjectRedCore.ID, "projectred.core.part", 1, 44, missing),
getModItem(LogisticsPipes.ID, "item.itemModule", 1, 0, missing));
addShapedRecipe(
getModItem(LogisticsPipes.ID, "item.logisticsParts", 1, 2, missing),
"boltRedSteel",
Expand Down Expand Up @@ -1262,6 +1256,114 @@ private void recipes1() {
.itemOutputs(getModItem(LogisticsPipes.ID, "item.PipeItemsBasicLogistics", 32, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 72)).duration(40 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
getModItem(IndustrialCraft2.ID, "itemPartCircuit", 1, 0, missing),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.lead", 144)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
ItemList.Circuit_Basic.get(1L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.lead", 144)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
ItemList.Circuit_Microprocessor.get(1L),
Copy link
Member

Choose a reason for hiding this comment

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

is this on purpose? These itemlist circuits should only be used if you want to forbid unification (multiple occurences, not just here)

GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.lead", 144)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 1, 5, missing),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.lead", 144)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
getModItem(IndustrialCraft2.ID, "itemPartCircuit", 1, 0, missing),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.tin", 72)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
ItemList.Circuit_Basic.get(1L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.tin", 72)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
ItemList.Circuit_Microprocessor.get(1L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.tin", 72)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 1, 5, missing),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.tin", 72)).duration(30 * SECONDS).eut(TierEU.RECIPE_LV)
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
getModItem(IndustrialCraft2.ID, "itemPartCircuit", 1, 0, missing),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 36)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
ItemList.Circuit_Basic.get(1L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 36)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
ItemList.Circuit_Microprocessor.get(1L),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 36)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 4),
getModItem(BartWorks.ID, "gt.bwMetaGeneratedItem0", 1, 5, missing),
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Gold, 4L),
GT_Utility.getIntegratedCircuit(18))
.itemOutputs(getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing))
.fluidInputs(FluidRegistry.getFluidStack("molten.solderingalloy", 36)).duration(30 * SECONDS)
.eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
getModItem(LogisticsPipes.ID, "item.itemModule", 4, 0, missing),
Expand Down
13 changes: 12 additions & 1 deletion src/main/java/com/dreammaster/scripts/ScriptMechworks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ public void loadRecipes() {
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1L),
getModItem(TinkersMechworks.ID, "LengthWire", 1, 0, missing))
getModItem(TinkersMechworks.ID, "LengthWire", 1, 0, missing),
GT_Utility.getIntegratedCircuit(1))
.itemOutputs(getModItem(TinkersMechworks.ID, "SpoolWire", 1, 256, missing)).duration(10 * SECONDS)
.eut(16).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
Expand All @@ -103,6 +104,16 @@ public void loadRecipes() {
getModItem(TinkersMechworks.ID, "SpoolWire", 1, 64, missing))
.itemOutputs(getModItem(TinkersMechworks.ID, "SpoolWire", 1, 0, missing))
.duration(1 * MINUTES + 4 * SECONDS).eut(16).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Steel, 1L),
getModItem(TinkersMechworks.ID, "LengthWire", 64, 0, missing),
getModItem(TinkersMechworks.ID, "LengthWire", 64, 0, missing),
getModItem(TinkersMechworks.ID, "LengthWire", 64, 0, missing),
getModItem(TinkersMechworks.ID, "LengthWire", 64, 0, missing),
GT_Utility.getIntegratedCircuit(2))
.itemOutputs(getModItem(TinkersMechworks.ID, "SpoolWire", 1, 0, missing))
.duration(2 * MINUTES + 8 * SECONDS).eut(64).addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
getModItem(TinkersMechworks.ID, "LengthWire", 3, 0, missing),
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dreammaster/scripts/ScriptNuclearControl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public void loadRecipes() {
GT_Values.RA.stdBuilder() // Advanced Panel Extender
.itemInputs(
getModItem(IC2NuclearControl.ID, "ItemUpgrade", 1, 0, missing),
getModItem(IC2NuclearControl.ID, "blockNuclearControlMain", 1, 4, missing),
getModItem(IC2NuclearControl.ID, "blockNuclearControlMain", 1, 5, missing),
getModItem(IC2NuclearControl.ID, "ItemUpgrade", 1, 1, missing),
GT_OreDictUnificator.get(OrePrefixes.plateAlloy, Materials.Carbon, 1),
GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Steel, 1L))
Expand Down
Loading