diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/blocks.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/blocks.groovy index 3e208b8..cacb8b7 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/blocks.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/blocks.groovy @@ -27,7 +27,7 @@ crafting.shapedBuilder() 'DPD') .key('D', metaitem('nomilabs:plateDarkSteel')) .key('P', metaitem('electric.piston.mv')) - .key('F', item('appliedenergistics2:material:7')) + .key('F', item('appliedenergistics2:material', 7)) .key('H', metaitem('hull.mv')) .replace().register() @@ -39,9 +39,9 @@ crafting.shapedBuilder() 'FLF', 'PCP') .key('P', metaitem('plateAluminium')) - .key('C', item('appliedenergistics2:material:23')) - .key('F', item('appliedenergistics2:part:16')) - .key('L', item('appliedenergistics2:material:22')) + .key('C', item('appliedenergistics2:material', 23)) + .key('F', item('appliedenergistics2:part', 16)) + .key('L', item('appliedenergistics2:material', 22)) .replace().register() // Molecular Assembler @@ -53,9 +53,9 @@ crafting.shapedBuilder() 'PGP') .key('P', metaitem('plateAluminium')) .key('G', item('appliedenergistics2:quartz_glass')) - .key('A', item('appliedenergistics2:material:44')) + .key('A', item('appliedenergistics2:material', 44)) .key('C', metaitem('workbench')) - .key('F', item('appliedenergistics2:material:43')) + .key('F', item('appliedenergistics2:material', 43)) .replace().register() // Matter Condensor @@ -100,12 +100,12 @@ crafting.shapedBuilder() 'CSF', 'DQD') .key('G', item('appliedenergistics2:quartz_glass')) - .key('P', item('appliedenergistics2:part:180')) - .key('C', item('appliedenergistics2:material:10')) + .key('P', item('appliedenergistics2:part', 180)) + .key('C', item('appliedenergistics2:material', 10)) .key('S', item('actuallyadditions:block_giant_chest')) - .key('F', item('appliedenergistics2:material:12')) + .key('F', item('appliedenergistics2:material', 12)) .key('D', ore('blockDarkSteel')) - .key('Q', item('appliedenergistics2:material:11')) + .key('Q', item('appliedenergistics2:material', 11)) .replace().register() // Quantum Ring @@ -116,8 +116,8 @@ crafting.shapedBuilder() 'EQE', 'PCP') .key('P', metaitem('plateStainlessSteel')) - .key('C', item('appliedenergistics2:material:23')) - .key('E', item('appliedenergistics2:material:24')) + .key('C', item('appliedenergistics2:material', 23)) + .key('E', item('appliedenergistics2:material', 24)) .key('Q', metaitem('quantumstar')) .replace().register() @@ -132,9 +132,9 @@ var makeInterface = { String recipeName, OreDictIngredient plate, ItemStack movi 'PPP') .key('P', plate) .key('R', moving) - .key('A', item('appliedenergistics2:material:44')) + .key('A', item('appliedenergistics2:material', 44)) .key('M', metaitem('hull.mv')) - .key('F', item('appliedenergistics2:material:43')) + .key('F', item('appliedenergistics2:material', 43)) .register() } @@ -146,27 +146,27 @@ makeInterface('appliedenergistics2:network/blocks/fluid_interfaces_interface', o /* Cables */ // Quartz Fiber -crafting.removeByOutput(item('appliedenergistics2:part:140')) +crafting.removeByOutput(item('appliedenergistics2:part', 140)) mods.gregtech.wiremill.recipeBuilder() - .inputs(item('appliedenergistics2:material:11')) - .outputs(item('appliedenergistics2:part:140') * 2) + .inputs(item('appliedenergistics2:material', 11)) + .outputs(item('appliedenergistics2:part', 140) * 2) .duration(100).EUt(VHA[LV]) .buildAndRegister() // Glass Cable -crafting.removeByOutput(item('appliedenergistics2:part:16')) +crafting.removeByOutput(item('appliedenergistics2:part', 16)) mods.gregtech.alloy_smelter.recipeBuilder() - .inputs(ore('dustFluix'), item('appliedenergistics2:part:140')) - .outputs(item('appliedenergistics2:part:16') * 2) + .inputs(ore('dustFluix'), item('appliedenergistics2:part', 140)) + .outputs(item('appliedenergistics2:part', 16) * 2) .duration(50).EUt(VHA[LV]) .buildAndRegister() // Covered Cable for (var rubber in [fluid('rubber') * 144, fluid('styrene_butadiene_rubber') * 36, fluid('silicone_rubber') * 76]) { mods.gregtech.assembler.recipeBuilder() - .inputs(item('appliedenergistics2:part:16')) + .inputs(item('appliedenergistics2:part', 16)) .fluidInputs(rubber) - .outputs(item('appliedenergistics2:part:36')) + .outputs(item('appliedenergistics2:part', 36)) .duration(100).EUt(VA[ULV]) .buildAndRegister() @@ -175,7 +175,7 @@ for (var rubber in [fluid('rubber') * 144, fluid('styrene_butadiene_rubber') * 3 // ME Conduit crafting.removeByOutput(item('enderio:item_me_conduit')) mods.gregtech.assembler.recipeBuilder() - .inputs(item('appliedenergistics2:part:36') * 3, item('enderio:item_material:4') * 6) + .inputs(item('appliedenergistics2:part', 36) * 3, item('enderio:item_material', 4) * 6) .outputs(item('enderio:item_me_conduit') * 8) .duration(100).EUt(VHA[LV]) .buildAndRegister() @@ -196,16 +196,16 @@ var makePlane = { OreDictIngredient plate, ItemStack core, ItemStack plane -> } // Formation Plane -makePlane(ore('plateAluminium'), item('appliedenergistics2:material:43'), item('appliedenergistics2:part:320')) +makePlane(ore('plateAluminium'), item('appliedenergistics2:material', 43), item('appliedenergistics2:part', 320)) // Annihilation Plane -makePlane(ore('plateAluminium'), item('appliedenergistics2:material:44'), item('appliedenergistics2:part:300')) +makePlane(ore('plateAluminium'), item('appliedenergistics2:material', 44), item('appliedenergistics2:part', 300)) // Fluid Formation Plane -makePlane(ore('plateLapis'), item('appliedenergistics2:material:43'), item('appliedenergistics2:part:321')) +makePlane(ore('plateLapis'), item('appliedenergistics2:material', 43), item('appliedenergistics2:part', 321)) // Fluid Annihilation Plane -makePlane(ore('plateLapis'), item('appliedenergistics2:material:44'), item('appliedenergistics2:part:302')) +makePlane(ore('plateLapis'), item('appliedenergistics2:material', 44), item('appliedenergistics2:part', 302)) /* Level Emitters */ var makeEmitter = { OreDictIngredient plate, ItemStack emitter -> @@ -216,59 +216,59 @@ var makeEmitter = { OreDictIngredient plate, ItemStack emitter -> 'CR') .key('T', item('minecraft:redstone_torch')) .key('P', plate) - .key('C', item('appliedenergistics2:material:23')) + .key('C', item('appliedenergistics2:material', 23)) .key('R', ore('stickStainlessSteel')) .replace().register() } // Item Emitter -makeEmitter(ore('plateAluminium'), item('appliedenergistics2:part:280')) +makeEmitter(ore('plateAluminium'), item('appliedenergistics2:part', 280)) // Fluid Emitter -makeEmitter(ore('plateLapis'), item('appliedenergistics2:part:281')) +makeEmitter(ore('plateLapis'), item('appliedenergistics2:part', 281)) /* Terminals */ // ME Terminal crafting.shapelessBuilder() - .output(item('appliedenergistics2:part:380')) + .output(item('appliedenergistics2:part', 380)) .input(ore('itemIlluminatedPanel')) .input(ore('circuitLv')) .replace().register() // Pattern Terminal crafting.shapelessBuilder() - .output(item('appliedenergistics2:part:340')) - .input(item('appliedenergistics2:material:24')) - .input(item('appliedenergistics2:part:380')) - .input(item('appliedenergistics2:material:52')) + .output(item('appliedenergistics2:part', 340)) + .input(item('appliedenergistics2:material', 24)) + .input(item('appliedenergistics2:part', 380)) + .input(item('appliedenergistics2:material', 52)) .replace().register() // Fluid Terminal crafting.shapelessBuilder() - .output(item('appliedenergistics2:part:520')) - .input(item('appliedenergistics2:part:380')) + .output(item('appliedenergistics2:part', 520)) + .input(item('appliedenergistics2:part', 380)) .input(metaitem('plateLapis')) - .input(item('appliedenergistics2:material:22')) + .input(item('appliedenergistics2:material', 22)) .replace().register() // Extended Processing Pattern Terminal crafting.shapedBuilder() - .output(item('appliedenergistics2:part:341')) + .output(item('appliedenergistics2:part', 341)) .matrix( 'A', 'B', 'C') - .key('A', item('appliedenergistics2:part:340')) + .key('A', item('appliedenergistics2:part', 340)) .key('B', ore('circuitEv')) .key('C', item('packagedauto:encoder')) .replace().register() // Configuration Fluid Interface Terminal crafting.shapelessBuilder() - .output(item('appliedenergistics2:part:522')) - .input(item('appliedenergistics2:part:520')) - .input(item('appliedenergistics2:material:24')) - .input(item('appliedenergistics2:fluid_interface').or(item('appliedenergistics2:part:441'))) + .output(item('appliedenergistics2:part', 522)) + .input(item('appliedenergistics2:part', 520)) + .input(item('appliedenergistics2:material', 24)) + .input(item('appliedenergistics2:fluid_interface').or(item('appliedenergistics2:part', 441))) .replace().register() /* Buses */ @@ -278,7 +278,7 @@ var makeImportBus = { OreDictIngredient plate, ItemStack bus -> .matrix( ' A ', 'PEP') - .key('A', item('appliedenergistics2:material:44')) + .key('A', item('appliedenergistics2:material', 44)) .key('P', plate) .key('E', metaitem('electric.piston.mv')) .replace().register() @@ -291,57 +291,57 @@ var makeExportBus = { OreDictIngredient plate, ItemStack bus -> 'PEP', ' A ') .key('P', plate) - .key('E', item('appliedenergistics2:material:43')) + .key('E', item('appliedenergistics2:material', 43)) .key('A', metaitem('electric.piston.mv')) .replace().register() } // Import Bus -makeImportBus(ore('plateAluminium'), item('appliedenergistics2:part:240')) +makeImportBus(ore('plateAluminium'), item('appliedenergistics2:part', 240)) // Fluid Import Bus -makeImportBus(ore('plateLapis'), item('appliedenergistics2:part:241')) +makeImportBus(ore('plateLapis'), item('appliedenergistics2:part', 241)) // Export Bus -makeExportBus(ore('plateAluminium'), item('appliedenergistics2:part:260')) +makeExportBus(ore('plateAluminium'), item('appliedenergistics2:part', 260)) // Fluid Export Bus -makeExportBus(ore('plateLapis'), item('appliedenergistics2:part:261')) +makeExportBus(ore('plateLapis'), item('appliedenergistics2:part', 261)) // Storage Bus crafting.shapelessBuilder() - .output(item('appliedenergistics2:part:220')) + .output(item('appliedenergistics2:part', 220)) .input(metaitem('electric.piston.mv'), item('appliedenergistics2:interface')) .replace().register() // Fluid Storage Bus crafting.shapelessBuilder() - .output(item('appliedenergistics2:part:221')) + .output(item('appliedenergistics2:part', 221)) .input(metaitem('electric.pump.mv'), item('appliedenergistics2:fluid_interface')) .replace().register() // Oredict Storage Bus crafting.shapelessBuilder() - .output(item('appliedenergistics2:part:222')) - .input(item('appliedenergistics2:part:220'), metaitem('ore_dictionary_filter')) + .output(item('appliedenergistics2:part', 222)) + .input(item('appliedenergistics2:part', 220), metaitem('ore_dictionary_filter')) /* Misc Block Parts */ // P2P Tunnel crafting.shapedBuilder() - .output(item('appliedenergistics2:part:460')) + .output(item('appliedenergistics2:part', 460)) .matrix( ' P ', 'PEP', 'FFF') .key('P', metaitem('plateStainlessSteel')) - .key('E', item('appliedenergistics2:material:24')) + .key('E', item('appliedenergistics2:material', 24)) .key('F', ore('plateFluix')) .replace().register() // Illuminated Panel crafting.remove('appliedenergistics2:network/parts/panels_semi_dark_monitor') crafting.shapedBuilder() - .output(item('appliedenergistics2:part:180')) + .output(item('appliedenergistics2:part', 180)) .matrix( 'GGG', 'PPP') @@ -350,7 +350,7 @@ crafting.shapedBuilder() .register() // Cable Anchor -crafting.addShapeless(item('appliedenergistics2:part:120'), [ore('boltSteel')]) +crafting.addShapeless(item('appliedenergistics2:part', 120), [ore('boltSteel')]) /* Misc Blocks */ // Vibrant Quartz Glass 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 6d56aed..fc78577 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 @@ -1,3 +1,5 @@ +import com.nomiceu.nomilabs.util.LabsModeHelper + import static gregtech.api.GTValues.* /* Usable Items */ @@ -9,15 +11,15 @@ crafting.shapedBuilder() 'VPV', 'PCP', 'VPV') - .key('V', item('actuallyadditions:item_crystal:3')) + .key('V', item('actuallyadditions:item_crystal', 3)) .key('P', metaitem('nomilabs:plateDarkSteel')) - .key('C', item('appliedenergistics2:material:1')) + .key('C', item('appliedenergistics2:material', 1)) .replace().register() // Memory Card crafting.shapelessBuilder() .output(item('appliedenergistics2:memory_card')) - .input(item('appliedenergistics2:material:25')) + .input(item('appliedenergistics2:material', 25)) .input(ore('circuitHv')) .replace().register() @@ -30,7 +32,7 @@ crafting.shapelessBuilder() /* Materials */ // Pattern crafting.shapedBuilder() - .output(item('appliedenergistics2:material:52') * 8) + .output(item('appliedenergistics2:material', 52) * 8) .matrix( 'WWW', 'PCP', @@ -42,51 +44,51 @@ crafting.shapedBuilder() // Fluix Plate mods.gregtech.compressor.recipeBuilder() - .inputs(item('appliedenergistics2:material:7')) + .inputs(item('appliedenergistics2:material', 7)) .outputs(item('moreplates:fluix_plate')) .duration(20).EUt(VHA[LV]) .buildAndRegister() mods.gregtech.compressor.recipeBuilder() - .inputs(item('appliedenergistics2:material:12')) + .inputs(item('appliedenergistics2:material', 12)) .outputs(item('moreplates:fluix_plate')) .duration(20).EUt(VHA[LV]) .buildAndRegister() // Wireless Part crafting.shapedBuilder() - .output(item('appliedenergistics2:material:41')) + .output(item('appliedenergistics2:material', 41)) .matrix( ' E ', 'PFP', ' P ') .key('E', metaitem('emitter.ev')) .key('P', metaitem('plateTitanium')) - .key('F', item('appliedenergistics2:material:9')) + .key('F', item('appliedenergistics2:material', 9)) .replace().register() // Basic Card crafting.shapedBuilder() - .output(item('appliedenergistics2:material:25')) + .output(item('appliedenergistics2:material', 25)) .matrix( 'WP ', 'WCP', 'WP ') .key('W', ore('wireFineCopper')) .key('P', ore('plateIron')) - .key('C', item('appliedenergistics2:material:23')) + .key('C', item('appliedenergistics2:material', 23)) .replace().register() // Advanced Card crafting.shapedBuilder() - .output(item('appliedenergistics2:material:28')) + .output(item('appliedenergistics2:material', 28)) .matrix( 'WP ', 'WCP', 'WP ') .key('W', ore('wireFineAluminium')) .key('P', ore('plateElectricalSteel')) - .key('C', item('appliedenergistics2:material:23')) + .key('C', item('appliedenergistics2:material', 23)) .replace().register() /* Storage */ @@ -102,7 +104,7 @@ crafting.remove('appliedenergistics2:network/cells/fluid_storage_cell_64k') // Storage Housing crafting.shapedBuilder() - .output(item('appliedenergistics2:material:39')) + .output(item('appliedenergistics2:material', 39)) .matrix( 'WPW', 'P P', @@ -113,7 +115,7 @@ crafting.shapedBuilder() // 1k Storage crafting.shapedBuilder() - .output(item('appliedenergistics2:material:35')) + .output(item('appliedenergistics2:material', 35)) .matrix('GPG', 'PCP', 'GPG') @@ -124,93 +126,129 @@ crafting.shapedBuilder() // 4k Storage crafting.shapedBuilder() - .output(item('appliedenergistics2:material:36')) + .output(item('appliedenergistics2:material', 36)) .matrix( 'ABA', 'CDC', 'ACA') .key('A', item('minecraft:glass')) - .key('B', item('appliedenergistics2:material:22')) - .key('C', item('appliedenergistics2:material:35')) + .key('B', item('appliedenergistics2:material', 22)) + .key('C', item('appliedenergistics2:material', 35)) .key('D', ore('circuitMv')) .replace().register() // 16k Storage crafting.shapedBuilder() - .output(item('appliedenergistics2:material:37')) + .output(item('appliedenergistics2:material', 37)) .matrix( 'ABA', 'CDC', 'ACA') .key('A', item('minecraft:glass')) - .key('B', item('appliedenergistics2:material:24')) - .key('C', item('appliedenergistics2:material:36')) + .key('B', item('appliedenergistics2:material', 24)) + .key('C', item('appliedenergistics2:material', 36)) .key('D', ore('circuitHv')) .replace().register() // 64k Storage crafting.shapedBuilder() - .output(item('appliedenergistics2:material:38')) + .output(item('appliedenergistics2:material', 38)) .matrix( 'ABA', 'CDC', 'ACA') - .key('A', item('appliedenergistics2:material:22')) - .key('B', item('appliedenergistics2:material:24')) - .key('C', item('appliedenergistics2:material:37')) + .key('A', item('appliedenergistics2:material', 22)) + .key('B', item('appliedenergistics2:material', 24)) + .key('C', item('appliedenergistics2:material', 37)) .key('D', ore('circuitEv')) .replace().register() -// 1k Fluid Storage -crafting.shapedBuilder() - .output(item('appliedenergistics2:material:54')) - .matrix( - 'GPG', - 'PCP', - 'GPG') - .key('G', item('minecraft:glass')) - .key('P', metaitem('plateLapis')) - .key('C', ore('circuitLv')) - .replace().register() +/* Fluid Storage (Different Across NM and HM) */ -// 4k Fluid Storage -crafting.shapedBuilder() - .output(item('appliedenergistics2:material:55')) - .matrix( - 'ABA', - 'CDC', - 'ACA') - .key('A', item('minecraft:glass')) - .key('B', item('appliedenergistics2:material:22')) - .key('C', item('appliedenergistics2:material:54')) - .key('D', ore('circuitMv')) - .replace().register() +if (LabsModeHelper.normal) { + // 1k Fluid Storage + crafting.shapedBuilder() + .output(item('appliedenergistics2:material', 54)) + .matrix( + 'GPG', + 'PCP', + 'GPG') + .key('G', item('minecraft:glass')) + .key('P', metaitem('plateLapis')) + .key('C', ore('circuitLv')) + .replace().register() -// 16k Fluid Storage -crafting.shapedBuilder() - .output(item('appliedenergistics2:material:56')) - .matrix( - 'ABA', - 'CDC', - 'ACA') - .key('A', item('minecraft:glass')) - .key('B', item('appliedenergistics2:material:24')) - .key('C', item('appliedenergistics2:material:55')) - .key('D', ore('circuitHv')) - .replace().register() + // 4k Fluid Storage + crafting.shapedBuilder() + .output(item('appliedenergistics2:material', 55)) + .matrix( + 'ABA', + 'CDC', + 'ACA') + .key('A', item('minecraft:glass')) + .key('B', item('appliedenergistics2:material', 22)) + .key('C', item('appliedenergistics2:material', 54)) + .key('D', ore('circuitMv')) + .replace().register() -// 64k Fluid Storage -crafting.shapedBuilder() - .output(item('appliedenergistics2:material:57')) - .matrix( - 'ABA', - 'CDC', - 'ACA') - .key('A', item('appliedenergistics2:material:22')) - .key('B', item('appliedenergistics2:material:24')) - .key('C', item('appliedenergistics2:material:56')) - .key('D', ore('circuitEv')) - .replace().register() + // 16k Fluid Storage + crafting.shapedBuilder() + .output(item('appliedenergistics2:material', 56)) + .matrix( + 'ABA', + 'CDC', + 'ACA') + .key('A', item('minecraft:glass')) + .key('B', item('appliedenergistics2:material', 24)) + .key('C', item('appliedenergistics2:material', 55)) + .key('D', ore('circuitHv')) + .replace().register() + + // 64k Fluid Storage + crafting.shapedBuilder() + .output(item('appliedenergistics2:material', 57)) + .matrix( + 'ABA', + 'CDC', + 'ACA') + .key('A', item('appliedenergistics2:material', 22)) + .key('B', item('appliedenergistics2:material', 24)) + .key('C', item('appliedenergistics2:material', 56)) + .key('D', ore('circuitEv')) + .replace().register() +} else { + // 1k Fluid Storage + crafting.removeByOutput(item('appliedenergistics2:material', 54)) + mods.gregtech.assembler.recipeBuilder() + .inputs(ore('gemExquisiteLapis') * 2, ore('crystalPureCertusQuartz') * 4, item('appliedenergistics2:material', 22), ore('circuitEv') * 2) + .outputs(item('appliedenergistics2:material', 54)) + .duration(100).EUt(VHA[EV]) + .buildAndRegister() + + // 4k Fluid Storage + crafting.removeByOutput(item('appliedenergistics2:material', 55)) + mods.gregtech.assembler.recipeBuilder() + .inputs(ore('gemExquisiteLapis') * 2, ore('crystalPureCertusQuartz') * 4, item('appliedenergistics2:material', 23), item('appliedenergistics2:material', 54) * 3) + .outputs(item('appliedenergistics2:material', 55)) + .duration(100).EUt(VHA[EV]) + .buildAndRegister() + + // 16k Fluid Storage + crafting.removeByOutput(item('appliedenergistics2:material', 56)) + mods.gregtech.assembler.recipeBuilder() + .inputs(ore('gemExquisiteLapis') * 2, ore('crystalPureCertusQuartz') * 4, item('appliedenergistics2:material', 23), item('appliedenergistics2:material', 55) * 3) + .outputs(item('appliedenergistics2:material', 56)) + .duration(100).EUt(VHA[EV]) + .buildAndRegister() + + // 64k Fluid Storage + crafting.removeByOutput(item('appliedenergistics2:material', 57)) + mods.gregtech.assembler.recipeBuilder() + .inputs(ore('gemExquisiteLapis') * 2, ore('crystalPureCertusQuartz') * 4, item('appliedenergistics2:material', 23), item('appliedenergistics2:material', 56) * 3) + .outputs(item('appliedenergistics2:material', 57)) + .duration(100).EUt(VHA[EV]) + .buildAndRegister() +} // AE2 Processor Shortcut // Logic Processor @@ -256,7 +294,7 @@ mods.gregtech.autoclave.recipeBuilder() .outputs(item('appliedenergistics2:material', 11) * 64, item('appliedenergistics2:material', 11) * 64) .duration(2560).EUt(VA[EV]).buildAndRegister(); -// Fluix+Charged Certus Shortcut +// Fluix + Charged Certus Shortcut mods.gregtech.autoclave.recipeBuilder() .inputs(ore('dustCertusQuartz') * 8, ore('dustNetherQuartz') * 8) .fluidInputs(fluid('redstone') * 1152) diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/misc.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/misc.groovy index 88d31b0..f369987 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/misc.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/ae2/misc.groovy @@ -4,11 +4,11 @@ import net.minecraft.item.ItemStack import static gregtech.api.GTValues.* // Standardise fluix dust -ore('dustFluix').add(item('appliedenergistics2:material:8')) +ore('dustFluix').add(item('appliedenergistics2:material', 8)) // Conversion Recipes (DEPRECATED) crafting.shapelessBuilder() - .output(item('appliedenergistics2:material:59')) + .output(item('appliedenergistics2:material', 59)) .input(item('ae2wtlib:infinity_booster_card')) .register() crafting.shapelessBuilder() @@ -16,12 +16,12 @@ crafting.shapelessBuilder() .input(item('wct:wct')) .register() crafting.shapelessBuilder() - .output(item('appliedenergistics2:material:60')) + .output(item('appliedenergistics2:material', 60)) .input(item('wct:magnet_card')) .register() // JEI -mods.jei.ingredient.removeAndHide(item('appliedenergistics2:material:0')) +mods.jei.ingredient.removeAndHide(item('appliedenergistics2:material', 0)) // AE2 Certus -> GT Certus crafting.remove('appliedenergistics2:misc/deconstruction_certus_quartz_pillar') @@ -35,7 +35,7 @@ crafting.shapelessBuilder() // Name Press mods.gregtech.laser_engraver.recipeBuilder() - .outputs(item('appliedenergistics2:material:21')) + .outputs(item('appliedenergistics2:material', 21)) .inputs(ore('blockVanadiumSteel')) .notConsumable(ore('craftingLensWhite')) .duration(1600).EUt(VA[MV]) @@ -60,7 +60,7 @@ mods.gregtech.alloy_smelter.recipeBuilder() // Skystone Dust mods.gregtech.macerator.recipeBuilder() - .outputs(item('appliedenergistics2:material:45')) + .outputs(item('appliedenergistics2:material', 45)) .inputs(item('appliedenergistics2:sky_stone_block')) .duration(45).EUt(VA[ULV]) .buildAndRegister() @@ -70,26 +70,26 @@ mods.gregtech.macerator.recipeBuilder() // Silicon (done manually, is unique) // Inscriber Silicon Press -mods.appliedenergistics2.inscriber.removeByOutput(item('appliedenergistics2:material:19')) +mods.appliedenergistics2.inscriber.removeByOutput(item('appliedenergistics2:material', 19)) mods.gregtech.laser_engraver.recipeBuilder() - .outputs(item('appliedenergistics2:material:19')) + .outputs(item('appliedenergistics2:material', 19)) .inputs(ore('blockVanadiumSteel')) .notConsumable(ore('craftingLensLightBlue')) .duration(1600).EUt(VA[MV]) .buildAndRegister() // Printed Silicon -mods.appliedenergistics2.inscriber.removeByOutput(item('appliedenergistics2:material:20')) +mods.appliedenergistics2.inscriber.removeByOutput(item('appliedenergistics2:material', 20)) mods.appliedenergistics2.inscriber.recipeBuilder() .input(ore('plateSilicon')) - .top(item('appliedenergistics2:material:19')) - .output(item('appliedenergistics2:material:20')) + .top(item('appliedenergistics2:material', 19)) + .output(item('appliedenergistics2:material', 20)) .inscribe().register() mods.appliedenergistics2.inscriber.recipeBuilder() .input(ore('itemSilicon')) - .top(item('appliedenergistics2:material:19')) - .output(item('appliedenergistics2:material:20')) + .top(item('appliedenergistics2:material', 19)) + .output(item('appliedenergistics2:material', 20)) .inscribe().register() var applyProcessorChange = { OreDictIngredient lens, OreDictIngredient plate, ItemStack press, ItemStack circuit, ItemStack processor -> @@ -115,18 +115,18 @@ var applyProcessorChange = { OreDictIngredient lens, OreDictIngredient plate, It mods.appliedenergistics2.inscriber.recipeBuilder() .input(ore('circuitLv')) .top(circuit) - .bottom(item('appliedenergistics2:material:20')) // Silicon + .bottom(item('appliedenergistics2:material', 20)) // Silicon .output(processor) .press().register() } // Calculation -applyProcessorChange(ore('craftingLensBlue'), ore('plateCertusQuartz'), item('appliedenergistics2:material:13'), item('appliedenergistics2:material:16'), item('appliedenergistics2:material:23')) +applyProcessorChange(ore('craftingLensBlue'), ore('plateCertusQuartz'), item('appliedenergistics2:material', 13), item('appliedenergistics2:material', 16), item('appliedenergistics2:material', 23)) // Engineering -applyProcessorChange(ore('craftingLensRed'), ore('plateDiamond'), item('appliedenergistics2:material:14'), item('appliedenergistics2:material:17'), item('appliedenergistics2:material:24')) +applyProcessorChange(ore('craftingLensRed'), ore('plateDiamond'), item('appliedenergistics2:material', 14), item('appliedenergistics2:material', 17), item('appliedenergistics2:material', 24)) // Logic -applyProcessorChange(ore('craftingLensGreen'), ore('plateGold'), item('appliedenergistics2:material:15'), item('appliedenergistics2:material:18'), item('appliedenergistics2:material:22')) +applyProcessorChange(ore('craftingLensGreen'), ore('plateGold'), item('appliedenergistics2:material', 15), item('appliedenergistics2:material', 18), item('appliedenergistics2:material', 22)) diff --git a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nae2.groovy b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nae2.groovy index 4c2d9a6..18d7bd5 100644 --- a/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nae2.groovy +++ b/overrides/groovy/postInit/Post-Initial/Main/Mod-Specific/nae2.groovy @@ -2,14 +2,14 @@ import static gregtech.api.GTValues.* // Crafting Removals crafting.removeByOutput(item('nae2:material')) -crafting.removeByOutput(item('nae2:material:1')) -crafting.removeByOutput(item('nae2:material:2')) -crafting.removeByOutput(item('nae2:material:3')) -crafting.removeByOutput(item('nae2:material:4')) -crafting.removeByOutput(item('nae2:material:5')) -crafting.removeByOutput(item('nae2:material:6')) -crafting.removeByOutput(item('nae2:material:7')) -crafting.removeByOutput(item('nae2:material:8')) +crafting.removeByOutput(item('nae2:material', 1)) +crafting.removeByOutput(item('nae2:material', 2)) +crafting.removeByOutput(item('nae2:material', 3)) +crafting.removeByOutput(item('nae2:material', 4)) +crafting.removeByOutput(item('nae2:material', 5)) +crafting.removeByOutput(item('nae2:material', 6)) +crafting.removeByOutput(item('nae2:material', 7)) +crafting.removeByOutput(item('nae2:material', 8)) crafting.removeByOutput(item('nae2:part')) crafting.removeByOutput(item('nae2:reconstruction_chamber')) crafting.remove("nae2:block/exposer") @@ -24,72 +24,72 @@ mods.gregtech.assembler.recipeBuilder() // 256k Storage (Tin Recipe is Auto Generated from the Soldering Alloy Recipe) mods.gregtech.assembler.recipeBuilder() - .inputs(item('appliedenergistics2:quartz_glass') * 4, ore('plateTitanium') * 4, ore('circuitIv'), item('appliedenergistics2:material:24'), metaitem('field.generator.lv'), ore('wireFineRedAlloy') * 16) + .inputs(item('appliedenergistics2:quartz_glass') * 4, ore('plateTitanium') * 4, ore('circuitIv'), item('appliedenergistics2:material', 24), metaitem('field.generator.lv'), ore('wireFineRedAlloy') * 16) .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('nae2:material:1')) + .outputs(item('nae2:material', 1)) .duration(200).EUt(VA[IV]) .buildAndRegister() // 1024k Storage mods.gregtech.assembly_line.recipeBuilder() - .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material:1'), ore('circuitLuv'), item('appliedenergistics2:material', 24) * 4, ore('plateSignalum') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.mv'), ore('wireFineGold') * 16, ore('wireGtSingleEndSteel') * 4) + .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material', 1), ore('circuitLuv'), item('appliedenergistics2:material', 24) * 4, ore('plateSignalum') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.mv'), ore('wireFineGold') * 16, ore('wireGtSingleEndSteel') * 4) .fluidInputs(fluid('soldering_alloy') * 576) - .outputs(item('nae2:material:2')) - .scannerResearch(b -> b.researchStack(item('nae2:material:1'))) + .outputs(item('nae2:material', 2)) + .scannerResearch(b -> b.researchStack(item('nae2:material', 1))) .duration(400).EUt(VA[LuV]) .buildAndRegister() // 4096k Storage mods.gregtech.assembly_line.recipeBuilder() - .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material:2'), ore('circuitZpm'), item('appliedenergistics2:material', 24) * 4, ore('plateRuridit') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.hv'), ore('wireFineGold') * 32, ore('wireGtSingleEndSteel') * 8) + .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material', 2), ore('circuitZpm'), item('appliedenergistics2:material', 24) * 4, ore('plateRuridit') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.hv'), ore('wireFineGold') * 32, ore('wireGtSingleEndSteel') * 8) .fluidInputs(fluid('soldering_alloy') * 576) - .outputs(item('nae2:material:3')) - .stationResearch(b -> b.researchStack(item('nae2:material:2')).CWUt(16)) + .outputs(item('nae2:material', 3)) + .stationResearch(b -> b.researchStack(item('nae2:material', 2)).CWUt(16)) .duration(800).EUt(VA[ZPM]) .buildAndRegister() // 16384k Storage mods.gregtech.assembly_line.recipeBuilder() - .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material:3'), ore('circuitUv'), item('appliedenergistics2:material', 24) * 4, ore('plateTrinium') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.ev'), ore('wireFineGold') * 64, ore('wireGtSingleEndSteel') * 16) + .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material', 3), ore('circuitUv'), item('appliedenergistics2:material', 24) * 4, ore('plateTrinium') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.ev'), ore('wireFineGold') * 64, ore('wireGtSingleEndSteel') * 16) .fluidInputs(fluid('soldering_alloy') * 576) - .outputs(item('nae2:material:4')) - .stationResearch(b -> b.researchStack(item('nae2:material:3')).CWUt(48)) + .outputs(item('nae2:material', 4)) + .stationResearch(b -> b.researchStack(item('nae2:material', 3)).CWUt(48)) .duration(1600).EUt(VA[UV]) .buildAndRegister() /* Fluid Storage */ // 256k Fluid Storage (Tin Recipe is Auto Generated from the Soldering Alloy Recipe) mods.gregtech.assembler.recipeBuilder() - .inputs(item('appliedenergistics2:quartz_glass') * 4, ore('plateCobaltBrass') * 4, ore('circuitIv'), item('appliedenergistics2:material:22'), metaitem('field.generator.lv'), ore('wireFineRedAlloy') * 16) + .inputs(item('appliedenergistics2:quartz_glass') * 4, ore('plateCobaltBrass') * 4, ore('circuitIv'), item('appliedenergistics2:material', 22), metaitem('field.generator.lv'), ore('wireFineRedAlloy') * 16) .fluidInputs(fluid('soldering_alloy') * 72) - .outputs(item('nae2:material:5')) + .outputs(item('nae2:material', 5)) .duration(200).EUt(VA[IV]) .buildAndRegister() // 1024k Fluid Storage mods.gregtech.assembly_line.recipeBuilder() - .outputs(item('nae2:material:6')) - .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material:5'), ore('circuitLuv'), item('appliedenergistics2:material', 22) * 4, ore('plateWatertightSteel') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.mv'), ore('wireFineGold') * 16, ore('wireGtSingleEndSteel') * 4) + .outputs(item('nae2:material', 6)) + .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material', 5), ore('circuitLuv'), item('appliedenergistics2:material', 22) * 4, ore('plateWatertightSteel') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.mv'), ore('wireFineGold') * 16, ore('wireGtSingleEndSteel') * 4) .fluidInputs(fluid('soldering_alloy') * 576) - .scannerResearch(b -> b.researchStack(item('nae2:material:5'))) + .scannerResearch(b -> b.researchStack(item('nae2:material', 5))) .duration(400).EUt(VA[LuV]) .buildAndRegister() // 4096k Fluid Storage mods.gregtech.assembly_line.recipeBuilder() - .outputs(item('nae2:material:7')) - .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material:6'), ore('circuitZpm'), item('appliedenergistics2:material', 22) * 4, ore('plateRuridit') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.hv'), ore('wireFineGold') * 32, ore('wireGtSingleEndSteel') * 8) + .outputs(item('nae2:material', 7)) + .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material', 6), ore('circuitZpm'), item('appliedenergistics2:material', 22) * 4, ore('plateRuridit') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.hv'), ore('wireFineGold') * 32, ore('wireGtSingleEndSteel') * 8) .fluidInputs(fluid('soldering_alloy') * 576) - .stationResearch(b -> b.researchStack(item('nae2:material:6')).CWUt(16)) + .stationResearch(b -> b.researchStack(item('nae2:material', 6)).CWUt(16)) .duration(800).EUt(VA[ZPM]) .buildAndRegister() // 16384k Fluid Storage mods.gregtech.assembly_line.recipeBuilder() - .outputs(item('nae2:material:8')) - .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material:7'), ore('circuitUv'), item('appliedenergistics2:material', 22) * 4, ore('plateTrinium') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.ev'), ore('wireFineGold') * 64, ore('wireGtSingleEndSteel') * 16) + .outputs(item('nae2:material', 8)) + .inputs(item('appliedenergistics2:quartz_glass') * 4, item('nae2:material', 7), ore('circuitUv'), item('appliedenergistics2:material', 22) * 4, ore('plateTrinium') * 4, ore('foilPolybenzimidazole') * 4, ore('gemExquisiteCertusQuartz'), metaitem('field.generator.ev'), ore('wireFineGold') * 64, ore('wireGtSingleEndSteel') * 16) .fluidInputs(fluid('soldering_alloy') * 576) - .stationResearch(b -> b.researchStack(item('nae2:material:7')).CWUt(48)) + .stationResearch(b -> b.researchStack(item('nae2:material', 7)).CWUt(48)) .duration(1600).EUt(VA[UV]) .buildAndRegister() diff --git a/overrides/scripts/expertmode.zs b/overrides/scripts/expertmode.zs index e396b8f..51ced8e 100755 --- a/overrides/scripts/expertmode.zs +++ b/overrides/scripts/expertmode.zs @@ -289,35 +289,7 @@ recipes.addShaped(, [ [, , ] ]); -// Fluid Storage -recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_components_cell_1k_part"); -recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_components_cell_4k_part"); -recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_components_cell_16k_part"); -recipes.removeByRecipeName("appliedenergistics2:network/cells/fluid_storage_components_cell_64k_part"); - -assembler.recipeBuilder() - .inputs( * 2, * 4, , * 2) - .outputs() - .duration(100).EUt(960) - .buildAndRegister(); - -assembler.recipeBuilder() - .inputs( * 2, * 4, , * 3) - .outputs() - .duration(100).EUt(960) - .buildAndRegister(); - -assembler.recipeBuilder() - .inputs( * 2, * 4, , * 3) - .outputs() - .duration(100).EUt(960) - .buildAndRegister(); - -assembler.recipeBuilder() - .inputs( * 2, * 4, , * 3) - .outputs() - .duration(100).EUt(960) - .buildAndRegister(); +// Fluid Storage (Moved to Groovy) // Small Storage Crates recipes.removeByRecipeName("actuallyadditions:recipes162");