Skip to content

Commit

Permalink
Merge branch 'master' into solenoid+lfe-recipes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dream-Master
Dream-Master authored Sep 6, 2024
2 parents c9356f4 + 75a5c02 commit 4168071
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 26 deletions.
46 changes: 24 additions & 22 deletions src/main/java/com/dreammaster/gthandler/recipes/AssemblingLineRecipes.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,9 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.circuit, Materials.UMV, 4),
ItemList.Electric_Pump_UIV.get(32), ItemList.Quantum_Tank_IV.get(2),
ItemList.Conveyor_Module_UIV.get(32), ItemList.Quantum_Chest_IV.get(2) },
new FluidStack[] { Materials.Lubricant.getFluid(50000), Materials.SuperCoolant.getFluid(16_000),
new FluidStack(solderUEV, 11_520), Materials.UUMatter.getFluid(8_000) },
new FluidStack[] { MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(50000),
Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11_520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 4, 2),
40 * SECONDS,
(int) TierEU.RECIPE_UEV);
Expand All @@ -419,8 +420,9 @@ public void run() {
ItemList.Robot_Arm_UIV.get(32), ItemList.Electric_Piston_UIV.get(32),
new ItemStack(Blocks.dropper, 64), new ItemStack(Blocks.dropper, 64),
new ItemStack(Blocks.dropper, 64), new ItemStack(Blocks.dropper, 64), },
new FluidStack[] { Materials.Lubricant.getFluid(50_000), Materials.SuperCoolant.getFluid(16_000),
new FluidStack(solderUEV, 11520), Materials.UUMatter.getFluid(8_000) },
new FluidStack[] { MaterialsUEVplus.DimensionallyShiftedSuperfluid.getFluid(50_000),
Materials.SuperCoolant.getFluid(16_000), new FluidStack(solderUEV, 11520),
Materials.UUMatter.getFluid(8_000) },
GTModHandler.getModItem(GalaxySpace.ID, "dysonswarmparts", 1, 3),
10 * SECONDS,
(int) TierEU.RECIPE_UEV);
Expand Down Expand Up @@ -1214,25 +1216,25 @@ public void run() {
.metadata(RESEARCH_TIME, 1 * HOURS)
.itemInputs(
GTOreDictUnificator
.get(OrePrefixes.frameGt, Materials.Longasssuperconductornameforuhvwire, 16),
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Ledox, 16),
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CallistoIce, 16),
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.EnrichedHolmium, 16),
.get(OrePrefixes.frameGt, Materials.Longasssuperconductornameforuhvwire, 32),
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.Ledox, 32),
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.CallistoIce, 32),
GTOreDictUnificator.get(OrePrefixes.frameGt, Materials.EnrichedHolmium, 32),
GTOreDictUnificator
.get(OrePrefixes.plate, Materials.Longasssuperconductornameforuhvwire, 16),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Ledox, 16),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.CallistoIce, 16),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.EnrichedHolmium, 16),
.get(OrePrefixes.plate, Materials.Longasssuperconductornameforuhvwire, 32),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Ledox, 32),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.CallistoIce, 32),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.EnrichedHolmium, 32),
ItemList.Field_Generator_UEV.get(1),
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2 },
GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16))
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 8 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 4 },
GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 32))
.fluidInputs(
Materials.Longasssuperconductornameforuhvwire.getMolten(32 * 144),
Materials.Ledox.getMolten(32 * 144),
Materials.CallistoIce.getMolten(32 * 144),
MaterialsUEVplus.ExcitedDTRC.getFluid(4000L))
.itemOutputs(ItemList.BlockQuarkContainmentCasing.get(4)).duration(60 * SECONDS)
Materials.Longasssuperconductornameforuhvwire.getMolten(64 * 144),
Materials.Ledox.getMolten(64 * 144),
Materials.CallistoIce.getMolten(64 * 144),
MaterialsUEVplus.ExcitedDTRC.getFluid(8000L))
.itemOutputs(ItemList.BlockQuarkContainmentCasing.get(8)).duration(60 * SECONDS)
.eut(TierEU.RECIPE_UIV).addTo(AssemblyLine);

// Femtometer-calibrated particle beam casing
Expand All @@ -1247,7 +1249,7 @@ public void run() {
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Infinity, 16),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Tritanium, 16),
GTOreDictUnificator.get(OrePrefixes.plate, Materials.Neutronium, 16),
ItemList.Field_Generator_UEV.get(1),
ItemList.Field_Generator_UHV.get(1),
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2 },
GTOreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Infinity, 16))
Expand All @@ -1272,7 +1274,7 @@ public void run() {
GTOreDictUnificator
.get(OrePrefixes.foil, Materials.Longasssuperconductornameforuhvwire, 64),
GTOreDictUnificator.get(OrePrefixes.foil, Materials.Draconium, 64),
ItemList.Field_Generator_UEV.get(1),
ItemList.Electric_Pump_UEV.get(1),
new Object[] { OrePrefixes.circuit.get(Materials.UEV), 4 },
new Object[] { OrePrefixes.circuit.get(Materials.UIV), 2 },
GTOreDictUnificator.get(OrePrefixes.pipeQuadruple, Materials.Infinity, 16))
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/dreammaster/scripts/ScriptTCCoreMod.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,13 @@ public void loadRecipes() {
.add(Aspect.getAspect("terminus"), 512).add(Aspect.getAspect("gula"), 512)
.add(Aspect.getAspect("superbia"), 512),
ItemList.Block_BedrockiumCompressed.get(1L),
new ItemStack[] { ItemList.Field_Generator_UMV.get(1L),
new ItemStack[] { ItemList.Field_Generator_UIV.get(1L),
getModItem(EternalSingularity.ID, "eternal_singularity", 1, 0, missing),
ItemList.Field_Generator_UMV.get(1L),
ItemList.Field_Generator_UIV.get(1L),
getModItem(EternalSingularity.ID, "eternal_singularity", 1, 0, missing),
ItemList.Field_Generator_UMV.get(1L),
ItemList.Field_Generator_UIV.get(1L),
getModItem(EternalSingularity.ID, "eternal_singularity", 1, 0, missing),
ItemList.Field_Generator_UMV.get(1L),
ItemList.Field_Generator_UIV.get(1L),
getModItem(EternalSingularity.ID, "eternal_singularity", 1, 0, missing), });
TCHelper.addResearchPage(
"PORTALDEEPDARK",
Expand Down

0 comments on commit 4168071

Please sign in to comment.