From c138b5374a3d572dab4c47cfe28b47f37259cbcc Mon Sep 17 00:00:00 2001 From: tracer4b <61507029+tracer4b@users.noreply.github.com> Date: Wed, 6 Apr 2022 17:27:36 +0800 Subject: [PATCH] ton of shit update ceu/gcym, update circuit oredicts, adjust for update, remove crystal matrix from hardmode exotic materials catalyst, add front overlays to multis --- manifest.json | 4 +- overrides/scripts/AE2.zs | 24 +++++------ overrides/scripts/AdvRocketry.zs | 46 ++++++++++----------- overrides/scripts/Earlygame.zs | 6 +-- overrides/scripts/EnderIO.zs | 2 +- overrides/scripts/Endgame.zs | 4 +- overrides/scripts/Microverse.zs | 6 +-- overrides/scripts/Midgame.zs | 16 ++++---- overrides/scripts/Nuclearcraft.zs | 2 +- overrides/scripts/_oreDict.zs | 44 ++++++++++---------- overrides/scripts/dml.zs | 8 ++-- overrides/scripts/electronics.zs | 4 +- overrides/scripts/expertmode.zs | 48 +++++++++++++++++++--- overrides/scripts/extendedcrafting.zs | 38 +---------------- overrides/scripts/multiblock_dml.zs | 1 + overrides/scripts/multiblocks_expert.zs | 24 ++++++----- overrides/scripts/multiblocks_normal.zs | 23 ++++++----- overrides/scripts/normalmode.zs | 54 ++++++++++++++++++++----- 18 files changed, 201 insertions(+), 153 deletions(-) diff --git a/manifest.json b/manifest.json index c5a440a..75cc985 100644 --- a/manifest.json +++ b/manifest.json @@ -645,12 +645,12 @@ }, { "projectID": 557242, - "fileID": 3665578, + "fileID": 3736675, "required": true }, { "projectID": 564858, - "fileID": 3661669, + "fileID": 3736682, "required": true }, { diff --git a/overrides/scripts/AE2.zs b/overrides/scripts/AE2.zs index 6ccccec..5119b71 100644 --- a/overrides/scripts/AE2.zs +++ b/overrides/scripts/AE2.zs @@ -21,7 +21,7 @@ Inscriber.addRecipe(, , //Engineering Processor Inscriber.removeRecipe(); -Inscriber.addRecipe(, , false, ,); +Inscriber.addRecipe(, , false, ,); //Inscriber.addRecipe(, , false, ,); //Inscriber.addRecipe(, , false, ,); Inscriber.removeRecipe(); @@ -29,7 +29,7 @@ Inscriber.addRecipe(, , //Calculation Processor Inscriber.removeRecipe(); -Inscriber.addRecipe(, , false, ,); +Inscriber.addRecipe(, , false, ,); //Inscriber.addRecipe(, , false, ,); //Inscriber.addRecipe(, , false, ,); Inscriber.removeRecipe(); @@ -37,7 +37,7 @@ Inscriber.addRecipe(, ); -Inscriber.addRecipe(, , false, ,); +Inscriber.addRecipe(, , false, ,); //Inscriber.addRecipe(, , false, ,); //Inscriber.addRecipe(, , false, ,); Inscriber.removeRecipe(); @@ -47,7 +47,7 @@ Inscriber.addRecipe(, , tru recipes.remove(); recipes.addShaped(, [ [,,], - [,,], + [,,], [,,]]); //ME Inscriber @@ -61,7 +61,7 @@ recipes.addShaped(, [ recipes.remove(); recipes.addShaped( * 8, [ [,,], - [,,], + [,,], [, , ]]); //Crafting CPU @@ -183,7 +183,7 @@ recipes.addShapeless(, [); -recipes.addShapeless(, [, ]); +recipes.addShapeless(, [, ]); //Basic Card recipes.remove(); @@ -297,7 +297,7 @@ recipes.addShapeless(, [); -recipes.addShapeless(, [, ]); +recipes.addShapeless(, [, ]); //Quantum Ring @@ -328,28 +328,28 @@ recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_cell recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); // 4k Storage recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); // 16k Storage recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); // 64k Storage recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); //AE2 Wireless Terminal, Infinity Booster Card @@ -388,6 +388,6 @@ recipes.addShapeless("nf_oredict_storage_bus", recipes.removeByRecipeName("appliedenergistics2:network/parts/terminal_expanded_processing"); recipes.addShaped("nf_terminal_expanded_processing", , [ [null, , null], - [null, , null], + [null, , null], [null, , null] ]); \ No newline at end of file diff --git a/overrides/scripts/AdvRocketry.zs b/overrides/scripts/AdvRocketry.zs index 548bde9..2439990 100644 --- a/overrides/scripts/AdvRocketry.zs +++ b/overrides/scripts/AdvRocketry.zs @@ -131,7 +131,7 @@ makeShaped("pauto_packager", M: , // ME Packaging Component I: , // ME Import Bus T: , // Titanium Plate - C: , // T4 Circuit + C: , // T4 Circuit X: , // ExU2 Crafter }); @@ -145,7 +145,7 @@ makeShaped("pauto_unpackager", M: , // ME Packaging Component E: , // ME Export Bus T: , // Titanium Plate - C: , // T4 Circuit + C: , // T4 Circuit X: , // ExU2 Crafter }); @@ -159,7 +159,7 @@ makeShaped("pauto_encoder", M: , // ME Packaging Component H: , // Recipe Holder T: , // Titanium Plate - C: , // T4 Circuit + C: , // T4 Circuit X: , // AE2STuff Pattern Encoder }); @@ -175,7 +175,7 @@ makeShaped("ae2stuff_encoder", F: , // Formation Core A: , // Annihilation Core M: , // ME Packaging Component - C: , // T4 Circuit + C: , // T4 Circuit X: , // HV Machine Hull }); @@ -260,7 +260,7 @@ makeShaped("ar_suit_workstation", ], { T: , // Workstation R: , // MV Robot Arm - C: , // T2 Circuit + C: , // T2 Circuit X: , // MV Machine Hull W: , // GTCE Crafting Station }); @@ -369,7 +369,7 @@ assembler.recipeBuilder() * 2, * 2, , - + ]) .outputs([]) .duration(500) @@ -453,7 +453,7 @@ makeExtremeRecipe5(, X: , // Machine Structure S: , // HV Sensor E: , // HV Emitter - C: , // T3 Circuit + C: , // T3 Circuit M: , // GT Computer Screen }); @@ -473,7 +473,7 @@ makeExtremeRecipe5(, A: , // MV Assembling Machine E: , // MV Emitter M: , // GT Computer Screen - C: , // T2 Circuit + C: , // T2 Circuit }); // Planet ID Chip @@ -486,7 +486,7 @@ makeShaped("ar_planet_id_chip", ], { W: , // Fine Stainless Steel Wire P: , // Vibrant Alloy Plate - C: , // T2 Circuit + C: , // T2 Circuit }); //// Soul Powder @@ -541,7 +541,7 @@ makeShaped("ar_linker", ], { S: , // Stainless Steel Plate E: , // HV Emitter - C: , // T3 Circuit + C: , // T3 Circuit }); // Plant Fibers @@ -595,7 +595,7 @@ makeExtremeRecipe5(, R: , // EV Robot Arm E: , // EV Emitter A: , // EV Assembling Machine - C: , // T4 Circuit + C: , // T4 Circuit M: , // Screen }); @@ -609,7 +609,7 @@ makeShaped("ar_station_id_chip", ], { W: , // Fine Titanium Wire P: , // Black Steel Plate - C: , // T4 Circuit + C: , // T4 Circuit }); // Warp Monitor @@ -623,7 +623,7 @@ makeShaped("ar_warp_monitor", X: , // Machine Structure S: , // EV Sensor M: , // Screen - C: , // T4 Circuit + C: , // T4 Circuit }); // Holo Projector @@ -675,7 +675,7 @@ makeShaped("ar_rocket_monitoring_station", O: , // Optical Sensor X: , // Machine Structure R: , // Copper Rod - C: , // T2 Circuit + C: , // T2 Circuit }); // Guidance Computer Access Hatch @@ -688,13 +688,13 @@ makeShaped("ar_guidance_computer_access_hatch", ], { X: , // Machine Structure R: , // Copper Rod - C: , // T2 Circuit + C: , // T2 Circuit }); // Station Docking Port recipes.remove(); recipes.addShapeless(, [ - , , + , , ]); // Station Gravity Controller @@ -706,7 +706,7 @@ recipes.addShapeless(, [ // Altitude Controller recipes.remove(); recipes.addShapeless(, [ - , , + , , ]); // Orientation Controller @@ -718,7 +718,7 @@ recipes.addShapeless(, [ // Docking Pad recipes.remove(); recipes.addShapeless(, [ - , + , ]); // Station Light @@ -745,7 +745,7 @@ makeShaped("ar_atmosphere_detector", B: , // Vanilla Iron Bars M: , // Screen P: , // Steel Plate - C: , // T2 Circuit + C: , // T2 Circuit R: , // Steel Rotor }); @@ -759,7 +759,7 @@ makeShaped("ar_gravity_machine", ], { W: , // Warp Core T: , // Titanium Plate - C: , // T4 Circuit + C: , // T4 Circuit M: , // Screen }); @@ -781,7 +781,7 @@ makeShaped("ar_hovercraft", ], { T: , // Structure Tower E: , // Liquid Engine - C: , // T2 Circuit + C: , // T2 Circuit M: , // Screen D: , // Dilithium Crystal }); @@ -789,7 +789,7 @@ makeShaped("ar_hovercraft", // Planet Selector recipes.remove(); recipes.addShaped(, [ - [ , , ], + [ , , ], [ , , ] ]); @@ -803,7 +803,7 @@ makeShaped("ar_planetselector_holo", ], { P: , X: , - C: , + C: , G: , H: , }); diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs index 60a76fe..202b0db 100644 --- a/overrides/scripts/Earlygame.zs +++ b/overrides/scripts/Earlygame.zs @@ -52,17 +52,17 @@ recipes.addShaped(, [ recipes.addShaped(, [ [,,], - [, , ], + [, , ], [, , ]]); recipes.addShaped(, [ [,,], - [, , ], + [, , ], [, , ]]); recipes.addShaped(, [ [,,], - [, , ], + [, , ], [, , ]]); diff --git a/overrides/scripts/EnderIO.zs b/overrides/scripts/EnderIO.zs index 1da2400..f58365e 100644 --- a/overrides/scripts/EnderIO.zs +++ b/overrides/scripts/EnderIO.zs @@ -247,7 +247,7 @@ alloy.recipeBuilder() // Z-Logic Controller (Cheap) recipes.addShaped(, [ [, ,], - [, ,], + [, ,], [, ,] ]); diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 10ac230..0f8ed8d 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -190,7 +190,7 @@ makeShaped("of_processing_array", , "CBC"], { A : , //Robot Arm (IV) H : , //Machine Hull (IV) - C : , //T6 Circuit + C : , //T6 Circuit S : , //Sunnarium B : }); //dataorb @@ -207,7 +207,7 @@ recipes.addShaped(, [ // ZPM Field Generator * 1 .findRecipe(24000, [, * 6, , * 2, * 2, * 64, * 64, * 4], [ * 1152]).remove(); assembly_line.recipeBuilder() - .inputs([, * 6, , * 2, * 2, * 64, * 64, * 4]) + .inputs([, * 6, , * 2, * 2, * 64, * 64, * 4]) .fluidInputs([ * 1152, * 1296]) .outputs() .duration(600) diff --git a/overrides/scripts/Microverse.zs b/overrides/scripts/Microverse.zs index 157e544..92e2d3f 100644 --- a/overrides/scripts/Microverse.zs +++ b/overrides/scripts/Microverse.zs @@ -32,7 +32,7 @@ makeShaped("of_t1guidance", , ["GPG", "PCP", "CCC"], - { C : , + { C : , G : , P : } ); @@ -101,7 +101,7 @@ makeExtremeRecipe5(, "QCECQ"], { A : , B : , - C : , + C : , E : , G : , Q : , @@ -149,7 +149,7 @@ makeShaped("of_t2guidance", , "WCW", "CCC"], { A : , - C : , + C : , W : } ); diff --git a/overrides/scripts/Midgame.zs b/overrides/scripts/Midgame.zs index 5b1c231..2f9dd59 100644 --- a/overrides/scripts/Midgame.zs +++ b/overrides/scripts/Midgame.zs @@ -89,14 +89,14 @@ vacuum_freezer.recipeBuilder() .buildAndRegister(); // Allow Gas Collector to work in LostCities, void dims -gas_collector.recipeBuilder() - .fluidOutputs( * 10000) - .circuit(4) - .property("dimension", 111) - .property("dimension", 119) - .duration(200) - .EUt(16) - .buildAndRegister(); +//gas_collector.recipeBuilder() +// .fluidOutputs( * 10000) +// .circuit(4) +// .property("dimension", 111) +// .property("dimension", 119) +// .duration(200) +// .EUt(16) +// .buildAndRegister(); // Rebalancing important chanced outputs // Helium * 120 diff --git a/overrides/scripts/Nuclearcraft.zs b/overrides/scripts/Nuclearcraft.zs index 008956f..301ef58 100644 --- a/overrides/scripts/Nuclearcraft.zs +++ b/overrides/scripts/Nuclearcraft.zs @@ -660,7 +660,7 @@ makeShaped("of_nc_fission_controller", , - B : , + B : , C : }); alloy.recipeBuilder() diff --git a/overrides/scripts/_oreDict.zs b/overrides/scripts/_oreDict.zs index a77a8ec..3e726c7 100644 --- a/overrides/scripts/_oreDict.zs +++ b/overrides/scripts/_oreDict.zs @@ -2431,28 +2431,28 @@ mods.jei.JEI.removeAndHide(); recipes.addShapeless(, []); //Circuits -//.add(); -//.remove(); +//.add(); +//.remove(); // -//.add(); -//.add(); -//.add(); -//.add(); -//.remove(); -//.remove(); +//.add(); +//.add(); +//.add(); +//.add(); +//.remove(); +//.remove(); // -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); -//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); +//.add(); //.add(); @@ -2467,8 +2467,8 @@ recipes.addShapeless(, []); //.remove(); //.remove(); //.remove(); -//.remove(); -//.remove(); +//.remove(); +//.remove(); //.remove(); //.remove(); //.remove(); diff --git a/overrides/scripts/dml.zs b/overrides/scripts/dml.zs index aee7f0f..8efa12c 100644 --- a/overrides/scripts/dml.zs +++ b/overrides/scripts/dml.zs @@ -45,7 +45,7 @@ recipes.addShapeless(.withTag({sim recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); recipes.remove(); @@ -64,13 +64,13 @@ alloy.recipeBuilder().inputs([,]).outputs([); recipes.addShaped(, [ [, , ], - [, , ], - [, , ]]); + [, , ], + [, , ]]); recipes.remove(); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); recipes.remove(); diff --git a/overrides/scripts/electronics.zs b/overrides/scripts/electronics.zs index f4f6e3f..6f6710a 100644 --- a/overrides/scripts/electronics.zs +++ b/overrides/scripts/electronics.zs @@ -163,8 +163,8 @@ recipes.addShapeless( * 4,[,, [ - [, , ], - [, , ], + [, , ], + [, , ], [, , ]]); //// LV Casing diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs index 9be7280..60ef8b5 100644 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -84,7 +84,7 @@ makeShaped("farming_station", , S : , G : , H : , - C : }); + C : }); ///////////// Tier Four and Half Space Ship ////////////////// makeExtremeRecipe7(, @@ -372,8 +372,8 @@ makeExtremeRecipe9( * 2, //recipes.removeByRecipeName("gregtech:electric_blast_furnace"); //recipes.addShaped(, [ // [,,], -// [, , ], -// [, ,] +// [, , ], +// [, ,] //]); // @@ -387,9 +387,9 @@ recipes.addShaped(, [ // Auto Maintenance Hatch recipes.removeByRecipeName("gregtech:maintenance_hatch_automatic"); recipes.addShaped(, [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); // Fluid Storage @@ -399,7 +399,7 @@ recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_comp recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_components_cell_64k_part"); assembler.recipeBuilder() - .inputs( * 2, * 4, , * 2) + .inputs( * 2, * 4, , * 2) .outputs() .duration(100).EUt(960) .buildAndRegister(); @@ -521,6 +521,7 @@ blast_furnace.recipeBuilder().inputs([ * 4]).fluidInputs([ // H2SO4 require V2O5 // Sulfur Trioxide * 1000 .findRecipe(7, null, [ * 1000, * 1000]).remove(); +.findRecipe(7, null, [ * 1000, * 1000]).remove(); chemical_reactor.recipeBuilder() .fluidInputs( * 1000, * 1000) @@ -654,6 +655,41 @@ alloy_smelter.recipeBuilder() .outputs() .duration(30).EUt(7680).buildAndRegister(); +//////////////////// Exotic Materials Catalyst //////////////////////// +makeExtremeRecipe7(, + ["L M J", + " K W S ", + " YNT ", + "OFUVAIC", + " XEH ", + " Q G P ", + "B R D"], + { A : , + B : , + C : , + D : , + E : , + F : , + G : , + H : , + I : , + J : , + K : , + L : , + M : , + N : , + O : , + P : , + Q : , + R : , + S : , + T : , + U : , + V : , + W : , + X : , + Y : }); + // Remove shortcut recipes recipes.remove( * 16); recipes.removeByRecipeName("appliedenergistics2:misc/vanilla_comparator"); diff --git a/overrides/scripts/extendedcrafting.zs b/overrides/scripts/extendedcrafting.zs index d859eeb..18d70e9 100644 --- a/overrides/scripts/extendedcrafting.zs +++ b/overrides/scripts/extendedcrafting.zs @@ -123,7 +123,7 @@ makeExtremeRecipe9(, C : , G : , N : , - U : }); + U : }); //Luminescence @@ -385,46 +385,12 @@ mods.extendedcrafting.TableCrafting.addShaped(0, , , , , , , , , ], [, , , , , , , , ], [, , , , , , , , ], - [, , , , , , , , ], + [, , , , , , , , ], [, , , , , , , , ], [, , , , , , , , ], [, , , , , , , , ] ]); -//////////////////// Exotic Materials Catalyst //////////////////////// -makeExtremeRecipe7(, - ["L M J", - " K W S ", - " YNT ", - "OFUVAIC", - " XEH ", - " Q G P ", - "B R D"], - { A : , - B : , - C : , - D : , - E : , - F : , - G : , - H : , - I : , - J : , - K : , - L : , - M : , - N : , - O : , - P : , - Q : , - R : , - S : , - T : , - U : , - V : , - W : , - X : , - Y : }); ////////////////////////// Crystal Matrix Ingot /////////////////////// recipes.remove(); diff --git a/overrides/scripts/multiblock_dml.zs b/overrides/scripts/multiblock_dml.zs index e651cf3..f963aa6 100644 --- a/overrides/scripts/multiblock_dml.zs +++ b/overrides/scripts/multiblock_dml.zs @@ -137,6 +137,7 @@ val dml_sim_chamber = Builder.start("dml_sim_chamber", 3100) .buildAndRegister(); dml_sim_chamber.hasMaintenanceMechanics = false; dml_sim_chamber.hasMufflerMechanics = false; +dml_sim_chamber.frontOverlay = ; //Recipe for Controller makeShaped("simulation_controller", , diff --git a/overrides/scripts/multiblocks_expert.zs b/overrides/scripts/multiblocks_expert.zs index d2aef54..a876896 100644 --- a/overrides/scripts/multiblocks_expert.zs +++ b/overrides/scripts/multiblocks_expert.zs @@ -50,6 +50,7 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") microverse_projector_basic.hasMufflerMechanics = true; microverse_projector_basic.hasMaintenanceMechanics = true; +microverse_projector_basic.frontOverlay = ; // Advanced Microverse Projector val microverse_projector_advanced = Builder.start("mbt:microverse_projector_advanced") @@ -108,6 +109,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva microverse_projector_advanced.hasMufflerMechanics = true; microverse_projector_advanced.hasMaintenanceMechanics = true; +microverse_projector_advanced.frontOverlay = ; // Advanced Microverse Projector II val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_advanced_ii") @@ -206,6 +208,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a microverse_projector_advanced_ii.hasMufflerMechanics = true; microverse_projector_advanced_ii.hasMaintenanceMechanics = true; +microverse_projector_advanced_ii.frontOverlay = ; // Naquadah Reactor 1 @@ -256,6 +259,7 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1") .buildAndRegister(); naquadah_reactor_1.hasMufflerMechanics = false; naquadah_reactor_1.hasMaintenanceMechanics = false; +naquadah_reactor_1.frontOverlay = ; naquadah_reactor_1.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks @@ -314,6 +318,7 @@ val naquadah_reactor_2 = Builder.start("naquadah_reactor_2") naquadah_reactor_2.hasMufflerMechanics = false; naquadah_reactor_2.hasMaintenanceMechanics = false; +naquadah_reactor_2.frontOverlay = ; naquadah_reactor_2.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks @@ -348,24 +353,25 @@ val actualization_chamber = Builder.start("actualization_chamber") actualization_chamber.hasMufflerMechanics = false; actualization_chamber.hasMaintenanceMechanics = false; +actualization_chamber.frontOverlay = ; // multiblock controller recipes recipes.addShaped("microverse_projector_basic", , [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); recipes.addShaped("microverse_projector_advanced", , [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); recipes.addShaped("microverse_projector_advanced_ii", , [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); @@ -373,7 +379,7 @@ makeShaped("naquadah_reactor_1", ["NCN", "GSG", "PPP"], - { C : , //T5 + { C : , //T5 G : , S : , P : , @@ -383,7 +389,7 @@ makeShaped("naquadah_reactor_2", ["NCN", "GSG", "PPP"], - { C : , //T6 + { C : , //T6 G : , S : , P : , @@ -397,7 +403,7 @@ makeExtremeRecipe5(, "PSFEP", "PPPPP"], { G : , - W : , + W : , P : , E : , S : , diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs index 30a9798..fa7189d 100644 --- a/overrides/scripts/multiblocks_normal.zs +++ b/overrides/scripts/multiblocks_normal.zs @@ -49,6 +49,7 @@ val microverse_projector_basic = Builder.start("mbt:microverse_projector_basic") microverse_projector_basic.hasMufflerMechanics = true; microverse_projector_basic.hasMaintenanceMechanics = true; +microverse_projector_basic.frontOverlay = ; // Advanced Microverse Projector val microverse_projector_advanced = Builder.start("mbt:microverse_projector_advanced") @@ -107,6 +108,7 @@ val microverse_projector_advanced = Builder.start("mbt:microverse_projector_adva microverse_projector_advanced.hasMufflerMechanics = true; microverse_projector_advanced.hasMaintenanceMechanics = true; +microverse_projector_advanced.frontOverlay = ; // Advanced Microverse Projector II val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_advanced_ii") @@ -205,6 +207,7 @@ val microverse_projector_advanced_ii = Builder.start("mbt:microverse_projector_a microverse_projector_advanced_ii.hasMufflerMechanics = true; microverse_projector_advanced_ii.hasMaintenanceMechanics = true; +microverse_projector_advanced_ii.frontOverlay = ; // Creative Tank Provider val creative_tank_provider = Builder.start("mbt:creative_tank_provider") @@ -281,6 +284,7 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1") .buildAndRegister(); naquadah_reactor_1.hasMufflerMechanics = false; naquadah_reactor_1.hasMaintenanceMechanics = false; +naquadah_reactor_1.frontOverlay = ; naquadah_reactor_1.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks @@ -339,6 +343,7 @@ val naquadah_reactor_2 = Builder.start("naquadah_reactor_2") naquadah_reactor_2.hasMufflerMechanics = false; naquadah_reactor_2.hasMaintenanceMechanics = false; +naquadah_reactor_2.frontOverlay = ; naquadah_reactor_2.runOverclockingLogic = function(recipelogic as IRecipeLogic, recipe as IRecipe, negativeEU as bool, maxOverclocks as int) as int[] { return IRecipeLogic.standardOverclockingLogic(recipe.getEUt() * (negativeEU ? -1 : 1), recipelogic.maxVoltage, recipe.getDuration(), 1, 1, 0); // 1x duration, 1x voltage, 0 overclocks @@ -348,34 +353,34 @@ naquadah_reactor_2.runOverclockingLogic = function(recipelogic as IRecipeLogic, // multiblock controller recipes recipes.addShaped("microverse_projector_basic", , [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); recipes.addShaped("microverse_projector_advanced", , [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); recipes.addShaped("microverse_projector_advanced_ii", , [ - [, , ], + [, , ], [, , ], - [, , ] + [, , ] ]); recipes.addShaped("creative_tank_provider", , [ [, , ], [, , ], - [, , ] + [, , ] ]); makeShaped("naquadah_reactor_1", , ["NCN", "GSG", "PPP"], - { C : , //T5 + { C : , //T5 G : , S : , P : , @@ -385,7 +390,7 @@ makeShaped("naquadah_reactor_2", ["NCN", "GSG", "PPP"], - { C : , //T6 + { C : , //T6 G : , S : , P : , diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs index 353a833..438a9aa 100644 --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -62,14 +62,14 @@ recipes.remove(); recipes.addShaped(, [ [, , ], [, , ], - [, , ]]); + [, , ]]); //MV Macerator recipes.remove(); recipes.addShaped(, [ [, , ], [, , ], - [, , ]]); + [, , ]]); //LV Piston recipes.addShaped(, [ @@ -95,19 +95,19 @@ recipes.remove(); recipes.remove(); -recipes.addShaped(, [[, , ], +recipes.addShaped(, [[, , ], [, , ], - [, , ]]); + [, , ]]); recipes.addShaped(, [ - [, , ], + [, , ], [, , ], - [, , ]]); + [, , ]]); recipes.addShaped(, [ - [, , ], + [, , ], [, , ], - [, , ]]); + [, , ]]); @@ -450,7 +450,7 @@ fluid_extractor.recipeBuilder() //recipes.addShaped("creative_tank_provider", , [ // [, , ], // [, , ], -// [, , ] +// [, , ] //]); // //// creative tank provider @@ -544,7 +544,7 @@ recipes.addShaped(, [ recipes.removeByRecipeName("gregtech:distillation_tower"); recipes.addShaped(, [ [, , ], - [, , ], + [, , ], [, , ]]); //Draconium [tier 14] @@ -560,6 +560,40 @@ blast_furnace.recipeBuilder().inputs([ * 4]).fluidInputs([ blast_furnace.recipeBuilder().inputs([]).fluidInputs([*500]).outputs().property("temperature", 6800).duration(10000).EUt(120).buildAndRegister(); blast_furnace.recipeBuilder().inputs([ * 4]).fluidInputs([*2000]).outputs([ * 2]).property("temperature", 6800).duration(20000).EUt(120).buildAndRegister(); +//////////////////// Exotic Materials Catalyst //////////////////////// +makeExtremeRecipe7(, + ["L M J", + " K W S ", + " YNT ", + "OFUVAIC", + " XEH ", + " Q G P ", + "B R D"], + { A : , + B : , + C : , + D : , + E : , + F : , + G : , + H : , + I : , + J : , + K : , + L : , + M : , + N : , + O : , + P : , + Q : , + R : , + S : , + T : , + U : , + V : , + W : , + X : , + Y : }); // Removals // GT