From efdda8cedd9b9c2a608d8bc57f938293dedfd770 Mon Sep 17 00:00:00 2001 From: mina <143211829+ursamina@users.noreply.github.com> Date: Sun, 17 Dec 2023 22:42:58 +0000 Subject: [PATCH] cleanup scripts for launch fixed syntax + unified unnecessary files --- .../gtceu/compass/pages/en_us/covers/pump.xml | 14 - .../machines/inscriber/overlay_front.png | Bin 88 -> 0 bytes .../inscriber/overlay_front_active.png | Bin 154 -> 0 bytes .../server_scripts/appliedenergistics2/ae2.js | 365 ++++++++---------- .../appliedenergistics2/cables.js | 89 +++-- .../appliedenergistics2/cards.js | 77 ++-- .../appliedenergistics2/cells.js | 85 ++-- .../appliedenergistics2/certus_quartz.js | 16 +- .../appliedenergistics2/circuitry.js | 54 ++- .../appliedenergistics2/crafting_storage.js | 36 +- .../appliedenergistics2/extendedae2.js | 104 +++-- .../appliedenergistics2/inter_providers.js | 26 +- .../molecular_assemblers.js | 28 +- .../appliedenergistics2/patterns.js | 66 +++- .../appliedenergistics2/portable_cells.js | 16 +- .../appliedenergistics2/pressing.js | 38 +- .../appliedenergistics2/removals.js | 75 ++-- .../appliedenergistics2/storage_parts.js | 91 +++-- .../appliedenergistics2/terminals.js | 150 +++---- .../crafting_station/recipes.js | 16 +- kubejs/server_scripts/example.js | 2 - kubejs/server_scripts/gregtech/greenhouse.js | 18 +- .../gregtech/wood_unification.js | 32 ++ kubejs/server_scripts/miscellaneous.js | 23 -- kubejs/server_scripts/open_blocks/elevator.js | 6 +- kubejs/server_scripts/tags/items.js | 3 - kubejs/server_scripts/tool_belt/recipes.js | 28 +- kubejs/server_scripts/vanilla/loot_drops.js | 12 +- kubejs/server_scripts/vanilla/mob_drops.js | 153 +++++--- .../startup_scripts/components/hsla-steel.js | 12 +- kubejs/startup_scripts/example.js | 6 - kubejs/startup_scripts/icons.js | 8 +- .../startup_scripts/machinery/greenhouse.js | 59 +-- .../material_testing/material.js | 25 +- kubejs/startup_scripts/recipes/greenhouse.js | 17 +- 35 files changed, 922 insertions(+), 828 deletions(-) delete mode 100644 kubejs/assets/gtceu/compass/pages/en_us/covers/pump.xml delete mode 100644 kubejs/assets/gtceu/textures/block/machines/inscriber/overlay_front.png delete mode 100644 kubejs/assets/gtceu/textures/block/machines/inscriber/overlay_front_active.png delete mode 100644 kubejs/server_scripts/example.js create mode 100644 kubejs/server_scripts/gregtech/wood_unification.js delete mode 100644 kubejs/server_scripts/miscellaneous.js delete mode 100644 kubejs/startup_scripts/example.js diff --git a/kubejs/assets/gtceu/compass/pages/en_us/covers/pump.xml b/kubejs/assets/gtceu/compass/pages/en_us/covers/pump.xml deleted file mode 100644 index 815a21a..0000000 --- a/kubejs/assets/gtceu/compass/pages/en_us/covers/pump.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - hover info - - - - - hover info - - - \ No newline at end of file diff --git a/kubejs/assets/gtceu/textures/block/machines/inscriber/overlay_front.png b/kubejs/assets/gtceu/textures/block/machines/inscriber/overlay_front.png deleted file mode 100644 index 5e4988e6b2bfa35a4512b02b86013e071bb13b02..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 88 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z#!!5 p;uvDlo17rQx;R0khlzuMfkl9UvEH|$kAZ=K!PC{xWt~$(69DHx60HCL diff --git a/kubejs/assets/gtceu/textures/block/machines/inscriber/overlay_front_active.png b/kubejs/assets/gtceu/textures/block/machines/inscriber/overlay_front_active.png deleted file mode 100644 index cb2596bcf361c20c4aa1ff3106de7a0502145dee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 154 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z`&C3 z=bP0l+XkK D77!}0 diff --git a/kubejs/server_scripts/appliedenergistics2/ae2.js b/kubejs/server_scripts/appliedenergistics2/ae2.js index 61527d2..6293f98 100644 --- a/kubejs/server_scripts/appliedenergistics2/ae2.js +++ b/kubejs/server_scripts/appliedenergistics2/ae2.js @@ -1,43 +1,42 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; // quartz glass - event.remove({id: "ae2:decorative/quartz_glass"}) - greg.alloy_smelter('gtceu:quartz_glass') - .itemInputs("4x #forge:glass", "5x gtceu:certus_quartz_dust") - .itemOutputs("4x ae2:quartz_glass") - .duration(100) - .EUt(8) - + event.remove({ id: "ae2:decorative/quartz_glass" }); + greg + .alloy_smelter("gtceu:quartz_glass") + .itemInputs("4x #forge:glass", "5x gtceu:certus_quartz_dust") + .itemOutputs("4x ae2:quartz_glass") + .duration(100) + .EUt(8); + // vibrant quartz glass - event.remove({id: "ae2:decorative/quartz_vibrant_glass"}) - greg.alloy_smelter('gtceu:vibrant_quartz_glass') - .itemInputs("ae2:quartz_glass", "2x minecraft:glowstone_dust") - .itemOutputs("2x ae2:quartz_vibrant_glass") - .duration(100) - .EUt(8) + event.remove({ id: "ae2:decorative/quartz_vibrant_glass" }); + greg + .alloy_smelter("gtceu:vibrant_quartz_glass") + .itemInputs("ae2:quartz_glass", "2x minecraft:glowstone_dust") + .itemOutputs("2x ae2:quartz_vibrant_glass") + .duration(100) + .EUt(8); // Tiny TNT - event.remove({id: "ae2:misc/tiny_tnt"}) - greg.cutter("gtceu:tiny_tnt") - .inputFluids('minecraft:water 9000') - .itemInputs('minecraft:tnt') - .itemOutputs('4x ae2:tiny_tnt') + event.remove({ id: "ae2:misc/tiny_tnt" }); + greg + .cutter("gtceu:tiny_tnt") + .inputFluids("minecraft:water 9000") + .itemInputs("minecraft:tnt") + .itemOutputs("4x ae2:tiny_tnt") .duration(200) - .EUt(30) + .EUt(30); - // WAP - event.remove({id: "ae2:network/wireless_access_point"}) - event.shaped("ae2:wireless_access_point", [ - 'PWP', - 'RCR', - 'PFP' - ] , { + // WAP + event.remove({ id: "ae2:network/wireless_access_point" }); + event.shaped("ae2:wireless_access_point", ["PWP", "RCR", "PFP"], { P: "gtceu:titanium_plate", W: "ae2:wireless_receiver", R: "gtceu:titanium_rod", C: "ae2:calculation_processor", - F: "ae2:fluix_glass_cable" - }) + F: "ae2:fluix_glass_cable", + }); /* // Security Terminal @@ -56,173 +55,132 @@ ServerEvents.recipes(event => { */ // Quantum Ring - event.remove({id: "ae2:network/blocks/quantum_ring"}) - event.shaped("ae2:quantum_ring", [ - 'PLP', - 'EHE', - 'PLP' - ] , { + event.remove({ id: "ae2:network/blocks/quantum_ring" }); + event.shaped("ae2:quantum_ring", ["PLP", "EHE", "PLP"], { P: "gtceu:titanium_plate", L: "ae2:logic_processor", E: "ae2:engineering_processor", - H: "gtceu:hv_field_generator" - }) + H: "gtceu:hv_field_generator", + }); // Quantum Link Chamber - event.remove({id: "ae2:network/blocks/quantum_link"}) - event.shaped("ae2:quantum_link", [ - 'GPG', - 'PHP', - 'GPG' - ] , { + event.remove({ id: "ae2:network/blocks/quantum_link" }); + event.shaped("ae2:quantum_link", ["GPG", "PHP", "GPG"], { G: "ae2:quartz_glass", P: "ae2:fluix_pearl", - H: "gtceu:hv_field_generator" - }) + H: "gtceu:hv_field_generator", + }); // ME Drive - event.remove({id: "ae2:network/blocks/storage_drive"}) - event.shaped("ae2:drive", [ - 'PEP', - 'KCK', - 'PEP' - ] , { + event.remove({ id: "ae2:network/blocks/storage_drive" }); + event.shaped("ae2:drive", ["PEP", "KCK", "PEP"], { P: "#forge:plates/steel", E: "ae2:engineering_processor", K: "ae2:fluix_glass_cable", - C: "#forge:circuits/lv" - }) + C: "#forge:circuits/lv", + }); // ME Chest - event.remove({id: "ae2:network/blocks/storage_chest"}) - event.shaped("ae2:chest", [ - 'GTG', - 'KCK', - 'PFP' - ] , { + event.remove({ id: "ae2:network/blocks/storage_chest" }); + event.shaped("ae2:chest", ["GTG", "KCK", "PFP"], { G: "ae2:quartz_glass", T: "ae2:terminal", K: "ae2:fluix_glass_cable", C: "#forge:circuits/ulv", P: "#forge:plates/steel", - F: "#forge:gems/fluix" - }) + F: "#forge:gems/fluix", + }); - // Cell Workbench - event.remove({id: "ae2:network/blocks/cell_workbench"}) - event.shaped("ae2:cell_workbench", [ - 'FKL', - 'PCP', - 'PPP' - ] , { + // Cell Workbench + event.remove({ id: "ae2:network/blocks/cell_workbench" }); + event.shaped("ae2:cell_workbench", ["FKL", "PCP", "PPP"], { F: "gtceu:item_filter", K: "ae2:fluix_glass_cable", L: "gtceu:fluid_filter", P: "#forge:plates/steel", - C: "#forge:chests/wooden" - }) + C: "#forge:chests/wooden", + }); // IO Port - event.remove({id: "ae2:network/blocks/io_port"}) - event.shaped("ae2:io_port", [ - 'UGR', - 'DCD', - 'PLP' - ] , { + event.remove({ id: "ae2:network/blocks/io_port" }); + event.shaped("ae2:io_port", ["UGR", "DCD", "PLP"], { U: "gtceu:lv_pump", G: "#forge:glass", R: "gtceu:lv_robot_arm", D: "ae2:drive", C: "ae2:fluix_glass_cable", P: "#forge:plates/steel", - L: "ae2:logic_processor" - }) + L: "ae2:logic_processor", + }); // Matter Condenser - event.remove({id: "ae2:network/blocks/io_condenser"}) - event.shaped("ae2:condenser", [ - 'PCP', - 'CHC', - 'PCP' - ] , { + event.remove({ id: "ae2:network/blocks/io_condenser" }); + event.shaped("ae2:condenser", ["PCP", "CHC", "PCP"], { P: "#forge:plates/stainless_steel", C: "gtceu:hv_electric_piston", - H: "#forge:circuits/hv" - }) + H: "#forge:circuits/hv", + }); // Energy Acceptor - event.remove({id: "ae2:network/blocks/energy_energy_acceptor"}) - event.shaped("ae2:energy_acceptor", [ - 'PFP', - 'FVF', - 'PFP' - ] , { + event.remove({ id: "ae2:network/blocks/energy_energy_acceptor" }); + event.shaped("ae2:energy_acceptor", ["PFP", "FVF", "PFP"], { P: "#forge:plates/steel", F: "#forge:plates/fluix", - V: "gtceu:lv_voltage_coil" - }) + V: "gtceu:lv_voltage_coil", + }); // Energy Cell - event.remove({id: "ae2:network/blocks/energy_energy_cell"}) - event.shaped("ae2:energy_cell", [ - 'SPS', - 'CGC', - 'SPS' - ] , { + event.remove({ id: "ae2:network/blocks/energy_energy_cell" }); + event.shaped("ae2:energy_cell", ["SPS", "CGC", "SPS"], { S: "gtceu:certus_quartz_gem", P: "#forge:plates/certus_quartz", C: "gtceu:lv_voltage_coil", - G: "ae2:quartz_vibrant_glass" - }) + G: "ae2:quartz_vibrant_glass", + }); // Dense Energy Cell - event.remove({id: "ae2:network/blocks/energy_dense_energy_cell"}) - greg.compressor('gtceu:dense_energy_cell') + event.remove({ id: "ae2:network/blocks/energy_dense_energy_cell" }); + greg + .compressor("gtceu:dense_energy_cell") .itemInputs("8x ae2:energy_cell") .itemOutputs("ae2:dense_energy_cell") .duration(100) - .EUt(30) - + .EUt(30); + // Crafting Unit - event.remove({id: "ae2:network/crafting/cpu_crafting_unit"}) - event.shaped("ae2:crafting_unit", [ - 'PCP', - 'KMK', - 'PLP' - ] , { + event.remove({ id: "ae2:network/crafting/cpu_crafting_unit" }); + event.shaped("ae2:crafting_unit", ["PCP", "KMK", "PLP"], { P: "#forge:plates/aluminium", C: "ae2:calculation_processor", K: "ae2:fluix_glass_cable", M: "#forge:circuits/mv", - L: "ae2:logic_processor" - }) + L: "ae2:logic_processor", + }); // Crafting Co-Processing Unit - event.remove({id: "ae2:network/crafting/cpu_crafting_accelerator"}) - greg.canner('gtceu:ae2_accelerator') - .itemInputs("ae2:crafting_unit", "ae2:engineering_processor") - .itemOutputs("ae2:crafting_accelerator") - .duration(100) - .EUt(64) + event.remove({ id: "ae2:network/crafting/cpu_crafting_accelerator" }); + greg + .canner("gtceu:ae2_accelerator") + .itemInputs("ae2:crafting_unit", "ae2:engineering_processor") + .itemOutputs("ae2:crafting_accelerator") + .duration(100) + .EUt(64); // Crafting Monitor - event.remove({id: "ae2:network/crafting/cpu_crafting_monitor"}) - greg.canner('gtceu:crafting_monitor') + event.remove({ id: "ae2:network/crafting/cpu_crafting_monitor" }); + greg + .canner("gtceu:crafting_monitor") .itemInputs("ae2:crafting_unit", "ae2:storage_monitor") .itemOutputs("ae2:crafting_monitor") .duration(100) - .EUt(4) + .EUt(4); // Creative Energy Cell - event.shaped("ae2:creative_energy_cell", [ - 'CCC', - 'CUC', - 'CCC' - ] , { + event.shaped("ae2:creative_energy_cell", ["CCC", "CUC", "CCC"], { C: "ae2:dense_energy_cell", - U: "gtceu:uv_field_generator" - }) - + U: "gtceu:uv_field_generator", + }); + /* // Biometric Card event.remove({id: "ae2:tools/network_biometric_card"}) @@ -239,137 +197,128 @@ ServerEvents.recipes(event => { */ // Memory Card - event.remove({id: "ae2:tools/network_memory_card"}) - event.shaped("ae2:memory_card", [ - 'EC ', - 'WP ', - ' ' - ] , { + event.remove({ id: "ae2:tools/network_memory_card" }); + event.shaped("ae2:memory_card", ["EC ", "WP ", " "], { E: "ae2:calculation_processor", C: "#forge:circuits/lv", W: "#forge:wires/fine/gold", - P: "#forge:plates/iron" - }) + P: "#forge:plates/iron", + }); // Network Tool - event.remove({id: "ae2:tools/network_tool"}) - event.shaped("ae2:network_tool", [ - 'wC ', - 'EP ', - ' ' - ] , { + event.remove({ id: "ae2:tools/network_tool" }); + event.shaped("ae2:network_tool", ["wC ", "EP ", " "], { w: "#forge:tools/wrenches", E: "ae2:calculation_processor", C: "#forge:circuits/lv", - P: "#ae2:illuminated_panel" - }) + P: "#ae2:illuminated_panel", + }); // Fluix Dust - event.remove({id: "ae2:inscriber/fluix_dust"}) - greg.mixer("gtceu:fluix_dust") - .itemInputs("#forge:dusts/nether_quartz", "#forge:dusts/certus_quartz", "#forge:dusts/redstone") + event.remove({ id: "ae2:inscriber/fluix_dust" }); + greg + .mixer("gtceu:fluix_dust") + .itemInputs( + "#forge:dusts/nether_quartz", + "#forge:dusts/certus_quartz", + "#forge:dusts/redstone" + ) .itemOutputs("3x gtceu:fluix_dust") - .duration(200).EUt(16) + .duration(200) + .EUt(16); // Charged Certus Quartz - event.remove({id: "ae2:charger/charged_certus_quartz_crystal"}) - greg.polarizer("gtceu:charged_certus_quartz") + event.remove({ id: "ae2:charger/charged_certus_quartz_crystal" }); + greg + .polarizer("gtceu:charged_certus_quartz") .itemInputs("gtceu:certus_quartz_gem") .itemOutputs("ae2:charged_certus_quartz_crystal") - .duration(100).EUt(16) + .duration(100) + .EUt(16); // Fluix Pearl - event.remove({id: "ae2:misc/fluixpearl"}) - greg.chemical_reactor("gtceu:fluix_pearl") + event.remove({ id: "ae2:misc/fluixpearl" }); + greg + .chemical_reactor("gtceu:fluix_pearl") .itemInputs("#forge:dusts/fluix", "ender_eye") .itemOutputs("ae2:fluix_pearl") - .duration(200).EUt(480) + .duration(200) + .EUt(480); // Wireless Receiver - event.remove({id: "ae2:network/wireless_part"}) - event.shaped("ae2:wireless_receiver", [ - 'CPC', - 'RSR', - ' ' - ] , { + event.remove({ id: "ae2:network/wireless_part" }); + event.shaped("ae2:wireless_receiver", ["CPC", "RSR", " "], { C: "#forge:circuits/ev", P: "ae2:fluix_pearl", R: "#forge:rods/titanium", - S: "gtceu:hv_sensor" - }) + S: "gtceu:hv_sensor", + }); // Annihilation Core - event.remove({id: "ae2:materials/annihilationcore"}) - event.shaped("ae2:annihilation_core", [ - 'CPB' - ] , { + event.remove({ id: "ae2:materials/annihilationcore" }); + event.shaped("ae2:annihilation_core", ["CPB"], { C: "#forge:circuits/ulv", P: "ae2:logic_processor", - B: "#forge:dusts/nether_quartz" - }) + B: "#forge:dusts/nether_quartz", + }); // Formation Core - event.remove({id: "ae2:materials/formationcore"}) - event.shaped("ae2:formation_core", [ - 'CPB' - ] , { + event.remove({ id: "ae2:materials/formationcore" }); + event.shaped("ae2:formation_core", ["CPB"], { C: "#forge:circuits/ulv", P: "ae2:logic_processor", - B: "#forge:dusts/certus_quartz" - }) - + B: "#forge:dusts/certus_quartz", + }); + // Cable Anchor - event.remove({id: "ae2:network/parts/cable_anchor"}) - greg.extruder('gtceu:cable_anchor') + event.remove({ id: "ae2:network/parts/cable_anchor" }); + greg + .extruder("gtceu:cable_anchor") .itemInputs("#forge:plates/steel") .notConsumable("gtceu:bolt_extruder_mold") .itemOutputs("8x ae2:cable_anchor") - .duration(20).EUt(16) + .duration(20) + .EUt(16); // Quartz Fibers - event.remove({id: "ae2:network/parts/quartz_fiber_part"}) - greg.alloy_smelter("gtceu:quartz_fibers") + event.remove({ id: "ae2:network/parts/quartz_fiber_part" }); + greg + .alloy_smelter("gtceu:quartz_fibers") .itemInputs("#forge:dusts/certus_quartz", "ae2:quartz_glass") .itemOutputs("2x ae2:quartz_fiber") - .duration(60).EUt(16) + .duration(60) + .EUt(16); //Illuminated Panel - event.remove({id: "ae2:network/parts/panels_semi_dark_monitor"}) - event.shaped("ae2:semi_dark_monitor", [ - 'WSG' - ] , { + event.remove({ id: "ae2:network/parts/panels_semi_dark_monitor" }); + event.shaped("ae2:semi_dark_monitor", ["WSG"], { W: "#forge:wires/fine/tin", S: "gtceu:computer_monitor_cover", - G: "ae2:quartz_vibrant_glass" - }) - event.shaped("ae2:semi_dark_monitor", [ - 'mWG', - "TCV", - 'xWG' - ] , { + G: "ae2:quartz_vibrant_glass", + }); + event.shaped("ae2:semi_dark_monitor", ["mWG", "TCV", "xWG"], { m: "#forge:tools/mallets", x: "#forge:tools/wire_cutters", W: "#forge:wires/fine/copper", G: "#forge:plates/glass", T: "#forge:wires/fine/tin", C: "#forge:circuits/lv", - V: "ae2:quartz_vibrant_glass" - }) + V: "ae2:quartz_vibrant_glass", + }); // Wireless Booster - event.remove({id: "ae2:network/wireless_booster"}) - event.shaped("ae2:wireless_booster", [ - 'EC ', - 'PP ' - ] , { + event.remove({ id: "ae2:network/wireless_booster" }); + event.shaped("ae2:wireless_booster", ["EC ", "PP "], { E: "gtceu:lv_emitter", C: "ae2:fluix_glass_cable", - P: "#forge:plates/steel" - }) + P: "#forge:plates/steel", + }); // Fluix Crystals - greg.autoclave("gtceu:fluix_crystal") + greg + .autoclave("gtceu:fluix_crystal") .itemInputs("gtceu:fluix_dust") .inputFluids("water 100") .itemOutputs("ae2:fluix_crystal") - .duration(200).EUt(24) -}) \ No newline at end of file + .duration(200) + .EUt(24); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/cables.js b/kubejs/server_scripts/appliedenergistics2/cables.js index de23966..4ba5817 100644 --- a/kubejs/server_scripts/appliedenergistics2/cables.js +++ b/kubejs/server_scripts/appliedenergistics2/cables.js @@ -1,5 +1,5 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; const dyes = [ "white", "orange", @@ -16,52 +16,65 @@ ServerEvents.recipes(event => { "brown", "green", "red", - "black" ] - dyes.forEach(dyes => { + "black", + ]; + dyes.forEach((dyes) => { let cablePainting = (cableType) => { - event.remove({id: "ae2:network/cables/" + cableType + "_fluix_clean"}) - event.remove({id: "ae2:network/cables/dense_smart_fluix_clean"}) - event.remove({id: "ae2:network/cables/dense_covered_fluix_clean"}) - event.remove({id: "ae2:network/cables/" + cableType + "_" + dyes}) - event.remove({id: "ae2:network/cables/dense_smart_" + dyes}) - event.remove({id: "ae2:network/cables/dense_covered_" + dyes}) - greg.chemical_bath("gtceu:"+ dyes + "_" + cableType + "_cable") - .itemInputs("ae2:fluix_"+ cableType + "_cable") - .inputFluids("gtceu:" + dyes + "_dye 18") - .itemOutputs("ae2:"+ dyes + "_" + cableType + "_cable") - .duration(40).EUt(16) - greg.chemical_bath("gtceu:un_"+ dyes + "_" + cableType + "_cable") - .itemInputs("ae2:"+ dyes + "_" + cableType + "_cable") + event.remove({ id: `ae2:network/cables/${cableType}_fluix_clean` }); + event.remove({ id: "ae2:network/cables/dense_smart_fluix_clean" }); + event.remove({ id: "ae2:network/cables/dense_covered_fluix_clean" }); + event.remove({ id: `ae2:network/cables/${cableType}_${dyes}` }); + event.remove({ id: `ae2:network/cables/dense_smart_${dyes}` }); + event.remove({ id: `ae2:network/cables/dense_covered_${dyes}` }); + greg + .chemical_bath(`gtceu:${dyes}_${cableType}_cable`) + .itemInputs(`ae2:fluix_${cableType}_cable`) + .inputFluids(`gtceu:${dyes}_dye 18`) + .itemOutputs(`ae2:${dyes}_${cableType}_cable`) + .duration(40) + .EUt(16); + greg + .chemical_bath(`gtceu:un_${dyes}_${cableType}_cable`) + .itemInputs(`ae2:${dyes}_${cableType}_cable`) .inputFluids("gtceu:chlorine 10") - .itemOutputs("ae2:fluix_" + cableType + "_cable") - .duration(40).EUt(16) - } - cablePainting("smart") - cablePainting("covered") - cablePainting("glass") - cablePainting("covered_dense") - cablePainting("smart_dense") - }) - event.remove({id: "ae2:network/cables/glass_fluix"}) - greg.assembler("gtceu:glass_fluix_cable") + .itemOutputs(`ae2:fluix_${cableType}_cable`) + .duration(40) + .EUt(16); + }; + cablePainting("smart"); + cablePainting("covered"); + cablePainting("glass"); + cablePainting("covered_dense"); + cablePainting("smart_dense"); + }); + event.remove({ id: "ae2:network/cables/glass_fluix" }); + greg + .assembler("gtceu:glass_fluix_cable") .itemInputs("2x ae2:quartz_fiber", "ae2:fluix_crystal") .itemOutputs("3x ae2:fluix_glass_cable") - .duration(100).EUt(30) - - event.remove({id: "ae2:network/cables/covered_fluix"}) - event.recipes.gtceu.assembler('gtceu:covered_fluix_worst') + .duration(100) + .EUt(30); + + event.remove({ id: "ae2:network/cables/covered_fluix" }); + event.recipes.gtceu + .assembler("gtceu:covered_fluix_worst") .itemInputs("ae2:fluix_glass_cable") .inputFluids("gtceu:rubber 144") .itemOutputs("ae2:fluix_covered_cable") - .duration(150).EUt(8) - event.recipes.gtceu.assembler('gtceu:covered_fluix_mid') + .duration(150) + .EUt(8); + event.recipes.gtceu + .assembler("gtceu:covered_fluix_mid") .itemInputs("ae2:fluix_glass_cable") .inputFluids("gtceu:styrene_butadiene_rubber 72") .itemOutputs("ae2:fluix_covered_cable") - .duration(150).EUt(8) - event.recipes.gtceu.assembler('gtceu:covered_fluix_best') + .duration(150) + .EUt(8); + event.recipes.gtceu + .assembler("gtceu:covered_fluix_best") .itemInputs("ae2:fluix_glass_cable") .inputFluids("gtceu:silicone_rubber 36") .itemOutputs("ae2:fluix_covered_cable") - .duration(150).EUt(8) -}) \ No newline at end of file + .duration(150) + .EUt(8); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/cards.js b/kubejs/server_scripts/appliedenergistics2/cards.js index 04c6211..ec25edd 100644 --- a/kubejs/server_scripts/appliedenergistics2/cards.js +++ b/kubejs/server_scripts/appliedenergistics2/cards.js @@ -1,64 +1,63 @@ -ServerEvents.recipes(event => { +ServerEvents.recipes((event) => { // Advanced Card - event.remove({id: "ae2:materials/advancedcard"}) - event.shaped("2x ae2:advanced_card", [ - 'WP ', - 'ACP', - 'SP ' - ] , { + event.remove({ id: "ae2:materials/advancedcard" }); + event.shaped("2x ae2:advanced_card", ["WP ", "ACP", "SP "], { W: "#forge:wires/fine/red_alloy", P: "#forge:plates/stainless_steel", A: "ae2:engineering_processor", C: "#forge:circuits/hv", - S: "#forge:wires/fine/silver" - }) + S: "#forge:wires/fine/silver", + }); // Fuzzy Card - event.remove({id: "ae2:materials/cardfuzzy"}) + event.remove({ id: "ae2:materials/cardfuzzy" }); event.shapeless("ae2:fuzzy_card", [ - "ae2:advanced_card", "#forge:circuits/ulv" - ]) + "ae2:advanced_card", + "#forge:circuits/ulv", + ]); // Inverter Card - event.remove({id: "ae2:materials/cardinverter"}) + event.remove({ id: "ae2:materials/cardinverter" }); event.shapeless("ae2:inverter_card", [ - "ae2:advanced_card", "#forge:wires/fine/red_alloy" - ]) + "ae2:advanced_card", + "#forge:wires/fine/red_alloy", + ]); // Acceleration Card - event.remove({id: "ae2:materials/cardspeed"}) + event.remove({ id: "ae2:materials/cardspeed" }); event.shapeless("ae2:speed_card", [ - "ae2:advanced_card", "#forge:circuits/mv" - ]) + "ae2:advanced_card", + "#forge:circuits/mv", + ]); // Energy Card - event.remove({id: "ae2:materials/cardenergy"}) + event.remove({ id: "ae2:materials/cardenergy" }); event.shapeless("ae2:energy_card", [ - "ae2:advanced_card", "#forge:batteries/mv" - ]) + "ae2:advanced_card", + "#forge:batteries/mv", + ]); // Basic Card - event.remove({id: "ae2:materials/basiccard"}) - event.shaped("2x ae2:basic_card", [ - 'WP ', - 'ACP', - 'SP ' - ] , { + event.remove({ id: "ae2:materials/basiccard" }); + event.shaped("2x ae2:basic_card", ["WP ", "ACP", "SP "], { W: "#forge:wires/fine/red_alloy", P: "#forge:plates/aluminium", A: "ae2:engineering_processor", C: "#forge:circuits/mv", - S: "#forge:wires/fine/gold" - }) + S: "#forge:wires/fine/gold", + }); // Capacity Card - event.remove({id: "ae2:materials/cardcapacity"}) + event.remove({ id: "ae2:materials/cardcapacity" }); event.shapeless("ae2:capacity_card", [ - "ae2:basic_card", "#forge:circuits/lv" - ]) + "ae2:basic_card", + "#forge:circuits/lv", + ]); // Crafting Card - event.remove({id: "ae2:materials/cardcrafting"}) + event.remove({ id: "ae2:materials/cardcrafting" }); event.shapeless("ae2:crafting_card", [ - "ae2:basic_card", "#forge:circuits/mv" - ]) + "ae2:basic_card", + "#forge:circuits/mv", + ]); // Redstone Card - event.remove({id: "ae2:materials/cardredstone"}) + event.remove({ id: "ae2:materials/cardredstone" }); event.shapeless("ae2:redstone_card", [ - "ae2:basic_card", "#forge:plates/red_alloy" - ]) -}) \ No newline at end of file + "ae2:basic_card", + "#forge:plates/red_alloy", + ]); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/cells.js b/kubejs/server_scripts/appliedenergistics2/cells.js index 8cba712..8af44b0 100644 --- a/kubejs/server_scripts/appliedenergistics2/cells.js +++ b/kubejs/server_scripts/appliedenergistics2/cells.js @@ -1,54 +1,57 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu - let cells = (componentSize, energyExponent, mod) => { - event.remove({output: mod + ":item_storage_cell_" + componentSize}) - greg.canner("gtceu:" + componentSize + "_storage_cell") - .itemInputs("ae2:item_cell_housing", mod + ":cell_component_" + componentSize) - .itemOutputs(mod + ":item_storage_cell_" + componentSize) - .duration(100).EUt(4**(energyExponent-1)) - event.remove({output: mod + ":fluid_storage_cell_" + componentSize}) - greg.canner("gtceu:" + componentSize + "_fluid_storage_cell") - .itemInputs("ae2:fluid_cell_housing", mod + ":cell_component_" + componentSize) - .itemOutputs(mod + ":fluid_storage_cell_" + componentSize) - .duration(100).EUt(4**(energyExponent-1)) - } - cells("1k", 1, "ae2") - cells("4k", 2, "ae2") - cells("16k", 3, "ae2") - cells("64k", 4, "ae2") - cells("256k", 5, "ae2") +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + let cells = (componentSize, energyExponent) => { + event.remove({ output: `ae2:item_storage_cell_${componentSize}` }); + greg + .canner(`gtceu:${componentSize}_storage_cell`) + .itemInputs( + "ae2:item_cell_housing", + `ae2:cell_component_${componentSize}` + ) + .itemOutputs(`ae2:item_storage_cell_${componentSize}`) + .duration(100) + .EUt(4 ** (energyExponent - 1)); + event.remove({ output: `ae2:fluid_storage_cell_${componentSize}` }); + greg + .canner(`gtceu:${componentSize}_fluid_storage_cell`) + .itemInputs( + "ae2:fluid_cell_housing", + `ae2:cell_component_${componentSize}` + ) + .itemOutputs(`ae2:fluid_storage_cell_${componentSize}`) + .duration(100) + .EUt(4 ** (energyExponent - 1)); + }; + cells("1k", 1); + cells("4k", 2); + cells("16k", 3); + cells("64k", 4); + cells("256k", 5); // View Cell - event.remove({output: "ae2:view_cell"}) - greg.canner("gtceu:view_cell") - .itemInputs("ae2:item_cell_housing", 'gtceu:certus_quartz_gem') + event.remove({ output: "ae2:view_cell" }); + greg + .canner("gtceu:view_cell") + .itemInputs("ae2:item_cell_housing", "gtceu:certus_quartz_gem") .itemOutputs("ae2:view_cell") - .duration(100).EUt(4) - // add fluid cells! + .duration(100) + .EUt(4); //ME Storage Housing - event.remove({output: "ae2:item_cell_housing"}) - event.shaped("ae2:item_cell_housing", [ - 'GPG', - 'WCW', - 'PPP' - ] , { + event.remove({ output: "ae2:item_cell_housing" }); + event.shaped("ae2:item_cell_housing", ["GPG", "WCW", "PPP"], { G: "ae2:quartz_glass", P: "#forge:plates/steel", W: "#forge:wires/fine/red_alloy", - C: "#forge:circuits/lv" - }) + C: "#forge:circuits/lv", + }); //Fluid Storage Housing - event.remove({output: "ae2:fluid_cell_housing"}) - event.shaped("2x ae2:fluid_cell_housing", [ - 'GPG', - 'WCW', - 'PPP' - ] , { + event.remove({ output: "ae2:fluid_cell_housing" }); + event.shaped("2x ae2:fluid_cell_housing", ["GPG", "WCW", "PPP"], { G: "ae2:quartz_glass", P: "#forge:plates/ruby", W: "gtceu:simple_soc", - C: "#forge:circuits/ev" - }) -}) \ No newline at end of file + C: "#forge:circuits/ev", + }); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/certus_quartz.js b/kubejs/server_scripts/appliedenergistics2/certus_quartz.js index 869bbd5..560f2bd 100644 --- a/kubejs/server_scripts/appliedenergistics2/certus_quartz.js +++ b/kubejs/server_scripts/appliedenergistics2/certus_quartz.js @@ -1,4 +1,12 @@ -ServerEvents.recipes(event => { - event.replaceInput({input: 'ae2:charged_certus_quartz_crystal'}, 'ae2:charged_certus_quartz_crystal', "gtceu:certus_quartz_gem") - event.replaceInput({input: 'ae2:quartz_block'}, 'ae2:quartz_block', 'gtceu:certus_quartz_block') -}) \ No newline at end of file +ServerEvents.recipes((event) => { + event.replaceInput( + { input: "ae2:charged_certus_quartz_crystal" }, + "ae2:charged_certus_quartz_crystal", + "gtceu:certus_quartz_gem" + ); + event.replaceInput( + { input: "ae2:quartz_block" }, + "ae2:quartz_block", + "gtceu:certus_quartz_block" + ); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/circuitry.js b/kubejs/server_scripts/appliedenergistics2/circuitry.js index 0f3c8b1..5984c7a 100644 --- a/kubejs/server_scripts/appliedenergistics2/circuitry.js +++ b/kubejs/server_scripts/appliedenergistics2/circuitry.js @@ -1,21 +1,45 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; // Logic Processor - event.remove({id:"ae2:inscriber/logic_processor"}) - greg.circuit_assembler("gtceu:logic_processor") - .itemInputs("ae2:printed_logic_processor", "ae2:printed_silicon", "#forge:circuits/lv", "#gtceu:resistors", "2x #forge:wires/fine/tin") + event.remove({ id: "ae2:inscriber/logic_processor" }); + greg + .circuit_assembler("gtceu:logic_processor") + .itemInputs( + "ae2:printed_logic_processor", + "ae2:printed_silicon", + "#forge:circuits/lv", + "#gtceu:resistors", + "2x #forge:wires/fine/tin" + ) .itemOutputs("4x ae2:logic_processor") - .duration(200).EUt(30) + .duration(200) + .EUt(30); // Engineering Processor - event.remove({id:"ae2:inscriber/engineering_processor"}) - greg.circuit_assembler("gtceu:engineering_processor") - .itemInputs("ae2:printed_engineering_processor", "ae2:printed_silicon", "#forge:circuits/lv", "#gtceu:resistors", "2x #forge:wires/fine/tin") + event.remove({ id: "ae2:inscriber/engineering_processor" }); + greg + .circuit_assembler("gtceu:engineering_processor") + .itemInputs( + "ae2:printed_engineering_processor", + "ae2:printed_silicon", + "#forge:circuits/lv", + "#gtceu:resistors", + "2x #forge:wires/fine/tin" + ) .itemOutputs("4x ae2:engineering_processor") - .duration(200).EUt(30) + .duration(200) + .EUt(30); // Calculation Processor - event.remove({id:"ae2:inscriber/calculation_processor"}) - greg.circuit_assembler("gtceu:calculation_processor") - .itemInputs("ae2:printed_calculation_processor", "ae2:printed_silicon", "#forge:circuits/lv", "#gtceu:resistors", "2x #forge:wires/fine/tin") + event.remove({ id: "ae2:inscriber/calculation_processor" }); + greg + .circuit_assembler("gtceu:calculation_processor") + .itemInputs( + "ae2:printed_calculation_processor", + "ae2:printed_silicon", + "#forge:circuits/lv", + "#gtceu:resistors", + "2x #forge:wires/fine/tin" + ) .itemOutputs("4x ae2:calculation_processor") - .duration(200).EUt(30) -}) \ No newline at end of file + .duration(200) + .EUt(30); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/crafting_storage.js b/kubejs/server_scripts/appliedenergistics2/crafting_storage.js index ec53127..7c3e653 100644 --- a/kubejs/server_scripts/appliedenergistics2/crafting_storage.js +++ b/kubejs/server_scripts/appliedenergistics2/crafting_storage.js @@ -1,19 +1,17 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu - let craftystorage = (componentSize, energyExponent, mod, k) => { - event.remove({output: mod + ":" + componentSize + "k_crafting_storage"}) - greg.canner("gtceu:" + componentSize + "crafting_storage") - .itemInputs("ae2:crafting_unit", mod + ":" + "cell_component_" + componentSize + k) - .itemOutputs(mod + ":" + componentSize + "k_crafting_storage") - .duration(100).EUt(4**(energyExponent-1)) - } - craftystorage("1", 1, "ae2", "k") - craftystorage("4", 2, "ae2", "k") - craftystorage("16", 3, "ae2","k") - craftystorage("64", 4, "ae2","k") - craftystorage("256", 5, "ae2","k") - // add fluid cells! -}) - -// ae2 has 16k input output -// ae2add has 16 input but 16k output \ No newline at end of file +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + let craftystorage = (componentSize, energyExponent) => { + event.remove({ output: `ae2:${componentSize}k_crafting_storage` }); + greg + .canner(`gtceu:${componentSize}k_crafting_storage`) + .itemInputs("ae2:crafting_unit", `ae2:cell_component_${componentSize}k`) + .itemOutputs(`ae2:${componentSize}k_crafting_storage`) + .duration(100) + .EUt(4 ** (energyExponent - 1)); + }; + craftystorage("1", 1); + craftystorage("4", 2); + craftystorage("16", 3); + craftystorage("64", 4); + craftystorage("256", 5); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/appliedenergistics2/extendedae2.js b/kubejs/server_scripts/appliedenergistics2/extendedae2.js index f3ef92c..1933e9b 100644 --- a/kubejs/server_scripts/appliedenergistics2/extendedae2.js +++ b/kubejs/server_scripts/appliedenergistics2/extendedae2.js @@ -1,47 +1,89 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; // extended shits - event.remove({id: "expatternprovider:epp"}) - greg.assembler("extended_pattern_provider") - .itemInputs("ae2:pattern_provider", "4x ae2:engineering_processor", "gtceu:soc", "#forge:circuits/hv") + event.remove({ id: "expatternprovider:epp" }); + greg + .assembler("extended_pattern_provider") + .itemInputs( + "ae2:pattern_provider", + "4x ae2:engineering_processor", + "gtceu:soc", + "#forge:circuits/hv" + ) .itemOutputs("expatternprovider:ex_pattern_provider") - .duration(200).EUt(50) - event.remove({id: "expatternprovider:ei"}) - greg.assembler("extended_interface") - .itemInputs("ae2:interface", "4x ae2:logic_processor", "gtceu:soc", "#forge:circuits/hv") + .duration(200) + .EUt(50); + event.remove({ id: "expatternprovider:ei" }); + greg + .assembler("extended_interface") + .itemInputs( + "ae2:interface", + "4x ae2:logic_processor", + "gtceu:soc", + "#forge:circuits/hv" + ) .itemOutputs("expatternprovider:ex_interface") - .duration(200).EUt(50) - + .duration(200) + .EUt(50); + // extended thermal upgrade shit - event.remove({id: "expatternprovider:epp_upgrade"}) - greg.assembler("extended_pattern_provider_upgrade") - .itemInputs("4x ae2:engineering_processor", "gtceu:soc", "#forge:circuits/hv") + event.remove({ id: "expatternprovider:epp_upgrade" }); + greg + .assembler("extended_pattern_provider_upgrade") + .itemInputs( + "4x ae2:engineering_processor", + "gtceu:soc", + "#forge:circuits/hv" + ) .itemOutputs("expatternprovider:pattern_provider_upgrade") - .duration(180).EUt(50) - event.remove({id: "expatternprovider:ei_upgrade"}) - greg.assembler("extended_interface_upgrade") + .duration(180) + .EUt(50); + event.remove({ id: "expatternprovider:ei_upgrade" }); + greg + .assembler("extended_interface_upgrade") .itemInputs("4x ae2:logic_processor", "gtceu:soc", "#forge:circuits/hv") .itemOutputs("expatternprovider:interface_upgrade") - .duration(180).EUt(50) + .duration(180) + .EUt(50); // infinite cells - event.remove({id: "expatternprovider:cobblestone_cell"}) - greg.canner("infinite_cobble_cell") + event.remove({ id: "expatternprovider:cobblestone_cell" }); + greg + .canner("infinite_cobble_cell") .itemInputs("ae2:fluid_cell_housing", "gtceu:infinite_water_cover") - .itemOutputs(Item.of('expatternprovider:infinity_cell', '{record:{"#c":"ae2:f",id:"minecraft:water"}}')) - .duration(100).EUt(600) - event.remove({id: "expatternprovider:water_cell"}) - greg.canner("infinite_water_cell") + .itemOutputs( + Item.of( + "expatternprovider:infinity_cell", + '{record:{"#c":"ae2:f",id:"minecraft:water"}}' + ) + ) + .duration(100) + .EUt(600); + event.remove({ id: "expatternprovider:water_cell" }); + greg + .canner("infinite_water_cell") .itemInputs("ae2:item_cell_housing", "gtceu:infinite_water_cover") .inputFluids("minecraft:lava 5000") - .itemOutputs(Item.of('expatternprovider:infinity_cell', '{record:{"#c":"ae2:i",id:"minecraft:cobblestone"}}')) - .duration(100).EUt(600) + .itemOutputs( + Item.of( + "expatternprovider:infinity_cell", + '{record:{"#c":"ae2:i",id:"minecraft:cobblestone"}}' + ) + ) + .duration(100) + .EUt(600); - event.remove({id: "expatternprovider:wireless_connector"}) - greg.assembly_line('gtceu:extended_card') - .itemInputs("gtceu:luv_machine_casing", "2x gtceu:luv_sensor", "gtceu:luv_emitter", "gtceu:quantum_star") + event.remove({ id: "expatternprovider:wireless_connector" }); + greg + .assembly_line("gtceu:extended_card") + .itemInputs( + "gtceu:luv_machine_casing", + "2x gtceu:luv_sensor", + "gtceu:luv_emitter", + "gtceu:quantum_star" + ) .inputFluids("gtceu:radon 1000") .itemOutputs("2x expatternprovider:wireless_connect") .duration(200) - .EUt(8192) -}) \ No newline at end of file + .EUt(8192); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/inter_providers.js b/kubejs/server_scripts/appliedenergistics2/inter_providers.js index 314ac49..3563de9 100644 --- a/kubejs/server_scripts/appliedenergistics2/inter_providers.js +++ b/kubejs/server_scripts/appliedenergistics2/inter_providers.js @@ -1,25 +1,21 @@ -ServerEvents.recipes(event => { +ServerEvents.recipes((event) => { const patpros = [ ["lv", "steel", 1], ["mv", "aluminium", 2], ["hv", "stainless_steel", 3], - ["ev", "titanium", 4] - ] - patpros.forEach(tier => { + ["ev", "titanium", 4], + ]; + patpros.forEach((tier) => { let interProv = (materialType, blockType) => { - event.shaped(tier[2]+ "x " + blockType, [ - 'PGP', - 'ACF', - 'PGP' - ] , { + event.shaped(`${tier[2]}x ${blockType}`, ["PGP", "ACF", "PGP"], { P: `#forge:plates/${tier[1]}`, G: materialType, A: "ae2:annihilation_core", F: "ae2:formation_core", - C: `gtceu:${tier[0]}_conveyor_module` - }) - } + C: `gtceu:${tier[0]}_conveyor_module`, + }); + }; interProv("#forge:glass", "ae2:interface"); - interProv("minecraft:crafting_table", "ae2:pattern_provider") - }) -}) + interProv("minecraft:crafting_table", "ae2:pattern_provider"); + }); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js b/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js index fc901b5..7e9c8da 100644 --- a/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js +++ b/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js @@ -1,24 +1,20 @@ -ServerEvents.recipes(event => { +ServerEvents.recipes((event) => { const patpros = [ ["hv", "stainless_steel", 1], ["ev", "titanium", 4], - ["iv", "tungsten_steel", 16] - ] - patpros.forEach((tier)=> { + ["iv", "tungsten_steel", 16], + ]; + patpros.forEach((tier) => { let interProv = (materialType, blockType) => { - event.shaped(tier[2]+ "x " + blockType, [ - 'PGP', - 'ACF', - 'PGP' - ] , { + event.shaped(`${tier[2]}x ${blockType}`, ["PGP", "ACF", "PGP"], { P: `#forge:plates/${tier[1]}`, G: materialType, A: "ae2:annihilation_core", F: "ae2:formation_core", - C: `gtceu:${tier[0]}_conveyor_module` - }) - } - event.remove({id: "ae2:network/crafting/molecular_assembler"}) - interProv("ae2:quartz_glass", "ae2:molecular_assembler") - }) -}) + C: `gtceu:${tier[0]}_conveyor_module`, + }); + }; + event.remove({ id: "ae2:network/crafting/molecular_assembler" }); + interProv("ae2:quartz_glass", "ae2:molecular_assembler"); + }); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/patterns.js b/kubejs/server_scripts/appliedenergistics2/patterns.js index b86c5d3..0ec0cb2 100644 --- a/kubejs/server_scripts/appliedenergistics2/patterns.js +++ b/kubejs/server_scripts/appliedenergistics2/patterns.js @@ -1,24 +1,52 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; // Blank Pattern - event.remove({id: "ae2:network/crafting/patterns_blank"}) - greg.assembler("gtceu:blank_pattern") - .itemInputs("3x #forge:plates/steel", "2x #forge:plates/polyethylene", "4x #forge:wires/fine/red_alloy", "#forge:circuits/mv") + event.remove({ id: "ae2:network/crafting/patterns_blank" }); + greg + .assembler("gtceu:blank_pattern") + .itemInputs( + "3x #forge:plates/steel", + "2x #forge:plates/polyethylene", + "4x #forge:wires/fine/red_alloy", + "#forge:circuits/mv" + ) .itemOutputs("ae2:blank_pattern") - .duration(200).EUt(120) - - greg.assembler("gtceu:blank_pattern_good") - .itemInputs("3x #forge:plates/steel", "2x #forge:plates/polyvinyl_chloride", "4x #forge:wires/fine/red_alloy", "#forge:circuits/mv") + .duration(200) + .EUt(120); + + greg + .assembler("gtceu:blank_pattern_good") + .itemInputs( + "3x #forge:plates/steel", + "2x #forge:plates/polyvinyl_chloride", + "4x #forge:wires/fine/red_alloy", + "#forge:circuits/mv" + ) .itemOutputs("4x ae2:blank_pattern") - .duration(200).EUt(120) - - greg.assembler("gtceu:blank_pattern_better") - .itemInputs("3x #forge:plates/steel", "2x #forge:plates/polytetrafluoroethylene", "4x #forge:wires/fine/red_alloy", "#forge:circuits/mv") + .duration(200) + .EUt(120); + + greg + .assembler("gtceu:blank_pattern_better") + .itemInputs( + "3x #forge:plates/steel", + "2x #forge:plates/polytetrafluoroethylene", + "4x #forge:wires/fine/red_alloy", + "#forge:circuits/mv" + ) .itemOutputs("16x ae2:blank_pattern") - .duration(200).EUt(480) - - greg.assembler("gtceu:blank_pattern_best") - .itemInputs("3x #forge:plates/steel", "2x #forge:plates/polybenzimidazole", "4x #forge:wires/fine/red_alloy", "#forge:circuits/mv") + .duration(200) + .EUt(480); + + greg + .assembler("gtceu:blank_pattern_best") + .itemInputs( + "3x #forge:plates/steel", + "2x #forge:plates/polybenzimidazole", + "4x #forge:wires/fine/red_alloy", + "#forge:circuits/mv" + ) .itemOutputs("64x ae2:blank_pattern") - .duration(200).EUt(480) -}) \ No newline at end of file + .duration(200) + .EUt(480); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/portable_cells.js b/kubejs/server_scripts/appliedenergistics2/portable_cells.js index 8bbb94f..fe355eb 100644 --- a/kubejs/server_scripts/appliedenergistics2/portable_cells.js +++ b/kubejs/server_scripts/appliedenergistics2/portable_cells.js @@ -1,16 +1,12 @@ -ServerEvents.recipes(event => { +ServerEvents.recipes((event) => { // Portable Cells - event.remove({id: "ae2:tools/portable_item_cell_1k"}) - event.shaped("ae2:portable_item_cell_1k", [ - 'BGB', - 'CHC', - 'PWP' - ] , { + event.remove({ id: "ae2:tools/portable_item_cell_1k" }); + event.shaped("ae2:portable_item_cell_1k", ["BGB", "CHC", "PWP"], { B: "#forge:bolts/red_alloy", G: "#forge:glass_panes", C: "#forge:circuits/ulv", H: "#forge:chests/wooden", P: "#forge:plates/wrought_iron", - W: "gtceu:red_alloy_single_cable" - }) -}) \ No newline at end of file + W: "gtceu:red_alloy_single_cable", + }); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/pressing.js b/kubejs/server_scripts/appliedenergistics2/pressing.js index 29bd473..369a920 100644 --- a/kubejs/server_scripts/appliedenergistics2/pressing.js +++ b/kubejs/server_scripts/appliedenergistics2/pressing.js @@ -1,31 +1,39 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; // Silicon - event.remove({id: "ae2:inscriber/silicon_press"}) - greg.laser_engraver("gtceu:inscriber_silicon_press") + event.remove({ id: "ae2:inscriber/silicon_press" }); + greg + .laser_engraver("gtceu:inscriber_silicon_press") .itemInputs("#forge:plates/steel") .notConsumable("gtceu:sapphire_lens") .itemOutputs("ae2:silicon_press") - .duration(500).EUt(120) + .duration(500) + .EUt(120); // Logic - event.remove({id: "ae2:inscriber/logic_press"}) - greg.laser_engraver("gtceu:inscriber_logic_press") + event.remove({ id: "ae2:inscriber/logic_press" }); + greg + .laser_engraver("gtceu:inscriber_logic_press") .itemInputs("#forge:plates/steel") .notConsumable("gtceu:emerald_lens") .itemOutputs("ae2:logic_processor_press") - .duration(500).EUt(120) + .duration(500) + .EUt(120); // Engineering - event.remove({id: "ae2:inscriber/engineering_press"}) - greg.laser_engraver("gtceu:inscriber_engineering_press") + event.remove({ id: "ae2:inscriber/engineering_press" }); + greg + .laser_engraver("gtceu:inscriber_engineering_press") .itemInputs("#forge:plates/steel") .notConsumable("gtceu:ruby_lens") .itemOutputs("ae2:engineering_processor_press") - .duration(500).EUt(120) + .duration(500) + .EUt(120); // Calculation - event.remove({id: "ae2:inscriber/calculation_press"}) - greg.laser_engraver("gtceu:inscriber_calculation_press") + event.remove({ id: "ae2:inscriber/calculation_press" }); + greg + .laser_engraver("gtceu:inscriber_calculation_press") .itemInputs("#forge:plates/steel") .notConsumable("gtceu:glass_lens") .itemOutputs("ae2:calculation_processor_press") - .duration(500).EUt(120) -}) \ No newline at end of file + .duration(500) + .EUt(120); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/removals.js b/kubejs/server_scripts/appliedenergistics2/removals.js index 9e297ef..495e4b5 100644 --- a/kubejs/server_scripts/appliedenergistics2/removals.js +++ b/kubejs/server_scripts/appliedenergistics2/removals.js @@ -1,42 +1,39 @@ -ServerEvents.recipes(event => { +ServerEvents.recipes((event) => { let yeet = (recipeTag) => { - event.remove({id: recipeTag}) - } + event.remove({ id: recipeTag }); + }; let yote = (itemName) => { - event.remove({output: itemName}) - event.remove({input: itemName}) - } - event.remove({type: "ae2:transform"}) - event.remove({type: "ae2:entropy"}) - event.remove({type: "ae2:charger"}) - event.remove({type: "ae2:inscriber"}) - yeet("ae2:network/blocks/inscribers") - yeet("ae2:network/blocks/crystal_processing_charger") - yeet("ae2:misc/deconstruction_certus_quartz_pillar") - yeet("ae2:misc/deconstruction_certus_quartz_block") - yeet("ae2:misc/deconstruction_chiseled_certus_quartz") - yeet("ae2:network/blocks/interfaces_interface") - yeet("ae2:network/blocks/pattern_providers_interface") - yeet("ae2:network/blocks/energy_vibration_chamber") - yeet("ae2:blasting/silicon_from_certus_quartz_dust") - yeet("ae2:smelting/silicon_from_certus_quartz_dust") - yeet("ae2:network/blocks/crank") - yeet("ae2:tools/misctools_entropy_manipulator") - yeet("ae2:tools/misctools_charged_staff") - yeet("ae2:tools/network_color_applicator") - yeet("ae2:tools/matter_cannon") - yeet("ae2:shaped/not_so_mysterious_cube") - yeet("ae2:network/blocks/crystal_processing_quartz_growth_accelerator") + event.remove({ output: itemName }); + event.remove({ input: itemName }); + }; + event.remove({ type: "ae2:transform" }); + event.remove({ type: "ae2:entropy" }); + event.remove({ type: "ae2:charger" }); + event.remove({ type: "ae2:inscriber" }); + yeet("ae2:network/blocks/inscribers"); + yeet("ae2:network/blocks/crystal_processing_charger"); + yeet("ae2:misc/deconstruction_certus_quartz_pillar"); + yeet("ae2:misc/deconstruction_certus_quartz_block"); + yeet("ae2:misc/deconstruction_chiseled_certus_quartz"); + yeet("ae2:network/blocks/interfaces_interface"); + yeet("ae2:network/blocks/pattern_providers_interface"); + yeet("ae2:network/blocks/energy_vibration_chamber"); + yeet("ae2:blasting/silicon_from_certus_quartz_dust"); + yeet("ae2:smelting/silicon_from_certus_quartz_dust"); + yeet("ae2:network/blocks/crank"); + yeet("ae2:tools/misctools_entropy_manipulator"); + yeet("ae2:tools/misctools_charged_staff"); + yeet("ae2:tools/network_color_applicator"); + yeet("ae2:tools/matter_cannon"); + yeet("ae2:shaped/not_so_mysterious_cube"); + yeet("ae2:network/blocks/crystal_processing_quartz_growth_accelerator"); - yote("ae2:cut_quartz_block") - yote("ae2:chiseled_quartz_block") - yote('ae2:quartz_stairs') - yote('ae2:quartz_bricks') - yote('ae2:quartz_pillar') - yote('ae2:smooth_quartz_block') - yote('ae2:quartz_wall') - yote('ae2:quartz_slab') - - - -}) \ No newline at end of file + yote("ae2:cut_quartz_block"); + yote("ae2:chiseled_quartz_block"); + yote("ae2:quartz_stairs"); + yote("ae2:quartz_bricks"); + yote("ae2:quartz_pillar"); + yote("ae2:smooth_quartz_block"); + yote("ae2:quartz_wall"); + yote("ae2:quartz_slab"); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/storage_parts.js b/kubejs/server_scripts/appliedenergistics2/storage_parts.js index ca9f409..b9589bb 100644 --- a/kubejs/server_scripts/appliedenergistics2/storage_parts.js +++ b/kubejs/server_scripts/appliedenergistics2/storage_parts.js @@ -1,43 +1,78 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; // 1k storage - event.remove({output: "ae2:cell_component_1k"}) - greg.assembler("gtceu:1k_component") - .itemInputs("gtceu:cpu_chip", "#forge:plates/certus_quartz", "#forge:circuits/lv") + event.remove({ output: "ae2:cell_component_1k" }); + greg + .assembler("gtceu:1k_component") + .itemInputs( + "gtceu:cpu_chip", + "#forge:plates/certus_quartz", + "#forge:circuits/lv" + ) .itemOutputs("ae2:cell_component_1k") - .duration(200).EUt(30) - greg.assembler("gtceu:1k_component_expensive") - .itemInputs("16x #gtceu:resistors", "#forge:plates/certus_quartz", "2x #forge:circuits/lv") + .duration(200) + .EUt(30); + greg + .assembler("gtceu:1k_component_expensive") + .itemInputs( + "16x #gtceu:resistors", + "#forge:plates/certus_quartz", + "2x #forge:circuits/lv" + ) .inputFluids("gtceu:red_alloy 288") .itemOutputs("ae2:cell_component_1k") - .duration(200).EUt(30) - + .duration(200) + .EUt(30); + // 4k storage - event.remove({output: "ae2:cell_component_4k"}) - greg.assembler("gtceu:4k_component") - .itemInputs("gtceu:ram_chip","3x ae2:cell_component_1k", "#forge:circuits/mv") + event.remove({ output: "ae2:cell_component_4k" }); + greg + .assembler("gtceu:4k_component") + .itemInputs( + "gtceu:ram_chip", + "3x ae2:cell_component_1k", + "#forge:circuits/mv" + ) .itemOutputs("ae2:cell_component_4k") - .duration(200).EUt(30) + .duration(200) + .EUt(30); // 16k storage - event.remove({output: "ae2:cell_component_16k"}) - greg.assembler("gtceu:16k_component") - .itemInputs("gtceu:ulpic_chip","3x ae2:cell_component_4k", "#forge:circuits/hv") + event.remove({ output: "ae2:cell_component_16k" }); + greg + .assembler("gtceu:16k_component") + .itemInputs( + "gtceu:ulpic_chip", + "3x ae2:cell_component_4k", + "#forge:circuits/hv" + ) .itemOutputs("ae2:cell_component_16k") - .duration(200).EUt(120) + .duration(200) + .EUt(120); // 64k storage - event.remove({output: "ae2:cell_component_64k"}) - greg.assembler("gtceu:64k_component") - .itemInputs("gtceu:lpic_chip","3x ae2:cell_component_16k", "#forge:circuits/ev") + event.remove({ output: "ae2:cell_component_64k" }); + greg + .assembler("gtceu:64k_component") + .itemInputs( + "gtceu:lpic_chip", + "3x ae2:cell_component_16k", + "#forge:circuits/ev" + ) .itemOutputs("ae2:cell_component_64k") - .duration(200).EUt(480) + .duration(200) + .EUt(480); // 256k storage - event.remove({output: "ae2:cell_component_256k"}) - greg.assembler("gtceu:256k_component") - .itemInputs("gtceu:qbit_cpu_chip","3x ae2:cell_component_64k", "#forge:circuits/iv") + event.remove({ output: "ae2:cell_component_256k" }); + greg + .assembler("gtceu:256k_component") + .itemInputs( + "gtceu:qbit_cpu_chip", + "3x ae2:cell_component_64k", + "#forge:circuits/iv" + ) .itemOutputs("ae2:cell_component_256k") - .duration(200).EUt(1920) - -}) \ No newline at end of file + .duration(200) + .EUt(1920); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/terminals.js b/kubejs/server_scripts/appliedenergistics2/terminals.js index 07f4412..c9c7217 100644 --- a/kubejs/server_scripts/appliedenergistics2/terminals.js +++ b/kubejs/server_scripts/appliedenergistics2/terminals.js @@ -1,156 +1,116 @@ -ServerEvents.recipes(event => { +ServerEvents.recipes((event) => { // Wireless Terminal - event.remove({id: "ae2:network/wireless_terminal"}) - event.shaped("ae2:wireless_terminal", [ - 'wRd', - 'CTC', - 'KLK' - ] , { + event.remove({ id: "ae2:network/wireless_terminal" }); + event.shaped("ae2:wireless_terminal", ["wRd", "CTC", "KLK"], { w: "#forge:tools/wrenches", R: "ae2:wireless_receiver", d: "#forge:tools/screwdrivers", C: "#forge:circuits/hv", T: "ae2:terminal", K: "ae2:fluix_glass_cable", - L: "gtceu:lapotron_crystal" - }) + L: "gtceu:lapotron_crystal", + }); // Wireless Crafting Terminal - event.remove({id: "ae2:network/wireless_crafting_terminal"}) - event.remove({id: "ae2:network/upgrade_wireless_crafting_terminal"}) - event.shaped("ae2:wireless_crafting_terminal", [ - 'TC ', - 'Kd ', - ' ' - ] , { + event.remove({ id: "ae2:network/wireless_crafting_terminal" }); + event.remove({ id: "ae2:network/upgrade_wireless_crafting_terminal" }); + event.shaped("ae2:wireless_crafting_terminal", ["TC ", "Kd ", " "], { d: "#forge:tools/screwdrivers", T: "ae2:wireless_terminal", C: "gtceu:crafting_table_cover", - K: "ae2:fluix_glass_cable" - }) - + K: "ae2:fluix_glass_cable", + }); + // ME Storage Bus - event.remove({id: "ae2:network/parts/storage_bus"}) - event.shaped("ae2:storage_bus", [ - 'IPC' - ] , { + event.remove({ id: "ae2:network/parts/storage_bus" }); + event.shaped("ae2:storage_bus", ["IPC"], { I: "ae2:interface", P: "gtceu:lv_electric_piston", - C: "ae2:fluix_glass_cable" - }) - + C: "ae2:fluix_glass_cable", + }); + // ME Import Bus - event.remove({id: "ae2:network/parts/import_bus"}) - event.shaped("ae2:import_bus", [ - 'IPC' - ] , { + event.remove({ id: "ae2:network/parts/import_bus" }); + event.shaped("ae2:import_bus", ["IPC"], { I: "ae2:annihilation_core", P: "gtceu:lv_robot_arm", - C: "ae2:fluix_glass_cable" - }) + C: "ae2:fluix_glass_cable", + }); // ME Import Bus - event.remove({id: "ae2:network/parts/export_bus"}) - event.shaped("ae2:export_bus", [ - 'IPC' - ] , { + event.remove({ id: "ae2:network/parts/export_bus" }); + event.shaped("ae2:export_bus", ["IPC"], { I: "ae2:formation_core", P: "gtceu:lv_robot_arm", - C: "ae2:fluix_glass_cable" - }) + C: "ae2:fluix_glass_cable", + }); // ME Formation Plane - event.remove({output: "ae2:formation_plane"}) - event.shaped("ae2:formation_plane", [ - 'EFC', - 'PPP' - ] , { + event.remove({ output: "ae2:formation_plane" }); + event.shaped("ae2:formation_plane", ["EFC", "PPP"], { E: "gtceu:lv_electric_piston", F: "ae2:formation_core", C: "#forge:gears/fluix", - P: "#forge:plates/steel" - }) + P: "#forge:plates/steel", + }); // ME Formation Plane - event.remove({output: "ae2:annihilation_plane"}) - event.shaped("ae2:annihilation_plane", [ - 'EFC', - 'PPP' - ] , { + event.remove({ output: "ae2:annihilation_plane" }); + event.shaped("ae2:annihilation_plane", ["EFC", "PPP"], { E: "gtceu:lv_electric_piston", F: "ae2:annihilation_core", C: "#forge:gears/fluix", - P: "#forge:plates/steel" - }) + P: "#forge:plates/steel", + }); // ME Terminal - event.remove({id: "ae2:network/parts/terminals"}) - event.shaped("ae2:terminal", [ - 'BCB', - 'xPd', - 'CDC' - ] , { + event.remove({ id: "ae2:network/parts/terminals" }); + event.shaped("ae2:terminal", ["BCB", "xPd", "CDC"], { B: "#forge:bolts/tin_alloy", C: "#forge:circuits/lv", x: "#forge:tools/wire_cutters", P: "ae2:semi_dark_monitor", d: "#forge:tools/screwdrivers", - D: "#forge:plates/double/steel" - }) - event.shaped("ae2:terminal", [ - 'PB ', - 'Cd ' - ] , { + D: "#forge:plates/double/steel", + }); + event.shaped("ae2:terminal", ["PB ", "Cd "], { B: "ae2:calculation_processor", C: "ae2:logic_processor", P: "ae2:semi_dark_monitor", d: "#forge:tools/screwdrivers", - }) + }); // ME Crafting Terminal - event.remove({id: "ae2:network/parts/terminals_crafting"}) - event.shaped("ae2:crafting_terminal", [ - 'PB ', - 'Cd ' - ] , { + event.remove({ id: "ae2:network/parts/terminals_crafting" }); + event.shaped("ae2:crafting_terminal", ["PB ", "Cd "], { P: "ae2:terminal", B: "gtceu:crafting_table_cover", C: "ae2:calculation_processor", - d: "#forge:tools/screwdrivers" - }) + d: "#forge:tools/screwdrivers", + }); // ME Pattern Terminal - event.remove({id: "ae2:network/parts/terminals_pattern_encoding"}) - event.shaped("ae2:pattern_encoding_terminal", [ - 'PB ', - 'Cd ' - ] , { + event.remove({ id: "ae2:network/parts/terminals_pattern_encoding" }); + event.shaped("ae2:pattern_encoding_terminal", ["PB ", "Cd "], { P: "ae2:terminal", B: "ae2:blank_pattern", C: "ae2:engineering_processor", - d: "#forge:tools/screwdrivers" - }) + d: "#forge:tools/screwdrivers", + }); // ME Pattern Access Terminal - event.remove({id: "ae2:network/parts/terminals_pattern_access"}) - event.shaped("ae2:pattern_access_terminal", [ - 'PB ', - 'Cd ' - ] , { + event.remove({ id: "ae2:network/parts/terminals_pattern_access" }); + event.shaped("ae2:pattern_access_terminal", ["PB ", "Cd "], { P: "ae2:terminal", B: "gtceu:polyvinyl_chloride_plate", C: "ae2:fluix_glass_cable", - d: "#forge:tools/screwdrivers" - }) + d: "#forge:tools/screwdrivers", + }); // P2P Tunnel - event.remove({id: "ae2:network/parts/tunnels_me"}) - event.shaped("2x ae2:me_p2p_tunnel", [ - ' P ', - 'PEP', - 'PCP' - ] , { + event.remove({ id: "ae2:network/parts/tunnels_me" }); + event.shaped("2x ae2:me_p2p_tunnel", [" P ", "PEP", "PCP"], { P: "#forge:plates/tungsten_steel", E: "ae2:engineering_processor", - C: "ae2:fluix_glass_cable" - }) -}) \ No newline at end of file + C: "ae2:fluix_glass_cable", + }); +}); diff --git a/kubejs/server_scripts/crafting_station/recipes.js b/kubejs/server_scripts/crafting_station/recipes.js index 0aea5d0..c50effe 100644 --- a/kubejs/server_scripts/crafting_station/recipes.js +++ b/kubejs/server_scripts/crafting_station/recipes.js @@ -1,12 +1,12 @@ -ServerEvents.recipes(event => { - event.remove({id: "craftingstation:crafting_station"}) +ServerEvents.recipes((event) => { + event.remove({ id: "craftingstation:crafting_station" }); event.shapeless("craftingstation:crafting_station", [ "minecraft:crafting_table", - "#forge:tools/saws" - ]) - event.remove({id: "craftingstation:crafting_station_slab"}) + "#forge:tools/saws", + ]); + event.remove({ id: "craftingstation:crafting_station_slab" }); event.shapeless("craftingstation:crafting_station_slab", [ "craftingstation:crafting_station", - "#forge:tools/saws" - ]) -}) \ No newline at end of file + "#forge:tools/saws", + ]); +}); diff --git a/kubejs/server_scripts/example.js b/kubejs/server_scripts/example.js deleted file mode 100644 index 9ad37a1..0000000 --- a/kubejs/server_scripts/example.js +++ /dev/null @@ -1,2 +0,0 @@ -ServerEvents.recipes(event => { -}) \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/greenhouse.js b/kubejs/server_scripts/gregtech/greenhouse.js index a1a5279..76874bd 100644 --- a/kubejs/server_scripts/gregtech/greenhouse.js +++ b/kubejs/server_scripts/gregtech/greenhouse.js @@ -13,14 +13,18 @@ ServerEvents.recipes((event) => { const plants = [ ["minecraft:pumpkin_seeds", "minecraft:pumpkin", 6], ["minecraft:beetroot_seeds", "minecraft:beetroot", 16], + ["minecraft:sweet_berries", "minecraft:sweet_berries", 16], + ["minecraft:glow_berries", "minecraft:glow_berries", 8], ["minecraft:wheat_seeds", "minecraft:wheat", 16], ["minecraft:melon_seeds", "minecraft:melon", 6], ["minecraft:carrot", "minecraft:carrot", 12], ["minecraft:sugar_cane", "minecraft:sugar_cane", 12], + ["minecraft:kelp", "minecraft:kelp", 12], ["minecraft:cactus", "minecraft:cactus", 12], ["minecraft:brown_mushroom", "minecraft:brown_mushroom", 12], ["minecraft:red_mushroom", "minecraft:red_mushroom", 12], ["minecraft:nether_wart", "minecraft:nether_wart", 12], + ["minecraft:bamboo", "minecraft:bamboo", 16], ]; event.shaped("gtceu:greenhouse", ["GGG", "CHC", "PUP"], { @@ -35,20 +39,20 @@ ServerEvents.recipes((event) => { .greenhouse(woodType[0]) .notConsumable(woodType[0]) .inputFluids("water 1000") - .itemOutputs("64x " + woodType[1], "6x " + woodType[0]) + .itemOutputs(`64x ${woodType[1]}`, `6x ${woodType[0]}`) .duration(1200) .EUt(40) .circuit(1); greg - .greenhouse(woodType[0] + "_fertiliser") + .greenhouse(`${woodType[0]}_fertiliser`) .notConsumable(woodType[0]) .itemInputs("4x gtceu:fertilizer") .inputFluids("water 1000") .itemOutputs( - "64x " + woodType[1], - "64x " + woodType[1], - "12x " + woodType[0] + `64x ${woodType[1]}`, + `64x ${woodType[1]}`, + `12x ${woodType[0]}` ) .duration(900) .EUt(60) @@ -60,7 +64,7 @@ ServerEvents.recipes((event) => { .greenhouse(seedType[0]) .notConsumable(seedType[0]) .inputFluids("water 1000") - .itemOutputs(seedType[2] + "x " + seedType[1]) + .itemOutputs(`${seedType[2]}x ${seedType[1]}`) .duration(1200) .EUt(40) .circuit(1); @@ -69,7 +73,7 @@ ServerEvents.recipes((event) => { .notConsumable(seedType[0]) .itemInputs("4x gtceu:fertilizer") .inputFluids("water 1000") - .itemOutputs(2 * seedType[2] + "x " + seedType[1]) + .itemOutputs(`${2 * seedType[2]}x ${seedType[1]}`) .duration(900) .EUt(60) .circuit(2); diff --git a/kubejs/server_scripts/gregtech/wood_unification.js b/kubejs/server_scripts/gregtech/wood_unification.js new file mode 100644 index 0000000..9e0f759 --- /dev/null +++ b/kubejs/server_scripts/gregtech/wood_unification.js @@ -0,0 +1,32 @@ +ServerEvents.recipes((event) => { + function woodUnification(woodType) { + event.recipes.gtceu + .assembler(`${woodType}_fence`) + .itemInputs(`${woodType}_planks`, "stick") + .itemOutputs(`${woodType}_fence`) + .circuit(1) + .duration(100) + .EUt(4); + + event.recipes.gtceu + .assembler(`${woodType}_fence_gate`) + .itemInputs(`2x ${woodType}_planks`, "2x stick") + .itemOutputs(`${woodType}_fence_gate`) + .circuit(2) + .duration(100) + .EUt(4); + + event.recipes.gtceu + .assembler(`${woodType}_stairs`) + .itemInputs(`6x ${woodType}_planks`) + .itemOutputs(`4x ${woodType}_stairs`) + .circuit(1) + .duration(100) + .EUt(1); + } + + woodUnification("warped"); + woodUnification("crimson"); + woodUnification("mangrove"); + woodUnification("cherry"); +}); diff --git a/kubejs/server_scripts/miscellaneous.js b/kubejs/server_scripts/miscellaneous.js deleted file mode 100644 index ac6d6cd..0000000 --- a/kubejs/server_scripts/miscellaneous.js +++ /dev/null @@ -1,23 +0,0 @@ -ServerEvents.recipes(event => { -}) - /* - // WAP - event.remove({id: }) - event.shaped(, [ - '', - '', - '' - ] , { - }) - - event.remove({id: }) - event.shapeless(, [ - ]) - - event.remove({id: ""}) - event.recipes.gtceu.alloy_smelter('gtceu:') - .itemInputs() - .itemOutputs() - .duration() - .EUt() -*/ \ No newline at end of file diff --git a/kubejs/server_scripts/open_blocks/elevator.js b/kubejs/server_scripts/open_blocks/elevator.js index 63ad792..0bd9e73 100644 --- a/kubejs/server_scripts/open_blocks/elevator.js +++ b/kubejs/server_scripts/open_blocks/elevator.js @@ -21,10 +21,10 @@ ServerEvents.recipes((event) => { event.remove({ mod: "elevatorid" }); dyes.forEach((dyes) => { greg - .chemical_bath(dyes + "_elevator") + .chemical_bath(`${dyes}_elevator`) .itemInputs("#elevatorid:elevators") - .inputFluids("gtceu:" + dyes + "_dye 18") - .itemOutputs("elevatorid:elevator_" + dyes) + .inputFluids(`gtceu:${dyes}_dye 18"`) + .itemOutputs(`elevatorid:elevator_${dyes}`) .duration(20) .EUt(7); }); diff --git a/kubejs/server_scripts/tags/items.js b/kubejs/server_scripts/tags/items.js index 0dede53..242e8e0 100644 --- a/kubejs/server_scripts/tags/items.js +++ b/kubejs/server_scripts/tags/items.js @@ -1,7 +1,4 @@ ServerEvents.tags("item", (event) => { - event.add("forge:mob_buckets", "kubejs:bucket_of_bee"); - event.add("bookshelf:mob_buckets", "kubejs:bucket_of_bee"); - event.add("forge:meat", "minecraft:chicken"); event.add("forge:meat", "minecraft:cooked_chicken"); event.add("forge:meat", "minecraft:beef"); diff --git a/kubejs/server_scripts/tool_belt/recipes.js b/kubejs/server_scripts/tool_belt/recipes.js index 69fe6e2..14e5c74 100644 --- a/kubejs/server_scripts/tool_belt/recipes.js +++ b/kubejs/server_scripts/tool_belt/recipes.js @@ -1,23 +1,15 @@ -ServerEvents.recipes(event => { - event.remove({id: "toolbelt:belt"}) - event.shaped("toolbelt:belt", [ - 'SLS', - 'C C', - 'LIL' - ] , { +ServerEvents.recipes((event) => { + event.remove({ id: "toolbelt:belt" }); + event.shaped("toolbelt:belt", ["SLS", "C C", "LIL"], { S: "minecraft:string", L: "minecraft:leather", I: "#forge:plates/steel", - C: "#forge:screws/steel" - }) - event.remove({id: "toolbelt:pouch"}) - event.shaped("toolbelt:pouch", [ - ' G ', - 'LSL', - ' ' - ] , { + C: "#forge:screws/steel", + }); + event.remove({ id: "toolbelt:pouch" }); + event.shaped("toolbelt:pouch", [" G ", "LSL", " "], { G: "#forge:rings/gold", L: "minecraft:leather", - S: "#forge:plates/steel" - }) -}) \ No newline at end of file + S: "#forge:plates/steel", + }); +}); diff --git a/kubejs/server_scripts/vanilla/loot_drops.js b/kubejs/server_scripts/vanilla/loot_drops.js index 7123840..3634456 100644 --- a/kubejs/server_scripts/vanilla/loot_drops.js +++ b/kubejs/server_scripts/vanilla/loot_drops.js @@ -1,8 +1,8 @@ -LootJS.modifiers(event => { +LootJS.modifiers((event) => { event - .addEntityLootModifier("minecraft:blaze") - .replaceLoot("minecraft:blaze_rod", "gtceu:sulfur_dust", true) + .addEntityLootModifier("minecraft:blaze") + .replaceLoot("minecraft:blaze_rod", "gtceu:sulfur_dust", true); event - .addEntityLootModifier("minecraft:enderman") - .replaceLoot("minecraft:ender_pearl", "gtceu:ender_pearl_dust", true) -}); \ No newline at end of file + .addEntityLootModifier("minecraft:enderman") + .replaceLoot("minecraft:ender_pearl", "gtceu:ender_pearl_dust", true); +}); diff --git a/kubejs/server_scripts/vanilla/mob_drops.js b/kubejs/server_scripts/vanilla/mob_drops.js index 744ff75..a732dcb 100644 --- a/kubejs/server_scripts/vanilla/mob_drops.js +++ b/kubejs/server_scripts/vanilla/mob_drops.js @@ -1,94 +1,131 @@ -ServerEvents.recipes(event => { - const greg = event.recipes.gtceu +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + + event.remove({ id: "minecraft:blaze_powder" }); + event.remove({ id: "gtceu:shapeless/blaze_rod_to_powder" }); + event.remove({ id: "minecraft:ender_eye" }); - event.remove({id: "minecraft:blaze_powder"}), - event.remove({id:"gtceu:shapeless/blaze_rod_to_powder"}) - event.remove({id:"minecraft:ender_eye"}) - //Ghast Tear - greg.chemical_reactor('gtceu:ghast_tear') + greg + .chemical_reactor("gtceu:ghast_tear") .itemInputs("#forge:dusts/tiny/potassium", "#forge:dusts/tiny/lithium") .inputFluids("gtceu:salt_water 1000") .itemOutputs("minecraft:ghast_tear") .duration(400) .EUt(30); // Skeleton Skull - greg.assembler('gtceu:skeleton_skull') - .itemInputs('minecraft:bone') + greg + .assembler("gtceu:skeleton_skull") + .itemInputs("minecraft:bone") .itemOutputs("skeleton_skull") - .duration(100).EUt(4); + .duration(100) + .EUt(4); // Bones - greg.extractor("gtceu:bones") + greg + .extractor("gtceu:bones") .itemInputs("#minecraft:dirt") .itemOutputs("bone") - .duration(100).EUt(16) + .duration(100) + .EUt(16); // Prismarine - greg.autoclave('gtceu:prismarine') - .itemInputs('minecraft:prismarine_crystals') + greg + .autoclave("gtceu:prismarine") + .itemInputs("minecraft:prismarine_crystals") .inputFluids("minecraft:water 100") .itemOutputs("prismarine_shard") - .duration(1200).EUt(24) - greg.autoclave('gtceu:prismarine_distilled') - .itemInputs('minecraft:prismarine_crystals') + .duration(1200) + .EUt(24); + greg + .autoclave("gtceu:prismarine_distilled") + .itemInputs("minecraft:prismarine_crystals") .inputFluids("gtceu:distilled_water 100") .itemOutputs("prismarine_shard") - .duration(600).EUt(24) - greg.macerator('gtceu:prismarine_crushed') + .duration(600) + .EUt(24); + greg + .macerator("gtceu:prismarine_crushed") .itemInputs("minecraft:prismarine_shard") .itemOutputs("prismarine_crystals") - .duration(120).EUt(2) + .duration(120) + .EUt(2); // Slimeballs - greg.chemical_bath("gtceu:slimeball_bath") - .itemInputs('#forge:dusts/asbestos') + greg + .chemical_bath("gtceu:slimeball_bath") + .itemInputs("#forge:dusts/asbestos") .inputFluids("gtceu:glue 250") .itemOutputs("slime_ball") - .duration(200).EUt(24) - greg.centrifuge('gtceu:slimeballs_centrifuge') + .duration(200) + .EUt(24); + greg + .centrifuge("gtceu:slimeballs_centrifuge") .itemInputs("slime_ball") .outputFluids("gtceu:glue 250") .itemOutputs("#forge:dusts/asbestos") - .duration(200).EUt(24) - + .duration(200) + .EUt(24); + // Sponge - greg.compressor("gtceu:spongebob") - .itemInputs("2x #forge:foils/polycaprolactam") - .itemOutputs("sponge") - .duration(200).EUt(2) + greg + .compressor("gtceu:spongebob") + .itemInputs("2x #forge:foils/polycaprolactam") + .itemOutputs("sponge") + .duration(200) + .EUt(2); // Fire Resistance - event.shapeless(Item.of("minecraft:potion").withNBT({Potion:"minecraft:fire_resistance"}), [ - Item.of('minecraft:potion', '{Potion:"minecraft:water"}'), - "#forge:dusts/sugar", - "#forge:dusts/stone", - "#forge:dusts/lead" - ]) - event.shapeless(Item.of("minecraft:potion").withNBT({Potion:"minecraft:long_fire_resistance"}), [ - Item.of('minecraft:potion', '{Potion:"minecraft:water"}'), - "#forge:dusts/redstone", - "#forge:dusts/sugar", - "#forge:dusts/stone", - "#forge:dusts/lead" - ]) + event.shapeless( + Item.of("minecraft:potion").withNBT({ + Potion: "minecraft:fire_resistance", + }), + [ + Item.of("minecraft:potion", '{Potion:"minecraft:water"}'), + "#forge:dusts/sugar", + "#forge:dusts/stone", + "#forge:dusts/lead", + ] + ); + event.shapeless( + Item.of("minecraft:potion").withNBT({ + Potion: "minecraft:long_fire_resistance", + }), + [ + Item.of("minecraft:potion", '{Potion:"minecraft:water"}'), + "#forge:dusts/redstone", + "#forge:dusts/sugar", + "#forge:dusts/stone", + "#forge:dusts/lead", + ] + ); // XP - greg.large_chemical_reactor("gtceu:bottle_o_enchanting") - .itemInputs("glass_bottle", "#forge:dusts/tiny/gold", "#forge:dusts/tiny/sugar") - .inputFluids("water 100") - .itemOutputs("experience_bottle") - .duration(20).EUt(256) + greg + .large_chemical_reactor("gtceu:bottle_o_enchanting") + .itemInputs( + "glass_bottle", + "#forge:dusts/tiny/gold", + "#forge:dusts/tiny/sugar" + ) + .inputFluids("water 100") + .itemOutputs("experience_bottle") + .duration(20) + .EUt(256); // Nether Star - greg.chemical_reactor("gtceu:nether_star") - .itemInputs("#forge:dusts/diamond", "#forge:dusts/iridium") - .inputFluids("gtceu:rocket_fuel 1000", "gtceu:nether_air 8000") - .itemOutputs("2x gtceu:nether_star_dust") - .duration(200).EUt(7680) + greg + .chemical_reactor("gtceu:nether_star") + .itemInputs("#forge:dusts/diamond", "#forge:dusts/iridium") + .inputFluids("gtceu:rocket_fuel 1000", "gtceu:nether_air 8000") + .itemOutputs("2x gtceu:nether_star_dust") + .duration(200) + .EUt(7680); // Netherite - greg.alloy_smelter("gtceu:better_netherite") - .itemInputs("2x netherite_scrap", "2x #forge:ingots/gold") - .itemOutputs("1x netherite_ingot") - .duration(150).EUt(100) -}) \ No newline at end of file + greg + .alloy_smelter("gtceu:better_netherite") + .itemInputs("2x netherite_scrap", "2x #forge:ingots/gold") + .itemOutputs("1x netherite_ingot") + .duration(150) + .EUt(100); +}); diff --git a/kubejs/startup_scripts/components/hsla-steel.js b/kubejs/startup_scripts/components/hsla-steel.js index af2f495..e7c070f 100644 --- a/kubejs/startup_scripts/components/hsla-steel.js +++ b/kubejs/startup_scripts/components/hsla-steel.js @@ -1,6 +1,6 @@ -GTCEuStartupEvents.registry('gtceu:material', event => { - GTMaterials.HSLASteel.addFlags(GTMaterialFlags.GENERATE_SPRING) //Adds flags to pre-existing GT materials - GTMaterials.HSLASteel.addFlags(GTMaterialFlags.GENERATE_LONG_ROD) //Adds flags to pre-existing GT materials - GTMaterials.Iridium.addFlags(GTMaterialFlags.GENERATE_FRAME) //Adds flags to pre-existing GT materials - GTMaterials.Cobalt.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE) //Adds flags to pre-existing GT materials -}) \ No newline at end of file +GTCEuStartupEvents.registry("gtceu:material", (event) => { + GTMaterials.HSLASteel.addFlags(GTMaterialFlags.GENERATE_SPRING); + GTMaterials.HSLASteel.addFlags(GTMaterialFlags.GENERATE_LONG_ROD); + GTMaterials.Iridium.addFlags(GTMaterialFlags.GENERATE_FRAME); + GTMaterials.Cobalt.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE); +}); diff --git a/kubejs/startup_scripts/example.js b/kubejs/startup_scripts/example.js deleted file mode 100644 index 48ee094..0000000 --- a/kubejs/startup_scripts/example.js +++ /dev/null @@ -1,6 +0,0 @@ -// priority: 0 - -// Visit the wiki for more info - https://kubejs.com/ - -console.info('Hello, World! (Loaded startup scripts)') - diff --git a/kubejs/startup_scripts/icons.js b/kubejs/startup_scripts/icons.js index b1c64bc..cd459f6 100644 --- a/kubejs/startup_scripts/icons.js +++ b/kubejs/startup_scripts/icons.js @@ -1,5 +1,5 @@ -StartupEvents.registry('item', event => { - event.create('greg_icon') -}) +StartupEvents.registry("item", (event) => { + event.create("greg_icon"); +}); -Platform.mods.kubejs.name = 'GregTech Community Pack' \ No newline at end of file +Platform.mods.kubejs.name = "GregTech Community Pack"; diff --git a/kubejs/startup_scripts/machinery/greenhouse.js b/kubejs/startup_scripts/machinery/greenhouse.js index 3f220e9..fbf896b 100644 --- a/kubejs/startup_scripts/machinery/greenhouse.js +++ b/kubejs/startup_scripts/machinery/greenhouse.js @@ -1,23 +1,36 @@ -/*let GTRecipeModifiers = Java.loadClass("com.gregtechceu.gtceu.common.data.GTRecipeModifiers") -let OverclockingLogic = Java.loadClass("com.gregtechceu.gtceu.api.recipe.OverclockingLogic") */ - -GTCEuStartupEvents.registry('gtceu:machine', event => { - event.create('greenhouse', 'multiblock') - .rotationState(RotationState.NON_Y_AXIS) - .recipeType("greenhouse") - .appearanceBlock(GTBlocks.MACHINE_CASING_ULV ) - .recipeModifier(GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK)) - .pattern(definition => FactoryBlockPattern.start() - .aisle("#BBB#", "#BBB#", "#BBB#", "#BBB#") - .aisle("BBBBB", "BDDDB", "B###B", "BGGGB") - .aisle("BBBBB", "BDDDB", "B###B", "BGGGB") - .aisle("BBBBB", "BDDDB", "B###B", "BGGGB") - .aisle("#BBB#", "#BEB#", "#BBB#", "#BBB#") - .where('E', Predicates.controller(Predicates.blocks(definition.get()))) - .where('D', Predicates.blocks("minecraft:dirt")) - .where('G', Predicates.blocks("gtceu:tempered_glass")) - .where('B', Predicates.blocks("gtceu:ulv_machine_casing").setMinGlobalLimited(5).or(Predicates.autoAbilities(definition.getRecipeTypes()))) - .where('#', Predicates.air()) - .build()) - .workableCasingRenderer("gtceu:block/casings/voltage/ulv/side","gtceu:block/multiblock/implosion_compressor", true) -}) \ No newline at end of file +GTCEuStartupEvents.registry("gtceu:machine", (event) => { + event + .create("greenhouse", "multiblock") + .rotationState(RotationState.NON_Y_AXIS) + .recipeType("greenhouse") + .appearanceBlock(GTBlocks.MACHINE_CASING_ULV) + .recipeModifier( + GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply( + OverclockingLogic.NON_PERFECT_OVERCLOCK + ) + ) + .pattern((definition) => + FactoryBlockPattern.start() + .aisle("#BBB#", "#BBB#", "#BBB#", "#BBB#") + .aisle("BBBBB", "BDDDB", "B###B", "BGGGB") + .aisle("BBBBB", "BDDDB", "B###B", "BGGGB") + .aisle("BBBBB", "BDDDB", "B###B", "BGGGB") + .aisle("#BBB#", "#BEB#", "#BBB#", "#BBB#") + .where("E", Predicates.controller(Predicates.blocks(definition.get()))) + .where("D", Predicates.blocks("minecraft:dirt")) + .where("G", Predicates.blocks("gtceu:tempered_glass")) + .where( + "B", + Predicates.blocks("gtceu:ulv_machine_casing") + .setMinGlobalLimited(5) + .or(Predicates.autoAbilities(definition.getRecipeTypes())) + ) + .where("#", Predicates.air()) + .build() + ) + .workableCasingRenderer( + "gtceu:block/casings/voltage/ulv/side", + "gtceu:block/multiblock/implosion_compressor", + true + ); +}); diff --git a/kubejs/startup_scripts/material_testing/material.js b/kubejs/startup_scripts/material_testing/material.js index 05de82c..4fb4841 100644 --- a/kubejs/startup_scripts/material_testing/material.js +++ b/kubejs/startup_scripts/material_testing/material.js @@ -1,7 +1,18 @@ -GTCEuStartupEvents.registry('gtceu:material', event => { - event.create('fluix') - .dust() - .components('1x nether_quartz', '1x certus_quartz', '1x redstone') - .color(0x8F5CCB).iconSet(GTMaterialIconSet.DULL) - .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_GEAR) -}) \ No newline at end of file +GTCEuStartupEvents.registry("gtceu:material", (event) => { + event + .create("fluix") + .dust() + .components("1x nether_quartz", "1x certus_quartz", "1x redstone") + .color(0x8f5ccb) + .iconSet(GTMaterialIconSet.DULL) + .flags(GTMaterialFlags.GENERATE_PLATE, GTMaterialFlags.GENERATE_GEAR); + + /* + event + .create("netherite") + .components("1x gold", "1x tungsten", "1x platinum") + .color(0x4d494d) + .iconSet(GTMaterialIconSet.METALLIC) + .flags(GTMaterialFlags.GENERATE_PLATE); + */ +}); diff --git a/kubejs/startup_scripts/recipes/greenhouse.js b/kubejs/startup_scripts/recipes/greenhouse.js index 10474fa..aecd1ee 100644 --- a/kubejs/startup_scripts/recipes/greenhouse.js +++ b/kubejs/startup_scripts/recipes/greenhouse.js @@ -1,9 +1,10 @@ -GTCEuStartupEvents.registry('gtceu:recipe_type', event => { - event.create('greenhouse') - .category('test') //Used in the GTlib / LDlib ui editor - .setEUIO('in') - .setMaxIOSize(3, 4, 1, 0) //Max Item Inputs, Max Item Outputs, Max Fluid Inputs, Max Fluid Outputs - .setSlotOverlay(false, false, GuiTextures.BOX_OVERLAY) - .setProgressBar(GuiTextures.PROGRESS_BAR_BATH, FillDirection.LEFT_TO_RIGHT) +GTCEuStartupEvents.registry("gtceu:recipe_type", (event) => { + event + .create("greenhouse") + .category("test") + .setEUIO("in") + .setMaxIOSize(3, 4, 1, 0) + .setSlotOverlay(false, false, GuiTextures.BOX_OVERLAY) + .setProgressBar(GuiTextures.PROGRESS_BAR_BATH, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.COOLING); -}) \ No newline at end of file +});