From 70744cfd9399348be79ee212898a4a4846bdae22 Mon Sep 17 00:00:00 2001 From: mina <143211829+ursamina@users.noreply.github.com> Date: Fri, 22 Dec 2023 22:56:44 +0000 Subject: [PATCH] script polishes - removed crafting cover in recipes as it's uncraftable (ironic) - fixed incorrect item names in storage drawer recipes --- kubejs/assets/gtceu/lang/en_us.json | 12 +- kubejs/client_scripts/example.js | 12 +- kubejs/client_scripts/jei_hidden.js | 10 +- kubejs/config/client.properties | 32 +- kubejs/config/common.properties | 26 +- .../server_scripts/appliedenergistics2/ae2.js | 648 +++++++++--------- .../appliedenergistics2/cables.js | 160 ++--- .../appliedenergistics2/cards.js | 126 ++-- .../appliedenergistics2/cells.js | 114 +-- .../appliedenergistics2/certus_quartz.js | 24 +- .../appliedenergistics2/circuitry.js | 90 +-- .../appliedenergistics2/crafting_storage.js | 32 +- .../appliedenergistics2/extendedae2.js | 178 ++--- .../appliedenergistics2/inter_providers.js | 42 +- .../molecular_assemblers.js | 40 +- .../appliedenergistics2/patterns.js | 104 +-- .../appliedenergistics2/portable_cells.js | 64 +- .../appliedenergistics2/pressing.js | 78 +-- .../appliedenergistics2/removals.js | 78 +-- .../appliedenergistics2/storage_parts.js | 156 ++--- .../appliedenergistics2/terminals.js | 232 +++---- .../building_gadgets/gadgets.js | 114 +-- .../crafting_station/recipes.js | 24 +- kubejs/server_scripts/gregtech/components.js | 48 +- kubejs/server_scripts/gregtech/greenhouse.js | 212 +++--- kubejs/server_scripts/gregtech/inscriber.js | 72 +- kubejs/server_scripts/gregtech/tools.js | 122 ++-- .../gregtech/wood_unification.js | 64 +- kubejs/server_scripts/open_blocks/elevator.js | 88 +-- .../server_scripts/open_blocks/hang_glider.js | 52 +- kubejs/server_scripts/open_blocks/magnets.js | 36 +- kubejs/server_scripts/removals.js | 12 +- .../server_scripts/storage_drawers/drawers.js | 288 ++++---- .../storage_drawers/upgrades.js | 184 ++--- kubejs/server_scripts/tags/ae2.js | 16 +- kubejs/server_scripts/tags/gregtech.js | 8 +- kubejs/server_scripts/tags/items.js | 24 +- kubejs/server_scripts/tool_belt/recipes.js | 30 +- kubejs/server_scripts/torchmaster.js | 78 +-- kubejs/server_scripts/vanilla/loot_drops.js | 16 +- kubejs/server_scripts/vanilla/mob_drops.js | 262 +++---- .../startup_scripts/components/hsla-steel.js | 12 +- kubejs/startup_scripts/icons.js | 10 +- .../startup_scripts/machinery/greenhouse.js | 72 +- .../material_testing/material.js | 36 +- kubejs/startup_scripts/recipes/greenhouse.js | 20 +- 46 files changed, 2099 insertions(+), 2059 deletions(-) diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index 5ae2dad..b9b91af 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -1,6 +1,6 @@ -{ - "block.gtceu.greenhouse":"Greenhouse", - "gtceu.greenhouse":"Greenhouse", - - "material.fluix":"Fluix" -} +{ + "block.gtceu.greenhouse":"Greenhouse", + "gtceu.greenhouse":"Greenhouse", + + "material.fluix":"Fluix" +} diff --git a/kubejs/client_scripts/example.js b/kubejs/client_scripts/example.js index 2b421e5..a0441f6 100644 --- a/kubejs/client_scripts/example.js +++ b/kubejs/client_scripts/example.js @@ -1,6 +1,6 @@ -// priority: 0 - -// Visit the wiki for more info - https://kubejs.com/ - -console.info('Hello, World! (Loaded client scripts)') - +// priority: 0 + +// Visit the wiki for more info - https://kubejs.com/ + +console.info('Hello, World! (Loaded client scripts)') + diff --git a/kubejs/client_scripts/jei_hidden.js b/kubejs/client_scripts/jei_hidden.js index b24ef76..2667ba3 100644 --- a/kubejs/client_scripts/jei_hidden.js +++ b/kubejs/client_scripts/jei_hidden.js @@ -1,6 +1,6 @@ -JEIEvents.removeCategories(event => { - console.log(event.getCategoryIds()) //log a list of all category ids to logs/kubejs/client.txt - event.remove("lychee:item_inside/minecraft/default") - event.remove("jei:information") - event.remove("ae2:certus_growth") +JEIEvents.removeCategories(event => { + console.log(event.getCategoryIds()) //log a list of all category ids to logs/kubejs/client.txt + event.remove("lychee:item_inside/minecraft/default") + event.remove("jei:information") + event.remove("ae2:certus_growth") }) \ No newline at end of file diff --git a/kubejs/config/client.properties b/kubejs/config/client.properties index aadd6c9..fdf1c62 100644 --- a/kubejs/config/client.properties +++ b/kubejs/config/client.properties @@ -1,16 +1,16 @@ -#KubeJS Client Properties -#Mon Nov 27 19:33:24 GMT 2023 -backgroundColor=2E3440 -barBorderColor=ECEFF4 -barColor=ECEFF4 -blurScaledPackIcon=true -disableRecipeBook=false -exportAtlases=false -fmlLogColor=ECEFF4 -fmlMemoryColor=ECEFF4 -menuBackgroundBrightness=64 -menuBackgroundScale=32.0 -menuInnerBackgroundBrightness=32 -overrideColors=false -showTagNames=false -title=GregTech Community Pack Modern +#KubeJS Client Properties +#Mon Nov 27 19:33:24 GMT 2023 +backgroundColor=2E3440 +barBorderColor=ECEFF4 +barColor=ECEFF4 +blurScaledPackIcon=true +disableRecipeBook=false +exportAtlases=false +fmlLogColor=ECEFF4 +fmlMemoryColor=ECEFF4 +menuBackgroundBrightness=64 +menuBackgroundScale=32.0 +menuInnerBackgroundBrightness=32 +overrideColors=false +showTagNames=false +title=GregTech Community Pack Modern diff --git a/kubejs/config/common.properties b/kubejs/config/common.properties index d238cfd..db5c1f4 100644 --- a/kubejs/config/common.properties +++ b/kubejs/config/common.properties @@ -1,13 +1,13 @@ -#KubeJS Common Properties -#Mon Nov 27 19:33:26 GMT 2023 -allowAsyncStreams=true -announceReload=true -creativeModeTabIcon=minecraft\:purple_dye -hideServerScriptErrors=false -ignoreCustomUniqueRecipeIds=false -matchJsonRecipes=true -packmode=default -saveDevPropertiesInConfig=false -serverOnly=false -startupErrorGUI=true -startupErrorReportUrl= +#KubeJS Common Properties +#Mon Nov 27 19:33:26 GMT 2023 +allowAsyncStreams=true +announceReload=true +creativeModeTabIcon=minecraft\:purple_dye +hideServerScriptErrors=false +ignoreCustomUniqueRecipeIds=false +matchJsonRecipes=true +packmode=default +saveDevPropertiesInConfig=false +serverOnly=false +startupErrorGUI=true +startupErrorReportUrl= diff --git a/kubejs/server_scripts/appliedenergistics2/ae2.js b/kubejs/server_scripts/appliedenergistics2/ae2.js index 1fb469c..b38c24f 100644 --- a/kubejs/server_scripts/appliedenergistics2/ae2.js +++ b/kubejs/server_scripts/appliedenergistics2/ae2.js @@ -1,324 +1,324 @@ -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); - - // 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); - - // 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); - - // 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", - }); - - /* - // Security Terminal - event.remove({id: "ae2:network/blocks/security_station"}) - event.shaped("ae2:security_station", [ - 'PCP', - 'KAK', - 'PEP' - ] , { - P: "gtceu:iron_plate", - C: "ae2:chest", - K: "ae2:fluix_glass_cable", - A: "ae2:cell_component_16k", - E: "ae2:engineering_processor" - }) - */ - - // Quantum Ring - 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", - }); - - // Quantum Link Chamber - 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", - }); - - // ME Drive - 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", - }); - - // ME Chest - 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", - }); - - // 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", - }); - - // IO Port - 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", - }); - - // Matter Condenser - 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", - }); - - // Energy Acceptor - 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", - }); - - // Energy Cell - 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", - }); - - // 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); - - // Crafting Unit - 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", - }); - - // 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); - - // 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); - - // Creative Energy Cell - event.shaped("ae2:creative_energy_cell", ["CCC", "CUC", "CCC"], { - C: "ae2:dense_energy_cell", - U: "gtceu:uv_field_generator", - }); - - /* - // Biometric Card - event.remove({id: "ae2:tools/network_biometric_card"}) - event.shaped("ae2:biometric_card", [ - 'EC ', - 'WP ', - ' ' - ] , { - E: "ae2:engineering_processor", - C: "#forge:circuits/lv", - W: "#forge:fine_wires/gold", - P: "#forge:plates/iron" - }) - */ - - // Memory Card - 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:fine_wires/gold", - P: "#forge:plates/iron", - }); - - // Network Tool - 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", - }); - - // 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" - ) - .itemOutputs("3x gtceu:fluix_dust") - .duration(200) - .EUt(16); - - // 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); - - // 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); - - // Wireless Receiver - 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", - }); - - // Annihilation Core - 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", - }); - // Formation Core - 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", - }); - - // 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); - - // 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); - - //Illuminated Panel - event.remove({ id: "ae2:network/parts/panels_semi_dark_monitor" }); - event.shaped("ae2:semi_dark_monitor", ["WSG"], { - W: "#forge:fine_wires/tin", - S: "gtceu:computer_monitor_cover", - 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:fine_wires/copper", - G: "#forge:plates/glass", - T: "#forge:fine_wires/tin", - C: "#forge:circuits/lv", - V: "ae2:quartz_vibrant_glass", - }); - - // Wireless Booster - 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", - }); - - // Fluix Crystals - greg - .autoclave("gtceu:fluix_crystal") - .itemInputs("gtceu:fluix_dust") - .inputFluids("water 100") - .itemOutputs("ae2:fluix_crystal") - .duration(200) - .EUt(24); -}); +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); + + // 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); + + // 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); + + // 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", + }); + + /* + // Security Terminal + event.remove({id: "ae2:network/blocks/security_station"}) + event.shaped("ae2:security_station", [ + 'PCP', + 'KAK', + 'PEP' + ] , { + P: "gtceu:iron_plate", + C: "ae2:chest", + K: "ae2:fluix_glass_cable", + A: "ae2:cell_component_16k", + E: "ae2:engineering_processor" + }) + */ + + // Quantum Ring + 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", + }); + + // Quantum Link Chamber + 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", + }); + + // ME Drive + 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", + }); + + // ME Chest + 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", + }); + + // 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", + }); + + // IO Port + 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", + }); + + // Matter Condenser + 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", + }); + + // Energy Acceptor + 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", + }); + + // Energy Cell + 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", + }); + + // 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); + + // Crafting Unit + 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", + }); + + // 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); + + // 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); + + // Creative Energy Cell + event.shaped("ae2:creative_energy_cell", ["CCC", "CUC", "CCC"], { + C: "ae2:dense_energy_cell", + U: "gtceu:uv_field_generator", + }); + + /* + // Biometric Card + event.remove({id: "ae2:tools/network_biometric_card"}) + event.shaped("ae2:biometric_card", [ + 'EC ', + 'WP ', + ' ' + ] , { + E: "ae2:engineering_processor", + C: "#forge:circuits/lv", + W: "#forge:fine_wires/gold", + P: "#forge:plates/iron" + }) + */ + + // Memory Card + 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:fine_wires/gold", + P: "#forge:plates/iron", + }); + + // Network Tool + 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", + }); + + // 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" + ) + .itemOutputs("3x gtceu:fluix_dust") + .duration(200) + .EUt(16); + + // 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); + + // 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); + + // Wireless Receiver + 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", + }); + + // Annihilation Core + 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", + }); + // Formation Core + 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", + }); + + // 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); + + // 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); + + //Illuminated Panel + event.remove({ id: "ae2:network/parts/panels_semi_dark_monitor" }); + event.shaped("ae2:semi_dark_monitor", ["WSG"], { + W: "#forge:fine_wires/tin", + S: "gtceu:computer_monitor_cover", + 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:fine_wires/copper", + G: "#forge:plates/glass", + T: "#forge:fine_wires/tin", + C: "#forge:circuits/lv", + V: "ae2:quartz_vibrant_glass", + }); + + // Wireless Booster + 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", + }); + + // Fluix Crystals + greg + .autoclave("gtceu:fluix_crystal") + .itemInputs("gtceu:fluix_dust") + .inputFluids("water 100") + .itemOutputs("ae2:fluix_crystal") + .duration(200) + .EUt(24); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/cables.js b/kubejs/server_scripts/appliedenergistics2/cables.js index 5b72b13..4ba5817 100644 --- a/kubejs/server_scripts/appliedenergistics2/cables.js +++ b/kubejs/server_scripts/appliedenergistics2/cables.js @@ -1,80 +1,80 @@ -ServerEvents.recipes((event) => { - const greg = event.recipes.gtceu; - const dyes = [ - "white", - "orange", - "magenta", - "light_blue", - "yellow", - "lime", - "pink", - "gray", - "light_gray", - "cyan", - "purple", - "blue", - "brown", - "green", - "red", - "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`) - .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") - .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") - .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") - .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") - .itemInputs("ae2:fluix_glass_cable") - .inputFluids("gtceu:silicone_rubber 36") - .itemOutputs("ae2:fluix_covered_cable") - .duration(150) - .EUt(8); -}); +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + const dyes = [ + "white", + "orange", + "magenta", + "light_blue", + "yellow", + "lime", + "pink", + "gray", + "light_gray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "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`) + .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") + .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") + .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") + .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") + .itemInputs("ae2:fluix_glass_cable") + .inputFluids("gtceu:silicone_rubber 36") + .itemOutputs("ae2:fluix_covered_cable") + .duration(150) + .EUt(8); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/cards.js b/kubejs/server_scripts/appliedenergistics2/cards.js index 2cc2038..7e4645e 100644 --- a/kubejs/server_scripts/appliedenergistics2/cards.js +++ b/kubejs/server_scripts/appliedenergistics2/cards.js @@ -1,63 +1,63 @@ -ServerEvents.recipes((event) => { - // Advanced Card - event.remove({ id: "ae2:materials/advancedcard" }); - event.shaped("2x ae2:advanced_card", ["WP ", "ACP", "SP "], { - W: "#forge:fine_wires/red_alloy", - P: "#forge:plates/stainless_steel", - A: "ae2:engineering_processor", - C: "#forge:circuits/hv", - S: "#forge:fine_wires/silver", - }); - // Fuzzy Card - event.remove({ id: "ae2:materials/cardfuzzy" }); - event.shapeless("ae2:fuzzy_card", [ - "ae2:advanced_card", - "#forge:circuits/ulv", - ]); - // Inverter Card - event.remove({ id: "ae2:materials/cardinverter" }); - event.shapeless("ae2:inverter_card", [ - "ae2:advanced_card", - "#forge:fine_wires/red_alloy", - ]); - // Acceleration Card - event.remove({ id: "ae2:materials/cardspeed" }); - event.shapeless("ae2:speed_card", [ - "ae2:advanced_card", - "#forge:circuits/mv", - ]); - // Energy Card - event.remove({ id: "ae2:materials/cardenergy" }); - event.shapeless("ae2:energy_card", [ - "ae2:advanced_card", - "#forge:batteries/mv", - ]); - - // Basic Card - event.remove({ id: "ae2:materials/basiccard" }); - event.shaped("2x ae2:basic_card", ["WP ", "ACP", "SP "], { - W: "#forge:fine_wires/red_alloy", - P: "#forge:plates/aluminium", - A: "ae2:engineering_processor", - C: "#forge:circuits/mv", - S: "#forge:fine_wires/gold", - }); - // Capacity Card - event.remove({ id: "ae2:materials/cardcapacity" }); - event.shapeless("ae2:capacity_card", [ - "ae2:basic_card", - "#forge:circuits/lv", - ]); - // Crafting Card - event.remove({ id: "ae2:materials/cardcrafting" }); - event.shapeless("ae2:crafting_card", [ - "ae2:basic_card", - "#forge:circuits/mv", - ]); - // Redstone Card - event.remove({ id: "ae2:materials/cardredstone" }); - event.shapeless("ae2:redstone_card", [ - "ae2:basic_card", - "#forge:plates/red_alloy", - ]); -}); +ServerEvents.recipes((event) => { + // Advanced Card + event.remove({ id: "ae2:materials/advancedcard" }); + event.shaped("2x ae2:advanced_card", ["WP ", "ACP", "SP "], { + W: "#forge:fine_wires/red_alloy", + P: "#forge:plates/stainless_steel", + A: "ae2:engineering_processor", + C: "#forge:circuits/hv", + S: "#forge:fine_wires/silver", + }); + // Fuzzy Card + event.remove({ id: "ae2:materials/cardfuzzy" }); + event.shapeless("ae2:fuzzy_card", [ + "ae2:advanced_card", + "#forge:circuits/ulv", + ]); + // Inverter Card + event.remove({ id: "ae2:materials/cardinverter" }); + event.shapeless("ae2:inverter_card", [ + "ae2:advanced_card", + "#forge:fine_wires/red_alloy", + ]); + // Acceleration Card + event.remove({ id: "ae2:materials/cardspeed" }); + event.shapeless("ae2:speed_card", [ + "ae2:advanced_card", + "#forge:circuits/mv", + ]); + // Energy Card + event.remove({ id: "ae2:materials/cardenergy" }); + event.shapeless("ae2:energy_card", [ + "ae2:advanced_card", + "#forge:batteries/mv", + ]); + + // Basic Card + event.remove({ id: "ae2:materials/basiccard" }); + event.shaped("2x ae2:basic_card", ["WP ", "ACP", "SP "], { + W: "#forge:fine_wires/red_alloy", + P: "#forge:plates/aluminium", + A: "ae2:engineering_processor", + C: "#forge:circuits/mv", + S: "#forge:fine_wires/gold", + }); + // Capacity Card + event.remove({ id: "ae2:materials/cardcapacity" }); + event.shapeless("ae2:capacity_card", [ + "ae2:basic_card", + "#forge:circuits/lv", + ]); + // Crafting Card + event.remove({ id: "ae2:materials/cardcrafting" }); + event.shapeless("ae2:crafting_card", [ + "ae2:basic_card", + "#forge:circuits/mv", + ]); + // Redstone Card + event.remove({ id: "ae2:materials/cardredstone" }); + event.shapeless("ae2:redstone_card", [ + "ae2:basic_card", + "#forge:plates/red_alloy", + ]); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/cells.js b/kubejs/server_scripts/appliedenergistics2/cells.js index 60cb6c7..bf35505 100644 --- a/kubejs/server_scripts/appliedenergistics2/cells.js +++ b/kubejs/server_scripts/appliedenergistics2/cells.js @@ -1,57 +1,57 @@ -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") - .itemOutputs("ae2:view_cell") - .duration(100) - .EUt(4); - - //ME Storage Housing - 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:fine_wires/red_alloy", - C: "#forge:circuits/lv", - }); - - //Fluid Storage Housing - 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", - }); -}); +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") + .itemOutputs("ae2:view_cell") + .duration(100) + .EUt(4); + + //ME Storage Housing + 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:fine_wires/red_alloy", + C: "#forge:circuits/lv", + }); + + //Fluid Storage Housing + 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", + }); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/certus_quartz.js b/kubejs/server_scripts/appliedenergistics2/certus_quartz.js index daf531b..560f2bd 100644 --- a/kubejs/server_scripts/appliedenergistics2/certus_quartz.js +++ b/kubejs/server_scripts/appliedenergistics2/certus_quartz.js @@ -1,12 +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" - ); -}); +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 51877ce..ec2d507 100644 --- a/kubejs/server_scripts/appliedenergistics2/circuitry.js +++ b/kubejs/server_scripts/appliedenergistics2/circuitry.js @@ -1,45 +1,45 @@ -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:fine_wires/tin" - ) - .itemOutputs("4x ae2:logic_processor") - .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:fine_wires/tin" - ) - .itemOutputs("4x ae2:engineering_processor") - .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:fine_wires/tin" - ) - .itemOutputs("4x ae2:calculation_processor") - .duration(200) - .EUt(30); -}); +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:fine_wires/tin" + ) + .itemOutputs("4x ae2:logic_processor") + .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:fine_wires/tin" + ) + .itemOutputs("4x ae2:engineering_processor") + .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:fine_wires/tin" + ) + .itemOutputs("4x ae2:calculation_processor") + .duration(200) + .EUt(30); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/crafting_storage.js b/kubejs/server_scripts/appliedenergistics2/crafting_storage.js index b9b0a8b..7c3e653 100644 --- a/kubejs/server_scripts/appliedenergistics2/crafting_storage.js +++ b/kubejs/server_scripts/appliedenergistics2/crafting_storage.js @@ -1,17 +1,17 @@ -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); +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 b3d7923..1933e9b 100644 --- a/kubejs/server_scripts/appliedenergistics2/extendedae2.js +++ b/kubejs/server_scripts/appliedenergistics2/extendedae2.js @@ -1,89 +1,89 @@ -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" - ) - .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" - ) - .itemOutputs("expatternprovider:ex_interface") - .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" - ) - .itemOutputs("expatternprovider:pattern_provider_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); - - // infinite cells - 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") - .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); - - 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); -}); +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" + ) + .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" + ) + .itemOutputs("expatternprovider:ex_interface") + .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" + ) + .itemOutputs("expatternprovider:pattern_provider_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); + + // infinite cells + 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") + .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); + + 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); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/inter_providers.js b/kubejs/server_scripts/appliedenergistics2/inter_providers.js index c0d91b0..584059f 100644 --- a/kubejs/server_scripts/appliedenergistics2/inter_providers.js +++ b/kubejs/server_scripts/appliedenergistics2/inter_providers.js @@ -1,21 +1,21 @@ -ServerEvents.recipes((event) => { - const patpros = [ - ["lv", "steel", 1], - ["mv", "aluminium", 2], - ["hv", "stainless_steel", 3], - ["ev", "titanium", 4], - ]; - patpros.forEach((tier) => { - let interProv = (materialType, blockType) => { - 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`, - }); - }; - interProv("#forge:glass", "ae2:interface"); - interProv("minecraft:crafting_table", "ae2:pattern_provider"); - }); -}); +ServerEvents.recipes((event) => { + const patpros = [ + ["lv", "steel", 1], + ["mv", "aluminium", 2], + ["hv", "stainless_steel", 3], + ["ev", "titanium", 4], + ]; + patpros.forEach((tier) => { + let interProv = (materialType, blockType) => { + 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`, + }); + }; + interProv("#forge:glass", "ae2:interface"); + interProv("minecraft:crafting_table", "ae2:pattern_provider"); + }); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js b/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js index 52baabe..7e9c8da 100644 --- a/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js +++ b/kubejs/server_scripts/appliedenergistics2/molecular_assemblers.js @@ -1,20 +1,20 @@ -ServerEvents.recipes((event) => { - const patpros = [ - ["hv", "stainless_steel", 1], - ["ev", "titanium", 4], - ["iv", "tungsten_steel", 16], - ]; - patpros.forEach((tier) => { - let interProv = (materialType, blockType) => { - 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"); - }); -}); +ServerEvents.recipes((event) => { + const patpros = [ + ["hv", "stainless_steel", 1], + ["ev", "titanium", 4], + ["iv", "tungsten_steel", 16], + ]; + patpros.forEach((tier) => { + let interProv = (materialType, blockType) => { + 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"); + }); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/patterns.js b/kubejs/server_scripts/appliedenergistics2/patterns.js index 5ae10f1..96eae61 100644 --- a/kubejs/server_scripts/appliedenergistics2/patterns.js +++ b/kubejs/server_scripts/appliedenergistics2/patterns.js @@ -1,52 +1,52 @@ -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:fine_wires/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:fine_wires/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:fine_wires/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:fine_wires/red_alloy", - "#forge:circuits/mv" - ) - .itemOutputs("64x ae2:blank_pattern") - .duration(200) - .EUt(480); -}); +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:fine_wires/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:fine_wires/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:fine_wires/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:fine_wires/red_alloy", + "#forge:circuits/mv" + ) + .itemOutputs("64x ae2:blank_pattern") + .duration(200) + .EUt(480); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/portable_cells.js b/kubejs/server_scripts/appliedenergistics2/portable_cells.js index 7e7265b..2f52819 100644 --- a/kubejs/server_scripts/appliedenergistics2/portable_cells.js +++ b/kubejs/server_scripts/appliedenergistics2/portable_cells.js @@ -1,12 +1,52 @@ -ServerEvents.recipes((event) => { - // Portable Cells - 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", - }); -}); +ServerEvents.recipes((event) => { + // Portable Cells + event.remove({ id: "ae2:tools/portable_item_cell_1k" }); + event.shaped( + Item.of("ae2:portable_item_cell_1k", "{internalCurrentPower:200000.0d}"), + ["BGB", "CHC", "PWP"], + { + B: "#forge:bolts/red_alloy", + G: "minecraft:glass", + C: "#forge:circuits/ulv", + H: "#forge:chests/wooden", + P: "#forge:plates/wrought_iron", + W: "gtceu:red_alloy_single_cable", + } + ); + event.remove({ id: "ae2:tools/portable_item_cell_4k" }); + event.shaped("ae2:portable_item_cell_4k", ["BGB", "CHC", "PWP"], { + B: "#forge:bolts/invar", + G: "ae2:quartz_glass", + C: "#forge:circuits/lv", + H: "gtceu:steel_crate", + P: "#forge:plates/black_steel", + W: "gtceu:tin_single_cable", + }); + event.remove({ id: "ae2:tools/portable_item_cell_16k" }); + event.shaped("ae2:portable_item_cell_16k", ["BGB", "CHC", "PWP"], { + B: "#forge:bolts/rose_gold", + G: "gtceu:tempered_glass", + C: "#forge:circuits/mv", + H: "gtceu:aluminium_crate", + P: "#forge:plates/vanadium_steel", + W: "gtceu:annealed_copper_single_cable", + }); + event.remove({ id: "ae2:tools/portable_item_cell_64k" }); + event.shaped("ae2:portable_item_cell_64k", ["BGB", "CHC", "PWP"], { + B: "#forge:bolts/blue_alloy", + G: "gtceu:cleanroom_glass", + C: "#forge:circuits/hv", + H: "gtceu:stainless_steel_crate", + P: "#forge:plates/blue_steel", + W: "gtceu:kanthal_single_cable", + }); + event.remove({ id: "ae2:tools/portable_item_cell_256k" }); + event.shaped("ae2:portable_item_cell_256k", ["BGB", "CHC", "PWP"], { + B: "#forge:bolts/platinum", + G: "gtceu:laminated_glass", + C: "#forge:circuits/ev", + H: "gtceu:titanium_crate", + P: "#forge:plates/tungsten", + W: "gtceu:black_steel_single_cable", + }); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/pressing.js b/kubejs/server_scripts/appliedenergistics2/pressing.js index 843abc5..369a920 100644 --- a/kubejs/server_scripts/appliedenergistics2/pressing.js +++ b/kubejs/server_scripts/appliedenergistics2/pressing.js @@ -1,39 +1,39 @@ -ServerEvents.recipes((event) => { - const greg = event.recipes.gtceu; - // Silicon - 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); - // Logic - 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); - // Engineering - 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); - // Calculation - 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); -}); +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + // Silicon + 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); + // Logic + 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); + // Engineering + 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); + // Calculation + 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); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/removals.js b/kubejs/server_scripts/appliedenergistics2/removals.js index f92e90c..495e4b5 100644 --- a/kubejs/server_scripts/appliedenergistics2/removals.js +++ b/kubejs/server_scripts/appliedenergistics2/removals.js @@ -1,39 +1,39 @@ -ServerEvents.recipes((event) => { - let yeet = (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"); - - 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"); -}); +ServerEvents.recipes((event) => { + let yeet = (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"); + + 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 fb520bc..b9589bb 100644 --- a/kubejs/server_scripts/appliedenergistics2/storage_parts.js +++ b/kubejs/server_scripts/appliedenergistics2/storage_parts.js @@ -1,78 +1,78 @@ -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" - ) - .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" - ) - .inputFluids("gtceu:red_alloy 288") - .itemOutputs("ae2:cell_component_1k") - .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" - ) - .itemOutputs("ae2:cell_component_4k") - .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" - ) - .itemOutputs("ae2:cell_component_16k") - .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" - ) - .itemOutputs("ae2:cell_component_64k") - .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" - ) - .itemOutputs("ae2:cell_component_256k") - .duration(200) - .EUt(1920); -}); +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" + ) + .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" + ) + .inputFluids("gtceu:red_alloy 288") + .itemOutputs("ae2:cell_component_1k") + .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" + ) + .itemOutputs("ae2:cell_component_4k") + .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" + ) + .itemOutputs("ae2:cell_component_16k") + .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" + ) + .itemOutputs("ae2:cell_component_64k") + .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" + ) + .itemOutputs("ae2:cell_component_256k") + .duration(200) + .EUt(1920); +}); diff --git a/kubejs/server_scripts/appliedenergistics2/terminals.js b/kubejs/server_scripts/appliedenergistics2/terminals.js index 6df09c6..b47a13d 100644 --- a/kubejs/server_scripts/appliedenergistics2/terminals.js +++ b/kubejs/server_scripts/appliedenergistics2/terminals.js @@ -1,116 +1,116 @@ -ServerEvents.recipes((event) => { - // Wireless Terminal - 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", - }); - // 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 ", " "], { - d: "#forge:tools/screwdrivers", - T: "ae2:wireless_terminal", - C: "gtceu:crafting_table_cover", - K: "ae2:fluix_glass_cable", - }); - - // ME Storage Bus - 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", - }); - - // ME Import Bus - 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", - }); - - // ME Import Bus - 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", - }); - - // ME Formation Plane - 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", - }); - - // ME Formation Plane - 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", - }); - - // ME Terminal - 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 "], { - 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 "], { - P: "ae2:terminal", - B: "gtceu:crafting_table_cover", - C: "ae2:calculation_processor", - d: "#forge:tools/screwdrivers", - }); - - // ME Pattern Terminal - 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", - }); - - // ME Pattern Access Terminal - 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", - }); - - // P2P Tunnel - 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", - }); -}); +ServerEvents.recipes((event) => { + // Wireless Terminal + 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", + }); + // 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 ", " "], { + d: "#forge:tools/screwdrivers", + T: "ae2:wireless_terminal", + C: "crafting_table", + K: "ae2:fluix_glass_cable", + }); + + // ME Storage Bus + 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", + }); + + // ME Import Bus + 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", + }); + + // ME Import Bus + 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", + }); + + // ME Formation Plane + 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", + }); + + // ME Formation Plane + 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", + }); + + // ME Terminal + 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 "], { + 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 "], { + P: "ae2:terminal", + B: "crafting_table", + C: "ae2:calculation_processor", + d: "#forge:tools/screwdrivers", + }); + + // ME Pattern Terminal + 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", + }); + + // ME Pattern Access Terminal + 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", + }); + + // P2P Tunnel + 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", + }); +}); diff --git a/kubejs/server_scripts/building_gadgets/gadgets.js b/kubejs/server_scripts/building_gadgets/gadgets.js index 1dd1592..1ac4d0c 100644 --- a/kubejs/server_scripts/building_gadgets/gadgets.js +++ b/kubejs/server_scripts/building_gadgets/gadgets.js @@ -1,57 +1,57 @@ -ServerEvents.recipes((event) => { - // Building Tool - event.remove({ output: "buildinggadgets2:gadget_building" }); - event.shaped("buildinggadgets2:gadget_building", ["PLP", "DCD", "PKP"], { - P: "#forge:plates/steel", - L: "#forge:plates/lapis", - D: "#forge:plates/diamond", - C: "#forge:circuits/lv", - K: "gtceu:tin_single_cable", - }); - // Exchanging Tool - event.remove({ output: "buildinggadgets2:gadget_exchanging" }); - event.shaped("buildinggadgets2:gadget_exchanging", ["PLP", "DCD", "PKP"], { - P: "#forge:plates/steel", - L: "#forge:plates/gold", - D: "#forge:plates/diamond", - C: "#forge:circuits/lv", - K: "gtceu:tin_single_cable", - }); - // Copy-paste Tool - event.remove({ output: "buildinggadgets2:gadget_copy_paste" }); - event.shaped("buildinggadgets2:gadget_copy_paste", ["PLP", "DCD", "PKP"], { - P: "#forge:plates/steel", - L: "#forge:plates/redstone", - D: "#forge:plates/emerald", - C: "#forge:circuits/lv", - K: "gtceu:tin_single_cable", - }); - - // Template Manager - event.remove({ output: "buildinggadgets2:template_manager" }); - event.shaped("buildinggadgets2:template_manager", ["KCK", "CHC", "KCK"], { - K: "gtceu:tin_single_cable", - C: "#forge:circuits/lv", - H: "gtceu:lv_machine_hull", - }); - - // Destruction Gadget - event.remove({ output: "buildinggadgets2:gadget_destruction" }); - event.shaped("buildinggadgets2:gadget_destruction", ["PLP", "DCD", "PKP"], { - P: "#forge:plates/aluminium", - L: "#forge:plates/nether_quartz", - D: "#forge:plates/ender_pearl", - C: "#forge:circuits/mv", - K: "gtceu:copper_single_cable", - }); - - // Cut 'n' Paste Gadget - event.remove({ output: "buildinggadgets2:gadget_cut_paste" }); - event.shaped("buildinggadgets2:gadget_cut_paste", ["PLP", "DCD", "PKP"], { - P: "#forge:plates/aluminium", - L: "#forge:plates/lapis", - D: "gtceu:iron_buzz_saw_blade", - C: "#forge:circuits/mv", - K: "gtceu:copper_single_cable", - }); -}); +ServerEvents.recipes((event) => { + // Building Tool + event.remove({ output: "buildinggadgets2:gadget_building" }); + event.shaped("buildinggadgets2:gadget_building", ["PLP", "DCD", "PKP"], { + P: "#forge:plates/steel", + L: "#forge:plates/lapis", + D: "#forge:plates/diamond", + C: "#forge:circuits/lv", + K: "gtceu:tin_single_cable", + }); + // Exchanging Tool + event.remove({ output: "buildinggadgets2:gadget_exchanging" }); + event.shaped("buildinggadgets2:gadget_exchanging", ["PLP", "DCD", "PKP"], { + P: "#forge:plates/steel", + L: "#forge:plates/gold", + D: "#forge:plates/diamond", + C: "#forge:circuits/lv", + K: "gtceu:tin_single_cable", + }); + // Copy-paste Tool + event.remove({ output: "buildinggadgets2:gadget_copy_paste" }); + event.shaped("buildinggadgets2:gadget_copy_paste", ["PLP", "DCD", "PKP"], { + P: "#forge:plates/steel", + L: "#forge:plates/redstone", + D: "#forge:plates/emerald", + C: "#forge:circuits/lv", + K: "gtceu:tin_single_cable", + }); + + // Template Manager + event.remove({ output: "buildinggadgets2:template_manager" }); + event.shaped("buildinggadgets2:template_manager", ["KCK", "CHC", "KCK"], { + K: "gtceu:tin_single_cable", + C: "#forge:circuits/lv", + H: "gtceu:lv_machine_hull", + }); + + // Destruction Gadget + event.remove({ output: "buildinggadgets2:gadget_destruction" }); + event.shaped("buildinggadgets2:gadget_destruction", ["PLP", "DCD", "PKP"], { + P: "#forge:plates/aluminium", + L: "#forge:plates/nether_quartz", + D: "#forge:plates/ender_pearl", + C: "#forge:circuits/mv", + K: "gtceu:copper_single_cable", + }); + + // Cut 'n' Paste Gadget + event.remove({ output: "buildinggadgets2:gadget_cut_paste" }); + event.shaped("buildinggadgets2:gadget_cut_paste", ["PLP", "DCD", "PKP"], { + P: "#forge:plates/aluminium", + L: "#forge:plates/lapis", + D: "gtceu:iron_buzz_saw_blade", + C: "#forge:circuits/mv", + K: "gtceu:copper_single_cable", + }); +}); diff --git a/kubejs/server_scripts/crafting_station/recipes.js b/kubejs/server_scripts/crafting_station/recipes.js index f9a19f1..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" }); - event.shapeless("craftingstation:crafting_station", [ - "minecraft:crafting_table", - "#forge:tools/saws", - ]); - event.remove({ id: "craftingstation:crafting_station_slab" }); - event.shapeless("craftingstation:crafting_station_slab", [ - "craftingstation:crafting_station", - "#forge:tools/saws", - ]); -}); +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" }); + event.shapeless("craftingstation:crafting_station_slab", [ + "craftingstation:crafting_station", + "#forge:tools/saws", + ]); +}); diff --git a/kubejs/server_scripts/gregtech/components.js b/kubejs/server_scripts/gregtech/components.js index 11d7d34..46b0aea 100644 --- a/kubejs/server_scripts/gregtech/components.js +++ b/kubejs/server_scripts/gregtech/components.js @@ -1,24 +1,24 @@ -ServerEvents.recipes((event) => { - const greg = event.recipes.gtceu; - event.remove({ output: "gtceu:fluid_voiding_cover" }); - event.remove({ id: "gtceu:macerator/macerate_fluid_voiding_cover" }); - greg - .assembler("fluid_voiding_cover") - .itemInputs( - "2x #forge:screws/steel", - "gtceu:fluid_detector_cover", - "gtceu:bronze_normal_fluid_pipe" - ) - .itemOutputs("gtceu:fluid_voiding_cover") - .duration(100) - .EUt(30); - - event.remove({ output: "gtceu:item_voiding_cover" }); - event.remove({ id: "gtceu:macerator/macerate_item_voiding_cover" }); - greg - .assembler("item_voiding_cover") - .itemInputs("2x #forge:screws/steel", "gtceu:item_detector_cover", "hopper") - .itemOutputs("gtceu:item_voiding_cover") - .duration(100) - .EUt(30); -}); +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + event.remove({ output: "gtceu:fluid_voiding_cover" }); + event.remove({ id: "gtceu:macerator/macerate_fluid_voiding_cover" }); + greg + .assembler("fluid_voiding_cover") + .itemInputs( + "2x #forge:screws/steel", + "gtceu:fluid_detector_cover", + "gtceu:bronze_normal_fluid_pipe" + ) + .itemOutputs("gtceu:fluid_voiding_cover") + .duration(100) + .EUt(30); + + event.remove({ output: "gtceu:item_voiding_cover" }); + event.remove({ id: "gtceu:macerator/macerate_item_voiding_cover" }); + greg + .assembler("item_voiding_cover") + .itemInputs("2x #forge:screws/steel", "gtceu:item_detector_cover", "hopper") + .itemOutputs("gtceu:item_voiding_cover") + .duration(100) + .EUt(30); +}); diff --git a/kubejs/server_scripts/gregtech/greenhouse.js b/kubejs/server_scripts/gregtech/greenhouse.js index 6f1527c..76874bd 100644 --- a/kubejs/server_scripts/gregtech/greenhouse.js +++ b/kubejs/server_scripts/gregtech/greenhouse.js @@ -1,106 +1,106 @@ -ServerEvents.recipes((event) => { - const greg = event.recipes.gtceu; - const trees = [ - ["minecraft:oak_sapling", "minecraft:oak_log"], - ["minecraft:spruce_sapling", "minecraft:spruce_log"], - ["minecraft:birch_sapling", "minecraft:birch_log"], - ["minecraft:jungle_sapling", "minecraft:jungle_log"], - ["minecraft:acacia_sapling", "minecraft:acacia_log"], - ["minecraft:dark_oak_sapling", "minecraft:dark_oak_log"], - ["minecraft:mangrove_propagule", "minecraft:mangrove_log"], - ["minecraft:cherry_sapling", "minecraft:cherry_log"], - ]; - 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"], { - G: "gtceu:tempered_glass", - C: "#forge:circuits/mv", - H: "gtceu:mv_machine_hull", - P: "gtceu:mv_electric_piston", - U: "gtceu:mv_electric_pump", - }); - trees.forEach((woodType) => { - greg - .greenhouse(woodType[0]) - .notConsumable(woodType[0]) - .inputFluids("water 1000") - .itemOutputs(`64x ${woodType[1]}`, `6x ${woodType[0]}`) - .duration(1200) - .EUt(40) - .circuit(1); - - greg - .greenhouse(`${woodType[0]}_fertiliser`) - .notConsumable(woodType[0]) - .itemInputs("4x gtceu:fertilizer") - .inputFluids("water 1000") - .itemOutputs( - `64x ${woodType[1]}`, - `64x ${woodType[1]}`, - `12x ${woodType[0]}` - ) - .duration(900) - .EUt(60) - .circuit(2); - }); - - plants.forEach((seedType) => { - greg - .greenhouse(seedType[0]) - .notConsumable(seedType[0]) - .inputFluids("water 1000") - .itemOutputs(`${seedType[2]}x ${seedType[1]}`) - .duration(1200) - .EUt(40) - .circuit(1); - greg - .greenhouse(seedType[0] + "_fertilizer") - .notConsumable(seedType[0]) - .itemInputs("4x gtceu:fertilizer") - .inputFluids("water 1000") - .itemOutputs(`${2 * seedType[2]}x ${seedType[1]}`) - .duration(900) - .EUt(60) - .circuit(2); - }); - greg - .greenhouse("rubber_wood") - .notConsumable("gtceu:rubber_sapling") - .inputFluids("water 1000") - .itemOutputs( - "16x gtceu:rubber_log", - "3x gtceu:rubber_sapling", - "4x gtceu:sticky_resin" - ) - .duration(1200) - .EUt(40) - .circuit(1); - greg - .greenhouse("rubber_wood_fertiliser") - .notConsumable("gtceu:rubber_sapling") - .itemInputs("4x gtceu:fertilizer") - .inputFluids("water 1000") - .itemOutputs( - "32x gtceu:rubber_log", - "6x gtceu:rubber_sapling", - "8x gtceu:sticky_resin" - ) - .duration(900) - .EUt(60) - .circuit(2); -}); +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + const trees = [ + ["minecraft:oak_sapling", "minecraft:oak_log"], + ["minecraft:spruce_sapling", "minecraft:spruce_log"], + ["minecraft:birch_sapling", "minecraft:birch_log"], + ["minecraft:jungle_sapling", "minecraft:jungle_log"], + ["minecraft:acacia_sapling", "minecraft:acacia_log"], + ["minecraft:dark_oak_sapling", "minecraft:dark_oak_log"], + ["minecraft:mangrove_propagule", "minecraft:mangrove_log"], + ["minecraft:cherry_sapling", "minecraft:cherry_log"], + ]; + 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"], { + G: "gtceu:tempered_glass", + C: "#forge:circuits/mv", + H: "gtceu:mv_machine_hull", + P: "gtceu:mv_electric_piston", + U: "gtceu:mv_electric_pump", + }); + trees.forEach((woodType) => { + greg + .greenhouse(woodType[0]) + .notConsumable(woodType[0]) + .inputFluids("water 1000") + .itemOutputs(`64x ${woodType[1]}`, `6x ${woodType[0]}`) + .duration(1200) + .EUt(40) + .circuit(1); + + greg + .greenhouse(`${woodType[0]}_fertiliser`) + .notConsumable(woodType[0]) + .itemInputs("4x gtceu:fertilizer") + .inputFluids("water 1000") + .itemOutputs( + `64x ${woodType[1]}`, + `64x ${woodType[1]}`, + `12x ${woodType[0]}` + ) + .duration(900) + .EUt(60) + .circuit(2); + }); + + plants.forEach((seedType) => { + greg + .greenhouse(seedType[0]) + .notConsumable(seedType[0]) + .inputFluids("water 1000") + .itemOutputs(`${seedType[2]}x ${seedType[1]}`) + .duration(1200) + .EUt(40) + .circuit(1); + greg + .greenhouse(seedType[0] + "_fertilizer") + .notConsumable(seedType[0]) + .itemInputs("4x gtceu:fertilizer") + .inputFluids("water 1000") + .itemOutputs(`${2 * seedType[2]}x ${seedType[1]}`) + .duration(900) + .EUt(60) + .circuit(2); + }); + greg + .greenhouse("rubber_wood") + .notConsumable("gtceu:rubber_sapling") + .inputFluids("water 1000") + .itemOutputs( + "16x gtceu:rubber_log", + "3x gtceu:rubber_sapling", + "4x gtceu:sticky_resin" + ) + .duration(1200) + .EUt(40) + .circuit(1); + greg + .greenhouse("rubber_wood_fertiliser") + .notConsumable("gtceu:rubber_sapling") + .itemInputs("4x gtceu:fertilizer") + .inputFluids("water 1000") + .itemOutputs( + "32x gtceu:rubber_log", + "6x gtceu:rubber_sapling", + "8x gtceu:sticky_resin" + ) + .duration(900) + .EUt(60) + .circuit(2); +}); diff --git a/kubejs/server_scripts/gregtech/inscriber.js b/kubejs/server_scripts/gregtech/inscriber.js index 1aa859c..dcdcf0a 100644 --- a/kubejs/server_scripts/gregtech/inscriber.js +++ b/kubejs/server_scripts/gregtech/inscriber.js @@ -1,36 +1,36 @@ -ServerEvents.recipes((event) => { - const greg = event.recipes.gtceu; - // Printed Silicon - greg - .forming_press("printed_silicon_circuit") - .itemInputs("#forge:plates/silicon") - .notConsumable("ae2:silicon_press") - .itemOutputs("ae2:printed_silicon") - .duration(200) - .EUt(30); - - // Printed Logic Circuit - greg - .forming_press("printed_logic_processor") - .itemInputs("#forge:plates/gold") - .notConsumable("ae2:logic_processor_press") - .itemOutputs("ae2:printed_logic_processor") - .duration(200) - .EUt(30); - - // Printed Engineering Circuit - greg - .forming_press("printed_engineering_processor") - .itemInputs("#forge:plates/diamond") - .notConsumable("ae2:engineering_processor_press") - .itemOutputs("ae2:printed_engineering_processor") - .duration(200) - .EUt(30); - - // Printed Calculation Circuit - greg - .forming_press("printed_calculation_circuit") - .itemInputs("#forge:plates/certus_quartz") - .notConsumable("ae2:calculation_processor_press") - .itemOutputs("ae2:printed_calculation_processor"); -}); +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + // Printed Silicon + greg + .forming_press("printed_silicon_circuit") + .itemInputs("#forge:plates/silicon") + .notConsumable("ae2:silicon_press") + .itemOutputs("ae2:printed_silicon") + .duration(200) + .EUt(30); + + // Printed Logic Circuit + greg + .forming_press("printed_logic_processor") + .itemInputs("#forge:plates/gold") + .notConsumable("ae2:logic_processor_press") + .itemOutputs("ae2:printed_logic_processor") + .duration(200) + .EUt(30); + + // Printed Engineering Circuit + greg + .forming_press("printed_engineering_processor") + .itemInputs("#forge:plates/diamond") + .notConsumable("ae2:engineering_processor_press") + .itemOutputs("ae2:printed_engineering_processor") + .duration(200) + .EUt(30); + + // Printed Calculation Circuit + greg + .forming_press("printed_calculation_circuit") + .itemInputs("#forge:plates/certus_quartz") + .notConsumable("ae2:calculation_processor_press") + .itemOutputs("ae2:printed_calculation_processor"); +}); diff --git a/kubejs/server_scripts/gregtech/tools.js b/kubejs/server_scripts/gregtech/tools.js index c90dc80..4122455 100644 --- a/kubejs/server_scripts/gregtech/tools.js +++ b/kubejs/server_scripts/gregtech/tools.js @@ -1,61 +1,61 @@ -ServerEvents.recipes((event) => { - const murderingUtensils = ["sword", "knife", "butchery_knife", "axe"]; - - const miningUtensils = [ - "pickaxe", - "shovel", - "hoe", - "mining_hammer", - "saw", - "hammer", - "wrench", - "file", - "crowbar", - "screwdriver", - "wire_cutter", - "scythe", - "plunger", - ]; - - miningUtensils.forEach((miningUtensil) => { - let addEnchantment = ( - tooltype, - material, - enchantment, - enchantmentLevel - ) => { - event.replaceOutput( - { id: `gtceu:shaped/${tooltype}_${material}` }, - `gtceu:${material}_${tooltype}`, - Item.of(`gtceu:${material}_${tooltype}`, "{Damage:0}").enchant( - `minecraft:${enchantment}`, - `${enchantmentLevel}` - ) - ); - }; - addEnchantment(miningUtensil, "damascus_steel", "fortune", 3); - addEnchantment(miningUtensil, "rose_gold", "fortune", 2); - addEnchantment(miningUtensil, "invar", "efficiency", 1); - }); - - murderingUtensils.forEach((murderingUtensil) => { - let addEnchantment = ( - tooltype, - material, - enchantment, - enchantmentLevel - ) => { - event.replaceOutput( - { id: `gtceu:shaped/${tooltype}_${material}` }, - `gtceu:${material}_${tooltype}`, - Item.of(`gtceu:${material}_${tooltype}`, "{Damage:0}").enchant( - `minecraft:${enchantment}`, - `${enchantmentLevel}` - ) - ); - }; - addEnchantment(murderingUtensil, "damascus_steel", "looting", 3); - addEnchantment(murderingUtensil, "rose_gold", "looting", 2); - addEnchantment(murderingUtensil, "invar", "unbreaking", 1); - }); -}); +ServerEvents.recipes((event) => { + const murderingUtensils = ["sword", "knife", "butchery_knife", "axe"]; + + const miningUtensils = [ + "pickaxe", + "shovel", + "hoe", + "mining_hammer", + "saw", + "hammer", + "wrench", + "file", + "crowbar", + "screwdriver", + "wire_cutter", + "scythe", + "plunger", + ]; + + miningUtensils.forEach((miningUtensil) => { + let addEnchantment = ( + tooltype, + material, + enchantment, + enchantmentLevel + ) => { + event.replaceOutput( + { id: `gtceu:shaped/${tooltype}_${material}` }, + `gtceu:${material}_${tooltype}`, + Item.of(`gtceu:${material}_${tooltype}`, "{Damage:0}").enchant( + `minecraft:${enchantment}`, + `${enchantmentLevel}` + ) + ); + }; + addEnchantment(miningUtensil, "damascus_steel", "fortune", 3); + addEnchantment(miningUtensil, "rose_gold", "fortune", 2); + addEnchantment(miningUtensil, "invar", "efficiency", 1); + }); + + murderingUtensils.forEach((murderingUtensil) => { + let addEnchantment = ( + tooltype, + material, + enchantment, + enchantmentLevel + ) => { + event.replaceOutput( + { id: `gtceu:shaped/${tooltype}_${material}` }, + `gtceu:${material}_${tooltype}`, + Item.of(`gtceu:${material}_${tooltype}`, "{Damage:0}").enchant( + `minecraft:${enchantment}`, + `${enchantmentLevel}` + ) + ); + }; + addEnchantment(murderingUtensil, "damascus_steel", "looting", 3); + addEnchantment(murderingUtensil, "rose_gold", "looting", 2); + addEnchantment(murderingUtensil, "invar", "unbreaking", 1); + }); +}); diff --git a/kubejs/server_scripts/gregtech/wood_unification.js b/kubejs/server_scripts/gregtech/wood_unification.js index 579ef8a..9e0f759 100644 --- a/kubejs/server_scripts/gregtech/wood_unification.js +++ b/kubejs/server_scripts/gregtech/wood_unification.js @@ -1,32 +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"); -}); +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/open_blocks/elevator.js b/kubejs/server_scripts/open_blocks/elevator.js index 10ecc5b..cf6670c 100644 --- a/kubejs/server_scripts/open_blocks/elevator.js +++ b/kubejs/server_scripts/open_blocks/elevator.js @@ -1,44 +1,44 @@ -ServerEvents.recipes((event) => { - const greg = event.recipes.gtceu; - const dyes = [ - "white", - "orange", - "magenta", - "light_blue", - "yellow", - "lime", - "pink", - "gray", - "light_gray", - "cyan", - "purple", - "blue", - "brown", - "green", - "red", - "black", - ]; - event.remove({ mod: "elevatorid" }); - dyes.forEach((dyes) => { - greg - .chemical_bath(`${dyes}_elevator`) - .itemInputs("#elevatorid:elevators") - .inputFluids(`gtceu:${dyes}_dye 18"`) - .itemOutputs(`elevatorid:elevator_${dyes}`) - .duration(20) - .EUt(7); - }); - greg - .chemical_bath("elevator_washing") - .itemInputs("#elevatorid:elevators") - .inputFluids("gtceu:chlorine 50") - .itemOutputs("elevatorid:elevator_gray") - .duration(400) - .EUt(2); - - event.shaped("elevatorid:elevator_gray", ["PPP", "GFG", "PPP"], { - P: "#forge:plates/steel", - G: "#forge:small_gears/steel", - F: "#forge:frames/steel", - }); -}); +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + const dyes = [ + "white", + "orange", + "magenta", + "light_blue", + "yellow", + "lime", + "pink", + "gray", + "light_gray", + "cyan", + "purple", + "blue", + "brown", + "green", + "red", + "black", + ]; + event.remove({ mod: "elevatorid" }); + dyes.forEach((dyes) => { + greg + .chemical_bath(`${dyes}_elevator`) + .itemInputs("#elevatorid:elevators") + .inputFluids(`gtceu:${dyes}_dye 18"`) + .itemOutputs(`elevatorid:elevator_${dyes}`) + .duration(20) + .EUt(7); + }); + greg + .chemical_bath("elevator_washing") + .itemInputs("#elevatorid:elevators") + .inputFluids("gtceu:chlorine 50") + .itemOutputs("elevatorid:elevator_gray") + .duration(400) + .EUt(2); + + event.shaped("elevatorid:elevator_gray", ["PPP", "GFG", "PPP"], { + P: "#forge:plates/steel", + G: "#forge:small_gears/steel", + F: "#forge:frames/steel", + }); +}); diff --git a/kubejs/server_scripts/open_blocks/hang_glider.js b/kubejs/server_scripts/open_blocks/hang_glider.js index 87bd0ee..56ecd4e 100644 --- a/kubejs/server_scripts/open_blocks/hang_glider.js +++ b/kubejs/server_scripts/open_blocks/hang_glider.js @@ -1,26 +1,26 @@ -ServerEvents.recipes((event) => { - event.remove({ id: "hangglider:glider_wing" }); - event.shaped("hangglider:glider_wing", ["hRL", "RLL", "LLL"], { - h: "#forge:tools/hammers", - R: "#forge:rods/steel", - L: "minecraft:leather", - }); - event.remove({ id: "hangglider:glider_framework" }); - event.shaped("hangglider:glider_framework", [" R ", "RhR", "RRR"], { - h: "#forge:tools/hammers", - R: "#forge:rods/steel", - }); - event.remove({ id: "hangglider:hang_glider" }); - event.shaped("hangglider:hang_glider", ["SSS", "LML", "SSS"], { - S: "#forge:screws/iron", - L: "hangglider:glider_wing", - M: "hangglider:glider_framework", - }); - event.remove({ output: "hangglider:reinforced_hang_glider" }); - event.shaped("hangglider:reinforced_hang_glider", ["SVS", "LML", "SVS"], { - S: "#forge:screws/vanadium_steel", - V: "#forge:rods/vanadium_steel", - L: "hangglider:glider_wing", - M: "hangglider:hang_glider", - }); -}); +ServerEvents.recipes((event) => { + event.remove({ id: "hangglider:glider_wing" }); + event.shaped("hangglider:glider_wing", ["hRL", "RLL", "LLL"], { + h: "#forge:tools/hammers", + R: "#forge:rods/steel", + L: "minecraft:leather", + }); + event.remove({ id: "hangglider:glider_framework" }); + event.shaped("hangglider:glider_framework", [" R ", "RhR", "RRR"], { + h: "#forge:tools/hammers", + R: "#forge:rods/steel", + }); + event.remove({ id: "hangglider:hang_glider" }); + event.shaped("hangglider:hang_glider", ["SSS", "LML", "SSS"], { + S: "#forge:screws/iron", + L: "hangglider:glider_wing", + M: "hangglider:glider_framework", + }); + event.remove({ output: "hangglider:reinforced_hang_glider" }); + event.shaped("hangglider:reinforced_hang_glider", ["SVS", "LML", "SVS"], { + S: "#forge:screws/vanadium_steel", + V: "#forge:rods/vanadium_steel", + L: "hangglider:glider_wing", + M: "hangglider:hang_glider", + }); +}); diff --git a/kubejs/server_scripts/open_blocks/magnets.js b/kubejs/server_scripts/open_blocks/magnets.js index 5d612ab..7344759 100644 --- a/kubejs/server_scripts/open_blocks/magnets.js +++ b/kubejs/server_scripts/open_blocks/magnets.js @@ -1,18 +1,18 @@ -ServerEvents.recipes((event) => { - // Worst magnet - event.remove({ id: "simplemagnets:basicmagnet" }); - event.shaped("simplemagnets:basicmagnet", ["R R", "RwR", "BPB"], { - R: "#forge:rods/magnetic_steel", - w: "#forge:tools/wrenches", - B: "#forge:bolts/tin", - P: "#forge:plates/steel", - }); - // King magnet - event.remove({ output: "simplemagnets:advancedmagnet" }); - event.shaped("simplemagnets:advancedmagnet", ["R R", "RwR", "BPB"], { - R: "#forge:rods/magnetic_samarium", - w: "#forge:tools/wrenches", - B: "#forge:bolts/gold", - P: "#forge:plates/stainless_steel", - }); -}); +ServerEvents.recipes((event) => { + // Worst magnet + event.remove({ id: "simplemagnets:basicmagnet" }); + event.shaped("simplemagnets:basicmagnet", ["R R", "RwR", "BPB"], { + R: "#forge:rods/magnetic_steel", + w: "#forge:tools/wrenches", + B: "#forge:bolts/tin", + P: "#forge:plates/steel", + }); + // King magnet + event.remove({ output: "simplemagnets:advancedmagnet" }); + event.shaped("simplemagnets:advancedmagnet", ["R R", "RwR", "BPB"], { + R: "#forge:rods/magnetic_samarium", + w: "#forge:tools/wrenches", + B: "#forge:bolts/gold", + P: "#forge:plates/stainless_steel", + }); +}); diff --git a/kubejs/server_scripts/removals.js b/kubejs/server_scripts/removals.js index a0ebff5..2a67f1f 100644 --- a/kubejs/server_scripts/removals.js +++ b/kubejs/server_scripts/removals.js @@ -1,6 +1,6 @@ -ServerEvents.recipes((event) => { - event.remove({ mod: "itemfilters" }); - event.remove({ mod: "better_angel_ring" }); - - event.remove({id: "minecraft:charcoal"}) -}); +ServerEvents.recipes((event) => { + event.remove({ mod: "itemfilters" }); + event.remove({ mod: "better_angel_ring" }); + + event.remove({id: "minecraft:charcoal"}) +}); diff --git a/kubejs/server_scripts/storage_drawers/drawers.js b/kubejs/server_scripts/storage_drawers/drawers.js index ea826f4..67115c2 100644 --- a/kubejs/server_scripts/storage_drawers/drawers.js +++ b/kubejs/server_scripts/storage_drawers/drawers.js @@ -1,144 +1,144 @@ -ServerEvents.recipes((event) => { - const greg = event.recipes.gtceu; - event.remove({ mod: "storagedrawers" }); - const woodTypes = [ - "oak", - "spruce", - "birch", - "jungle", - "acacia", - "dark_oak", - "warped", - "crimson", - ]; - woodTypes.forEach((woodType) => { - // Type 1 - event.shaped( - `storagedrawers:${woodType}_full_drawers_1`, - ["PPP", "sCr", "PPP"], - { - P: `${woodType}_planks`, - s: "#forge:tools/saws", - C: "#forge:chests/wooden", - r: "#forge:tools/mallets", - } - ).noMirror(); - greg - .assembler(`storagedrawers:${woodType}_full_drawers_1`) - .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_full_drawers_1`) - .circuit(9) - .duration(100) - .EUt(16); - // Type 2 - event.shaped( - `storagedrawers:${woodType}_full_drawers_2`, - ["PPP", "rCs", "PPP"], - { - P: `${woodType}_planks`, - s: "#forge:tools/saws", - C: "#forge:chests/wooden", - r: "#forge:tools/mallets", - } - ).noMirror(); - greg - .assembler(`storagedrawers:${woodType}_full_drawers_2`) - .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_full_drawers_2`) - .circuit(10) - .duration(100) - .EUt(16); - // Type 4 - event.shaped( - `storagedrawers:${woodType}_full_drawers_4`, - ["PsP", "PCP", "PrP"], - { - P: `${woodType}_planks`, - s: "#forge:tools/saws", - C: "#forge:chests/wooden", - r: "#forge:tools/mallets", - } - ); - greg - .assembler(`storagedrawers:${woodType}_full_drawers_4`) - .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_full_drawers_4`) - .circuit(11) - .duration(100) - .EUt(16); - - // Half 1 - event.shaped( - `storagedrawers:${woodType}_half_drawers_1`, - ["PPP", "sCr", "PPP"], - { - P: `${woodType}_slab`, - s: "#forge:tools/saws", - C: "#forge:chests/wooden", - r: "#forge:tools/mallets", - } - ).noMirror(); - greg - .assembler(`storagedrawers:${woodType}_half_drawers_1`) - .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_half_drawers_1`) - .circuit(9) - .duration(100) - .EUt(16); - // Half 2 - event.shaped( - `storagedrawers:${woodType}_half_drawers_2`, - ["PPP", "rCs", "PPP"], - { - P: `${woodType}_slab`, - s: "#forge:tools/saws", - C: "#forge:chests/wooden", - r: "#forge:tools/mallets", - } - ).noMirror(); - greg - .assembler(`storagedrawers:${woodType}_half_drawers_2`) - .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_half_drawers_2`) - .circuit(10) - .duration(100) - .EUt(16); - // Half 4 - event.shaped( - `storagedrawers:${woodType}_half_drawers_4`, - ["PsP", "PCP", "PrP"], - { - P: `${woodType}_slab`, - s: "#forge:tools/saws", - C: "#forge:chests/wooden", - r: "#forge:tools/mallets", - } - ); - greg - .assembler(`storagedrawers:${woodType}_half_drawers_4`) - .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") - .itemOutputs(`storagedrawers:${woodType}_half_drawers_4`) - .circuit(11) - .duration(100) - .EUt(16); - }); - - // Controller - event.remove({ output: "storagedrawers:storage_controller" }); - event.shaped("storagedrawers:controller", ["PCP", "KDK", "OPO"], { - P: "#forge:plates/diamond", - C: "#forge:circuits/lv", - K: "gtceu:red_alloy_single_wire", - D: "#storagedrawers:drawers", - O: "#forge:plates/obsidian", - }); - // Controller Extension - event.remove({ output: "storagedrawers:controller_slave" }); - event.shaped("storagedrawers:controller_slave", ["OPO", "KDK", "PCP"], { - P: "#forge:plates/diamond", - C: "#forge:circuits/lv", - K: "gtceu:red_alloy_single_wire", - D: "#storagedrawers:drawers", - O: "#forge:plates/obsidian", - }); -}); \ No newline at end of file +ServerEvents.recipes((event) => { + const greg = event.recipes.gtceu; + event.remove({ mod: "storagedrawers" }); + const woodTypes = [ + "oak", + "spruce", + "birch", + "jungle", + "acacia", + "dark_oak", + "warped", + "crimson", + ]; + woodTypes.forEach((woodType) => { + // Type 1 + event.shaped( + `storagedrawers:${woodType}_full_drawers_1`, + ["PPP", "sCr", "PPP"], + { + P: `${woodType}_planks`, + s: "#forge:tools/saws", + C: "#forge:chests/wooden", + r: "#forge:tools/mallets", + } + ).noMirror(); + greg + .assembler(`storagedrawers:${woodType}_full_drawers_1`) + .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") + .itemOutputs(`storagedrawers:${woodType}_full_drawers_1`) + .circuit(9) + .duration(100) + .EUt(16); + // Type 2 + event.shaped( + `storagedrawers:${woodType}_full_drawers_2`, + ["PPP", "rCs", "PPP"], + { + P: `${woodType}_planks`, + s: "#forge:tools/saws", + C: "#forge:chests/wooden", + r: "#forge:tools/mallets", + } + ).noMirror(); + greg + .assembler(`storagedrawers:${woodType}_full_drawers_2`) + .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") + .itemOutputs(`storagedrawers:${woodType}_full_drawers_2`) + .circuit(10) + .duration(100) + .EUt(16); + // Type 4 + event.shaped( + `storagedrawers:${woodType}_full_drawers_4`, + ["PsP", "PCP", "PrP"], + { + P: `${woodType}_planks`, + s: "#forge:tools/saws", + C: "#forge:chests/wooden", + r: "#forge:tools/mallets", + } + ); + greg + .assembler(`storagedrawers:${woodType}_full_drawers_4`) + .itemInputs(`6x minecraft:${woodType}_planks`, "#forge:chests/wooden") + .itemOutputs(`storagedrawers:${woodType}_full_drawers_4`) + .circuit(11) + .duration(100) + .EUt(16); + + // Half 1 + event.shaped( + `storagedrawers:${woodType}_half_drawers_1`, + ["PPP", "sCr", "PPP"], + { + P: `${woodType}_slab`, + s: "#forge:tools/saws", + C: "#forge:chests/wooden", + r: "#forge:tools/mallets", + } + ).noMirror(); + greg + .assembler(`storagedrawers:${woodType}_half_drawers_1`) + .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") + .itemOutputs(`storagedrawers:${woodType}_half_drawers_1`) + .circuit(9) + .duration(100) + .EUt(16); + // Half 2 + event.shaped( + `storagedrawers:${woodType}_half_drawers_2`, + ["PPP", "rCs", "PPP"], + { + P: `${woodType}_slab`, + s: "#forge:tools/saws", + C: "#forge:chests/wooden", + r: "#forge:tools/mallets", + } + ).noMirror(); + greg + .assembler(`storagedrawers:${woodType}_half_drawers_2`) + .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") + .itemOutputs(`storagedrawers:${woodType}_half_drawers_2`) + .circuit(10) + .duration(100) + .EUt(16); + // Half 4 + event.shaped( + `storagedrawers:${woodType}_half_drawers_4`, + ["PsP", "PCP", "PrP"], + { + P: `${woodType}_slab`, + s: "#forge:tools/saws", + C: "#forge:chests/wooden", + r: "#forge:tools/mallets", + } + ); + greg + .assembler(`storagedrawers:${woodType}_half_drawers_4`) + .itemInputs(`6x minecraft:${woodType}_slab`, "#forge:chests/wooden") + .itemOutputs(`storagedrawers:${woodType}_half_drawers_4`) + .circuit(11) + .duration(100) + .EUt(16); + }); + + // Controller + event.remove({ output: "storagedrawers:storage_controller" }); + event.shaped("storagedrawers:controller", ["PCP", "KDK", "OPO"], { + P: "#forge:plates/diamond", + C: "#forge:circuits/lv", + K: "gtceu:red_alloy_single_wire", + D: "#storagedrawers:drawers", + O: "#forge:plates/obsidian", + }); + // Controller Extension + event.remove({ output: "storagedrawers:controller_slave" }); + event.shaped("storagedrawers:controller_slave", ["OPO", "KDK", "PCP"], { + P: "#forge:plates/diamond", + C: "#forge:circuits/lv", + K: "gtceu:red_alloy_single_wire", + D: "#storagedrawers:drawers", + O: "#forge:plates/obsidian", + }); +}); diff --git a/kubejs/server_scripts/storage_drawers/upgrades.js b/kubejs/server_scripts/storage_drawers/upgrades.js index 7e5a95c..93d088d 100644 --- a/kubejs/server_scripts/storage_drawers/upgrades.js +++ b/kubejs/server_scripts/storage_drawers/upgrades.js @@ -1,92 +1,92 @@ -ServerEvents.recipes((event) => { - // Upgrade Template - event.shaped("storagedrawers:upgrade_template", ["SPS", "SWS", " d "], { - S: "#forge:screws/iron", - P: "gtceu:lv_electric_piston", - W: "#minecraft:planks", - d: "#forge:tools/screwdrivers", - }); - event.recipes.gtceu - .assembler("upgrade_template") - .itemInputs( - "2x #forge:screws/iron", - "gtceu:lv_electric_piston", - "#minecraft:planks" - ) - .itemOutputs("storagedrawers:upgrade_template") - .duration(60) - .EUt(24); - - // Upgrade 1 - event.shaped("storagedrawers:obsidian_storage_upgrade", ["PTP"], { - P: "#forge:plates/obsidian", - T: "storagedrawers:upgrade_template", - }); - - // Upgrade 2 - event.shaped("storagedrawers:iron_storage_upgrade", ["S S", "PTP", "S S"], { - S: "#forge:rods/iron", - P: "#forge:plates/iron", - T: "storagedrawers:upgrade_template", - }); - - // Upgrade 3 - event.shaped("storagedrawers:gold_storage_upgrade", ["S S", "PTP", "S S"], { - S: "#forge:rods/gold", - P: "#forge:plates/rose_gold", - T: "storagedrawers:upgrade_template", - }); - - // Upgrade 4 - event.shaped( - "storagedrawers:diamond_storage_upgrade", - ["S S", "PTP", "S S"], - { - S: "#forge:rods/stainless_steel", - P: "#forge:plates/diamond", - T: "storagedrawers:upgrade_template", - } - ); - - // Upgrade 5 - event.shaped( - "storagedrawers:emerald_storage_upgrade", - ["S S", "PTP", "S S"], - { - S: "#forge:rods/titanium", - P: "#forge:plates/emerald", - T: "storagedrawers:upgrade_template", - } - ); - // Upgrade 5 2 - event.shaped( - "storagedrawers:emerald_storage_upgrade", - ["S S", "PTP", "S S"], - { - S: "#forge:rods/titanium", - P: "#forge:plates/olivine", - T: "storagedrawers:upgrade_template", - } - ); - - // Storage Downgrade - event.shaped("storagedrawers:one_stack_upgrade", ["PTP"], { - P: "flint", - T: "storagedrawers:upgrade_template", - }); - - // Void Upgrade - event.shaped("storagedrawers:void_upgrade", ["PPP", "PTP", "PPP"], { - P: "#forge:plates/obsidian", - T: "storagedrawers:upgrade_template", - }); - - // Void Upgrade - event.shaped("storagedrawers:drawer_key", [" BP", "TPP", "Gs "], { - B: "#forge:bolts/gold", - T: "storagedrawers:upgrade_template", - P: "#forge:plates/steel", - G: "#forge:plates/gold", - s: "#forge:tools/saws", - }); -}); +ServerEvents.recipes((event) => { + // Upgrade Template + event.shaped("storagedrawers:upgrade_template", ["SPS", "SWS", " d "], { + S: "#forge:screws/iron", + P: "gtceu:lv_electric_piston", + W: "#minecraft:planks", + d: "#forge:tools/screwdrivers", + }); + event.recipes.gtceu + .assembler("upgrade_template") + .itemInputs( + "2x #forge:screws/iron", + "gtceu:lv_electric_piston", + "#minecraft:planks" + ) + .itemOutputs("storagedrawers:upgrade_template") + .duration(60) + .EUt(24); + + // Upgrade 1 + event.shaped("storagedrawers:obsidian_storage_upgrade", ["PTP"], { + P: "#forge:plates/obsidian", + T: "storagedrawers:upgrade_template", + }); + + // Upgrade 2 + event.shaped("storagedrawers:iron_storage_upgrade", ["S S", "PTP", "S S"], { + S: "#forge:rods/iron", + P: "#forge:plates/iron", + T: "storagedrawers:upgrade_template", + }); + + // Upgrade 3 + event.shaped("storagedrawers:gold_storage_upgrade", ["S S", "PTP", "S S"], { + S: "#forge:rods/gold", + P: "#forge:plates/rose_gold", + T: "storagedrawers:upgrade_template", + }); + + // Upgrade 4 + event.shaped( + "storagedrawers:diamond_storage_upgrade", + ["S S", "PTP", "S S"], + { + S: "#forge:rods/stainless_steel", + P: "#forge:plates/diamond", + T: "storagedrawers:upgrade_template", + } + ); + + // Upgrade 5 + event.shaped( + "storagedrawers:emerald_storage_upgrade", + ["S S", "PTP", "S S"], + { + S: "#forge:rods/titanium", + P: "#forge:plates/emerald", + T: "storagedrawers:upgrade_template", + } + ); + // Upgrade 5 2 + event.shaped( + "storagedrawers:emerald_storage_upgrade", + ["S S", "PTP", "S S"], + { + S: "#forge:rods/titanium", + P: "#forge:plates/olivine", + T: "storagedrawers:upgrade_template", + } + ); + + // Storage Downgrade + event.shaped("storagedrawers:one_stack_upgrade", ["PTP"], { + P: "flint", + T: "storagedrawers:upgrade_template", + }); + + // Void Upgrade + event.shaped("storagedrawers:void_upgrade", ["PPP", "PTP", "PPP"], { + P: "#forge:plates/obsidian", + T: "storagedrawers:upgrade_template", + }); + + // Drawer Key + event.shaped("storagedrawers:drawer_key", [" BP", "TPP", "Gs "], { + B: "#forge:bolts/gold", + T: "storagedrawers:upgrade_template", + P: "#forge:plates/steel", + G: "#forge:plates/gold", + s: "#forge:tools/saws", + }); +}); diff --git a/kubejs/server_scripts/tags/ae2.js b/kubejs/server_scripts/tags/ae2.js index 48a2afa..3b3e8e2 100644 --- a/kubejs/server_scripts/tags/ae2.js +++ b/kubejs/server_scripts/tags/ae2.js @@ -1,8 +1,8 @@ -ServerEvents.tags("item", (event) => { - event.remove("forge:dusts/ender_pearl", "ae2:ender_dust"); - event.remove("forge:dusts/certus_quartz", "ae2:certus_quartz_dust"); - event.remove("forge:dusts/fluix", "ae2:fluix_dust"); - event.remove("forge:silicon", "ae2:silicon"); - - event.add("forge:silicon", "gtceu:silicon_plate"); -}); +ServerEvents.tags("item", (event) => { + event.remove("forge:dusts/ender_pearl", "ae2:ender_dust"); + event.remove("forge:dusts/certus_quartz", "ae2:certus_quartz_dust"); + event.remove("forge:dusts/fluix", "ae2:fluix_dust"); + event.remove("forge:silicon", "ae2:silicon"); + + event.add("forge:silicon", "gtceu:silicon_plate"); +}); diff --git a/kubejs/server_scripts/tags/gregtech.js b/kubejs/server_scripts/tags/gregtech.js index 4e37a41..5086d76 100644 --- a/kubejs/server_scripts/tags/gregtech.js +++ b/kubejs/server_scripts/tags/gregtech.js @@ -1,4 +1,4 @@ -ServerEvents.tags("item", (event) => { - event.add("forge:rods/long/hsla", "kubejs:hsla_steel_long_rod"); - event.add("forge:springs/hsla", "kubejs:hsla_steel_spring"); -}); +ServerEvents.tags("item", (event) => { + event.add("forge:rods/long/hsla", "kubejs:hsla_steel_long_rod"); + event.add("forge:springs/hsla", "kubejs:hsla_steel_spring"); +}); diff --git a/kubejs/server_scripts/tags/items.js b/kubejs/server_scripts/tags/items.js index cbc428c..242e8e0 100644 --- a/kubejs/server_scripts/tags/items.js +++ b/kubejs/server_scripts/tags/items.js @@ -1,12 +1,12 @@ -ServerEvents.tags("item", (event) => { - event.add("forge:meat", "minecraft:chicken"); - event.add("forge:meat", "minecraft:cooked_chicken"); - event.add("forge:meat", "minecraft:beef"); - event.add("forge:meat", "minecraft:cooked_beef"); - event.add("forge:meat", "minecraft:porkchop"); - event.add("forge:meat", "minecraft:cooked_porkchop"); - event.add("forge:meat", "minecraft:mutton"); - event.add("forge:meat", "minecraft:cooked_mutton"); - event.add("forge:meat", "minecraft:rabbit"); - event.add("forge:meat", "minecraft:cooked_rabbit"); -}); +ServerEvents.tags("item", (event) => { + event.add("forge:meat", "minecraft:chicken"); + event.add("forge:meat", "minecraft:cooked_chicken"); + event.add("forge:meat", "minecraft:beef"); + event.add("forge:meat", "minecraft:cooked_beef"); + event.add("forge:meat", "minecraft:porkchop"); + event.add("forge:meat", "minecraft:cooked_porkchop"); + event.add("forge:meat", "minecraft:mutton"); + event.add("forge:meat", "minecraft:cooked_mutton"); + event.add("forge:meat", "minecraft:rabbit"); + event.add("forge:meat", "minecraft:cooked_rabbit"); +}); diff --git a/kubejs/server_scripts/tool_belt/recipes.js b/kubejs/server_scripts/tool_belt/recipes.js index a8303bd..14e5c74 100644 --- a/kubejs/server_scripts/tool_belt/recipes.js +++ b/kubejs/server_scripts/tool_belt/recipes.js @@ -1,15 +1,15 @@ -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", " "], { - G: "#forge:rings/gold", - L: "minecraft:leather", - S: "#forge:plates/steel", - }); -}); +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", " "], { + G: "#forge:rings/gold", + L: "minecraft:leather", + S: "#forge:plates/steel", + }); +}); diff --git a/kubejs/server_scripts/torchmaster.js b/kubejs/server_scripts/torchmaster.js index 507e5ec..5d9845a 100644 --- a/kubejs/server_scripts/torchmaster.js +++ b/kubejs/server_scripts/torchmaster.js @@ -1,39 +1,39 @@ -ServerEvents.recipes((event) => { - // Mega Torch - event.remove({ id: "torchmaster:megatorch" }); - event.shaped("torchmaster:megatorch", ["SDR", "IBD", "RIS"], { - S: "#forge:screws/iron", - D: "#forge:gems/diamond", - R: "#forge:rings/gold", - I: "minecraft:stick", - B: "#forge:storage_blocks/coke", - }); - - // Dread Lamp - event.remove({ id: "torchmaster:dreadlamp" }); - event.shaped("torchmaster:dreadlamp", ["PPP", "GLG", "PPP"], { - P: "#forge:plates/obsidian", - L: "minecraft:glowstone", - G: "#forge:glass_panes", - }); - - // Feral Flare Lantern - event.remove({ id: "torchmaster:feral_flare_lantern" }); - event.shaped("torchmaster:feral_flare_lantern", ["SPR", "INP", "RIS"], { - S: "#forge:screws/iron", - P: "#forge:plates/glowstone", - R: "#forge:rings/steel", - I: "#forge:rods/steel", - N: "#forge:springs/small/gold", - }); - - // Frozen Pearl - event.remove({ id: "torchmaster:frozen_pearl" }); - event.recipes.gtceu - .chemical_bath("frozen_pearl") - .itemInputs("minecraft:ender_pearl") - .inputFluids("gtceu:ice 1152") - .itemOutputs("torchmaster:frozen_pearl") - .duration(100) - .EUt(16); -}); +ServerEvents.recipes((event) => { + // Mega Torch + event.remove({ id: "torchmaster:megatorch" }); + event.shaped("torchmaster:megatorch", ["SDR", "IBD", "RIS"], { + S: "#forge:screws/iron", + D: "#forge:gems/diamond", + R: "#forge:rings/gold", + I: "minecraft:stick", + B: "#forge:storage_blocks/coke", + }); + + // Dread Lamp + event.remove({ id: "torchmaster:dreadlamp" }); + event.shaped("torchmaster:dreadlamp", ["PPP", "GLG", "PPP"], { + P: "#forge:plates/obsidian", + L: "minecraft:glowstone", + G: "#forge:glass_panes", + }); + + // Feral Flare Lantern + event.remove({ id: "torchmaster:feral_flare_lantern" }); + event.shaped("torchmaster:feral_flare_lantern", ["SPR", "INP", "RIS"], { + S: "#forge:screws/iron", + P: "#forge:plates/glowstone", + R: "#forge:rings/steel", + I: "#forge:rods/steel", + N: "#forge:springs/small/gold", + }); + + // Frozen Pearl + event.remove({ id: "torchmaster:frozen_pearl" }); + event.recipes.gtceu + .chemical_bath("frozen_pearl") + .itemInputs("minecraft:ender_pearl") + .inputFluids("gtceu:ice 1152") + .itemOutputs("torchmaster:frozen_pearl") + .duration(100) + .EUt(16); +}); diff --git a/kubejs/server_scripts/vanilla/loot_drops.js b/kubejs/server_scripts/vanilla/loot_drops.js index 2d8f496..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) => { - event - .addEntityLootModifier("minecraft:blaze") - .replaceLoot("minecraft:blaze_rod", "gtceu:sulfur_dust", true); - event - .addEntityLootModifier("minecraft:enderman") - .replaceLoot("minecraft:ender_pearl", "gtceu:ender_pearl_dust", true); -}); +LootJS.modifiers((event) => { + event + .addEntityLootModifier("minecraft:blaze") + .replaceLoot("minecraft:blaze_rod", "gtceu:sulfur_dust", true); + event + .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 cc75a96..5c44faf 100644 --- a/kubejs/server_scripts/vanilla/mob_drops.js +++ b/kubejs/server_scripts/vanilla/mob_drops.js @@ -1,131 +1,131 @@ -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" }); - - //Ghast Tear - greg - .chemical_reactor("gtceu:ghast_tear") - .itemInputs("#forge:tiny_dusts/potassium", "#forge:tiny_dusts/lithium") - .inputFluids("gtceu:salt_water 1000") - .itemOutputs("minecraft:ghast_tear") - .duration(400) - .EUt(30); - // Skeleton Skull - greg - .assembler("gtceu:skeleton_skull") - .itemInputs("minecraft:bone") - .itemOutputs("skeleton_skull") - .duration(100) - .EUt(4); - // Bones - greg - .extractor("gtceu:bones") - .itemInputs("#minecraft:dirt") - .itemOutputs("bone") - .duration(100) - .EUt(16); - - // Prismarine - 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") - .inputFluids("gtceu:distilled_water 100") - .itemOutputs("prismarine_shard") - .duration(600) - .EUt(24); - greg - .macerator("gtceu:prismarine_crushed") - .itemInputs("minecraft:prismarine_shard") - .itemOutputs("prismarine_crystals") - .duration(120) - .EUt(2); - - // Slimeballs - 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") - .itemInputs("slime_ball") - .outputFluids("gtceu:glue 250") - .itemOutputs("#forge:dusts/asbestos") - .duration(200) - .EUt(24); - - // Sponge - 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", - ] - ); - - // XP - greg - .large_chemical_reactor("gtceu:bottle_o_enchanting") - .itemInputs( - "glass_bottle", - "#forge:tiny_dusts/gold", - "#forge:tiny_dusts/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); - - // Netherite - greg - .alloy_smelter("gtceu:better_netherite") - .itemInputs("2x netherite_scrap", "2x #forge:ingots/gold") - .itemOutputs("1x netherite_ingot") - .duration(150) - .EUt(100); -}); +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" }); + + //Ghast Tear + greg + .chemical_reactor("gtceu:ghast_tear") + .itemInputs("#forge:tiny_dusts/potassium", "#forge:tiny_dusts/lithium") + .inputFluids("gtceu:salt_water 1000") + .itemOutputs("minecraft:ghast_tear") + .duration(400) + .EUt(30); + // Skeleton Skull + greg + .assembler("gtceu:skeleton_skull") + .itemInputs("minecraft:bone") + .itemOutputs("skeleton_skull") + .duration(100) + .EUt(4); + // Bones + greg + .extractor("gtceu:bones") + .itemInputs("#minecraft:dirt") + .itemOutputs("bone") + .duration(100) + .EUt(16); + + // Prismarine + 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") + .inputFluids("gtceu:distilled_water 100") + .itemOutputs("prismarine_shard") + .duration(600) + .EUt(24); + greg + .macerator("gtceu:prismarine_crushed") + .itemInputs("minecraft:prismarine_shard") + .itemOutputs("prismarine_crystals") + .duration(120) + .EUt(2); + + // Slimeballs + 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") + .itemInputs("slime_ball") + .outputFluids("gtceu:glue 250") + .itemOutputs("#forge:dusts/asbestos") + .duration(200) + .EUt(24); + + // Sponge + 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", + ] + ); + + // XP + greg + .large_chemical_reactor("gtceu:bottle_o_enchanting") + .itemInputs( + "glass_bottle", + "#forge:tiny_dusts/gold", + "#forge:tiny_dusts/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); + + // Netherite + 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 e65b6ce..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); - GTMaterials.HSLASteel.addFlags(GTMaterialFlags.GENERATE_LONG_ROD); - GTMaterials.Iridium.addFlags(GTMaterialFlags.GENERATE_FRAME); - GTMaterials.Cobalt.addFlags(GTMaterialFlags.GENERATE_FINE_WIRE); -}); +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/icons.js b/kubejs/startup_scripts/icons.js index 223381c..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"); -}); - -Platform.mods.kubejs.name = "GregTech Community Pack"; +StartupEvents.registry("item", (event) => { + event.create("greg_icon"); +}); + +Platform.mods.kubejs.name = "GregTech Community Pack"; diff --git a/kubejs/startup_scripts/machinery/greenhouse.js b/kubejs/startup_scripts/machinery/greenhouse.js index 6d0b2d5..fbf896b 100644 --- a/kubejs/startup_scripts/machinery/greenhouse.js +++ b/kubejs/startup_scripts/machinery/greenhouse.js @@ -1,36 +1,36 @@ -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 - ); -}); +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 413fc30..4fb4841 100644 --- a/kubejs/startup_scripts/material_testing/material.js +++ b/kubejs/startup_scripts/material_testing/material.js @@ -1,18 +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); - - /* - event - .create("netherite") - .components("1x gold", "1x tungsten", "1x platinum") - .color(0x4d494d) - .iconSet(GTMaterialIconSet.METALLIC) - .flags(GTMaterialFlags.GENERATE_PLATE); - */ -}); +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 b08a75d..aecd1ee 100644 --- a/kubejs/startup_scripts/recipes/greenhouse.js +++ b/kubejs/startup_scripts/recipes/greenhouse.js @@ -1,10 +1,10 @@ -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); -}); +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); +});