diff --git a/manifest.json b/manifest.json index 56eba72..2e16d5e 100644 --- a/manifest.json +++ b/manifest.json @@ -681,7 +681,7 @@ }, { "projectID": 687577, - "fileID": 5507936, + "fileID": 5562296, "required": true }, { @@ -746,7 +746,7 @@ }, { "projectID": 932060, - "fileID": 5545493, + "fileID": 5583492, "required": true }, { diff --git a/overrides/groovy/classes/postInit/common.groovy b/overrides/groovy/classes/postInit/common.groovy new file mode 100644 index 0000000..7da9bff --- /dev/null +++ b/overrides/groovy/classes/postInit/common.groovy @@ -0,0 +1,51 @@ +package classes.postInit + +import net.minecraft.item.ItemStack + +class Common { + /* Cached Values */ + private static ItemStack meP2p = null + private static List p2pVariants = null + private static List eioGlasses = null + + static ItemStack getMeP2p() { + if (meP2p != null) return meP2p + + meP2p = item('appliedenergistics2:part', 460) + return meP2p + } + // All P2P Variants, Excluding ME P2P + static List getP2pVariants() { + if (p2pVariants != null) return p2pVariants + + p2pVariants = [ + item('appliedenergistics2:part', 461), // Redstone + item('appliedenergistics2:part', 462), // Item + item('appliedenergistics2:part', 463), // Fluid + item('appliedenergistics2:part', 467), // Light + item('appliedenergistics2:part', 469), // RF + item('appliedenergistics2:part', 470), // EU + item('nae2:part', 1), // Interface + ] + return p2pVariants + } + static List getEioGlasses() { + if (eioGlasses != null) return eioGlasses + + eioGlasses = [] + for (var prefix in [null, 'holy', 'unholy', 'pasture', 'not_holy', 'not_unholy', 'not_pasture']) { + if (prefix == null) { + prefix = '' + } else { + prefix = "_$prefix" + } + eioGlasses.add(item("enderio:block${prefix}_fused_quartz")) + eioGlasses.add(item("enderio:block${prefix}_fused_glass")) + eioGlasses.add(item("enderio:block${prefix}_enlightened_fused_quartz")) + eioGlasses.add(item("enderio:block${prefix}_enlightened_fused_glass")) + eioGlasses.add(item("enderio:block${prefix}_dark_fused_quartz")) + eioGlasses.add(item("enderio:block${prefix}_dark_fused_glass")) + } + return eioGlasses + } +} diff --git a/overrides/groovy/classes/postInit/eioPrefixes.groovy b/overrides/groovy/classes/postInit/eioPrefixes.groovy deleted file mode 100644 index 8936cf9..0000000 --- a/overrides/groovy/classes/postInit/eioPrefixes.groovy +++ /dev/null @@ -1,28 +0,0 @@ -package classes.postInit - -import net.minecraft.item.ItemStack - -class EioPrefixes { - public static List prefixes = [null, 'holy', 'unholy', 'pasture', 'not_holy', 'not_unholy', 'not_pasture'] - public static List allItems - - static List getAllItems() { - if (allItems) return allItems - - allItems = [] - for (var prefix in prefixes) { - if (prefix == null) { - prefix = '' - } else { - prefix = "_$prefix" - } - allItems.add(item("enderio:block${prefix}_fused_quartz")) - allItems.add(item("enderio:block${prefix}_fused_glass")) - allItems.add(item("enderio:block${prefix}_enlightened_fused_quartz")) - allItems.add(item("enderio:block${prefix}_enlightened_fused_glass")) - allItems.add(item("enderio:block${prefix}_dark_fused_quartz")) - allItems.add(item("enderio:block${prefix}_dark_fused_glass")) - } - return allItems - } -} diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/earlygame.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/earlygame.groovy index 48cbef4..a2b2a6a 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/earlygame.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/earlygame.groovy @@ -13,7 +13,7 @@ mods.gregtech.assembler.recipeBuilder() .duration(100).EUt(VA[ULV]) .buildAndRegister() -//Copper Furnace +// Copper Furnace replaceRecipeInput(item('morefurnaces:furnaceblock', 5), [ [ore('ingotCopper'), ore('ingotCopper'), ore('ingotCopper')], [ore('ingotCopper'), item('morefurnaces:furnaceblock'), ore('ingotCopper')], @@ -26,7 +26,7 @@ mods.gregtech.assembler.recipeBuilder() .duration(100).EUt(VA[ULV]) .buildAndRegister() -//Silver Furnace +// Silver Furnace replaceRecipeInput(item('morefurnaces:furnaceblock', 6), [ [ore('ingotSilver'), ore('ingotSilver'), ore('ingotSilver')], [ore('ingotSilver'), item('morefurnaces:furnaceblock', 5), ore('ingotSilver')], @@ -39,7 +39,7 @@ mods.gregtech.assembler.recipeBuilder() .duration(100).EUt(VA[ULV]) .buildAndRegister() -//Gold Furnace +// Gold Furnace replaceRecipeInput(item('morefurnaces:furnaceblock', 1), [ [item('minecraft:gold_ingot'), item('minecraft:gold_ingot'), item('minecraft:gold_ingot')], [item('minecraft:gold_ingot'), item('morefurnaces:furnaceblock', 6), item('minecraft:gold_ingot')], @@ -52,7 +52,7 @@ mods.gregtech.assembler.recipeBuilder() .duration(100).EUt(VA[ULV]) .buildAndRegister() -//Diamond Furnace +// Diamond Furnace replaceRecipeInput(item('morefurnaces:furnaceblock', 2), [ [item('minecraft:diamond'), item('minecraft:diamond'), item('minecraft:diamond')], [item('minecraft:diamond'), item('morefurnaces:furnaceblock', 1), item('minecraft:diamond')], @@ -65,7 +65,7 @@ mods.gregtech.assembler.recipeBuilder() .duration(100).EUt(VA[ULV]) .buildAndRegister() -//Obsidian Furnace +// Obsidian Furnace replaceRecipeInput(item('morefurnaces:furnaceblock', 3), [ [item('minecraft:obsidian'), item('minecraft:obsidian'), item('minecraft:obsidian')], [item('morefurnaces:furnaceblock', 2), item('minecraft:obsidian'), item('morefurnaces:furnaceblock', 2)], @@ -102,7 +102,6 @@ if (LabsModeHelper.expert) { .outputs(item('actuallyadditions:item_misc', 16)) .duration(100).EUt(VA[ULV]) .buildAndRegister() - } // Coated Circuit Board @@ -115,10 +114,8 @@ mods.gregtech.assembler.recipeBuilder() .buildAndRegister() // Circuit Board (Move from Wood Plate + Glue + Foil to Coated Circuit Board + Foil) -mods.gregtech.assembler.removeByOutput([metaitem('circuit_board.basic')], null, null, null) mods.gregtech.assembler.recipeBuilder() .inputs(metaitem('board.coated'), ore('foilCopper') * 4) .outputs(metaitem('circuit_board.basic')) .duration(100).EUt(VA[ULV]) - .buildAndRegister() - + .replace().buildAndRegister() diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/electronics.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/electronics.groovy index f851f4b..482b7c2 100755 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/electronics.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Early-Game/electronics.groovy @@ -1,4 +1,5 @@ import static com.nomiceu.nomilabs.groovy.GroovyHelpers.RecyclingHelpers.* +import static gregtech.api.GTValues.* // Pyrolyse Oven replaceRecipeInput(metaitem('pyrolyse_oven'), [ @@ -7,15 +8,13 @@ replaceRecipeInput(metaitem('pyrolyse_oven'), [ [metaitem('electric.piston.lv'), metaitem('electric.pump.lv'), ore('wireGtQuadrupleCupronickel')]]) // HV Coil -mods.gregtech.assembler.removeByInput(480, [metaitem('stickSteelMagnetic'), metaitem('wireFineBlackSteel') * 16, metaitem('circuit.integrated').withNbt([Configuration: 1])], null) mods.gregtech.assembler.recipeBuilder() .inputs(metaitem('stickSteelMagnetic'), metaitem('wireFineSilver') * 16) .circuitMeta(1) .outputs(metaitem('voltage_coil.hv')) .changeRecycling() - .duration(200) - .EUt(480) - .buildAndRegister() + .duration(200).EUt(VA[HV]) + .replace().buildAndRegister() // Refresh HV Energy and HV Dynamo Recipes // Since stacks are not stored, they cannot simply be reloaded, we must recall. diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/assemblyLine.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/assemblyLine.groovy index f6f9942..5450915 100755 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/assemblyLine.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/assemblyLine.groovy @@ -1,13 +1,29 @@ +import com.nomiceu.nomilabs.groovy.ChangeRecipeBuilder import com.nomiceu.nomilabs.util.LabsModeHelper +import gregtech.api.recipes.builders.AssemblyLineRecipeBuilder +import gregtech.api.recipes.recipeproperties.ResearchProperty -// ZPM Field Generator (Add Awakened Draconium to Required Fluids) -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')) - .researchWithoutRecipe("1xmetaitem.field.generator.luv@207", metaitem('tool.dataorb')) - .duration(600).EUt(24000) - .buildAndRegister() +import static gregtech.api.GTValues.* + +// ZPM Field Generator +mods.gregtech.assembly_line.changeByOutput([metaitem('field.generator.zpm')], null) + .forEach { ChangeRecipeBuilder builder -> + builder.builder { AssemblyLineRecipeBuilder recipe -> + recipe.fluidInputs(fluid('awakened_draconium') * 1296) + }.copyProperties(ResearchProperty.instance) + .replaceAndRegister() + } + +// UV Field Generator (HM Only) +if (LabsModeHelper.expert) { + mods.gregtech.assembly_line.changeByOutput([metaitem('field.generator.uv')], null) + .forEach { ChangeRecipeBuilder builder -> + builder.builder { AssemblyLineRecipeBuilder recipe -> + recipe.fluidInputs(fluid('taranium') * 288) + }.copyProperties(ResearchProperty.instance) + .replaceAndRegister() + } +} // Dark Soularium Jetplate mods.gregtech.assembly_line.recipeBuilder() @@ -16,7 +32,7 @@ mods.gregtech.assembly_line.recipeBuilder() .fluidInputs(fluid('soldering_alloy') * 1152) .outputs(item('simplyjetpacks:itemjetpack', 9)) .stationResearch(b -> b.researchStack(item('simplyjetpacks:metaitemmods', 11)).CWUt(16)) - .duration(3000).EUt(30720) + .duration(3000).EUt(VA[LuV]) .buildAndRegister() // Flux-Infused Jetplate @@ -27,7 +43,7 @@ mods.gregtech.assembly_line.recipeBuilder() .fluidInputs(fluid('soldering_alloy') * 1152) .outputs(item('simplyjetpacks:itemjetpack', 18)) .stationResearch(b -> b.researchStack(item('simplyjetpacks:metaitemmods', 30)).CWUt(16)) - .duration(3000).EUt(30720) + .duration(3000).EUt(VA[LuV]) .buildAndRegister() // Rotary Hearth Furnace @@ -38,7 +54,7 @@ if (LabsModeHelper.normal) { .outputs(metaitem('gcym:mega_blast_furnace')) .changeRecycling() .stationResearch(b -> b.researchStack(metaitem('electric_blast_furnace')).CWUt(16)) - .duration(1200).EUt(30720) + .duration(1200).EUt(VA[LuV]) .buildAndRegister() } else { mods.gregtech.assembly_line.recipeBuilder() @@ -46,8 +62,8 @@ if (LabsModeHelper.normal) { .fluidInputs(fluid('soldering_alloy') * 1152) .outputs(metaitem('gcym:mega_blast_furnace')) .changeRecycling() - .stationResearch(b -> b.researchStack(metaitem('electric_blast_furnace')).CWUt(128).EUt(1966080)) - .duration(1200).EUt(491520) + .stationResearch(b -> b.researchStack(metaitem('electric_blast_furnace')).CWUt(128).EUt(VA[UHV])) + .duration(1200).EUt(VA[UV]) .buildAndRegister() } @@ -59,7 +75,7 @@ if (LabsModeHelper.normal) { .outputs(metaitem('gcym:mega_vacuum_freezer')) .changeRecycling() .stationResearch(b -> b.researchStack(metaitem('vacuum_freezer')).CWUt(16)) - .duration(1200).EUt(30720) + .duration(1200).EUt(VA[LuV]) .buildAndRegister() } else { mods.gregtech.assembly_line.recipeBuilder() @@ -67,8 +83,8 @@ if (LabsModeHelper.normal) { .fluidInputs(fluid('soldering_alloy') * 1152) .outputs(metaitem('gcym:mega_vacuum_freezer')) .changeRecycling() - .stationResearch(b -> b.researchStack(metaitem('vacuum_freezer')).CWUt(128).EUt(1966080)) - .duration(1200).EUt(491520) + .stationResearch(b -> b.researchStack(metaitem('vacuum_freezer')).CWUt(128).EUt(VA[UHV] )) + .duration(1200).EUt(VA[UV]) .buildAndRegister() } @@ -78,7 +94,7 @@ mods.gregtech.assembly_line.recipeBuilder() .fluidInputs(fluid('soldering_alloy') * 1152, fluid('omnium') * 32) .outputs(metaitem('nomilabs:naquadah_reactor_1')) .stationResearch(b -> b.researchStack(metaitem('boltNaquadah')).CWUt(16)) - .duration(1500).EUt(122880) + .duration(1500).EUt(VA[ZPM]) .buildAndRegister() // Naquadah Reactor 2 @@ -86,8 +102,8 @@ 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('nomilabs:naquadah_reactor_2')) - .stationResearch(b -> b.researchStack(metaitem('nomilabs:naquadah_reactor_1')).CWUt(64).EUt(122880)) - .duration(1500).EUt(122880) + .stationResearch(b -> b.researchStack(metaitem('nomilabs:naquadah_reactor_1')).CWUt(64).EUt(VA[UV])) + .duration(1500).EUt(VA[ZPM]) .buildAndRegister() // Universal Navigator @@ -95,16 +111,16 @@ mods.gregtech.assembly_line.recipeBuilder() .inputs(metaitem('nomilabs:frameMicroversium'), metaitem('nomilabs: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('nomilabs:universalnavigator')) - .stationResearch(b -> b.researchStack(item('nomilabs:stellarcreationdata')).CWUt(96).EUt(491520)) - .duration(6000).EUt(491520) + .stationResearch(b -> b.researchStack(item('nomilabs:stellarcreationdata')).CWUt(96).EUt(VA[UV])) + .duration(6000).EUt(VA[UV]) .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) + .stationResearch(b -> b.researchStack(item('draconicevolution:dragon_heart')).CWUt(96).EUt(VA[UV])) + .duration(600).EUt(VA[UV]) .buildAndRegister() // Reactor Stabilizer Rotor Assembly @@ -112,8 +128,8 @@ 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('nomilabs:gearAwakenedDraconium')).CWUt(96).EUt(491520)) - .duration(600).EUt(491520) + .stationResearch(b -> b.researchStack(metaitem('nomilabs:gearAwakenedDraconium')).CWUt(96).EUt(VA[UV])) + .duration(600).EUt(VA[UV]) .buildAndRegister() // Reactor Stabilizer Focus Ring @@ -121,8 +137,8 @@ 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('nomilabs:ringAwakenedDraconium')).CWUt(96).EUt(491520)) - .duration(600).EUt(491520) + .stationResearch(b -> b.researchStack(metaitem('nomilabs:ringAwakenedDraconium')).CWUt(96).EUt(VA[UV])) + .duration(600).EUt(VA[UV]) .buildAndRegister() // Reactor Stabilizer Frame @@ -130,8 +146,8 @@ 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('nomilabs:frameAwakenedDraconium')).CWUt(96).EUt(491520)) - .duration(750).EUt(491520) + .stationResearch(b -> b.researchStack(metaitem('nomilabs:frameAwakenedDraconium')).CWUt(96).EUt(VA[UV])) + .duration(750).EUt(VA[UV]) .buildAndRegister() // Simulation Supercomputer @@ -140,19 +156,7 @@ if (LabsModeHelper.normal) { .inputs(item('gcym:large_multiblock_casing', 11), ore('plateTrinaquadalloy') * 6, item('deepmoblearning:simulation_chamber') * 4, item('nomilabs: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('nomilabs:dme_sim_chamber')) - .stationResearch(b -> b.researchStack(item('deepmoblearning:simulation_chamber')).CWUt(128).EUt(1966080)) - .duration(1200).EUt(1966080) - .buildAndRegister() -} - -// UV Field Generator (Hard mode only) -if (LabsModeHelper.expert) { - mods.gregtech.assembly_line.removeByOutput([metaitem('field.generator.uv')], null, null, null) - 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')) - .researchWithoutRecipe("1xmetaitem.field.generator.zpm@208", metaitem('tool.datamodule')) - .duration(600).EUt(100000) + .stationResearch(b -> b.researchStack(item('deepmoblearning:simulation_chamber')).CWUt(128).EUt(VA[UHV])) + .duration(1200).EUt(VA[UHV]) .buildAndRegister() } diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy index ad2c8a8..5765934 100755 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Late-Game/lategame.groovy @@ -43,14 +43,12 @@ if (LabsModeHelper.normal) { ]) // Computer Casing - mods.gregtech.assembler.removeByOutput([item('gregtech:computer_casing')], null, null, null) - mods.gregtech.assembler.recipeBuilder() .inputs(metaitem('frameIridium'), metaitem('plateIridium') * 6, ore('circuitLuv') * 2, metaitem('wireFineCobalt') * 64, metaitem('wireFineCopper') * 64, metaitem('wireGtSingleVanadiumGallium') * 4) .outputs(item('gregtech:computer_casing') * 4) .changeRecycling() .duration(400).EUt(VA[LuV]) - .buildAndRegister() + .replace().buildAndRegister() } // UHV Batbufs @@ -75,16 +73,17 @@ createRecipe(metaitem('charger.uhv'), [ // HM Ore Drilling Plants if (LabsModeHelper.expert) { - mods.gregtech.assembler.removeByOutput([metaitem('large_miner.ev')], null, null, null) - mods.gregtech.assembler.removeByOutput([metaitem('large_miner.iv')], null, null, null) - mods.gregtech.assembler.removeByOutput([metaitem('large_miner.luv')], null, null, null) + // Must Remove Manually as RecipeMap changed + mods.gregtech.assembler.removeByOutput([metaitem('large_miner.iv')], null) + mods.gregtech.assembler.removeByOutput([metaitem('large_miner.luv')], null) mods.gregtech.assembler.recipeBuilder() .inputs(metaitem('hull.iv')) .inputWildNBT(item('redstonearsenal:tool.pickaxe_flux')) .inputs(item('nomilabs:t3laser') * 12, metaitem('frameStainlessSteel') * 12, metaitem('sensor.iv') * 6, metaitem('conveyor.module.iv') * 12, metaitem('fluid.regulator.iv') * 12, metaitem('gearTungstenSteel') * 12) .outputs(metaitem('large_miner.ev')) - .duration(400).EUt(VA[IV]).buildAndRegister() + .duration(400).EUt(VA[IV]) + .replace().buildAndRegister() mods.gregtech.assembly_line.recipeBuilder() .inputs(metaitem('hull.zpm')) @@ -95,7 +94,8 @@ if (LabsModeHelper.expert) { .fluidInputs(fluid('concrete') * 2304) .outputs(metaitem('large_miner.iv')) .stationResearch(b -> b.researchStack(metaitem('large_miner.ev')).CWUt(16)) - .duration(800).EUt(VA[ZPM]).buildAndRegister() + .duration(800).EUt(VA[ZPM]) + .buildAndRegister() mods.gregtech.assembly_line.recipeBuilder() .inputs(metaitem('hull.uhv')) @@ -104,7 +104,8 @@ if (LabsModeHelper.expert) { .fluidInputs(fluid('concrete') * 2304, fluid('taranium') * 576) .outputs(metaitem('large_miner.luv')) .stationResearch(b -> b.researchStack(metaitem('large_miner.iv')).CWUt(128)) - .duration(800).EUt(VA[UHV]).buildAndRegister() + .duration(800).EUt(VA[UHV]) + .buildAndRegister() } // World Accelerator HV diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Mid-Game/midgame.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Mid-Game/midgame.groovy index aa14d9e..031f400 100755 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Mid-Game/midgame.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Mid-Game/midgame.groovy @@ -17,6 +17,5 @@ mods.gregtech.centrifuge.recipeBuilder() .chancedOutput(metaitem('dustCerium'), 625, 100) .chancedOutput(metaitem('dustYttrium'), 625, 100) .chancedOutput(metaitem('dustLanthanum'), 625, 100) - .duration(64) - .EUt(VA[LV]) + .duration(64).EUt(VA[LV]) .buildAndRegister() diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/blastFurnace.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/blastFurnace.groovy index 838c8c3..42f664b 100755 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/blastFurnace.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/blastFurnace.groovy @@ -1,117 +1,76 @@ +import com.nomiceu.nomilabs.groovy.ChangeRecipeBuilder import com.nomiceu.nomilabs.util.LabsModeHelper +import gregtech.api.recipes.RecipeBuilder +import gregtech.api.recipes.ingredients.GTRecipeInput +import gregtech.api.recipes.recipeproperties.TemperatureProperty +import net.minecraft.item.ItemStack +import net.minecraftforge.fluids.FluidStack -import static gregtech.api.GTValues.* +// Lumium +mods.gregtech.alloy_blast_smelter.changeByOutput(null, [fluid('molten.lumium')]) + .forEach { ChangeRecipeBuilder builder -> + builder.builder { RecipeBuilder recipe -> + recipe.inputs(item('extendedcrafting:material', 7) * 2, ore('clathrateGlowstone')) // Luminessence + .fluidInputs(fluid('mana') * 1000) + }.changeCircuitMeta { meta -> meta + 2 } + .copyProperties(TemperatureProperty.instance) + .replaceAndRegister() + } -// Signalum (Adds Redstone Clathrate) -mods.gregtech.alloy_blast_smelter.removeByOutput(null, [fluid('molten.signalum')], null, null) +// Signalum +mods.gregtech.alloy_blast_smelter.changeByOutput(null, [fluid('molten.signalum')]) + .forEach { ChangeRecipeBuilder builder -> + builder.builder { RecipeBuilder recipe -> + recipe.inputs(ore('clathrateRedstone')) + .fluidInputs(fluid('mana') * 1000) + }.changeCircuitMeta { meta -> meta + 1 } + .copyProperties(TemperatureProperty.instance) + .replaceAndRegister() + } -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs(metaitem('dustAnnealedCopper') * 4, metaitem('nomilabs:dustArdite') * 2, metaitem('dustRedAlloy') * 2, item('thermalfoundation:material', 893)) - .fluidInputs(fluid('mana') * 1000, fluid('helium') * 800) - .circuitMeta(14) - .fluidOutputs(fluid('molten.signalum') * 576) - .property('temperature', 4000) - .duration(5628) - .EUt(VA[IV]) - .buildAndRegister() +// Enderium +mods.gregtech.alloy_blast_smelter.changeByOutput(null, [fluid('molten.enderium')]) + .forEach { ChangeRecipeBuilder builder -> + builder.builder { RecipeBuilder recipe -> + recipe.inputs(ore('clathrateEnder')) + .fluidInputs(fluid('mana') * 1000) + }.changeCircuitMeta { meta -> meta + 1 } + .copyProperties(TemperatureProperty.instance) + .replaceAndRegister() + } -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs(metaitem('dustAnnealedCopper') * 4, metaitem('nomilabs:dustArdite') * 2, metaitem('dustRedAlloy') * 2, item('thermalfoundation:material', 893)) - .fluidInputs(fluid('mana') * 1000) - .circuitMeta(4) - .fluidOutputs(fluid('molten.signalum') * 576) - .property('temperature', 4000) - .duration(8400) - .EUt(VA[IV]) - .buildAndRegister() - -// Lumium (Adds Energized Clathrate & Luminessence) -mods.gregtech.alloy_blast_smelter.removeByOutput(null, [fluid('molten.lumium')], null, null) - -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs(metaitem('dustTinAlloy') * 4, metaitem('dustSterlingSilver') * 2, item('extendedcrafting:material', 7) * 2, item('thermalfoundation:material', 894)) - .fluidInputs(fluid('mana') * 1000, fluid('helium') * 600) - .circuitMeta(14) - .fluidOutputs(fluid('molten.lumium') * 576) - .property('temperature', 4500) - .duration(4824) - .EUt(VA[IV]) - .buildAndRegister() - -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs(metaitem('dustTinAlloy') * 4, metaitem('dustSterlingSilver') * 2, item('extendedcrafting:material', 7) * 2, item('thermalfoundation:material', 894)) - .fluidInputs(fluid('mana') * 1000) - .circuitMeta(4) - .fluidOutputs(fluid('molten.lumium') * 576) - .property('temperature', 4500) - .duration(7200) - .EUt(VA[IV]) - .buildAndRegister() - -// Enderium (Adds Resonant Clathrate) -mods.gregtech.alloy_blast_smelter.removeByOutput(null, [fluid('molten.enderium')], null, null) - -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs(metaitem('dustLead') * 4, metaitem('dustPlatinum') * 2, metaitem('dustBlueSteel'), metaitem('dustOsmium'), item('thermalfoundation:material', 895)) - .fluidInputs(fluid('mana') * 1000, fluid('krypton') * 80) - .circuitMeta(15) - .fluidOutputs(fluid('molten.enderium') * 576) - .property('temperature', 6400) - .duration(6432) - .EUt(VA[LuV]) - .buildAndRegister() - -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs(metaitem('dustLead') * 4, metaitem('dustPlatinum') * 2, metaitem('dustBlueSteel'), metaitem('dustOsmium'), item('thermalfoundation:material', 895)) - .fluidInputs(fluid('mana') * 1000) - .circuitMeta(5) - .fluidOutputs(fluid('molten.enderium') * 576) - .property('temperature', 6400) - .duration(9600) - .EUt(VA[LuV]) - .buildAndRegister() - -// Fluxed Electrum (Adds Mana Dust) -mods.gregtech.alloy_blast_smelter.removeByOutput(null, [fluid('electrum_flux')], null, null) - -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs([metaitem('dustElectrum') * 6, metaitem('nomilabs:dustLumium'), metaitem('nomilabs:dustSignalum'), ore('dustMana')]) - .fluidInputs(fluid('nitrogen') * 8000) - .fluidOutputs(fluid('electrum_flux') * 1296) - .circuitMeta(14) - .property('temperature', 1100) - .duration(6432) - .EUt(VA[EV]) - .buildAndRegister() - -mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs([metaitem('dustElectrum') * 6, metaitem('nomilabs:dustLumium'), metaitem('nomilabs:dustSignalum'), ore('dustMana')]) - .fluidOutputs(fluid('electrum_flux') * 1296) - .circuitMeta(4) - .property('temperature', 1100) - .duration(9600) - .EUt(VA[EV]) - .buildAndRegister() +// Fluxed Electrum +mods.gregtech.alloy_blast_smelter.changeByOutput(null, [fluid('electrum_flux')]) + .forEach { ChangeRecipeBuilder builder -> + builder.builder {RecipeBuilder recipe -> + recipe.inputs(ore('dustMana')) + }.changeCircuitMeta { meta -> meta + 1 } + .copyProperties(TemperatureProperty.instance) + .replaceAndRegister() + } if (LabsModeHelper.normal) { - mods.gregtech.alloy_blast_smelter.removeByOutput(null, [fluid('red_alloy')], null, null) - - mods.gregtech.alloy_blast_smelter.recipeBuilder() - .inputs(ore('dustCopper') * 2, item('minecraft:redstone') * 3) - .circuitMeta(2) - .property('temperature', 1400) - .fluidOutputs(fluid('red_alloy') * 288) - .duration(75) - .EUt(VH[LV]) - .buildAndRegister() + // Red Alloy (Increases Output) + mods.gregtech.alloy_blast_smelter.changeByOutput(null, [fluid('red_alloy')]) + .forEach { ChangeRecipeBuilder builder -> + builder.clearCircuitMeta() + .changeEachFluidOutput { FluidStack fluid -> + fluid.amount *= 2 + return fluid + } + .builder { RecipeBuilder recipe -> + recipe.clearInputs() + .inputs(ore('dustCopper') * 2, item('minecraft:redstone') * 3) + .circuitMeta(2) + }.replaceAndRegister() + } // Red Alloy has DISABLE DECOMPOSITION flag, so we need to replace it ourselves - mods.gregtech.centrifuge.removeByInput([metaitem('dustRedAlloy')], null) - - mods.gregtech.centrifuge.recipeBuilder() - .inputs(metaitem('dustRedAlloy') * 2) - .outputs(item('minecraft:redstone') * 3, metaitem('dustCopper') * 2) - .duration(45) - .EUt(VA[LV]) - .buildAndRegister() + mods.gregtech.centrifuge.changeByInput([metaitem('dustRedAlloy')], null) + .changeEachInput { GTRecipeInput input -> + return input.copyWithAmount(2) + }.builder { RecipeBuilder recipe -> + recipe.clearOutputs() + .outputs(item('minecraft:redstone') * 3, metaitem('dustCopper') * 2) + }.replaceAndRegister() } diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/diodes.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/diodes.groovy index 80996c8..62267ea 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/diodes.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/diodes.groovy @@ -33,7 +33,6 @@ void replaceRecipe(int minTier, int maxTier, IIngredient oreDict) { // Direct call to MetaTileEntity def diode = callInstanceMethodOfClass(MetaTileEntity.class, MetaTileEntities.DIODES[tier], "getStackForm", null) - crafting.removeByOutput(diode) crafting.shapedBuilder() .output(diode) .matrix("CDC", "DHD", "PDP") @@ -41,7 +40,7 @@ void replaceRecipe(int minTier, int maxTier, IIngredient oreDict) { .key('D', oreDict) .key('P', plate) .key('C', cable) - .register() + .replace().register() } } diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy index 6294005..664bcc4 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy @@ -1,4 +1,6 @@ +import com.cleanroommc.groovyscript.api.IIngredient import com.jaquadro.minecraft.storagedrawers.api.storage.attribute.IFrameable +import com.nomiceu.nomilabs.groovy.ShapedDummyRecipe import com.nomiceu.nomilabs.util.ItemMeta import net.minecraft.item.Item import net.minecraft.item.ItemStack @@ -39,11 +41,21 @@ for (ItemStack stack : items) { for (boolean front : [true, false]) { def recipeName = getRecipeName(stack, trim, front) def recipeStack = addNBT(stack, trim, front) - crafting.addShaped(recipeName, recipeStack, [ - [item("xtones:zane"), trim ? item("extendedcrafting:storage", 4) : null, null], - [front ? item("xtones:zane", 15) : null, stack, null], - [null, null, null] - ]) + + crafting.shapedBuilder() + .name(recipeName) + .output(recipeStack) + .matrix( + 'ST ', + 'FS ', + ' ') + .key('S', item("xtones:zane")) + .key('T', trim ? item("extendedcrafting:storage", 4) : IIngredient.EMPTY) + .key('F', front ? item("xtones:zane", 15) : IIngredient.EMPTY) + .key('S', stack) + .recipeClassFunction((output, width, height, ingredients) -> new ShapedDummyRecipe(output, ingredients, width, height, false)) + .register() + addRecipeOutputTooltip(recipeStack, resource(recipeName), ItemMeta.compare(tool, recipeStack) ? translatable("nomiceu.tooltip.labs.hand_framing.tool") : diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/materialChanges.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/materialChanges.groovy index ccd0186..b72e7f0 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/materialChanges.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/materialChanges.groovy @@ -10,16 +10,16 @@ material('rhodium_plated_palladium') .changeChemicalFormula() .change() +/* Black Steel */ + // Can't use change composition to remove, as that is only performed at the end of running scripts, and if not removed, conflicts will occur. // TODO Make this use change composition when that accepts non-material Item Stacks -/* Black Steel */ - // Remove ABS Recipes -mods.gregtech.alloy_blast_smelter.removeByOutput(null, [fluid('black_steel')], null, null) +mods.gregtech.alloy_blast_smelter.removeByOutput(null, [fluid('black_steel')]) // Remove Mixer Recipes -mods.gregtech.mixer.removeByOutput([metaitem('dustBlackSteel')], null, null, null) +mods.gregtech.mixer.removeByOutput([metaitem('dustBlackSteel')], null) // Remove Decomp Recipe mods.gregtech.centrifuge.removeByInput([metaitem('dustBlackSteel')], null) @@ -28,7 +28,7 @@ mods.gregtech.centrifuge.removeByInput([metaitem('dustBlackSteel')], null) mods.gregtech.mixer.recipeBuilder() .inputs(metaitem('dustSteel') * 3, metaitem('dustBlackBronze') * 2, item('actuallyadditions:item_crystal', 3) * 2, item('extrautils2:ingredients', 4) * 2) .outputs(metaitem('dustBlackSteel') * 9) - .EUt(VHA[LV]).duration(200) + .duration(200).EUt(VHA[LV]) .buildAndRegister() /* Black Steel Shortcut */ @@ -37,15 +37,14 @@ mods.gregtech.mixer.recipeBuilder() mods.gregtech.mixer.recipeBuilder() .inputs(metaitem('dustSteel') * 15, metaitem('dustCopper') * 6, metaitem('dustGold') * 2, metaitem('dustSilver') * 2, item('actuallyadditions:item_crystal', 3) * 10, item('extrautils2:ingredients', 4) * 10) .outputs(metaitem('dustBlackSteel') * 45) - .EUt(VHA[HV]).duration(375) + .duration(375).EUt(VHA[HV]) .buildAndRegister() // Decomp Recipe mods.gregtech.centrifuge.recipeBuilder() .inputs(metaitem('dustBlackSteel') * 9) .outputs(metaitem('dustSteel') * 3, metaitem('dustBlackBronze') * 2, item('actuallyadditions:item_crystal', 3) * 2, item('extrautils2:ingredients', 4) * 2) - .EUt(VA[LV] * 2) - .duration(480) + .duration(480).EUt(VA[LV] * 2) .buildAndRegister() // Change Chem Formula diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy index 2385be6..0b42421 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/tooltips.groovy @@ -8,7 +8,7 @@ import net.minecraft.item.ItemStack import static com.nomiceu.nomilabs.groovy.GroovyHelpers.TooltipHelpers.* import static com.nomiceu.nomilabs.groovy.GroovyHelpers.TranslationHelpers.* -import classes.postInit.EioPrefixes +import classes.postInit.Common /* Actually Additions */ @@ -111,15 +111,21 @@ addTooltip(item('appliedenergistics2:material', 12), translatable('nomiceu.toolt // Charged Certus addTooltip(item('appliedenergistics2:material', 1), translatable('nomiceu.tooltip.ae2.charged_certus')) -// P2P Tunnels -addTooltip(item('appliedenergistics2:part', 460), translatable('nomiceu.tooltip.ae2.p2p_me')) -addTooltip(item('appliedenergistics2:part', 469), translatable('nomiceu.tooltip.ae2.p2p_rf')) -addTooltip(item('appliedenergistics2:part', 463), translatable('nomiceu.tooltip.ae2.p2p_fluid')) -addTooltip(item('appliedenergistics2:part', 462), translatable('nomiceu.tooltip.ae2.p2p_item')) -addTooltip(item('appliedenergistics2:part', 467), translatable('nomiceu.tooltip.ae2.p2p_light')) -addTooltip(item('appliedenergistics2:part', 461), translatable('nomiceu.tooltip.ae2.p2p_redstone')) -addTooltip(item('appliedenergistics2:part', 470), translatable('nomiceu.tooltip.ae2.p2p_eu')) -addTooltip(item('nae2:part', 1), translatable('nomiceu.tooltip.ae2.p2p_interface')) +/* P2P Tunnels */ + +// ME P2P (Special) +// Add a new line after its unique tooltip so it is easier to read the global p2p tooltip +addTooltip(Common.meP2p, [ + translatable('nomiceu.tooltip.ae2.p2p.me'), + translatableEmpty(), + translatable("nomiceu.tooltip.ae2.p2p.desc"), +]) + +// Global P2P +for (ItemStack item : Common.p2pVariants) { + addTooltip(item, translatable("nomiceu.tooltip.ae2.p2p.desc")) +} + // Dense Cables, Conduits, and Controller // Only apply tooltip if channels not enabled (manually, by players) @@ -247,7 +253,7 @@ addTooltip(metaitem('cover.facade'), [ // Glasses addTooltip(item('enderio:block_fused_glass'), translatable('tooltip.fused_glass.make')) -for (ItemStack stack in EioPrefixes.getAllItems()) { +for (ItemStack stack in Common.eioGlasses) { addTooltip(stack, translatable('tooltip.eio_glass.dye')) } diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy index fc78577..6b46f53 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/items.groovy @@ -4,7 +4,6 @@ import static gregtech.api.GTValues.* /* Usable Items */ // Meteorite Compass -crafting.removeByOutput(item('appliedenergistics2:sky_compass')) crafting.shapedBuilder() .output(item('appliedenergistics2:sky_compass')) .matrix( @@ -256,7 +255,8 @@ mods.gregtech.circuit_assembler.recipeBuilder() .inputs(ore('circuitEv'), metaitem('plate.nand_memory_chip') * 8, metaitem('wireFineElectrum') * 16, item('appliedenergistics2:part', 16) * 2) .fluidInputs(fluid('soldering_alloy') * 288) .outputs(item('appliedenergistics2:material', 22) * 16) - .duration(400).EUt(VA[IV]).buildAndRegister(); + .duration(400).EUt(VA[IV]) + .buildAndRegister(); // Calculation Processor mods.gregtech.circuit_assembler.recipeBuilder() @@ -270,7 +270,8 @@ mods.gregtech.circuit_assembler.recipeBuilder() .inputs(ore('circuitEv'), metaitem('plate.nor_memory_chip') * 8, metaitem('wireFineElectrum') * 16, item('appliedenergistics2:part', 16) * 2) .fluidInputs(fluid('soldering_alloy') * 288) .outputs(item('appliedenergistics2:material', 24) * 16) - .duration(400).EUt(VA[IV]).buildAndRegister(); + .duration(400).EUt(VA[IV]) + .buildAndRegister(); // Purified AE2 Crystal Shortcut mods.gregtech.autoclave.recipeBuilder() @@ -278,26 +279,30 @@ mods.gregtech.autoclave.recipeBuilder() .inputs(ore('dustCertusQuartz') * 64) .fluidInputs(fluid('distilled_water') * 8000) .outputs(item('appliedenergistics2:material', 10) * 64, item('appliedenergistics2:material', 10) * 64) - .duration(2560).EUt(VA[EV]).buildAndRegister(); + .duration(2560).EUt(VA[EV]) + .buildAndRegister(); mods.gregtech.autoclave.recipeBuilder() .notConsumable(item('appliedenergistics2:crystal_seed', 1200)) .inputs(ore('dustFluix') * 64) .fluidInputs(fluid('distilled_water') * 8000) .outputs(item('appliedenergistics2:material', 12) * 64, item('appliedenergistics2:material', 12) * 64) - .duration(2560).EUt(VA[EV]).buildAndRegister(); + .duration(2560).EUt(VA[EV]) + .buildAndRegister(); mods.gregtech.autoclave.recipeBuilder() .notConsumable(item('appliedenergistics2:crystal_seed', 600)) .inputs(ore('dustNetherQuartz') * 64) .fluidInputs(fluid('distilled_water') * 8000) .outputs(item('appliedenergistics2:material', 11) * 64, item('appliedenergistics2:material', 11) * 64) - .duration(2560).EUt(VA[EV]).buildAndRegister(); + .duration(2560).EUt(VA[EV]) + .buildAndRegister(); // Fluix + Charged Certus Shortcut mods.gregtech.autoclave.recipeBuilder() .inputs(ore('dustCertusQuartz') * 8, ore('dustNetherQuartz') * 8) .fluidInputs(fluid('redstone') * 1152) .outputs(item('appliedenergistics2:material', 7) * 16) - .duration(160).EUt(VA[EV]).buildAndRegister(); + .duration(160).EUt(VA[EV]) + .buildAndRegister(); diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/p2p.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/p2p.groovy new file mode 100644 index 0000000..74a3240 --- /dev/null +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/p2p.groovy @@ -0,0 +1,22 @@ +import classes.postInit.Common +import com.cleanroommc.groovyscript.helper.ingredient.OreDictIngredient + +import static gregtech.api.GTValues.* + +// Create an OreDict for P2Ps +OreDictIngredient p2pOre = ore('ae2P2ps') +p2pOre.add(Common.meP2p) +p2pOre.add(Common.p2pVariants) + +// Crafting Recipe: Shapeless, Any P2P (Ore Dict) -> ME P2P +crafting.addShapeless(Common.meP2p, [p2pOre]) + +// Assembler Recipes: Any P2P (Ore Dict) + Circuit -> Variant of P2P (Excluding ME) +for (int i : 0..Common.p2pVariants.size() - 1) { + mods.gregtech.assembler.recipeBuilder() + .inputs(p2pOre) + .circuitMeta(i + 1) + .outputs(Common.p2pVariants[i]) + .duration(10).EUt(VA[LV]) + .buildAndRegister() +} diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/eio.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/eio.groovy index df600f4..41f47bc 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/eio.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/eio.groovy @@ -1,10 +1,10 @@ import net.minecraft.item.ItemStack -import classes.postInit.EioPrefixes +import classes.postInit.Common -/* Cleanup EIO Glasses in JEI +/* Cleanup EIO Glasses in JEI, removing the dyed versions of each variant of glass * Since we are lazy, remove all, then add back the original */ -for (var stack in EioPrefixes.getAllItems()) { +for (var stack in Common.eioGlasses) { mods.jei.ingredient.hide(new ItemStack(stack.getItem(), 1, Short.MAX_VALUE)) mods.jei.ingredient.add(stack.copy()) } diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nuclearcraft.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nuclearcraft.groovy index 118ae4f..b9f5f31 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nuclearcraft.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nuclearcraft.groovy @@ -1,8 +1,13 @@ +import nc.enumm.MetaEnums import com.cleanroommc.groovyscript.helper.ingredient.OreDictIngredient import net.minecraft.item.ItemStack import net.minecraftforge.fluids.FluidStack import static gregtech.api.GTValues.* +import static com.nomiceu.nomilabs.groovy.NCActiveCoolerHelper.changeCoolerRecipe + +// Change Active Cooler Recipe from NC Helium -> GT Liquid Helium +changeCoolerRecipe(fluid('liquid_helium'), MetaEnums.CoolerType.HELIUM) // Replace Cooler Crafting Recipes with Canner Recipes def replaceCannerRecipe = (ItemStack cooler, FluidStack fluid) -> { diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Expert-Mode/stabilizedMiners.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Expert-Mode/stabilizedMiners.groovy index 4d746e5..e7bac06 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Expert-Mode/stabilizedMiners.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Expert-Mode/stabilizedMiners.groovy @@ -1,4 +1,5 @@ import com.nomiceu.nomilabs.util.LabsModeHelper +import net.minecraft.item.ItemStack import static gregtech.api.GTValues.* @@ -20,5 +21,6 @@ void createStabilizedMinerRecipe(ItemStack nonStab, ItemStack stab) { .inputs(nonStab, item('nomilabs:heartofauniverse'), item('draconicevolution:chaos_shard') * 4, metaitem('field.generator.uv') * 24, metaitem('plateDenseIridium') * 7, metaitem('plateDenseIridium') * 7, metaitem('plateDenseIridium') * 7, metaitem('plateDenseIridium') * 7) .fluidInputs(fluid('rocket_fuel') * 48000, fluid('omnium') * 576, fluid('neutronium') * 576) .outputs(stab) - .duration(2500).EUt(VA[UHV]).buildAndRegister() + .duration(2500).EUt(VA[UHV]) + .buildAndRegister() } diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Normal-Mode/buses.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Normal-Mode/buses.groovy index 18b9c3b..af64369 100755 --- a/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Normal-Mode/buses.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mode-Specific/Normal-Mode/buses.groovy @@ -6,12 +6,12 @@ import static com.nomiceu.nomilabs.groovy.GroovyHelpers.RecyclingHelpers.createR if (!LabsModeHelper.normal) return // Input Buses -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.ulv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.lv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.mv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.hv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.ev')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.iv')], null, null, null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.ulv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.lv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.mv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.hv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.ev')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.import.iv')], null) createRecipe(metaitem('item_bus.import.ulv'), [[ore('chest')], [metaitem('hull.ulv')]]) createRecipe(metaitem('item_bus.import.lv'), [[ore('chest')], [metaitem('hull.lv')]]) @@ -21,12 +21,12 @@ createRecipe(metaitem('item_bus.import.ev'), [[ore('chest')], [metaitem('hull.ev createRecipe(metaitem('item_bus.import.iv'), [[ore('chest')], [metaitem('hull.iv')]]) // Output Buses -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.ulv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.lv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.mv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.hv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.ev')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.iv')], null, null, null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.ulv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.lv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.mv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.hv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.ev')], null) +mods.gregtech.assembler.removeByOutput([metaitem('item_bus.export.iv')], null) createRecipe(metaitem('item_bus.export.ulv'), [[metaitem('hull.ulv')], [ore('chest')]]) createRecipe(metaitem('item_bus.export.lv'), [[metaitem('hull.lv')], [ore('chest')]]) @@ -36,12 +36,12 @@ createRecipe(metaitem('item_bus.export.ev'), [[metaitem('hull.ev')], [ore('chest createRecipe(metaitem('item_bus.export.iv'), [[metaitem('hull.iv')], [ore('chest')]]) // Input Hatches -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.ulv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.lv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.mv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.hv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.ev')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.iv')], null, null, null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.ulv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.lv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.mv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.hv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.ev')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import.iv')], null) createRecipe(metaitem('fluid_hatch.import.ulv'), [[ore('blockGlass')], [metaitem('hull.ulv')]]) createRecipe(metaitem('fluid_hatch.import.lv'), [[ore('blockGlass')], [metaitem('hull.lv')]]) @@ -51,12 +51,12 @@ createRecipe(metaitem('fluid_hatch.import.ev'), [[ore('blockGlass')], [metaitem( createRecipe(metaitem('fluid_hatch.import.iv'), [[ore('blockGlass')], [metaitem('hull.iv')]]) // Output Hatches -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.ulv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.lv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.mv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.hv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.ev')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.iv')], null, null, null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.ulv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.lv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.mv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.hv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.ev')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export.iv')], null) createRecipe(metaitem('fluid_hatch.export.ulv'), [[metaitem('hull.ulv')], [ore('blockGlass')]]) createRecipe(metaitem('fluid_hatch.export.lv'), [[metaitem('hull.lv')], [ore('blockGlass')]]) @@ -66,15 +66,15 @@ createRecipe(metaitem('fluid_hatch.export.ev'), [[metaitem('hull.ev')], [ore('bl createRecipe(metaitem('fluid_hatch.export.iv'), [[metaitem('hull.iv')], [ore('blockGlass')]]) /* 4x/9x Hatches */ -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_4x')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_4x')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_4x.iv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_4x.iv')], null, null, null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_4x')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_4x')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_4x.iv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_4x.iv')], null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_9x')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_9x')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_9x.iv')], null, null, null) -mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_9x.iv')], null, null, null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_9x')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_9x')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.import_9x.iv')], null) +mods.gregtech.assembler.removeByOutput([metaitem('fluid_hatch.export_9x.iv')], null) createRecipe(metaitem('fluid_hatch.import_4x'), [[ore('pipeQuadrupleFluidTitanium')], [metaitem('hull.ev')]]) createRecipe(metaitem('fluid_hatch.import_4x.iv'), [[ore('pipeQuadrupleFluidTungstenSteel')], [metaitem('hull.iv')]]) diff --git a/overrides/groovy/runConfig.json b/overrides/groovy/runConfig.json index 78ed13e..db1d2a6 100644 --- a/overrides/groovy/runConfig.json +++ b/overrides/groovy/runConfig.json @@ -4,23 +4,11 @@ "version": "1.0.0", "debug": false, "classes": { - "preInit": [ - "classes/preInit/" - ], - "init": [ - "classes/init" - ], "postInit": [ "classes/postInit" ] }, "loaders": { - "preInit": [ - "preInit/" - ], - "init": [ - "init/" - ], "postInit": [ "postInit/Initial", "postInit/Post-Initial", diff --git a/overrides/resources/modpack/lang/en_us.lang b/overrides/resources/modpack/lang/en_us.lang index f76ac9c..4d067e1 100644 --- a/overrides/resources/modpack/lang/en_us.lang +++ b/overrides/resources/modpack/lang/en_us.lang @@ -41,14 +41,8 @@ nomiceu.tooltip.ae2.pure_certus_quartz=§aMade in a Crystal Growth Chamber from nomiceu.tooltip.ae2.pure_nether_quartz=§aMade in a Crystal Growth Chamber from a Nether Quartz Seed.§r nomiceu.tooltip.ae2.pure_fluix=§aMade in a Crystal Growth Chamber from a Fluix Seed.§r nomiceu.tooltip.ae2.charged_certus=§bObtained by charging with RF power in the AE2 Charger, or the Energetic Infuser.§r -nomiceu.tooltip.ae2.p2p_me=§aThe basis for all other P2P Tunnels.§r -nomiceu.tooltip.ae2.p2p_rf=§aMade by right-clicking a ME P2P Tunnel with an energy conduit.§r -nomiceu.tooltip.ae2.p2p_fluid=§aMade by right-clicking a ME P2P Tunnel with a bucket.§r -nomiceu.tooltip.ae2.p2p_item=§aMade by right-clicking a ME P2P Tunnel with a chest.§r -nomiceu.tooltip.ae2.p2p_light=§aMade by right-clicking a ME P2P Tunnel with a torch.§r -nomiceu.tooltip.ae2.p2p_redstone=§aMade by right-clicking a ME P2P Tunnel with redstone.§r -nomiceu.tooltip.ae2.p2p_eu=§aMade by right-clicking a ME P2P Tunnel with any GregTech wire or cable.§r -nomiceu.tooltip.ae2.p2p_interface=§aMade by right-clicking a ME P2P Tunnel with an interface.§r +nomiceu.tooltip.ae2.p2p.me=§bThe basis for all other P2P Tunnels.§r +nomiceu.tooltip.ae2.p2p.desc=§aShift and scroll whilst holding to cycle through P2P types!§r nomiceu.tooltip.ae2.channels_not_enabled=Channels not enabled! nomiceu.tooltip.ae2.controller=§bThe ME Controller reduces your AE2 system's power consumption!§r nomiceu.tooltip.ae2.dense=§bFor decoration!§r @@ -56,6 +50,7 @@ nomiceu.tooltip.ae2.facade=§3AE2 facades can be made from most non-tile-entitie nomiceu.tooltip.ae2.crafting_storage=§ePlace this into a Crafting Grid to recycle it!§r nomiceu.tooltip.ae2.storage_cell=§eShift Right Click whilst holding this to recycle it!§r nomiceu.tooltip.ae2.quartz_knife=§eRight Click on placed ME parts to rename them... for free!§r +nomiceu.tooltip.ae2.p2p_reset_me_shapeless=§5Reset P2Ps back to ME P2Ps!§r # Dimensional Edibles nomiceu.tooltip.dimensionaledibles.island_cake.1=§aUsed by Server Owners to send FTB Teams and Individuals to their Personal Islands!§r diff --git a/overrides/scripts/Endgame.zs b/overrides/scripts/Endgame.zs index 55bbfe7..c8ec130 100644 --- a/overrides/scripts/Endgame.zs +++ b/overrides/scripts/Endgame.zs @@ -180,8 +180,6 @@ recipes.addShapeless(, []); // Assembly Line -// ZPM Field Generator * 1 -.findRecipe(24000, [, * 6, , * 2, * 2, * 64, * 64, * 4], [ * 1152]).remove(); // Moved to Groovy // Rhodium Plated Palladium -> Rhodium Plated Lumium Palladium (Moved to Groovy) diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs index 51ced8e..f68c199 100755 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -462,16 +462,6 @@ brewery.recipeBuilder() .property("cleanroom", "sterile_cleanroom") .duration(128).EUt(4).buildAndRegister(); -// Taranium in UV Fieldgen -// UV Field Generator * 1 -.findRecipe(100000, [, * 6, , * 2, * 2, * 64, * 64, * 4], [ * 1728, * 576]).remove(); - -assembly_line.recipeBuilder() - .inputs(, * 6, , * 2, * 2, * 64, * 64, * 4) - .fluidInputs( * 1728, * 576, * 288) - .outputs() - .duration(600).EUt(100000).buildAndRegister(); - // Parallel Hatches recipes.removeByRecipeName("gcym:parallel_hatch_iv"); recipes.removeByRecipeName("gcym:parallel_hatch_luv");