diff --git a/.packwizignore b/.packwizignore index cbfe1953..23c73242 100644 --- a/.packwizignore +++ b/.packwizignore @@ -3,14 +3,4 @@ # mods !/mods /mods/.index -/mods/*.jar - -# configs -!/config -/config/* -!/config/fancymenu -!/config/ftbquests -!/config/emi.css -!/defaultconfigs -!/kubejs -!/packmenu \ No newline at end of file +/mods/*.jar \ No newline at end of file diff --git a/index.toml b/index.toml index 46875f07..7c52fb70 100644 --- a/index.toml +++ b/index.toml @@ -1,467 +1,5 @@ hash-format = "sha256" -[[files]] -file = "config/emi.css" - -[[files]] -file = "config/fancymenu/animations/ebf_5ed795df72a44a03/animation.properties" - -[[files]] -file = "config/fancymenu/config.txt" - -[[files]] -file = "config/fancymenu/customizablemenus.txt" - -[[files]] -file = "config/fancymenu/customization/loading1.txt" - -[[files]] -file = "config/fancymenu/customization/menu1.txt" - -[[files]] -file = "config/fancymenu/locals/de_de.local" - -[[files]] -file = "config/fancymenu/locals/en_us.local" - -[[files]] -file = "config/fancymenu/locals/pl_pl.local" - -[[files]] -file = "config/fancymenu/locals/pt_br.local" - -[[files]] -file = "config/fancymenu/locals/ru_ru.local" - -[[files]] -file = "config/fancymenu/locals/uk_ua.local" - -[[files]] -file = "config/fancymenu/locals/zh_cn.local" - -[[files]] -file = "config/fancymenu/menu_identifiers.db" - -[[files]] -file = "config/fancymenu/slideshows/mainSlideShow/images/image1.png" - -[[files]] -file = "config/fancymenu/slideshows/mainSlideShow/images/image2.jpg" - -[[files]] -file = "config/fancymenu/slideshows/mainSlideShow/images/image3.jpg" - -[[files]] -file = "config/fancymenu/slideshows/mainSlideShow/images/image4.png" - -[[files]] -file = "config/fancymenu/slideshows/mainSlideShow/properties.txt" - -[[files]] -file = "config/fancymenu/user_variables.db" - -[[files]] -file = "config/ftbquests/quests/chapter_groups.snbt" - -[[files]] -file = "config/ftbquests/quests/chapters/multiblocks.snbt" - -[[files]] -file = "config/ftbquests/quests/chapters/power_generation.snbt" - -[[files]] -file = "config/ftbquests/quests/chapters/ulvuls__humble_beginnigs.snbt" - -[[files]] -file = "config/ftbquests/quests/chapters/welcome.snbt" - -[[files]] -file = "config/ftbquests/quests/chapters/you_gotta_start_somewhere.snbt" - -[[files]] -file = "config/ftbquests/quests/data.snbt" - -[[files]] -file = "defaultconfigs/create-server.toml" - -[[files]] -file = "defaultconfigs/ftbchunks/client-config.snbt" - -[[files]] -file = "defaultconfigs/ftbchunks/ftbchunks-world.snbt" - -[[files]] -file = "defaultconfigs/ftbessentials-server.snbt" - -[[files]] -file = "defaultconfigs/toms_storage-server.toml" - -[[files]] -file = "kubejs/README.txt" - -[[files]] -file = "kubejs/assets/gtceu/lang/en_us.json" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/drinkable_liquid_concrete.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/empty_compass.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_advanced_integrated_circuit.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_advanced_integrated_circuit_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_basic_electronic_circuit.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_basic_integrated_circuit.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_good_electronic_circuit.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_good_integrated_circuit.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_conveyor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_conveyor_module_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_electric_motor_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_electric_piston_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_electric_pump_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_emitter.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_emitter_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_fluid_regulator.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_fluid_regulator_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_motor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_piston.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_pump.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_robot_arm.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_robot_arm_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_sensor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_hv_sensor_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_inter_nano_processor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_inter_nano_processor_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_conveyor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_emitter.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_fluid_regulator.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_motor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_piston.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_pump.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_robot_arm.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_lv_sensor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_micro_processor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_micro_processor_assembly.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_microchip_processor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_conveyor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_emitter.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_fluid_regulator.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_motor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_piston.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_pump.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_robot_arm.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_mv_sensor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_nano_processor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_nano_processor_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inc_raw_resin_printed_circuit_board_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inter_micro_processor_assembly.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/inter_nano_processor.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/netherite_plate_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/plate.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/plate_1.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/plate_2.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/plate_3.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/raw_epoxy_circuit_board.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/raw_integrated_circuit_board.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/raw_phenolic_circuit_board.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/raw_phenolic_printed_circuit_board_show.png" - -[[files]] -file = "kubejs/assets/kubejs/textures/item/raw_plastic_circuit_board.png" - -[[files]] -file = "kubejs/client_scripts/debug.js" - -[[files]] -file = "kubejs/client_scripts/rei_hide.js" - -[[files]] -file = "kubejs/config/client.properties" - -[[files]] -file = "kubejs/config/common.properties" - -[[files]] -file = "kubejs/config/probejs.json" - -[[files]] -file = "kubejs/jsconfig.json" - -[[files]] -file = "kubejs/server_scripts/Armor/AD Astra/JetSuit.js" - -[[files]] -file = "kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js" - -[[files]] -file = "kubejs/server_scripts/Armor/AD Astra/SpaceSuit.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Create/CopperDiving.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Create/NetheriteDiving.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Vanilla/Chain.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Vanilla/Diamond.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Vanilla/Gold.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Vanilla/Iron.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Vanilla/Leather.js" - -[[files]] -file = "kubejs/server_scripts/Armor/Vanilla/Netherite.js" - -[[files]] -file = "kubejs/server_scripts/GregMultiRecipe.js" - -[[files]] -file = "kubejs/server_scripts/Items/Compass.js" - -[[files]] -file = "kubejs/server_scripts/Items/Piston.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/AE2/cutting_16k_wafer.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/AE2/cutting_1k_wafer.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/AE2/cutting_256k_wafer.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/AE2/cutting_4k_wafer.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/AE2/cutting_64k_wafer.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Ad_Astra/T1Rocket.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Ad_Astra/T2Rocket.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Ad_Astra/T3Rocket.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Ad_Astra/T4Rocket.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Greg/Circuit Assembler/HVCircuits.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNaquadah.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNeutronium.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverPhosphorus.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverSilicon.js" - -[[files]] -file = "kubejs/server_scripts/JSONRecipes/Greg/bender.js" - -[[files]] -file = "kubejs/server_scripts/Mods/AE2.js" - -[[files]] -file = "kubejs/server_scripts/Mods/Avaritia.js" - -[[files]] -file = "kubejs/server_scripts/Mods/Create.js" - -[[files]] -file = "kubejs/server_scripts/Mods/EnderStorage.js" - -[[files]] -file = "kubejs/server_scripts/Mods/Greate.js" - -[[files]] -file = "kubejs/server_scripts/Mods/Greg.js" - -[[files]] -file = "kubejs/server_scripts/Mods/IronChest.js" - -[[files]] -file = "kubejs/server_scripts/Mods/SophisticatedBackpacks.js" - -[[files]] -file = "kubejs/server_scripts/Mods/TomsSimpleStorage.js" - -[[files]] -file = "kubejs/server_scripts/Mods/Wands.js" - -[[files]] -file = "kubejs/server_scripts/Mods/ad_astra.js" - -[[files]] -file = "kubejs/server_scripts/Mods/cc_tweaked.js" - -[[files]] -file = "kubejs/server_scripts/SequencedAssembly/AE2sequence.js" - -[[files]] -file = "kubejs/server_scripts/SequencedAssembly/HV.js" - -[[files]] -file = "kubejs/server_scripts/SequencedAssembly/IntermediateItems.js" - -[[files]] -file = "kubejs/server_scripts/SequencedAssembly/LV.js" - -[[files]] -file = "kubejs/server_scripts/SequencedAssembly/MV.js" - -[[files]] -file = "kubejs/server_scripts/Tags.js" - -[[files]] -file = "kubejs/server_scripts/Vanilla.js" - -[[files]] -file = "kubejs/startup_scripts/BlockGeneration.js" - -[[files]] -file = "kubejs/startup_scripts/ItemGeneration.js" - -[[files]] -file = "kubejs/startup_scripts/ItemsModification.js" - -[[files]] -file = "kubejs/startup_scripts/Materials.js" - -[[files]] -file = "kubejs/startup_scripts/MultiBlock.js" - -[[files]] -file = "kubejs/startup_scripts/Ores.js" - [[files]] file = "mods/ad-astra.pw.toml" metafile = true diff --git a/kubejs/client_scripts/rei_hide.js b/kubejs/client_scripts/rei_hide.js index 2c8d75f4..cd3f0bd1 100644 --- a/kubejs/client_scripts/rei_hide.js +++ b/kubejs/client_scripts/rei_hide.js @@ -1,4 +1,4 @@ -REIEvents.hide('item', event => { +JEIEvents.hideItems(event => { //Create event.hide(/create:(.*)_sheet/) diff --git a/kubejs/config/client.properties b/kubejs/config/client.properties index 835f292e..5f5a4b4a 100644 --- a/kubejs/config/client.properties +++ b/kubejs/config/client.properties @@ -1,9 +1,9 @@ #KubeJS Client Properties -#Sat Jul 29 17:03:13 EDT 2023 +#Thu Nov 30 20:00:41 AEDT 2023 backgroundColor=2E3440 -barBorderColor=ECEFF4 -exportAtlases=false menuBackgroundBrightness=64 +exportAtlases=false +barBorderColor=ECEFF4 disableRecipeBook=false title= barColor=ECEFF4 @@ -12,4 +12,5 @@ fmlLogColor=ECEFF4 showTagNames=false fmlMemoryColor=ECEFF4 menuBackgroundScale=32.0 +blurScaledPackIcon=true menuInnerBackgroundBrightness=32 diff --git a/kubejs/config/probejs.json b/kubejs/config/probejs.json index 20dacc31..0d07303a 100644 --- a/kubejs/config/probejs.json +++ b/kubejs/config/probejs.json @@ -1,7 +1,7 @@ { "firstLoad": false, "noAggressiveProbing": true, - "docsTimestamp": 1690007604193, + "docsTimestamp": 1694524116376, "allowRegistryObjectDumps": false, "requireSingleAndPerm": true, "enabled": true, diff --git a/kubejs/jsconfig.json b/kubejs/jsconfig.json index c41f1a31..7d535205 100644 --- a/kubejs/jsconfig.json +++ b/kubejs/jsconfig.json @@ -1,13 +1,13 @@ -{ - "compilerOptions": { - "lib": [ - "ES5", - "ES2015" - ], - "typeRoots": [ - "./probe/generated", - "./probe/user" - ], - "target": "ES2015" - } +{ + "compilerOptions": { + "lib": [ + "ES5", + "ES2015" + ], + "typeRoots": [ + "./probe/generated", + "./probe/user" + ], + "target": "ES2015" + } } \ No newline at end of file diff --git a/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js b/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js index abc2784c..4907e3c5 100644 --- a/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js +++ b/kubejs/server_scripts/Armor/AD Astra/NetheriteSpaceSuit.js @@ -1,73 +1,72 @@ ServerEvents.recipes(event => { -// TODO: Uncomment when KubeJS Create is added -// event.recipes.createMechanicalCrafting( -// Item.of('ad_astra:netherite_space_helmet', 1), -// [ -// 'AAAAAAA', -// 'ABBBBBA', -// 'ABCCCBA', -// 'AB C BA', -// 'AB D BA' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate', -// D: 'ad_astra:space_helmet' + event.recipes.createMechanicalCrafting( + Item.of('ad_astra:netherite_space_helmet', 1), + [ + 'AAAAAAA', + 'ABBBBBA', + 'ABCCCBA', + 'AB C BA', + 'AB D BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_helmet' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('ad_astra:netherite_space_suit', 1), -// [ -// 'ABBBDBBBA', -// 'ABBCCCBBA', -// ' ABCBA ', -// ' ABCBA ', -// ' ABBBA ', -// ' AAAAA ' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate', -// D: 'ad_astra:space_suit' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('ad_astra:netherite_space_pants', 1), -// [ -// 'AAAAAA', -// 'ABBBBA', -// 'ABCCBA', -// 'AB DBA', -// 'AB BA', -// 'AB BA', -// 'AB BA' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate', -// D: 'ad_astra:space_pants' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('ad_astra:netherite_space_boots'), -// [ -// ' ABA ABA ', -// ' ABA ABA ', -// ' ABA ABA ', -// ' ABA ABA ', -// 'CAA D AAC' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate', -// D: 'ad_astra:space_boots' -// } -// ) + } + ) + event.recipes.createMechanicalCrafting( + Item.of('ad_astra:netherite_space_suit', 1), + [ + 'ABBBDBBBA', + 'ABBCCCBBA', + ' ABCBA ', + ' ABCBA ', + ' ABBBA ', + ' AAAAA ' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_suit' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('ad_astra:netherite_space_pants', 1), + [ + 'AAAAAA', + 'ABBBBA', + 'ABCCBA', + 'AB DBA', + 'AB BA', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_pants' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('ad_astra:netherite_space_boots'), + [ + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + 'CAA D AAC' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate', + D: 'ad_astra:space_boots' + } + ) diff --git a/kubejs/server_scripts/Armor/Vanilla/Chain.js b/kubejs/server_scripts/Armor/Vanilla/Chain.js index b19da576..31830ee3 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Chain.js +++ b/kubejs/server_scripts/Armor/Vanilla/Chain.js @@ -1,56 +1,55 @@ -// TODO: Uncomment when KubeJS Create is added -// ServerEvents.recipes(event => { +ServerEvents.recipes(event => { -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:chainmail_helmet', 1), -// [ -// ' AAA ', -// 'AB BA', -// 'AB BA' -// ], -// { -// A: 'gtceu:iron_ring', -// B: 'minecraft:leather' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:chainmail_chestplate', 1), -// [ -// 'AA AA', -// ' ABBA ', -// ' AA ', -// ' AA ' -// ], -// { -// A: 'gtceu:iron_ring', -// B: 'minecraft:leather' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:chainmail_leggings', 1), -// [ -// 'AAAA', -// 'A A', -// 'A A', -// 'A A', -// 'B B' -// ], -// { -// A: 'gtceu:iron_ring', -// B: 'minecraft:leather' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:chainmail_boots', 1), -// [ -// ' A A ', -// ' A A ', -// 'AB BA' -// ], -// { -// A: 'gtceu:iron_ring', -// B: 'minecraft:leather' -// } -// ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:chainmail_helmet', 1), + [ + ' AAA ', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:chainmail_chestplate', 1), + [ + 'AA AA', + ' ABBA ', + ' AA ', + ' AA ' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:chainmail_leggings', 1), + [ + 'AAAA', + 'A A', + 'A A', + 'A A', + 'B B' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:chainmail_boots', 1), + [ + ' A A ', + ' A A ', + 'AB BA' + ], + { + A: 'gtceu:iron_ring', + B: 'minecraft:leather' + } + ) -// }) \ No newline at end of file + }) \ No newline at end of file diff --git a/kubejs/server_scripts/Armor/Vanilla/Diamond.js b/kubejs/server_scripts/Armor/Vanilla/Diamond.js index d555abd2..9139a720 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Diamond.js +++ b/kubejs/server_scripts/Armor/Vanilla/Diamond.js @@ -1,63 +1,62 @@ -// TODO: Uncomment when KubeJS Create is added -// ServerEvents.recipes(event => { +ServerEvents.recipes(event => { -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:diamond_helmet', 1), -// [ -// 'AAAAAA', -// 'ABBBBA', -// 'AC CA', -// 'AC CA' -// ], -// { -// A: 'gtceu:diamond_plate', -// B: 'gtceu:stainless_steel_plate', -// C: 'gtceu:titanium_plate' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:diamond_chestplate', 1), -// [ -// 'CBB BBC', -// 'CBCCCBC', -// ' ABCBA ', -// ' ABCBA ', -// ' ABBBA ' -// ], -// { -// A: 'gtceu:diamond_plate', -// B: 'gtceu:stainless_steel_plate', -// C: 'gtceu:titanium_plate' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:diamond_leggings', 1), -// [ -// 'AAAAAA', -// 'ABCCBA', -// 'AB BA', -// 'AB BA', -// 'AB BA' -// ], -// { -// A: 'gtceu:diamond_plate', -// B: 'gtceu:stainless_steel_plate', -// C: 'gtceu:titanium_plate' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:diamond_boots', 1), -// [ -// ' AA AA ', -// ' AA AA ', -// ' AA AA ', -// 'CBB BBC' -// ], -// { -// A: 'gtceu:diamond_plate', -// B: 'gtceu:stainless_steel_plate', -// C: 'gtceu:titanium_plate' -// } -// ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:diamond_helmet', 1), + [ + 'AAAAAA', + 'ABBBBA', + 'AC CA', + 'AC CA' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:diamond_chestplate', 1), + [ + 'CBB BBC', + 'CBCCCBC', + ' ABCBA ', + ' ABCBA ', + ' ABBBA ' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:diamond_leggings', 1), + [ + 'AAAAAA', + 'ABCCBA', + 'AB BA', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:diamond_boots', 1), + [ + ' AA AA ', + ' AA AA ', + ' AA AA ', + 'CBB BBC' + ], + { + A: 'gtceu:diamond_plate', + B: 'gtceu:stainless_steel_plate', + C: 'gtceu:titanium_plate' + } + ) -// }) \ No newline at end of file + }) \ No newline at end of file diff --git a/kubejs/server_scripts/Armor/Vanilla/Iron.js b/kubejs/server_scripts/Armor/Vanilla/Iron.js index 3f4640b7..287a5070 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Iron.js +++ b/kubejs/server_scripts/Armor/Vanilla/Iron.js @@ -1,62 +1,61 @@ -// TODO: Uncomment when KubeJS Create is added -// ServerEvents.recipes(event => { +ServerEvents.recipes(event => { -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:iron_helmet', 1), -// [ -// ' ABA ', -// 'AC CA', -// 'AC CA' -// ], -// { -// A: 'gtceu:iron_plate', -// B: 'gtceu:invar_plate', -// C: 'gtceu:carbon_fiber_mesh' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:iron_chestplate', 1), -// [ -// 'CB BC', -// 'CBCCBC', -// ' ABBA ', -// ' ABBA ', -// ' ABBA ', -// ], -// { -// A: 'gtceu:iron_plate', -// B: 'gtceu:invar_plate', -// C: 'gtceu:carbon_fiber_mesh' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:iron_leggings', 1), -// [ -// 'AAAA', -// 'ACCA', -// 'A A', -// 'A A', -// 'B B' -// ], -// { -// A: 'gtceu:iron_plate', -// B: 'gtceu:invar_plate', -// C: 'gtceu:carbon_fiber_mesh' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:iron_boots', 1), -// [ -// ' A A ', -// ' A A ', -// ' A A ', -// 'CB BC' -// ], -// { -// A: 'gtceu:iron_plate', -// B: 'gtceu:invar_plate', -// C: 'gtceu:carbon_fiber_mesh' -// } -// ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:iron_helmet', 1), + [ + ' ABA ', + 'AC CA', + 'AC CA' + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:iron_chestplate', 1), + [ + 'CB BC', + 'CBCCBC', + ' ABBA ', + ' ABBA ', + ' ABBA ', + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:iron_leggings', 1), + [ + 'AAAA', + 'ACCA', + 'A A', + 'A A', + 'B B' + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:iron_boots', 1), + [ + ' A A ', + ' A A ', + ' A A ', + 'CB BC' + ], + { + A: 'gtceu:iron_plate', + B: 'gtceu:invar_plate', + C: 'gtceu:carbon_fiber_mesh' + } + ) -// }) \ No newline at end of file + }) \ No newline at end of file diff --git a/kubejs/server_scripts/Armor/Vanilla/Netherite.js b/kubejs/server_scripts/Armor/Vanilla/Netherite.js index 76c999b9..607953d5 100644 --- a/kubejs/server_scripts/Armor/Vanilla/Netherite.js +++ b/kubejs/server_scripts/Armor/Vanilla/Netherite.js @@ -1,68 +1,67 @@ -// TODO: Uncomment when KubeJS Create is added -// ServerEvents.recipes(event => { +ServerEvents.recipes(event => { -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:netherite_helmet', 1), -// [ -// 'AAAAAAA', -// 'ABBBBBA', -// 'ABCCCBA', -// 'AB C BA', -// 'AB BA' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:netherite_chestplate', 1), -// [ -// 'ABBB BBBA', -// 'ABBCCCBBA', -// ' ABCBA ', -// ' ABCBA ', -// ' ABBBA ', -// ' AAAAA ' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:netherite_leggings', 1), -// [ -// 'AAAAAA', -// 'ABBBBA', -// 'ABCCBA', -// 'AB BA', -// 'AB BA', -// 'AB BA', -// 'AB BA' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate' -// } -// ) -// event.recipes.createMechanicalCrafting( -// Item.of('minecraft:netherite_boots'), -// [ -// ' ABA ABA ', -// ' ABA ABA ', -// ' ABA ABA ', -// ' ABA ABA ', -// 'CAA AAC' -// ], -// { -// A: 'gtceu:tungsten_carbide_plate', -// B: 'gtceu:tungsten_steel_plate', -// C: 'kubejs:netherite_plate' -// } -// ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:netherite_helmet', 1), + [ + 'AAAAAAA', + 'ABBBBBA', + 'ABCCCBA', + 'AB C BA', + 'AB BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:netherite_chestplate', 1), + [ + 'ABBB BBBA', + 'ABBCCCBBA', + ' ABCBA ', + ' ABCBA ', + ' ABBBA ', + ' AAAAA ' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:netherite_leggings', 1), + [ + 'AAAAAA', + 'ABBBBA', + 'ABCCBA', + 'AB BA', + 'AB BA', + 'AB BA', + 'AB BA' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) + event.recipes.createMechanicalCrafting( + Item.of('minecraft:netherite_boots'), + [ + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + ' ABA ABA ', + 'CAA AAC' + ], + { + A: 'gtceu:tungsten_carbide_plate', + B: 'gtceu:tungsten_steel_plate', + C: 'kubejs:netherite_plate' + } + ) -// }) \ No newline at end of file + }) \ No newline at end of file diff --git a/kubejs/server_scripts/Items/Compass.js b/kubejs/server_scripts/Items/Compass.js index f49fb1a2..73b6cd1d 100644 --- a/kubejs/server_scripts/Items/Compass.js +++ b/kubejs/server_scripts/Items/Compass.js @@ -40,14 +40,13 @@ ServerEvents.recipes(event => { event.remove({output: 'minecraft:compass'}); - // TODO: Uncomment when KubeJS Create is added - // event.recipes.createSequencedAssembly([ - // 'minecraft:compass', - // ], empty_compass, [ - // event.recipes.createFilling(empty_compass, [empty_compass, Fluid.of('minecraft:water', 1000)]), - // event.recipes.createDeploying(empty_compass, [empty_compass, 'gtceu:magnetic_iron_rod']), - // event.recipes.createDeploying(empty_compass, [empty_compass, 'gtceu:red_alloy_bolt']), - // event.recipes.createDeploying(empty_compass, [empty_compass, 'minecraft:glass_pane']) - // ]).transitionalItem(empty_compass).loops(1) + event.recipes.createSequencedAssembly([ + 'minecraft:compass', + ], empty_compass, [ + event.recipes.createFilling('kubejs:empty_compass', ['kubejs:empty_compass', Fluid.of('minecraft:water', 1000)]), + event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'gtceu:magnetic_iron_rod']), + event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'gtceu:red_alloy_bolt']), + event.recipes.createDeploying('kubejs:empty_compass', ['kubejs:empty_compass', 'minecraft:glass_pane']) + ]).transitionalItem('kubejs:empty_compass').loops(1) }) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/AE2/cutting_16k_wafer.js b/kubejs/server_scripts/JSONRecipes/AE2/cutting_16k_wafer.js deleted file mode 100644 index c3d4c167..00000000 --- a/kubejs/server_scripts/JSONRecipes/AE2/cutting_16k_wafer.js +++ /dev/null @@ -1,171 +0,0 @@ -ServerEvents.recipes(event => { - -event.custom({ - "type": "gtceu:cutter", - "duration": 900, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:lubricant", - "amount": 250 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:16k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:16k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1350, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:distilled_water", - "amount": 750 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:16k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:16k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1800, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:16k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:16k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/AE2/cutting_1k_wafer.js b/kubejs/server_scripts/JSONRecipes/AE2/cutting_1k_wafer.js deleted file mode 100644 index cc98b792..00000000 --- a/kubejs/server_scripts/JSONRecipes/AE2/cutting_1k_wafer.js +++ /dev/null @@ -1,171 +0,0 @@ -ServerEvents.recipes(event => { - -event.custom({ - "type": "gtceu:cutter", - "duration": 900, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:lubricant", - "amount": 250 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:1k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:1k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1350, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:distilled_water", - "amount": 750 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:1k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:1k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1800, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:1k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:1k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/AE2/cutting_256k_wafer.js b/kubejs/server_scripts/JSONRecipes/AE2/cutting_256k_wafer.js deleted file mode 100644 index 465a2a74..00000000 --- a/kubejs/server_scripts/JSONRecipes/AE2/cutting_256k_wafer.js +++ /dev/null @@ -1,171 +0,0 @@ -ServerEvents.recipes(event => { - -event.custom({ - "type": "gtceu:cutter", - "duration": 900, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:lubricant", - "amount": 250 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:256k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:256k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1350, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:distilled_water", - "amount": 750 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:256k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:256k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1800, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:256k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:256k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/AE2/cutting_4k_wafer.js b/kubejs/server_scripts/JSONRecipes/AE2/cutting_4k_wafer.js deleted file mode 100644 index b2fac8e3..00000000 --- a/kubejs/server_scripts/JSONRecipes/AE2/cutting_4k_wafer.js +++ /dev/null @@ -1,171 +0,0 @@ -ServerEvents.recipes(event => { - -event.custom({ - "type": "gtceu:cutter", - "duration": 900, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:lubricant", - "amount": 250 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:4k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:4k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1350, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:distilled_water", - "amount": 750 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:4k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:4k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1800, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:4k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:4k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/AE2/cutting_64k_wafer.js b/kubejs/server_scripts/JSONRecipes/AE2/cutting_64k_wafer.js deleted file mode 100644 index 0286aef3..00000000 --- a/kubejs/server_scripts/JSONRecipes/AE2/cutting_64k_wafer.js +++ /dev/null @@ -1,171 +0,0 @@ -ServerEvents.recipes(event => { - -event.custom({ - "type": "gtceu:cutter", - "duration": 900, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:lubricant", - "amount": 250 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:64k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:64k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1350, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "gtceu:distilled_water", - "amount": 750 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:64k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:64k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -event.custom({ - "type": "gtceu:cutter", - "duration": 1800, - "inputs": { - "fluid": [ - { - "content": { - "fluid": "minecraft:water", - "amount": 1000 - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:64k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:64k_me_storage_base" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 30720, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/Greg/Circuit Assembler/HVCircuits.js b/kubejs/server_scripts/JSONRecipes/Greg/Circuit Assembler/HVCircuits.js deleted file mode 100644 index 80611572..00000000 --- a/kubejs/server_scripts/JSONRecipes/Greg/Circuit Assembler/HVCircuits.js +++ /dev/null @@ -1,176 +0,0 @@ -ServerEvents.recipes(event => { - let interNanoProc = 'kubejs:inter_nano_processor' - // EV expensive recipe - event.custom( - { - "type": "gtceu:circuit_assembler", - "duration": 200, - "inputs": { - "fluid": [], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": interNanoProc - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 2, - "ingredient": { - "item": "gtceu:smd_resistor" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 2, - "ingredient": { - "item": "gtceu:smd_capacitor" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 2, - "ingredient": { - "item": "gtceu:smd_transistor" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 2, - "tag": "forge:wires/fine/electrum" - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 2, - "ingredient": { - "item": "gtceu:nano_processor" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 600, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {}, - "recipeConditions": [ - { - "type": "cleanroom", - "data": { - "cleanroom": "cleanroom" - } - } - ] -} - ) - - // EV cheap recipe - event.custom( - { - "type": "gtceu:circuit_assembler", - "duration": 100, - "inputs": { - "fluid": [], - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": interNanoProc - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 6, - "tag": "forge:wires/fine/electrum" - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 2, - "ingredient": { - "item": "gtceu:nano_processor" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 600, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {}, - "recipeConditions": [ - { - "type": "cleanroom", - "data": { - "cleanroom": "cleanroom" - } - } - ] -} - ) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNaquadah.js b/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNaquadah.js deleted file mode 100644 index 6d5ffad1..00000000 --- a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNaquadah.js +++ /dev/null @@ -1,356 +0,0 @@ -// priority: 0 -ServerEvents.recipes(event => { - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 200, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:naquadah_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - } - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 8, - "ingredient": { - "item": "kubejs:1k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 1920, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 200, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:naquadah_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:2}" - }, - - }, - - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 8, - "ingredient": { - "item": "kubejs:4k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 1920, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 200, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:naquadah_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - {"content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:3}" - }, - - }, - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 8, - "ingredient": { - "item": "kubejs:16k_me_storage_wafer" - }, - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - ], - }, - "tickInputs": { - "eu": [ - { - "content": 1920, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - ], - }, - }) - - - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 900, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:naquadah_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - {"content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:5}" - }, - - }, - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:256k_me_storage_wafer" - }, - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - ], - }, - "tickInputs": { - "eu": [ - { - "content": 1920, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - ], - }, - }), - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 500, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:naquadah_wafer" - }, - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - }, - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 4, - "ingredient": { - "item": "kubejs:64k_me_storage_wafer" - }, - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - ], - }, - "tickInputs": { - "eu": [ - { - "content": 1920, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNeutronium.js b/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNeutronium.js deleted file mode 100644 index 9a603c66..00000000 --- a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverNeutronium.js +++ /dev/null @@ -1,428 +0,0 @@ -// priority: 0 -ServerEvents.recipes(event => { - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 50, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "gtceu:neutronium_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - } - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:1k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 7680, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 50, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:neutronium_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:2}" - }, - - }, - - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:4k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 7680, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 50, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:neutronium_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - {"content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:3}" - }, - - }, - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 16, - "ingredient": { - "item": "kubejs:16k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 7680, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - }) - - - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 500, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:neutronium_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - {"content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:5}" - }, - - }, - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 2, - "ingredient": { - "item": "kubejs:256k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 7680, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - }), - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 200, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:neutronium_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - } - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 8, - "ingredient": { - "item": "kubejs:64k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 7680, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 9000, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:neutronium_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:6}" - } - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:infinity_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 135000000, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverPhosphorus.js b/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverPhosphorus.js deleted file mode 100644 index b29a106b..00000000 --- a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverPhosphorus.js +++ /dev/null @@ -1,286 +0,0 @@ -// priority: 0 -ServerEvents.recipes(event => { - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 500, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:phosphorus_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - } - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 4, - "ingredient": { - "item": "kubejs:1k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 480, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 500, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:phosphorus_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:2}" - }, - - }, - - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 4, - "ingredient": { - "item": "kubejs:4k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 480, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 500, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:phosphorus_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - {"content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:3}" - }, - - }, - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 4, - "ingredient": { - "item": "kubejs:16k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 480, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 900, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:naquadah_wafer" - }, - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - }, - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 4, - "ingredient": { - "item": "kubejs:64k_me_storage_wafer" - }, - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - ], - }, - "tickInputs": { - "eu": [ - { - "content": 1920, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverSilicon.js b/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverSilicon.js deleted file mode 100644 index a98edebf..00000000 --- a/kubejs/server_scripts/JSONRecipes/Greg/Engraver/engraverSilicon.js +++ /dev/null @@ -1,218 +0,0 @@ -// priority: 0 -ServerEvents.recipes(event => { - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 900, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:silicon_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - } - - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:1k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 120, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 900, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:silicon_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:2}" - }, - - }, - - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:4k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 120, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} - }) - event.custom({ - "type": "gtceu:laser_engraver", - "duration": 900, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "gtceu:silicon_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "tag": "forge:lenses/certus" - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - {"content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:3}" - }, - - }, - }, - ], - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:16k_me_storage_wafer" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 120, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - }) - - - - -}) \ No newline at end of file diff --git a/kubejs/server_scripts/JSONRecipes/Greg/bender.js b/kubejs/server_scripts/JSONRecipes/Greg/bender.js deleted file mode 100644 index 5ae06a36..00000000 --- a/kubejs/server_scripts/JSONRecipes/Greg/bender.js +++ /dev/null @@ -1,124 +0,0 @@ -// priority: 0 -ServerEvents.recipes(event => { - event.custom({ - "type": "gtceu:bender", - "duration": 26, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 5, - 'ingredient': - {"item": "minecraft:scute"} - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - } - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:unf_turtle_helmet" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 24, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) - -event.custom({ - "type": "gtceu:bender", - "duration": 26, - "inputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 5, - 'ingredient': - {"item": "gtceu:ruthenium_trinium_americium_neutronate_ingot"} - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - }, - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "type": "forge:nbt", - "item": "gtceu:programmed_circuit", - "count": 1, - "nbt": "{Configuration:1}" - } - }, - "chance": 0.0, - "tierChanceBoost": 0.0 - }, - ] - }, - "outputs": { - "item": [ - { - "content": { - "type": "gtceu:sized", - "fabric:type": "gtceu:sized", - "count": 1, - "ingredient": { - "item": "kubejs:ruthenium_trinium_americium_neutronate_plate" - } - }, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickInputs": { - "eu": [ - { - "content": 24, - "chance": 1.0, - "tierChanceBoost": 0.0 - } - ] - }, - "tickOutputs": {} -}) -}) \ No newline at end of file diff --git a/kubejs/server_scripts/Mods/AE2.js b/kubejs/server_scripts/Mods/AE2.js index 98092c07..2d0427f8 100644 --- a/kubejs/server_scripts/Mods/AE2.js +++ b/kubejs/server_scripts/Mods/AE2.js @@ -187,14 +187,11 @@ ServerEvents.recipes(event => { ) - event.shaped( - Item.of('ae2:fluid_storage_cell_64k'), - [ + event.shaped('ae2:fluid_storage_cell_64k', [ 'AEA', 'BCB', 'DDD' - ], - { + ],{ A:'gtceu:annealed_copper_double_plate', B:'gtceu:polytetrafluoroethylene_plate', C:'ae2:cell_component_64k', @@ -234,34 +231,143 @@ ServerEvents.recipes(event => { ) - // TODO: Uncomment when KubeJS Create is added - // event.recipes.createMechanicalCrafting(Item.of('ae2:creative_item_cell'), + event.recipes.createMechanicalCrafting(Item.of('ae2:creative_item_cell'), - // [ - // 'CBC', - // 'ADA', - // 'AAA' - // ], - // { - // A:'avaritia:infinity_ingot', - // B:'gtceu:wetware_processor_mainframe', - // C:'kubejs:ruthenium_trinium_americium_neutronate_plate', - // D:'kubejs:infinity_me_storage_wafer' - // } - // ) - // event.recipes.createMechanicalCrafting(Item.of('ae2:creative_fluid_cell'), + [ + 'CBC', + 'ADA', + 'AAA' + ], + { + A:'avaritia:infinity_ingot', + B:'gtceu:wetware_processor_mainframe', + C:'kubejs:ruthenium_trinium_americium_neutronate_plate', + D:'kubejs:infinity_me_storage_wafer' + } + ) + event.recipes.createMechanicalCrafting(Item.of('ae2:creative_fluid_cell'), - // [ - // 'CBC', - // 'ADA', - // 'AAA' - // ], - // { - // A:'avaritia:infinity_ingot', - // B:'gtceu:wetware_processor_mainframe', - // C:'gtceu:darmstadtium_double_plate', - // D:'kubejs:infinity_me_storage_wafer' - // } - // ) + [ + 'CBC', + 'ADA', + 'AAA' + ], + { + A:'avaritia:infinity_ingot', + B:'gtceu:wetware_processor_mainframe', + C:'gtceu:darmstadtium_double_plate', + D:'kubejs:infinity_me_storage_wafer' + } + ) + + //Wafers + event.recipes.gtceu.cutter('kubejs:cutting_1k_wafer_lubricant') + .duration(500) + .inputFluids(Fluid.of('gtceu:lubricant', 250)) + .itemInputs('kubejs:1k_me_storage_wafer') + .itemOutputs('16x kubejs:1k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_1k_wafer_distilled_water') + .duration(1350) + .inputFluids(Fluid.of('gtceu:distilled_water', 750)) + .itemInputs('kubejs:1k_me_storage_wafer') + .itemOutputs('16x kubejs:1k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_1k_wafer_water') + .duration(1800) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemInputs('kubejs:1k_me_storage_wafer') + .itemOutputs('16x kubejs:1k_me_storage_base') + .EUt(32767) + + + event.recipes.gtceu.cutter('kubejs:cutting_4k_wafer_lubricant') + .duration(500) + .inputFluids(Fluid.of('gtceu:lubricant', 250)) + .itemInputs('kubejs:4k_me_storage_wafer') + .itemOutputs('16x kubejs:4k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_4k_wafer_distilled_water') + .duration(1350) + .inputFluids(Fluid.of('gtceu:distilled_water', 750)) + .itemInputs('kubejs:4k_me_storage_wafer') + .itemOutputs('16x kubejs:4k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_4k_wafer_water') + .duration(1800) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemInputs('kubejs:4k_me_storage_wafer') + .itemOutputs('16x kubejs:4k_me_storage_base') + .EUt(32767) + + + event.recipes.gtceu.cutter('kubejs:cutting_16k_wafer_lubricant') + .duration(500) + .inputFluids(Fluid.of('gtceu:lubricant', 250)) + .itemInputs('kubejs:16k_me_storage_wafer') + .itemOutputs('16x kubejs:16k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_16k_wafer_distilled_water') + .duration(1350) + .inputFluids(Fluid.of('gtceu:distilled_water', 750)) + .itemInputs('kubejs:16k_me_storage_wafer') + .itemOutputs('16x kubejs:16k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_16k_wafer_water') + .duration(1800) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemInputs('kubejs:16k_me_storage_wafer') + .itemOutputs('16x kubejs:16k_me_storage_base') + .EUt(32767) + + + event.recipes.gtceu.cutter('kubejs:cutting_64k_wafer_lubricant') + .duration(500) + .inputFluids(Fluid.of('gtceu:lubricant', 250)) + .itemInputs('kubejs:64k_me_storage_wafer') + .itemOutputs('16x kubejs:64k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_64k_wafer_distilled_water') + .duration(1350) + .inputFluids(Fluid.of('gtceu:distilled_water', 750)) + .itemInputs('kubejs:64k_me_storage_wafer') + .itemOutputs('16x kubejs:64k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_64k_wafer_water') + .duration(1800) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemInputs('kubejs:64k_me_storage_wafer') + .itemOutputs('16x kubejs:64k_me_storage_base') + .EUt(32767) + + + event.recipes.gtceu.cutter('kubejs:cutting_256k_wafer_lubricant') + .duration(500) + .inputFluids(Fluid.of('gtceu:lubricant', 250)) + .itemInputs('kubejs:256k_me_storage_wafer') + .itemOutputs('16x kubejs:256k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_256k_wafer_distilled_water') + .duration(1350) + .inputFluids(Fluid.of('gtceu:distilled_water', 750)) + .itemInputs('kubejs:256k_me_storage_wafer') + .itemOutputs('16x kubejs:256k_me_storage_base') + .EUt(32767) + + event.recipes.gtceu.cutter('kubejs:cutting_256k_wafer_water') + .duration(1800) + .inputFluids(Fluid.of('minecraft:water', 1000)) + .itemInputs('kubejs:256k_me_storage_wafer') + .itemOutputs('16x kubejs:256k_me_storage_base') + .EUt(32767) }) diff --git a/kubejs/server_scripts/Mods/Create.js b/kubejs/server_scripts/Mods/Create.js index fb2ac310..38b8bb5b 100644 --- a/kubejs/server_scripts/Mods/Create.js +++ b/kubejs/server_scripts/Mods/Create.js @@ -1,156 +1,157 @@ -// TODO: Uncomment when KubeJS Create is added -// ServerEvents.recipes(event => { +ServerEvents.recipes(event => { -// var removed = [ -// 'potato_cannon', -// 'fluid_pipe', -// 'smart_fluid_pipe', -// 'mechanical_pump', -// 'fluid_valve', -// 'water_wheel', -// 'large_water_wheel', -// //'andesite_casing', -// 'windmill_bearing', -// 'steam_engine', -// 'belt_connector', -// 'cogwheel', -// 'large_cogwheel', -// ] + var removed = [ + 'potato_cannon', + 'fluid_pipe', + 'smart_fluid_pipe', + 'mechanical_pump', + 'fluid_valve', + 'water_wheel', + 'large_water_wheel', + 'andesite_casing', + 'windmill_bearing', + 'steam_engine', + 'belt_connector', + 'cogwheel', + 'large_cogwheel', + 'brass_hand', + ] -// removed.forEach(item => { -// event.remove({output: `create:${item}`}) -// }) + removed.forEach(item => { + event.remove({output: `create:${item}`}) + }) -// event.remove({ output: 'create:iron_sheet'}) -// event.remove({ output: 'create:brass_sheet'}) -// event.remove({ output: 'create:copper_sheet'}) -// event.remove({ output: 'create:golden_sheet'}) + event.remove({ output: 'create:iron_sheet'}) + event.remove({ output: 'create:brass_sheet'}) + event.remove({ output: 'create:copper_sheet'}) + event.remove({ output: 'create:golden_sheet'}) + event.remove({ id: 'create:iron_sheet'}) -// event.recipes.createMixing('minecraft:netherite_ingot', [ -// 'minecraft:netherite_scrap', -// 'minecraft:netherite_scrap', -// 'minecraft:netherite_scrap', -// 'minecraft:netherite_scrap', -// Fluid.of('gtceu:hssg', 576) -// ]).superheated() + event.recipes.createMixing('minecraft:netherite_ingot', [ + 'minecraft:netherite_scrap', + 'minecraft:netherite_scrap', + 'minecraft:netherite_scrap', + 'minecraft:netherite_scrap', + Fluid.of('gtceu:hssg', 576) + ]).superheated() -// event.recipes.createMixing('minecraft:turtle_helmet', [ -// 'kubejs:unf_turtle_helmet', -// Fluid.of('create:potion', 576, {Bottle:'REGULAR', Potion:'minecraft:water_breathing'}) -// ]).heated() + event.recipes.createMixing('minecraft:turtle_helmet', [ + 'kubejs:unf_turtle_helmet', + Fluid.of('create:potion', 576, {Bottle:'REGULAR', Potion:'minecraft:water_breathing'}) + ]).heated() -// // mechanical belts -// event.recipes.createMixing(Fluid.of('gtceu:rubber', 500), [ -// Item.of('gtceu:raw_rubber_dust', 8), -// Item.of('gtceu:sulfur_dust', 1) -// ]).heated() + //mechanical belts + event.recipes.createMixing(Fluid.of('gtceu:rubber', 500), [ + Item.of('gtceu:raw_rubber_dust', 8), + Item.of('gtceu:sulfur_dust', 1) + ]).heated() -// event.recipes.createFilling(Item.of('create:belt_connector', 1), [ -// 'gtceu:steel_plate', -// Fluid.of('gtceu:rubber', 250) -// ]) + event.recipes.createFilling(Item.of('create:belt_connector', 1), [ + 'gtceu:steel_plate', + Fluid.of('gtceu:rubber', 250) + ]) -// // #region SU gen -// // water wheel small -// event.shaped( -// Item.of('create:water_wheel', 1), -// [ -// 'DCE', -// 'CAC', -// 'BCB' -// ], -// { -// A:'create:andesite_casing', -// B:'gtceu:bronze_screw', -// C:'gtceu:wood_plate', -// D:'#forge:tools/screwdrivers', -// E:'#forge:tools/files', -// } -// ) -// //water wheel large -// event.shaped( -// Item.of('create:large_water_wheel', 1), -// [ -// 'DCE', -// 'CAC', -// 'BCB' -// ], -// { -// A:'create:andesite_casing', -// B:'gtceu:steel_screw', -// C:'gtceu:treated_wood_plate', -// D:'#forge:tools/screwdrivers', -// E:'#forge:tools/files', -// } -// ) + //#region SU gen + //water wheel small + event.shaped( + Item.of('create:water_wheel', 1), + [ + 'DCE', + 'CAC', + 'BCB' + ], + { + A:'create:andesite_casing', + B:'gtceu:bronze_screw', + C:'gtceu:wood_plate', + D:'#forge:tools/screwdrivers', + E:'#forge:tools/files', + } + ) + //water wheel large + event.shaped( + Item.of('create:large_water_wheel', 1), + [ + 'DCE', + 'CAC', + 'BCB' + ], + { + A:'create:andesite_casing', + B:'gtceu:steel_screw', + C:'gtceu:treated_wood_plate', + D:'#forge:tools/screwdrivers', + E:'#forge:tools/files', + } + ) -// // windmill bearing -// event.shaped( -// Item.of('create:windmill_bearing', 1), -// [ -// 'BDB', -// 'CAC', -// 'FEF' -// ], -// { -// A:'gtceu:aluminium_frame', -// B:'gtceu:steel_screw', -// C:'gtceu:steel_plate', -// D:'gtceu:treated_wood_plate', -// E:'greate:large_steel_cogwheel', -// F:'gtceu:steel_spring' -// } -// ) -// // steam engine -// event.recipes.createMechanicalCrafting( -// Item.of('create:steam_engine', 1), -// [ -// ' C ', -// ' F ', -// ' C ', -// 'BAB', -// 'DED', -// 'DDD', -// ], -// { -// A: 'gtceu:lv_electric_piston', -// B: 'gtceu:bronze_gear', -// C: 'greate:steel_shaft', -// D: 'gtceu:bronze_plate', -// E: 'gtceu:steel_gearbox', -// F: 'gtceu:gold_plate' -// } -// ) -// // #endregion -// // potato cannon -// event.recipes.createMechanicalCrafting( -// Item.of('create:potato_cannon', 1), -// [ -// 'ABCCC', -// 'DD ' -// ], -// { -// A:'greate:steel_cogwheel', -// B:'create:precision_mechanism', -// C:'gtceu:copper_normal_fluid_pipe', -// D:'minecraft:copper_ingot', -// }) + //windmill bearing + event.shaped( + Item.of('create:windmill_bearing', 1), + [ + 'BDB', + 'CAC', + 'FEF' + ], + { + A:'gtceu:aluminium_frame', + B:'gtceu:steel_screw', + C:'gtceu:steel_plate', + D:'gtceu:treated_wood_plate', + E:'greate:large_steel_cogwheel', + F:'gtceu:steel_spring' + } + ) + //steam engine + event.recipes.createMechanicalCrafting( + Item.of('create:steam_engine', 1), + [ + ' C ', + ' F ', + ' C ', + 'BAB', + 'DED', + 'DDD', + ], + { + A: 'gtceu:lv_electric_piston', + B: 'gtceu:bronze_gear', + C: 'greate:steel_shaft', + D: 'gtceu:bronze_plate', + E: 'gtceu:steel_gearbox', + F: 'gtceu:gold_plate' + } + ) + // #endregion + // potato cannon + event.recipes.createMechanicalCrafting( + Item.of('create:potato_cannon', 1), + [ + 'ABCCC', + 'DD ' + ], + { + A:'greate:steel_cogwheel', + B:'create:precision_mechanism', + C:'gtceu:copper_normal_fluid_pipe', + D:'minecraft:copper_ingot', + }) -// event.shaped( -// Item.of('create:electron_tube', 1), -// [ -// ' B ', -// 'CAC', -// 'DDD', -// ], -// { -// A: 'create:polished_rose_quartz', -// B: 'gtceu:glass_tube', //needs recipe pre LV -// C: 'gtceu:steel_bolt', -// D: 'gtceu:copper_single_wire' -// } -// ) -// }) \ No newline at end of file + event.shaped( + Item.of('create:electron_tube', 1), + [ + ' B ', + 'CAC', + 'DDD', + ], + { + A: 'create:polished_rose_quartz', + B: 'gtceu:glass_tube', //needs recipe pre LV + C: 'gtceu:steel_bolt', + D: 'gtceu:copper_single_wire' + } + ) + }) \ No newline at end of file diff --git a/kubejs/server_scripts/Mods/EnderStorage.js b/kubejs/server_scripts/Mods/EnderStorage.js index 714cbf2f..b9c55b2b 100644 --- a/kubejs/server_scripts/Mods/EnderStorage.js +++ b/kubejs/server_scripts/Mods/EnderStorage.js @@ -1,3 +1,5 @@ +//TODO: Enable once EnderStorage updates +/* ServerEvents.recipes(event => { event.remove({ output: 'enderstorage:ender_chest' }) @@ -49,4 +51,4 @@ event.shaped(Item.of('enderstorage:ender_chest', 1), E: 'minecraft:ender_pearl' } ) -}) \ No newline at end of file +})*/ \ No newline at end of file diff --git a/kubejs/server_scripts/Mods/Greate.js b/kubejs/server_scripts/Mods/Greate.js index 595c3d78..a6f00d3c 100644 --- a/kubejs/server_scripts/Mods/Greate.js +++ b/kubejs/server_scripts/Mods/Greate.js @@ -7,7 +7,7 @@ ServerEvents.recipes(event => { 'aluminium', 'stainless_steel', 'titanium', - 'tungsten_steel', + 'tungstensteel', 'palladium', 'naquadah', 'darmstadtium', @@ -54,24 +54,23 @@ ServerEvents.recipes(event => { ] - // TODO: Uncomment when KubeJS Create is added - // tiers.forEach((tier, index) => { - // // small cogwheel - // event.recipes.createDeploying(`greate:${tier}_cogwheel`, [`greate:${tier}_shaft`, `${plates[index]}`]); - // // large cogwheel - // event.recipes.createDeploying(`greate:large_${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]); - // event.recipes.createSequencedAssembly([ - // `greate:large_${tier}_cogwheel` - // ], `greate:${tier}_shaft`, [ - // event.recipes.createDeploying(`greate:${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]) - // ]).transitionalItem(`greate:${tier}_cogwheel`).loops(2) - // // alloys - // event.recipes.createMixing( - // Item.of(`greate:${tier}_alloy`, 1), - // [ - // `${materials[index]}`, - // `${nuggets[index]}` - // ] - // ) - // }); + tiers.forEach((tier, index) => { + // small cogwheel + event.recipes.create.deploying(`greate:${tier}_cogwheel`, [`greate:${tier}_shaft`, `${plates[index]}`]); + // large cogwheel + event.recipes.create.deploying(`greate:large_${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]); + event.recipes.create.sequenced_assembly([ + `greate:large_${tier}_cogwheel` + ], `greate:${tier}_shaft`, [ + event.recipes.create.deploying(`greate:${tier}_cogwheel`, [`greate:${tier}_cogwheel`, `${plates[index]}`]) + ]).transitionalItem(`greate:${tier}_cogwheel`).loops(2) + // alloys + event.recipes.create.mixing( + Item.of(`greate:${tier}_alloy`, 1), + [ + `${materials[index]}`, + `${nuggets[index]}` + ] + ) + }); }); diff --git a/kubejs/server_scripts/Mods/Greg.js b/kubejs/server_scripts/Mods/Greg/Greg.js similarity index 100% rename from kubejs/server_scripts/Mods/Greg.js rename to kubejs/server_scripts/Mods/Greg/Greg.js diff --git a/kubejs/server_scripts/Mods/Greg/bender.js b/kubejs/server_scripts/Mods/Greg/bender.js new file mode 100644 index 00000000..f41a7926 --- /dev/null +++ b/kubejs/server_scripts/Mods/Greg/bender.js @@ -0,0 +1,15 @@ +ServerEvents.recipes(event => { + event.recipes.gtceu.bender('kubejs:bending_scute') + .duration(26) + .circuit(1) + .itemInputs('5x minecraft:scute') + .itemOutputs('kubejs:unf_turtle_helmet') + .EUt(24) + + event.recipes.gtceu.bender('kubejs:bending_ruthenium_trinium_americium_neutronate_ingot') + .duration(26) + .circuit(1) + .itemInputs('gtceu:ruthenium_trinium_americium_neutronate_ingot') + .itemOutputs('kubejs:ruthenium_trinium_americium_neutronate_plate') + .EUt(24) +}) \ No newline at end of file diff --git a/kubejs/server_scripts/Mods/Greg/circuit_assembler.js b/kubejs/server_scripts/Mods/Greg/circuit_assembler.js new file mode 100644 index 00000000..4e1fc220 --- /dev/null +++ b/kubejs/server_scripts/Mods/Greg/circuit_assembler.js @@ -0,0 +1,16 @@ +ServerEvents.recipes(event => { + event.recipes.gtceu.circuit_assembler('kubejs:circuit_assembler_nano_processor') + .duration(200) + .circuit(1) + .recipeConditions('cleanroom') + .itemInputs(['kubejs:inter_nano_processor', '2x gtceu:smd_resistor', '2x gtceu:smd_capacitor', '2x gtceu:smd_transistor', '2x #forge:wires/fine/electrum']) + .itemOutputs('2x gtceu:nano_processor') + .EUt(600) + + event.recipes.gtceu.circuit_assembler('kubejs:circuit_assembler_nano_processor_cheap') + .duration(100) + .recipeConditions('cleanroom') + .itemInputs(['kubejs:inter_nano_processor', '6x #forge:wires/fine/electrum']) + .itemOutputs('gtceu:nano_processor') + .EUt(600) +}) \ No newline at end of file diff --git a/kubejs/server_scripts/Mods/Greg/engraver.js b/kubejs/server_scripts/Mods/Greg/engraver.js new file mode 100644 index 00000000..b2910ec4 --- /dev/null +++ b/kubejs/server_scripts/Mods/Greg/engraver.js @@ -0,0 +1,150 @@ +ServerEvents.recipes(event => { + //Naquadah + event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_64k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:64k_me_storage_wafer') + .circuit(4) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_256k_me_storage_wafer_naquadah') + .duration(200) + .itemInputs('gtceu:naquadah_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:256k_me_storage_wafer') + .circuit(5) + .EUt(1920) + + + //Neutronium + event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('16x kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('16x kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('16x kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_64k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('8x kubejs:64k_me_storage_wafer') + .circuit(4) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_256k_me_storage_wafer_neutronium') + .duration(50) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('2x kubejs:256k_me_storage_wafer') + .circuit(5) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_infinity_me_storage_wafer_neutronium') + .duration(9000) + .itemInputs('gtceu:neutronium_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:256k_me_storage_wafer') + .circuit(6) + .EUt(135000000) + + //Phosphourus + event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_64k_me_storage_wafer_phosphorus') + .duration(500) + .itemInputs('gtceu:phosphorus_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('4x kubejs:64k_me_storage_wafer') + .circuit(4) + .EUt(1920) + + //Silicon + event.recipes.gtceu.laser_engraver('kubejs:engraving_1k_me_storage_wafer_silicon') + .duration(900) + .itemInputs('gtceu:silicon_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:1k_me_storage_wafer') + .circuit(1) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_4k_me_storage_wafer_silicon') + .duration(900) + .itemInputs('gtceu:silicon_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:4k_me_storage_wafer') + .circuit(2) + .EUt(1920) + + event.recipes.gtceu.laser_engraver('kubejs:engraving_16k_me_storage_wafer_silicon') + .duration(900) + .itemInputs('gtceu:silicon_wafer') + .notConsumable('#forge:lenses/certus') + .itemOutputs('kubejs:16k_me_storage_wafer') + .circuit(3) + .EUt(1920) +}) \ No newline at end of file diff --git a/kubejs/server_scripts/Mods/TomsSimpleStorage.js b/kubejs/server_scripts/Mods/TomsSimpleStorage.js index 1ed18529..7d13a4b3 100644 --- a/kubejs/server_scripts/Mods/TomsSimpleStorage.js +++ b/kubejs/server_scripts/Mods/TomsSimpleStorage.js @@ -9,48 +9,47 @@ ServerEvents.recipes(event => { storage.forEach((element) => event.remove({output: element})); - // TODO: Uncomment when KubeJS Create is added - // //Storage Connector - // event.recipes.createMechanicalCrafting( - // Item.of('toms_storage:ts.inventory_connector', 1), - // [ - // ' BAB ', - // 'BDEDB', - // 'AECEA', - // 'BDEDB', - // ' BAB ', - // ], - // { - // A:'ironchest:iron_chest', - // B:'gtceu:treated_wood_plate', - // C:'gtceu:mv_machine_casing', - // D:'gtceu:micro_processor', - // E:'gtceu:lv_robot_arm' - // } - // ) + //Storage Connector + event.recipes.createMechanicalCrafting( + Item.of('toms_storage:ts.inventory_connector', 1), + [ + ' BAB ', + 'BDEDB', + 'AECEA', + 'BDEDB', + ' BAB ', + ], + { + A:'ironchest:iron_chest', + B:'gtceu:treated_wood_plate', + C:'gtceu:mv_machine_casing', + D:'gtceu:micro_processor', + E:'gtceu:lv_robot_arm' + } + ) - // //Terminal - // event.recipes.createMechanicalCrafting( - // Item.of('toms_storage:ts.crafting_terminal', 1), - // [ - // 'ABCBA', - // 'BFDFB', - // 'CDEDC', - // 'BFDFB', - // 'ABCBA', - // ], - // { - // A:'minecraft:crafting_table', - // B:'ironchest:iron_chest', - // C:'gtceu:mv_conveyor_module', - // D:'toms_storage:ts.inventory_cable', - // E:'#forge:circuits/mv', - // F:'toms_storage:ts.inventory_cable_connector', + //Terminal + event.recipes.createMechanicalCrafting( + Item.of('toms_storage:ts.crafting_terminal', 1), + [ + 'ABCBA', + 'BFDFB', + 'CDEDC', + 'BFDFB', + 'ABCBA', + ], + { + A:'minecraft:crafting_table', + B:'ironchest:iron_chest', + C:'gtceu:mv_conveyor_module', + D:'toms_storage:ts.inventory_cable', + E:'#forge:circuits/mv', + F:'toms_storage:ts.inventory_cable_connector', - // } - // ) + } + ) //Inventory Cable diff --git a/kubejs/server_scripts/Mods/Wands.js b/kubejs/server_scripts/Mods/Wands.js index 30243ef8..bc5d5f62 100644 --- a/kubejs/server_scripts/Mods/Wands.js +++ b/kubejs/server_scripts/Mods/Wands.js @@ -35,37 +35,36 @@ ServerEvents.recipes(event => { C:'gtceu:iron_screw' } ) - // TODO: Uncomment when KubeJS Create is added - // event.recipes.createMechanicalCrafting( - // Item.of('constructionwand:diamond_wand', 1), - // [ - // ' BB', - // ' CDB', - // ' AC ', - // 'A ', - // ], - // { - // A:'minecraft:stick', - // B:'gtceu:diamond_plate', - // C:'gtceu:diamond_screw', - // D:'gtceu:diamond_gear' - // } - // ) + event.recipes.createMechanicalCrafting( + Item.of('constructionwand:diamond_wand', 1), + [ + ' BB', + ' CDB', + ' AC ', + 'A ', + ], + { + A:'minecraft:stick', + B:'gtceu:diamond_plate', + C:'gtceu:diamond_screw', + D:'gtceu:diamond_gear' + } + ) - // event.recipes.createMechanicalCrafting( - // Item.of('constructionwand:infinity_wand', 1), - // [ - // ' CB', - // ' DC', - // ' A ', - // 'A ', - // ], - // { - // A:'minecraft:stick', - // B:'gtceu:nether_star_plate', - // C:'kubejs:netherite_plate', - // D:'gtceu:diamond_gear' + event.recipes.createMechanicalCrafting( + Item.of('constructionwand:infinity_wand', 1), + [ + ' CB', + ' DC', + ' A ', + 'A ', + ], + { + A:'minecraft:stick', + B:'gtceu:nether_star_plate', + C:'kubejs:netherite_plate', + D:'gtceu:diamond_gear' - // } - // ) + } + ) }); \ No newline at end of file diff --git a/kubejs/server_scripts/SequencedAssembly/AE2sequence.js b/kubejs/server_scripts/SequencedAssembly/AE2sequence.js index a2d4aa60..ddb273fa 100644 --- a/kubejs/server_scripts/SequencedAssembly/AE2sequence.js +++ b/kubejs/server_scripts/SequencedAssembly/AE2sequence.js @@ -1,70 +1,69 @@ -// TODO: Uncomment when KubeJS Create is added -// // priority: 0 -// ServerEvents.recipes(event => { +// priority: 0 +ServerEvents.recipes(event => { -// let incStorageCell = 'kubejs:incomplete_storage_cell' -// let incStorageComponent = 'kubejs:incomplete_storage_component' + let incStorageCell = 'kubejs:incomplete_storage_cell' + let incStorageComponent = 'kubejs:incomplete_storage_component' -// event.recipes.createSequencedAssembly([ -// 'ae2:cell_component_1k', -// ], 'kubejs:1k_me_storage_base', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'gtceu:red_alloy_double_wire']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'gtceu:red_alloy_double_wire']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, '#forge:gems/certus_quartz']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:logic_processor']) -// ]).transitionalItem(incStorageComponent).loops(1) -// event.recipes.createSequencedAssembly([ -// 'ae2:cell_component_4k', -// ], 'kubejs:4k_me_storage_base', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'gtceu:copper_double_wire']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:cell_component_1k']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:calculation_processor']) -// ]).transitionalItem(incStorageComponent).loops(3) + event.recipes.createSequencedAssembly([ + 'ae2:cell_component_1k', + ], 'kubejs:1k_me_storage_base', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:red_alloy_double_wire']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:red_alloy_double_wire']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', '#forge:gems/certus_quartz']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:logic_processor']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) + event.recipes.createSequencedAssembly([ + 'ae2:cell_component_4k', + ], 'kubejs:4k_me_storage_base', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:copper_double_wire']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_1k']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) -// event.recipes.createSequencedAssembly([ -// 'ae2:cell_component_16k', -// ], 'kubejs:16k_me_storage_base', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'gtceu:silver_double_wire']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:cell_component_4k']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:calculation_processor']) -// ]).transitionalItem(incStorageComponent).loops(3) + event.recipes.createSequencedAssembly([ + 'ae2:cell_component_16k', + ], 'kubejs:16k_me_storage_base', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:silver_double_wire']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_4k']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) -// event.recipes.createSequencedAssembly([ -// 'ae2:cell_component_64k', -// ], 'kubejs:64k_me_storage_base', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'gtceu:aluminium_quadruple_wire']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:cell_component_16k']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:calculation_processor']) -// ]).transitionalItem(incStorageComponent).loops(3) + event.recipes.createSequencedAssembly([ + 'ae2:cell_component_64k', + ], 'kubejs:64k_me_storage_base', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:aluminium_quadruple_wire']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_16k']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) -// event.recipes.createSequencedAssembly([ -// 'ae2:cell_component_256k', -// ], 'kubejs:256k_me_storage_base', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'gtceu:platinum_double_wire']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:cell_component_64k']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:calculation_processor']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:sky_dust']) -// ]).transitionalItem(incStorageComponent).loops(3) + event.recipes.createSequencedAssembly([ + 'ae2:cell_component_256k', + ], 'kubejs:256k_me_storage_base', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'gtceu:platinum_double_wire']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:cell_component_64k']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:calculation_processor']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:sky_dust']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(3) -// event.recipes.createSequencedAssembly([ -// 'ae2:logic_processor', -// ], '#forge:circuits/lv', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:printed_logic_processor']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:printed_silicon']) -// ]).transitionalItem(incStorageComponent).loops(1) + event.recipes.createSequencedAssembly([ + ('ae2:logic_processor'), + ], '#forge:circuits/lv', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_logic_processor']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_silicon']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) -// event.recipes.createSequencedAssembly([ -// 'ae2:engineering_processor', -// ], '#forge:circuits/lv', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:printed_engineering_processor']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:printed_silicon']) -// ]).transitionalItem(incStorageComponent).loops(1) + event.recipes.createSequencedAssembly([ + 'ae2:engineering_processor', + ], '#forge:circuits/lv', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_engineering_processor']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_silicon']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) -// event.recipes.createSequencedAssembly([ -// 'ae2:calculation_processor', -// ], '#forge:circuits/lv', [ -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:printed_calculation_processor']), -// event.recipes.createDeploying(incStorageComponent, [incStorageComponent, 'ae2:printed_silicon']) -// ]).transitionalItem(incStorageComponent).loops(1) + event.recipes.createSequencedAssembly([ + 'ae2:calculation_processor', + ], '#forge:circuits/lv', [ + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_calculation_processor']), + event.recipes.createDeploying('kubejs:incomplete_storage_component', ['kubejs:incomplete_storage_component', 'ae2:printed_silicon']) + ]).transitionalItem('kubejs:incomplete_storage_component').loops(1) -// }) \ No newline at end of file + }) diff --git a/kubejs/server_scripts/SequencedAssembly/HV.js b/kubejs/server_scripts/SequencedAssembly/HV.js index c1cb3b15..cf3acb67 100644 --- a/kubejs/server_scripts/SequencedAssembly/HV.js +++ b/kubejs/server_scripts/SequencedAssembly/HV.js @@ -1,147 +1,146 @@ -// TODO: Uncomment when KubeJS Create is added -// // priority: 0 -// ServerEvents.recipes(event => { -// // #region variables -// let interAdvCirc = 'kubejs:inter_advanced_integrated_circuit' -// let incAdvCirc = 'kubejs:inc_advanced_integrated_circuit' -// let interMicroProcCirc = 'kubejs:inter_micro_processor_assembly' -// let incMicroProcCirc = 'kubejs:inc_micro_processor_assembly' +// priority: 0 + ServerEvents.recipes(event => { +// #region variables + let interAdvCirc = 'kubejs:inter_advanced_integrated_circuit' + let incAdvCirc = 'kubejs:inc_advanced_integrated_circuit' + let interMicroProcCirc = 'kubejs:inter_micro_processor_assembly' + let incMicroProcCirc = 'kubejs:inc_micro_processor_assembly' -// let incHvMotor = 'kubejs:inc_hv_motor' -// let incHvPiston = 'kubejs:inc_hv_piston' -// let lncHvRobotArm = 'kubejs:inc_hv_robot_arm' -// let incHvConveyor = 'kubejs:inc_hv_conveyor' -// let incHvPump = 'kubejs:inc_hv_pump' -// let invHvFluidRegulator = 'kubejs:inc_hv_fluid_regulator' -// let invHvSensor = 'kubejs:inc_hv_sensor' -// let incHvEmitter = 'kubejs:inc_hv_emitter' -// // #endregion -// // #region circuits -// event.recipes.createSequencedAssembly([ -// 'gtceu:advanced_integrated_circuit' -// ], interAdvCirc, [ -// event.recipes.createDeploying(incAdvCirc, [incAdvCirc, ['gtceu:transistor','gtceu:smd_transistor']]), -// event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), -// event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), -// event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), -// event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), -// ]).transitionalItem(incAdvCirc).loops(4) + let incHvMotor = 'kubejs:inc_hv_motor' + let incHvPiston = 'kubejs:inc_hv_piston' + let lncHvRobotArm = 'kubejs:inc_hv_robot_arm' + let incHvConveyor = 'kubejs:inc_hv_conveyor' + let incHvPump = 'kubejs:inc_hv_pump' + let invHvFluidRegulator = 'kubejs:inc_hv_fluid_regulator' + let invHvSensor = 'kubejs:inc_hv_sensor' + let incHvEmitter = 'kubejs:inc_hv_emitter' +// #endregion +// #region circuits + event.recipes.createSequencedAssembly([ + 'gtceu:advanced_integrated_circuit' + ], interAdvCirc, [ + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, ['gtceu:transistor','gtceu:smd_transistor']]), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:electrum_fine_wire']), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), + event.recipes.createDeploying(incAdvCirc, [incAdvCirc, 'gtceu:annealed_copper_bolt']), + ]).transitionalItem(incAdvCirc).loops(4) -// event.recipes.createSequencedAssembly([ -// 'gtceu:micro_processor_assembly' -// ], interMicroProcCirc, [ -// event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), -// event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), -// event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:inductor', 'gtceu:smd_inductor']]), -// event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), -// event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]) -// ]).transitionalItem(incMicroProcCirc).loops(4) -// // #endregion -// // #region components -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_electric_motor', -// ], 'gtceu:magnetic_steel_rod',[ -// event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:electrum_double_wire']), -// event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:electrum_double_wire']), -// event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:stainless_steel_rod']), -// event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:silver_double_cable']) -// ]).transitionalItem(incHvMotor).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:micro_processor_assembly' + ], interMicroProcCirc, [ + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, 'gtceu:red_alloy_fine_wire']), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:inductor', 'gtceu:smd_inductor']]), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), + event.recipes.createDeploying(incMicroProcCirc, [incMicroProcCirc, ['gtceu:capacitor', 'gtceu:smd_capacitor']]) + ]).transitionalItem(incMicroProcCirc).loops(4) +// #endregion +// #region components + event.recipes.createSequencedAssembly([ + 'gtceu:hv_electric_motor', + ], 'gtceu:magnetic_steel_rod',[ + event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:electrum_double_wire']), + event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:electrum_double_wire']), + event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:stainless_steel_rod']), + event.recipes.createDeploying(incHvMotor,[incHvMotor, 'gtceu:silver_double_cable']) + ]).transitionalItem(incHvMotor).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_electric_piston', -// ], 'gtceu:hv_electric_motor',[ -// event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:gold_single_cable']), -// event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_small_gear']), -// event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_rod']), -// event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_plate']), -// ]).transitionalItem(incHvPiston).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:hv_electric_piston', + ], 'gtceu:hv_electric_motor',[ + event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:gold_single_cable']), + event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_small_gear']), + event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_rod']), + event.recipes.createDeploying(incHvPiston,[incHvPiston, 'gtceu:stainless_steel_plate']), + ]).transitionalItem(incHvPiston).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_robot_arm', -// ], 'gtceu:hv_electric_piston',[ -// event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, '#forge:circuits/hv']), -// event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:hv_electric_motor']), -// event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:gold_single_cable']), -// event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:stainless_steel_rod']), -// ]).transitionalItem(lncHvRobotArm).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:hv_robot_arm', + ], 'gtceu:hv_electric_piston',[ + event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, '#forge:circuits/hv']), + event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:hv_electric_motor']), + event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:gold_single_cable']), + event.recipes.createDeploying(lncHvRobotArm,[lncHvRobotArm, 'gtceu:stainless_steel_rod']), + ]).transitionalItem(lncHvRobotArm).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_conveyor_module', -// ], 'gtceu:gold_single_cable',[ -// event.recipes.createDeploying(incHvConveyor, -// [incHvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incHvConveyor, -// [incHvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incHvConveyor, -// [incHvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incHvConveyor,[incHvConveyor, 'gtceu:hv_electric_motor']), -// ]).transitionalItem(incHvConveyor).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:hv_conveyor_module', + ], 'gtceu:gold_single_cable',[ + event.recipes.createDeploying(incHvConveyor, + [incHvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incHvConveyor, + [incHvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incHvConveyor, + [incHvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incHvConveyor,[incHvConveyor, 'gtceu:hv_electric_motor']), + ]).transitionalItem(incHvConveyor).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_electric_pump', -// ], 'gtceu:stainless_steel_normal_fluid_pipe',[ -// event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:steel_screw']), -// event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:steel_rotor']), -// event.recipes.createDeploying(incHvPump, -// [incHvPump, -// [ -// 'gtceu:rubber_ring', -// 'gtceu:silicone_rubber_ring', -// 'gtceu:styrene_butadiene_rubber_ring' -// ] -// ]), -// event.recipes.createDeploying(incHvPump, -// [incHvPump, -// [ -// 'gtceu:rubber_ring', -// 'gtceu:silicone_rubber_ring', -// 'gtceu:styrene_butadiene_rubber_ring' -// ] -// ]), -// event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:gold_single_cable']), -// event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:hv_electric_motor']), -// ]).transitionalItem(incHvPump).loops(1) + event.recipes.createSequencedAssembly([ + 'gtceu:hv_electric_pump', + ], 'gtceu:stainless_steel_normal_fluid_pipe',[ + event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:steel_screw']), + event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:steel_rotor']), + event.recipes.createDeploying(incHvPump, + [incHvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incHvPump, + [incHvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:gold_single_cable']), + event.recipes.createDeploying(incHvPump,[incHvPump, 'gtceu:hv_electric_motor']), + ]).transitionalItem(incHvPump).loops(1) -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_fluid_regulator', -// ], 'gtceu:hv_electric_pump', [ -// event.recipes.createDeploying(invHvFluidRegulator, [invHvFluidRegulator, '#forge:circuits/hv']) -// ]).transitionalItem(invHvFluidRegulator).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:hv_fluid_regulator', + ], 'gtceu:hv_electric_pump', [ + event.recipes.createDeploying(invHvFluidRegulator, [invHvFluidRegulator, '#forge:circuits/hv']) + ]).transitionalItem(invHvFluidRegulator).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_sensor', -// ], 'gtceu:chromium_rod',[ -// event.recipes.createDeploying(invHvSensor,[invHvSensor,'#forge:circuits/hv']), -// event.recipes.createDeploying(invHvSensor,[invHvSensor,'gtceu:stainless_steel_double_plate']), -// event.recipes.createDeploying(invHvSensor,[invHvSensor,'gtceu:stainless_steel_double_plate']), -// event.recipes.createDeploying(invHvSensor,[invHvSensor,'minecraft:ender_eye']), -// ]).transitionalItem(invHvSensor).loops(1) + event.recipes.createSequencedAssembly([ + 'gtceu:hv_sensor', + ], 'gtceu:chromium_rod',[ + event.recipes.createDeploying(invHvSensor,[invHvSensor,'#forge:circuits/hv']), + event.recipes.createDeploying(invHvSensor,[invHvSensor,'gtceu:stainless_steel_double_plate']), + event.recipes.createDeploying(invHvSensor,[invHvSensor,'gtceu:stainless_steel_double_plate']), + event.recipes.createDeploying(invHvSensor,[invHvSensor,'minecraft:ender_eye']), + ]).transitionalItem(invHvSensor).loops(1) -// event.recipes.createSequencedAssembly([ -// 'gtceu:hv_emitter', -// ], 'minecraft:ender_eye', [ -// event.recipes.createDeploying(incHvEmitter, [incHvEmitter, '#forge:circuits/hv']), -// event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:gold_single_cable']), -// event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:chromium_rod']), -// event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:chromium_rod']), -// ]).transitionalItem(incHvEmitter).loops(2) -// // #endregion -// }) \ No newline at end of file + event.recipes.createSequencedAssembly([ + 'gtceu:hv_emitter', + ], 'minecraft:ender_eye', [ + event.recipes.createDeploying(incHvEmitter, [incHvEmitter, '#forge:circuits/hv']), + event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:gold_single_cable']), + event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:chromium_rod']), + event.recipes.createDeploying(incHvEmitter, [incHvEmitter, 'gtceu:chromium_rod']), + ]).transitionalItem(incHvEmitter).loops(2) +// #endregion +}) \ No newline at end of file diff --git a/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js b/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js index dd4c47b9..4e01e723 100644 --- a/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js +++ b/kubejs/server_scripts/SequencedAssembly/IntermediateItems.js @@ -1,121 +1,120 @@ -// TODO: Uncomment when KubeJS Create is added -// // priority: 0 -// ServerEvents.recipes(event => { -// let rawIntegratedCircBoard = 'kubejs:raw_integrated_circuit_board' -// let rawPlasticPrintedCircBoard = 'kubejs:raw_plastic_circuit_board' -// let rawPhenolicCircBoard = 'kubejs:raw_phenolic_circuit_board' -// let interAdvCirc = 'kubejs:inter_advanced_integrated_circuit' -// let interMicroProcCirc = 'kubejs:inter_micro_processor_assembly' -// let rawEpoxyCircBoard = 'kubejs:raw_epoxy_circuit_board' -// let interNanoProc = 'kubejs:inter_nano_processor' -// let incNanoProc = 'kubejs:inc_inter_nano_processor' +// priority: 0 + ServerEvents.recipes(event => { + let rawIntegratedCircBoard = 'kubejs:raw_integrated_circuit_board' + let rawPlasticPrintedCircBoard = 'kubejs:raw_plastic_circuit_board' + let rawPhenolicCircBoard = 'kubejs:raw_phenolic_circuit_board' + let interAdvCirc = 'kubejs:inter_advanced_integrated_circuit' + let interMicroProcCirc = 'kubejs:inter_micro_processor_assembly' + let rawEpoxyCircBoard = 'kubejs:raw_epoxy_circuit_board' + let interNanoProc = 'kubejs:inter_nano_processor' + let incNanoProc = 'kubejs:inc_inter_nano_processor' -// event.recipes.createMixing([rawIntegratedCircBoard], -// [ -// 'gtceu:resin_printed_circuit_board', -// 'gtceu:ilc_chip', -// Fluid.of('gtceu:tin', 144) -// ]).heated() -// event.recipes.createMixing([rawIntegratedCircBoard], -// [ -// 'gtceu:resin_printed_circuit_board', -// 'gtceu:ilc_chip', -// Fluid.of('gtceu:soldering_alloy', 72) -// ]).heated() + event.recipes.createMixing([rawIntegratedCircBoard], + [ + 'gtceu:resin_printed_circuit_board', + 'gtceu:ilc_chip', + Fluid.of('gtceu:tin', 144) + ]).heated() + event.recipes.createMixing([rawIntegratedCircBoard], + [ + 'gtceu:resin_printed_circuit_board', + 'gtceu:ilc_chip', + Fluid.of('gtceu:soldering_alloy', 72) + ]).heated() -// event.recipes.createMixing([rawPlasticPrintedCircBoard], -// [ -// 'gtceu:plastic_printed_circuit_board', -// 'gtceu:cpu_chip', -// Fluid.of('gtceu:tin', 144) -// ]).heated() -// event.recipes.createMixing([rawPlasticPrintedCircBoard], -// [ -// 'gtceu:plastic_printed_circuit_board', -// 'gtceu:cpu_chip', -// Fluid.of('gtceu:soldering_alloy', 72) -// ]).heated() + event.recipes.createMixing([rawPlasticPrintedCircBoard], + [ + 'gtceu:plastic_printed_circuit_board', + 'gtceu:cpu_chip', + Fluid.of('gtceu:tin', 144) + ]).heated() + event.recipes.createMixing([rawPlasticPrintedCircBoard], + [ + 'gtceu:plastic_printed_circuit_board', + 'gtceu:cpu_chip', + Fluid.of('gtceu:soldering_alloy', 72) + ]).heated() -// event.recipes.createSequencedAssembly([ -// rawPhenolicCircBoard -// ], 'gtceu:phenolic_printed_circuit_board', [ -// event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), -// event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:soldering_alloy', 36)]) -// ]).transitionalItem(rawPhenolicCircBoard).loops(2) + event.recipes.createSequencedAssembly([ + rawPhenolicCircBoard + ], 'gtceu:phenolic_printed_circuit_board', [ + event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), + event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:soldering_alloy', 36)]) + ]).transitionalItem(rawPhenolicCircBoard).loops(2) -// event.recipes.createSequencedAssembly([ -// rawPhenolicCircBoard -// ], 'gtceu:phenolic_printed_circuit_board', [ -// event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), -// event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:tin', 72)]) -// ]).transitionalItem(rawPhenolicCircBoard).loops(2) + event.recipes.createSequencedAssembly([ + rawPhenolicCircBoard + ], 'gtceu:phenolic_printed_circuit_board', [ + event.recipes.createDeploying(rawPhenolicCircBoard, [rawPhenolicCircBoard, '#forge:circuits/lv']), + event.recipes.createFilling(rawPhenolicCircBoard, [rawPhenolicCircBoard, Fluid.of('gtceu:tin', 72)]) + ]).transitionalItem(rawPhenolicCircBoard).loops(2) -// event.recipes.createMixing([interAdvCirc], -// [ -// '2x gtceu:good_integrated_circuit', -// '2x gtceu:ram_chip', -// '2x gtceu:ilc_chip', -// Fluid.of('gtceu:tin', 144) -// ]).heated() -// event.recipes.createMixing([interAdvCirc], -// [ -// '2x gtceu:good_integrated_circuit', -// '2x gtceu:ram_chip', -// '2x gtceu:ilc_chip', -// Fluid.of('gtceu:soldering_alloy', 72) -// ]).heated() + event.recipes.createMixing([interAdvCirc], + [ + '2x gtceu:good_integrated_circuit', + '2x gtceu:ram_chip', + '2x gtceu:ilc_chip', + Fluid.of('gtceu:tin', 144) + ]).heated() + event.recipes.createMixing([interAdvCirc], + [ + '2x gtceu:good_integrated_circuit', + '2x gtceu:ram_chip', + '2x gtceu:ilc_chip', + Fluid.of('gtceu:soldering_alloy', 72) + ]).heated() -// event.recipes.createSequencedAssembly([ //textureneed for intermediate item -// interMicroProcCirc -// ], 'gtceu:plastic_printed_circuit_board', [ -// event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), -// event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), -// event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), -// event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:tin', 144)]) -// ]).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) + event.recipes.createSequencedAssembly([ //textureneed for intermediate item + interMicroProcCirc + ], 'gtceu:plastic_printed_circuit_board', [ + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:tin', 144)]) + ]).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) -// event.recipes.createSequencedAssembly([ -// interMicroProcCirc -// ], 'gtceu:plastic_printed_circuit_board', [ -// event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), -// event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), -// event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), -// event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:soldering_alloy', 72)]) -// ]).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) + event.recipes.createSequencedAssembly([ + interMicroProcCirc + ], 'gtceu:plastic_printed_circuit_board', [ + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:micro_processor']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createDeploying('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', 'gtceu:ram_chip']), + event.recipes.createFilling('gtceu:plastic_printed_circuit_board', ['gtceu:plastic_printed_circuit_board', Fluid.of('gtceu:soldering_alloy', 72)]) + ]).transitionalItem('gtceu:plastic_printed_circuit_board').loops(2) -// event.recipes.createMixing([rawEpoxyCircBoard], -// [ -// 'gtceu:epoxy_printed_circuit_board', -// 'gtceu:nano_cpu_chip', -// Fluid.of('gtceu:soldering_alloy', 72) -// ]).heated() -// event.recipes.createMixing([rawEpoxyCircBoard], -// [ -// 'gtceu:epoxy_printed_circuit_board', -// 'gtceu:nano_cpu_chip', -// Fluid.of('gtceu:tin', 144) -// ]).heated() + event.recipes.createMixing([rawEpoxyCircBoard], + [ + 'gtceu:epoxy_printed_circuit_board', + 'gtceu:nano_cpu_chip', + Fluid.of('gtceu:soldering_alloy', 72) + ]).heated() + event.recipes.createMixing([rawEpoxyCircBoard], + [ + 'gtceu:epoxy_printed_circuit_board', + 'gtceu:nano_cpu_chip', + Fluid.of('gtceu:tin', 144) + ]).heated() -// event.recipes.createSequencedAssembly([ -// interNanoProc -// ], rawEpoxyCircBoard, [ -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_resistor']), -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_capacitor']), -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_transistor']), -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), -// ]).transitionalItem(incNanoProc).loops(6) + event.recipes.createSequencedAssembly([ + interNanoProc + ], rawEpoxyCircBoard, [ + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_resistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_capacitor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:smd_transistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), + ]).transitionalItem(incNanoProc).loops(6) -// event.recipes.createSequencedAssembly([ -// interNanoProc -// ], rawEpoxyCircBoard, [ -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_resistor']), -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_capacitor']), -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_transistor']), -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), -// event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), -// ]).transitionalItem(incNanoProc).loops(2) -// }) + event.recipes.createSequencedAssembly([ + interNanoProc + ], rawEpoxyCircBoard, [ + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_resistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_capacitor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:advanced_smd_transistor']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), + event.recipes.createDeploying(incNanoProc, [incNanoProc, 'gtceu:electrum_fine_wire']), + ]).transitionalItem(incNanoProc).loops(2) + }) diff --git a/kubejs/server_scripts/SequencedAssembly/LV.js b/kubejs/server_scripts/SequencedAssembly/LV.js index 845893f2..f2cb2d30 100644 --- a/kubejs/server_scripts/SequencedAssembly/LV.js +++ b/kubejs/server_scripts/SequencedAssembly/LV.js @@ -1,166 +1,165 @@ -// TODO: Uncomment when KubeJS Create is added -// // priority: 0 -// ServerEvents.recipes(event=>{ -// // #region variables -// let incBasicElectronicCirc = 'kubejs:inc_basic_electronic_circuit' -// let incBasicIntegrated = 'kubejs:inc_basic_integrated_circuit' -// let incMicrochipProcessor = 'kubejs:inc_microchip_processor' +// priority: 0 + ServerEvents.recipes(event => { +// #region variables + let incBasicElectronicCirc = 'kubejs:inc_basic_electronic_circuit' + let incBasicIntegrated = 'kubejs:inc_basic_integrated_circuit' + let incMicrochipProcessor = 'kubejs:inc_microchip_processor' -// let incLvMotor = 'kubejs:inc_lv_motor' -// let incLvPiston = 'kubejs:inc_lv_piston' -// let lncLvRobotArm = 'kubejs:inc_lv_robot_arm' -// let incLvConveyor = 'kubejs:inc_lv_conveyor' -// let incLvPump = 'kubejs:inc_lv_pump' -// let invLvFluidRegulator = 'kubejs:inc_lv_fluid_regulator' -// let invLvSensor = 'kubejs:inc_lv_sensor' -// let incLvEmitter = 'kubejs:inc_lv_emitter' -// let rawIntegratedCirc = 'kubejs:raw_integrated_circuit_board' -// let rawPlasticCircBoard = 'kubejs:raw_plastic_circuit_board' -// // #endregion -// // #region circuits -// event.recipes.createSequencedAssembly([ -// 'gtceu:basic_electronic_circuit', -// ], 'gtceu:resin_printed_circuit_board', [ -// event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), -// event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), -// event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), -// event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:tin', 72)]) -// ]).transitionalItem(incBasicElectronicCirc).loops(2) + let incLvMotor = 'kubejs:inc_lv_motor' + let incLvPiston = 'kubejs:inc_lv_piston' + let lncLvRobotArm = 'kubejs:inc_lv_robot_arm' + let incLvConveyor = 'kubejs:inc_lv_conveyor' + let incLvPump = 'kubejs:inc_lv_pump' + let invLvFluidRegulator = 'kubejs:inc_lv_fluid_regulator' + let invLvSensor = 'kubejs:inc_lv_sensor' + let incLvEmitter = 'kubejs:inc_lv_emitter' + let rawIntegratedCirc = 'kubejs:raw_integrated_circuit_board' + let rawPlasticCircBoard = 'kubejs:raw_plastic_circuit_board' +// #endregion +// #region circuits + event.recipes.createSequencedAssembly([ + 'gtceu:basic_electronic_circuit', + ], 'gtceu:resin_printed_circuit_board', [ + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), + event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:tin', 72)]) + ]).transitionalItem(incBasicElectronicCirc).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:basic_electronic_circuit', -// ], 'gtceu:resin_printed_circuit_board', [ -// event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), -// event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), -// event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), -// event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) -// ]).transitionalItem(incBasicElectronicCirc).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:basic_electronic_circuit', + ], 'gtceu:resin_printed_circuit_board', [ + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, 'gtceu:red_alloy_single_wire']), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incBasicElectronicCirc, [incBasicElectronicCirc, ['create:electron_tube', 'gtceu:nand_chip']]), + event.recipes.createFilling(incBasicElectronicCirc, [incBasicElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) + ]).transitionalItem(incBasicElectronicCirc).loops(2) -// event.recipes.createSequencedAssembly([ -// '2x gtceu:basic_integrated_circuit', -// ], rawIntegratedCirc, [ -// event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:resistor', 'gtceu:smd_resistor']]), -// event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:diode', 'gtceu:smd_diode']]), -// event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:copper_fine_wire']), -// event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:tin_bolt']), -// ]).transitionalItem(Item.of(incBasicIntegrated)).loops(2) + event.recipes.createSequencedAssembly([ + '2x gtceu:basic_integrated_circuit', + ], rawIntegratedCirc, [ + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, ['gtceu:diode', 'gtceu:smd_diode']]), + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:copper_fine_wire']), + event.recipes.createDeploying(incBasicIntegrated, [incBasicIntegrated, 'gtceu:tin_bolt']), + ]).transitionalItem(Item.of(incBasicIntegrated)).loops(2) -// event.recipes.createSequencedAssembly([ -// '3x gtceu:microchip_processor', -// ], rawPlasticCircBoard, [ -// event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), -// event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), -// event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), -// event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, 'gtceu:copper_fine_wire']), -// ]).transitionalItem(incMicrochipProcessor).loops(2) + event.recipes.createSequencedAssembly([ + '3x gtceu:microchip_processor', + ], rawPlasticCircBoard, [ + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), + event.recipes.createDeploying(incMicrochipProcessor, [incMicrochipProcessor, 'gtceu:copper_fine_wire']), + ]).transitionalItem(incMicrochipProcessor).loops(2) -// // #endregion -// // #region components + // #endregion + // #region components -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_electric_motor', -// ], ['gtceu:magnetic_iron_rod', 'gtceu:magnetic_steel_rod'], [ -// event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), -// event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), -// event.recipes.createDeploying(incLvMotor, [incLvMotor, ['gtceu:iron_rod','gtceu:steel_rod']]), -// event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:tin_single_cable']), -// ]).transitionalItem(incLvMotor).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_electric_motor', + ], ['gtceu:magnetic_iron_rod', 'gtceu:magnetic_steel_rod'], [ + event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), + event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:copper_single_wire']), + event.recipes.createDeploying(incLvMotor, [incLvMotor, ['gtceu:iron_rod','gtceu:steel_rod']]), + event.recipes.createDeploying(incLvMotor, [incLvMotor, 'gtceu:tin_single_cable']), + ]).transitionalItem(incLvMotor).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_electric_piston', -// ], 'gtceu:lv_electric_motor', [ -// event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:tin_single_cable']), -// event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_small_gear']), -// event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_rod']), -// event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_plate']) -// ]).transitionalItem(incLvPiston).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_electric_piston', + ], 'gtceu:lv_electric_motor', [ + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_small_gear']), + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_rod']), + event.recipes.createDeploying(incLvPiston, [incLvPiston, 'gtceu:steel_plate']) + ]).transitionalItem(incLvPiston).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_robot_arm', -// ], 'gtceu:lv_electric_piston', [ -// event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, '#forge:circuits/lv']), -// event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:lv_electric_motor']), -// event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:tin_single_cable']), -// event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:steel_rod']) -// ]).transitionalItem(lncLvRobotArm).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_robot_arm', + ], 'gtceu:lv_electric_piston', [ + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, '#forge:circuits/lv']), + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:lv_electric_motor']), + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(lncLvRobotArm, [lncLvRobotArm, 'gtceu:steel_rod']) + ]).transitionalItem(lncLvRobotArm).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_conveyor_module', -// ], 'gtceu:tin_single_cable', [ -// event.recipes.createDeploying(incLvConveyor, -// [incLvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incLvConveyor, -// [incLvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incLvConveyor, -// [incLvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incLvConveyor, [incLvConveyor, 'gtceu:lv_electric_motor']) -// ]).transitionalItem(incLvConveyor).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_conveyor_module', + ], 'gtceu:tin_single_cable', [ + event.recipes.createDeploying(incLvConveyor, + [incLvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incLvConveyor, + [incLvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incLvConveyor, + [incLvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incLvConveyor, [incLvConveyor, 'gtceu:lv_electric_motor']) + ]).transitionalItem(incLvConveyor).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_electric_pump', -// ], 'gtceu:bronze_normal_fluid_pipe', [ -// event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_screw']), -// event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_rotor']), -// event.recipes.createDeploying(incLvPump, -// [incLvPump, -// [ -// 'gtceu:rubber_ring', -// 'gtceu:silicone_rubber_ring', -// 'gtceu:styrene_butadiene_rubber_ring' -// ] -// ]), -// event.recipes.createDeploying(incLvPump, -// [incLvPump, -// [ -// 'gtceu:rubber_ring', -// 'gtceu:silicone_rubber_ring', -// 'gtceu:styrene_butadiene_rubber_ring' -// ] -// ]), -// event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_single_cable']), -// event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:lv_electric_motor']), -// ]).transitionalItem(incLvPump).loops(1) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_electric_pump', + ], 'gtceu:bronze_normal_fluid_pipe', [ + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_screw']), + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_rotor']), + event.recipes.createDeploying(incLvPump, + [incLvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incLvPump, + [incLvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(incLvPump, [incLvPump, 'gtceu:lv_electric_motor']), + ]).transitionalItem(incLvPump).loops(1) -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_fluid_regulator', -// ], 'gtceu:lv_electric_piston', [ -// event.recipes.createDeploying(invLvFluidRegulator, [invLvFluidRegulator, '#forge:circuits/lv']) -// ]).transitionalItem(invLvFluidRegulator).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_fluid_regulator', + ], 'gtceu:lv_electric_piston', [ + event.recipes.createDeploying(invLvFluidRegulator, [invLvFluidRegulator, '#forge:circuits/lv']) + ]).transitionalItem(invLvFluidRegulator).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_sensor', -// ], '#forge:circuits/lv', [ -// event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), -// event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), -// event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:brass_rod']), -// event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:quartzite_gem']) -// ]).transitionalItem(invLvSensor).loops(1) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_sensor', + ], '#forge:circuits/lv', [ + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:steel_double_plate']), + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:brass_rod']), + event.recipes.createDeploying(invLvSensor, [invLvSensor, 'gtceu:quartzite_gem']) + ]).transitionalItem(invLvSensor).loops(1) -// event.recipes.createSequencedAssembly([ -// 'gtceu:lv_emitter', -// ], 'gtceu:quartzite_gem', [ -// event.recipes.createDeploying(incLvEmitter, [incLvEmitter, '#forge:circuits/lv']), -// event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:tin_single_cable']), -// event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']), -// event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']) -// ]).transitionalItem(incLvEmitter).loops(2) -// // #endregion -// }) + event.recipes.createSequencedAssembly([ + 'gtceu:lv_emitter', + ], 'gtceu:quartzite_gem', [ + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, '#forge:circuits/lv']), + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:tin_single_cable']), + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']), + event.recipes.createDeploying(incLvEmitter, [incLvEmitter, 'gtceu:brass_rod']) + ]).transitionalItem(incLvEmitter).loops(2) + // #endregion +}) diff --git a/kubejs/server_scripts/SequencedAssembly/MV.js b/kubejs/server_scripts/SequencedAssembly/MV.js index 33865258..113b25c4 100644 --- a/kubejs/server_scripts/SequencedAssembly/MV.js +++ b/kubejs/server_scripts/SequencedAssembly/MV.js @@ -1,166 +1,165 @@ -// TODO: Uncomment when KubeJS Create is added -// // priority: 0 -// ServerEvents.recipes(event => { -// // #region variables -// let incGoodElectronicCirc = 'kubejs:inc_good_electronic_circuit' -// let incGoodIntegratedCirc = 'kubejs:inc_good_integrated_circuit' -// let incMicroProcessor = 'kubejs:inc_micro_processor' +// priority: 0 + ServerEvents.recipes(event => { +// #region variables + let incGoodElectronicCirc = 'kubejs:inc_good_electronic_circuit' + let incGoodIntegratedCirc = 'kubejs:inc_good_integrated_circuit' + let incMicroProcessor = 'kubejs:inc_micro_processor' -// let incMvMotor = 'kubejs:inc_mv_motor' -// let incMvPiston = 'kubejs:inc_mv_piston' -// let lncMvRobotArm = 'kubejs:inc_mv_robot_arm' -// let incMvConveyor = 'kubejs:inc_mv_conveyor' -// let incMvPump = 'kubejs:inc_mv_pump' -// let invMvFluidRegulator = 'kubejs:inc_mv_fluid_regulator' -// let invMvSensor = 'kubejs:inc_mv_sensor' -// let incMvEmitter = 'kubejs:inc_mv_emitter' -// let rawPhenolicCircBoard = 'kubejs:raw_phenolic_circuit_board' -// let rawPlasticCircBoard = 'kubejs:raw_plastic_circuit_board' -// // #endregion -// // #region circuits -// event.recipes.createSequencedAssembly([ -// 'gtceu:good_electronic_circuit' -// ], 'gtceu:phenolic_printed_circuit_board',[ -// event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), -// event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), -// event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), -// event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) -// ]).transitionalItem(incGoodElectronicCirc).loops(2) + let incMvMotor = 'kubejs:inc_mv_motor' + let incMvPiston = 'kubejs:inc_mv_piston' + let lncMvRobotArm = 'kubejs:inc_mv_robot_arm' + let incMvConveyor = 'kubejs:inc_mv_conveyor' + let incMvPump = 'kubejs:inc_mv_pump' + let invMvFluidRegulator = 'kubejs:inc_mv_fluid_regulator' + let invMvSensor = 'kubejs:inc_mv_sensor' + let incMvEmitter = 'kubejs:inc_mv_emitter' + let rawPhenolicCircBoard = 'kubejs:raw_phenolic_circuit_board' + let rawPlasticCircBoard = 'kubejs:raw_plastic_circuit_board' +// #endregion +// #region circuits + event.recipes.createSequencedAssembly([ + 'gtceu:good_electronic_circuit' + ], 'gtceu:phenolic_printed_circuit_board',[ + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), + event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:soldering_alloy', 36)]) + ]).transitionalItem(incGoodElectronicCirc).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:good_electronic_circuit' -// ], 'gtceu:phenolic_printed_circuit_board',[ -// event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), -// event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), -// event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), -// event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:tin', 72)]) -// ]).transitionalItem(incGoodElectronicCirc).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:good_electronic_circuit' + ], 'gtceu:phenolic_printed_circuit_board',[ + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, '#forge:circuits/lv']), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, ['gtceu:diode', 'gtceu:smd_diode']]), + event.recipes.createDeploying(incGoodElectronicCirc, [incGoodElectronicCirc, 'gtceu:copper_single_wire']), + event.recipes.createFilling(incGoodElectronicCirc, [incGoodElectronicCirc, Fluid.of('gtceu:tin', 72)]) + ]).transitionalItem(incGoodElectronicCirc).loops(2) -// event.recipes.createSequencedAssembly([ -// '2x gtceu:good_integrated_circuit' -// ], rawPhenolicCircBoard, [ -// event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_resistor', 'gtceu:resistor']]), -// event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_diode', 'gtceu:diode']]), -// event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), -// event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), -// event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']), -// event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']) -// ]).transitionalItem(incGoodIntegratedCirc).loops(2) + event.recipes.createSequencedAssembly([ + '2x gtceu:good_integrated_circuit' + ], rawPhenolicCircBoard, [ + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_resistor', 'gtceu:resistor']]), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, ['gtceu:smd_diode', 'gtceu:diode']]), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:gold_fine_wire']), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']), + event.recipes.createDeploying(incGoodIntegratedCirc, [incGoodIntegratedCirc, 'gtceu:silver_bolt']) + ]).transitionalItem(incGoodIntegratedCirc).loops(2) -// event.recipes.createSequencedAssembly([ -// '2x gtceu:micro_processor' -// ], rawPlasticCircBoard, [ -// event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), -// event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), -// event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), -// event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, 'gtceu:red_alloy_fine_wire']), -// ]).transitionalItem(incMicroProcessor).loops(4) -// // #endregion -// // #region components -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_electric_motor', -// ], 'gtceu:magnetic_steel_rod',[ -// event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), -// event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), -// event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:aluminium_rod']), -// event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:copper_single_cable']) -// ]).transitionalItem(incMvMotor).loops(2) + event.recipes.createSequencedAssembly([ + '2x gtceu:micro_processor' + ], rawPlasticCircBoard, [ + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:resistor', 'gtceu:smd_resistor']]), + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:capacitor', 'gtceu:smd_capacitor']]), + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, ['gtceu:transistor', 'gtceu:smd_transistor']]), + event.recipes.createDeploying(incMicroProcessor, [incMicroProcessor, 'gtceu:red_alloy_fine_wire']), + ]).transitionalItem(incMicroProcessor).loops(4) +// #endregion +// #region components + event.recipes.createSequencedAssembly([ + 'gtceu:mv_electric_motor', + ], 'gtceu:magnetic_steel_rod',[ + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:cupronickel_double_wire']), + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:aluminium_rod']), + event.recipes.createDeploying(incMvMotor,[incMvMotor, 'gtceu:copper_single_cable']) + ]).transitionalItem(incMvMotor).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_electric_piston', -// ], 'gtceu:mv_electric_motor',[ -// event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:copper_single_cable']), -// event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_small_gear']), -// event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_rod']), -// event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_plate']), -// ]).transitionalItem(incMvPiston).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:mv_electric_piston', + ], 'gtceu:mv_electric_motor',[ + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_small_gear']), + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_rod']), + event.recipes.createDeploying(incMvPiston,[incMvPiston, 'gtceu:aluminium_plate']), + ]).transitionalItem(incMvPiston).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_robot_arm', -// ], 'gtceu:mv_electric_piston',[ -// event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, '#forge:circuits/mv']), -// event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:mv_electric_motor']), -// event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:copper_single_cable']), -// event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:aluminium_rod']), -// ]).transitionalItem(lncMvRobotArm).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:mv_robot_arm', + ], 'gtceu:mv_electric_piston',[ + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, '#forge:circuits/mv']), + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:mv_electric_motor']), + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(lncMvRobotArm,[lncMvRobotArm, 'gtceu:aluminium_rod']), + ]).transitionalItem(lncMvRobotArm).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_conveyor_module', -// ], 'gtceu:copper_single_cable',[ -// event.recipes.createDeploying(incMvConveyor, -// [incMvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incMvConveyor, -// [incMvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incMvConveyor, -// [incMvConveyor, -// [ -// 'gtceu:rubber_plate', -// 'gtceu:silicone_rubber_plate', -// 'gtceu:styrene_butadiene_rubber_plate' -// ] -// ]), -// event.recipes.createDeploying(incMvConveyor,[incMvConveyor, 'gtceu:mv_electric_motor']), -// ]).transitionalItem(incMvConveyor).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:mv_conveyor_module', + ], 'gtceu:copper_single_cable',[ + event.recipes.createDeploying(incMvConveyor, + [incMvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incMvConveyor, + [incMvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incMvConveyor, + [incMvConveyor, + [ + 'gtceu:rubber_plate', + 'gtceu:silicone_rubber_plate', + 'gtceu:styrene_butadiene_rubber_plate' + ] + ]), + event.recipes.createDeploying(incMvConveyor,[incMvConveyor, 'gtceu:mv_electric_motor']), + ]).transitionalItem(incMvConveyor).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_electric_pump', -// ], 'gtceu:steel_normal_fluid_pipe',[ -// event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_screw']), -// event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_rotor']), -// event.recipes.createDeploying(incMvPump, -// [incMvPump, -// [ -// 'gtceu:rubber_ring', -// 'gtceu:silicone_rubber_ring', -// 'gtceu:styrene_butadiene_rubber_ring' -// ] -// ]), -// event.recipes.createDeploying(incMvPump, -// [incMvPump, -// [ -// 'gtceu:rubber_ring', -// 'gtceu:silicone_rubber_ring', -// 'gtceu:styrene_butadiene_rubber_ring' -// ] -// ]), -// event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:copper_single_cable']), -// event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:mv_electric_motor']), -// ]).transitionalItem(incMvPump).loops(1) + event.recipes.createSequencedAssembly([ + 'gtceu:mv_electric_pump', + ], 'gtceu:steel_normal_fluid_pipe',[ + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_screw']), + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:bronze_rotor']), + event.recipes.createDeploying(incMvPump, + [incMvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incMvPump, + [incMvPump, + [ + 'gtceu:rubber_ring', + 'gtceu:silicone_rubber_ring', + 'gtceu:styrene_butadiene_rubber_ring' + ] + ]), + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(incMvPump,[incMvPump, 'gtceu:mv_electric_motor']), + ]).transitionalItem(incMvPump).loops(1) -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_fluid_regulator', -// ], 'gtceu:mv_electric_piston', [ -// event.recipes.createDeploying(invMvFluidRegulator, [invMvFluidRegulator, '#forge:circuits/mv']) -// ]).transitionalItem(invMvFluidRegulator).loops(2) + event.recipes.createSequencedAssembly([ + 'gtceu:mv_fluid_regulator', + ], 'gtceu:mv_electric_piston', [ + event.recipes.createDeploying(invMvFluidRegulator, [invMvFluidRegulator, '#forge:circuits/mv']) + ]).transitionalItem(invMvFluidRegulator).loops(2) -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_sensor', -// ], 'gtceu:electrum_rod',[ -// event.recipes.createDeploying(invMvSensor,[invMvSensor,'#forge:circuits/mv']), -// event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), -// event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), -// event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:emerald_flawless_gem']), -// ]).transitionalItem(invMvSensor).loops(1) + event.recipes.createSequencedAssembly([ + 'gtceu:mv_sensor', + ], 'gtceu:electrum_rod',[ + event.recipes.createDeploying(invMvSensor,[invMvSensor,'#forge:circuits/mv']), + event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), + event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:aluminium_double_plate']), + event.recipes.createDeploying(invMvSensor,[invMvSensor,'gtceu:emerald_flawless_gem']), + ]).transitionalItem(invMvSensor).loops(1) -// event.recipes.createSequencedAssembly([ -// 'gtceu:mv_emitter', -// ], 'gtceu:emerald_flawless_gem', [ -// event.recipes.createDeploying(incMvEmitter, [incMvEmitter, '#forge:circuits/mv']), -// event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:copper_single_cable']), -// event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), -// event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), -// ]).transitionalItem(incMvEmitter).loops(2) -// // #endregion -// }) \ No newline at end of file + event.recipes.createSequencedAssembly([ + 'gtceu:mv_emitter', + ], 'gtceu:emerald_flawless_gem', [ + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, '#forge:circuits/mv']), + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:copper_single_cable']), + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), + event.recipes.createDeploying(incMvEmitter, [incMvEmitter, 'gtceu:electrum_rod']), + ]).transitionalItem(incMvEmitter).loops(2) +// #endregion +}) \ No newline at end of file diff --git a/kubejs/server_scripts/Vanilla.js b/kubejs/server_scripts/Vanilla.js index 7ab73b73..3f86c356 100644 --- a/kubejs/server_scripts/Vanilla.js +++ b/kubejs/server_scripts/Vanilla.js @@ -61,10 +61,9 @@ var logs = ['#minecraft:acacia_logs', '#minecraft:oak_logs', '#minecraft:birch_l ).damageIngredient(Item.of('#forge:tools/files')) - // TODO: Uncomment when KubeJS Create is added - // event.recipes.createCutting(Item.of( - // planks[i], 6), - // logs[i], ).processingTime(20) + event.recipes.createCutting(Item.of( + planks[i], 6), + logs[i], ).processingTime(20) event.shapeless( Item.of(planks[i], 4), diff --git a/kubejs/startup_scripts/ItemGeneration.js b/kubejs/startup_scripts/ItemGeneration.js index b78cc1fa..78042558 100644 --- a/kubejs/startup_scripts/ItemGeneration.js +++ b/kubejs/startup_scripts/ItemGeneration.js @@ -3,57 +3,56 @@ StartupEvents.registry('item', event => { event.create('drinkable_liquid_concrete').useAnimation("drink").displayName('Bucket of Drinkable Liquid Concrete') - // TODO: Uncomment when KubeJS Create is added - // event.create('inc_mv_circuit', 'create:sequenced_assembly').displayName('Incomplete MV Circuit') - // //lv circuits - // event.create('inc_basic_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Electronic Circuit') - // event.create('inc_basic_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Integrated Circuit') - // event.create('inc_microchip_processor', 'create:sequenced_assembly').displayName('Incomplete Microchip Processor') - // //hv circuits - // event.create('inc_good_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Godd Electronic Circuit') - // event.create('inc_good_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Good Integrated Circuit') - // event.create('inc_micro_processor', 'create:sequenced_assembly').displayName('Incomplete Micro Processor') - // //hv circuits missing texture for inter items - // event.create('inter_advanced_integrated_circuit').displayName('Intermediate Advanced Integrated Circuit') - // event.create('inc_advanced_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Advanced Integrated Circuit') + event.create('inc_mv_circuit', 'create:sequenced_assembly').displayName('Incomplete MV Circuit') + //lv circuits + event.create('inc_basic_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Electronic Circuit') + event.create('inc_basic_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Basic Integrated Circuit') + event.create('inc_microchip_processor', 'create:sequenced_assembly').displayName('Incomplete Microchip Processor') + //hv circuits + event.create('inc_good_electronic_circuit', 'create:sequenced_assembly').displayName('Incomplete Godd Electronic Circuit') + event.create('inc_good_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Good Integrated Circuit') + event.create('inc_micro_processor', 'create:sequenced_assembly').displayName('Incomplete Micro Processor') + //hv circuits missing texture for inter items + event.create('inter_advanced_integrated_circuit').displayName('Intermediate Advanced Integrated Circuit') + event.create('inc_advanced_integrated_circuit', 'create:sequenced_assembly').displayName('Incomplete Advanced Integrated Circuit') - // event.create('inter_micro_processor_assembly').displayName('Intermediate Micro Processor Assembly') - // event.create('inc_micro_processor_assembly', 'create:sequenced_assembly').displayName('Incomplete Micro Processor Assembly') + event.create('inter_micro_processor_assembly').displayName('Intermediate Micro Processor Assembly') + event.create('inc_micro_processor_assembly', 'create:sequenced_assembly').displayName('Incomplete Micro Processor Assembly') - // event.create('inc_inter_nano_processor', 'create:sequenced_assembly').displayName('Incomplete Nano Processor') - // event.create('inter_nano_processor').displayName('Intermediate Nano Processor') + event.create('inc_inter_nano_processor', 'create:sequenced_assembly').displayName('Incomplete Nano Processor') + event.create('inter_nano_processor').displayName('Intermediate Nano Processor') - // event.create('raw_integrated_circuit_board').displayName("Raw Integrated Circuit Board") - // event.create('raw_phenolic_circuit_board').displayName("Raw Phenolic Printed Circuit Board") - // event.create('raw_plastic_circuit_board').displayName("Raw Plastic Printed Circuit Board") - // event.create('raw_epoxy_circuit_board').displayName("Raw Epoxy Printed Circuit Board") - // // LV components - // event.create('inc_lv_motor', 'create:sequenced_assembly').displayName('Incomplete LV Motor') - // event.create('inc_lv_piston', 'create:sequenced_assembly').displayName('Incomplete LV Piston') - // event.create('inc_lv_pump', 'create:sequenced_assembly').displayName('Incomplete LV Pump') - // event.create('inc_lv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete LV Fluid Regulator') - // event.create('inc_lv_sensor', 'create:sequenced_assembly').displayName('Incomplete LV Sensor') - // event.create('inc_lv_emitter', 'create:sequenced_assembly').displayName('Incomplete LV Emitter') - // event.create('inc_lv_conveyor', 'create:sequenced_assembly').displayName('Incomplete LV Conveyor') - // event.create('inc_lv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete LV Robot Arm') - // // MV components - // event.create('inc_mv_motor', 'create:sequenced_assembly').displayName('Incomplete MV Motor') - // event.create('inc_mv_piston', 'create:sequenced_assembly').displayName('Incomplete MV Piston') - // event.create('inc_mv_pump', 'create:sequenced_assembly').displayName('Incomplete MV Pump') - // event.create('inc_mv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete MV Fluid Regulator') - // event.create('inc_mv_sensor', 'create:sequenced_assembly').displayName('Incomplete MV Sensor') - // event.create('inc_mv_emitter', 'create:sequenced_assembly').displayName('Incomplete MV Emitter') - // event.create('inc_mv_conveyor', 'create:sequenced_assembly').displayName('Incomplete MV Conveyor') - // event.create('inc_mv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete MV Robotic Arm') - // // HV components - // event.create('inc_hv_motor', 'create:sequenced_assembly') - // event.create('inc_hv_piston', 'create:sequenced_assembly').displayName('Incomplete HV Piston') - // event.create('inc_hv_pump', 'create:sequenced_assembly').displayName('Incomplete HV Pump') - // event.create('inc_hv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete HV Fluid Regulator') - // event.create('inc_hv_sensor', 'create:sequenced_assembly').displayName('Incomplete HV Sensor') - // event.create('inc_hv_emitter', 'create:sequenced_assembly').displayName('Incomplete HV Emitter') - // event.create('inc_hv_conveyor', 'create:sequenced_assembly').displayName('Incomplete HV Conveyor') - // event.create('inc_hv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete HV Robot Arm') + event.create('raw_integrated_circuit_board').displayName("Raw Integrated Circuit Board") + event.create('raw_phenolic_circuit_board').displayName("Raw Phenolic Printed Circuit Board") + event.create('raw_plastic_circuit_board').displayName("Raw Plastic Printed Circuit Board") + event.create('raw_epoxy_circuit_board').displayName("Raw Epoxy Printed Circuit Board") + // LV components + event.create('inc_lv_motor', 'create:sequenced_assembly').displayName('Incomplete LV Motor') + event.create('inc_lv_piston', 'create:sequenced_assembly').displayName('Incomplete LV Piston') + event.create('inc_lv_pump', 'create:sequenced_assembly').displayName('Incomplete LV Pump') + event.create('inc_lv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete LV Fluid Regulator') + event.create('inc_lv_sensor', 'create:sequenced_assembly').displayName('Incomplete LV Sensor') + event.create('inc_lv_emitter', 'create:sequenced_assembly').displayName('Incomplete LV Emitter') + event.create('inc_lv_conveyor', 'create:sequenced_assembly').displayName('Incomplete LV Conveyor') + event.create('inc_lv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete LV Robot Arm') + // MV components + event.create('inc_mv_motor', 'create:sequenced_assembly').displayName('Incomplete MV Motor') + event.create('inc_mv_piston', 'create:sequenced_assembly').displayName('Incomplete MV Piston') + event.create('inc_mv_pump', 'create:sequenced_assembly').displayName('Incomplete MV Pump') + event.create('inc_mv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete MV Fluid Regulator') + event.create('inc_mv_sensor', 'create:sequenced_assembly').displayName('Incomplete MV Sensor') + event.create('inc_mv_emitter', 'create:sequenced_assembly').displayName('Incomplete MV Emitter') + event.create('inc_mv_conveyor', 'create:sequenced_assembly').displayName('Incomplete MV Conveyor') + event.create('inc_mv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete MV Robotic Arm') + // HV components + event.create('inc_hv_motor', 'create:sequenced_assembly') + event.create('inc_hv_piston', 'create:sequenced_assembly').displayName('Incomplete HV Piston') + event.create('inc_hv_pump', 'create:sequenced_assembly').displayName('Incomplete HV Pump') + event.create('inc_hv_fluid_regulator', 'create:sequenced_assembly').displayName('Incomplete HV Fluid Regulator') + event.create('inc_hv_sensor', 'create:sequenced_assembly').displayName('Incomplete HV Sensor') + event.create('inc_hv_emitter', 'create:sequenced_assembly').displayName('Incomplete HV Emitter') + event.create('inc_hv_conveyor', 'create:sequenced_assembly').displayName('Incomplete HV Conveyor') + event.create('inc_hv_robot_arm', 'create:sequenced_assembly').displayName('Incomplete HV Robot Arm') // AE2 @@ -72,9 +71,8 @@ StartupEvents.registry('item', event => { event.create('256k_me_storage_wafer').displayName('256k ME Storage Wafer') event.create('256k_me_storage_base').displayName('256k ME Storage Base') - // TODO: Uncomment when KubeJS Create is added - // event.create('incomplete_storage_cell', 'create:sequenced_assembly').displayName('Incomplete Storage Cell') - // event.create('incomplete_storage_component', 'create:sequenced_assembly').displayName('Incomplete Storage Component') + event.create('incomplete_storage_cell', 'create:sequenced_assembly').displayName('Incomplete Storage Cell') + event.create('incomplete_storage_component', 'create:sequenced_assembly').displayName('Incomplete Storage Component') // Ad Astra // Stainless Steel diff --git a/kubejs/startup_scripts/MultiBlock.js b/kubejs/startup_scripts/MultiBlock.js index f88e1533..9d7f03ba 100644 --- a/kubejs/startup_scripts/MultiBlock.js +++ b/kubejs/startup_scripts/MultiBlock.js @@ -1,38 +1,37 @@ -// TODO: Uncomment when KubeJS Create is added -// GTCEuStartupEvents.registry('gtceu:machine', event => { +GTCEuStartupEvents.registry('gtceu:machine', event => { -// //multi -// event.create('ore_proc', 'multiblock') -// .rotationState(RotationState.NON_Y_AXIS) -// .recipeType('ore_proc') -// .appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN) -// .pattern(definition => FactoryBlockPattern.start() -// .aisle("PPPPP", "PTTTP", "PTTTP", "PPPPP") -// .aisle("PPPPP", "SWGWS", "SWGWS", "PPPPP") -// .aisle("PPPPP", "S#G#S", "S#G#S", "PPMPP") -// .aisle("PPPPP", "SWGWS", "SWGWS", "PPPPP") -// .aisle("PPPPP", "PTCTP", "PTTTP", "PPPPP") -// .where('C', Predicates.controller(Predicates.blocks(definition.get()))) -// .where('P', Predicates.blocks('gtceu:inert_machine_casing').setMinGlobalLimited(5).or(Predicates.autoAbilities(definition.getRecipeType()))) -// .where('S', Predicates.blocks('gtceu:stainless_steel_frame')) -// .where('T', Predicates.blocks('gtceu:tempered_glass')) -// .where('G', Predicates.blocks('gtceu:steel_gearbox')) -// .where('W', Predicates.blocks('create:crushing_wheel')) -// .where('M', Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1)) -// .where('#', Predicates.air()) -// .build()) -// .workableCasingRenderer("gtceu:block/casings/solid/machine_casing_inert_ptfe", -// "gtceu:block/multiblock/implosion_compressor", false) + //multi + event.create('ore_proc', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeTypes(['ore_proc']) + .appearanceBlock(GTBlocks.CASING_STAINLESS_CLEAN) + .pattern(definition => FactoryBlockPattern.start() + .aisle("PPPPP", "PTTTP", "PTTTP", "PPPPP") + .aisle("PPPPP", "SWGWS", "SWGWS", "PPPPP") + .aisle("PPPPP", "S#G#S", "S#G#S", "PPMPP") + .aisle("PPPPP", "SWGWS", "SWGWS", "PPPPP") + .aisle("PPPPP", "PTCTP", "PTTTP", "PPPPP") + .where('C', Predicates.controller(Predicates.blocks(definition.get()))) + .where('P', Predicates.blocks('gtceu:inert_machine_casing').setMinGlobalLimited(5).or(Predicates.autoAbilities(definition.getRecipeTypes()))) + .where('S', Predicates.blocks('gtceu:stainless_steel_frame')) + .where('T', Predicates.blocks('gtceu:tempered_glass')) + .where('G', Predicates.blocks('gtceu:steel_gearbox')) + .where('W', Predicates.blocks('create:crushing_wheel')) + .where('M', Predicates.abilities(PartAbility.MUFFLER).setExactLimit(1)) + .where('#', Predicates.air()) + .build()) + .workableCasingRenderer("gtceu:block/casings/solid/machine_casing_inert_ptfe", + "gtceu:block/multiblock/implosion_compressor", false) -// }) + }) -// GTCEuStartupEvents.registry('gtceu:recipe_type', event => { + GTCEuStartupEvents.registry('gtceu:recipe_type', event => { -// event.create('ore_proc') -// .category('multi') //Used in the GTlib / LDlib ui editor -// .setEUIO('in') -// .setMaxIOSize(3, 4, 4, 3) //Max Item Inputs, Max Item Outputs, Max Fluid Inputs, Max Fluid Outputs -// .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) -// .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) -// .setSound(GTSoundEntries.FIRE); -// }) \ No newline at end of file + event.create('ore_proc') + .category('multi') //Used in the GTlib / LDlib ui editor + .setEUIO('in') + .setMaxIOSize(3, 4, 4, 3) //Max Item Inputs, Max Item Outputs, Max Fluid Inputs, Max Fluid Outputs + .setSlotOverlay(false, false, GuiTextures.SOLIDIFIER_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.FIRE); + }) \ No newline at end of file diff --git a/mods/ad-astra.pw.toml b/mods/ad-astra.pw.toml index af05f178..1854b984 100644 --- a/mods/ad-astra.pw.toml +++ b/mods/ad-astra.pw.toml @@ -1,13 +1,13 @@ name = "Ad Astra" -filename = "ad_astra-forge-1.20.1-1.15.3.jar" +filename = "ad_astra-forge-1.20.1-1.15.5.jar" side = "both" [download] hash-format = "sha1" -hash = "6a0a99f549dfc3146a2bfffb941ebb3fe640339c" +hash = "4f1e5a074f39c3dcf2ef38a44415f9611cade6cf" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4671593 +file-id = 4894852 project-id = 635042 diff --git a/mods/advanced-peripherals.pw.toml b/mods/advanced-peripherals.pw.toml index 2acc348e..28374f00 100644 --- a/mods/advanced-peripherals.pw.toml +++ b/mods/advanced-peripherals.pw.toml @@ -1,13 +1,13 @@ name = "Advanced Peripherals" -filename = "AdvancedPeripherals-1.20.1-0.7.32b.jar" +filename = "AdvancedPeripherals-1.20.1-0.7.35b.jar" side = "both" [download] hash-format = "sha1" -hash = "78fa025340f3176baa17131cb8884e383083d56a" +hash = "c433e7a01b9d9718059886107a5a8a0eb0701f5b" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4684385 +file-id = 4896160 project-id = 431725 diff --git a/mods/appleskin.pw.toml b/mods/appleskin.pw.toml index 6c3fc801..431e12d0 100644 --- a/mods/appleskin.pw.toml +++ b/mods/appleskin.pw.toml @@ -1,13 +1,13 @@ name = "AppleSkin" -filename = "appleskin-forge-mc1.20.1-2.5.0.jar" +filename = "appleskin-forge-mc1.20.1-2.5.1.jar" side = "both" [download] hash-format = "sha1" -hash = "82d939a64bec23de208357fb9e97a12df5fccf1a" +hash = "81919356f84eab14258db98924b66c3c38e372b1" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4605078 +file-id = 4770828 project-id = 248787 diff --git a/mods/applied-energistics-2.pw.toml b/mods/applied-energistics-2.pw.toml index ae0b49df..1d48eecc 100644 --- a/mods/applied-energistics-2.pw.toml +++ b/mods/applied-energistics-2.pw.toml @@ -1,13 +1,13 @@ name = "Applied Energistics 2" -filename = "appliedenergistics2-forge-15.0.11.jar" +filename = "appliedenergistics2-forge-15.0.15.jar" side = "both" [download] hash-format = "sha1" -hash = "5eee709ab9a3eff81aa138fec08bd9b03408036b" +hash = "7a3e1c6e4ee6335aef62e995db1beefa6385ac79" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4735461 +file-id = 4857895 project-id = 223794 diff --git a/mods/athena.pw.toml b/mods/athena.pw.toml index cb90efc9..0c2aa850 100644 --- a/mods/athena.pw.toml +++ b/mods/athena.pw.toml @@ -1,13 +1,13 @@ name = "Athena" -filename = "athena-forge-1.20.1-3.1.0.jar" +filename = "athena-forge-1.20.1-3.1.1.jar" side = "both" [download] hash-format = "sha1" -hash = "1d0add63cbd0e985ec4e1715d5d7a4fba57e9a87" +hash = "1643af6a4c429048f36bf40857f58c9b3def7204" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4718179 +file-id = 4764357 project-id = 841890 diff --git a/mods/attributefix.pw.toml b/mods/attributefix.pw.toml index 5a9f158a..ed50230a 100644 --- a/mods/attributefix.pw.toml +++ b/mods/attributefix.pw.toml @@ -1,13 +1,13 @@ name = "AttributeFix" -filename = "AttributeFix-Forge-1.20.1-21.0.2.jar" +filename = "AttributeFix-Forge-1.20.1-21.0.4.jar" side = "both" [download] hash-format = "sha1" -hash = "afd84663db17041e3bf3908ea97a9174f339c357" +hash = "6eb69343eb21d38f95d1b1d00e6bc777bdb336fa" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4714729 +file-id = 4911084 project-id = 280510 diff --git a/mods/baubley-heart-canisters.pw.toml b/mods/baubley-heart-canisters.pw.toml index d56a6b54..15b099ea 100644 --- a/mods/baubley-heart-canisters.pw.toml +++ b/mods/baubley-heart-canisters.pw.toml @@ -1,13 +1,13 @@ name = "Baubley Heart Canisters" -filename = "baubley-heart-canisters-1.20.1-1.0.3.jar" +filename = "baubley-heart-canisters-1.20.1-1.0.5.jar" side = "both" [download] hash-format = "sha1" -hash = "0de2dbc93f6a6dda630db671410e3c51cc963484" +hash = "43c18dd492cf5c37520d58cdc36c2e74d976c77e" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4606359 +file-id = 4786762 project-id = 282947 diff --git a/mods/botarium.pw.toml b/mods/botarium.pw.toml index 1198f429..cf3f469f 100644 --- a/mods/botarium.pw.toml +++ b/mods/botarium.pw.toml @@ -1,13 +1,13 @@ name = "Botarium" -filename = "botarium-forge-1.20.1-2.2.0.jar" +filename = "botarium-forge-1.20.1-2.2.1.jar" side = "both" [download] hash-format = "sha1" -hash = "6444145d4c89755c218d907a19177b72be9baa7f" +hash = "d0d985e3ad275c68f8140520312062e41cca37e7" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4672475 +file-id = 4831434 project-id = 704113 diff --git a/mods/cc-tweaked.pw.toml b/mods/cc-tweaked.pw.toml index 7a83ddb8..e4d953d6 100644 --- a/mods/cc-tweaked.pw.toml +++ b/mods/cc-tweaked.pw.toml @@ -1,13 +1,13 @@ name = "CC: Tweaked" -filename = "cc-tweaked-1.20.1-forge-1.108.1.jar" +filename = "cc-tweaked-1.20.1-forge-1.109.0.jar" side = "both" [download] hash-format = "sha1" -hash = "1eb52ee1fd0ce3adb16e67adfeb0eac1ce4bc676" +hash = "f9df1ebfa307d3bda4661fce2a35bc2bca9a4eed" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4740605 +file-id = 4870180 project-id = 282001 diff --git a/mods/cloth-config.pw.toml b/mods/cloth-config.pw.toml index 664a35b0..e63ae503 100644 --- a/mods/cloth-config.pw.toml +++ b/mods/cloth-config.pw.toml @@ -1,13 +1,13 @@ name = "Cloth Config API (Fabric/Forge)" -filename = "cloth-config-12.0.109-forge.jar" +filename = "cloth-config-11.1.106-forge.jar" side = "both" [download] hash-format = "sha1" -hash = "e2d0dabdb7cc7a504b42a5b38c768678a928bf36" +hash = "b6f17b52c469c5ca27c9e90abdb0ecc0be16149d" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4762986 +file-id = 4633444 project-id = 348521 diff --git a/mods/colorful-hearts.pw.toml b/mods/colorful-hearts.pw.toml index 1aebf0f2..242b51f4 100644 --- a/mods/colorful-hearts.pw.toml +++ b/mods/colorful-hearts.pw.toml @@ -1,13 +1,13 @@ name = "Colorful Hearts" -filename = "colorfulhearts-forge-1.20.1-4.0.1.jar" +filename = "colorfulhearts-forge-1.20.1-4.0.4.jar" side = "both" [download] hash-format = "sha1" -hash = "80f38445141864ad7d656fa5d49bf540fe6a7853" +hash = "04d2c691e1a4a5810f7a830b129e68185b1eec5c" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4761450 +file-id = 4811084 project-id = 854213 diff --git a/mods/corpse.pw.toml b/mods/corpse.pw.toml index d6a62a1f..c1024dcd 100644 --- a/mods/corpse.pw.toml +++ b/mods/corpse.pw.toml @@ -1,13 +1,13 @@ name = "Corpse" -filename = "corpse-1.20.1-1.0.5.jar" +filename = "corpse-1.20.1-1.0.9.jar" side = "both" [download] hash-format = "sha1" -hash = "686d772b62321ab3018851dc2c17ad34d0f5e513" +hash = "9f04c3997653581e06037ccec6d79209d5c76c6c" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4678972 +file-id = 4913871 project-id = 316582 diff --git a/mods/create-steam-n-rails.pw.toml b/mods/create-steam-n-rails.pw.toml index 6e6f57c1..fcb969b3 100644 --- a/mods/create-steam-n-rails.pw.toml +++ b/mods/create-steam-n-rails.pw.toml @@ -1,13 +1,13 @@ name = "Create: Steam 'n' Rails" -filename = "Steam_Rails-1.5.1+forge-mc1.20.1.jar" +filename = "Steam_Rails-1.5.3+forge-mc1.20.1.jar" side = "both" [download] hash-format = "sha1" -hash = "c5886a3c9e5d8b9fcd14335fb978d60a0ebfc6aa" +hash = "ed3611b9a6e947d93a7fdfaf4d6d037c17f5ec6e" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4746993 +file-id = 4836196 project-id = 688231 diff --git a/mods/create.pw.toml b/mods/create.pw.toml index fc362079..b4a0c709 100644 --- a/mods/create.pw.toml +++ b/mods/create.pw.toml @@ -1,13 +1,13 @@ name = "Create" -filename = "create-1.20.1-0.5.1.d.jar" +filename = "create-1.20.1-0.5.1.f.jar" side = "both" [download] hash-format = "sha1" -hash = "26c3f76dbba950b58c63044ae6717d0d33fa0f01" +hash = "3fee3c26ebbfdfd59e1371ab73ba1f61b44ef6d0" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4626108 +file-id = 4835191 project-id = 328085 diff --git a/mods/curios.pw.toml b/mods/curios.pw.toml index e491468f..50942818 100644 --- a/mods/curios.pw.toml +++ b/mods/curios.pw.toml @@ -1,13 +1,13 @@ name = "Curios API (Forge)" -filename = "curios-forge-5.3.3+1.20.1.jar" +filename = "curios-forge-5.4.5+1.20.1.jar" side = "both" [download] hash-format = "sha1" -hash = "9ac5948af753129d4fa6699ab4a34bb9b572c068" +hash = "497660b3f6e708da546df8925fe78c75ef2921b9" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4762969 +file-id = 4913335 project-id = 309927 diff --git a/mods/emi.pw.toml b/mods/emi.pw.toml index ae749305..9600c2fb 100644 --- a/mods/emi.pw.toml +++ b/mods/emi.pw.toml @@ -1,13 +1,13 @@ name = "EMI" -filename = "emi-1.0.20+1.20.1+forge.jar" +filename = "emi-1.0.26+1.20.1+forge.jar" side = "both" [download] hash-format = "sha1" -hash = "3b8433bee3e5ad07245c971437a88a3beb96e6f5" +hash = "837a46d29e38657c95dcc288748529b0376bb4b3" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4758541 +file-id = 4918905 project-id = 580555 diff --git a/mods/ender-io.pw.toml b/mods/ender-io.pw.toml index 18ebabdb..79589a1e 100644 --- a/mods/ender-io.pw.toml +++ b/mods/ender-io.pw.toml @@ -1,13 +1,13 @@ name = "Ender IO" -filename = "EnderIO-1.20.1-6.0.20-alpha.jar" +filename = "EnderIO-1.20.1-6.0.23-alpha.jar" side = "both" [download] hash-format = "sha1" -hash = "11d045cf4d630a4f881432edc07cac25114e5e84" +hash = "6339a0f9ff791ccdc2d2237cb0f5130adafb5b6c" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4762194 +file-id = 4920828 project-id = 64578 diff --git a/mods/fancymenu-forge.pw.toml b/mods/fancymenu-forge.pw.toml index 21341cdf..6d0da592 100644 --- a/mods/fancymenu-forge.pw.toml +++ b/mods/fancymenu-forge.pw.toml @@ -1,13 +1,13 @@ name = "FancyMenu [Forge]" -filename = "fancymenu_forge_2.14.9-1_MC_1.20.1.jar" +filename = "fancymenu_forge_2.14.9-3_MC_1.20.1.jar" side = "both" [download] hash-format = "sha1" -hash = "f4448b0e7af1c1649144e296b22ba1a21192cb77" +hash = "fff908c285b52da7218445df41b7902099381a15" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4727346 +file-id = 4776833 project-id = 367706 diff --git a/mods/ferritecore.pw.toml b/mods/ferritecore.pw.toml index 0de2fa01..fb064536 100644 --- a/mods/ferritecore.pw.toml +++ b/mods/ferritecore.pw.toml @@ -1,13 +1,13 @@ name = "FerriteCore (Forge)" -filename = "ferritecore-6.0.0-forge.jar" +filename = "ferritecore-6.0.1-forge.jar" side = "both" [download] hash-format = "sha1" -hash = "5c090bf8e882c0ccb9dcdb4afe712fa430e03a02" +hash = "417fb6ce8f52abf40bd9d0390371790f9576f8ba" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4574361 +file-id = 4810975 project-id = 429235 diff --git a/mods/framedblocks.pw.toml b/mods/framedblocks.pw.toml index 321133b9..8f78eda8 100644 --- a/mods/framedblocks.pw.toml +++ b/mods/framedblocks.pw.toml @@ -1,13 +1,13 @@ name = "FramedBlocks" -filename = "FramedBlocks-9.1.1.jar" +filename = "FramedBlocks-9.1.6.jar" side = "both" [download] hash-format = "sha1" -hash = "1cec819ac407fdcee28260e1ff9e23eb1dc5cb74" +hash = "9663ba7c16867cc1983ec1c1dbc237e2b54626e1" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4762548 +file-id = 4793884 project-id = 441647 diff --git a/mods/ftb-backups-2.pw.toml b/mods/ftb-backups-2.pw.toml index 59a63e80..484255b2 100644 --- a/mods/ftb-backups-2.pw.toml +++ b/mods/ftb-backups-2.pw.toml @@ -1,13 +1,13 @@ name = "FTB Backups 2" -filename = "ftbbackups2-forge-1.20-1.0.19.jar" +filename = "ftbbackups2-forge-1.20-1.0.23.jar" side = "both" [download] hash-format = "sha1" -hash = "ea84c245ce64bf2cd035483010eb59224172adff" +hash = "4b100de40338247a3fbf4d1fd1846257c5338189" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4584674 +file-id = 4834403 project-id = 622737 diff --git a/mods/ftb-chunks-forge.pw.toml b/mods/ftb-chunks-forge.pw.toml index 02748224..5c127fb6 100644 --- a/mods/ftb-chunks-forge.pw.toml +++ b/mods/ftb-chunks-forge.pw.toml @@ -1,13 +1,13 @@ name = "FTB Chunks (Forge)" -filename = "ftb-chunks-forge-2001.2.2.jar" +filename = "ftb-chunks-forge-2001.2.3.jar" side = "both" [download] hash-format = "sha1" -hash = "0c8522e9ea77659471bb80cfddb500f29865bef3" +hash = "1f851131fd578a96168e286a3b7284a65274a442" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4753076 +file-id = 4828652 project-id = 314906 diff --git a/mods/ftb-essentials-forge.pw.toml b/mods/ftb-essentials-forge.pw.toml index ae91a75c..2a705bca 100644 --- a/mods/ftb-essentials-forge.pw.toml +++ b/mods/ftb-essentials-forge.pw.toml @@ -1,13 +1,13 @@ name = "FTB Essentials (Forge & Fabric)" -filename = "ftb-essentials-forge-2001.1.2.jar" +filename = "ftb-essentials-forge-2001.2.2.jar" side = "both" [download] hash-format = "sha1" -hash = "543802e3674033509d154cb0283b1e01801b2fd4" +hash = "e9f668ea8fa12215b1db9d505af8feb617d66e5a" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4596992 +file-id = 4896152 project-id = 410811 diff --git a/mods/ftb-library-forge.pw.toml b/mods/ftb-library-forge.pw.toml index 51fd0326..e3c0bd0e 100644 --- a/mods/ftb-library-forge.pw.toml +++ b/mods/ftb-library-forge.pw.toml @@ -1,13 +1,13 @@ name = "FTB Library (Forge)" -filename = "ftb-library-forge-2001.1.3.jar" +filename = "ftb-library-forge-2001.1.4.jar" side = "both" [download] hash-format = "sha1" -hash = "38855d828fde1b0e037aa711b67cfae57be0d50d" +hash = "de7fd22d2fd5e5cd5e6060c487df8f97c33933f2" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4720056 +file-id = 4864329 project-id = 404465 diff --git a/mods/ftb-quests-forge.pw.toml b/mods/ftb-quests-forge.pw.toml index 2c1db407..f6ad4f32 100644 --- a/mods/ftb-quests-forge.pw.toml +++ b/mods/ftb-quests-forge.pw.toml @@ -1,13 +1,13 @@ name = "FTB Quests (Forge)" -filename = "ftb-quests-forge-2001.1.4.jar" +filename = "ftb-quests-forge-2001.2.0.jar" side = "both" [download] hash-format = "sha1" -hash = "50d2587166dbc1000c1b57c6b64c0e73f1c27f26" +hash = "e0fb6a20ac029f3b1981d06fb95e34355d175cb5" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4760286 +file-id = 4872462 project-id = 289412 diff --git a/mods/greate.pw.toml b/mods/greate.pw.toml index acaf3a56..9c24cfcc 100644 --- a/mods/greate.pw.toml +++ b/mods/greate.pw.toml @@ -1,13 +1,13 @@ name = "Greate" -filename = "greate-forge-0.0.5.jar" +filename = "greate-0.0.8.jar" side = "both" [download] -url = "https://cdn.modrinth.com/data/8wDcQuht/versions/HapF3oqu/greate-forge-0.0.5.jar" +url = "https://cdn.modrinth.com/data/8wDcQuht/versions/6bmNUb47/greate-0.0.8.jar" hash-format = "sha1" -hash = "6d5318662bd937b91cad3281a307ce08c5a6debf" +hash = "670b7589cd5d6c16c842ec07c31b07f716057b09" [update] [update.modrinth] mod-id = "8wDcQuht" -version = "HapF3oqu" +version = "6bmNUb47" diff --git a/mods/gregtechceu-modern.pw.toml b/mods/gregtechceu-modern.pw.toml index 030ae8c8..990fe09c 100644 --- a/mods/gregtechceu-modern.pw.toml +++ b/mods/gregtechceu-modern.pw.toml @@ -1,13 +1,13 @@ name = "GregTechCEu Modern" -filename = "gtceu-forge-1.20.1-1.0.12.e.jar" +filename = "gtceu-forge-1.20.1-1.0.16.jar" side = "both" [download] hash-format = "sha1" -hash = "21df591a12b0be01024feee13a87e454e233fe18" +hash = "b670d17043a5a40835075bc3fa69faf153cccca4" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4763386 +file-id = 4891191 project-id = 890405 diff --git a/mods/guard-villagers.pw.toml b/mods/guard-villagers.pw.toml index e2aae295..4ff26203 100644 --- a/mods/guard-villagers.pw.toml +++ b/mods/guard-villagers.pw.toml @@ -1,13 +1,13 @@ name = "Guard Villagers" -filename = "guardvillagers-1.20-1.6.1.jar" +filename = "guardvillagers-1.20.1-1.6.3.jar" side = "both" [download] hash-format = "sha1" -hash = "85ce16ac635d5b4d30825523be60a3ae14735cc8" +hash = "a3e0c8f2d074e9b3291ddd8701cbf645fd373cb9" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4686082 +file-id = 4800776 project-id = 360203 diff --git a/mods/item-filters.pw.toml b/mods/item-filters.pw.toml index be9773f3..76199d4e 100644 --- a/mods/item-filters.pw.toml +++ b/mods/item-filters.pw.toml @@ -1,13 +1,13 @@ name = "Item Filters" -filename = "item-filters-forge-2001.1.0-build.55.jar" +filename = "item-filters-forge-2001.1.0-build.59.jar" side = "both" [download] hash-format = "sha1" -hash = "b2ba276e3904c29667992a76378d5cdceeb9e86a" +hash = "55a7f032c59489eca96069a7841601de2ff97590" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4728209 +file-id = 4838266 project-id = 309674 diff --git a/mods/jade-addons.pw.toml b/mods/jade-addons.pw.toml index 32ae1838..71f4c857 100644 --- a/mods/jade-addons.pw.toml +++ b/mods/jade-addons.pw.toml @@ -1,13 +1,13 @@ name = "Jade Addons (Forge)" -filename = "JadeAddons-1.20.1-forge-5.2.0.jar" +filename = "JadeAddons-1.20.1-forge-5.2.1.jar" side = "both" [download] hash-format = "sha1" -hash = "281a85bae4405edc564c5cc97e8160a95ab70c09" +hash = "820317c167edd6ab8cc65321848f9cca49f4a33b" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4712768 +file-id = 4848425 project-id = 583345 diff --git a/mods/jade.pw.toml b/mods/jade.pw.toml index a1f9d9a4..8b8d1871 100644 --- a/mods/jade.pw.toml +++ b/mods/jade.pw.toml @@ -1,13 +1,13 @@ name = "Jade 🔍" -filename = "Jade-1.20.1-forge-11.5.1.jar" +filename = "Jade-1.20.1-forge-11.6.3.jar" side = "both" [download] hash-format = "sha1" -hash = "6a6c185219441aa76fc7e184c7d362058494c0ca" +hash = "26fe4f70ff6ae68652f65c65cc300fa6bc416962" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4711195 +file-id = 4801177 project-id = 324717 diff --git a/mods/journeymap.pw.toml b/mods/journeymap.pw.toml index 6189da20..50ae0b25 100644 --- a/mods/journeymap.pw.toml +++ b/mods/journeymap.pw.toml @@ -1,13 +1,13 @@ name = "JourneyMap" -filename = "journeymap-1.20.1-5.9.13-forge.jar" +filename = "journeymap-1.20.1-5.9.18-forge.jar" side = "both" [download] hash-format = "sha1" -hash = "ccc79fa06cc6718d5444a130fbc3e2c422bd4e12" +hash = "379cafda0e730baa4dfd5cc64fdfd993c0e9d2ce" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4759554 +file-id = 4873848 project-id = 32274 diff --git a/mods/kubejs.pw.toml b/mods/kubejs.pw.toml index 67bbd42d..e6d2db2a 100644 --- a/mods/kubejs.pw.toml +++ b/mods/kubejs.pw.toml @@ -1,13 +1,13 @@ name = "KubeJS" -filename = "kubejs-forge-2001.6.3-build.47.jar" +filename = "kubejs-forge-2001.6.4-build.95.jar" side = "both" [download] hash-format = "sha1" -hash = "90df776044db556084de8c8b08266c1324fb0744" +hash = "eac452d190a79ef06b252fdd654cfb2e65d57a99" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4758954 +file-id = 4878381 project-id = 238086 diff --git a/mods/modernfix.pw.toml b/mods/modernfix.pw.toml index 6afc80d3..7e1a520b 100644 --- a/mods/modernfix.pw.toml +++ b/mods/modernfix.pw.toml @@ -1,13 +1,13 @@ name = "ModernFix" -filename = "modernfix-forge-5.7.2+mc1.20.1.jar" +filename = "modernfix-forge-5.9.3+mc1.20.1.jar" side = "both" [download] hash-format = "sha1" -hash = "c387c723fdc83975e0b6303e6fb11eaec78e7f0a" +hash = "8e9158aea30c5b66c5b855f565e3dac80074a827" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4728408 +file-id = 4862982 project-id = 790626 diff --git a/mods/oculus.pw.toml b/mods/oculus.pw.toml index e156b6ba..a274c234 100644 --- a/mods/oculus.pw.toml +++ b/mods/oculus.pw.toml @@ -1,13 +1,13 @@ name = "Oculus" -filename = "oculus-mc1.20-1.6.4.jar" +filename = "oculus-mc1.20.1-1.6.9.jar" side = "both" [download] hash-format = "sha1" -hash = "33cecf7bcb17a4cbcb23aed1993771e73f1f9307" +hash = "406ad9995cd1ab803e0001f80a85498105b4d488" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4578741 +file-id = 4767500 project-id = 581495 diff --git a/mods/openblocks-elevator.pw.toml b/mods/openblocks-elevator.pw.toml index 70a64ae3..16123fa8 100644 --- a/mods/openblocks-elevator.pw.toml +++ b/mods/openblocks-elevator.pw.toml @@ -1,13 +1,13 @@ name = "OpenBlocks Elevator" -filename = "elevatorid-1.20.1-1.8.15.jar" +filename = "elevatorid-1.20.1-lex-1.9.jar" side = "both" [download] hash-format = "sha1" -hash = "7b84f12c284da1b4f20fbccb1cfe3da938d25fb3" +hash = "04f3ee97d8881f4dd6b4e2c8c5ba4e1785e2f2c7" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4703090 +file-id = 4837768 project-id = 250832 diff --git a/mods/openblocks-trophies.pw.toml b/mods/openblocks-trophies.pw.toml index 1958f945..6647eab2 100644 --- a/mods/openblocks-trophies.pw.toml +++ b/mods/openblocks-trophies.pw.toml @@ -1,13 +1,13 @@ name = "OpenBlocks Trophies" -filename = "OpenBlocksTrophies-1.20.1-3.0.4.jar" +filename = "OpenBlocksTrophies-1.20.1-4.0.0.jar" side = "both" [download] hash-format = "sha1" -hash = "62d6c6bd7bcdb9fc5220dfdba363149c7410a372" +hash = "508e84b9dddd16756ee398c8966db7b1975fce6d" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4741033 +file-id = 4908007 project-id = 683319 diff --git a/mods/placebo.pw.toml b/mods/placebo.pw.toml index 6b7341f1..b3249c65 100644 --- a/mods/placebo.pw.toml +++ b/mods/placebo.pw.toml @@ -1,13 +1,13 @@ name = "Placebo" -filename = "Placebo-1.20.1-8.3.7.jar" +filename = "Placebo-1.20.1-8.6.0.jar" side = "both" [download] hash-format = "sha1" -hash = "428450383d6002229759c2d98c9eaffaa0b61083" +hash = "ddc15d8cd438bdfd8e1498ec0cc19d0e39a8b16e" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4723708 +file-id = 4913663 project-id = 283644 diff --git a/mods/polylib.pw.toml b/mods/polylib.pw.toml index 5447c147..d0e9b221 100644 --- a/mods/polylib.pw.toml +++ b/mods/polylib.pw.toml @@ -1,13 +1,13 @@ name = "PolyLib" -filename = "polylib-forge-1200.0.2-build.85.jar" +filename = "polylib-forge-2000.0.3-build.97.jar" side = "both" [download] hash-format = "sha1" -hash = "276f7b89affb3c431c83d4403d2e5246a20e67ac" +hash = "3a0b3d8640b02727d5d2aacfc3cb4db0dc8427de" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4586333 +file-id = 4893433 project-id = 576589 diff --git a/mods/productivebees.pw.toml b/mods/productivebees.pw.toml index 119e1829..d48ec6d8 100644 --- a/mods/productivebees.pw.toml +++ b/mods/productivebees.pw.toml @@ -1,13 +1,13 @@ name = "Productive Bees" -filename = "productivebees-1.20.1-12.2.1.jar" +filename = "productivebees-1.20.1-12.2.11.jar" side = "both" [download] hash-format = "sha1" -hash = "41ea2c3a7019b32d3aaa9643e76f75acf2c4fa49" +hash = "f71c9c31e908afc4fb791155520dacbaff397b6f" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4743183 +file-id = 4910187 project-id = 377897 diff --git a/mods/puzzles-lib.pw.toml b/mods/puzzles-lib.pw.toml index 74870d86..8f93f5f7 100644 --- a/mods/puzzles-lib.pw.toml +++ b/mods/puzzles-lib.pw.toml @@ -1,13 +1,13 @@ name = "Puzzles Lib [Forge & Fabric]" -filename = "PuzzlesLib-v8.0.24-1.20.1-Forge.jar" +filename = "PuzzlesLib-v8.1.9-1.20.1-Forge.jar" side = "both" [download] hash-format = "sha1" -hash = "69493022734c4e7c4ac6365a2c4fee7baff9affd" +hash = "5afb28969481dd68138d15a0c57bab693b8ee85e" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4707419 +file-id = 4882383 project-id = 495476 diff --git a/mods/resourceful-lib.pw.toml b/mods/resourceful-lib.pw.toml index b1d137d2..3435ef15 100644 --- a/mods/resourceful-lib.pw.toml +++ b/mods/resourceful-lib.pw.toml @@ -1,13 +1,13 @@ name = "Resourceful Lib" -filename = "resourcefullib-forge-1.20.1-2.1.11.jar" +filename = "resourcefullib-forge-1.20.1-2.1.18.jar" side = "both" [download] hash-format = "sha1" -hash = "ff24e6e598a0290f33c7f30a932b2fdfbb6839ff" +hash = "0adc7649ae933fb17a411651a672f1369f0eb51d" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4741196 +file-id = 4903912 project-id = 570073 diff --git a/mods/rhino.pw.toml b/mods/rhino.pw.toml index 075cc91c..f0fa1bd9 100644 --- a/mods/rhino.pw.toml +++ b/mods/rhino.pw.toml @@ -1,13 +1,13 @@ name = "Rhino" -filename = "rhino-forge-2001.2.2-build.6.jar" +filename = "rhino-forge-2001.2.2-build.13.jar" side = "both" [download] hash-format = "sha1" -hash = "bf7196f66ccfc926f2943e6d16539c122b2f9a07" +hash = "7a2cf786276dee7a5f83b32245cc3dec8f950b0f" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4735056 +file-id = 4847655 project-id = 416294 diff --git a/mods/rubidium.pw.toml b/mods/rubidium.pw.toml index 48b9728b..c7df5c2a 100644 --- a/mods/rubidium.pw.toml +++ b/mods/rubidium.pw.toml @@ -1,13 +1,13 @@ name = "Rubidium" -filename = "rubidium-0.6.5.jar" +filename = "rubidium-mc1.20.1-0.7.1.jar" side = "both" [download] hash-format = "sha1" -hash = "d2da2d5ba83056c1e68a94912a5da3ca992291c4" +hash = "9c532360e08cca8c8dd2d94827c24fc7eaac8b4b" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4573226 +file-id = 4767529 project-id = 574856 diff --git a/mods/searchables.pw.toml b/mods/searchables.pw.toml index 520a41bc..c8be10a5 100644 --- a/mods/searchables.pw.toml +++ b/mods/searchables.pw.toml @@ -1,13 +1,13 @@ name = "Searchables" -filename = "Searchables-forge-1.20.1-1.0.1.jar" +filename = "Searchables-forge-1.20.1-1.0.2.jar" side = "both" [download] hash-format = "sha1" -hash = "ec3c2d3919a72f72d562bb85cfcb76f57220c2f7" +hash = "15548b2b50b700c0ffe2b9c4de80dfe510db208d" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4598462 +file-id = 4779110 project-id = 858542 diff --git a/mods/sophisticated-backpacks.pw.toml b/mods/sophisticated-backpacks.pw.toml index 33c709fc..e16fbda6 100644 --- a/mods/sophisticated-backpacks.pw.toml +++ b/mods/sophisticated-backpacks.pw.toml @@ -1,13 +1,13 @@ name = "Sophisticated Backpacks" -filename = "sophisticatedbackpacks-1.20.1-3.18.59.909.jar" +filename = "sophisticatedbackpacks-1.20.1-3.19.1.962.jar" side = "both" [download] hash-format = "sha1" -hash = "d529bd298652f84b599c9ea8d17adc44b736e213" +hash = "a83580ca5f2c6a4a0dacb8db2b516496fee46077" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4738222 +file-id = 4913632 project-id = 422301 diff --git a/mods/sophisticated-core.pw.toml b/mods/sophisticated-core.pw.toml index 31c395e6..693fcd46 100644 --- a/mods/sophisticated-core.pw.toml +++ b/mods/sophisticated-core.pw.toml @@ -1,13 +1,13 @@ name = "Sophisticated Core" -filename = "sophisticatedcore-1.20.1-0.5.89.425.jar" +filename = "sophisticatedcore-1.20.1-0.5.108.504.jar" side = "both" [download] hash-format = "sha1" -hash = "61a8092d1713c79c74330ecb62200b172e3bd5b4" +hash = "6476a3b4439192e261be59891a62a764a3482fdf" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4738212 +file-id = 4913628 project-id = 618298 diff --git a/mods/spice-of-life-carrot-edition.pw.toml b/mods/spice-of-life-carrot-edition.pw.toml index c2f8fa4f..3c925ab9 100644 --- a/mods/spice-of-life-carrot-edition.pw.toml +++ b/mods/spice-of-life-carrot-edition.pw.toml @@ -1,13 +1,13 @@ name = "Spice of Life: Carrot Edition" -filename = "solcarrot-1.20.1-1.15.0.jar" +filename = "solcarrot-1.20.1-1.15.1.jar" side = "both" [download] hash-format = "sha1" -hash = "337b8affe4c45528d83d2768e1577ba9b8c2dbf9" +hash = "f7fa1fd0c633b10f98d7f0f97766b95aac1a2dc0" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4650707 +file-id = 4888575 project-id = 277616 diff --git a/mods/terralith.pw.toml b/mods/terralith.pw.toml index eff3e6e4..10d7e55a 100644 --- a/mods/terralith.pw.toml +++ b/mods/terralith.pw.toml @@ -1,13 +1,13 @@ name = "Terralith" -filename = "Terralith_1.20.1_v2.4.5.jar" +filename = "Terralith_1.20.2_v2.4.8.jar" side = "both" [download] hash-format = "sha1" -hash = "550446ab3401fe21b6f4761b3c23d7aa4fcab2cc" +hash = "4b20f50554edbb75945bd15a5db989afffc79709" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4725190 +file-id = 4823753 project-id = 513688 diff --git a/mods/toms-storage.pw.toml b/mods/toms-storage.pw.toml index 199b8d46..0add2d3d 100644 --- a/mods/toms-storage.pw.toml +++ b/mods/toms-storage.pw.toml @@ -1,13 +1,13 @@ name = "Tom's Simple Storage Mod" -filename = "toms_storage-1.20-1.6.4.jar" +filename = "toms_storage-1.20-1.6.5.jar" side = "both" [download] hash-format = "sha1" -hash = "be1441cde0350890a221f86887db89fa94512ef5" +hash = "abcd33998c1baec7e429c705bdbdf9d3c9b377e7" mode = "metadata:curseforge" [update] [update.curseforge] -file-id = 4649849 +file-id = 4792109 project-id = 378609 diff --git a/pack.toml b/pack.toml index 2a5e4945..83d67c1f 100644 --- a/pack.toml +++ b/pack.toml @@ -8,7 +8,7 @@ file = "index.toml" hash-format = "sha256" [versions] -forge = "47.1.47" +forge = "47.2.0" minecraft = "1.20.1" [options]