From fa51974bc631f89fbbbe08b5246811d33944fcaf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 11:56:16 +0000 Subject: [PATCH 01/43] Update constants.js Signed-off-by: Pyritie --- kubejs/startup_scripts/create_additions/constants.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index 940a5fd71..513b22446 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -33,12 +33,10 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:electrum_spool', 'createaddition:gold_spool', 'createaddition:biomass_pellet_block', - 'createaddition:electric_motor', - 'createaddition:alternator', 'createaddition:connector', 'createaddition:redstone_relay', 'createaddition:spool', 'createaddition:copper_spool', 'createaddition:festive_spool', 'createaddition:small_light_connector', -]; \ No newline at end of file +]; From 73096acc505d78ff84559ff28786769bce7cca00 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 12:14:06 +0000 Subject: [PATCH 02/43] Update recipes.js Signed-off-by: Pyritie --- .../create_additions/recipes.js | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 7aaca654a..f5e35bfdd 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -68,4 +68,30 @@ const registerCreateAdditionsRecipes = (event) => { .itemOutputs('4x createaddition:barbed_wire') .duration(200) .EUt(20) -} \ No newline at end of file + + // electric motor: EU to SU + event.shaped('createaddition:electric_motor', [ + 'CCC', + 'BAD', + 'CCC' + ], { + A: 'gtceu:mv_machine_casing', + B: 'create:rotation_speed_controller', + C: 'gtceu:manganese_phosphide_quadruple_wire', + D: 'gtceu:mv_electric_motor', + }).id('tfg:electric_motor_mv') + + // alternator: SU to EU + event.shaped('createaddition:alternator', [ + 'ABA', + 'CDC', + 'EFE' + ], { + A: '#gtceu:resistors', + B: '#gtceu:circuits/lv', + C: 'gtceu:lv_voltage_coil', + D: 'gtceu:mv_machine_casing', + E: 'gtceu:manganese_phosphide_quadruple_wire', + F: 'create:rotation_speed_controller' + }).id('tfg:alternator_mv') +} From 07261b3ae81a32bbf125ff117c7cfca2d1583caa Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 12:39:04 +0000 Subject: [PATCH 03/43] Update constants.js Signed-off-by: Pyritie --- kubejs/startup_scripts/create_additions/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index 513b22446..bc38875bb 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -34,7 +34,8 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:gold_spool', 'createaddition:biomass_pellet_block', 'createaddition:connector', - 'createaddition:redstone_relay', + 'createaddition:redstone_relay', + 'createaddition:alternator' 'createaddition:spool', 'createaddition:copper_spool', 'createaddition:festive_spool', From 9dcb74fe7e1d73ad21c8de14a72442242c76aaf1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 12:39:42 +0000 Subject: [PATCH 04/43] Update recipes.js Signed-off-by: Pyritie --- .../server_scripts/create_additions/recipes.js | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index f5e35bfdd..9a5dffe04 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -68,21 +68,9 @@ const registerCreateAdditionsRecipes = (event) => { .itemOutputs('4x createaddition:barbed_wire') .duration(200) .EUt(20) - - // electric motor: EU to SU - event.shaped('createaddition:electric_motor', [ - 'CCC', - 'BAD', - 'CCC' - ], { - A: 'gtceu:mv_machine_casing', - B: 'create:rotation_speed_controller', - C: 'gtceu:manganese_phosphide_quadruple_wire', - D: 'gtceu:mv_electric_motor', - }).id('tfg:electric_motor_mv') // alternator: SU to EU - event.shaped('createaddition:alternator', [ + event.shaped('createaddition:alternator', [ 'ABA', 'CDC', 'EFE' @@ -91,7 +79,7 @@ const registerCreateAdditionsRecipes = (event) => { B: '#gtceu:circuits/lv', C: 'gtceu:lv_voltage_coil', D: 'gtceu:mv_machine_casing', - E: 'gtceu:manganese_phosphide_quadruple_wire', + E: 'gtceu:manganese_phosphide_quadruple_wire', F: 'create:rotation_speed_controller' }).id('tfg:alternator_mv') } From e73f36391133ad1714fcc38200aeb94da3d58741 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 12:40:57 +0000 Subject: [PATCH 05/43] Update recipe_types.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/recipe_types.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index eb4144c95..76e61ec1c 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -7,13 +7,5 @@ const registerGTCEuRecipeTypes = (event) => { .setMaxIOSize(3, 4, 1, 0) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH) - - event.create('alternator') - .category('alternator') - .setEUIO('out') - .setMaxIOSize(1, 0, 0, 0) - .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) - .setSound(GTSoundEntries.ARC) - .setMaxTooltips(6) } From 9459b2088872cf0e8e2a137131e24f48a48a134a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 12:41:11 +0000 Subject: [PATCH 06/43] Update machines.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 0a415b613..a9ec614f2 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -23,25 +23,5 @@ const registerGTCEuMachines = (event) => { .build() ) .workableCasingRenderer('gtceu:block/casings/solid/machine_casing_solid_steel', 'gtceu:block/multiblock/implosion_compressor', false) - - event.create('alternator', 'multiblock') - .rotationState(RotationState.NON_Y_AXIS) - .recipeType('alternator') - .pattern(definition => FactoryBlockPattern.start() - .aisle("CWC", "CWC", "#W#") - .aisle("CWC", "K#E", "CWC") - .aisle("CWI", "CWA", "#W#") - .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks('gtceu:cupronickel_coil_block')) - .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) - .where('#', Predicates.any()) - .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1)) - .where('E', Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1)) - .where('I', Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1)) - .build() - ) - .workableCasingRenderer( - "gtceu:block/casings/solid/machine_casing_solid_steel", - "gtceu:block/multiblock/implosion_compressor", false - ) -} \ No newline at end of file + +} From 758f26b63bdf718faf84d8a0e6a48766bdd6a300 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 12:41:55 +0000 Subject: [PATCH 07/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/recipes.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index bf6547854..9797258a4 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1097,19 +1097,6 @@ const registerGTCEURecipes = (event) => { D: 'gtceu:solid_machine_casing' }).id('tfg:shaped/greenhouse') - // Контроллер электрического генератора - event.shaped('gtceu:alternator', [ - 'ABA', - 'CDC', - 'EBE' - ], { - A: '#gtceu:resistors', - B: '#gtceu:circuits/lv', - C: 'gtceu:lv_voltage_coil', - D: 'gtceu:solid_machine_casing', - E: 'gtceu:copper_single_cable' - }).id('tfg:shaped/alternator') - // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ 'AAA', From 226b746a07fbd0a71bee73423723380bba49abcf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 15:32:52 +0000 Subject: [PATCH 08/43] blaze burner model Signed-off-by: Pyritie --- .../models/block/blaze_burner/blaze_cage.obj | 40 +++++++++ .../block/blaze_burner/block_with_blaze.json | 85 ++++++++++++++++++ .../create/textures/block/blaze_active.png | Bin 0 -> 476 bytes .../textures/block/blaze_heater_brazier.png | Bin 0 -> 1749 bytes .../create/textures/block/blaze_idle.png | Bin 0 -> 476 bytes .../create/textures/block/blaze_inert.png | Bin 0 -> 476 bytes .../create/textures/block/blaze_super.png | Bin 0 -> 478 bytes .../textures/block/blaze_super_active.png | Bin 0 -> 478 bytes 8 files changed, 125 insertions(+) create mode 100644 kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj create mode 100644 kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json create mode 100644 kubejs/assets/create/textures/block/blaze_active.png create mode 100644 kubejs/assets/create/textures/block/blaze_heater_brazier.png create mode 100644 kubejs/assets/create/textures/block/blaze_idle.png create mode 100644 kubejs/assets/create/textures/block/blaze_inert.png create mode 100644 kubejs/assets/create/textures/block/blaze_super.png create mode 100644 kubejs/assets/create/textures/block/blaze_super_active.png diff --git a/kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj b/kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj new file mode 100644 index 000000000..d510a8968 --- /dev/null +++ b/kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj @@ -0,0 +1,40 @@ +# Blender v2.93.0 OBJ File: '' +# www.blender.org +mtllib blaze_cage.mtl +o cube +v 0.062500 -0.000000 0.937500 +v 0.062500 0.875000 0.937500 +v 0.062500 -0.000000 0.062500 +v 0.062500 0.875000 0.062500 +v 0.937500 -0.000000 0.937500 +v 0.937500 0.875000 0.937500 +v 0.937500 -0.000000 0.062500 +v 0.937500 0.875000 0.062500 +vt 0.375000 0.000000 +vt 0.625000 0.000000 +vt 0.625000 0.250000 +vt 0.375000 0.250000 +vt 0.625000 0.500000 +vt 0.375000 0.500000 +vt 0.625000 0.750000 +vt 0.375000 0.750000 +vt 0.625000 1.000000 +vt 0.375000 1.000000 +vt 0.125000 0.500000 +vt 0.125000 0.750000 +vt 0.875000 0.500000 +vt 0.875000 0.750000 +vn -1.0000 0.0000 0.0000 +vn 0.0000 0.0000 -1.0000 +vn 1.0000 0.0000 0.0000 +vn 0.0000 0.0000 1.0000 +vn 0.0000 -1.0000 0.0000 +vn 0.0000 1.0000 0.0000 +usemtl m_0 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 8/5/2 7/6/2 +f 7/6/3 8/5/3 6/7/3 5/8/3 +f 5/8/4 6/7/4 2/9/4 1/10/4 +f 3/11/5 7/6/5 5/8/5 1/12/5 +f 8/5/6 4/13/6 2/14/6 6/7/6 diff --git a/kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json b/kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json new file mode 100644 index 000000000..8b9daa724 --- /dev/null +++ b/kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json @@ -0,0 +1,85 @@ +{ + "parent": "block/cube", + "textures": { + "particle": "block/coal_block", + "all": "block/coal_block", + "bottom": "block/coal_block", + "top": "block/coal_block", + "side": "block/coal_block" + }, + "elements": [ + { + "from": [ + 1, + 1, + 1 + ], + "to": [ + 15, + 15, + 15 + ], + "faces": { + "down": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#bottom", + "cullface": "down" + }, + "up": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#top" + }, + "north": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#side", + "cullface": "north" + }, + "south": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#side", + "cullface": "south" + }, + "west": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#side", + "cullface": "west" + }, + "east": { + "uv": [ + 1, + 1, + 15, + 15 + ], + "texture": "#side", + "cullface": "east" + } + } + } + ] +} \ No newline at end of file diff --git a/kubejs/assets/create/textures/block/blaze_active.png b/kubejs/assets/create/textures/block/blaze_active.png new file mode 100644 index 0000000000000000000000000000000000000000..13e2153c7ce190d58a3e5f8931a7f49556e899ae GIT binary patch literal 476 zcmV<20VDp2P)Gq zgI@X=#2(j7eLgZ5rRDg#$ENC?PxWfOuj%Mcrc4cNox)R^ZWM)QghLxeUGa|afR>FX zg^z^2h8$4%TIq=zzbMYs_(QP~4bOsI^>k+%IMKjb*2oKw3w!dplJ<8VbrWZ*uo#g# zEOP{tFhK&iNl;>q97TLm3zAuLpa0jlz`A%e`RkN1#E~H@UazPn>6((77Cj|jj}2E5C8#k Sr4x1l0000r!Z3SBeK~Mw{J9}S^g!N7$BuFyL?EN@1=Q48!+_PytV>g8$lg(R^nXrFpdByL2 z!$T)M1R2nD+nigNj?!>^Kj2dJenj@}}Y);ch*p z#f6WBgO(gn_(tim3co5&R`^q~6^%@RTlMrOYdBWJddkWO4+{q}>4N@u9(9xUM0RmO zYM;!0Y$D7M#!rj_>!isuA~h?S)%S(UzIk%u(dBPa#1co6lz4-p7Nl!Jsv&wpzBEOZ z`~N&`V{Ek2y*&)gFOKsu2;My??K;lSiQ|+`!Sf7P*{VM$IZb?tzFXA-N8sCni|eWu z+lR|-=zTIZODjtrnQp^?_jBl2hORqkU9DvGx6aukL^tJ$ZsFh%hGf5Q?H4NGXdXqh zO$Pt~010qNS#tmY4#NNd4#NS*Z>VGd00j+6L_t(&L+x72P82~DZHy!^W)cu)fl;Fy z*DMT)d)9u1G0|`GD~#^go49geT(I#0$O1-4aArtYV4q@6=gduY4_#f?u%MF8^rO1^ zp1SA0s%D{ZXp4)BmmGFwWu-VjKMx1a(Rj^1OG`@yj-#Wah1}xY!GMpSJ_|>#24UF% zh5&Gmc7Js>fMq}4&-HyB=dQ<~6db>&r>Ef)I46+tWK!LWX*8!y0pPFiyE(@!ddtfd z6=SsI1ZY3pJ3BkeDhCD&6wTeBAr+n)q!yKu>uYN>+RZJC3q=6{f}{O8ISIc6tN@g% zq;hV6E*b>D)g3Jw!Q6p zk=~QQ>5Ot~(nW&+r~zJu25s3?i(awN1t6UYHA%3z587%XKze!sbn&7A$TU|KMOoz?d1tY?E3n%d9kts=ZJ^{nf%&CG1j7 zU_$Ar?D%TCvC=E1#zu-_5N7+-8q+WgrnX`Gp_&LbEBPoxf!d|5Ch&~5M}hgCbuM&H z)4gOTW8+d2Ws!=}t;ez#P82|s z4eD{Ntz#_Ou=VB|O4z3kTCpBQNcNGT{01KV7zD3zZl5IYQhR> z?NBL30d;nHe%)$9gSrCKCB|U)vZ&QWPdsbXpni}vL5!nqs1WK1XrH7buCG%~pr6{7 zr7fKr99UhbvViA08HNSgAHd-Q3ZCw}E`(S|MIbiovBGJF1hBMAn?5#`S#tr-WHM93 zSEHx42rgDh;MsMn37fGnYthhR^VX*I)a-i!0Mlh}Vsq<7P~_J0&Eo5~-H?B-57vsE zk00ilTlD!{4W^7r=cM%3bJ($ZW2GvC`6E^;OXK%jZw6FuDNL1t%LHt%E|osxBXZVh!7S zDVlTv*rl3y^yFbhPn-;=_LsT?<_0jen%MiXUny|8bTD0;+rn?^-ULAL&{gnMpe_Jy zV$KlJb#LPJ+c&Lox&idqoA^5#-3)+`0->U9HDRSkkk>YvT>XimO>=QFAxJyyO^ilY z`;Bdy3q@_VkL#4Z3C(K4q$OlDE*gwg6xXdLn2W~1aL2ff23-KsYueSZ*dnl<42^>p z$c@Qlx>OU)J7ZdEdRC`ZmwFJpQp`bhWlqZ?3Z&~iO)J!GXsLZ&DB7i(NCi^&o{JZ~ z{ioA(x^MsKl!31<6op)=)kFqNGeful^r|LOz`FtTs3vXAz!swPqZ{TB^(sU~uO(lP!4%Y-LjxVyVu00000NkvXXu0mjfox(R1 literal 0 HcmV?d00001 diff --git a/kubejs/assets/create/textures/block/blaze_idle.png b/kubejs/assets/create/textures/block/blaze_idle.png new file mode 100644 index 0000000000000000000000000000000000000000..13e2153c7ce190d58a3e5f8931a7f49556e899ae GIT binary patch literal 476 zcmV<20VDp2P)Gq zgI@X=#2(j7eLgZ5rRDg#$ENC?PxWfOuj%Mcrc4cNox)R^ZWM)QghLxeUGa|afR>FX zg^z^2h8$4%TIq=zzbMYs_(QP~4bOsI^>k+%IMKjb*2oKw3w!dplJ<8VbrWZ*uo#g# zEOP{tFhK&iNl;>q97TLm3zAuLpa0jlz`A%e`RkN1#E~H@UazPn>6((77Cj|jj}2E5C8#k Sr4x1l0000Gq zgI@X=#2(j7eLgZ5rRDg#$ENC?PxWfOuj%Mcrc4cNox)R^ZWM)QghLxeUGa|afR>FX zg^z^2h8$4%TIq=zzbMYs_(QP~4bOsI^>k+%IMKjb*2oKw3w!dplJ<8VbrWZ*uo#g# zEOP{tFhK&iNl;>q97TLm3zAuLpa0jlz`A%e`RkN1#E~H@UazPn>6((77Cj|jj}2E5C8#k Sr4x1l00007zLvtFd71*Api*h00a;K U0dl1ib^rhX07*qoM6N<$f7zLvtFd71*Api*h00a;K U0dl1ib^rhX07*qoM6N<$f?}h@^8f$< literal 0 HcmV?d00001 From 310b82a707930fe148014ca465e13e1a2032aa8e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 15:33:24 +0000 Subject: [PATCH 09/43] blaze burner fuels Signed-off-by: Pyritie --- .../tags/items/blaze_burner_fuel/regular.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 kubejs/data/create/tags/items/blaze_burner_fuel/regular.json diff --git a/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json b/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json new file mode 100644 index 000000000..c27c3fcdb --- /dev/null +++ b/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json @@ -0,0 +1,15 @@ +{ + "replace": false, + "values": [ + "gtceu:poor_raw_coal", + "gtceu:coal_dust", + "gtceu:charcoal_dust", + "gtceu:raw_coal", + "gtceu:rich_raw_coal", + "gtceu:flawed_coal", + "gtceu:chipped_coal", + "gtceu:pure_coal_dust", + "gtceu:flawless_coal_gem", + "gtceu:exquisite_coal_gem" + ] +} \ No newline at end of file From ddd0a9780be36b8af2491b4a48a1cc62e40b9607 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 15:34:00 +0000 Subject: [PATCH 10/43] Update constants.js Signed-off-by: Pyritie --- kubejs/startup_scripts/create/constants.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kubejs/startup_scripts/create/constants.js b/kubejs/startup_scripts/create/constants.js index 7e1358b06..fd60d9195 100644 --- a/kubejs/startup_scripts/create/constants.js +++ b/kubejs/startup_scripts/create/constants.js @@ -462,7 +462,6 @@ global.CREATE_DISABLED_ITEMS = [ 'create:refined_radiance_casing', 'create:shadow_steel_casing', 'create:wooden_bracket', - 'create:blaze_burner', 'create:sand_paper', 'create:red_sand_paper', 'create:empty_blaze_burner', @@ -470,4 +469,4 @@ global.CREATE_DISABLED_ITEMS = [ 'create:furnace_minecart_contraption', 'create:chest_minecart_contraption', 'create:framed_glass_pane' -]; \ No newline at end of file +]; From 70668ceb0c42498f5a52ce34f87711f6ff2aca97 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 15:40:34 +0000 Subject: [PATCH 11/43] add recipe Signed-off-by: Pyritie --- kubejs/server_scripts/create/recipes.js | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index 25b7bb275..c477fd464 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1195,5 +1195,26 @@ const registerCreateRecipes = (event) => { .EUt(20) //#endregion - + + //#region Blaze burner + + event.shaped('create:blaze_burner', [ + ' ', + ' A ', + 'BBB' + ], { + A: 'gtceu:charcoal_block', + B: 'gtceu:wrought_iron_plate' + }).id('tfg:create/shaped/blaze_burner_charcoal') + + event.shaped('create:blaze_burner', [ + ' ', + ' A ', + 'BBB' + ], { + A: 'minecraft:coal_block', + B: 'gtceu:wrought_iron_plate' + }).id('tfg:create/shaped/blaze_burner_coal') + + //#endregion } From 243aa9796820d0dbade8c5ee17a5a13a411697b6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 16:32:34 +0000 Subject: [PATCH 12/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/recipes.js | 43 +++++++++++++++-------- 1 file changed, 28 insertions(+), 15 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 9797258a4..cbf32fb57 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1096,6 +1096,19 @@ const registerGTCEURecipes = (event) => { C: '#gtceu:circuits/mv', D: 'gtceu:solid_machine_casing' }).id('tfg:shaped/greenhouse') + + // Контроллер электрического генератора + event.shaped('gtceu:alternator', [ + 'ABA', + 'CDC', + 'EBE' + ], { + A: '#gtceu:resistors', + B: '#gtceu:circuits/lv', + C: 'gtceu:lv_voltage_coil', + D: 'gtceu:solid_machine_casing', + E: 'gtceu:copper_single_cable' + }).id('tfg:shaped/alternator') // Compressed Coke Clay event.shaped('gtceu:compressed_coke_clay', [ @@ -1200,33 +1213,33 @@ const registerGTCEURecipes = (event) => { //#region Рецепты электрического генератора - event.recipes.gtceu.alternator('32_rpm_to_32_eu') - .inputStress(256) + event.recipes.gtceu.alternator('lv_alternator') + .inputStress(8192) .circuit(0) - .rpm(32) + .rpm(256) .duration(2) - .EUt(-32) + .outputEU(32) - event.recipes.gtceu.alternator('64_rpm_to_48_eu') - .inputStress(256) + event.recipes.gtceu.alternator('mv_alternator') + .inputStress(32768) .circuit(1) - .rpm(64) + .rpm(256) .duration(2) - .EUt(-48) + .outputEU(128) - event.recipes.gtceu.alternator('128_rpm_to_64_eu') - .inputStress(256) + event.recipes.gtceu.alternator('hv_alternator') + .inputStress(131072) .circuit(2) - .rpm(128) + .rpm(256) .duration(2) - .EUt(-64) + .outputEU(512) - event.recipes.gtceu.alternator('256_rpm_to_96_eu') - .inputStress(256) + event.recipes.gtceu.alternator('ev_alternator') + .inputStress(524288) .circuit(3) .rpm(256) .duration(2) - .EUt(-96) + .outputEU(2048) //#endregion From 8a63e4188c62e7782a8a60cc37250e0b9aec7a79 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 16:32:54 +0000 Subject: [PATCH 13/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/create_additions/recipes.js | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/kubejs/server_scripts/create_additions/recipes.js b/kubejs/server_scripts/create_additions/recipes.js index 9a5dffe04..d902e2016 100644 --- a/kubejs/server_scripts/create_additions/recipes.js +++ b/kubejs/server_scripts/create_additions/recipes.js @@ -68,18 +68,4 @@ const registerCreateAdditionsRecipes = (event) => { .itemOutputs('4x createaddition:barbed_wire') .duration(200) .EUt(20) - - // alternator: SU to EU - event.shaped('createaddition:alternator', [ - 'ABA', - 'CDC', - 'EFE' - ], { - A: '#gtceu:resistors', - B: '#gtceu:circuits/lv', - C: 'gtceu:lv_voltage_coil', - D: 'gtceu:mv_machine_casing', - E: 'gtceu:manganese_phosphide_quadruple_wire', - F: 'create:rotation_speed_controller' - }).id('tfg:alternator_mv') } From 6520e5bdab411113a0e9c6f0c72853934f7613de Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 16:33:34 +0000 Subject: [PATCH 14/43] Update constants.js Signed-off-by: Pyritie --- kubejs/startup_scripts/create_additions/constants.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/create_additions/constants.js b/kubejs/startup_scripts/create_additions/constants.js index bc38875bb..6924e24b3 100644 --- a/kubejs/startup_scripts/create_additions/constants.js +++ b/kubejs/startup_scripts/create_additions/constants.js @@ -35,7 +35,8 @@ global.CREATE_ADDITIONS_DISABLED_ITEMS = [ 'createaddition:biomass_pellet_block', 'createaddition:connector', 'createaddition:redstone_relay', - 'createaddition:alternator' + 'createaddition:alternator', + 'createaddition:electric_motor', 'createaddition:spool', 'createaddition:copper_spool', 'createaddition:festive_spool', From d7176bb43160c8858022aaa0aa7b5227dddd9ce0 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 16:37:06 +0000 Subject: [PATCH 15/43] Update machines.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index a9ec614f2..e64a1e9a1 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -24,4 +24,24 @@ const registerGTCEuMachines = (event) => { ) .workableCasingRenderer('gtceu:block/casings/solid/machine_casing_solid_steel', 'gtceu:block/multiblock/implosion_compressor', false) + event.create('alternator', 'multiblock') + .rotationState(RotationState.NON_Y_AXIS) + .recipeType('alternator') + .pattern(definition => FactoryBlockPattern.start() + .aisle("CWC", "CWC", "#W#") + .aisle("CWC", "K#E", "CWC") + .aisle("CWI", "CWA", "#W#") + .where('A', Predicates.controller(Predicates.blocks(definition.get()))) + .where('W', Predicates.blocks('gtceu:cupronickel_coil_block')) + .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) + .where('#', Predicates.any()) + .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1)) + .where('E', Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1)) + .where('I', Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1)) + .build() + ) + .workableCasingRenderer( + "gtceu:block/casings/solid/machine_casing_solid_steel", + "gtceu:block/multiblock/implosion_compressor", false + ) } From 7b71cda5ebbc247c87fc1672fec12beaa94fb2c8 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 16:37:30 +0000 Subject: [PATCH 16/43] Update recipe_types.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/recipe_types.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/kubejs/startup_scripts/gtceu/recipe_types.js b/kubejs/startup_scripts/gtceu/recipe_types.js index 76e61ec1c..eb4144c95 100644 --- a/kubejs/startup_scripts/gtceu/recipe_types.js +++ b/kubejs/startup_scripts/gtceu/recipe_types.js @@ -7,5 +7,13 @@ const registerGTCEuRecipeTypes = (event) => { .setMaxIOSize(3, 4, 1, 0) .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) .setSound(GTSoundEntries.BATH) + + event.create('alternator') + .category('alternator') + .setEUIO('out') + .setMaxIOSize(1, 0, 0, 0) + .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, FillDirection.LEFT_TO_RIGHT) + .setSound(GTSoundEntries.ARC) + .setMaxTooltips(6) } From 78ff3af136cba6d35861b7f6833bc308d868a2c2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 11 Jan 2025 19:56:51 +0000 Subject: [PATCH 17/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/recipes.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index cbf32fb57..43792cc80 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1212,34 +1212,39 @@ const registerGTCEURecipes = (event) => { //#endregion //#region Рецепты электрического генератора - + event.recipes.gtceu.alternator('lv_alternator') .inputStress(8192) .circuit(0) .rpm(256) .duration(2) - .outputEU(32) + .outputEU(32) + // this does not actually do anything except write the number in JEI + .EUt(-32) event.recipes.gtceu.alternator('mv_alternator') .inputStress(32768) .circuit(1) .rpm(256) .duration(2) - .outputEU(128) + .outputEU(128) + .EUt(-128) event.recipes.gtceu.alternator('hv_alternator') .inputStress(131072) .circuit(2) .rpm(256) .duration(2) - .outputEU(512) + .outputEU(512) + .EUt(-512) event.recipes.gtceu.alternator('ev_alternator') .inputStress(524288) .circuit(3) .rpm(256) .duration(2) - .outputEU(2048) + .outputEU(2048) + .EUt(-2048) //#endregion From 56702012fd9924aebef436069bd4c7b9cb48ad3e Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 10:56:05 +0000 Subject: [PATCH 18/43] Delete kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj Signed-off-by: Pyritie --- .../models/block/blaze_burner/blaze_cage.obj | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj diff --git a/kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj b/kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj deleted file mode 100644 index d510a8968..000000000 --- a/kubejs/assets/create/models/block/blaze_burner/blaze_cage.obj +++ /dev/null @@ -1,40 +0,0 @@ -# Blender v2.93.0 OBJ File: '' -# www.blender.org -mtllib blaze_cage.mtl -o cube -v 0.062500 -0.000000 0.937500 -v 0.062500 0.875000 0.937500 -v 0.062500 -0.000000 0.062500 -v 0.062500 0.875000 0.062500 -v 0.937500 -0.000000 0.937500 -v 0.937500 0.875000 0.937500 -v 0.937500 -0.000000 0.062500 -v 0.937500 0.875000 0.062500 -vt 0.375000 0.000000 -vt 0.625000 0.000000 -vt 0.625000 0.250000 -vt 0.375000 0.250000 -vt 0.625000 0.500000 -vt 0.375000 0.500000 -vt 0.625000 0.750000 -vt 0.375000 0.750000 -vt 0.625000 1.000000 -vt 0.375000 1.000000 -vt 0.125000 0.500000 -vt 0.125000 0.750000 -vt 0.875000 0.500000 -vt 0.875000 0.750000 -vn -1.0000 0.0000 0.0000 -vn 0.0000 0.0000 -1.0000 -vn 1.0000 0.0000 0.0000 -vn 0.0000 0.0000 1.0000 -vn 0.0000 -1.0000 0.0000 -vn 0.0000 1.0000 0.0000 -usemtl m_0 -s off -f 1/1/1 2/2/1 4/3/1 3/4/1 -f 3/4/2 4/3/2 8/5/2 7/6/2 -f 7/6/3 8/5/3 6/7/3 5/8/3 -f 5/8/4 6/7/4 2/9/4 1/10/4 -f 3/11/5 7/6/5 5/8/5 1/12/5 -f 8/5/6 4/13/6 2/14/6 6/7/6 From b745920cbf83348ceaa6cba9a69d4b9f66cb1bfc Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 10:56:12 +0000 Subject: [PATCH 19/43] Delete kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json Signed-off-by: Pyritie --- .../block/blaze_burner/block_with_blaze.json | 85 ------------------- 1 file changed, 85 deletions(-) delete mode 100644 kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json diff --git a/kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json b/kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json deleted file mode 100644 index 8b9daa724..000000000 --- a/kubejs/assets/create/models/block/blaze_burner/block_with_blaze.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "parent": "block/cube", - "textures": { - "particle": "block/coal_block", - "all": "block/coal_block", - "bottom": "block/coal_block", - "top": "block/coal_block", - "side": "block/coal_block" - }, - "elements": [ - { - "from": [ - 1, - 1, - 1 - ], - "to": [ - 15, - 15, - 15 - ], - "faces": { - "down": { - "uv": [ - 1, - 1, - 15, - 15 - ], - "texture": "#bottom", - "cullface": "down" - }, - "up": { - "uv": [ - 1, - 1, - 15, - 15 - ], - "texture": "#top" - }, - "north": { - "uv": [ - 1, - 1, - 15, - 15 - ], - "texture": "#side", - "cullface": "north" - }, - "south": { - "uv": [ - 1, - 1, - 15, - 15 - ], - "texture": "#side", - "cullface": "south" - }, - "west": { - "uv": [ - 1, - 1, - 15, - 15 - ], - "texture": "#side", - "cullface": "west" - }, - "east": { - "uv": [ - 1, - 1, - 15, - 15 - ], - "texture": "#side", - "cullface": "east" - } - } - } - ] -} \ No newline at end of file From 9558a9c4a5bea6aa3a4ac0ef8cc3c719b1246718 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 10:56:39 +0000 Subject: [PATCH 20/43] Add files via upload Signed-off-by: Pyritie --- .../block/blaze_burner/blaze_rods_large.obj | 15 +++++++++++++++ .../block/blaze_burner/blaze_rods_small.obj | 15 +++++++++++++++ .../create/textures/block/blaze_active.png | Bin 476 -> 2159 bytes .../textures/block/blaze_heater_brazier.png | Bin 1749 -> 2197 bytes .../create/textures/block/blaze_idle.png | Bin 476 -> 2216 bytes .../create/textures/block/blaze_inert.png | Bin 476 -> 1509 bytes 6 files changed, 30 insertions(+) create mode 100644 kubejs/assets/create/models/block/blaze_burner/blaze_rods_large.obj create mode 100644 kubejs/assets/create/models/block/blaze_burner/blaze_rods_small.obj diff --git a/kubejs/assets/create/models/block/blaze_burner/blaze_rods_large.obj b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_large.obj new file mode 100644 index 000000000..93857794a --- /dev/null +++ b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_large.obj @@ -0,0 +1,15 @@ +# Blender v3.1.2 OBJ File: 'Burner V3blend.blend' +# www.blender.org +mtllib blaze_rods.mtl +o cube +v 0 0 0 +v 0 0 0 +v 0 0 0 +v 0 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +usemtl m_0 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 diff --git a/kubejs/assets/create/models/block/blaze_burner/blaze_rods_small.obj b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_small.obj new file mode 100644 index 000000000..93857794a --- /dev/null +++ b/kubejs/assets/create/models/block/blaze_burner/blaze_rods_small.obj @@ -0,0 +1,15 @@ +# Blender v3.1.2 OBJ File: 'Burner V3blend.blend' +# www.blender.org +mtllib blaze_rods.mtl +o cube +v 0 0 0 +v 0 0 0 +v 0 0 0 +v 0 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +vt 0 0 +usemtl m_0 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 diff --git a/kubejs/assets/create/textures/block/blaze_active.png b/kubejs/assets/create/textures/block/blaze_active.png index 13e2153c7ce190d58a3e5f8931a7f49556e899ae..4492673a6880e9213bc44fcf2403feefa9826a58 100644 GIT binary patch literal 2159 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 diff --git a/kubejs/assets/create/textures/block/blaze_idle.png b/kubejs/assets/create/textures/block/blaze_idle.png index 13e2153c7ce190d58a3e5f8931a7f49556e899ae..463ed8e8992854d2e968a25f68c0995770bba8c7 100644 GIT binary patch literal 2216 zcmbVO4Nw$i7(V|(Ofiy7v1nZ&N!;7p`{i~#7486U@&J!Bk<{GV-Q#w=+g*1T?jUp0 ziX;XE6-gbKun{%HUlfTER5VRRN;4J5)R75OlO$)-9G$*{<3=4cYiD-%+wXh6=Y8Iv z@0~43OGzFvEPR+uCL3X%ZnA>+E53W^K=3Rnb!x#Yn4dmJl*vL4`|bf{u_5DRvLOc; zTZWWjnSqm>TTW1%otAsuJV482lc#!lf?P;Tke$wASOeVE*bGAqWq@aEED8&6q@B$4 zJb_NnORt1FTdiH6U9EhS@L`u2O@XW%i;h9K|?t zpF$~Zm;zTTa7_RO%7h{$;(0iV#2uXACV+p8o5-S3p3Q=xK-6#}=i&rl4#-hGK5sS} z(*(}JxWIyFO-_L9*^Em<7`8{C#e$nzQ6gB9Hk%AEh=ZJAC|s?fNld4~5LFzeM3ixA z42jc|8bq(r(hl0L(AXXNzWpYS%=TrwZ$Ab0lR8STAt?&ck!l*zIn+voP{%nCz1>dG zI!vq5(8|93sR9E|8{zujJiasND-(P=BZ36x`cFwZy~sauF;Gus-~{QbcmquOQcY8^ zf12qh0x#x4FRjN(1JeGBpcf%>4#`6ZbbJ;F)W1|0`YhEVk@I}bFP61_H9t|3|6Q{` zkff7fvuMyTQP}4N>T4~%X+WROP|w<9ZKw|pdYf+;XsX~N(3WWyPz#{x#@2hkmB|Jc zn@#bym{QBkcT-0ZVHMjq8nf^-r|LGwrB%C~3{w@p1!AU+iVWVs&Ny7b&fQ0}94~90 zrelj%-pd?&VQfJ>#xB1%&_os@ZshKek51=AyoqW@vrQe14V{%AwzbBeJGFusv-gdZ zdvTF%bMT^D?b};ZcdElS4V=GfY0}Uw;itboQZ|40lCR2>TjrNvzLuGKyV|-XB7Zft zbzgaHU1Dw8WzpN(HOKQ$=N6@%J%e}fagOaXCg1;KL{d)Z#9>^aX+!YL*5CNT zg3#y-o!7_StZ$qA<yYwhdD%etDcg)JRK2-5Wn zHHmAmD3$(`V$;!iA>*pHmX&mliPfz>LALx=*+ku~Tl15YG=12>8;`k4^tXrPW-?hWRg@_ zL3h|rhyDFC)y11Up5vP95j%3IKNHtQ9Z=ek^r-Q%Ulexj5=Tq&D?y{e5(|E(aLaez zCYNg5-d&&l+Fo06GD&%q3EdXW7gbwpszSLBf@&tTUu-FLMzpN>CdfGD(a`;um)A{< z*R4o-@VE7Wy+%EyV`NBPL|bdLLTD#5k(jmn58Z0LS>H8v@ZB5UE9i}@uXdMol!yEN OCCrH_rfmremi+^L3M9_} delta 461 zcmV;;0W$um5!?fi8Gi-<001BJ|6u?C0c~kRLr`gBV*mgsk#&*1OF~f?#(!#2lwnap zM1zAxgMt)9V;JOO4Qi0pqSvoL?Q*XY(i*fh2n|t7Uqk;vtwC!+5EMZ~TYFzi$n8BD zD52+a?)&38=Xp8jIbaXvw7l8ohkT)Ego6S1Qf%4X@rr|9`hOV29@k8LJ~9`j<@mbC zrs|zf^=iGZ>F7?TObu+E!c&@V6oqGmLmNe1@s99-mW?NckA%I398maL>4_S@D9+UQ zL$MJJ&w^d`bY~hk(ZE{P$P14Pd-A!G_IDn26KATh7?C6((77Cj|jjq0?q`xqvfj4bCFv#Np5Yp}tMtLi%p@6ZcW2$5 zG`XWnTSTaRX{Z$iAL_@of>=2w*1?bt1_V2mRB;4?gRzWqUDW{9NJi_ zp^Y_^$MS*wV6JNk0*`PAx}NJtR@avMyp~wU$C?cK5WZ&1^RYm%>Qq62g#={OSp^ws z6J+zMF{|gz^y9$PjjX0;H6x|yhNaJ1sXQ2dvXB8PEQ z%EG2*dA5D)KiX=iI4LD^!h#6s>wYe<|O$R1;K|2s#3df_c_gq#f(=@Xv#7=XfjYVVn*iZj$4O*ttBdC) zA|hToD$E!)H zstvlg%@fyPoF-P8Mk0Xg!zwvMo*S-Q3i_F0K@?}aEu%Qp1k1x?dfOft&~{oxkZzv@ z14P6cyaPir-xQAekL=Qf)>>SY0|T^MZR_7{Dc})YbcJ}Cv?H-e8XECM7YjwZI&8Gg ziB{LE6z6L*y6QJ}8=q`m<{#fHXU}%scQ=oz&SdE!rT5m3$(Pt`d&56}`0<`j ZZtSDEgV)=qBosH|N@=NhY2n$Ee*y4&=U4y$ delta 461 zcmV;;0W$vO3)};c8Gi-<001BJ|6u?C0c~kRLr`gBV*mgsk#&*1OF~f?#(!#2lwnap zM1zAxgMt)9V;JOO4Qi0pqSvoL?Q*XY(i*fh2n|t7Uqk;vtwC!+5EMZ~TYFzi$n8BD zD52+a?)&38=Xp8jIbaXvw7l8ohkT)Ego6S1Qf%4X@rr|9`hOV29@k8LJ~9`j<@mbC zrs|zf^=iGZ>F7?TObu+E!c&@V6oqGmLmNe1@s99-mW?NckA%I398maL>4_S@D9+UQ zL$MJJ&w^d`bY~hk(ZE{P$P14Pd-A!G_IDn26KATh7?C6((77Cj|jj Date: Sun, 12 Jan 2025 13:28:54 +0000 Subject: [PATCH 21/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/recipes.js | 31 ++++++++--------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index 43792cc80..48558c399 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1214,37 +1214,28 @@ const registerGTCEURecipes = (event) => { //#region Рецепты электрического генератора event.recipes.gtceu.alternator('lv_alternator') - .inputStress(8192) - .circuit(0) - .rpm(256) - .duration(2) - .outputEU(32) - // this does not actually do anything except write the number in JEI - .EUt(-32) - - event.recipes.gtceu.alternator('mv_alternator') - .inputStress(32768) .circuit(1) .rpm(256) .duration(2) - .outputEU(128) - .EUt(-128) + .outputEU(128) - event.recipes.gtceu.alternator('hv_alternator') - .inputStress(131072) + event.recipes.gtceu.alternator('mv_alternator') .circuit(2) .rpm(256) .duration(2) - .outputEU(512) - .EUt(-512) + .outputEU(512) - event.recipes.gtceu.alternator('ev_alternator') - .inputStress(524288) + event.recipes.gtceu.alternator('hv_alternator') .circuit(3) .rpm(256) .duration(2) - .outputEU(2048) - .EUt(-2048) + .outputEU(2048) + + event.recipes.gtceu.alternator('ev_alternator') + .circuit(4) + .rpm(256) + .duration(2) + .outputEU(8192) //#endregion From 5a70837dd04c5028673e9c5e9913d140ae4f14bf Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 13:29:13 +0000 Subject: [PATCH 22/43] Update machines.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 28 ++++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index e64a1e9a1..0b70a2ce2 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -24,24 +24,38 @@ const registerGTCEuMachines = (event) => { ) .workableCasingRenderer('gtceu:block/casings/solid/machine_casing_solid_steel', 'gtceu:block/multiblock/implosion_compressor', false) - event.create('alternator', 'multiblock') + event.create('alternator', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) .recipeType('alternator') .pattern(definition => FactoryBlockPattern.start() - .aisle("CWC", "CWC", "#W#") - .aisle("CWC", "K#E", "CWC") - .aisle("CWI", "CWA", "#W#") + .aisle("CCC", "CKC", "#C#") + .aisle("WWW", "W#W", "WWW") + .aisle("CAC", "CEC", "#C#") .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks('gtceu:cupronickel_coil_block')) - .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get())) + .where('W', Predicates.blocks(GTBlocks.COIL_CUPRONICKEL.get())) + .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get()) + .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1))) .where('#', Predicates.any()) .where('K', Predicates.abilities(PartAbility.INPUT_KINETIC).setExactLimit(1)) .where('E', Predicates.abilities(PartAbility.OUTPUT_ENERGY).setExactLimit(1)) - .where('I', Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1)) .build() ) + .shapeInfo(controller => MultiblockShapeInfo.builder() + .aisle("CCC", "CkC", " C ") + .aisle("WWW", "W W", "WWW") + .aisle("iAC", "CeC", " C ") + .where('A', controller, Direction.SOUTH) + .where('C', GTBlocks.CASING_STEEL_SOLID.get()) + .where(' ', Block.getBlock('minecraft:air')) + .where('W', GTBlocks.COIL_CUPRONICKEL.get()) + .where('k', Block.getBlock('gtceu:lv_kinetic_input_box')) + .where('e', GTMachines.ENERGY_OUTPUT_HATCH[GTValues.LV], Direction.SOUTH) + .where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.LV], Direction.SOUTH) + .build() + ) .workableCasingRenderer( "gtceu:block/casings/solid/machine_casing_solid_steel", "gtceu:block/multiblock/implosion_compressor", false ) + } From b8d9d261e11164c465a60122c30961f8abf8091a Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 13:30:13 +0000 Subject: [PATCH 23/43] Update tooltips.js Signed-off-by: Pyritie --- kubejs/client_scripts/tooltips.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index 323f0ead5..edc161882 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -20,7 +20,12 @@ ItemEvents.tooltip(event => { event.addAdvanced(['firmalife:bucket/yeast_starter'], (item, advanced, text) => { text.add(1, [text.of('Created with dried fruit')]) }) - event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => { + event.addAdvanced(['firmalife:beehive'], (item, advanced, text) => { text.add(1, [text.of('Needs to be filled with empty frames and surrounded by flowers to attract bees.')]) }) + event.addAdvanced(['gtceu:alternator'], (item, advanced, text) => { + text.add(1, text.of('Generates 2A of the matching §6Kinetic Input Box§r and §6Dynamo Hatch§r.')), + text.add(2, text.of(`Select Circuit 1 for LV, 2 for MV, 3 for HV, and 4 for EV.`)), + text.add(3, text.of(`§cRequires 256 RPM to run.§r`)) + }) }) From 8ee3f9d296e9ece06214ada6833b674873e0ddf5 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 13:36:27 +0000 Subject: [PATCH 24/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/create/recipes.js | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/kubejs/server_scripts/create/recipes.js b/kubejs/server_scripts/create/recipes.js index c477fd464..42535a6ac 100644 --- a/kubejs/server_scripts/create/recipes.js +++ b/kubejs/server_scripts/create/recipes.js @@ -1198,23 +1198,15 @@ const registerCreateRecipes = (event) => { //#region Blaze burner - event.shaped('create:blaze_burner', [ - ' ', - ' A ', - 'BBB' - ], { - A: 'gtceu:charcoal_block', - B: 'gtceu:wrought_iron_plate' - }).id('tfg:create/shaped/blaze_burner_charcoal') - - event.shaped('create:blaze_burner', [ - ' ', - ' A ', - 'BBB' + event.shaped('create:blaze_burner', [ + 'B B', + 'BAB', + 'CCC' ], { A: 'minecraft:coal_block', - B: 'gtceu:wrought_iron_plate' - }).id('tfg:create/shaped/blaze_burner_coal') + B: 'tfc:metal/bars/blue_steel', + C: 'gtceu:blue_steel_plate', + }).id('tfg:create/shaped/blaze_burner') //#endregion } From 725e44381e3aef4d0edd637b2c976382c05f92ef Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 13:49:41 +0000 Subject: [PATCH 25/43] Add files via upload Signed-off-by: Pyritie --- .../data/create/tags/items/blaze_burner_fuel/regular.json | 4 +--- .../data/create/tags/items/blaze_burner_fuel/special.json | 7 +++++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 kubejs/data/create/tags/items/blaze_burner_fuel/special.json diff --git a/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json b/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json index c27c3fcdb..c8f47d1dc 100644 --- a/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json +++ b/kubejs/data/create/tags/items/blaze_burner_fuel/regular.json @@ -8,8 +8,6 @@ "gtceu:rich_raw_coal", "gtceu:flawed_coal", "gtceu:chipped_coal", - "gtceu:pure_coal_dust", - "gtceu:flawless_coal_gem", - "gtceu:exquisite_coal_gem" + "gtceu:pure_coal_dust" ] } \ No newline at end of file diff --git a/kubejs/data/create/tags/items/blaze_burner_fuel/special.json b/kubejs/data/create/tags/items/blaze_burner_fuel/special.json new file mode 100644 index 000000000..bdad57f76 --- /dev/null +++ b/kubejs/data/create/tags/items/blaze_burner_fuel/special.json @@ -0,0 +1,7 @@ +{ + "replace": false, + "values": [ + "gtceu:flawless_coal_gem", + "gtceu:exquisite_coal_gem" + ] +} \ No newline at end of file From 4d3edb5fa3e9252d7d68df8657cece9c27e45670 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sun, 12 Jan 2025 14:08:39 +0000 Subject: [PATCH 26/43] Update tooltips.js Signed-off-by: Pyritie --- kubejs/client_scripts/tooltips.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index edc161882..820683e04 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -28,4 +28,7 @@ ItemEvents.tooltip(event => { text.add(2, text.of(`Select Circuit 1 for LV, 2 for MV, 3 for HV, and 4 for EV.`)), text.add(3, text.of(`§cRequires 256 RPM to run.§r`)) }) + event.addAdvanced(['create:blaze_burner'], (item, advanced, text) => { + text.add(1, text.of('§cSuperheat§r with Flawless and Exquisite coal gems.')) + }) }) From fa7c506236b2dfdb03b9892e3cc500a43331fad2 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 15 Jan 2025 11:41:28 +0000 Subject: [PATCH 27/43] Add files via upload Signed-off-by: Pyritie --- .../tfg/blockstates/copper_coil_block.json | 10 ++++++++++ .../tfg/models/block/copper_coil_block.json | 6 ++++++ .../models/block/copper_coil_block_active.json | 7 +++++++ .../tfg/models/item/copper_coil_block.json | 3 +++ .../item/unfinished_copper_coil_block.json | 3 +++ .../block/casings/coils/machine_coil_copper.png | Bin 0 -> 2491 bytes .../casings/coils/machine_coil_copper.png.mcmeta | 5 +++++ .../casings/coils/machine_coil_copper_bloom.png | Bin 0 -> 2166 bytes .../coils/machine_coil_copper_bloom.png.mcmeta | 9 +++++++++ .../coils/machine_coil_copper_bloom_ctm.png | Bin 0 -> 2653 bytes .../machine_coil_copper_bloom_ctm.png.mcmeta | 5 +++++ .../casings/coils/machine_coil_copper_ctm.png | Bin 0 -> 2826 bytes 12 files changed, 48 insertions(+) create mode 100644 kubejs/assets/tfg/blockstates/copper_coil_block.json create mode 100644 kubejs/assets/tfg/models/block/copper_coil_block.json create mode 100644 kubejs/assets/tfg/models/block/copper_coil_block_active.json create mode 100644 kubejs/assets/tfg/models/item/copper_coil_block.json create mode 100644 kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json create mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png create mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png create mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_ctm.png diff --git a/kubejs/assets/tfg/blockstates/copper_coil_block.json b/kubejs/assets/tfg/blockstates/copper_coil_block.json new file mode 100644 index 000000000..db9b8845f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/copper_coil_block.json @@ -0,0 +1,10 @@ +{ + "variants": { + "active=false": { + "model": "tfg:block/copper_coil_block" + }, + "active=true": { + "model": "tfg:block/copper_coil_block_active" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/copper_coil_block.json b/kubejs/assets/tfg/models/block/copper_coil_block.json new file mode 100644 index 000000000..9933ec27f --- /dev/null +++ b/kubejs/assets/tfg/models/block/copper_coil_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/casings/coils/machine_coil_copper" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/copper_coil_block_active.json b/kubejs/assets/tfg/models/block/copper_coil_block_active.json new file mode 100644 index 000000000..a3c2ebb3e --- /dev/null +++ b/kubejs/assets/tfg/models/block/copper_coil_block_active.json @@ -0,0 +1,7 @@ +{ + "parent": "gtceu:block/cube_2_layer/all", + "textures": { + "bot_all": "tfg:block/casings/coils/machine_coil_copper", + "top_all": "tfg:block/casings/coils/machine_coil_copper_bloom" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/copper_coil_block.json b/kubejs/assets/tfg/models/item/copper_coil_block.json new file mode 100644 index 000000000..84d2ca9a7 --- /dev/null +++ b/kubejs/assets/tfg/models/item/copper_coil_block.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/copper_coil_block" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json b/kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json new file mode 100644 index 000000000..b3218943a --- /dev/null +++ b/kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:item/copper_coil_block" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png new file mode 100644 index 0000000000000000000000000000000000000000..4e8461f4c96c0b46f3b117809794b5ebc1158e66 GIT binary patch literal 2491 zcma)84|Egt9S=;4tq+g^o%*O;FS@mq%l%7oxqA(@G|=YRU~My+jZwYa{gRwba^ddU zgl-i<<~pjZrNZXwq?Y!*0c&Xy(UomgTos=TTpjhX2Nbm%bF+_xXOl|G&Tduxd^D+?=~}3Vett`5XGeGIGq!u%kT>YO6ZQ*AJpYV5 z;*7sjxTA4+-7&DoyLZX&Hd*{52OG+ZHXKm%caIYbhtJ)9{_MAl)-=7?eC@a1(EhJ2 zbl8?ghnlx^dWKKMFJ?~}^W@q`Z#lW);JW2Ivsa+&^QPqrW?L_n-*cq%`>k6g$J2#% zKl@<1k;yM^t;D4FZfiBx?O!m3b{xu@{`7?5_H~o>we7F%d+zQ2W3BGF=9ez^NsqQ( zTr?s2Cu#?l$zA(;3v+)dmUnmWbq%_=U!6K!TcS1{lJeg^^W*nFd2_>`@o;&JRuK7_uW3-%(yT!br91_Dw=lLBg**0_bHdVv+uk`+jCjDrLrpz%m76b!3e%#J2_Ik?uhaTG~F zw0b*Qsw+f1uuRHi1t6@6!~}w%5Qa7JR^Cdp*5wFAP-dK}WvKA{>rKqft|oHpz+~Cs~%o2@0nu3?eXfV_4&3SXect85}?r6e*%f zav0GWd9U1{*->a}(uYvQ<;oC;)l{Tl%!|VkTLuu3YDFhEgyqUt_Lt`vM@m2tAqCk;p`3DsVRx}^H-X5JtgggvGT3CyZhT6>xW`=4pmZz+k z$OtyzwedU)3mwsu#FbV#?I>j;Qm<7(Uh~OH$c|P@;f7dh*DZxWjmGOKAgvTdFf7fG zR)(MnTMDrjC@L&Gor)w(lo>@tfm;oUcvwYJi1!0L680x{b^052q1{}W0(ebU+_D_B zqlvMrQzg7jo&g810jL1>5=IgjMYt)FvrrsiEg~!&k%GEpQSxoP0ZO__nxhGhV7>r_ zohXu7 zuwKfNmRDt;7UdOC>WAjT$ik9E^vEIwi3}H}anS(K(??JwMp!V)>L%f&VmOM`M;44O z{-x}{nYCZ8s*~PktVrhgzY~{)-QZMm23Muq8KEpDl0ph|;bouZ&3SF){efL$+s-L? z{L0a2d^)(k?zyi#K4V%tI5V&1o5x49_jK*)-1pT57n*;usOzPy-0d?fCUW1caGdz# zcMrb+w4T29p;>q4)z|lgH_Mxj^Ao@Fck;WtD~FEQW3x~9ys5&OZZ*RA!u>O|kA9sDUe5s*<7Je|V zit!kSd#{Xsva)O8)xm;}@zEbePhARXJ(~~A``14n=4^4}g2B~4sl4`w&DWwWM|b+} zCOY<7s-Jml=r=<<`Q5R8w9kT#9XmBy_LrLVCy!nR_K$0rf!D`!`ik1JluccWJy~?u e5W-YGF_S&Op|dNuPVLgKa_6cwj{cR8Z21og1A)r` literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta new file mode 100644 index 000000000..250d849bf --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/coils/machine_coil_copper_ctm" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png new file mode 100644 index 0000000000000000000000000000000000000000..06b49ec017bf38073c38347c36f3396efc91bbf0 GIT binary patch literal 2166 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 V*X8Y<#r!`b^|a}#-Bai1{Rd_aDa-%> literal 0 HcmV?d00001 From d2f64a1bcce7653f8282ed53245ef7134300ed69 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 15 Jan 2025 11:44:16 +0000 Subject: [PATCH 28/43] Update machines.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 3911cfed7..4785bbd86 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -40,7 +40,7 @@ const registerGTCEuMachines = (event) => { .aisle("WWW", "W#W", "WWW") .aisle("CAC", "CEC", "#C#") .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks(GTBlocks.COIL_CUPRONICKEL.get())) + .where('W', Predicates.blocks('tfg:copper_coil_block')) .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get()) .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1))) .where('#', Predicates.any()) @@ -55,7 +55,7 @@ const registerGTCEuMachines = (event) => { .where('A', controller, Direction.SOUTH) .where('C', GTBlocks.CASING_STEEL_SOLID.get()) .where(' ', Block.getBlock('minecraft:air')) - .where('W', GTBlocks.COIL_CUPRONICKEL.get()) + .where('W', Block.getBlock('tfg:copper_coil_block')) .where('k', Block.getBlock('gtceu:lv_kinetic_input_box')) .where('e', GTMachines.ENERGY_OUTPUT_HATCH[GTValues.LV], Direction.SOUTH) .where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.LV], Direction.SOUTH) From 180e593c7eff3e18e06ba356154fa0fa17ef7ee1 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 15 Jan 2025 11:46:18 +0000 Subject: [PATCH 29/43] Add files via upload Signed-off-by: Pyritie --- kubejs/server_scripts/tfg/recipes.js | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 kubejs/server_scripts/tfg/recipes.js diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js new file mode 100644 index 000000000..6eeec8cdc --- /dev/null +++ b/kubejs/server_scripts/tfg/recipes.js @@ -0,0 +1,21 @@ +// priority: 0 + +const registerTFGRecipes = (e) => { + + //#region Copper Coil Block + + e.recipes.gtceu.assembler(`tfg:copper_coil_block`) + .itemInputs('8x gtceu:copper_double_wire', '8x #forge:foils/copper') + .inputFluids(Fluid.of('gtceu:tin_alloy', 144)) + .itemOutputs('tfg:copper_coil_block') + .EUt(16).duration(200) + + e.recipes.createSequencedAssembly([ + 'tfg:copper_coil_block', + ], 'gtceu:copper_frame', [ + e.recipes.createDeploying('tfg:unfinished_copper_coil_block', ['tfg:unfinished_copper_coil_block', 'gtceu:copper_double_wire']), + e.recipes.createDeploying('tfg:unfinished_copper_coil_block', ['tfg:unfinished_copper_coil_block', '#forge:foils/copper']), + ]).transitionalItem('tfg:unfinished_copper_coil_block').loops(8).id('tfg:sequenced_assembly/copper_coil_block') + + //#endregion +} \ No newline at end of file From 72ecc7ec8926cfc1949335daa68a4b68d507df3d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 15 Jan 2025 11:47:12 +0000 Subject: [PATCH 30/43] Update main_server_script.js Signed-off-by: Pyritie --- kubejs/server_scripts/main_server_script.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 5adb7f640..f4c8bc0f0 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -138,6 +138,7 @@ ServerEvents.recipes(event => { registerTFCRecipes(event) registerTFCGroomingStationRecipes(event) registerToolBeltRecipes(event) + registerTFGRecipes(event) registerTreeTapRecipes(event) registerWaterFlasksRecipes(event) -}) \ No newline at end of file +}) From 594b7ad758381c8f88b2cce6625fdc1380ade73c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 15 Jan 2025 11:48:14 +0000 Subject: [PATCH 31/43] Update items.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/items.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index 488cc5e9b..e99aa4c21 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/kubejs/startup_scripts/gtceu/items.js @@ -3,4 +3,5 @@ const registerGTCEuItems = (event) => { event.create('tfg:unfinished_vacuum_tube', 'create:sequenced_assembly') event.create('tfg:unfinished_basic_electronic_circuit', 'create:sequenced_assembly') -} \ No newline at end of file + event.create('tfg:unfinished_copper_coil_block', 'create:sequenced_assembly') +} From ffaa6502883a3a07c86e3e5e9b195259fdfa926d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Wed, 15 Jan 2025 11:50:37 +0000 Subject: [PATCH 32/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/gregtech/recipes.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index efc23aff1..5a1cbe23d 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1213,28 +1213,25 @@ const registerGTCEURecipes = (event) => { //#region Рецепты электрического генератора event.recipes.gtceu.alternator('lv_alternator') + .inputStress(8192) .circuit(1) .rpm(256) .duration(2) .outputEU(128) event.recipes.gtceu.alternator('mv_alternator') + .inputStress(32768) .circuit(2) .rpm(256) .duration(2) .outputEU(512) event.recipes.gtceu.alternator('hv_alternator') + .inputStress(131072) .circuit(3) .rpm(256) .duration(2) .outputEU(2048) - - event.recipes.gtceu.alternator('ev_alternator') - .circuit(4) - .rpm(256) - .duration(2) - .outputEU(8192) //#endregion From cddc46ac25b87af7ce86c67ee32435e38fb7f2bb Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:56:16 +0000 Subject: [PATCH 33/43] Delete kubejs/assets/tfg/blockstates/copper_coil_block.json Signed-off-by: Pyritie --- kubejs/assets/tfg/blockstates/copper_coil_block.json | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 kubejs/assets/tfg/blockstates/copper_coil_block.json diff --git a/kubejs/assets/tfg/blockstates/copper_coil_block.json b/kubejs/assets/tfg/blockstates/copper_coil_block.json deleted file mode 100644 index db9b8845f..000000000 --- a/kubejs/assets/tfg/blockstates/copper_coil_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "active=false": { - "model": "tfg:block/copper_coil_block" - }, - "active=true": { - "model": "tfg:block/copper_coil_block_active" - } - } -} \ No newline at end of file From 7c14da274709c0583c9809446180d4413b328289 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:56:27 +0000 Subject: [PATCH 34/43] Delete kubejs/assets/tfg/models/block/copper_coil_block.json Signed-off-by: Pyritie --- kubejs/assets/tfg/models/block/copper_coil_block.json | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 kubejs/assets/tfg/models/block/copper_coil_block.json diff --git a/kubejs/assets/tfg/models/block/copper_coil_block.json b/kubejs/assets/tfg/models/block/copper_coil_block.json deleted file mode 100644 index 9933ec27f..000000000 --- a/kubejs/assets/tfg/models/block/copper_coil_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "tfg:block/casings/coils/machine_coil_copper" - } -} \ No newline at end of file From 97371eeb0138ad7cbaec8dbe200895695faf2a9c Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:56:34 +0000 Subject: [PATCH 35/43] Delete kubejs/assets/tfg/models/block/copper_coil_block_active.json Signed-off-by: Pyritie --- .../assets/tfg/models/block/copper_coil_block_active.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 kubejs/assets/tfg/models/block/copper_coil_block_active.json diff --git a/kubejs/assets/tfg/models/block/copper_coil_block_active.json b/kubejs/assets/tfg/models/block/copper_coil_block_active.json deleted file mode 100644 index a3c2ebb3e..000000000 --- a/kubejs/assets/tfg/models/block/copper_coil_block_active.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "gtceu:block/cube_2_layer/all", - "textures": { - "bot_all": "tfg:block/casings/coils/machine_coil_copper", - "top_all": "tfg:block/casings/coils/machine_coil_copper_bloom" - } -} \ No newline at end of file From 878768cc7ae00a2f138c27fd08eadae6ae9dd974 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:56:44 +0000 Subject: [PATCH 36/43] Delete kubejs/assets/tfg/models/item directory Signed-off-by: Pyritie --- kubejs/assets/tfg/models/item/copper_coil_block.json | 3 --- .../assets/tfg/models/item/unfinished_copper_coil_block.json | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 kubejs/assets/tfg/models/item/copper_coil_block.json delete mode 100644 kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json diff --git a/kubejs/assets/tfg/models/item/copper_coil_block.json b/kubejs/assets/tfg/models/item/copper_coil_block.json deleted file mode 100644 index 84d2ca9a7..000000000 --- a/kubejs/assets/tfg/models/item/copper_coil_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "tfg:block/copper_coil_block" -} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json b/kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json deleted file mode 100644 index b3218943a..000000000 --- a/kubejs/assets/tfg/models/item/unfinished_copper_coil_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "tfg:item/copper_coil_block" -} \ No newline at end of file From 5cbf660af17175a45661c093c369a89ae6bcdffd Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:56:54 +0000 Subject: [PATCH 37/43] Delete kubejs/assets/tfg/textures/block/casings/coils directory Signed-off-by: Pyritie --- .../block/casings/coils/machine_coil_copper.png | Bin 2491 -> 0 bytes .../casings/coils/machine_coil_copper.png.mcmeta | 5 ----- .../casings/coils/machine_coil_copper_bloom.png | Bin 2166 -> 0 bytes .../coils/machine_coil_copper_bloom.png.mcmeta | 9 --------- .../coils/machine_coil_copper_bloom_ctm.png | Bin 2653 -> 0 bytes .../machine_coil_copper_bloom_ctm.png.mcmeta | 5 ----- .../casings/coils/machine_coil_copper_ctm.png | Bin 2826 -> 0 bytes 7 files changed, 19 deletions(-) delete mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png delete mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta delete mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png delete mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta delete mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png delete mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta delete mode 100644 kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_ctm.png diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png deleted file mode 100644 index 4e8461f4c96c0b46f3b117809794b5ebc1158e66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2491 zcma)84|Egt9S=;4tq+g^o%*O;FS@mq%l%7oxqA(@G|=YRU~My+jZwYa{gRwba^ddU zgl-i<<~pjZrNZXwq?Y!*0c&Xy(UomgTos=TTpjhX2Nbm%bF+_xXOl|G&Tduxd^D+?=~}3Vett`5XGeGIGq!u%kT>YO6ZQ*AJpYV5 z;*7sjxTA4+-7&DoyLZX&Hd*{52OG+ZHXKm%caIYbhtJ)9{_MAl)-=7?eC@a1(EhJ2 zbl8?ghnlx^dWKKMFJ?~}^W@q`Z#lW);JW2Ivsa+&^QPqrW?L_n-*cq%`>k6g$J2#% zKl@<1k;yM^t;D4FZfiBx?O!m3b{xu@{`7?5_H~o>we7F%d+zQ2W3BGF=9ez^NsqQ( zTr?s2Cu#?l$zA(;3v+)dmUnmWbq%_=U!6K!TcS1{lJeg^^W*nFd2_>`@o;&JRuK7_uW3-%(yT!br91_Dw=lLBg**0_bHdVv+uk`+jCjDrLrpz%m76b!3e%#J2_Ik?uhaTG~F zw0b*Qsw+f1uuRHi1t6@6!~}w%5Qa7JR^Cdp*5wFAP-dK}WvKA{>rKqft|oHpz+~Cs~%o2@0nu3?eXfV_4&3SXect85}?r6e*%f zav0GWd9U1{*->a}(uYvQ<;oC;)l{Tl%!|VkTLuu3YDFhEgyqUt_Lt`vM@m2tAqCk;p`3DsVRx}^H-X5JtgggvGT3CyZhT6>xW`=4pmZz+k z$OtyzwedU)3mwsu#FbV#?I>j;Qm<7(Uh~OH$c|P@;f7dh*DZxWjmGOKAgvTdFf7fG zR)(MnTMDrjC@L&Gor)w(lo>@tfm;oUcvwYJi1!0L680x{b^052q1{}W0(ebU+_D_B zqlvMrQzg7jo&g810jL1>5=IgjMYt)FvrrsiEg~!&k%GEpQSxoP0ZO__nxhGhV7>r_ zohXu7 zuwKfNmRDt;7UdOC>WAjT$ik9E^vEIwi3}H}anS(K(??JwMp!V)>L%f&VmOM`M;44O z{-x}{nYCZ8s*~PktVrhgzY~{)-QZMm23Muq8KEpDl0ph|;bouZ&3SF){efL$+s-L? z{L0a2d^)(k?zyi#K4V%tI5V&1o5x49_jK*)-1pT57n*;usOzPy-0d?fCUW1caGdz# zcMrb+w4T29p;>q4)z|lgH_Mxj^Ao@Fck;WtD~FEQW3x~9ys5&OZZ*RA!u>O|kA9sDUe5s*<7Je|V zit!kSd#{Xsva)O8)xm;}@zEbePhARXJ(~~A``14n=4^4}g2B~4sl4`w&DWwWM|b+} zCOY<7s-Jml=r=<<`Q5R8w9kT#9XmBy_LrLVCy!nR_K$0rf!D`!`ik1JluccWJy~?u e5W-YGF_S&Op|dNuPVLgKa_6cwj{cR8Z21og1A)r` diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta deleted file mode 100644 index 250d849bf..000000000 --- a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "ldlib": { - "connection": "tfg:block/casings/coils/machine_coil_copper_ctm" - } -} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png deleted file mode 100644 index 06b49ec017bf38073c38347c36f3396efc91bbf0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2166 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 V*X8Y<#r!`b^|a}#-Bai1{Rd_aDa-%> From 5ad9f00f5acfebb02a4898953025dbbd2d8972de Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:57:37 +0000 Subject: [PATCH 38/43] Update items.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/items.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/items.js b/kubejs/startup_scripts/gtceu/items.js index e99aa4c21..cbfba0a4f 100644 --- a/kubejs/startup_scripts/gtceu/items.js +++ b/kubejs/startup_scripts/gtceu/items.js @@ -3,5 +3,4 @@ const registerGTCEuItems = (event) => { event.create('tfg:unfinished_vacuum_tube', 'create:sequenced_assembly') event.create('tfg:unfinished_basic_electronic_circuit', 'create:sequenced_assembly') - event.create('tfg:unfinished_copper_coil_block', 'create:sequenced_assembly') } From f42fbd7239af964dc0eb61104451bdd6c01ccb98 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:58:20 +0000 Subject: [PATCH 39/43] Delete kubejs/server_scripts/tfg/recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/tfg/recipes.js | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 kubejs/server_scripts/tfg/recipes.js diff --git a/kubejs/server_scripts/tfg/recipes.js b/kubejs/server_scripts/tfg/recipes.js deleted file mode 100644 index 6eeec8cdc..000000000 --- a/kubejs/server_scripts/tfg/recipes.js +++ /dev/null @@ -1,21 +0,0 @@ -// priority: 0 - -const registerTFGRecipes = (e) => { - - //#region Copper Coil Block - - e.recipes.gtceu.assembler(`tfg:copper_coil_block`) - .itemInputs('8x gtceu:copper_double_wire', '8x #forge:foils/copper') - .inputFluids(Fluid.of('gtceu:tin_alloy', 144)) - .itemOutputs('tfg:copper_coil_block') - .EUt(16).duration(200) - - e.recipes.createSequencedAssembly([ - 'tfg:copper_coil_block', - ], 'gtceu:copper_frame', [ - e.recipes.createDeploying('tfg:unfinished_copper_coil_block', ['tfg:unfinished_copper_coil_block', 'gtceu:copper_double_wire']), - e.recipes.createDeploying('tfg:unfinished_copper_coil_block', ['tfg:unfinished_copper_coil_block', '#forge:foils/copper']), - ]).transitionalItem('tfg:unfinished_copper_coil_block').loops(8).id('tfg:sequenced_assembly/copper_coil_block') - - //#endregion -} \ No newline at end of file From 9e34df8ffc0a581240166f0a2f1283ec29cf08f9 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Fri, 17 Jan 2025 23:58:43 +0000 Subject: [PATCH 40/43] Update recipes.js Signed-off-by: Pyritie --- kubejs/server_scripts/firmalife/recipes.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kubejs/server_scripts/firmalife/recipes.js b/kubejs/server_scripts/firmalife/recipes.js index d113b1c53..9666be059 100644 --- a/kubejs/server_scripts/firmalife/recipes.js +++ b/kubejs/server_scripts/firmalife/recipes.js @@ -6,6 +6,8 @@ const registerFirmaLifeRecipes = (event) => { event.remove({ id: 'firmalife:crafting/compost_tumbler' }) event.remove({ id: 'firmalife:crafting/pumping_station' }) + event.remove({ id: 'firmalife:crafting/pumping_station2' }) + event.remove({ id: 'firmalife:crafting/pumping_station3' }) // - Chromium From 4fa950070124381cbc6723b0ddf061b44f10a57f Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 18 Jan 2025 00:01:13 +0000 Subject: [PATCH 41/43] Update machines.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index 4785bbd86..b97eb1721 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -40,7 +40,7 @@ const registerGTCEuMachines = (event) => { .aisle("WWW", "W#W", "WWW") .aisle("CAC", "CEC", "#C#") .where('A', Predicates.controller(Predicates.blocks(definition.get()))) - .where('W', Predicates.blocks('tfg:copper_coil_block')) + .where('W', Predicates.blocks(GTBlocks.COIL_CUPRONICKEL.get())) .where("C", Predicates.blocks(GTBlocks.CASING_STEEL_SOLID.get()) .or(Predicates.abilities(PartAbility.IMPORT_ITEMS).setExactLimit(1))) .where('#', Predicates.any()) From eaace89b0a336bf8eca8b1af93d10744e77ac9ae Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 18 Jan 2025 00:04:19 +0000 Subject: [PATCH 42/43] Update main_server_script.js Signed-off-by: Pyritie --- kubejs/server_scripts/main_server_script.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 95d79af0d..22338e50d 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -142,7 +142,6 @@ ServerEvents.recipes(event => { registerTFCRecipes(event) registerTFCGroomingStationRecipes(event) registerToolBeltRecipes(event) - registerTFGRecipes(event) registerTreeTapRecipes(event) registerWaterFlasksRecipes(event) }) From bed0cad994b4919b466d3963b0d3930c5f775c0d Mon Sep 17 00:00:00 2001 From: Pyritie Date: Sat, 18 Jan 2025 00:10:49 +0000 Subject: [PATCH 43/43] Update machines.js Signed-off-by: Pyritie --- kubejs/startup_scripts/gtceu/machines.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index b97eb1721..3911cfed7 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -55,7 +55,7 @@ const registerGTCEuMachines = (event) => { .where('A', controller, Direction.SOUTH) .where('C', GTBlocks.CASING_STEEL_SOLID.get()) .where(' ', Block.getBlock('minecraft:air')) - .where('W', Block.getBlock('tfg:copper_coil_block')) + .where('W', GTBlocks.COIL_CUPRONICKEL.get()) .where('k', Block.getBlock('gtceu:lv_kinetic_input_box')) .where('e', GTMachines.ENERGY_OUTPUT_HATCH[GTValues.LV], Direction.SOUTH) .where('i', GTMachines.ITEM_IMPORT_BUS[GTValues.LV], Direction.SOUTH)