From 25c53f16a8995bbf8b413c23232c3e72b77c2d0a Mon Sep 17 00:00:00 2001 From: tracer4b <61507029+tracer4b@users.noreply.github.com> Date: Mon, 23 Oct 2023 18:42:25 +0800 Subject: [PATCH] 1.7 Balance and Recipe Changes (#451) [EXPAND] [[messages]] messageTitle = "Balancing Changes For GregTech 2.7" messageBody = "[BALANCING]" [[messages]] messageTitle = "Copper Buff in Platinum Line (See [#407](https://github.com/Nomi-CEu/Nomi-CEu/issues/407))" messageBody = "[BALANCING]\n[HM]" [[messages]] messageTitle = "Rebalance ABS Recipe for Fluxed Electrum's Duration" messageBody = "[BALANCING]" [EXPAND] Co-authored-by: IntegerLimit <103940576+IntegerLimit@users.noreply.github.com> --- manifest.json | 5 + .../config-overrides/expert/gregtech.cfg | 88 +++++-- .../config-overrides/normal/gregtech.cfg | 64 ++++- overrides/config/gregtech.cfg | 64 ++++- .../groovy/postInit/assembly_line.groovy | 179 +++++++++++++ overrides/groovy/postInit/recycling.groovy | 63 +++++ overrides/groovy/postInit/removals.groovy | 235 ++++++++++++++++++ overrides/groovy/runConfig.json | 20 ++ overrides/scripts/AE2.zs | 1 + overrides/scripts/BlastFurnace.zs | 2 +- overrides/scripts/DraconicEvolution.zs | 59 +++-- overrides/scripts/Earlygame.zs | 2 +- overrides/scripts/Endgame.zs | 33 +-- overrides/scripts/JetpacksAndEnergyStorage.zs | 12 +- overrides/scripts/Microverse.zs | 26 +- overrides/scripts/expert_processing.zs | 13 +- overrides/scripts/expertmode.zs | 20 ++ overrides/scripts/extendedcrafting.zs | 11 +- overrides/scripts/materials.zs | 1 + overrides/scripts/multiblock_dml.zs | 11 +- overrides/scripts/multiblocks_normal.zs | 21 +- overrides/scripts/normalmode.zs | 68 +++-- overrides/scripts/solars.zs | 25 +- 23 files changed, 853 insertions(+), 170 deletions(-) create mode 100644 overrides/groovy/postInit/assembly_line.groovy create mode 100644 overrides/groovy/postInit/recycling.groovy create mode 100644 overrides/groovy/postInit/removals.groovy create mode 100644 overrides/groovy/runConfig.json mode change 100644 => 100755 overrides/scripts/expertmode.zs mode change 100644 => 100755 overrides/scripts/normalmode.zs diff --git a/manifest.json b/manifest.json index ad370a7..5d5acb7 100644 --- a/manifest.json +++ b/manifest.json @@ -764,6 +764,11 @@ "fileID": 4542025, "required": true }, + { + "projectID": 687577, + "fileID": 4749823, + "required": true + }, { "projectID": 737252, "fileID": 4278838, diff --git a/overrides/config-overrides/expert/gregtech.cfg b/overrides/config-overrides/expert/gregtech.cfg index d1413f9..757f8c7 100644 --- a/overrides/config-overrides/expert/gregtech.cfg +++ b/overrides/config-overrides/expert/gregtech.cfg @@ -9,10 +9,12 @@ general { ########################################################################################################## "client options" { - # Whether or not to enable Emissive Textures for GregTech Casings when the multiblock is working (EBF coils, Fusion Casings, etc.). - # Default: false B:casingsActiveEmissiveTextures=true + # Whether or not to enable Emissive Textures for Electric Blast Furnace Coils when the multiblock is working. + # Default: false + B:coilsActiveEmissiveTextures=true + # The default color to overlay onto machines. # 16777215 (0xFFFFFF in decimal) is no coloring (like GTCE). # 13819135 (0xD2DCFF in decimal) is the classic blue from GT5 (default). @@ -31,7 +33,7 @@ general { # Default: true B:hookDepthTexture=true - # Whether or not to enable Emissive Textures for GregTech Machines. + # Whether or not to enable Emissive Textures for GregTech Machines and multiblock parts. # Default: true B:machinesEmissiveTextures=true @@ -55,6 +57,10 @@ general { # Max: 16777215 I:multiblockPreviewFontColor=3355443 + # Prevent optical and laser cables from animating when active. + # Default: false + B:preventAnimatedCables=false + # Prevent tooltips from blinking for better visibility B:preventBlinkingTooltips=false @@ -83,6 +89,11 @@ general { # Min: 1 # Max: 2147483647 I:scrollSpeed=13 + + # If progress bars should move smoothly. + # False is incremental like the Minecraft furnace. + # Default: true + B:smoothProgressBars=true } "armor hud location" { @@ -321,7 +332,7 @@ general { ########################################################################################################## # energy compat options #--------------------------------------------------------------------------------------------------------# - # Config options regarding GTEU compatibility with other energy systems + # Config options regarding GTEU compatibility with AE2 ########################################################################################################## "energy compat options" { @@ -343,11 +354,24 @@ general { # Max: 16 D:feToEuRatio=4.0 + # The energy consumption of ME Hatch/Bus. + # Default: 1.0AE/t + # Min: 0.0 + # Max: 10.0 + D:meHatchEnergyUsage=1.0 + # Enable Native GTEU to Forge Energy (RF and alike) on GT Cables and Wires. # This does not enable nor disable Converters. # Default: true B:nativeEUToFE=true D:rfRatio=4.0 + + # The interval between ME Hatch/Bus interact ME network. + # It may cause lag if the interval is too small. + # Default: 2 sec + # Min: 1 + # Max: 80 + I:updateIntervals=40 } } @@ -398,6 +422,10 @@ general { # Default: true B:enableMaintenance=true + # Whether to enable Assembly Line research for recipes. + # Default: true + B:enableResearch=true + # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc. # Default: true B:enableWorldAccelerators=true @@ -410,6 +438,21 @@ general { # Default: true B:gt6StylePipesCables=true + # If High Tier (>UV-tier) GT content should be registered. + # Items and Machines enabled with this config will have missing recipes by default. + # This is intended for modpack developers only, and is not playable without custom tweaks or addons. + # Other mods can override this to true, regardless of the config file. + # Default: false + B:highTierContent=false + + # Minimum distance betweeb Long Distance Fluid Pipe Endpoints + # Default: 50 + I:ldFluidPipeMinDistance=50 + + # Minimum distance between Long Distance Item Pipe Endpoints + # Default: 50 + I:ldItemPipeMinDistance=50 + # Whether to play machine sounds while machines are active. # Default: true B:machineSounds=true @@ -419,6 +462,15 @@ general { # Default: 0.5 D:multiblockSteamToEU=0.5 + # Whether the Assembly Line should require the item inputs to be in order. + # Default: true + B:orderedAssembly=true + + # Whether the Assembly Line should require the fluid inputs to be in order. + # This does nothing if B:orderedAssembly is false. + # Default: false + B:orderedFluidAssembly=false + # Divisor for Recipe Duration per Overclock. # Default: 2.0 # Min: 2.0 @@ -486,6 +538,10 @@ general { # Whether to give the terminal to new players on login # Default: true B:spawnTerminal=false + + # Whether to enable Special Event features (e.g. Christmas, etc). + # Default: true + B:specialEvents=true } ########################################################################################################## @@ -521,7 +577,7 @@ general { B:hardDyeRecipes=false # Whether to make Glass related recipes harder. Default: true - B:hardGlassRecipes=true + B:hardGlassRecipes=false # Recipes for Buckets, Cauldrons, Hoppers, and Iron Bars require Iron Plates, Rods, and more. # Default: true @@ -529,33 +585,33 @@ general { # Whether to make miscellaneous recipes harder. # Default: false - B:hardMiscRecipes=true + B:hardMiscRecipes=false # Whether to make Redstone related recipes harder. # Default: false - B:hardRedstoneRecipes=true + B:hardRedstoneRecipes=false # Whether to make Vanilla Tools and Armor recipes harder. # Excludes Flint and Steel, and Buckets. # Default: false - B:hardToolArmorRecipes=true + B:hardToolArmorRecipes=false # Whether to make Wood related recipes harder. # Excludes sticks and planks. # Default: false - B:hardWoodRecipes=true + B:hardWoodRecipes=false # Whether to make crafting recipes for Bricks, Firebricks, and Coke Bricks harder. # Default: false - B:harderBrickRecipes=true + B:harderBrickRecipes=false # Whether to remove charcoal smelting recipes from the vanilla furnace. # Default: true - B:harderCharcoalRecipe=true + B:harderCharcoalRecipe=false # Whether to make the recipe for the EBF Controller harder. # Default: false - B:harderEBFControllerRecipe=true + B:harderEBFControllerRecipe=false # Change the recipe of Rods in the Lathe to 1 Rod and 2 Small Piles of Dust, instead of 2 Rods. # Default: false @@ -563,11 +619,11 @@ general { # Whether to nerf the Paper crafting recipe. # Default: true - B:nerfPaperCrafting=true + B:nerfPaperCrafting=false # Whether to nerf Wood crafting to 2 Planks from 1 Log, and 2 Sticks from 2 Planks. # Default: false - B:nerfWoodCrafting=true + B:nerfWoodCrafting=false B:plateWrenches=true # Whether to remove Vanilla Block Recipes from the Crafting Table. @@ -690,7 +746,7 @@ general { # Specifies an additional random number of veins in a section. # Default: 0 - I:additionalVeinsInSection=3 + I:additionalVeinsInSection=4 # Should all Stone Types drop unique Ore Item Blocks? # Default: false (meaning only Stone, Netherrack, and Endstone @@ -714,7 +770,7 @@ general { # Specifies the minimum number of veins in a section. # Default: 1 - I:minVeinsInSection=2 + I:minVeinsInSection=4 # Multiplier for the chance to spawn a Rubber Tree on any given roll. Higher values make Rubber Trees more common. # Default: 1.0 diff --git a/overrides/config-overrides/normal/gregtech.cfg b/overrides/config-overrides/normal/gregtech.cfg index 0389382..0140ee6 100644 --- a/overrides/config-overrides/normal/gregtech.cfg +++ b/overrides/config-overrides/normal/gregtech.cfg @@ -9,10 +9,12 @@ general { ########################################################################################################## "client options" { - # Whether or not to enable Emissive Textures for GregTech Casings when the multiblock is working (EBF coils, Fusion Casings, etc.). - # Default: false B:casingsActiveEmissiveTextures=true + # Whether or not to enable Emissive Textures for Electric Blast Furnace Coils when the multiblock is working. + # Default: false + B:coilsActiveEmissiveTextures=true + # The default color to overlay onto machines. # 16777215 (0xFFFFFF in decimal) is no coloring (like GTCE). # 13819135 (0xD2DCFF in decimal) is the classic blue from GT5 (default). @@ -31,7 +33,7 @@ general { # Default: true B:hookDepthTexture=true - # Whether or not to enable Emissive Textures for GregTech Machines. + # Whether or not to enable Emissive Textures for GregTech Machines and multiblock parts. # Default: true B:machinesEmissiveTextures=true @@ -55,6 +57,10 @@ general { # Max: 16777215 I:multiblockPreviewFontColor=3355443 + # Prevent optical and laser cables from animating when active. + # Default: false + B:preventAnimatedCables=false + # Prevent tooltips from blinking for better visibility B:preventBlinkingTooltips=false @@ -83,6 +89,11 @@ general { # Min: 1 # Max: 2147483647 I:scrollSpeed=13 + + # If progress bars should move smoothly. + # False is incremental like the Minecraft furnace. + # Default: true + B:smoothProgressBars=true } "armor hud location" { @@ -321,7 +332,7 @@ general { ########################################################################################################## # energy compat options #--------------------------------------------------------------------------------------------------------# - # Config options regarding GTEU compatibility with other energy systems + # Config options regarding GTEU compatibility with AE2 ########################################################################################################## "energy compat options" { @@ -343,11 +354,24 @@ general { # Max: 16 D:feToEuRatio=4.0 + # The energy consumption of ME Hatch/Bus. + # Default: 1.0AE/t + # Min: 0.0 + # Max: 10.0 + D:meHatchEnergyUsage=1.0 + # Enable Native GTEU to Forge Energy (RF and alike) on GT Cables and Wires. # This does not enable nor disable Converters. # Default: true B:nativeEUToFE=true D:rfRatio=4.0 + + # The interval between ME Hatch/Bus interact ME network. + # It may cause lag if the interval is too small. + # Default: 2 sec + # Min: 1 + # Max: 80 + I:updateIntervals=40 } } @@ -398,6 +422,10 @@ general { # Default: true B:enableMaintenance=true + # Whether to enable Assembly Line research for recipes. + # Default: true + B:enableResearch=true + # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc. # Default: true B:enableWorldAccelerators=true @@ -410,6 +438,21 @@ general { # Default: true B:gt6StylePipesCables=true + # If High Tier (>UV-tier) GT content should be registered. + # Items and Machines enabled with this config will have missing recipes by default. + # This is intended for modpack developers only, and is not playable without custom tweaks or addons. + # Other mods can override this to true, regardless of the config file. + # Default: false + B:highTierContent=false + + # Minimum distance betweeb Long Distance Fluid Pipe Endpoints + # Default: 50 + I:ldFluidPipeMinDistance=50 + + # Minimum distance between Long Distance Item Pipe Endpoints + # Default: 50 + I:ldItemPipeMinDistance=50 + # Whether to play machine sounds while machines are active. # Default: true B:machineSounds=true @@ -419,6 +462,15 @@ general { # Default: 0.5 D:multiblockSteamToEU=0.5 + # Whether the Assembly Line should require the item inputs to be in order. + # Default: true + B:orderedAssembly=false + + # Whether the Assembly Line should require the fluid inputs to be in order. + # This does nothing if B:orderedAssembly is false. + # Default: false + B:orderedFluidAssembly=false + # Divisor for Recipe Duration per Overclock. # Default: 2.0 # Min: 2.0 @@ -486,6 +538,10 @@ general { # Whether to give the terminal to new players on login # Default: true B:spawnTerminal=false + + # Whether to enable Special Event features (e.g. Christmas, etc). + # Default: true + B:specialEvents=true } ########################################################################################################## diff --git a/overrides/config/gregtech.cfg b/overrides/config/gregtech.cfg index 0389382..0140ee6 100644 --- a/overrides/config/gregtech.cfg +++ b/overrides/config/gregtech.cfg @@ -9,10 +9,12 @@ general { ########################################################################################################## "client options" { - # Whether or not to enable Emissive Textures for GregTech Casings when the multiblock is working (EBF coils, Fusion Casings, etc.). - # Default: false B:casingsActiveEmissiveTextures=true + # Whether or not to enable Emissive Textures for Electric Blast Furnace Coils when the multiblock is working. + # Default: false + B:coilsActiveEmissiveTextures=true + # The default color to overlay onto machines. # 16777215 (0xFFFFFF in decimal) is no coloring (like GTCE). # 13819135 (0xD2DCFF in decimal) is the classic blue from GT5 (default). @@ -31,7 +33,7 @@ general { # Default: true B:hookDepthTexture=true - # Whether or not to enable Emissive Textures for GregTech Machines. + # Whether or not to enable Emissive Textures for GregTech Machines and multiblock parts. # Default: true B:machinesEmissiveTextures=true @@ -55,6 +57,10 @@ general { # Max: 16777215 I:multiblockPreviewFontColor=3355443 + # Prevent optical and laser cables from animating when active. + # Default: false + B:preventAnimatedCables=false + # Prevent tooltips from blinking for better visibility B:preventBlinkingTooltips=false @@ -83,6 +89,11 @@ general { # Min: 1 # Max: 2147483647 I:scrollSpeed=13 + + # If progress bars should move smoothly. + # False is incremental like the Minecraft furnace. + # Default: true + B:smoothProgressBars=true } "armor hud location" { @@ -321,7 +332,7 @@ general { ########################################################################################################## # energy compat options #--------------------------------------------------------------------------------------------------------# - # Config options regarding GTEU compatibility with other energy systems + # Config options regarding GTEU compatibility with AE2 ########################################################################################################## "energy compat options" { @@ -343,11 +354,24 @@ general { # Max: 16 D:feToEuRatio=4.0 + # The energy consumption of ME Hatch/Bus. + # Default: 1.0AE/t + # Min: 0.0 + # Max: 10.0 + D:meHatchEnergyUsage=1.0 + # Enable Native GTEU to Forge Energy (RF and alike) on GT Cables and Wires. # This does not enable nor disable Converters. # Default: true B:nativeEUToFE=true D:rfRatio=4.0 + + # The interval between ME Hatch/Bus interact ME network. + # It may cause lag if the interval is too small. + # Default: 2 sec + # Min: 1 + # Max: 80 + I:updateIntervals=40 } } @@ -398,6 +422,10 @@ general { # Default: true B:enableMaintenance=true + # Whether to enable Assembly Line research for recipes. + # Default: true + B:enableResearch=true + # Whether to enable World Accelerators, which accelerate ticks for surrounding Tile Entities, Crops, etc. # Default: true B:enableWorldAccelerators=true @@ -410,6 +438,21 @@ general { # Default: true B:gt6StylePipesCables=true + # If High Tier (>UV-tier) GT content should be registered. + # Items and Machines enabled with this config will have missing recipes by default. + # This is intended for modpack developers only, and is not playable without custom tweaks or addons. + # Other mods can override this to true, regardless of the config file. + # Default: false + B:highTierContent=false + + # Minimum distance betweeb Long Distance Fluid Pipe Endpoints + # Default: 50 + I:ldFluidPipeMinDistance=50 + + # Minimum distance between Long Distance Item Pipe Endpoints + # Default: 50 + I:ldItemPipeMinDistance=50 + # Whether to play machine sounds while machines are active. # Default: true B:machineSounds=true @@ -419,6 +462,15 @@ general { # Default: 0.5 D:multiblockSteamToEU=0.5 + # Whether the Assembly Line should require the item inputs to be in order. + # Default: true + B:orderedAssembly=false + + # Whether the Assembly Line should require the fluid inputs to be in order. + # This does nothing if B:orderedAssembly is false. + # Default: false + B:orderedFluidAssembly=false + # Divisor for Recipe Duration per Overclock. # Default: 2.0 # Min: 2.0 @@ -486,6 +538,10 @@ general { # Whether to give the terminal to new players on login # Default: true B:spawnTerminal=false + + # Whether to enable Special Event features (e.g. Christmas, etc). + # Default: true + B:specialEvents=true } ########################################################################################################## diff --git a/overrides/groovy/postInit/assembly_line.groovy b/overrides/groovy/postInit/assembly_line.groovy new file mode 100644 index 0000000..3fc7ee9 --- /dev/null +++ b/overrides/groovy/postInit/assembly_line.groovy @@ -0,0 +1,179 @@ +import gregtech.recipes.builders.* +import io.sommers.packmode.PMConfig + +def assembly_line = mods.gregtech.assembly_line + +// World Accelerator HV +mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('hull.luv'), metaitem('field.generator.luv') * 64, metaitem('field.generator.luv') * 16, metaitem('sensor.luv') * 20, metaitem('emitter.luv') * 20, ore('circuitLuv') * 16, metaitem('plateDoubleIridium') * 4, metaitem('plateDenseDraconium') * 2) + .fluidInputs(fluid('soldering_alloy') * 1152, fluid('enderium') * 1152) + .outputs(metaitem('world_accelerator.hv')) + .stationResearch(b -> b.researchStack(item('minecraft:clock')).CWUt(4)) + .duration(6000).EUt(30720) + .buildAndRegister() + +// ZPM Field Generator +mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('frameNaquadahAlloy'), metaitem('plateNaquadahAlloy') * 6, metaitem('quantumstar'), metaitem('emitter.zpm') * 2, ore('circuitZpm') * 2, metaitem('wireFineUraniumRhodiumDinaquadide') * 64, metaitem('wireFineUraniumRhodiumDinaquadide') * 64, metaitem('cableGtSingleVanadiumGallium') * 4) + .fluidInputs(fluid('soldering_alloy') * 1152, fluid('awakened_draconium') * 1296) + .outputs(metaitem('field.generator.zpm')) + .stationResearch(b -> b.researchStack(metaitem('field.generator.luv')).CWUt(4)) + .duration(600).EUt(24000) + .buildAndRegister() + +// Dark Soularium Jetplate +mods.gregtech.assembly_line.recipeBuilder() + .inputs(item('simplyjetpacks:itemjetpack', 8), item('simplyjetpacks:metaitemmods', 4) * 2, item('extrautils2:angelring'), item('enderio:item_material', 16) * 2, item('contenttweaker:doublecompressedoctadiccapacitor'), ore('circuitLuv') * 4, item('simplyjetpacks:metaitemmods', 11) * 2) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(item('simplyjetpacks:itemjetpack', 9)) + .stationResearch(b -> b.researchStack(item('simplyjetpacks:metaitemmods', 11)).CWUt(16)) + .duration(3000).EUt(30720) + .buildAndRegister() + +// Flux-Infused Jetplate +mods.gregtech.assembly_line.recipeBuilder() + .inputs(item('simplyjetpacks:itemjetpack', 17), item('redstonearsenal:armor.plate_flux'), item('simplyjetpacks:metaitemmods', 21), item('extrautils2:angelring'), item('contenttweaker:compressedoctadiccapacitor') * 2, ore('circuitLuv') * 4, item('simplyjetpacks:metaitemmods', 30) * 2) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(item('simplyjetpacks:itemjetpack', 18)) + .stationResearch(b -> b.researchStack(item('simplyjetpacks:metaitemmods', 30)).CWUt(16)) + .duration(3000).EUt(30720) + .buildAndRegister() + +// Naquadah Reactor 1 +mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('cover.screen'), item('appliedenergistics2:spatial_pylon') * 3, ore('circuitZpm'), item('gregtech:transparent_casing', 1) * 2) + .fluidInputs(fluid('soldering_alloy') * 1152, fluid('omnium') * 32) + .outputs(metaitem('multiblocktweaker:naquadah_reactor_1')) + .stationResearch(b -> b.researchStack(metaitem('boltNaquadah')).CWUt(16)) + .duration(1500).EUt(122880) + .buildAndRegister() + +// Rotary Hearth Furnace +if (PMConfig.getPackMode() == "normal") { + mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('electric_blast_furnace'), ore('circuitUv') * 4, metaitem('field.generator.luv') * 4, metaitem('springNaquadahAlloy') * 4, metaitem('plateDenseNaquadahAlloy') * 4, metaitem('wireGtQuadrupleUraniumRhodiumDinaquadide') * 4) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(metaitem('gcym:mega_blast_furnace')) + .stationResearch(b -> b.researchStack(metaitem('electric_blast_furnace')).CWUt(16)) + .duration(1200).EUt(30720) + .buildAndRegister() +} else { + mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('electric_blast_furnace'), ore('circuitUhv') * 4, metaitem('field.generator.uv') * 4, metaitem('springTritanium') * 4, metaitem('plateTritanium') * 4, metaitem('wireGtQuadrupleUraniumRhodiumDinaquadide') * 4) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(metaitem('gcym:mega_blast_furnace')) + .stationResearch(b -> b.researchStack(metaitem('electric_blast_furnace')).CWUt(128).EUt(1966080)) + .duration(1200).EUt(491520) + .buildAndRegister() +} + +// Bulk Blast Chiller +if (PMConfig.getPackMode() == "normal") { + mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('vacuum_freezer'), ore('circuitUv') * 4, metaitem('field.generator.luv') * 4, metaitem('pipeNormalFluidNaquadah') * 4, metaitem('plateDenseNaquadahAlloy') * 4, metaitem('wireGtQuadrupleUraniumRhodiumDinaquadide') * 4) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(metaitem('gcym:mega_vacuum_freezer')) + .stationResearch(b -> b.researchStack(metaitem('vacuum_freezer')).CWUt(16)) + .duration(1200).EUt(30720) + .buildAndRegister() +} else { + mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('vacuum_freezer'), ore('circuitUhv') * 4, metaitem('field.generator.uv') * 4, metaitem('pipeNormalFluidDuranium') * 4, metaitem('plateDenseTritanium') * 4, metaitem('wireGtQuadrupleUraniumRhodiumDinaquadide') * 4) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(metaitem('gcym:mega_vacuum_freezer')) + .stationResearch(b -> b.researchStack(metaitem('vacuum_freezer')).CWUt(128).EUt(1966080)) + .duration(1200).EUt(491520) + .buildAndRegister() +} +// World Accelerator EV +mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('hull.zpm'), metaitem('field.generator.zpm') * 64, metaitem('field.generator.zpm') * 16, metaitem('sensor.zpm') * 20, metaitem('emitter.zpm') * 20, ore('circuitZpm') * 16, metaitem('plateDoubleEuropium') * 4, metaitem('plateDenseDraconium') * 2) + .fluidInputs(fluid('soldering_alloy') * 1152, fluid('enderium') * 1152) + .outputs(metaitem('world_accelerator.ev')) + .stationResearch(b -> b.researchStack(metaitem('world_accelerator.hv')).CWUt(32).EUt(122880)) + .duration(12000).EUt(122880) + .buildAndRegister() + +// Naquadah Reactor 2 +mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('cover.screen'), item('appliedenergistics2:spatial_pylon') * 3, ore('circuitUv'), item('gregtech:transparent_casing', 1) * 2) + .fluidInputs(fluid('soldering_alloy') * 1152, fluid('omnium') * 288) + .outputs(metaitem('multiblocktweaker:naquadah_reactor_2')) + .stationResearch(b -> b.researchStack(metaitem('multiblocktweaker:naquadah_reactor_1')).CWUt(64).EUt(122880)) + .duration(1500).EUt(122880) + .buildAndRegister() + +// Universal Navigator +mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('frameMicroversium'), metaitem('plateMicroversium') * 24, metaitem('gravistar'), metaitem('sensor.uv') * 2, metaitem('robot.arm.uv') * 2, ore('circuitUhv'), metaitem('plateDenseNaquadahAlloy') * 2, metaitem('wireGtQuadrupleEnrichedNaquadahTriniumEuropiumDuranide') * 4, metaitem('wireFineTritanium') * 64) + .fluidInputs(fluid('soldering_alloy') * 1152, fluid('naquadria') * 576) + .outputs(item('contenttweaker:universalnavigator')) + .stationResearch(b -> b.researchStack(item('contenttweaker:stellarcreationdata')).CWUt(96).EUt(491520)) + .duration(6000).EUt(491520) + .buildAndRegister() + +// Ultimate Material +mods.gregtech.assembly_line.recipeBuilder() + .inputs(item('draconicevolution:dragon_heart'), item('armorplus:material', 1) * 4, item('armorplus:material', 2) * 8, item('armorplus:material', 3) * 12) + .outputs(item('armorplus:material', 4)) + .stationResearch(b -> b.researchStack(item('draconicevolution:dragon_heart')).CWUt(96).EUt(491520)) + .duration(600).EUt(491520) + .buildAndRegister() + +// Reactor Stabilizer Rotor Assembly +mods.gregtech.assembly_line.recipeBuilder() + .inputs(ore('frameGtAwakenedDraconium'), ore('gearAwakenedDraconium'), ore('plateAwakenedDraconium') * 2, item('draconicevolution:reactor_part', 1) * 2, item('draconicevolution:reactor_part', 2) * 2) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(item('draconicevolution:reactor_part', 3)) + .stationResearch(b -> b.researchStack(metaitem('gearAwakenedDraconium')).CWUt(96).EUt(491520)) + .duration(600).EUt(491520) + .buildAndRegister() + +// Reactor Stabilizer Focus Ring +mods.gregtech.assembly_line.recipeBuilder() + .inputs(ore('frameGtAwakenedDraconium'), item('draconicevolution:awakened_core'), ore('ringAwakenedDraconium') * 4, ore('plateCrystalMatrix') * 4, item('advsolars:sunnarium_plate') * 4) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(item('draconicevolution:reactor_part', 4)) + .stationResearch(b -> b.researchStack(metaitem('ringAwakenedDraconium')).CWUt(96).EUt(491520)) + .duration(600).EUt(491520) + .buildAndRegister() + +// Reactor Stabilizer Frame +mods.gregtech.assembly_line.recipeBuilder() + .inputs(ore('frameGtAwakenedDraconium'), ore('gearAwakenedDraconium'), item('draconicevolution:awakened_core'), metaitem('sensor.zpm') * 2, metaitem('emitter.zpm') * 2, ore('plateElite') * 6) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(item('draconicevolution:reactor_part')) + .stationResearch(b -> b.researchStack(metaitem('frameAwakenedDraconium')).CWUt(96).EUt(491520)) + .duration(750).EUt(491520) + .buildAndRegister() + +// Simulation Supercomputer +if (PMConfig.getPackMode() == "normal") { + mods.gregtech.assembly_line.recipeBuilder() + .inputs(item('gcym:large_multiblock_casing', 11), ore('plateTrinaquadalloy') * 6, item('deepmoblearning:simulation_chamber') * 4, item('contenttweaker:heartofauniverse'), metaitem('robot.arm.uv') * 2, metaitem('field.generator.uv') * 2, ore('circuitUhv') * 4, item('draconicevolution:draconic_energy_core')) + .fluidInputs(fluid('soldering_alloy') * 1152) + .outputs(metaitem('multiblocktweaker:dml_sim_chamber')) + .stationResearch(b -> b.researchStack(item('deepmoblearning:simulation_chamber')).CWUt(128).EUt(1966080)) + .duration(1200).EUt(1966080) + .buildAndRegister() +} + +// World Accelerator IV +mods.gregtech.assembly_line.recipeBuilder() + .inputs(metaitem('hull.uv'), metaitem('field.generator.uv') * 64, metaitem('field.generator.uv') * 16, metaitem('sensor.uv') * 20, metaitem('emitter.uv') * 20, ore('circuitUv') * 16, metaitem('plateDoubleEuropium') * 4, metaitem('plateDenseNeutronium') * 2) + .fluidInputs(fluid('soldering_alloy') * 1152, fluid('enderium') * 1152, fluid('naquadria') * 576) + .outputs(metaitem('world_accelerator.iv')) + .stationResearch(b -> b.researchStack(metaitem('world_accelerator.ev')).CWUt(128).EUt(491520)) + .duration(12000).EUt(491520) + .buildAndRegister() + +// UV Field Generator (Hard mode only) +if (PMConfig.getPackMode() == "expert") { + mods.gregtech.assembly_line.recipeBuilder() + .inputs(ore('frameGtTritanium'), ore('plateTritanium') * 6, metaitem('gravistar'), metaitem('emitter.uv') * 2, ore('circuitUv') * 2, ore('wireFineEnrichedNaquadahTriniumEuropiumDuranide') * 64, ore('wireFineEnrichedNaquadahTriniumEuropiumDuranide') * 64, ore('cableGtSingleYttriumBariumCuprate') * 4) + .fluidInputs(fluid('soldering_alloy') * 1728, fluid('naquadria') * 576, fluid('taranium') * 288) + .outputs(metaitem('field.generator.uv')) + .stationResearch(b -> b.researchStack(metaitem('field.generator.zpm')).CWUt(48).EUt(122880)) + .duration(600).EUt(100000) + .buildAndRegister() +} \ No newline at end of file diff --git a/overrides/groovy/postInit/recycling.groovy b/overrides/groovy/postInit/recycling.groovy new file mode 100644 index 0000000..d88275a --- /dev/null +++ b/overrides/groovy/postInit/recycling.groovy @@ -0,0 +1,63 @@ +import io.sommers.packmode.PMConfig +import gregtech.api.recipes.category.RecipeCategories + +// Assembly Control Casing +mods.gregtech.arc_furnace.removeByInput(30, [item('gregtech:multiblock_casing', 3)], [fluid('oxygen') * 932]) +mods.gregtech.macerator.removeByInput(32, [item('gregtech:multiblock_casing', 3)], null) + +if (PMConfig.getPackMode() == "normal") { +mods.gregtech.arc_furnace.recipeBuilder() + .inputs(item('gregtech:multiblock_casing', 3)) + .fluidInputs(fluid('oxygen') * 932) + .outputs(metaitem('nuggetTungstenSteel') * 15, metaitem('dustGraphene'), metaitem('nuggetTungsten') * 6, metaitem('nuggetIridium') * 5) + .duration(932) + .EUt(30) + .category(RecipeCategories.ARC_FURNACE_RECYCLING) + .buildAndRegister(); + +mods.gregtech.macerator.recipeBuilder() + .inputs(item('gregtech:multiblock_casing', 3)) + .outputs(metaitem('dustSmallTungstenSteel') * 7, metaitem('dustRubber'), metaitem('dustGraphene'), metaitem('dustSmallTungsten') * 3) + .duration(725) + .EUt(30) + .category(RecipeCategories.MACERATOR_RECYCLING) + .buildAndRegister(); +} +else { +mods.gregtech.arc_furnace.recipeBuilder() + .inputs(item('gregtech:multiblock_casing', 3)) + .fluidInputs(fluid('oxygen') * 932) + .outputs(metaitem('nuggetTungstenSteel') * 62, metaitem('dustGraphene') * 4, metaitem('nuggetTungsten') * 26, metaitem('nuggetIridium') * 22) + .duration(932) + .EUt(30) + .category(RecipeCategories.ARC_FURNACE_RECYCLING) + .buildAndRegister(); + +mods.gregtech.macerator.recipeBuilder() + .inputs(item('gregtech:multiblock_casing', 3)) + .outputs(metaitem('dustSmallTungstenSteel') * 28, metaitem('dustRubber') * 4, metaitem('dustGraphene') * 4, metaitem('dustSmallTungsten') * 12) + .duration(725) + .EUt(30) + .category(RecipeCategories.MACERATOR_RECYCLING) + .buildAndRegister(); +} + +mods.gregtech.arc_furnace.removeByInput(30, [item('gregtech:multiblock_casing', 4)], [fluid('oxygen') * 3322]) +if (PMConfig.getPackMode() == "expert") { +mods.gregtech.arc_furnace.recipeBuilder() + .inputs(item('gregtech:multiblock_casing', 4)) + .fluidInputs(fluid('oxygen') * 3322) + .outputs(metaitem('dustGraphene') * 24, metaitem('nuggetTungstenSteel') * 20, metaitem('ingotTungsten') * 16, metaitem('ingotRuridit') * 8) + .duration(3322) + .EUt(30) + .category(RecipeCategories.ARC_FURNACE_RECYCLING) + .buildAndRegister(); + +mods.gregtech.arc_furnace.recipeBuilder() + .inputs(item('gregtech:multiblock_casing', 4)) + .outputs(metaitem('dustGraphene') * 24, metaitem('dustRubber') * 22, metaitem('dustTungstenSteel') * 20, metaitem('dustTungsten') * 17) + .duration(2944) + .EUt(30) + .category(RecipeCategories.ARC_FURNACE_RECYCLING) + .buildAndRegister(); +} diff --git a/overrides/groovy/postInit/removals.groovy b/overrides/groovy/postInit/removals.groovy new file mode 100644 index 0000000..f6fcbce --- /dev/null +++ b/overrides/groovy/postInit/removals.groovy @@ -0,0 +1,235 @@ +import io.sommers.packmode.PMConfig + +if (PMConfig.getPackMode() == "normal") { +// Input Buses +// ULV Input Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('glue') * 250]) +// ULV Input Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 72]) +// ULV Input Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 36]) +// ULV Input Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 4]) +// LV Input Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('glue') * 500]) +// LV Input Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 144]) +// LV Input Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 72]) +// LV Input Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 9]) +// MV Input Bus * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('crate.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 288]) +// MV Input Bus * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('crate.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 144]) +// MV Input Bus * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('crate.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 18]) +// HV Input Bus * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('crate.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 432]) +// HV Input Bus * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('crate.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 288]) +// HV Input Bus * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('crate.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 36]) +// EV Input Bus * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('crate.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 432]) +// EV Input Bus * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('crate.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 72]) +// IV Input Bus * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('crate.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 576]) +// IV Input Bus * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('crate.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 144]) +// Bronze Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.import.mv')], [fluid('oxygen') * 882]) +// Bronze Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('item_bus.import.mv')], null) +// Stainless Steel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.import.hv')], [fluid('oxygen') * 1087]) +// Stainless Steel Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('item_bus.import.hv')], null) +// Block of Aluminium * 1 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.import.ev')], [fluid('oxygen') * 621]) +// Aluminium Dust * 9 +mods.gregtech.macerator.removeByInput(8, [metaitem('item_bus.import.ev')], null) +// Stainless Steel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.import.iv')], [fluid('oxygen') * 1590]) +// Stainless Steel Dust * 8 +mods.gregtech.macerator.removeByInput(32, [metaitem('item_bus.import.iv')], null) + +// Output Buses +// ULV Output Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('glue') * 250]) +// ULV Output Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 72]) +// ULV Output Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 36]) +// ULV Output Bus * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 4]) +// LV Output Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('glue') * 500]) +// LV Output Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 144]) +// LV Output Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 72]) +// LV Output Bus * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:chest'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 9]) +// MV Output Bus * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('crate.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 288]) +// MV Output Bus * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('crate.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 144]) +// MV Output Bus * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('crate.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 18]) +// HV Output Bus * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('crate.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 432]) +// HV Output Bus * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('crate.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 288]) +// HV Output Bus * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('crate.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 36]) +// EV Output Bus * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('crate.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 432]) +// EV Output Bus * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('crate.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 72]) +// IV Output Bus * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('crate.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 576]) +// IV Output Bus * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('crate.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 144]) +// Aluminium Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.export.mv')], [fluid('oxygen') * 882]) +// Aluminium Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('item_bus.export.mv')], null) +// Stainless Steel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.export.hv')], [fluid('oxygen') * 1087]) +// Stainless Steel Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('item_bus.export.hv')], null) +// Block of Aluminium * 1 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.export.ev')], [fluid('oxygen') * 621]) +// Aluminium Dust * 9 +mods.gregtech.macerator.removeByInput(8, [metaitem('item_bus.export.ev')], null) +// Stainless Steel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('item_bus.export.iv')], [fluid('oxygen') * 1590]) +// Stainless Steel Dust * 8 +mods.gregtech.macerator.removeByInput(32, [metaitem('item_bus.export.iv')], null) + +// Input Hatches +// ULV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('glue') * 250]) +// ULV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 72]) +// ULV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 36]) +// ULV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 4]) +// LV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('glue') * 500]) +// LV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 144]) +// LV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 72]) +// LV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 9]) +// MV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('drum.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 288]) +// MV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('drum.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 144]) +// MV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('drum.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 18]) +// HV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('drum.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('plastic') * 432]) +// HV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('drum.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 288]) +// HV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('drum.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 36]) +// EV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('drum.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 432]) +// EV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('drum.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 72]) +// IV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('drum.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polytetrafluoroethylene') * 576]) +// IV Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('drum.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 1])], [fluid('polybenzimidazole') * 144]) +// Aluminium Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.import.mv')], [fluid('oxygen') * 730]) +// Aluminium Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('fluid_hatch.import.mv')], null) +// Stainless Steel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.import.hv')], [fluid('oxygen') * 975]) +// Stainless Steel Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('fluid_hatch.import.hv')], null) +// Titanium Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.import.ev')], [fluid('oxygen') * 569]) +// Titanium Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('fluid_hatch.import.ev')], null) +// Tungstensteel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.import.iv')], [fluid('oxygen') * 1480]) +// Tungstensteel Dust * 8 +mods.gregtech.macerator.removeByInput(32, [metaitem('fluid_hatch.import.iv')], null) + +// Output Hatches +// ULV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('glue') * 250]) +// ULV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 72]) +// ULV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 36]) +// ULV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7, [metaitem('hull.ulv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 4]) +// LV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('glue') * 500]) +// LV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 144]) +// LV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 72]) +// LV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(30, [metaitem('hull.lv'), item('minecraft:glass'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 9]) +// MV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('drum.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 288]) +// MV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(120, [metaitem('hull.mv'), metaitem('drum.bronze'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 144]) +// HV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('drum.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('plastic') * 432]) +// HV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('drum.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 288]) +// HV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(480, [metaitem('hull.hv'), metaitem('drum.steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 36]) +// EV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('drum.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 432]) +// EV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('hull.ev'), metaitem('drum.aluminium'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 72]) +// IV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('drum.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polytetrafluoroethylene') * 576]) +// IV Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('hull.iv'), metaitem('drum.stainless_steel'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('polybenzimidazole') * 144]) +// Aluminium Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.export.mv')], [fluid('oxygen') * 730]) +// Aluminium Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('fluid_hatch.export.mv')], null) +// Stainless Steel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.export.hv')], [fluid('oxygen') * 975]) +// Stainless Steel Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('fluid_hatch.export.hv')], null) +// Titanium Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.export.ev')], [fluid('oxygen') * 569]) +// Titanium Dust * 8 +mods.gregtech.macerator.removeByInput(8, [metaitem('fluid_hatch.export.ev')], null) +// Tungstensteel Ingot * 8 +mods.gregtech.arc_furnace.removeByInput(30, [metaitem('fluid_hatch.export.iv')], [fluid('oxygen') * 1480]) +// Tungstensteel Dust * 8 +mods.gregtech.macerator.removeByInput(32, [metaitem('fluid_hatch.export.iv')], null) + +// 4x/9x Hatches +// EV Quadruple Input Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('fluid_hatch.import.ev'), metaitem('pipeQuadrupleFluidTitanium'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('polytetrafluoroethylene') * 576]) +// EV Quadruple Output Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('fluid_hatch.export.ev'), metaitem('pipeQuadrupleFluidTitanium'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('polytetrafluoroethylene') * 576]) +// IV Quadruple Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('fluid_hatch.import.iv'), metaitem('pipeQuadrupleFluidTungstenSteel'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('polytetrafluoroethylene') * 576]) +// IV Quadruple Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('fluid_hatch.export.iv'), metaitem('pipeQuadrupleFluidTungstenSteel'), metaitem('circuit.integrated').withNbt(["Configuration": 4])], [fluid('polytetrafluoroethylene') * 576]) +// EV Nonuple Input Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('fluid_hatch.import.ev'), metaitem('pipeNonupleFluidTitanium'), metaitem('circuit.integrated').withNbt(["Configuration": 9])], [fluid('polytetrafluoroethylene') * 1296]) +// EV Nonuple Output Hatch * 1 +mods.gregtech.assembler.removeByInput(1920, [metaitem('fluid_hatch.export.ev'), metaitem('pipeNonupleFluidTitanium'), metaitem('circuit.integrated').withNbt(["Configuration": 9])], [fluid('polytetrafluoroethylene') * 1296]) +// IV Nonuple Input Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('fluid_hatch.import.iv'), metaitem('pipeNonupleFluidTungstenSteel'), metaitem('circuit.integrated').withNbt(["Configuration": 9])], [fluid('polytetrafluoroethylene') * 1296]) +// IV Nonuple Output Hatch * 1 +mods.gregtech.assembler.removeByInput(7680, [metaitem('fluid_hatch.export.iv'), metaitem('pipeNonupleFluidTungstenSteel'), metaitem('circuit.integrated').withNbt(["Configuration": 9])], [fluid('polytetrafluoroethylene') * 1296]) +} \ No newline at end of file diff --git a/overrides/groovy/runConfig.json b/overrides/groovy/runConfig.json new file mode 100644 index 0000000..0b677b9 --- /dev/null +++ b/overrides/groovy/runConfig.json @@ -0,0 +1,20 @@ +{ + "packName": "Nomi-CEu", + "packId": "nomi-ceu", + "version": "1.0.0", + "debug": false, + "classes": { + "preInit": [] + }, + "loaders": { + "preInit": [ + "preInit/" + ], + "init": [ + "init/" + ], + "postInit": [ + "postInit/" + ] + } +} diff --git a/overrides/scripts/AE2.zs b/overrides/scripts/AE2.zs index 74132db..c79b5e8 100644 --- a/overrides/scripts/AE2.zs +++ b/overrides/scripts/AE2.zs @@ -16,6 +16,7 @@ import mods.appliedenergistics2.Inscriber; //Silicon Inscriber.removeRecipe(); Inscriber.addRecipe(, , true, ); +Inscriber.addRecipe(, , true, ); //Engineering Processor Inscriber.removeRecipe(); diff --git a/overrides/scripts/BlastFurnace.zs b/overrides/scripts/BlastFurnace.zs index 605a8c5..c78ee61 100644 --- a/overrides/scripts/BlastFurnace.zs +++ b/overrides/scripts/BlastFurnace.zs @@ -269,7 +269,7 @@ alloy_blast_smelter.recipeBuilder() .fluidOutputs( * 1296) .circuit(4) .property("temperature", 1100) - .duration(9000) + .duration(19602) .EUt(120) .buildAndRegister(); diff --git a/overrides/scripts/DraconicEvolution.zs b/overrides/scripts/DraconicEvolution.zs index dd6a35f..da84679 100644 --- a/overrides/scripts/DraconicEvolution.zs +++ b/overrides/scripts/DraconicEvolution.zs @@ -55,18 +55,25 @@ recipes.addShaped(, [ //Fusion Injector recipes.remove(); -recipes.addShaped(, [ - [, , ], - [dragcore, , dragcore], - [, , ]]); - +assembly_line.recipeBuilder() + .inputs(, , , * 2, * 4) + .fluidInputs( * 1152) + .outputs() + .property("research", ) + .duration(600).EUt(30720).buildAndRegister(); + +// Fusion crafting core +recipes.remove(); +assembly_line.recipeBuilder() + .inputs(, * 6, * 4, * 4, * 2, * 2, * 8) + .fluidInputs( * 1152) + .outputs() + .property("research", ) + .duration(1200).EUt(30720).buildAndRegister(); + //Reactor Stabalizer Frame recipes.remove(); -recipes.addShaped(, [ - [,,], - [, , null], - [,,]]); - +// Moved to Groovy recipes.remove(); recipes.addShaped(, [ @@ -81,29 +88,27 @@ recipes.addShaped(, [ [, ,]]); recipes.remove(); -recipes.addShaped(, [ - [null, , ], - [, ,], - [null, , ]]); +// Moved to Groovy recipes.remove(); -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ]]); +// Moved to Groovy +// Particle Generator recipes.remove(); -recipes.addShaped(, [ - [, , ], - [, , ], - [, , ]]); +assembly_line.recipeBuilder() + .inputs(, * 6, , * 10, * 3, * 4) + .fluidInputs( * 1152) + .outputs() + .property("research", ) + .duration(1200).EUt(30720).buildAndRegister(); recipes.remove(); -recipes.addShaped(, [ - [,,], - [, ,], - [,,] -]); +assembly_line.recipeBuilder() + .inputs(, * 6, , * 4, * 2, * 12) + .fluidInputs( * 1152) + .outputs() + .property("research", ) + .duration(1200).EUt(30720).buildAndRegister(); recipes.addShapeless(, []); diff --git a/overrides/scripts/Earlygame.zs b/overrides/scripts/Earlygame.zs index e3bdc56..0513d42 100644 --- a/overrides/scripts/Earlygame.zs +++ b/overrides/scripts/Earlygame.zs @@ -419,7 +419,7 @@ recipes.addShaped(, [[, , ], [, , ], [, , ]]); - + /*arc_furnace.recipeBuilder() .inputs() .fluidInputs( * 236) diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 3a19b84..2a56248 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -217,15 +217,10 @@ recipes.addShaped(, [ ]); // Assembly Line + // ZPM Field Generator * 1 .findRecipe(24000, [, * 6, , * 2, * 2, * 64, * 64, * 4], [ * 1152]).remove(); -assembly_line.recipeBuilder() - .inputs([, * 6, , * 2, * 2, * 64, * 64, * 4]) - .fluidInputs([ * 1152, * 1296]) - .outputs() - .duration(600) - .EUt(24000) - .buildAndRegister(); +// Moved to Groovy // Rhodium Plated Palladium // Rhodium Plated Palladium Dust * 4 @@ -301,24 +296,16 @@ recipes.removeByRecipeName("gregtech:gregtech.machine.world_accelerator.uv"); // Tungstensteel Dust * 32 .findRecipe(32, [], null).remove(); +// Moved to Groovy -assembly_line.recipeBuilder() - .inputs( * 20, * 20, * 20, , * 2, , * 2, , * 20, * 20, * 20) - .fluidInputs( * 1152, * 1152) - .outputs() - .duration(900).EUt(30720).buildAndRegister(); +/* UHV Multis */ +// Rotary Hearth Furnace +recipes.remove(); +// Moved to Groovy -assembly_line.recipeBuilder() - .inputs( * 20, * 20, * 20, , * 2, , * 2, , * 20, * 20, * 20) - .fluidInputs( * 1152, * 1152) - .outputs() - .duration(900).EUt(122880).buildAndRegister(); - -assembly_line.recipeBuilder() - .inputs( * 20, * 20, * 20, , * 2, , * 2, , * 20, * 20, * 20) - .fluidInputs( * 1152, * 1152, * 576) - .outputs() - .duration(900).EUt(491520).buildAndRegister(); +// Bulk Blast Chiller +recipes.remove(); +// Moved to Groovy // Stabilized Miners Tooltips .addTooltip(format.italic( diff --git a/overrides/scripts/JetpacksAndEnergyStorage.zs b/overrides/scripts/JetpacksAndEnergyStorage.zs index be7745b..63c8126 100644 --- a/overrides/scripts/JetpacksAndEnergyStorage.zs +++ b/overrides/scripts/JetpacksAndEnergyStorage.zs @@ -215,19 +215,11 @@ recipes.addShaped(resonantjetpack, [ //Dark Soularium JetPlate recipes.removeByRecipeName("simplyjetpacks:upgraderecipe5"); -recipes.addShaped(darksoulariumjetplate, [ - [, , ], - [, armoredvibrantjetpack.marked("jetpack"), ], - [, doublecompressedoctadiccap, ]], - transferTag); +// Moved to Groovy //Flux-Infused Jetplate recipes.removeByRecipeName("simplyjetpacks:upgraderecipe34"); -recipes.addShaped(fluxinfusedjetplate, [ - [compressedoctadiccap, , compressedoctadiccap], - [, armoredresonantjetpack.marked("jetpack"), ], - [, , ]], - transferTag); +// Moved to Groovy /* Fix Armored Jetpacks */ recipes.removeByRecipeName("simplyjetpacks:upgraderecipe15"); // conductive iron diff --git a/overrides/scripts/Microverse.zs b/overrides/scripts/Microverse.zs index 4d00289..e543622 100644 --- a/overrides/scripts/Microverse.zs +++ b/overrides/scripts/Microverse.zs @@ -217,17 +217,12 @@ makeExtremeRecipe9(, W : } ); -makeShaped("of_warpengine", , - ["PIP", - "ABA", - "CDC"], - { A : , - B : , - C : , - D : , - I : , - P : } -); +assembly_line.recipeBuilder() + .inputs([, * 6, , * 2, * 2, * 2, * 2, ]) + .fluidInputs( * 1152) + .outputs() + .property("research", ) + .duration(1800).EUt(30720).buildAndRegister(); ///////////// Tier Eight Space Ship ////////////////// @@ -277,14 +272,7 @@ makeExtremeRecipe9(, W : } ); -makeShaped("of_universalnavigator", , - ["ABA", - "BCB", - "ABA"], - { A : , - B : , - C : } -); +// Recipe moved to Groovy .addTooltip(format.blue("See you later, navigator!")); ///////////// Tier Ten Space Ship ////////////////// diff --git a/overrides/scripts/expert_processing.zs b/overrides/scripts/expert_processing.zs index c63f8e7..793089f 100644 --- a/overrides/scripts/expert_processing.zs +++ b/overrides/scripts/expert_processing.zs @@ -495,7 +495,7 @@ chemical_reactor.recipeBuilder() chemical_bath.recipeBuilder() .inputs( * 3) .fluidInputs( * 2000) - .outputs() + .outputs(, ) .fluidOutputs( * 1000) .duration(250).EUt(30).buildAndRegister(); @@ -506,6 +506,15 @@ chemical_bath.recipeBuilder() .fluidOutputs( * 1000) .duration(250).EUt(30).buildAndRegister(); +// Platinum Sludge Residue +.findRecipe(30, [ * 5], null).remove(); + +centrifuge.recipeBuilder() + .inputs( * 5) + .outputs( * 2, * 2) + .chancedOutput(, 1000, 1000) + .duration(938).EUt(30).buildAndRegister(); + // Platinum chemical_reactor.recipeBuilder() .inputs( * 8) @@ -731,7 +740,7 @@ centrifuge.recipeBuilder() .inputs( * 10) .fluidInputs( * 10000) .outputs( * 12, * 12, * 8, * 4, * 4, ) - .fluidOutputs( * 2000, * 250, * 250) + .fluidOutputs( * 2000, * 1000, * 250, * 250) .duration(1500).EUt(720).buildAndRegister(); // 1/4800 scale diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs old mode 100644 new mode 100755 index ca74c33..a169aa8 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -634,6 +634,26 @@ assembly_line.recipeBuilder() .outputs() .duration(5000).EUt(500000).buildAndRegister(); +// Assembly Control Casing +recipes.remove(); +recipes.addShaped(, [ + [, , ], + [, , ], + [, , ] +]); + +// Recycling recipes in groovy + +// Assembly Line Casing +recipes.remove(); +recipes.addShaped(, [ + [, , ], + [, , ], + [, , ] +]); + +// Recycling recipes in groovy + // 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 e355504..e705604 100644 --- a/overrides/scripts/extendedcrafting.zs +++ b/overrides/scripts/extendedcrafting.zs @@ -443,16 +443,7 @@ recipes.addShaped(, [ ////////////////////////// Ultimate Material /////////////////////// -makeExtremeRecipe5(, - ["BCCCB", - "CBABC", - "CADAC", - "CBABC", - "BCCCB"], - { A : , - B : , - C : , - D : }); +// Moved to Groovy ////////////////////////// Eternal Catalyst /////////////////////// diff --git a/overrides/scripts/materials.zs b/overrides/scripts/materials.zs index f60be87..a275ae8 100644 --- a/overrides/scripts/materials.zs +++ b/overrides/scripts/materials.zs @@ -822,6 +822,7 @@ var tributyl_phosphate = MaterialBuilder(32115, "tributyl_phosphate") .addFlags(["generate_frame"]); .addFlags(["generate_double_plate"]); .addFlags(["generate_double_plate"]); +.addFlags(["generate_dense", "generate_spring"]); // Prevent TE Gears from showing up .addFlags(["generate_gear"]); .addFlags(["generate_gear"]); diff --git a/overrides/scripts/multiblock_dml.zs b/overrides/scripts/multiblock_dml.zs index d073d44..bbe1614 100755 --- a/overrides/scripts/multiblock_dml.zs +++ b/overrides/scripts/multiblock_dml.zs @@ -140,16 +140,7 @@ dml_sim_chamber.hasMufflerMechanics = false; //dml_sim_chamber.frontOverlay = ; //Recipe for Controller -makeShaped("simulation_controller", , - ["MHM", - "RCR", - "MEM"], - { M : , - R : , - C : , - E : , - H : - }); +// Moved to Groovy val DATA_MODEL_MAXIMUM_TIER = 4; val PRISTINE_CHANCE_FIXED = 30; // in % diff --git a/overrides/scripts/multiblocks_normal.zs b/overrides/scripts/multiblocks_normal.zs index 3485c1b..06937fa 100644 --- a/overrides/scripts/multiblocks_normal.zs +++ b/overrides/scripts/multiblocks_normal.zs @@ -377,25 +377,8 @@ recipes.addShaped("creative_tank_provider", , , ] ]); -makeShaped("naquadah_reactor_1", , - ["NCN", - "GSG", - "PPP"], - { C : , //T5 - G : , - S : , - P : , - N : }); //Omnium Nugget - -makeShaped("naquadah_reactor_2", , - ["NCN", - "GSG", - "PPP"], - { C : , //T6 - G : , - S : , - P : , - N : }); //Omnium Ingot +// Naquadah Reactor +// Moved to Groovy diff --git a/overrides/scripts/normalmode.zs b/overrides/scripts/normalmode.zs old mode 100644 new mode 100755 index 413a09e..d9adddc --- a/overrides/scripts/normalmode.zs +++ b/overrides/scripts/normalmode.zs @@ -728,26 +728,21 @@ large_chemical_reactor.recipeBuilder() .circuit(25) .duration(300).EUt(7680).buildAndRegister(); +// Assembly Control Casing +recipes.remove(); +recipes.addShaped( * 4, [ + [, , ], + [, , ], + [, , ] +]); + +// Recycling recipes in groovy + // Nq+ and Nq* mixer.recipeBuilder().inputs([ * 2, * 4,,]).fluidInputs([ * 576, * 144]).outputs().EUt(8000).duration(400).buildAndRegister(); mixer.recipeBuilder().inputs([ * 2,,*4,]).fluidInputs([ * 576, * 144]).outputs().EUt(30000).duration(400).buildAndRegister(); -/* UHV Multis, move to zpm (used to be UHV) */ -// Rotary Hearth Furnace -recipes.remove(); -recipes.addShaped(, - [[, , ], - [, , ], - [, , ]]); - -// Bulk Blast Chiller -recipes.remove(); -recipes.addShaped(, - [[, , ], - [, , ], - [, , ]]); - // Recycling recipe replacements // RHF .findRecipe(30, [], [ * 20786]).remove(); @@ -784,7 +779,48 @@ macerator.recipeBuilder() .duration(25408) .EUt(32) .buildAndRegister(); - + +// I/O Buses +// Removals in Groovy + +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); + +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); + +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); + +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); + +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); + +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); +recipes.addShaped(, [[], []]); + // AA Drill Core Coin Tooltip .addTooltip(format.red("Also can be purchased for Nomicoins.")); diff --git a/overrides/scripts/solars.zs b/overrides/scripts/solars.zs index c712557..790bd61 100644 --- a/overrides/scripts/solars.zs +++ b/overrides/scripts/solars.zs @@ -68,20 +68,29 @@ mods.jei.JEI.removeAndHide(); mods.jei.JEI.removeAndHide(); -recipes.addShaped( * 4, [ - [,,], - [,,], - [,,]]); +//recipes.addShaped( * 4, [ +// [,,], +// [,,], +// [,,]]); +assembly_line.recipeBuilder() + .inputs([ * 2, * 3, * 2, ]) + .fluidInputs([ * 1296]) + .outputs( * 4) + .property("research", ) + .duration(4800).EUt(30720) + .buildAndRegister(); recipes.addShaped( * 6, [ [,,], [,,], [,,]]); -recipes.addShaped( * 4, [ - [,,], - [,,], - [,,]]); +assembler.recipeBuilder() + .inputs([ * 2, * 3, * 2, ]) + .fluidInputs([ * 1296]) + .outputs( * 4) + .duration(2400).EUt(7680) + .buildAndRegister(); recipes.addShaped( * 6, [ [,,],