diff --git a/kubejs/server_scripts/appliedenergistics2/ae2.js b/kubejs/server_scripts/appliedenergistics2/ae2.js index b38c24f..ad6d9d7 100644 --- a/kubejs/server_scripts/appliedenergistics2/ae2.js +++ b/kubejs/server_scripts/appliedenergistics2/ae2.js @@ -77,7 +77,7 @@ ServerEvents.recipes((event) => { P: "#forge:plates/steel", E: "ae2:engineering_processor", K: "ae2:fluix_glass_cable", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", }); // ME Chest @@ -86,7 +86,7 @@ ServerEvents.recipes((event) => { G: "ae2:quartz_glass", T: "ae2:terminal", K: "ae2:fluix_glass_cable", - C: "#forge:circuits/ulv", + C: "#gtceu:circuits/ulv", P: "#forge:plates/steel", F: "#forge:gems/fluix", }); @@ -118,7 +118,7 @@ ServerEvents.recipes((event) => { event.shaped("ae2:condenser", ["PCP", "CHC", "PCP"], { P: "#forge:plates/stainless_steel", C: "gtceu:hv_electric_piston", - H: "#forge:circuits/hv", + H: "#gtceu:circuits/hv", }); // Energy Acceptor @@ -153,7 +153,7 @@ ServerEvents.recipes((event) => { P: "#forge:plates/aluminium", C: "ae2:calculation_processor", K: "ae2:fluix_glass_cable", - M: "#forge:circuits/mv", + M: "#gtceu:circuits/mv", L: "ae2:logic_processor", }); @@ -190,7 +190,7 @@ ServerEvents.recipes((event) => { ' ' ] , { E: "ae2:engineering_processor", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", W: "#forge:fine_wires/gold", P: "#forge:plates/iron" }) @@ -200,7 +200,7 @@ ServerEvents.recipes((event) => { event.remove({ id: "ae2:tools/network_memory_card" }); event.shaped("ae2:memory_card", ["EC ", "WP ", " "], { E: "ae2:calculation_processor", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", W: "#forge:fine_wires/gold", P: "#forge:plates/iron", }); @@ -210,7 +210,7 @@ ServerEvents.recipes((event) => { event.shaped("ae2:network_tool", ["wC ", "EP ", " "], { w: "#forge:tools/wrenches", E: "ae2:calculation_processor", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", P: "#ae2:illuminated_panel", }); @@ -248,7 +248,7 @@ ServerEvents.recipes((event) => { // Wireless Receiver event.remove({ id: "ae2:network/wireless_part" }); event.shaped("ae2:wireless_receiver", ["CPC", "RSR", " "], { - C: "#forge:circuits/ev", + C: "#gtceu:circuits/ev", P: "ae2:fluix_pearl", R: "#forge:rods/titanium", S: "gtceu:hv_sensor", @@ -257,14 +257,14 @@ ServerEvents.recipes((event) => { // Annihilation Core event.remove({ id: "ae2:materials/annihilationcore" }); event.shaped("ae2:annihilation_core", ["CPB"], { - C: "#forge:circuits/ulv", + C: "#gtceu: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", + C: "#gtceu:circuits/ulv", P: "ae2:logic_processor", B: "#forge:dusts/certus_quartz", }); @@ -301,7 +301,7 @@ ServerEvents.recipes((event) => { W: "#forge:fine_wires/copper", G: "#forge:plates/glass", T: "#forge:fine_wires/tin", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", V: "ae2:quartz_vibrant_glass", }); diff --git a/kubejs/server_scripts/appliedenergistics2/cables.js b/kubejs/server_scripts/appliedenergistics2/cables.js index 4ba5817..cc0926a 100644 --- a/kubejs/server_scripts/appliedenergistics2/cables.js +++ b/kubejs/server_scripts/appliedenergistics2/cables.js @@ -77,4 +77,29 @@ ServerEvents.recipes((event) => { .itemOutputs("ae2:fluix_covered_cable") .duration(150) .EUt(8); + + event.remove({ id: "ae2:network/cables/smart_fluix" }); + event.recipes.gtceu + .assembler("gtceu:smart_cable") + .itemInputs("8x ae2:fluix_covered_cable", "#gtceu:circuits/lv") + .itemOutputs("8x ae2:fluix_smart_cable") + .duration(200) + .EUt(8); + + event.remove({ id: "ae2:network/cables/dense_covered_fluix" }); + event.recipes.gtceu + .compressor("gtceu:dense_cable") + .itemInputs("4x ae2:fluix_covered_cable") + .itemOutputs("ae2:fluix_covered_dense_cable") + .duration(400) + .EUt(2); + + event.remove({ id: "ae2:network/cables/dense_smart_fluix" }); + event.remove({ id: "ae2:network/cables/dense_smart_from_smart" }); + event.recipes.gtceu + .assembler("gtceu:smart_dense") + .itemInputs("8x ae2:fluix_covered_dense_cable", "#gtceu:circuits/mv") + .itemOutputs("8x ae2:fluix_smart_dense_cable") + .duration(200) + .EUt(8); }); diff --git a/kubejs/server_scripts/appliedenergistics2/cards.js b/kubejs/server_scripts/appliedenergistics2/cards.js index 7e4645e..89e8f0f 100644 --- a/kubejs/server_scripts/appliedenergistics2/cards.js +++ b/kubejs/server_scripts/appliedenergistics2/cards.js @@ -5,14 +5,14 @@ ServerEvents.recipes((event) => { W: "#forge:fine_wires/red_alloy", P: "#forge:plates/stainless_steel", A: "ae2:engineering_processor", - C: "#forge:circuits/hv", + C: "#gtceu: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", + "#gtceu:circuits/ulv", ]); // Inverter Card event.remove({ id: "ae2:materials/cardinverter" }); @@ -24,13 +24,13 @@ ServerEvents.recipes((event) => { event.remove({ id: "ae2:materials/cardspeed" }); event.shapeless("ae2:speed_card", [ "ae2:advanced_card", - "#forge:circuits/mv", + "#gtceu:circuits/mv", ]); // Energy Card event.remove({ id: "ae2:materials/cardenergy" }); event.shapeless("ae2:energy_card", [ "ae2:advanced_card", - "#forge:batteries/mv", + "#gtceu:batteries/mv", ]); // Basic Card @@ -39,20 +39,20 @@ ServerEvents.recipes((event) => { W: "#forge:fine_wires/red_alloy", P: "#forge:plates/aluminium", A: "ae2:engineering_processor", - C: "#forge:circuits/mv", + C: "#gtceu: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", + "#gtceu:circuits/lv", ]); // Crafting Card event.remove({ id: "ae2:materials/cardcrafting" }); event.shapeless("ae2:crafting_card", [ "ae2:basic_card", - "#forge:circuits/mv", + "#gtceu:circuits/mv", ]); // Redstone Card event.remove({ id: "ae2:materials/cardredstone" }); diff --git a/kubejs/server_scripts/appliedenergistics2/cells.js b/kubejs/server_scripts/appliedenergistics2/cells.js index bf35505..11f9ef8 100644 --- a/kubejs/server_scripts/appliedenergistics2/cells.js +++ b/kubejs/server_scripts/appliedenergistics2/cells.js @@ -43,7 +43,7 @@ ServerEvents.recipes((event) => { G: "ae2:quartz_glass", P: "#forge:plates/steel", W: "#forge:fine_wires/red_alloy", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", }); //Fluid Storage Housing @@ -52,6 +52,6 @@ ServerEvents.recipes((event) => { G: "ae2:quartz_glass", P: "#forge:plates/ruby", W: "gtceu:simple_soc", - C: "#forge:circuits/ev", + C: "#gtceu:circuits/ev", }); }); diff --git a/kubejs/server_scripts/appliedenergistics2/circuitry.js b/kubejs/server_scripts/appliedenergistics2/circuitry.js index ec2d507..2382ad5 100644 --- a/kubejs/server_scripts/appliedenergistics2/circuitry.js +++ b/kubejs/server_scripts/appliedenergistics2/circuitry.js @@ -7,7 +7,7 @@ ServerEvents.recipes((event) => { .itemInputs( "ae2:printed_logic_processor", "ae2:printed_silicon", - "#forge:circuits/lv", + "#gtceu:circuits/lv", "#gtceu:resistors", "2x #forge:fine_wires/tin" ) @@ -21,7 +21,7 @@ ServerEvents.recipes((event) => { .itemInputs( "ae2:printed_engineering_processor", "ae2:printed_silicon", - "#forge:circuits/lv", + "#gtceu:circuits/lv", "#gtceu:resistors", "2x #forge:fine_wires/tin" ) @@ -35,7 +35,7 @@ ServerEvents.recipes((event) => { .itemInputs( "ae2:printed_calculation_processor", "ae2:printed_silicon", - "#forge:circuits/lv", + "#gtceu:circuits/lv", "#gtceu:resistors", "2x #forge:fine_wires/tin" ) diff --git a/kubejs/server_scripts/appliedenergistics2/patterns.js b/kubejs/server_scripts/appliedenergistics2/patterns.js index 96eae61..5efdd45 100644 --- a/kubejs/server_scripts/appliedenergistics2/patterns.js +++ b/kubejs/server_scripts/appliedenergistics2/patterns.js @@ -8,7 +8,7 @@ ServerEvents.recipes((event) => { "3x #forge:plates/steel", "2x #forge:plates/polyethylene", "4x #forge:fine_wires/red_alloy", - "#forge:circuits/mv" + "#gtceu:circuits/mv" ) .itemOutputs("ae2:blank_pattern") .duration(200) @@ -20,7 +20,7 @@ ServerEvents.recipes((event) => { "3x #forge:plates/steel", "2x #forge:plates/polyvinyl_chloride", "4x #forge:fine_wires/red_alloy", - "#forge:circuits/mv" + "#gtceu:circuits/mv" ) .itemOutputs("4x ae2:blank_pattern") .duration(200) @@ -32,7 +32,7 @@ ServerEvents.recipes((event) => { "3x #forge:plates/steel", "2x #forge:plates/polytetrafluoroethylene", "4x #forge:fine_wires/red_alloy", - "#forge:circuits/mv" + "#gtceu:circuits/mv" ) .itemOutputs("16x ae2:blank_pattern") .duration(200) @@ -44,7 +44,7 @@ ServerEvents.recipes((event) => { "3x #forge:plates/steel", "2x #forge:plates/polybenzimidazole", "4x #forge:fine_wires/red_alloy", - "#forge:circuits/mv" + "#gtceu:circuits/mv" ) .itemOutputs("64x ae2:blank_pattern") .duration(200) diff --git a/kubejs/server_scripts/appliedenergistics2/portable_cells.js b/kubejs/server_scripts/appliedenergistics2/portable_cells.js index 2f52819..848dbc6 100644 --- a/kubejs/server_scripts/appliedenergistics2/portable_cells.js +++ b/kubejs/server_scripts/appliedenergistics2/portable_cells.js @@ -7,7 +7,7 @@ ServerEvents.recipes((event) => { { B: "#forge:bolts/red_alloy", G: "minecraft:glass", - C: "#forge:circuits/ulv", + C: "#gtceu:circuits/ulv", H: "#forge:chests/wooden", P: "#forge:plates/wrought_iron", W: "gtceu:red_alloy_single_cable", @@ -17,7 +17,7 @@ ServerEvents.recipes((event) => { event.shaped("ae2:portable_item_cell_4k", ["BGB", "CHC", "PWP"], { B: "#forge:bolts/invar", G: "ae2:quartz_glass", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", H: "gtceu:steel_crate", P: "#forge:plates/black_steel", W: "gtceu:tin_single_cable", @@ -26,7 +26,7 @@ ServerEvents.recipes((event) => { event.shaped("ae2:portable_item_cell_16k", ["BGB", "CHC", "PWP"], { B: "#forge:bolts/rose_gold", G: "gtceu:tempered_glass", - C: "#forge:circuits/mv", + C: "#gtceu:circuits/mv", H: "gtceu:aluminium_crate", P: "#forge:plates/vanadium_steel", W: "gtceu:annealed_copper_single_cable", @@ -35,7 +35,7 @@ ServerEvents.recipes((event) => { event.shaped("ae2:portable_item_cell_64k", ["BGB", "CHC", "PWP"], { B: "#forge:bolts/blue_alloy", G: "gtceu:cleanroom_glass", - C: "#forge:circuits/hv", + C: "#gtceu:circuits/hv", H: "gtceu:stainless_steel_crate", P: "#forge:plates/blue_steel", W: "gtceu:kanthal_single_cable", @@ -44,7 +44,7 @@ ServerEvents.recipes((event) => { event.shaped("ae2:portable_item_cell_256k", ["BGB", "CHC", "PWP"], { B: "#forge:bolts/platinum", G: "gtceu:laminated_glass", - C: "#forge:circuits/ev", + C: "#gtceu:circuits/ev", H: "gtceu:titanium_crate", P: "#forge:plates/tungsten", W: "gtceu:black_steel_single_cable", diff --git a/kubejs/server_scripts/appliedenergistics2/storage_parts.js b/kubejs/server_scripts/appliedenergistics2/storage_parts.js index b9589bb..f6d0810 100644 --- a/kubejs/server_scripts/appliedenergistics2/storage_parts.js +++ b/kubejs/server_scripts/appliedenergistics2/storage_parts.js @@ -7,7 +7,7 @@ ServerEvents.recipes((event) => { .itemInputs( "gtceu:cpu_chip", "#forge:plates/certus_quartz", - "#forge:circuits/lv" + "#gtceu:circuits/lv" ) .itemOutputs("ae2:cell_component_1k") .duration(200) @@ -17,7 +17,7 @@ ServerEvents.recipes((event) => { .itemInputs( "16x #gtceu:resistors", "#forge:plates/certus_quartz", - "2x #forge:circuits/lv" + "2x #gtceu:circuits/lv" ) .inputFluids("gtceu:red_alloy 288") .itemOutputs("ae2:cell_component_1k") @@ -31,7 +31,7 @@ ServerEvents.recipes((event) => { .itemInputs( "gtceu:ram_chip", "3x ae2:cell_component_1k", - "#forge:circuits/mv" + "#gtceu:circuits/mv" ) .itemOutputs("ae2:cell_component_4k") .duration(200) @@ -44,7 +44,7 @@ ServerEvents.recipes((event) => { .itemInputs( "gtceu:ulpic_chip", "3x ae2:cell_component_4k", - "#forge:circuits/hv" + "#gtceu:circuits/hv" ) .itemOutputs("ae2:cell_component_16k") .duration(200) @@ -57,7 +57,7 @@ ServerEvents.recipes((event) => { .itemInputs( "gtceu:lpic_chip", "3x ae2:cell_component_16k", - "#forge:circuits/ev" + "#gtceu:circuits/ev" ) .itemOutputs("ae2:cell_component_64k") .duration(200) @@ -70,7 +70,7 @@ ServerEvents.recipes((event) => { .itemInputs( "gtceu:qbit_cpu_chip", "3x ae2:cell_component_64k", - "#forge:circuits/iv" + "#gtceu:circuits/iv" ) .itemOutputs("ae2:cell_component_256k") .duration(200) diff --git a/kubejs/server_scripts/appliedenergistics2/terminals.js b/kubejs/server_scripts/appliedenergistics2/terminals.js index b47a13d..98b8489 100644 --- a/kubejs/server_scripts/appliedenergistics2/terminals.js +++ b/kubejs/server_scripts/appliedenergistics2/terminals.js @@ -5,7 +5,7 @@ ServerEvents.recipes((event) => { w: "#forge:tools/wrenches", R: "ae2:wireless_receiver", d: "#forge:tools/screwdrivers", - C: "#forge:circuits/hv", + C: "#gtceu:circuits/hv", T: "ae2:terminal", K: "ae2:fluix_glass_cable", L: "gtceu:lapotron_crystal", @@ -66,11 +66,11 @@ ServerEvents.recipes((event) => { event.remove({ id: "ae2:network/parts/terminals" }); event.shaped("ae2:terminal", ["BCB", "xPd", "CDC"], { B: "#forge:bolts/tin_alloy", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", x: "#forge:tools/wire_cutters", P: "ae2:semi_dark_monitor", d: "#forge:tools/screwdrivers", - D: "#forge:plates/double/steel", + D: "#forge:double_plates/steel", }); event.shaped("ae2:terminal", ["PB ", "Cd "], { B: "ae2:calculation_processor", diff --git a/kubejs/server_scripts/building_gadgets/gadgets.js b/kubejs/server_scripts/building_gadgets/gadgets.js index 1ac4d0c..a129fcf 100644 --- a/kubejs/server_scripts/building_gadgets/gadgets.js +++ b/kubejs/server_scripts/building_gadgets/gadgets.js @@ -5,7 +5,7 @@ ServerEvents.recipes((event) => { P: "#forge:plates/steel", L: "#forge:plates/lapis", D: "#forge:plates/diamond", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", K: "gtceu:tin_single_cable", }); // Exchanging Tool @@ -14,7 +14,7 @@ ServerEvents.recipes((event) => { P: "#forge:plates/steel", L: "#forge:plates/gold", D: "#forge:plates/diamond", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", K: "gtceu:tin_single_cable", }); // Copy-paste Tool @@ -23,7 +23,7 @@ ServerEvents.recipes((event) => { P: "#forge:plates/steel", L: "#forge:plates/redstone", D: "#forge:plates/emerald", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", K: "gtceu:tin_single_cable", }); @@ -31,7 +31,7 @@ ServerEvents.recipes((event) => { event.remove({ output: "buildinggadgets2:template_manager" }); event.shaped("buildinggadgets2:template_manager", ["KCK", "CHC", "KCK"], { K: "gtceu:tin_single_cable", - C: "#forge:circuits/lv", + C: "#gtceu:circuits/lv", H: "gtceu:lv_machine_hull", }); @@ -41,7 +41,7 @@ ServerEvents.recipes((event) => { P: "#forge:plates/aluminium", L: "#forge:plates/nether_quartz", D: "#forge:plates/ender_pearl", - C: "#forge:circuits/mv", + C: "#gtceu:circuits/mv", K: "gtceu:copper_single_cable", }); @@ -51,7 +51,7 @@ ServerEvents.recipes((event) => { P: "#forge:plates/aluminium", L: "#forge:plates/lapis", D: "gtceu:iron_buzz_saw_blade", - C: "#forge:circuits/mv", + C: "#gtceu:circuits/mv", K: "gtceu:copper_single_cable", }); }); diff --git a/kubejs/server_scripts/gregtech/greenhouse.js b/kubejs/server_scripts/gregtech/greenhouse.js index 76874bd..3518538 100644 --- a/kubejs/server_scripts/gregtech/greenhouse.js +++ b/kubejs/server_scripts/gregtech/greenhouse.js @@ -29,7 +29,7 @@ ServerEvents.recipes((event) => { event.shaped("gtceu:greenhouse", ["GGG", "CHC", "PUP"], { G: "gtceu:tempered_glass", - C: "#forge:circuits/mv", + C: "#gtceu:circuits/mv", H: "gtceu:mv_machine_hull", P: "gtceu:mv_electric_piston", U: "gtceu:mv_electric_pump",