From 34277157aea7ce5f9a3056acfe07ce3aa3dbca77 Mon Sep 17 00:00:00 2001 From: FriendlyCube Date: Wed, 6 Dec 2023 15:31:55 +0200 Subject: [PATCH] =?UTF-8?q?=D1=87=D1=83=D1=82=D0=BE=D1=87=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B3*=D0=B2=D0=BD=D0=BE=D0=BA=D0=BE=D0=B4=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit главное признать свои ошибки --- .../textures/item/certus_quartz_rod.png | Bin 0 -> 195 bytes .../textures/item/nether_quartz_rod.png | Bin 0 -> 195 bytes kubejs/server_scripts/ae2/recipes.js | 46 ++++++++++++++++-- kubejs/server_scripts/ae2/tags.js | 10 ++++ kubejs/server_scripts/main_server_script.js | 1 + kubejs/startup_scripts/ae2/fluid.js | 9 ++++ kubejs/startup_scripts/ae2/items.js | 12 +++++ kubejs/startup_scripts/main_startup_script.js | 8 +++ 8 files changed, 82 insertions(+), 4 deletions(-) create mode 100644 kubejs/assets/kubejs/textures/item/certus_quartz_rod.png create mode 100644 kubejs/assets/kubejs/textures/item/nether_quartz_rod.png create mode 100644 kubejs/server_scripts/ae2/tags.js create mode 100644 kubejs/startup_scripts/ae2/fluid.js create mode 100644 kubejs/startup_scripts/ae2/items.js diff --git a/kubejs/assets/kubejs/textures/item/certus_quartz_rod.png b/kubejs/assets/kubejs/textures/item/certus_quartz_rod.png new file mode 100644 index 0000000000000000000000000000000000000000..2871bec935e44a6004216a9aaff875a50d0ac128 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z)(R0gxzon{Qv&$>u9oKI_F6WAoVp7F?yp34kLxyP~?G|iGF x9Qx9xw3w8?`}JRe@rjF*kDIcV;zMH&2A9|fL1j(t5C#SY22WQ%mvv4FO#r;&M5h1% literal 0 HcmV?d00001 diff --git a/kubejs/assets/kubejs/textures/item/nether_quartz_rod.png b/kubejs/assets/kubejs/textures/item/nether_quartz_rod.png new file mode 100644 index 0000000000000000000000000000000000000000..9feeaf7d38fd9af69a33c4168436aa1c2c1b7e09 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s77>k44ofy`glX=O&z)a zLuOcTP|}S}>HIg+B5nw#GMLToG-H^4) { .circuit(1) .duration(20) .EUt(480) + event.recipes.gtceu.assembler('fluix_glass_cable_fluixfluid') + .itemInputs( + '2x #forge:rods/aluminium', + '3x ae2:quartz_fiber',) + .inputFluids(Fluid.of('kubejs:fluix', 144)) + .itemOutputs('ae2:fluix_glass_cable') + .circuit(1) + .duration(20) + .EUt(480) //covered cable event.recipes.gtceu.assembler('fluix_covered_cable_rubber') @@ -1896,12 +1905,18 @@ const registerAE2Recipes = (event) => { //wiremill // Quartz Fiber - event.recipes.gtceu.wiremill('ae2:quartz_fiber') + event.recipes.gtceu.wiremill('ae2:quartz_fiber_certus') .itemInputs( - '#forge:plates/certus_quartz') + '#forge:rods/certus_quartz') .itemOutputs('ae2:quartz_fiber') - .duration(20) - .EUt(480) + .duration(200) + .EUt(7) + event.recipes.gtceu.wiremill('ae2:quartz_fiber_nether') + .itemInputs( + '#forge:rods/nether_quartz') + .itemOutputs('ae2:quartz_fiber') + .duration(200) + .EUt(7) //alloy smelter @@ -2377,5 +2392,28 @@ const registerAE2Recipes = (event) => { .duration(700) .EUt(8300) .cleanroom(CleanroomType.CLEANROOM) + + //chemical reactor + event.recipes.gtceu.chemical_reactor('ae2:fluix_pearl') + .itemInputs( + '4x #forge:gems/fluix') + .inputFluids(Fluid.of('kubejs:fluix', 576)) + .itemOutputs( + 'ae2:fluix_pearl') + .duration(200) + .EUt(480) + .cleanroom(CleanroomType.CLEANROOM) + + //lathe + //certus quartz rod + event.recipes.gtceu.lathe('kubejs:certus_quartz_to_rod') + .itemInputs( + 'gtceu:certus_quartz_gem') + .itemOutputs( + '2x kubejs:rods/certus_quartz') + .duration(40) + .EUt(16) + + } diff --git a/kubejs/server_scripts/ae2/tags.js b/kubejs/server_scripts/ae2/tags.js new file mode 100644 index 000000000..af000bbe8 --- /dev/null +++ b/kubejs/server_scripts/ae2/tags.js @@ -0,0 +1,10 @@ +// priority: 0 + +const registerAE2Tags = (event) => { + //certus_quartz + event.add('forge:rods/certus_quartz', 'kubejs:rods/certus_quartz'); + event.add('forge:rods', 'kubejs:rods/certus_quartz'); + //nether_quartz + event.add('forge:rods/nether_quartz', 'kubejs:rods/nether_quartz'); + event.add('forge:rods', 'kubejs:rods/nether_quartz'); +} diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 7ed3c6e45..2ccd9eea3 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -7,6 +7,7 @@ ServerEvents.tags('item', event => { registerMinecraftItemTags(event) registerTFCItemTags(event) registerCreateTags(event) + registerAE2Tags(event) }) /** diff --git a/kubejs/startup_scripts/ae2/fluid.js b/kubejs/startup_scripts/ae2/fluid.js new file mode 100644 index 000000000..3b1c66791 --- /dev/null +++ b/kubejs/startup_scripts/ae2/fluid.js @@ -0,0 +1,9 @@ +// priority: 0 + +const registerAE2Liquids = (event) => { + event.create('fluix') + .displayName('Liquid Fluix') + .thickTexture(0x57448d) + .bucketColor(0x46396d) + .noBlock() +}; \ No newline at end of file diff --git a/kubejs/startup_scripts/ae2/items.js b/kubejs/startup_scripts/ae2/items.js new file mode 100644 index 000000000..f38399036 --- /dev/null +++ b/kubejs/startup_scripts/ae2/items.js @@ -0,0 +1,12 @@ +// priority: 0 + +const registerAE2Items = (event) => { + event.create('rods/certus_quartz') + .displayName('Certus Quartz Rod') + .maxStackSize(32) + .texture("kubejs:item/certus_quartz_rod"); + event.create('rods/nether_quartz') + .displayName('Nether Quartz Rod') + .maxStackSize(32) + .texture("kubejs:item/nether_quartz_rod") +}; \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 29072eab9..0b002f8b9 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -5,6 +5,7 @@ */ StartupEvents.registry('item', (event) => { registerCreateItems(event); + registerAE2Items(event); }) /** @@ -12,4 +13,11 @@ StartupEvents.registry('item', (event) => { */ StartupEvents.registry('block', (event) => { +}) + +/** + * Событие регистрации жидкостей. + */ +StartupEvents.registry('fluid', (event) => { + registerAE2Liquids(event); }) \ No newline at end of file