diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs index 202b0db..0f3d5be 100644 --- a/overrides/scripts/Earlygame.zs +++ b/overrides/scripts/Earlygame.zs @@ -346,13 +346,6 @@ assembler.recipeBuilder() // Diamond Electrolysis // Carbon Dust * 64 .findRecipe(30, [], null).remove(); -electrolyzer.recipeBuilder() - .inputs() - .outputs( * 16) - .duration(768) - .EUt(30) - .buildAndRegister(); - // Kill Glowstone Decomp // Small Pile of Redstone Dust * 2 diff --git a/overrides/scripts/expert_processing.zs b/overrides/scripts/expert_processing.zs index 5c22752..1e7a0a0 100644 --- a/overrides/scripts/expert_processing.zs +++ b/overrides/scripts/expert_processing.zs @@ -693,7 +693,7 @@ centrifuge.recipeBuilder() .inputs( * 24, * 3) .fluidInputs( * 8000) .outputs( * 12, * 8, * 6, * 4, * 3, ) - .duration(400).EUt(96).buildAndRegister(); + .duration(1000).EUt(96).buildAndRegister(); large_chemical_reactor.recipeBuilder() .inputs() @@ -707,7 +707,7 @@ centrifuge.recipeBuilder() .fluidInputs( * 10000) .outputs( * 12, * 12, * 8, * 4, * 4, ) .fluidOutputs( * 2000, * 250, * 250) - .duration(600).EUt(720).buildAndRegister(); + .duration(1500).EUt(720).buildAndRegister(); // 1/4800 scale centrifuge.recipeBuilder() @@ -715,7 +715,7 @@ centrifuge.recipeBuilder() .notConsumable() .notConsumable( * 1000) .outputs( * 10, * 6, * 5, * 4, * 3, ) - .duration(800).EUt(400).buildAndRegister(); + .duration(2000).EUt(400).buildAndRegister(); // 1/4800 scale mixer.recipeBuilder() @@ -730,7 +730,7 @@ large_chemical_reactor.recipeBuilder() .notConsumable() .outputs( * 2, , ) .fluidOutputs( * 1000, * 2000) - .duration(120).EUt(1920).buildAndRegister(); + .duration(1000).EUt(1920).buildAndRegister(); // Taranium centrifuge.recipeBuilder() @@ -747,7 +747,7 @@ fusion_reactor.recipeBuilder() centrifuge.recipeBuilder() .fluidInputs( * 3000) .notConsumable(, ) - .outputs(, ) + .outputs(, ) .duration(100).EUt(30720).buildAndRegister(); centrifuge.recipeBuilder() diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs index ada5727..21e1cfc 100644 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -399,7 +399,7 @@ assembly_line.recipeBuilder() assembly_line.recipeBuilder() .inputs(, , * 12, * 12, * 12, * 24, * 24, * 12, * 12) - .fluidInputs( * 2304, * 576) + .fluidInputs( * 2304, * 576) .outputs() .duration(800).EUt(1966080).buildAndRegister(); @@ -469,7 +469,7 @@ makeExtremeRecipe7(, " XEH ", " Q G P ", "B R D"], - { A : , + { A : , B : , C : , D : , @@ -509,6 +509,46 @@ brewery.recipeBuilder() .fluidOutputs( * 1000) .duration(128).EUt(4).buildAndRegister(); +// Taranium in UV Fieldgen +// UV Field Generator * 1 +.findRecipe(100000, [, * 6, , * 2, * 2, * 64, * 64, * 4], [ * 1728, * 576]).remove(); + +assembly_line.recipeBuilder() + .inputs(, * 6, , * 2, * 2, * 64, * 64, * 4) + .fluidInputs( * 1728, * 576, * 288) + .outputs() + .duration(600).EUt(100000).buildAndRegister(); + +// Parallel Hatches +recipes.removeByRecipeName("gcym:parallel_hatch_iv"); +recipes.removeByRecipeName("gcym:parallel_hatch_luv"); +recipes.removeByRecipeName("gcym:parallel_hatch_zpm"); +recipes.removeByRecipeName("gcym:parallel_hatch_uv"); + +recipes.addShaped(, [ + [, , ], + [, , ], + [, , ] +]); + +recipes.addShaped(, [ + [, , ], + [, , ], + [, , ] +]); + +recipes.addShaped(, [ + [, , ], + [, , ], + [, , ] +]); + +recipes.addShaped(, [ + [, , ], + [, , ], + [, , ] +]); + // Remove shortcut recipes recipes.remove( * 16); recipes.removeByRecipeName("appliedenergistics2:misc/vanilla_comparator"); diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs index 6bd1cbd..39d3192 100644 --- a/overrides/scripts/materials.zs +++ b/overrides/scripts/materials.zs @@ -183,6 +183,7 @@ var microversium = MaterialBuilder(32027, "microversium") var draconic_superconductor = MaterialBuilder(32028, "draconic_superconductor") .ingot() .color(0xf5f0f4).iconSet("shiny") + .flags("no_unification") .cableProperties(2147483647, 4, 0, true) .build(); @@ -738,8 +739,9 @@ var dioxygen_difluoride = MaterialBuilder(32108, "dioxygen_difluoride") var taranium = MaterialBuilder(32109, "taranium") .element("Taranium") - .ingot() + .ingot().fluid() .color(0xff00ff).iconSet("bright") + .flags("generate_plate", "generate_dense") .blastTemp(10800) .build(); .setFormula("Tn"); diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs index fe85552..482563b 100644 --- a/overrides/scripts/multiblocks_expert.zs +++ b/overrides/scripts/multiblocks_expert.zs @@ -355,6 +355,36 @@ actualization_chamber.hasMufflerMechanics = false; actualization_chamber.hasMaintenanceMechanics = false; actualization_chamber.frontOverlay = ; +// Universal Crystallizer +val universal_crystallizer = Builder.start("universal_crystallizer") + .withPattern(function(controller as IControllerTile) as IBlockPattern { + return FactoryBlockPattern.start() + .aisle("CCC","GGG","CCC") + .aisle("CCC","GOG","CCC") + .aisle("CSC","GGG","CCC") + .where('S', controller.self()) + .where('O', ) + .where('G', ) + .where('C', CTPredicate.states() + | controller.autoAbilities(true, true, true, true, true, false, false) + ) + .build(); + } as IPatternBuilderFunction) + .withRecipeMap( + FactoryRecipeMap.start("universal_crystallizer") + .minInputs(1) + .maxInputs(9) + .minOutputs(1) + .maxOutputs(1) + .maxFluidInputs(1) + .build()) + .withBaseTexture() + .buildAndRegister(); + +universal_crystallizer.hasMufflerMechanics = false; +universal_crystallizer.hasMaintenanceMechanics = true; +universal_crystallizer.frontOverlay = ; + // multiblock controller recipes recipes.addShaped("microverse_projector_basic", , [ [, , ], @@ -409,6 +439,12 @@ makeExtremeRecipe5(, S : , F : }); +assembly_line.recipeBuilder() + .inputs( * 24, * 24, * 24, * 24, * 64, * 64, * 24, * 8, * 3, * 3, * 3, * 3) + .fluidInputs( * 36864, * 18432, * 9216, * 4608) + .outputs() + .duration(900).EUt(7864320).buildAndRegister(); + // multiblock recipemap recipes // basic projector // t1 ores @@ -1447,3 +1483,46 @@ naquadah_reactor_2.recipeMap .inputs() .outputs() .buildAndRegister(); + +// Universal Crystallizer Recipes +universal_crystallizer.recipeMap.recipeBuilder() + .inputs( * 64, * 64, * 64, * 64, * 64, * 64, * 64, * 64) + .outputs( * 32) + .fluidInputs( * 3) + .duration(3).EUt(31457280).buildAndRegister(); + +universal_crystallizer.recipeMap.recipeBuilder() + .inputs( * 9) + .outputs() + .fluidInputs( * 3) + .duration(3).EUt(31457280).buildAndRegister(); + +universal_crystallizer.recipeMap.recipeBuilder() + .inputs( * 9) + .outputs() + .fluidInputs( * 3) + .duration(3).EUt(31457280).buildAndRegister(); + +universal_crystallizer.recipeMap.recipeBuilder() + .inputs( * 9) + .outputs() + .fluidInputs( * 3) + .duration(3).EUt(31457280).buildAndRegister(); + +universal_crystallizer.recipeMap.recipeBuilder() + .inputs( * 9) + .outputs() + .fluidInputs( * 3) + .duration(3).EUt(31457280).buildAndRegister(); + +universal_crystallizer.recipeMap.recipeBuilder() + .inputs( * 9) + .outputs() + .fluidInputs( * 3) + .duration(3).EUt(31457280).buildAndRegister(); + +universal_crystallizer.recipeMap.recipeBuilder() + .inputs( * 9) + .outputs() + .fluidInputs( * 3) + .duration(3).EUt(31457280).buildAndRegister(); diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 4b00fad..08cc9ff 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -598,6 +598,14 @@ makeExtremeRecipe7(, X : , Y : }); +// Diamond decomp +electrolyzer.recipeBuilder() + .inputs() + .outputs( * 16) + .duration(768) + .EUt(30) + .buildAndRegister(); + // Removals // GT mods.jei.JEI.removeAndHide();