From 70d93d3a9155519d89cbe84afc5409ce41912bd9 Mon Sep 17 00:00:00 2001 From: Ghostipedia <46772882+Ghostipedia@users.noreply.github.com> Date: Sun, 31 Dec 2023 06:14:19 -0500 Subject: [PATCH] Game master 0.2.0 lv update - KUBEJS (#48) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fuck (#44) * Quickly Patching WorldLoad Issue and Mod Updates * Gregify almost all Supplementary recipes (#29) * Items gregified * Gregify most functional/decorative blocks * Gregify Flags * Gregify candle holders * Unify all signpost recipes for future tweaking * Forgot to tweak the present recipe * Cleaning up * Forgor another recipe, last one i swear * Gregification for Ars init (#30) * Create Saw Recipe Adding+Local desync fixing (Skill issued myself) * Gregification of Ars Nouveau Initial setup * Langfile hotfix (#32) * Create Saw Recipe Adding+Local desync fixing (Skill issued myself) * Gregification of Ars Nouveau Initial setup * Langfile Hotfix * Update README.md (#34) * Ad astra modifications (#35) - Yippie Merge Conflicts mk1 * Added GT Integration to Ad Astra * Recipes for Fins, Engines & Nose Cones * Created a Item Generation File with the Ad Astra Stuff --------- Co-authored-by: Ghostipedia <46772882+Ghostipedia@users.noreply.github.com> * Sophisticated mods modifications (#37) * chests and barrels done until diamond * no more gregtech * no more gt part 2 forgot to remove one recipe * soph storage done * Update SophisticatedMods.js * soph done :despair: --------- Co-authored-by: Ghostipedia <46772882+Ghostipedia@users.noreply.github.com> * Charcoal furnace recipe removal (#40) --------- Co-authored-by: Srdra <99605300+srdr2k3@users.noreply.github.com> Co-authored-by: 三好エイラ <91321779+MiyoshiEira@users.noreply.github.com> Co-authored-by: Paniawesome <74797734+pani29@users.noreply.github.com> Co-authored-by: Purplik <60230933+PurplikDev@users.noreply.github.com> * AAAAAAAAAAAAAA (#45) * Quickly Patching WorldLoad Issue and Mod Updates * Gregify almost all Supplementary recipes (#29) * Items gregified * Gregify most functional/decorative blocks * Gregify Flags * Gregify candle holders * Unify all signpost recipes for future tweaking * Forgot to tweak the present recipe * Cleaning up * Forgor another recipe, last one i swear * Gregification for Ars init (#30) * Create Saw Recipe Adding+Local desync fixing (Skill issued myself) * Gregification of Ars Nouveau Initial setup * Langfile hotfix (#32) * Create Saw Recipe Adding+Local desync fixing (Skill issued myself) * Gregification of Ars Nouveau Initial setup * Langfile Hotfix * Update README.md (#34) * Ad astra modifications (#35) - Yippie Merge Conflicts mk1 * Added GT Integration to Ad Astra * Recipes for Fins, Engines & Nose Cones * Created a Item Generation File with the Ad Astra Stuff --------- Co-authored-by: Ghostipedia <46772882+Ghostipedia@users.noreply.github.com> * Sophisticated mods modifications (#37) * chests and barrels done until diamond * no more gregtech * no more gt part 2 forgot to remove one recipe * soph storage done * Update SophisticatedMods.js * soph done :despair: --------- Co-authored-by: Ghostipedia <46772882+Ghostipedia@users.noreply.github.com> * Charcoal furnace recipe removal (#40) --------- Co-authored-by: Srdra <99605300+srdr2k3@users.noreply.github.com> Co-authored-by: 三好エイラ <91321779+MiyoshiEira@users.noreply.github.com> Co-authored-by: Paniawesome <74797734+pani29@users.noreply.github.com> Co-authored-by: Purplik <60230933+PurplikDev@users.noreply.github.com> * Manifest & Modlist Update * Overrides Mk1 - Everything but KJS * KubeJS Recipes If I somehow accidentally overwrote someones github work, let me know and we'll get it sorted --------- Co-authored-by: Srdra <99605300+srdr2k3@users.noreply.github.com> Co-authored-by: 三好エイラ <91321779+MiyoshiEira@users.noreply.github.com> Co-authored-by: Paniawesome <74797734+pani29@users.noreply.github.com> Co-authored-by: Purplik <60230933+PurplikDev@users.noreply.github.com> --- .../item/material_sets/mana/ingot.png | Bin 0 -> 316 bytes .../item/material_sets/mana/ingot_overlay.png | Bin 0 -> 126 bytes .../material_sets/mana/ingot_secondary.png | Bin 0 -> 126 bytes overrides/kubejs/client_scripts/SDRP.js | 13 + .../kubejs/server_scripts/Cosmic_Frontiers.js | 90 +++ .../Ores/{Zanite.js => Zanite.js.OLD} | 0 .../server_scripts/Recipes/ArsNouveau.js | 92 +-- .../kubejs/server_scripts/Recipes/Create.js | 260 ++++---- .../server_scripts/Recipes/Energy_Recipes.js | 19 - .../kubejs/server_scripts/Recipes/Gregtech.js | 554 +++++++++++------- .../Recipes/SophisticatedMods.js | 404 +++++++------ .../kubejs/startup_scripts/CustomMachines.js | 140 +++-- .../startup_scripts/Materials/MaterialGen.js | 37 +- ...Layer.js => AetherWorldGenLayer.js.BROKEN} | 0 14 files changed, 949 insertions(+), 660 deletions(-) create mode 100644 overrides/kubejs/assets/gtceu/textures/item/material_sets/mana/ingot.png create mode 100644 overrides/kubejs/assets/gtceu/textures/item/material_sets/mana/ingot_overlay.png create mode 100644 overrides/kubejs/assets/gtceu/textures/item/material_sets/mana/ingot_secondary.png create mode 100644 overrides/kubejs/client_scripts/SDRP.js create mode 100644 overrides/kubejs/server_scripts/Cosmic_Frontiers.js rename overrides/kubejs/server_scripts/Ores/{Zanite.js => Zanite.js.OLD} (100%) delete mode 100644 overrides/kubejs/server_scripts/Recipes/Energy_Recipes.js rename overrides/kubejs/startup_scripts/WorldGenLayer/{AetherWorldGenLayer.js => AetherWorldGenLayer.js.BROKEN} (100%) diff --git a/overrides/kubejs/assets/gtceu/textures/item/material_sets/mana/ingot.png b/overrides/kubejs/assets/gtceu/textures/item/material_sets/mana/ingot.png new file mode 100644 index 0000000000000000000000000000000000000000..fef8ccedc0e0218d8fd4f52b69ccfeb50d6125b2 GIT binary patch literal 316 zcmV-C0mJ@@P)rlQE8kAQVLp6W2j(=v{zoFfN4Hxe04sg$>b-U`>N; zgsEUefBt0hi@6oyy>s8?C5RX!pXlo&`Y+O2N3HcEu6PGc)0Ba_uJPUzLSUZf%vHZZ z08P_8(j=2AT}UYlD1p}6M=~j8HW6CuI1B^8%jUaM8e3&+EG81>RKwc<&#ea}H~5u3h1@uWWEFrnttK0=zDH97h1o^ArN0>$=#s zEdYJr=gA=iq?84ez#_r6Z34(9Y0|PRFQKc7%dYDpz;PUJp~B$bf8#fJ4~U&WK=uUy O0000q=(5MApxjSfPrzjOHDFR On!(f6&t;ucLK6Uj0UU_{ literal 0 HcmV?d00001 diff --git a/overrides/kubejs/assets/gtceu/textures/item/material_sets/mana/ingot_secondary.png b/overrides/kubejs/assets/gtceu/textures/item/material_sets/mana/ingot_secondary.png new file mode 100644 index 0000000000000000000000000000000000000000..2edec6b6df58006b9beaa414a04171110076ac1b GIT binary patch literal 126 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=f%HxgW_+~V@dc0}?CIhdV&R`G!MZp>q=(5MApxjSfPrzjOHDFR On!(f6&t;ucLK6Uj0UU_{ literal 0 HcmV?d00001 diff --git a/overrides/kubejs/client_scripts/SDRP.js b/overrides/kubejs/client_scripts/SDRP.js new file mode 100644 index 00000000..ac3212b7 --- /dev/null +++ b/overrides/kubejs/client_scripts/SDRP.js @@ -0,0 +1,13 @@ +sdrp.dimension_change((event) => { + const dimPath = event.level.dimension().location().getPath(); + event.updateSDRPState(`sdrp.${dimPath}.in`, `sdrp.${dimPath}`, "dimPath"); +}); + +let wires = ['gtceu:mana_steel_single_wire', 'gtceu:mana_steel_double_wire', 'gtceu:mana_steel_quadruple_wire', 'gtceu:mana_steel_octal_wire', 'gtceu:mana_steel_hex_wire', 'gtceu:mana_steel_single_cable', 'gtceu:mana_steel_double_cable', 'gtceu:mana_steel_quadruple_cable', 'gtceu:mana_steel_octal_cable', 'gtceu:mana_steel_hex_cable'] + +ItemEvents.tooltip(event => { + // event.add('gtceu:mana_steel_single_cable', Text.of('LV Superconductor')) + event.addAdvanced(wires, (item, advanced, text) => { + text.add(1, Text.of('LV Superconductor')) // Adds text in first line, pushing the items name down a line. If you want the line below the item name, the index must be 1 + }) +}) \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/Cosmic_Frontiers.js b/overrides/kubejs/server_scripts/Cosmic_Frontiers.js new file mode 100644 index 00000000..84eab781 --- /dev/null +++ b/overrides/kubejs/server_scripts/Cosmic_Frontiers.js @@ -0,0 +1,90 @@ +//A Simple "REMOVE AND HIDE" function akin to GroovyScript's Jei.yeet() function - This will tag the item for hiding from recipe viewers and remove the recipe +//This one also has a tag removal function to remove the forge:tools/knives tag from what is removed so bear that in mind if you copy/paste this around +let yeet = (itemName) => { + ServerEvents.recipes(event => { + event.remove({ output: itemName }) + }) + ServerEvents.tags('item', event => { + event.add('forge:viewers/hidden_from_recipe', itemName) + + }) + } + + //Generator Removal - WILL RETURN WITH UH, """BETTER""" CREATE FUNCTIONALITY + // yeet('gtceu:lv_combustion') + // yeet('gtceu:mv_combustion') + // yeet('gtceu:hv_combustion') + // yeet('gtceu:large_combustion_engine') + // yeet('gtceu:extreme_combustion_engine') + // yeet('gtceu:lv_gas_turbine') + // yeet('gtceu:mv_gas_turbine') + // yeet('gtceu:hv_gas_turbine') + // yeet('gtceu:gas_large_turbine') + // yeet('gtceu:lv_steam_turbine') + // yeet('gtceu:mv_steam_turbine') + // yeet('gtceu:hv_steam_turbine') + // yeet('gtceu:lv_steam_turbine') + // yeet('gtceu:steam_large_turbine') + // yeet('gtceu:plasma_large_turbine') + // yeet('gtceu:turbine_rotor') + + ServerEvents.recipes(event => { + // event.remove({ output: 'gtceu:firebrick' }) + event.recipes.gtceu.nether_catalyzer('cosmiccore:blackstone_pustule_growth') + .itemInputs('biomesoplenty:blackstone_bulb') + .itemOutputs('cosmiccore:blackstone_pustule') + .duration(160) + .EUt(16); + event.recipes.gtceu.cutter('cosmiccore:blackstone_pustule_slice') + .itemInputs('cosmiccore:blackstone_pustule') + .itemOutputs('3x biomesoplenty:blackstone_bulb') + .chancedOutput(Item.of('biomesoplenty:blackstone_bulb', 1), 5000, 500) + .duration(160) + .EUt(16); + event.recipes.gtceu.mixer('cosmiccore:sediment_sludge_mixing') + .itemInputs('biomesoplenty:blackstone_bulb') + .inputFluids(Fluid.of('minecraft:water',1000)) + .outputFluids(Fluid.of('gtceu:nether_sediment_sludge',1000)) + .duration(80) + .circuit(1) + .EUt(32); + event.recipes.gtceu.mixer('cosmiccore:sediment_sludge_mixing_good') + .itemInputs('2x biomesoplenty:blackstone_bulb') + .inputFluids(Fluid.of('gtceu:ethanol',250)) + .outputFluids(Fluid.of('gtceu:nether_sediment_sludge',1000)) + .duration(40) + .circuit(2) + .EUt(32); + event.recipes.gtceu.flora_nurturer('cosmiccore:lucis_spore_cultivation') + .itemInputs('1x betternether:lucis_spore') + .inputFluids(Fluid.of('gtceu:nether_sediment_sludge',500)) + .itemOutputs('2x cosmiccore:engourged_spore') + .itemOutputs('2x betternether:lucis_spore') + .chancedOutput(Item.of('betternether:lucis_spore', 1), 5000, 500) + .duration(160) + .EUt(16); + event.recipes.gtceu.nether_catalyzer('cosmiccore:engourged_spore_catalyzing') + .itemInputs('cosmiccore:engourged_spore') + .outputFluids(Fluid.of('gtceu:ethanol',250)) + .duration(240) + .EUt(32); + + + + + + + + + + + + + + + + + }) + + + \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/Ores/Zanite.js b/overrides/kubejs/server_scripts/Ores/Zanite.js.OLD similarity index 100% rename from overrides/kubejs/server_scripts/Ores/Zanite.js rename to overrides/kubejs/server_scripts/Ores/Zanite.js.OLD diff --git a/overrides/kubejs/server_scripts/Recipes/ArsNouveau.js b/overrides/kubejs/server_scripts/Recipes/ArsNouveau.js index eb353b8b..57d94d9f 100644 --- a/overrides/kubejs/server_scripts/Recipes/ArsNouveau.js +++ b/overrides/kubejs/server_scripts/Recipes/ArsNouveau.js @@ -1,28 +1,28 @@ ServerEvents.recipes(event => { - event.recipes.ars_nouveau.enchanting_apparatus( + event.recipes.ars_nouveau.enchanting_apparatus( [ "minecraft:sand", "minecraft:sand", "minecraft:sand", "minecraft:sand", ], // input items - "minecraft:gunpowder", // reagent - "minecraft:tnt", // output - 1000, // source cost - // true // keep nbt of reagent, think like a smithing recipe - ); + "minecraft:gunpowder", // reagent + "minecraft:tnt", // output + 1000, // source cost + // true // keep nbt of reagent, think like a smithing recipe + ); }) //Time to do some Gregification //Spellbooks ServerEvents.recipes(e => { - e.remove({id: 'ars_nouveau:novice_spell_book'}) + e.remove({ id: 'ars_nouveau:novice_spell_book' }) e.shaped('ars_nouveau:novice_spell_book', [ - 'ABC', - 'DE ', - ' ' - ], + 'ABC', + 'DE ', + ' ' + ], { A: 'minecraft:book', B: 'gtceu:iron_shovel', @@ -60,16 +60,16 @@ ServerEvents.recipes(e => { // } //) -//Fiber Recipes - e.remove({id: 'ars_nouveau:magebloom_fiber'}) + //Fiber Recipes + e.remove({ id: 'ars_nouveau:magebloom_fiber' }) e.recipes.gtceu.spooling_machine('ars_nouveau:magebloom_fiber') .itemInputs('ars_nouveau:magebloom') .itemOutputs('ars_nouveau:magebloom_fiber') .duration(60) .EUt(4); -//Spooling Recipes + //Spooling Recipes - e.remove({output: 'ars_nouveau:blank_thread'}) + e.remove({ output: 'ars_nouveau:blank_thread' }) e.recipes.gtceu.spooling_machine('ars_nouveau:blank_thread') .itemInputs('4x ars_nouveau:magebloom_fiber') .itemInputs('gtceu:gold_rod') @@ -77,13 +77,13 @@ ServerEvents.recipes(e => { .duration(60) .EUt(4); -//Magic Stations - e.remove({id: 'ars_nouveau:arcane_core'}) + //Magic Stations + e.remove({ id: 'ars_nouveau:arcane_core' }) e.shaped('ars_nouveau:arcane_core', [ - 'ACA', - 'BDB', - 'AAA' - ], + 'ACA', + 'BDB', + 'AAA' + ], { A: 'ars_nouveau:sourcestone', B: 'gtceu:gold_rod', @@ -91,12 +91,12 @@ ServerEvents.recipes(e => { D: 'ars_nouveau:source_gem', } ) - e.remove({id: 'ars_nouveau:enchanting_apparatus'}) + e.remove({ id: 'ars_nouveau:enchanting_apparatus' }) e.shaped('ars_nouveau:enchanting_apparatus', [ - 'BAB', - 'CDC', - 'BAB' - ], + 'BAB', + 'CDC', + 'BAB' + ], { A: 'ars_nouveau:sourcestone', B: 'minecraft:gold_nugget', @@ -104,39 +104,49 @@ ServerEvents.recipes(e => { D: 'minecraft:diamond', } ) - e.remove({id: 'ars_nouveau:agronomic_sourcelink'}) + e.remove({ id: 'ars_nouveau:agronomic_sourcelink' }) e.shaped('ars_nouveau:agronomic_sourcelink', [ - ' A ', - 'BCB', - ' A ' - ], + ' A ', + 'BCB', + ' A ' + ], { A: 'ars_nouveau:source_gem', B: 'gtceu:gold_plate', C: 'minecraft:wheat', } ) - e.remove({id: 'ars_nouveau:source_jar'}) + e.remove({ id: 'ars_nouveau:source_jar' }) e.shaped('ars_nouveau:source_jar', [ - 'CBC', - 'A A', - 'CCC' - ], + 'CBC', + 'A A', + 'CCC' + ], { A: '#forge:glass', B: 'gtceu:gold_plate', C: 'ars_nouveau:archwood_slab', } ) - e.remove({id: 'ars_nouveau:relay'}) + e.remove({ id: 'ars_nouveau:relay' }) e.shaped('ars_nouveau:relay', [ - 'A A', - 'ABA', - 'A A' - ], + 'A A', + 'ABA', + 'A A' + ], { A: 'gtceu:gold_rod', B: 'ars_nouveau:source_gem_block', } ) + e.remove({ output: 'ars_nouveau:imbuement_chamber' }) + e.shaped('ars_nouveau:imbuement_chamber', [ + 'ARA', + 'A A', + 'ARA' + ], { + A: 'ars_nouveau:archwood_planks', + R: 'gtceu:rose_gold_plate' + } + ) }) \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/Recipes/Create.js b/overrides/kubejs/server_scripts/Recipes/Create.js index b7e2b622..ef8e447f 100644 --- a/overrides/kubejs/server_scripts/Recipes/Create.js +++ b/overrides/kubejs/server_scripts/Recipes/Create.js @@ -1,130 +1,144 @@ let yeet = (itemName) => { - ServerEvents.recipes(event => { - event.remove({ output: itemName }) - }) - ServerEvents.tags('item', event => { - event.add('forge:viewers/hidden_from_recipe', itemName) - }) - } - - //SU sources removal - yeet('create:large_water_wheel') - yeet('create:water_wheel') - yeet('create:steam_engine') - yeet('create:windmill_bearing') - yeet('create:white_sail') - yeet('create:sail_frame') - - //Ore related removals - yeet('create:brass_ingot') - yeet('create:brass_nugget') - yeet('create:copper_nugget') - yeet("create:zinc_ingot") - yeet('create:zinc_nugget') - + ServerEvents.recipes(event => { + event.remove({ output: itemName }) + }) ServerEvents.tags('item', event => { - console.log('Hello! The item tags event has fired!') + event.add('forge:viewers/hidden_from_recipe', itemName) + }) +} - //Other Modded Plate Removals From the Forge Tag - Remember to Hide in EMI if needed below - event.remove('forge:plates/copper', 'create:copper_sheet') - event.remove('forge:plates/brass', 'create:brass_sheet') - event.remove('forge:plates/iron', 'create:iron_sheet') - event.remove('forge:plates/gold', 'create:golden_sheet') +//SU sources removal +yeet('create:large_water_wheel') +yeet('create:water_wheel') +yeet('create:windmill_bearing') +yeet('create:white_sail') +yeet('create:sail_frame') + +//Ore related removals +yeet('create:brass_ingot') +yeet('create:brass_nugget') +yeet('create:copper_nugget') +yeet("create:zinc_ingot") +yeet('create:zinc_nugget') + +ServerEvents.tags('item', event => { + console.log('Hello! The item tags event has fired!') + + //Other Modded Plate Removals From the Forge Tag - Remember to Hide in EMI if needed below + event.remove('forge:plates/copper', 'create:copper_sheet') + event.remove('forge:plates/brass', 'create:brass_sheet') + event.remove('forge:plates/iron', 'create:iron_sheet') + event.remove('forge:plates/gold', 'create:golden_sheet') + + //Hiding the Above Removals from EMI + event.add('c:hidden_from_recipe_viewers', 'create:copper_sheet') + event.add('c:hidden_from_recipe_viewers', 'create:brass_sheet') + event.add('c:hidden_from_recipe_viewers', 'create:iron_sheet') + event.add('c:hidden_from_recipe_viewers', 'create:golden_sheet') +}) + +ServerEvents.recipes(event => { + + event.remove({ output: 'create:andesite_alloy' }) + event.remove({ output: 'create:copper_backtank' }) + event.shaped('create:copper_backtank', [ + 'WGW', + 'CBC', + ' C ' + ], { + B: 'gtceu:bronze_machine_casing', + C: 'gtceu:copper_double_plate', + G: 'create:cogwheel', + W: 'create:shaft' + }) - //Hiding the Above Removals from EMI - event.add('c:hidden_from_recipe_viewers', 'create:copper_sheet') - event.add('c:hidden_from_recipe_viewers', 'create:brass_sheet') - event.add('c:hidden_from_recipe_viewers', 'create:iron_sheet') - event.add('c:hidden_from_recipe_viewers', 'create:golden_sheet') - }) - - ServerEvents.recipes(event => { - - event.remove({ output: 'create:andesite_alloy' }) - event.remove({ output: 'create:copper_backtank' }) - event.shaped('create:copper_backtank', [ - 'WGW', - 'CBC', - ' C ' - ], { - B: 'gtceu:bronze_machine_casing', - C: 'gtceu:copper_double_plate', - G: 'create:cogwheel', - W: 'create:shaft' - }) - //Cogs - event.remove({ output: 'create:cogwheel' }) - event.shaped('create:cogwheel', [ - ' T ', - 'TST', - ' T ' - ], { - S: 'create:shaft', - T: 'gtceu:treated_wood_plate' - }) - - event.remove({ output: 'create:large_cogwheel' }) - event.shaped('create:large_cogwheel', [ - ' T ', - 'TCT', - ' T ' - ], { - C: 'create:cogwheel', - T: 'gtceu:treated_wood_plate' - }) - + event.remove({ output: 'create:cogwheel' }) + event.shaped('create:cogwheel', [ + ' T ', + 'TST', + ' T ' + ], { + S: 'create:shaft', + T: 'gtceu:treated_wood_plate' + }) + + event.remove({ output: 'create:large_cogwheel' }) + event.shaped('create:large_cogwheel', [ + ' T ', + 'TCT', + ' T ' + ], { + C: 'create:cogwheel', + T: 'gtceu:treated_wood_plate' + }) + //Diving Helm - event.remove({ output: Item.of('create:copper_diving_helmet', '{Damage:0}') }) - event.shaped(Item.of('create:copper_diving_helmet', '{Damage:0}'), [ - 'CCC', - 'CGC', - ' ' - ], { - C: 'gtceu:copper_plate', - G: 'minecraft:glass_pane' - }) - + event.remove({ output: Item.of('create:copper_diving_helmet', '{Damage:0}') }) + event.shaped(Item.of('create:copper_diving_helmet', '{Damage:0}'), [ + 'CCC', + 'CGC', + ' ' + ], { + C: 'gtceu:copper_plate', + G: 'minecraft:glass_pane' + }) + //Blaze Burner + event.remove({ output: Item.of('create:empty_blaze_burner') }) + event.shaped(Item.of('create:empty_blaze_burner'), [ + 'GGG', + 'GGG', + 'CNC' + ], { + C: 'gtceu:steel_machine_casing', + G: 'gtceu:steel_long_rod', + N: 'minecraft:netherrack' + }) //Assembler recipes - event.recipes.gtceu.assembler('create:propeller') - .itemInputs('4x gtceu:iron_plate') - .itemInputs('create:andesite_alloy') - .itemOutputs('create:propeller') - .duration(100) - .EUt(8); - event.recipes.gtceu.assembler('create:whisk') - .itemInputs('5x gtceu:iron_plate') - .itemInputs('create:andesite_alloy') - .itemOutputs('create:whisk') - .duration(100) - .EUt(8); - event.recipes.gtceu.assembler('create:brass_hand') - .itemInputs('4x gtceu:brass_plate') - .itemInputs('create:andesite_alloy') - .itemOutputs('create:brass_hand') - .duration(100) - .EUt(8); - event.recipes.gtceu.assembler('create:shaft') - .itemInputs('2x create:andesite_alloy') - .itemOutputs('8x create:shaft') - .duration(100) - .EUt(8); - event.recipes.gtceu.assembler("create:cogwheel") - .itemInputs("4x gtceu:treated_wood_plates") - .itemInputs("create:shaft") - .itemOutputs("create:cogwheel") - .duration(100) - .EUt(8); - event.recipes.gtceu.assembler("create:large_cogwheel") - .itemInputs("4x gtceu:treated_wood_plantes") - .itemInputs("create:cogwheel") - .itemOutputs("create:large_cogwheel") - .duration(100) - .EUt(8); - event.recipes.gtceu.assembler("create:electron_tube") - .itemInputs("create:polished_rose_quartz") - .itemInputs("gtceu:iron_plate") - .itemOutputs("create:electron_tube") - .duration(100) - .EUt(8); - }) \ No newline at end of file + event.recipes.gtceu.assembler('create:propeller') + .itemInputs('4x gtceu:iron_plate') + .itemInputs('create:andesite_alloy') + .itemOutputs('create:propeller') + .duration(100) + .EUt(8); + event.recipes.gtceu.assembler('create:whisk') + .itemInputs('5x gtceu:iron_plate') + .itemInputs('create:andesite_alloy') + .itemOutputs('create:whisk') + .duration(100) + .EUt(8); + event.recipes.gtceu.assembler('create:brass_hand') + .itemInputs('4x gtceu:brass_plate') + .itemInputs('create:andesite_alloy') + .itemOutputs('create:brass_hand') + .duration(100) + .EUt(8); + event.recipes.gtceu.assembler('create:shaft') + .itemInputs('2x create:andesite_alloy') + .itemOutputs('8x create:shaft') + .duration(100) + .EUt(8); + event.recipes.gtceu.assembler("create:cogwheel") + .itemInputs("4x gtceu:treated_wood_plates") + .itemInputs("create:shaft") + .itemOutputs("create:cogwheel") + .duration(100) + .EUt(8); + event.recipes.gtceu.assembler("create:large_cogwheel") + .itemInputs("4x gtceu:treated_wood_plantes") + .itemInputs("create:cogwheel") + .itemOutputs("create:large_cogwheel") + .duration(100) + .EUt(8); + event.recipes.gtceu.assembler("create:electron_tube") + .itemInputs("create:polished_rose_quartz") + .itemInputs("gtceu:iron_plate") + .itemOutputs("create:electron_tube") + .duration(100) + .EUt(8); +}) + + +ServerEvents.recipes(e => { + e.recipes.create.filling('botania:manasteel_ingot', [Fluid.of('gtceu:ethanol', 1000), 'gtceu:blue_alloy_ingot']) +}) \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/Recipes/Energy_Recipes.js b/overrides/kubejs/server_scripts/Recipes/Energy_Recipes.js deleted file mode 100644 index f86cdfdd..00000000 --- a/overrides/kubejs/server_scripts/Recipes/Energy_Recipes.js +++ /dev/null @@ -1,19 +0,0 @@ -ServerEvents.recipes(event => { - event.recipes.gtceu.basic_alternator('power_recipe_1') - .inputStress(256) - .rpm(32) - .duration(2) - .EUt(-32); - - event.recipes.gtceu.basic_alternator('basic_power_recipe_1') - .inputStress(1024) - .rpm(256) - .duration(2) - .EUt(-256); - -}) - - - - -// 64mb Steam -> 256SU -> 32eu : 1t \ No newline at end of file diff --git a/overrides/kubejs/server_scripts/Recipes/Gregtech.js b/overrides/kubejs/server_scripts/Recipes/Gregtech.js index 654f4df1..1128116c 100755 --- a/overrides/kubejs/server_scripts/Recipes/Gregtech.js +++ b/overrides/kubejs/server_scripts/Recipes/Gregtech.js @@ -1,213 +1,367 @@ +//A Simple "REMOVE AND HIDE" function akin to GroovyScript's Jei.yeet() function - This will tag the item for hiding from recipe viewers and remove the recipe +//This one also has a tag removal function to remove the forge:tools/knives tag from what is removed so bear that in mind if you copy/paste this around +let yeet = (itemName) => { + ServerEvents.recipes(event => { + event.remove({ output: itemName }) + }) + ServerEvents.tags('item', event => { + event.add('forge:viewers/hidden_from_recipe', itemName) + + }) +} + +//Generator Removal - WILL RETURN WITH UH, """BETTER""" CREATE FUNCTIONALITY +// yeet('gtceu:lv_combustion') +// yeet('gtceu:mv_combustion') +// yeet('gtceu:hv_combustion') +// yeet('gtceu:large_combustion_engine') +// yeet('gtceu:extreme_combustion_engine') +// yeet('gtceu:lv_gas_turbine') +// yeet('gtceu:mv_gas_turbine') +// yeet('gtceu:hv_gas_turbine') +// yeet('gtceu:gas_large_turbine') +// yeet('gtceu:lv_steam_turbine') +// yeet('gtceu:mv_steam_turbine') +// yeet('gtceu:hv_steam_turbine') +// yeet('gtceu:lv_steam_turbine') +// yeet('gtceu:steam_large_turbine') +// yeet('gtceu:plasma_large_turbine') +// yeet('gtceu:turbine_rotor') + + + + ServerEvents.recipes(event => { - event.remove({ output: 'gtceu:firebrick' }) - event.recipes.gtceu.masonry_oven('gtceu:firebrick_masonry') - .itemInputs('gtceu:compressed_fireclay') - .itemInputs('gtceu:coal_dust') - .itemOutputs('gtceu:firebrick') - .itemOutputs('gtceu:ash_dust') - .notConsumable('gtceu:ingot_casting_mold') - .duration(100) - .EUt(8); - event.recipes.gtceu.masonry_oven('gtceu:andesite_alloy_masonry') - .itemInputs('minecraft:andesite') - .itemInputs('gtceu:zinc_dust') - .itemOutputs('create:andesite_alloy') - .notConsumable('gtceu:ingot_casting_mold') - .duration(100) - .EUt(8); - event.recipes.gtceu.macerator('gtceu:treated_wood_dust_shred') - .itemInputs('gtceu:treated_wood_planks') - .itemOutputs('gtceu:treated_wood_dust') - .duration(40) - .EUt(8); - event.recipes.gtceu.macerator('gtceu:nether_brick_dust_shred') - .itemInputs('minecraft:nether_bricks') - .itemOutputs('gtceu:nether_brick_dust_dust') - .duration(40) - .EUt(16); - event.remove({ output: 'gtceu:fireclay_dust' }) - event.shapeless('2x gtceu:fireclay_dust', [ - 'gtceu:nether_brick_dust_dust', - 'gtceu:clay_dust' - - event.recipes.gtceu.bender('kubejs:stainless_steel_fin') - .itemInputs('6x gtceu:stainless_steel_plate') - .circuit(4) - .itemOutputs('kubejs:stainless_steel_fin') - .duration(100) - .EUt(480); - event.recipes.gtceu.assembler('kubejs:stainless_steel_nose_cone') - .itemInputs('4x gtceu:stainless_steel_plate') - .itemInputs('gtceu:annealed_copper_rod') - .itemInputs('gtceu:annealed_copper_nugget') - .inputFluids('gtceu:polytetrafluoroethylene 288') - .itemOutputs('kubejs:stainless_steel_nose_cone') - .duration(100) - .EUt(480); - event.recipes.gtceu.assembler('kubejs:stainless_steel_engine') - .itemInputs('4x gtceu:stainless_steel_plate') - .itemInputs('gtceu:stainless_steel_rotor') - .itemInputs('gtceu:stainless_steel_drum') - .itemInputs('gtceu:hv_electric_motor') - .inputFluids('gtceu:polytetrafluoroethylene 432') - .itemOutputs('kubejs:stainless_steel_engine') - .duration(100) - .EUt(480); - event.recipes.gtceu.bender('kubejs:hsse_fin') - .itemInputs('6x gtceu:hsse_plate') - .circuit(4) - .itemOutputs('kubejs:hsse_fin') - .duration(100) - .EUt(4046); - event.recipes.gtceu.assembler('kubejs:hsse_nose_cone') - .itemInputs('4x gtceu:hsse_plate') - .itemInputs('gtceu:annealed_copper_rod') - .itemInputs('gtceu:annealed_copper_nugget') - .inputFluids('gtceu:polytetrafluoroethylene 288') - .itemOutputs('kubejs:hsse_nose_cone') - .duration(100) - .EUt(4046); - event.recipes.gtceu.assembler('kubejs:hsse_engine') - .itemInputs('4x gtceu:hsse_plate') - .itemInputs('gtceu:stainless_steel_rotor') - .itemInputs('gtceu:iv_quantum_tank') - .itemInputs('gtceu:iv_electric_motor') - .inputFluids('gtceu:polytetrafluoroethylene 432') - .itemOutputs('kubejs:hsse_engine') - .duration(100) - .EUt(4046); - event.recipes.gtceu.bender('kubejs:osmiridium_fin') - .itemInputs('6x gtceu:osmiridium_plate') - .circuit(4) - .itemOutputs('kubejs:osmiridium_fin') - .duration(100) - .EUt(30720); - event.recipes.gtceu.assembler('kubejs:osmiridium_nose_cone') - .itemInputs('4x gtceu:osmiridium_plate') - .itemInputs('gtceu:annealed_copper_rod') - .itemInputs('gtceu:annealed_copper_nugget') - .inputFluids('gtceu:styrene_butadiene_rubber 288') - .itemOutputs('kubejs:osmiridium_nose_cone') - .duration(100) - .EUt(30720); - event.recipes.gtceu.assembly_line('kubejs:osmiridium_engine') - .itemInputs('4x gtceu:osmiridium_plate') - .itemInputs('2x gtceu:osmiridium_round') - .itemInputs('gtceu:stainless_steel_rotor') - .itemInputs('gtceu:niobium_titanium_small_fluid_pipe') - .itemInputs('gtceu:luv_quantum_tank') - .itemInputs('gtceu:luv_electric_motor') - .itemInputs('4x gtceu:hsss_screw') - .inputFluids('gtceu:styrene_butadiene_rubber 288') - .inputFluids('gtceu:soldering_alloy 432') - .itemOutputs('kubejs:osmiridium_engine') - .duration(100) - .EUt(30720); - event.recipes.gtceu.bender('kubejs:americium_fin') - .itemInputs('6x gtceu:americium_plate') - .circuit(4) - .itemOutputs('kubejs:americium_fin') - .duration(100) - .EUt(122800); - event.recipes.gtceu.assembler('kubejs:americium_nose_cone') - .itemInputs('4x gtceu:americium_plate') - .itemInputs('2x gtceu:americium_round') - .itemInputs('gtceu:annealed_copper_rod') - .itemInputs('gtceu:annealed_copper_nugget') - .itemInputs('4x gtceu:osmiridium_screw') - .inputFluids('gtceu:styrene_butadiene_rubber 288') - .itemOutputs('kubejs:americium_nose_cone') - .duration(100) - .EUt(122800); - event.recipes.gtceu.assembly_line('kubejs:americium_engine') - .itemInputs('4x gtceu:americium_plate') - .itemInputs('gtceu:stainless_steel_rotor') - .itemInputs('gtceu:vanadium_gallium_single_cable') - .itemInputs('gtceu:zpm_quantum_tank') - .itemInputs('gtceu:zpm_electric_motor') - .itemInputs('4x gtceu:osmiridium_screw') - .itemInputs('4x gtceu:osmiridium_round') - .inputFluids('gtceu:styrene_butadiene_rubber 288') - .inputFluids('gtceu:soldering_alloy 432') - .itemOutputs('kubejs:americium_engine') - .duration(100) - .EUt(122800); - event.recipes.gtceu.assembler('ad_astra:launch_pad') - .itemInputs('4x gtceu:stainless_steel_plate') - .itemInputs('4x gtceu:steel_plate') - .itemOutputs('ad_astra:launch_pad') - .duration(100) - .EUt(480); - - - - - ]) - - -//Crafting Recipes -//Wrought Iron Base Molds -event.remove({ output: 'gtceu:empty_mold' }) -event.shaped('gtceu:empty_mold', [ - 'HF ', - 'WW ', - 'WW ' + // //Lmao + // event.remove([{ type: 'gtceu:steam_turbine' },{ type: 'gtceu:gas_turbine' },{ type: 'gtceu:combustion_generator' },{ type: 'gtceu:plasma_generator' }]) + + // GTRegistries.MATERIALS.forEach(id => { + // event.remove(`gtceu:${id}_turbine_blade`) + // }) + + + + + + + + event.remove({ output: 'gtceu:firebrick' }) + event.recipes.gtceu.masonry_oven('gtceu:firebrick_masonry') + .itemInputs('gtceu:compressed_fireclay') + .itemInputs('gtceu:coal_dust') + .itemOutputs('gtceu:firebrick') + .itemOutputs('gtceu:ash_dust') + .notConsumable('gtceu:ingot_casting_mold') + .duration(100) + .EUt(8); + event.recipes.gtceu.masonry_oven('gtceu:andesite_alloy_masonry') + .itemInputs('minecraft:andesite') + .itemInputs('gtceu:zinc_dust') + .itemOutputs('create:andesite_alloy') + .notConsumable('gtceu:ingot_casting_mold') + .duration(100) + .EUt(8); + event.recipes.gtceu.macerator('gtceu:treated_wood_dust_shred') + .itemInputs('gtceu:treated_wood_planks') + .itemOutputs('gtceu:treated_wood_dust') + .duration(40) + .EUt(8); + event.recipes.gtceu.macerator('gtceu:nether_brick_dust_shred') + .itemInputs('minecraft:nether_bricks') + .itemOutputs('gtceu:nether_brick_dust_dust') + .duration(40) + .EUt(16); + event.remove({ output: 'gtceu:fireclay_dust' }) + event.shapeless('2x gtceu:fireclay_dust', [ + 'gtceu:nether_brick_dust_dust', + 'gtceu:clay_dust' + ]) + + event.recipes.gtceu.bender('kubejs:stainless_steel_fin') + .itemInputs('6x gtceu:stainless_steel_plate') + .circuit(4) + .itemOutputs('kubejs:stainless_steel_fin') + .duration(100) + .EUt(480); + event.recipes.gtceu.assembler('kubejs:stainless_steel_nose_cone') + .itemInputs('4x gtceu:stainless_steel_plate') + .itemInputs('gtceu:annealed_copper_rod') + .itemInputs('gtceu:annealed_copper_nugget') + .inputFluids('gtceu:polytetrafluoroethylene 288') + .itemOutputs('kubejs:stainless_steel_nose_cone') + .duration(100) + .EUt(480); + event.recipes.gtceu.assembler('kubejs:stainless_steel_engine') + .itemInputs('4x gtceu:stainless_steel_plate') + .itemInputs('gtceu:stainless_steel_rotor') + .itemInputs('gtceu:stainless_steel_drum') + .itemInputs('gtceu:hv_electric_motor') + .inputFluids('gtceu:polytetrafluoroethylene 432') + .itemOutputs('kubejs:stainless_steel_engine') + .duration(100) + .EUt(480); + event.recipes.gtceu.bender('kubejs:hsse_fin') + .itemInputs('6x gtceu:hsse_plate') + .circuit(4) + .itemOutputs('kubejs:hsse_fin') + .duration(100) + .EUt(4046); + event.recipes.gtceu.assembler('kubejs:hsse_nose_cone') + .itemInputs('4x gtceu:hsse_plate') + .itemInputs('gtceu:annealed_copper_rod') + .itemInputs('gtceu:annealed_copper_nugget') + .inputFluids('gtceu:polytetrafluoroethylene 288') + .itemOutputs('kubejs:hsse_nose_cone') + .duration(100) + .EUt(4046); + event.recipes.gtceu.assembler('kubejs:hsse_engine') + .itemInputs('4x gtceu:hsse_plate') + .itemInputs('gtceu:stainless_steel_rotor') + .itemInputs('gtceu:iv_quantum_tank') + .itemInputs('gtceu:iv_electric_motor') + .inputFluids('gtceu:polytetrafluoroethylene 432') + .itemOutputs('kubejs:hsse_engine') + .duration(100) + .EUt(4046); + event.recipes.gtceu.bender('kubejs:osmiridium_fin') + .itemInputs('6x gtceu:osmiridium_plate') + .circuit(4) + .itemOutputs('kubejs:osmiridium_fin') + .duration(100) + .EUt(30720); + event.recipes.gtceu.assembler('kubejs:osmiridium_nose_cone') + .itemInputs('4x gtceu:osmiridium_plate') + .itemInputs('gtceu:annealed_copper_rod') + .itemInputs('gtceu:annealed_copper_nugget') + .inputFluids('gtceu:styrene_butadiene_rubber 288') + .itemOutputs('kubejs:osmiridium_nose_cone') + .duration(100) + .EUt(30720); + event.recipes.gtceu.assembly_line('kubejs:osmiridium_engine') + .itemInputs('4x gtceu:osmiridium_plate') + .itemInputs('2x gtceu:osmiridium_round') + .itemInputs('gtceu:stainless_steel_rotor') + .itemInputs('gtceu:niobium_titanium_small_fluid_pipe') + .itemInputs('gtceu:luv_quantum_tank') + .itemInputs('gtceu:luv_electric_motor') + .itemInputs('4x gtceu:hsss_screw') + .inputFluids('gtceu:styrene_butadiene_rubber 288') + .inputFluids('gtceu:soldering_alloy 432') + .itemOutputs('kubejs:osmiridium_engine') + .duration(100) + .EUt(30720); + event.recipes.gtceu.bender('kubejs:americium_fin') + .itemInputs('6x gtceu:americium_plate') + .circuit(4) + .itemOutputs('kubejs:americium_fin') + .duration(100) + .EUt(122800); + event.recipes.gtceu.assembler('kubejs:americium_nose_cone') + .itemInputs('4x gtceu:americium_plate') + .itemInputs('2x gtceu:americium_round') + .itemInputs('gtceu:annealed_copper_rod') + .itemInputs('gtceu:annealed_copper_nugget') + .itemInputs('4x gtceu:osmiridium_screw') + .inputFluids('gtceu:styrene_butadiene_rubber 288') + .itemOutputs('kubejs:americium_nose_cone') + .duration(100) + .EUt(122800); + event.recipes.gtceu.assembly_line('kubejs:americium_engine') + .itemInputs('4x gtceu:americium_plate') + .itemInputs('gtceu:stainless_steel_rotor') + .itemInputs('gtceu:vanadium_gallium_single_cable') + .itemInputs('gtceu:zpm_quantum_tank') + .itemInputs('gtceu:zpm_electric_motor') + .itemInputs('4x gtceu:osmiridium_screw') + .itemInputs('4x gtceu:osmiridium_round') + .inputFluids('gtceu:styrene_butadiene_rubber 288') + .inputFluids('gtceu:soldering_alloy 432') + .itemOutputs('kubejs:americium_engine') + .duration(100) + .EUt(122800); + event.recipes.gtceu.assembler('ad_astra:launch_pad') + .itemInputs('4x gtceu:stainless_steel_plate') + .itemInputs('4x gtceu:steel_plate') + .itemOutputs('ad_astra:launch_pad') + .duration(100) + .EUt(480); + //ManaSteel Stuff + event.remove({ id: 'gtceu:wiremill/mill_mana_steel_wire' }) + event.remove({ id: 'gtceu:extruder/extrude_mana_steel_wire' }) + event.recipes.gtceu.wiremill('gtceu:manasteel_wire_recipe') + .itemInputs('botania:manasteel_ingot') + .itemOutputs('2x gtceu:mana_steel_single_wire') + .duration(26) + .EUt(GTValues.VA[GTValues.LV]); + + event.recipes.gtceu.wiremill('gtceu:manasteel_fine_wire_recipe') + .itemInputs('gtceu:mana_steel_single_wire') + .itemOutputs('4x gtceu:mana_steel_fine_wire') + .duration(26) + .EUt(GTValues.VA[GTValues.LV]); + event.recipes.gtceu.bender('gtceu:manasteel_plate') + .itemInputs('botania:manasteel_ingot') + .itemOutputs('gtceu:mana_steel_plate') + .duration(26) + .circuit(1) + .EUt(GTValues.VA[GTValues.LV]); + event.recipes.gtceu.bender('gtceu:manasteel_plate_to_foil') + .itemInputs('gtceu:mana_steel_plate') + .itemOutputs('4x gtceu:mana_steel_foil') + .duration(26) + .circuit(1) + .EUt(GTValues.VA[GTValues.LV]); + event.recipes.gtceu.bender('gtceu:manasteel_ingot_to_foil') + .itemInputs('botania:manasteel_ingot') + .itemOutputs('4x gtceu:mana_steel_foil') + .duration(26) + .circuit(10) + .EUt(GTValues.VA[GTValues.LV]); + let manawires = ['gtceu:mana_steel_single_cable', 'gtceu:mana_steel_double_cable', 'gtceu:mana_steel_quadruple_cable', 'gtceu:mana_steel_octal_cable', 'gtceu:mana_steel_hex_cable'] + event.remove({ output: manawires }) + event.recipes.gtceu.spooling_machine('gtceu:mana_steel_single_cable_wrapping') + .itemInputs(['gtceu:mana_steel_single_wire', '2x ars_nouveau:magebloom_fiber']) + .itemOutputs('gtceu:mana_steel_single_cable') + .duration(60) + .EUt(GTValues.VA[GTValues.LV]); + event.recipes.gtceu.spooling_machine('gtceu:mana_steel_double_cable_wrapping') + .itemInputs(['gtceu:mana_steel_double_wire', '4x ars_nouveau:magebloom_fiber']) + .itemOutputs('gtceu:mana_steel_double_cable') + .duration(60) + .EUt(GTValues.VA[GTValues.LV]); + event.recipes.gtceu.spooling_machine('gtceu:mana_steel_quad_cable_wrapping') + .itemInputs(['gtceu:mana_steel_quadruple_wire', '8x ars_nouveau:magebloom_fiber']) + .itemOutputs('gtceu:mana_steel_quadruple_cable') + .duration(60) + .EUt(GTValues.VA[GTValues.LV]); + event.recipes.gtceu.spooling_machine('gtceu:mana_steel_octal_cable_wrapping') + .itemInputs(['gtceu:mana_steel_octal_wire', '16x ars_nouveau:magebloom_fiber']) + .itemOutputs('gtceu:mana_steel_octal_cable') + .duration(60) + .EUt(GTValues.VA[GTValues.LV]); + event.recipes.gtceu.spooling_machine('gtceu:mana_steel_hex_cable_wrapping') + .itemInputs(['gtceu:mana_steel_hex_wire', '32x ars_nouveau:magebloom_fiber']) + .itemOutputs('gtceu:mana_steel_hex_cable') + .duration(60) + .EUt(GTValues.VA[GTValues.LV]); + + //LV EMITTER + event.remove({ output: 'gtceu:lv_emitter' }) + event.recipes.gtceu.assembler('gtceu:lv_emitter_recipe') + .itemInputs(['2x gtceu:mana_steel_single_cable', '4x gtceu:mana_steel_rod', 'gtceu:quartzite_gem', '2x #forge:circuits/lv']) + .itemOutputs('gtceu:lv_emitter') + .duration(40) + .EUt(GTValues.VA[GTValues.LV]); + //HULLS + //MV MACHINE HULL AND CASING + event.remove({ output: 'gtceu:mv_machine_casing' }) + event.recipes.gtceu.assembler('gtceu:mv_machine_casing_assembler') + .itemInputs(['4x gtceu:aluminium_double_plate', '4x gtceu:mana_steel_plate']) + .itemOutputs('gtceu:mv_machine_casing') + .duration(40) + .EUt(GTValues.VA[GTValues.LV]); + event.shaped('gtceu:mv_machine_casing', [ + 'AMA', + 'MWM', + 'AMA' ], { - W: 'gtceu:wrought_iron_plate', - H: '#forge:tools/files', - F: '#forge:tools/hammers' + A: 'gtceu:aluminium_double_plate', + M: 'gtceu:mana_steel_plate', + W: '#forge:tools/wrenches' } -) -//Masonry Oven -event.shaped('gtceu:lp_steam_masonry_oven', [ - 'BBB', - 'PFP', - 'SSS' -], { - B: 'gtceu:bronze_plate', - P: 'gtceu:bronze_small_fluid_pipe', - F: 'minecraft:furnace', - S: 'minecraft:smooth_stone', -}) -//HP Masonry Oven -event.shaped('gtceu:hp_steam_masonry_oven', [ - 'WWW', - 'PBP', - 'SSS' -], { - W: 'gtceu:wrought_iron_plate', - P: 'gtceu:steel_small_fluid_pipe', - B: 'minecraft:blast_furnace', - S: 'minecraft:smooth_stone', -}) -//Custom Recipe Handler? - Reference - Otherwise just dump the recipe in questions JSON into event.custom() - let drying = (dryingoutput, dryingInput, duration) => { - event.custom({"type": "integrateddynamics:drying_basin", - "item": dryingInput, - "duration": duration, - "result": { item : dryingoutput} + ) + //Crafting Recipes + //Wrought Iron Base Molds 'gtceu:mv_machine_casing' + event.remove({ output: 'gtceu:empty_mold' }) + event.shaped('gtceu:empty_mold', [ + 'HF ', + 'WW ', + 'WW ' + ], { + W: 'gtceu:wrought_iron_plate', + H: '#forge:tools/files', + F: '#forge:tools/hammers' + } + ) + //Masonry Oven + event.shaped('gtceu:lp_steam_masonry_oven', [ + 'BBB', + 'PFP', + 'SSS' + ], { + B: 'gtceu:bronze_plate', + P: 'gtceu:bronze_small_fluid_pipe', + F: 'minecraft:furnace', + S: 'minecraft:smooth_stone', }) -} -drying('create:shaft','create:cogwheel',40) + //HP Masonry Oven + event.shaped('gtceu:hp_steam_masonry_oven', [ + 'WWW', + 'PBP', + 'SSS' + ], { + W: 'gtceu:wrought_iron_plate', + P: 'gtceu:steel_small_fluid_pipe', + B: 'minecraft:blast_furnace', + S: 'minecraft:smooth_stone', + }) + //LV Circuit assembler + event.remove({ output: 'gtceu:lv_circuit_assembler' }) + event.shaped('gtceu:lv_circuit_assembler', [ + 'RCE', + 'OHO', + 'WCW' + ], { + W: 'gtceu:mana_steel_double_cable', + R: 'gtceu:lv_robot_arm', + H: 'gtceu:lv_machine_hull', + C: '#forge:circuits/mv', + E: 'gtceu:lv_emitter', + O: 'gtceu:lv_conveyor_module', + }) + //Custom Recipe Handler? - Reference - Otherwise just dump the recipe in questions JSON into event.custom() + let drying = (dryingoutput, dryingInput, duration) => { + event.custom({ + "type": "integrateddynamics:drying_basin", + "item": dryingInput, + "duration": duration, + "result": { item: dryingoutput } + }) + } + drying('create:shaft', 'create:cogwheel', 40) }) ServerEvents.tags('item', event => { - //Exclude Hammers - GTRegistries.MATERIALS.forEach(id => { - event.add('ftbultimine:excluded_tools', [`gtceu:${id}_mining_hammer`]) - }) - + //Exclude Hammers + GTRegistries.MATERIALS.forEach(id => { + event.add('ftbultimine:excluded_tools', [`gtceu:${id}_mining_hammer`]) + }) + GTRegistries.MATERIALS.forEach(id => { + event.add('forge:viewers/hidden_from_recipe', [`gtceu:${id}_turbine_blade`]) }) - +}) + ServerEvents.tags('block', event => { - GTRegistries.MATERIALS.forEach(id => { - event.add('ftbultimine:excluded_blocks', [`gtceu:andesite_${id}_ore`, `gtceu:diorite_${id}_ore`, `gtceu:deepslate_${id}_ore`, `gtceu:${id}_ore`, `gtceu:granite_${id}_ore`, `gtceu:netherrack_${id}_ore`, `gtceu:endstone_${id}_ore`]) - }) - event.add('ftbultimine:excluded_blocks', 'minecraft:powder_snow') - - event.remove('aether:aether_portal_blocks', 'minecraft:glowstone'), - event.add('aether:aether_portal_blocks', 'gtceu:frostproof_machine_casing') + GTRegistries.MATERIALS.forEach(id => { + event.add('ftbultimine:excluded_blocks', [`gtceu:andesite_${id}_ore`, `gtceu:diorite_${id}_ore`, `gtceu:deepslate_${id}_ore`, `gtceu:${id}_ore`, `gtceu:granite_${id}_ore`, `gtceu:netherrack_${id}_ore`, `gtceu:endstone_${id}_ore`]) }) + event.add('ftbultimine:excluded_blocks', 'minecraft:powder_snow') + event.remove('aether:aether_portal_blocks', 'minecraft:glowstone'), + event.add('aether:aether_portal_blocks', 'gtceu:frostproof_machine_casing') +}) +ServerEvents.recipes(e => { + // for this code to work, kubejs:incomplete_spore_blossom needs to be added to the game + let inter = 'gtceu:lv_machine_hull' // making a variable to store the transitional item makes the code more readable + e.recipes.create.sequenced_assembly([ + Item.of('gtceu:lv_energy_output_hatch'), // this is the item that will appear in JEI as the result + ], 'gtceu:lv_machine_hull', [ // 'flowering_azalea_leaves' is the input + // the transitional item is a variable, that is 'kubejs:incomplete_spore_blossom' and is used during the intermediate stages of the assembly + e.recipes.createDeploying(inter, [inter, 'gtceu:steel_spring']), + e.recipes.createDeploying(inter, [inter, 'gtceu:tin_spring']), + e.recipes.createDeploying(inter, [inter, 'gtceu:tin_spring']), + e.recipes.createDeploying(inter, [inter, 'gtceu:rubber_plate']), + ]).transitionalItem(inter).loops(2) // set the transitional item and the number of loops +}) diff --git a/overrides/kubejs/server_scripts/Recipes/SophisticatedMods.js b/overrides/kubejs/server_scripts/Recipes/SophisticatedMods.js index b4e2b838..898cbd92 100644 --- a/overrides/kubejs/server_scripts/Recipes/SophisticatedMods.js +++ b/overrides/kubejs/server_scripts/Recipes/SophisticatedMods.js @@ -1,242 +1,260 @@ -ServerEvents.recipes(event => { -//I Love Fixing Merge Conflicts ~Ghostipedia 2023 +//A Simple "REMOVE AND HIDE" function akin to GroovyScript's Jei.yeet() function - This will tag the item for hiding from recipe viewers and remove the recipe +//This one also has a tag removal function to remove the forge:tools/knives tag from what is removed so bear that in mind if you copy/paste this around +let yeet = (itemName) => { + ServerEvents.recipes(event => { + event.remove({ output: itemName }) + }) + ServerEvents.tags('item', event => { + event.add('forge:viewers/hidden_from_recipe', itemName) + + }) +} +let DONOTEXIST = ['sophisticatedstorage:stack_upgrade_tier_1', 'sophisticatedstorage:stack_upgrade_tier_2', 'sophisticatedstorage:stack_upgrade_tier_3', 'sophisticatedstorage:stack_upgrade_tier_4', 'sophisticatedbackpacks:stack_upgrade_tier_1', 'sophisticatedbackpacks:stack_upgrade_tier_2', 'sophisticatedbackpacks:stack_upgrade_tier_3', 'sophisticatedbackpacks:stack_upgrade_tier_4'] + +ServerEvents.tags('item', event => { + event.add('forge:viewers/hidden_from_recipe', DONOTEXIST) + +}) +ServerEvents.recipes(event => { + //I Love Fixing Merge Conflicts ~Ghostipedia 2023 console.log('[SophisticatedMods.js loading]') - event.remove({ mod: 'sophisticatedstorage' }) + // event.remove({ mod: 'sophisticatedstorage' }) event.remove({ mod: 'sophisticatedbackpacks' }) - /* BACKPACKS */ - -//Backpacks base tiers -//Base -event.remove({ output: 'sophisticatedbackpacks:backpack' }) -event.shaped('sophisticatedbackpacks:backpack', [ - 'SWS', - 'SCS', - 'WWW' -], { - S: 'minecraft:string', - C: 'gtceu:bronze_crate', - W: 'cosmiccore:waxed_leather', -}) - -//Yup, Upgrading Backpacks takes a special recipetype... -event.remove({ output: 'sophisticatedbackpacks:iron_backpack' }) -event.custom({ - 'type': 'sophisticatedbackpacks:backpack_upgrade', - 'conditions': [ - { - 'itemRegistryName': 'sophisticatedbackpacks:iron_backpack', //What tier it's being upgraded to - 'type': 'sophisticatedcore:item_enabled' - } - ], - 'pattern': [ - 'DWD', - 'WBW', - 'DWD' - ], - 'key': { - 'D': { - 'item': 'gtceu:wrought_iron_plate' - }, - 'B': { - 'item': 'sophisticatedbackpacks:backpack' + /* BACKPACKS */ + + event.remove({ output: DONOTEXIST }) + //Backpacks base tiers + //Base + event.remove({ output: 'sophisticatedbackpacks:backpack' }) + event.shaped('sophisticatedbackpacks:backpack', [ + 'SWS', + 'SCS', + 'WWW' + ], { + S: 'minecraft:string', + C: 'gtceu:bronze_crate', + W: 'cosmiccore:waxed_leather', + }) + + //Yup, Upgrading Backpacks takes a special recipetype... + event.remove({ output: 'sophisticatedbackpacks:iron_backpack' }) + event.custom({ + 'type': 'sophisticatedbackpacks:backpack_upgrade', + 'conditions': [ + { + 'itemRegistryName': 'sophisticatedbackpacks:iron_backpack', //What tier it's being upgraded to + 'type': 'sophisticatedcore:item_enabled' + } + ], + 'pattern': [ + 'DWD', + 'WBW', + 'DWD' + ], + 'key': { + 'D': { + 'item': 'gtceu:wrought_iron_plate' + }, + 'B': { + 'item': 'sophisticatedbackpacks:backpack' + }, + 'W': { + 'item': 'cosmiccore:waxed_leather' + } }, - 'W': { - 'item': 'cosmiccore:waxed_leather' - } - }, - 'result': { - 'item': 'sophisticatedbackpacks:iron_backpack' // Same case as the Registry name - } -}) - -//GOLD BACKPACK -event.remove({ output: 'sophisticatedbackpacks:gold_backpack' }) -event.custom({ - 'type': 'sophisticatedbackpacks:backpack_upgrade', - 'conditions': [ - { - 'itemRegistryName': 'sophisticatedbackpacks:gold_backpack', //What tier it's being upgraded to - 'type': 'sophisticatedcore:item_enabled' + 'result': { + 'item': 'sophisticatedbackpacks:iron_backpack' // Same case as the Registry name } - ], - 'pattern': [ - 'DWD', - 'WBW', - 'DWD' - ], - 'key': { - 'D': { - 'item': 'gtceu:rose_gold_plate' - }, - 'B': { - 'item': 'sophisticatedbackpacks:iron_backpack' + }) + + //GOLD BACKPACK + event.remove({ output: 'sophisticatedbackpacks:gold_backpack' }) + event.custom({ + 'type': 'sophisticatedbackpacks:backpack_upgrade', + 'conditions': [ + { + 'itemRegistryName': 'sophisticatedbackpacks:gold_backpack', //What tier it's being upgraded to + 'type': 'sophisticatedcore:item_enabled' + } + ], + 'pattern': [ + 'DWD', + 'WBW', + 'DWD' + ], + 'key': { + 'D': { + 'item': 'gtceu:rose_gold_plate' + }, + 'B': { + 'item': 'sophisticatedbackpacks:iron_backpack' + }, + 'W': { + 'item': 'cosmiccore:waxed_leather' + } }, - 'W': { - 'item': 'cosmiccore:waxed_leather' + 'result': { + 'item': 'sophisticatedbackpacks:gold_backpack' // Same case as the Registry name } - }, - 'result': { - 'item': 'sophisticatedbackpacks:gold_backpack' // Same case as the Registry name - } -}) - -//DIAMOND BACKPACK -event.remove({ output: 'sophisticatedbackpacks:diamond_backpack' }) -event.custom({ - 'type': 'sophisticatedbackpacks:backpack_upgrade', - 'conditions': [ - { - 'itemRegistryName': 'sophisticatedbackpacks:diamond_backpack', //What tier it's being upgraded to - 'type': 'sophisticatedcore:item_enabled' - } - ], - 'pattern': [ - 'DWD', - 'WBW', - 'DWD' - ], - 'key': { - 'D': { - 'item': 'gtceu:diamond_exquisite_gem' - }, - 'B': { - 'item': 'sophisticatedbackpacks:gold_backpack' + }) + + //DIAMOND BACKPACK + event.remove({ output: 'sophisticatedbackpacks:diamond_backpack' }) + event.custom({ + 'type': 'sophisticatedbackpacks:backpack_upgrade', + 'conditions': [ + { + 'itemRegistryName': 'sophisticatedbackpacks:diamond_backpack', //What tier it's being upgraded to + 'type': 'sophisticatedcore:item_enabled' + } + ], + 'pattern': [ + 'DWD', + 'WBW', + 'DWD' + ], + 'key': { + 'D': { + 'item': 'gtceu:diamond_exquisite_gem' + }, + 'B': { + 'item': 'sophisticatedbackpacks:gold_backpack' + }, + 'W': { + 'item': 'cosmiccore:waxed_leather' + } }, - 'W': { - 'item': 'cosmiccore:waxed_leather' + 'result': { + 'item': 'sophisticatedbackpacks:diamond_backpack' // Same case as the Registry name } - }, - 'result': { - 'item': 'sophisticatedbackpacks:diamond_backpack' // Same case as the Registry name - } -}) + }) /* METHODS & UTILS */ const woodTypes = ['oak', 'spruce', 'birch', 'jungle', 'acacia', 'dark_oak', 'mangrove', 'crimson', 'warped']; let woodBarrel = (woodType) => { - // i didn't find a way to apply nbt data to an output + // i didn't find a way to apply nbt data to an output event.custom({ 'type': 'minecraft:crafting_shaped', 'conditions': [ - { - 'type': 'sophisticatedcore:item_enabled', - 'itemRegistryName': 'sophisticatedstorage:barrel' - } + { + 'type': 'sophisticatedcore:item_enabled', + 'itemRegistryName': 'sophisticatedstorage:barrel' + } ], 'key': { - 'C': { - 'item': 'minecraft:barrel' - }, - 'S': { - 'item': `minecraft:${woodType}_slab` - }, - 'E': { - 'tag': 'forge:tools/saws' - }, - 'P': { - 'item': `minecraft:${woodType}_planks` - } + 'C': { + 'item': 'minecraft:barrel' + }, + 'S': { + 'item': `minecraft:${woodType}_slab` + }, + 'E': { + 'tag': 'forge:tools/saws' + }, + 'P': { + 'item': `minecraft:${woodType}_planks` + } }, 'pattern': [ - 'PEP', - 'PCP', - 'PSP' + 'PEP', + 'PCP', + 'PSP' ], 'result': { - 'item': 'sophisticatedstorage:barrel', - 'nbt': `{woodType:\'${woodType}\'}` + 'item': 'sophisticatedstorage:barrel', + 'nbt': `{woodType:\'${woodType}\'}` } - }); -} + }); + } let containerTierUpgrade = (materialOne, materialTwo, nextTier, previousTier) => { - event.custom( + event.custom( + { + 'type': 'sophisticatedstorage:storage_tier_upgrade', + 'conditions': [ { - 'type': 'sophisticatedstorage:storage_tier_upgrade', - 'conditions': [ - { - 'type': 'sophisticatedcore:item_enabled', - 'itemRegistryName': `sophisticatedstorage:${nextTier}` - } - ], - 'key': { - 'C': { - 'item': `sophisticatedstorage:${previousTier}` - }, - 'S': { - 'tag': 'forge:tools/saws' - }, - 'H': { - 'tag': 'forge:tools/hammers' - }, - 'R': { - 'tag': materialOne - }, - 'P': { - 'item': materialTwo - } - }, - 'pattern': [ - 'PRP', - 'SCH', - 'PRP' - ], - 'result': { - 'item': `sophisticatedstorage:${nextTier}` - } + 'type': 'sophisticatedcore:item_enabled', + 'itemRegistryName': `sophisticatedstorage:${nextTier}` + } + ], + 'key': { + 'C': { + 'item': `sophisticatedstorage:${previousTier}` + }, + 'S': { + 'tag': 'forge:tools/saws' + }, + 'H': { + 'tag': 'forge:tools/hammers' + }, + 'R': { + 'tag': materialOne + }, + 'P': { + 'item': materialTwo } - ); + }, + 'pattern': [ + 'PRP', + 'SCH', + 'PRP' + ], + 'result': { + 'item': `sophisticatedstorage:${nextTier}` + } + } + ); } let upgradeUpgrade = (materialOne, materialTwo, coreItem, result) => { - event.shaped(result, [ - 'OTO', - 'TCT', - 'OTO' - ], { - O: materialOne, - T: materialTwo, - C: coreItem - }) + event.shaped(result, [ + 'OTO', + 'TCT', + 'OTO' + ], { + O: materialOne, + T: materialTwo, + C: coreItem + }) } let upgradeStorage = (input, result) => { - upgradeUpgrade(input, '#forge:dusts/redstone', 'sophisticatedstorage:upgrade_base', `sophisticatedstorage:${result}_upgrade`); - upgradeUpgrade('gtceu:rose_gold_screw', '#forge:dusts/redstone', `sophisticatedstorage:${result}_upgrade`, `sophisticatedstorage:advanced_${result}_upgrade`); + upgradeUpgrade(input, '#forge:dusts/redstone', 'sophisticatedstorage:upgrade_base', `sophisticatedstorage:${result}_upgrade`); + upgradeUpgrade('gtceu:rose_gold_screw', '#forge:dusts/redstone', `sophisticatedstorage:${result}_upgrade`, `sophisticatedstorage:advanced_${result}_upgrade`); } let upgradeSmeltingStorage = (input, result) => { upgradeUpgrade(input, '#forge:dusts/redstone', 'sophisticatedstorage:upgrade_base', `sophisticatedstorage:${result}_upgrade`); upgradeUpgrade('gtceu:rose_gold_screw', '#forge:dusts/redstone', `sophisticatedstorage:${result}_upgrade`, `sophisticatedstorage:auto_${result}_upgrade`); -} + } let upgradeBackpacks = (input, result) => { upgradeUpgrade(input, 'cosmiccore:waxed_leather', 'sophisticatedbackpacks:upgrade_base', `sophisticatedbackpacks:${result}_upgrade`); upgradeUpgrade('gtceu:rose_gold_screw', '#forge:dusts/redstone', `sophisticatedbackpacks:${result}_upgrade`, `sophisticatedbackpacks:advanced_${result}_upgrade`); -} + } -let upgradeSmeltingBackpacks = (input, result) => { - upgradeUpgrade(input, '#forge:dusts/redstone', 'sophisticatedbackpacks:upgrade_base', `sophisticatedbackpacks:${result}_upgrade`); - upgradeUpgrade('gtceu:rose_gold_screw', '#forge:dusts/redstone', `sophisticatedbackpacks:${result}_upgrade`, `sophisticatedbackpacks:auto_${result}_upgrade`); -} + let upgradeSmeltingBackpacks = (input, result) => { + upgradeUpgrade(input, '#forge:dusts/redstone', 'sophisticatedbackpacks:upgrade_base', `sophisticatedbackpacks:${result}_upgrade`); + upgradeUpgrade('gtceu:rose_gold_screw', '#forge:dusts/redstone', `sophisticatedbackpacks:${result}_upgrade`, `sophisticatedbackpacks:auto_${result}_upgrade`); + } /* STORAGE */ - woodTypes.forEach(function(woodType) { - woodBarrel(woodType); + woodTypes.forEach(function (woodType) { + woodBarrel(woodType); }); containerTierUpgrade('forge:rings/wrought_iron', 'gtceu:wrought_iron_plate', 'iron_barrel', 'barrel'); containerTierUpgrade('forge:rings/rose_gold', 'gtceu:rose_gold_plate', 'gold_barrel', 'iron_barrel'); - containerTierUpgrade('forge:plates/diamond', 'gtceu:diamond_exquisite_gem' ,'diamond_barrel', 'gold_barrel'); + containerTierUpgrade('forge:plates/diamond', 'gtceu:diamond_exquisite_gem', 'diamond_barrel', 'gold_barrel'); containerTierUpgrade('forge:rings/wrought_iron', 'gtceu:wrought_iron_plate', 'iron_chest', 'chest'); containerTierUpgrade('forge:rings/rose_gold', 'gtceu:rose_gold_plate', 'gold_chest', 'iron_chest'); - containerTierUpgrade('forge:plates/diamond', 'gtceu:diamond_exquisite_gem' ,'diamond_chest', 'gold_chest'); + containerTierUpgrade('forge:plates/diamond', 'gtceu:diamond_exquisite_gem', 'diamond_chest', 'gold_chest'); /* UPGRADES */ @@ -266,13 +284,13 @@ let upgradeSmeltingBackpacks = (input, result) => { upgradeUpgrade('minecraft:jukebox', '#forge:dusts/redstone', 'sophisticatedstorage:upgrade_base', `sophisticatedstorage:jukebox_upgrade`); upgradeUpgrade('#forge:dusts/redstone', 'minecraft:piston', 'sophisticatedstorage:upgrade_base', `sophisticatedstorage:compression_upgrade`); -// YES, I GAME UP HERE! -// I'M FUCKING TIRED AHHHHHHHHHHHHHH + // YES, I GAME UP HERE! + // I'M FUCKING TIRED AHHHHHHHHHHHHHH - upgradeUpgrade('gtceu:wood_screw', 'gtceu:wood_plate', `sophisticatedstorage:upgrade_base`, `sophisticatedstorage:stack_upgrade_tier_1`); - upgradeUpgrade('gtceu:wrought_iron_screw', 'gtceu:wrought_iron_plate', `sophisticatedstorage:stack_upgrade_tier_1`, `sophisticatedstorage:stack_upgrade_tier_2`); - upgradeUpgrade('gtceu:rose_gold_screw', 'gtceu:rose_gold_plate', `sophisticatedstorage:stack_upgrade_tier_2`, `sophisticatedstorage:stack_upgrade_tier_3`); - upgradeUpgrade('gtceu:diamond_exquisite_gem', 'gtceu:diamond_plate', `sophisticatedstorage:stack_upgrade_tier_3`, `sophisticatedstorage:stack_upgrade_tier_4`); + // upgradeUpgrade('gtceu:wood_screw', 'gtceu:wood_plate', `sophisticatedstorage:upgrade_base`, `sophisticatedstorage:stack_upgrade_tier_1`); + // upgradeUpgrade('gtceu:wrought_iron_screw', 'gtceu:wrought_iron_plate', `sophisticatedstorage:stack_upgrade_tier_1`, `sophisticatedstorage:stack_upgrade_tier_2`); + // upgradeUpgrade('gtceu:rose_gold_screw', 'gtceu:rose_gold_plate', `sophisticatedstorage:stack_upgrade_tier_2`, `sophisticatedstorage:stack_upgrade_tier_3`); + // upgradeUpgrade('gtceu:diamond_exquisite_gem', 'gtceu:diamond_plate', `sophisticatedstorage:stack_upgrade_tier_3`, `sophisticatedstorage:stack_upgrade_tier_4`); @@ -304,9 +322,9 @@ let upgradeSmeltingBackpacks = (input, result) => { upgradeUpgrade('gtceu:lv_super_tank', '#forge:dusts/redstone', 'sophisticatedbackpacks:upgrade_base', `sophisticatedbackpacks:tank_upgrade`); upgradeUpgrade('gtceu:lv_sodium_battery', '#forge:dusts/redstone', 'sophisticatedbackpacks:upgrade_base', `sophisticatedbackpacks:battery_upgrade`); upgradeUpgrade('minecraft:anvil', '#forge:dusts/redstone', 'sophisticatedbackpacks:upgrade_base', `sophisticatedbackpacks:anvil_upgrade`); - upgradeUpgrade('gtceu:wood_screw', 'cosmiccore:waxed_leather', `sophisticatedbackpacks:upgrade_base`, `sophisticatedbackpacks:stack_upgrade_tier_1`); - upgradeUpgrade('gtceu:wrought_iron_screw', 'gtceu:wrought_iron_plate', `sophisticatedbackpacks:stack_upgrade_tier_1`, `sophisticatedbackpacks:stack_upgrade_tier_2`); - upgradeUpgrade('gtceu:rose_gold_screw', 'gtceu:rose_gold_plate', `sophisticatedbackpacks:stack_upgrade_tier_2`, `sophisticatedbackpacks:stack_upgrade_tier_3`); - upgradeUpgrade('gtceu:diamond_exquisite_gem', 'gtceu:diamond_plate', `sophisticatedbackpacks:stack_upgrade_tier_3`, `sophisticatedbackpacks:stack_upgrade_tier_4`); + // upgradeUpgrade('gtceu:wood_screw', 'cosmiccore:waxed_leather', `sophisticatedbackpacks:upgrade_base`, `sophisticatedbackpacks:stack_upgrade_tier_1`); + // upgradeUpgrade('gtceu:wrought_iron_screw', 'gtceu:wrought_iron_plate', `sophisticatedbackpacks:stack_upgrade_tier_1`, `sophisticatedbackpacks:stack_upgrade_tier_2`); + // upgradeUpgrade('gtceu:rose_gold_screw', 'gtceu:rose_gold_plate', `sophisticatedbackpacks:stack_upgrade_tier_2`, `sophisticatedbackpacks:stack_upgrade_tier_3`); + // upgradeUpgrade('gtceu:diamond_exquisite_gem', 'gtceu:diamond_plate', `sophisticatedbackpacks:stack_upgrade_tier_3`, `sophisticatedbackpacks:stack_upgrade_tier_4`); }) \ No newline at end of file diff --git a/overrides/kubejs/startup_scripts/CustomMachines.js b/overrides/kubejs/startup_scripts/CustomMachines.js index e43d2ecd..e779f084 100644 --- a/overrides/kubejs/startup_scripts/CustomMachines.js +++ b/overrides/kubejs/startup_scripts/CustomMachines.js @@ -1,5 +1,5 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { - //Steam Singleblocks + //Steam Singleblocks let isHp = false event.create('steam_masonry_oven', 'steam', true) .recipeType('masonry_oven') // needs to be defined below otherwise the game will implote @@ -9,97 +9,91 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { }) .rotationState(RotationState.NON_Y_AXIS) -//Please Do not add anymore Steam machines, these are super fucking cursed because of the render builder being omega cursed + //Please Do not add anymore Steam machines, these are super fucking cursed because of the render builder being omega cursed -//Electri Version - event.create('masonry_oven', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV,GTValues.LuV,GTValues.ZPM,GTValues.UV,GTValues.UHV) - .recipeType('masonry_oven',true, true) + //Electri Version + event.create('masonry_oven', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV) + .recipeType('masonry_oven', true, true) .rotationState(RotationState.NON_Y_AXIS) .workableTieredHullRenderer(GTCEu.id("block/machines/masonry_oven")) //add this to the kube folder - Though, let Ghostipedia make these textures pls & ty - - event.create('flora_nurturer', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV,GTValues.LuV,GTValues.ZPM,GTValues.UV,GTValues.UHV) - .recipeType('flora_nurturer',true, true) + + event.create('flora_nurturer', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV) + .recipeType('flora_nurturer', true, true) .rotationState(RotationState.NON_Y_AXIS) .workableTieredHullRenderer(GTCEu.id("block/machines/flora_nurturer")) - event.create('nether_catalyzer', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV,GTValues.LuV,GTValues.ZPM,GTValues.UV,GTValues.UHV) - .recipeType('nether_catalyzer',true, true) + event.create('nether_catalyzer', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV) + .recipeType('nether_catalyzer', true, true) .rotationState(RotationState.NON_Y_AXIS) .workableTieredHullRenderer(GTCEu.id("block/machines/nether_catalyzer")) - event.create('basic_alternator', 'multiblock') - .rotationState(RotationState.NON_Y_AXIS) - .recipeType('basic_alternator') - .appearanceBlock(GTBlocks.CASING_STEEL_SOLID) - .pattern(definition => FactoryBlockPattern.start() - .aisle('F###F','ZWBWZ','ZWBWZ','ZWBWZ') - .aisle('#####','ZWBWZ','XOOOX','ZWBWZ') - .aisle('F###F','ZWBWZ','ZWCWZ','ZWBWZ') - .where('C', Predicates.controller(Predicates.blocks(definition.get()))) - .where('#', Predicates.any()) - .where('W', Predicates.blocks(GTBlocks.COIL_CUPRONICKEL.get())) - .where('B', Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) - .where('Z', Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(8) - .or(Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get()))) - .where('X', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1) - .or(Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get()))) - .where('O', Predicates.blocks(GTBlocks.CASING_STEEL_GEARBOX.get())) - .where('F', Predicates.blocks('gtceu:steel_frame')) - .build()) - .workableCasingRenderer('gtceu:block/casings/steam/steel/side', 'gtceu:block/multiblock/generator/large_gas_turbine', false); - //Custom Spooling Machine for Ars - event.create('spooling_machine', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV) - .recipeType('spooling_machine', true, true) - .rotationState(RotationState.NON_Y_AXIS) - .workableTieredHullRenderer(GTCEu.id("block/machines/nether_catalyzer")) + event.create('spooling_machine', 'simple', GTValues.LV, GTValues.MV, GTValues.HV, GTValues.EV, GTValues.IV, GTValues.LuV, GTValues.ZPM, GTValues.UV, GTValues.UHV) + .recipeType('spooling_machine', true, true) + .rotationState(RotationState.NON_Y_AXIS) + .workableTieredHullRenderer(GTCEu.id("block/machines/nether_catalyzer")) + event.create('bronze_steam_turbine', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('bronze_turbine') + .appearanceBlock(GTBlocks.BRONZE_HULL) + .pattern(definition => FactoryBlockPattern.start() + .aisle('F##F##F', 'BBBBBBB', 'BBBBBBB', 'BBBBBBB') + .aisle('#######', 'BBBBBBB', 'XOOOOOZ', 'BBBBBBB') + .aisle('F##F##F', 'BBBBBBB', 'BCBBBBB', 'BBBBBBB') + .where('C', Predicates.controller(Predicates.blocks(definition.get()))) + .where('#', Predicates.any()) + .where('W', Predicates.blocks(GTBlocks.COIL_CUPRONICKEL.get())) + .where('B', Predicates.blocks(GTBlocks.BRONZE_HULL.get())) + .where('Z', Predicates.abilities(PartAbility.IMPORT_FLUIDS).setExactLimit(1)) + .where('X', Predicates.abilities(PartAbility.OUTPUT_KINETIC).setExactLimit(1)) + .where('O', Predicates.blocks('gtceu:steam_turbine_blades')) + .where('F', Predicates.blocks('gtceu:bronze_frame')) + .build()) + .workableCasingRenderer('gtceu:block/casings/steam/steel/side', 'gtceu:block/multiblock/generator/large_gas_turbine', false); }) //Recipe Map/type - DEFINE THESE OR THE GAME WILL CRASH - GTCEuStartupEvents.registry('gtceu:recipe_type', event => { - event.create('masonry_oven') - .category('frontiers') - .setEUIO('in') - .setMaxIOSize(3, 3, 0, 0) //Max Item in, max item out, max fluid in, max fluid out (in slots) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.COOLING); - event.create('flora_nurturer') - .category('frontiers') - .setEUIO('in') - .setMaxIOSize(2, 3, 2, 0) //Max Item in, max item out, max fluid in, max fluid out (in slots) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.REPLICATOR); - event.create('nether_catalyzer') - .category('frontiers') - .setEUIO('in') - .setMaxIOSize(1, 3, 0, 2) //Max Item in, max item out, max fluid in, max fluid out (in slots) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.CHEMICAL); - event.create('basic_alternator') - .category('kinetic') - .setMaxIOSize(0,0,1,0) - .setEUIO('out') - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.ELECTROLYZER) - - +GTCEuStartupEvents.registry('gtceu:recipe_type', event => { + event.create('masonry_oven') + .category('frontiers') + .setEUIO('in') + .setMaxIOSize(3, 3, 0, 0) //Max Item in, max item out, max fluid in, max fluid out (in slots) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.COOLING); + event.create('flora_nurturer') + .category('frontiers') + .setEUIO('in') + .setMaxIOSize(2, 3, 1, 0) //Max Item in, max item out, max fluid in, max fluid out (in slots) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.REPLICATOR); + event.create('nether_catalyzer') + .category('frontiers') + .setEUIO('in') + .setMaxIOSize(1, 3, 0, 2) //Max Item in, max item out, max fluid in, max fluid out (in slots) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.CHEMICAL); + event.create('bronze_turbine') + .category('kinetic') + .setMaxIOSize(0, 0, 1, 0) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.TURBINE) //Custom Spooling Machine for Ars - event.create('spooling_machine') - .category('frontiers') - .setMaxIOSize(2,2,1,0) //Max Item in, max item out, max fluid in, max fluid out (in slots) - .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) - .setEUIO('in') - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.ELECTROLYZER) - }) \ No newline at end of file + event.create('spooling_machine') + .category('frontiers') + .setMaxIOSize(2, 2, 1, 0) //Max Item in, max item out, max fluid in, max fluid out (in slots) + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setEUIO('in') + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.ELECTROLYZER) +}) \ No newline at end of file diff --git a/overrides/kubejs/startup_scripts/Materials/MaterialGen.js b/overrides/kubejs/startup_scripts/Materials/MaterialGen.js index da38f9de..4a36ba5d 100644 --- a/overrides/kubejs/startup_scripts/Materials/MaterialGen.js +++ b/overrides/kubejs/startup_scripts/Materials/MaterialGen.js @@ -1,23 +1,38 @@ + +GTCEuStartupEvents.registry('gtceu:material_icon_set', (event) => { + event.create('mana').parent(GTMaterialIconSet.DULL) +}) + GTCEuStartupEvents.registry('gtceu:material', event => { event.create('nether_brick_dust') .dust() .color(0x511515) - event.create('zanite') + event.create('zanite') .gem() .ore() .color(0xa521fc).iconSet(GTMaterialIconSet.DIAMOND) -//nether materials, no ore veins yet + event.create('nether_sediment_sludge') + .fluid() + .color(0x511515) + event.create('mana_steel') + // .ingot() + .flags(GTMaterialFlags.GENERATE_FINE_WIRE, GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD) + .fluid() + .color(0x67b9ee) + .cableProperties(GTValues.V[GTValues.LV],8,0,false) + .iconSet(GTMaterialIconSet.getByName('mana')) +//nether materials, no ore veins yet event.create('cincinnasite') - .ingot() - .ore() - .color(0xeebb63).iconSet(GTMaterialIconSet.SHINY) - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD) - + .ingot() + .ore() + .color(0xeebb63).iconSet(GTMaterialIconSet.SHINY) + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD) + event.create('nether_ruby') - .gem() - .ore() - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD) - .color(0x9f0b21).iconSet(GTMaterialIconSet.RUBY) + .gem() + .ore() + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_ROD) + .color(0x9f0b21).iconSet(GTMaterialIconSet.RUBY) }) diff --git a/overrides/kubejs/startup_scripts/WorldGenLayer/AetherWorldGenLayer.js b/overrides/kubejs/startup_scripts/WorldGenLayer/AetherWorldGenLayer.js.BROKEN similarity index 100% rename from overrides/kubejs/startup_scripts/WorldGenLayer/AetherWorldGenLayer.js rename to overrides/kubejs/startup_scripts/WorldGenLayer/AetherWorldGenLayer.js.BROKEN