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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7b2FWt12U7785lGsmQLL3 z?Gz|+tUfDnN@Ad+OLMbpbCZZmvc!`l-mD2%7hPZP@V02Z&?TuYCLFwh-to@=9oIT$ zI|_(6xpr!1M&e7K{@8VV*{iw!U$geEfBC|1nGbKy+(W^$@taO%DW=7W d44jM%ECLLSMN5Ut7#J8BJYD@<);T3K0RYw|$cg{} literal 0 HcmV?d00001 diff --git a/kubejs/assets/create/textures/block/blaze_heater_brazier.png b/kubejs/assets/create/textures/block/blaze_heater_brazier.png new file mode 100644 index 0000000000000000000000000000000000000000..43cca78ec0640ed1f26858a8e9f208a5d192af85 GIT binary patch literal 1749 zcmeAS@N?(olHy`uVBq!ia0y~yV6XsT4mJh`h81nratsWNd6~}60h!6k3=A3*OD9@; zGdqg3?pN_T63*r7qQm62u|q)QNRU#-Vll&}^=X?=syWG>&TC?cK6uP&gFtSL=s)IM z)@WA802V>(>iFK4uYO7@9!96%{IxKCZdA;6XLF`)vU#h*KYe{(4- zbj+H6rY=Y6jKDGf9;VkzP8utjYR|m-z4g?-%A!XXpXLW05pth2rJ{L}*ph6gRf<(k z`%GM?{{C;1o1C-d(q3Dhv-*9X4LR=FYP_{NcfRxS6u*O?dBSh5vRAkCt?AqseU-`m z!R@B**Q>;Cx1Y{^QEO!Ct?ey0Gw*Q2_u>~3ZR@NvV%Mg8-G1(-vWxlC&b)^Y1lm&e z=f4%#dXORKy2Y2Bfq{Xuz$3Dlfr0NZ2s0kfUy;JVz{>0C;uwpDE0)z|7;4KL<@((ZY8WA=`s#Fz~q8BZ{|c@(61L?p~l@_T;9x0F9N z_WFhelg@ovyzAGzUC;NeN?TZv(cRrWU8XEGb*Y8DJwN-oixp?>yuH0y`xY-=+zjyv?t?cu4#}|mm>|efo`9om~^$8zSg6?)_ znk@HWe6argZp-63Ri{sjiY9M)!jfTs$J*NZv=%!Xx5(MM3lv4?Ni7kZI_Y(Gw(+gA zy4~Eaj0{bS|5{pd?q^xUFlE(}qPzw@DV76|A8vT@wQ6eFiqO@rO=oy}9`9s0^5DXW z3Y&E~7nuTPRb`$(%l6V`fh^O(^;r||O+N6lrzrc9Ycs?FvFR`D}sfGzDTDWnR08Zg%snr-+#Tmm903WcV9XC+U159)AboFq5=sP zg0q${;@{u={6yb_C2w{weS7Uu#*!6tE&nz!1#P%u_I8c0spE%|pf!qyiX8e3$FKOW zo~(9zZg#WrmKo>bdhC`MwK(lP{@Uzn3)AMZHGW;GGek~pm5|o#I%P90F(UfOi!A#Y zrE_!VGR!r}Nc;aF!R^2d$s;+FqjXNMG3i>hH^AZV)k9&bZ-RUioL;VY^CN5b#!K4E zj=6Ou38ekLB6Zn-XW6#I-wS7Pm}&piaBjS{bgkNlo^9@pKj)R|mH0i4^3!#Ferti+ zX)oPd-K@v-9Rs2_M(ajvMRi@?ctkDo^4=8n{u06g<+)u<|GViOxwQG}g zZf*GbOv>xVa=s@qT|p6iQSQR`mW#d0VTlSnXqgvlBv_oVC;jq%i4(`N4sm6^4bXIB zEG?_7yPM_Iyo>3w>am3Hn^s(P@wdsovY>8)iDS>=+!X?^I5OrhQC_z`*muGFTho^6 z&Xtmhh+VO%;klJ$8|y9k0}q+G=Dpjk*An6Gs$lkdF54y4R$eHVO5uwU)$`o zZ26cQHR>GuS%o#_x^sngu&c3}R>BK9v9J z9*e`r3!xuE7U(hLCY=+wSepOn>uvM3g}WHP+?f5tTIw!O!vv;F+J#OK@dvj-TyXJ1|e?4U{=h>`7OH@-#^rU)1MXs+^o6&vjK*8}H zy=<`zm$GkN-FQQ3!(5);X0a2!CsTHX2%oV|j>@VETOK;SN?>=;8OPF8ztc)wOJ3Xf zYG29CSXmpZack);57waX^SZ_N{#|~#WLN(Gms1+o>xs0+ti0;N=40%HsRc3o73VEmsaDi*$?zZJ=@#{b9lLkO RGB7YOc)I$ztaD0e0sx)DHxvK> 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7b2FWt12U7785lGsmQLL3 z?Gz|+tUfDnN@Ad+OLMbpbCZZmvc!`l-mD2%7hPZP@V02Z&?TuYCLFwh-to@=9oIT$ zI|_(6xpr!1M&e7K{@8VV*{iw!U$geEfBC|1nGbKy+(W^$@taO%DW=7W d44jM%ECLLSMN5Ut7#J8BJYD@<);T3K0RYw|$cg{} literal 0 HcmV?d00001 diff --git a/kubejs/assets/create/textures/block/blaze_inert.png b/kubejs/assets/create/textures/block/blaze_inert.png new file mode 100644 index 0000000000000000000000000000000000000000..13e2153c7ce190d58a3e5f8931a7f49556e899ae GIT binary patch literal 476 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7b2FWt12U7785lGsmQLL3 z?Gz|+tUfDnN@Ad+OLMbpbCZZmvc!`l-mD2%7hPZP@V02Z&?TuYCLFwh-to@=9oIT$ zI|_(6xpr!1M&e7K{@8VV*{iw!U$geEfBC|1nGbKy+(W^$@taO%DW=7W d44jM%ECLLSMN5Ut7#J8BJYD@<);T3K0RYw|$cg{} literal 0 HcmV?d00001 diff --git a/kubejs/assets/create/textures/block/blaze_super.png b/kubejs/assets/create/textures/block/blaze_super.png new file mode 100644 index 0000000000000000000000000000000000000000..cf428504ddacebc5bdb4d7643411b0c705c8a2df GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7^D~{D12U7785lGsmQLL3 zeb_L{by6uZhf`rs<>BHt)Q&%>&&U8^5F3MdeW{Uh~< zzeF@fl*Lid<<6bIQA>_|pXJoOr99@Iy#Kq(oz;9CX*_9GwVDUE#LV+OeJLx^mutUr zi^f?AC9dK(OYbDf*&aWy%(Tc(#dZC?-@E!2E_!C5VBlbLI_I6xdExYJG0`97K5}Sl zyFLWt9EL-`9TvZ<+`oL@bqi)E{R3OCehb%FzBB*Q>s;MB z9+&cl)3diNlVb?qec;9BwFOHxTQgWoWq<5oXybNxBPS8_eRI~|<3EKb++U`?iJeMSy{^XsK`+0|Nttr>mdKI;Vst077cSasU7T literal 0 HcmV?d00001 diff --git a/kubejs/assets/create/textures/block/blaze_super_active.png b/kubejs/assets/create/textures/block/blaze_super_active.png new file mode 100644 index 0000000000000000000000000000000000000000..854549b35e73e96b1e5982f320fc802b738617d1 GIT binary patch literal 478 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7^D~{D12U7785lGsmQLL3 zeb_L{by6uZhf`rs<>BHt)Q&%>&&U8^5F3MdeW{Uh~< zzeF@fl*Lid<<6bIQA>_|pXJoOr99@Iy#Kq(oz;9CX*_9GwVDUE#LV+OeJLx^mutUr zi^f?AC9dK(OYbDf*&aWy%(Tc(#dZC?-@E!2E_!C5VBlbLI_I6xdExYJG0`97K5}Sl zyFLWt9EL-`9TvZ<+`oL@bqi)E{R3OCehb%FzBB*Q>s;MB z9+&cl)3diNlVb?qec;9BwFOHxTQgWoWq<5oXybNxBPS8_eRI~|<3EKb++U`?iJeMSy{^XsK`+0|Nttr>mdKI;Vst0Ai!W^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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0XBj({-ZRBb+K z1_qX2nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rg~<&$%ZCI3g(u2hGqtqMkYE6Mh1rF z`Ud9uhQ_)EhE@hqbJP@rU|U{jQmW)~a?a1mFY?V#NwrlnMi%#Ub`B`YPs_|nwN)w(a(7Zl zD$UF((ap>QJJ8qH$}_LHBrz{J)zigRsUo*PFEca6$|NZ~B{U62%S6c=KhHB>Xm7mn*B*nyq1TWvZJ3;u?WkKDo zpLm7&c^MfQng0Fpc)Gjlt-Ox195WXOyR5XNyNi?B?Om&1Fx`Iq^6B$ufmtO5tB$;U z_x|0dFaQ7jzkL5mpsUr4{a0ST|H$IT`{nol?;l>j)HSmbIsJ`?jphE2&;S1YXJTLw z73BZ@=dTbSkH5K&yuQYc_|JE5-eh5CV}0`O!~F92mUYj{Po|xVbz8wubG&+WL4jN|MTX@-;c~(n{U7MRT0vOEekSK^!ajj z<&F1RYRcAnn#}*ciRzeMe*NwB_dm>@R>nenJfed9Z$EyP5ac`XV_?h|p&)@IA{dn^7wXm>A9mnN|KNzpxf4uL}Ck-jV z-}ij>n|?{ zTQu{X?k7AfEG(9K8fHK4K7IX`lbxNhJ~QFv%a>US|7JX5{qXs-m>}QR?>|3&`Fi!< z%&N*|6uJJm>#g+*0?S{`mXv|G$6#PF=Yvz{krk zAfO%`zk`?S=dXV^j_l%BHMsloeb!l*XGI_^2Hfe+BZ=SQVFh73vj**FR>#=ihSoq$2 z_{7V_X|An$;^MVaS8o3O|6f&3>df0;ELXoUGT(Xd|Ns9-FJ6la3-Jhx-~YoAEAWm} znC%F&#IBPUDvgEb-}}YJ!TIg`&(qg#Gm8oE^KoqfB*hfno2Oec_`2D>9?pN6C)$Tf~=rUk^8C2tPi=Qdrm*w`kEtb{Y}{) vFC_kceEt68t_L5lDmeP`eU4P&kro$w7dr9a;ZLluK}`ZrS3j3^P6zxBI98t(I3+RA(WSZB zwYf>eC0XK05^vUotBbC$cX(U0Ug(n4784HMK<{|x|Bh=NvmFIQ99^QTr0Gd)L2w;kV3(H)rml;8}Sht?4b!(yp-|`#v;G>s4>6YwMIWvA4B zjdNFiIByi>J>L}jwIp52;^Kj*YbUt-xvM|zob;_+u2eXE)dq=)RyxHjlMNi1c6bIP z^~$)`1aVJ_ES~@W`t}36>MKlszMf)uWTK*W-1-%&FK11fC1$G{-?!=1-}-rJRYi-g z-IZ+kmVUZQzO^rQMVQX(-#0d`Qh!jsz`U2VTwBmJ@4JI>uA z3=9mM1s;*b3=DjSK$uZf!>fUTfkD*M#WBRfKRH2yb+Mv>6w_iw22Mr>76AsvqNT!R Q3=9kmp00i_>zopr05;#r&j0`b diff --git a/kubejs/assets/create/textures/block/blaze_heater_brazier.png b/kubejs/assets/create/textures/block/blaze_heater_brazier.png index 43cca78ec0640ed1f26858a8e9f208a5d192af85..8cb31cba50324cb2a6ae85ed1314571bfa95206c 100644 GIT binary patch literal 2197 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 RGB7YOc)I$ztaD0e0sx)DHxvK> 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0XBj({-ZRBb+K z1_ssxnIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rg~<&$%ZCI3g(u2hGqtqMkYE6Mh1rF z`Ud9uhQ_)EhE@hqbJP@rU|U{jQmW)8bh!dFe_D@KCdI&dGq1QLF)umQ)5TV)BDX*$$<&jxjl3!E_%_YI9g-}*brUE!+ zSS2QdQoOBFGAOE3QnOH)AI3GZaEzd~J!<7giDvI;dO3D+9QXSJ%^GXP$E`40C zE>0}N?`Gm+4dNm+H=`s;hze5N3=PQSjKsY3)D&AKeI<}D^g%@nBpUR=85t>tz;Z~% zkez}JSSZNF4a5YOn4r?rP61IYr{<;DDitZ&+i7pF*u}uW)aU8q7@{%JH_+Q(I8kKo z`lZh4R+rChS!xlmEH@)FbD`8qg-i!wWzI!;K1b%}#q3Btd}```2lKq%Nk5__Z%TGL z8s>HUU~)G*LILqpJ+Wvh!eXC^&4a_CdI@;aqk zg-^<@GG zMSC%)+_afhu{X|4UadWln zG(#0*%jQ0p8+Lher{A`EkEi=oX&beh_-R`Yz zCT7Z}Ru9;M87uZ}DGEvHE_lIQGg;mCfuKr$n6t0KjeP&-pVHjq`_%vX?bbMbq2OSq zn{hh($GqohNzs>=^(`+iKV|wtZbMnhXV+OO2aG~=gH;r@ySm?RDi$lzd%!L%;@bH( z#me_s#l9S4>1~@@pWRwJ_l%p-@l3&Wss+8vf>tjS%#UYZt$yqF;fWb?hx=EtJKO!^ z*n7WYiOb5A W6#6vb$#f}DTf)=T&t;ucLK6Ue3M9_} delta 461 zcmZ1>c!zm{WIY=L1B3kM|A`C?jJcW4&HzxBI98t(I3+RA(WSZB zwYf>eC0XK05^vUotBbC$cX(U0Ug(n4784HMK<{|x|Bh=NvmFIQ99^QTr0Gd)L2w;kV3(H)rml;8}Sht?4b!(yp-|`#v;G>s4>6YwMIWvA4B zjdNFiIByi>J>L}jwIp52;^Kj*YbUt-xvM|zob;_+u2eXE)dq=)RyxHjlMNi1c6bIP z^~$)`1aVJ_ES~@W`t}36>MKlszMf)uWTK*W-1-%&FK11fC1$G{-?!=1-}-rJRYi-g z-IZ+kmVUZQzO^rQMVQX(-#0d`Qh!jsz`U2VTwBmJ@4JI>uA z3=9mM1s;*b3=DjSK$uZf!>fUTfkD*M#WBRfKRH2yb+Mv>6w_iw22Mr>76AsvqNT!R Q3=9kmp00i_>zopr0Jy=)i2wiq diff --git a/kubejs/assets/create/textures/block/blaze_inert.png b/kubejs/assets/create/textures/block/blaze_inert.png index 13e2153c7ce190d58a3e5f8931a7f49556e899ae..0ffeba545726ae12bf4a2a4ead5c8389b3810cfb 100644 GIT binary patch literal 1509 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLI14-?iy0XBj({-ZRBb+K z1_qX2nIRD+5xzcF$@#f@i7EL>sd^Q;1q>iyV_#8_n4FzjqL7rDo|$K>^nUk#C56ls zTcvPQUjyF)=hTc$kE){7;3~h6MhI|Z8xtBTx$+|-gpg^Jvqyke^gTP3i$ zR(Zu%AYpwa1+bEmY+EHqkcA2nz5xo(`9-M;rg~<&$%ZCI3g(u2hGqtqMkYE6Mh1rF z`Ud9uhQ_)EhE@hqbJP@rU|U{jQmW)FgX(l%JNFlWMC}9OUk#kW`wP zQ=*%h2X>&Zua#$BaYN~*c8MXHIRZj!mN zsjg{Cnu$SblA%S4p#@C8OMY@GD7InxQ%KbBUzC}inU|PDwmG0Y2udba9+|}@`9+n` zToRmG2xaADDu7dlRbnzI#oH<+gQ7Y$MF}dLNp=W8j4jVd&BK)lAS#OU(@M${i&7oa zQ}ap)q%M6s1si=(ri6GvADjh{{05do%D^z?K`w3}Cb+Btl{T^ b!sQl>n{C`qly)*Cg9>6#S3j3^P6zxBI98t(I3+RA(WSZB zwYf>eC0XK05^vUotBbC$cX(U0Ug(n4784HMK<{|x|Bh=NvmFIQ99^QTr0Gd)L2w;kV3(H)rml;8}Sht?4b!(yp-|`#v;G>s4>6YwMIWvA4B zjdNFiIByi>J>L}jwIp52;^Kj*YbUt-xvM|zob;_+u2eXE)dq=)RyxHjlMNi1c6bIP z^~$)`1aVJ_ES~@W`t}36>MKlszMf)uWTK*W-1-%&FK11fC1$G{-?!=1-}-rJRYi-g z-IZ+kmVUZQzO^rQMVQX(-#0d`Qh!jsz`U2VTwBmJ@4JI>uA z3=9mM1s;*b3=DjSK$uZf!>fUTfkD*M#WBRfKRH2yb+Mv>6w_iw22Mr>76AsvqNT!R Q3=9kmp00i_>zopr02|@SzyJUM From 6ac60ec8416b4b5389a0ba7b95d8aed308c5d6a9 Mon Sep 17 00:00:00 2001 From: Pyritie 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLJ2IV}1Kd4*0~C@M{m~~<7bmThIa_aiuoMYgQew!UW@!+aCr`Mh64&gP~`ekiqR`(Z? zCn@Pq!Z&E;FIcryQ*397`=UiFeK&^m{d>19+`hPKOQz!KJJTP2I9~YdebEMUnSXUQ zGIBPGUuTBD^{h*uUu^IB)_2PpR+SndloB>l+&B8kk#|SXdbuD?ovgoq|nKN}5%WiyPFkqLegSrHqo20xNy} z^73-Ma$~*xqI7*jOG`_A10#JSBi*8uG~MFLypqHU-MnIDmtpvG3@7Wn$Y4bCfuhE#HXu6{*gfxe-hfqrf-$YWq17nit}mEc!h98y`3 zsvneEoL^d$oa$PZnpdI>vka7N;JQJcNYBhI0DGe%w*YQQN-|tcL1|GASUx3LKQ$*c zH#M)MSl>|35U#c&w*amftK(r-mt>|P!Vg6yNCxarn9_ob{F40QjC>p>!=>Sx3VeO7 zT=J7kLC*7Zu~h>3$|@y4IWxry%uF-1v@}mOPS!OxOf=CoNij3fO*Ak!)HO;>G%`vy zF*Px?Gy_=RKim zndzpOCtIW@StKS}TBax|fFjAtF~HMS$wa#EJ@2R%C%MU$;>OQfQp7>=B5Uh zB!Z&A(9Folz}(W<+|bP2z}Ub7sv<14s5mn}4`h^~fu50xl0r(dm0NyMZeoe8Qf6*q zda8awUOHG5WIUQ^MQ(wWb5UwyNq$jCetwRv63A%^MtX(@VBbRIQe6^DQf-w$c}dsM zK-b71#K_Rf)X2)fOxwWJ$^fd=H$NpatrAVCVThrzm9c@9fjNrO)RM%M#F9jUia`m- z%D*TxHLoNQl)Y?~43!k%sl&=SKPSJ)H$NrSR>>HY8NoTt$|JM5B)_N zOa*Y}vPw*bm{puumYSjj6->@Z%u7#Au~pKCiDY6)Cl-dOriNzbmb#WENyfS+7RH9U zNv4*`x&}$+DduUW$(Bh*rZD}*`DrEPiAAZ7>8W`owo2}qxdq^mRnP#(uqI4hc}6NI z`V5Q=bq!2)jm$y}&8FX zHG!Q1qKZk)OR-fdQnI(RSZMFUz`*F}>EaloF>&f7L+`^55^eI?T?J3rUSD&_IIy;3 zrgFx$zNY<0Z{ECr>F!DeS7Yr-z81DQ+q8bjvL8J9aKp4~UH6Lg-+w<;{{CZ5Y}_2? zhR=Fo8$a`Pgr2#?xp=|i*{g&EpVzJtS+JE&tnahk6S2!4F6VAlZ(EpJvSjVVU5pa4 z+1X3-8uRPVBtF@bK09&#BA;EmZ7Y~=E;(Lom6#l;cK7d}$8SX~ENvsMU-Oui`Mg#= z=gqrsc5?6I=H1_1b0BWlx^AP5Zb?fQMQCQT%xmy{sUy!&YMk887hoQtynpHUOCOvT z2>;utG5P+b{_?9|b4r#puIKyxGv3PLy|Um&w;4YFuQdKI?>ICyP0C>MO4FbzCwJ}J zH8pX5#X6<6rn=WoTz%{OA~^Q^p>L_SZ-UJ?9KOc2R(k?lQT+nZ2sYydyA;fQnm==H Xuu@|3X?ZsdRF!+W`njxgN@xNA3Il=5 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0X7ltGxWVyS%@ z0|UEOW=KRygs+cPa(=E}VoH8es$NBI0Rsrw*jE%JCTFLXC?ut(XXe=|z2CiGNg*@E zRw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+asv@@_H?<^Dp&~aYuh^=>Rtapb zRbH_bNLXJ<0j#7X+g8aDWT8TYZ-9bxeo?A|rJkW~vVnn-g1Mz$qFJJuv89=gf{}rd ziN1lczM+w>fw`55g_V)90u(6ODcBUHq*(>IxIrx|N=dU-$|xx*u+rBrFE7_CH`dE9 zO4m2Ew6xSWFw!?N(k)6!(=D#dD@m--%_~-hnc$LIoLrPyP?DLSrvNfBF)6>a#8ycO zYHUSrfv+#z;JjjJNG0dz>Q^Kd=o{)8=;!8wJO=i0afxeL34YbZA(aKG`a!A1`K3k4 zsjg+Ic_qp)%iKME1K_$ro=DHkEdYC?BDVl;NlG$YO+jf<4p=@VSwA%=H8(Y{q*&ij z&k(M*BDVmp7^~x9Ru^RCm*f{`Fq(6f3yFRz|5wrb!k_iMpumPUz*x)!D>7AeMNrY0$7$smhC zrg`QSmn7yTr-DqY$Su&z%uKN|H#RXhN=r`DHMTIf&^1jqG15)6NH)|>G`28FNlQ#L zPqnm!>Gv(hL*aPiAH9+Ddx!*sYw=z ziI$crN(!K;vT_XYv{f?FGk|gfauQ3@@{4k9m3%VuN-LnEA(^?U!6k{Hh%huWGBPl? zG&VOhGdD0cuz;!vOD!tS%+CWEWoV#hWTK>yl5FLcUzD3zVyl#yo0y)eUyzp$76loP zCR&kOVC7ttnpl!w6q28xW2*#mnu3v@p#j*p5V=&B#FA87B_jhPBV7X%T|<))P>wRN zGB(#XFtIX#D)r4z$xN$+D>czIG|)9N3^6peGB&U>HqtgQMJP=zNlZyBNhGKk5y8&+ zIr&At`6;QkO2$eGpcG=|UzC}eSCRzlbBQY;MHN{p*A10ECC7oCprkWa>nOo{wnj{(PnphYc>L!_5 zChHm`nWvbinI>B%8JWWL7w4yylqVLYI;N-QmDnn|XXX}wLsmfp9K)J0b>$hUpy)F& zGSoFN)ip8;F*LU_F}E_Z1QlEc21@!wxgVQriA&XxK!LjgSHwY-p?L~Y5(mKYzk-pe zo}rO~MtEjkN`84U+>1zo3-XOVsH}uUj6QmtA)*|XzZ~YQA1b(HR$zZy} za7pjqW~Udk4Y|eV@gL3JJ@xaXFU4LLOge0s+=O?`*%|-(@R_aQJydg?^_d;p{~wc=z4dShw~ksfsAb^k L>gTe~DWM4f=cCC@ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta new file mode 100644 index 000000000..ce9216fdd --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/coils/machine_coil_copper_bloom_ctm", + "emissive": true + }, + "gtceu": { + "bloom": true + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..fd24da44251a267035e7929bca98043cdfa8194a GIT binary patch literal 2653 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNf=9$jU0gfs8NvR4!?oJ9C zhL)BVnhXpY6Q}m?_c|OP(!O8X_2|MdjzM~)H12NA9Vc4S;KsEWwUb&4{P`RFLUo(%A8|doOFF|TVUJgh}C76C$4*b z`lfi=45kLZ8B5Dnmof;b7aozg|DL1ay6^6HCdYo)8_6&8VpdMrEuE^^!F6H(rIl=k zEN2$X&l2EoSm}4mRKVY1<@Ddu0bE7@8N5z?tr3WCxLIr~-(z`zrzoD$M>aOQA!-ue zmB{xYr&py$UV5kIsM60qv+tboPWkpuFX5{f1I16gXHGDb&oP(X8MbxJ-mmrlYz41> zPR*O|&f%bAD<0`su~4r*RKj}l>!jlal6>zIt3pzCn-^?n>200A5O zih{)C?9>v4q}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7 z*i=|mnkaMm6T-LDnTMN!Z$#{Ilm}X!BWpq zH`&0zNWt7vFVQT~%-GUQN5ROz$VA`3Sl`e{*TCG$#KOwRSOE%@>=bN@Qqrt~T->0R z6{V!vDrJbkMLA#(q$KO7=A`DP=9Lud z8|oRtt#bGD4S=f#c{n{Yw*ai8BDVmpsv@@lt_Z8+VOAGpn0kQnCqID7+UIDCK{RPrkE#Nq$XJ;CR$piC@G{QTe;;IWl30>RP%%8sSUKnCpY9W-Blc@mCTvmz65Ix0-WvMAjP{HJk#Ju#>6k8>Im`Em;bYfwc zYHDa^ZmDZ&l4PuFVqt8kn`CO4tZR^Do?@P6nrxY5WD3(?oS#-wo>-LXn4X$fVyony znOgu3Sp^MntZBm3m1m@aqQt<+P}jgz*T^iy(A>(z+{(xjRAd<#DCraBer&EKE>%MU z1?~!55eHF*<|#-S901Gt3Pz@ShDHh+;hA|U`Q^oMFCqml$T#|+QW6p|`si^6mP0C0 z?G$XlLP0KWASSr<2h{|23WzEuH7~_hsYuD*F6r;h*9;6yCY~;iArY->r`hM;Tvn6m-GD;YSW+SHP@;n>-aWlk8Lj7SDjG^6ciky@@RO6_`M#H*Ugd^8 zza4D#?#-)PuUZ>Fr2gs4-TCp{j5+2H-p?@*_!qkT=3?81`1{|i?$5h^posbMOo`LK z4mJ<9V$UAa() zli6H0v)+`)#VRqu$a-R<^Ox5K3J=d41(cmXy)NmW?1T^UX$v0Ao6a~Z(c#kk)Cad- zF}B3p{q8Oev1lkTI{m8Yn+fx#e+B||G2B^~XG$D*;Mx5pwDb(agRQTM{)N>(XEs>z zVEI(`RWlm=DaZjUO-e)UAPM}BI- zzE7d1E}kBx=?uj$@%~Q literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta new file mode 100644 index 000000000..5f4d1c8fd --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta @@ -0,0 +1,5 @@ +{ + "gtceu": { + "bloom": true + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_ctm.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..5bbd2fd924a985df51d28f96e3539d2ef4a4ef89 GIT binary patch literal 2826 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 JS?83{1OR3ZDa-%> 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4kiW$h6xih%orFLJ2IV}1Kd4*0~C@M{m~~<7bmThIa_aiuoMYgQew!UW@!+aCr`Mh64&gP~`ekiqR`(Z? zCn@Pq!Z&E;FIcryQ*397`=UiFeK&^m{d>19+`hPKOQz!KJJTP2I9~YdebEMUnSXUQ zGIBPGUuTBD^{h*uUu^IB)_2PpR+SndloB>l+&B8kk#|SXdbuD?ovgoq|nKN}5%WiyPFkqLegSrHqo20xNy} z^73-Ma$~*xqI7*jOG`_A10#JSBi*8uG~MFLypqHU-MnIDmtpvG3@7Wn$Y4bCfuhE#HXu6{*gfxe-hfqrf-$YWq17nit}mEc!h98y`3 zsvneEoL^d$oa$PZnpdI>vka7N;JQJcNYBhI0DGe%w*YQQN-|tcL1|GASUx3LKQ$*c zH#M)MSl>|35U#c&w*amftK(r-mt>|P!Vg6yNCxarn9_ob{F40QjC>p>!=>Sx3VeO7 zT=J7kLC*7Zu~h>3$|@y4IWxry%uF-1v@}mOPS!OxOf=CoNij3fO*Ak!)HO;>G%`vy zF*Px?Gy_=RKim zndzpOCtIW@StKS}TBax|fFjAtF~HMS$wa#EJ@2R%C%MU$;>OQfQp7>=B5Uh zB!Z&A(9Folz}(W<+|bP2z}Ub7sv<14s5mn}4`h^~fu50xl0r(dm0NyMZeoe8Qf6*q zda8awUOHG5WIUQ^MQ(wWb5UwyNq$jCetwRv63A%^MtX(@VBbRIQe6^DQf-w$c}dsM zK-b71#K_Rf)X2)fOxwWJ$^fd=H$NpatrAVCVThrzm9c@9fjNrO)RM%M#F9jUia`m- z%D*TxHLoNQl)Y?~43!k%sl&=SKPSJ)H$NrSR>>HY8NoTt$|JM5B)_N zOa*Y}vPw*bm{puumYSjj6->@Z%u7#Au~pKCiDY6)Cl-dOriNzbmb#WENyfS+7RH9U zNv4*`x&}$+DduUW$(Bh*rZD}*`DrEPiAAZ7>8W`owo2}qxdq^mRnP#(uqI4hc}6NI z`V5Q=bq!2)jm$y}&8FX zHG!Q1qKZk)OR-fdQnI(RSZMFUz`*F}>EaloF>&f7L+`^55^eI?T?J3rUSD&_IIy;3 zrgFx$zNY<0Z{ECr>F!DeS7Yr-z81DQ+q8bjvL8J9aKp4~UH6Lg-+w<;{{CZ5Y}_2? zhR=Fo8$a`Pgr2#?xp=|i*{g&EpVzJtS+JE&tnahk6S2!4F6VAlZ(EpJvSjVVU5pa4 z+1X3-8uRPVBtF@bK09&#BA;EmZ7Y~=E;(Lom6#l;cK7d}$8SX~ENvsMU-Oui`Mg#= z=gqrsc5?6I=H1_1b0BWlx^AP5Zb?fQMQCQT%xmy{sUy!&YMk887hoQtynpHUOCOvT z2>;utG5P+b{_?9|b4r#puIKyxGv3PLy|Um&w;4YFuQdKI?>ICyP0C>MO4FbzCwJ}J zH8pX5#X6<6rn=WoTz%{OA~^Q^p>L_SZ-UJ?9KOc2R(k?lQT+nZ2sYydyA;fQnm==H Xuu@|3X?ZsdRF!+W`njxgN@xNA3Il=5 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 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0X7ltGxWVyS%@ z0|UEOW=KRygs+cPa(=E}VoH8es$NBI0Rsrw*jE%JCTFLXC?ut(XXe=|z2CiGNg*@E zRw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWPQj+asv@@_H?<^Dp&~aYuh^=>Rtapb zRbH_bNLXJ<0j#7X+g8aDWT8TYZ-9bxeo?A|rJkW~vVnn-g1Mz$qFJJuv89=gf{}rd ziN1lczM+w>fw`55g_V)90u(6ODcBUHq*(>IxIrx|N=dU-$|xx*u+rBrFE7_CH`dE9 zO4m2Ew6xSWFw!?N(k)6!(=D#dD@m--%_~-hnc$LIoLrPyP?DLSrvNfBF)6>a#8ycO zYHUSrfv+#z;JjjJNG0dz>Q^Kd=o{)8=;!8wJO=i0afxeL34YbZA(aKG`a!A1`K3k4 zsjg+Ic_qp)%iKME1K_$ro=DHkEdYC?BDVl;NlG$YO+jf<4p=@VSwA%=H8(Y{q*&ij z&k(M*BDVmp7^~x9Ru^RCm*f{`Fq(6f3yFRz|5wrb!k_iMpumPUz*x)!D>7AeMNrY0$7$smhC zrg`QSmn7yTr-DqY$Su&z%uKN|H#RXhN=r`DHMTIf&^1jqG15)6NH)|>G`28FNlQ#L zPqnm!>Gv(hL*aPiAH9+Ddx!*sYw=z ziI$crN(!K;vT_XYv{f?FGk|gfauQ3@@{4k9m3%VuN-LnEA(^?U!6k{Hh%huWGBPl? zG&VOhGdD0cuz;!vOD!tS%+CWEWoV#hWTK>yl5FLcUzD3zVyl#yo0y)eUyzp$76loP zCR&kOVC7ttnpl!w6q28xW2*#mnu3v@p#j*p5V=&B#FA87B_jhPBV7X%T|<))P>wRN zGB(#XFtIX#D)r4z$xN$+D>czIG|)9N3^6peGB&U>HqtgQMJP=zNlZyBNhGKk5y8&+ zIr&At`6;QkO2$eGpcG=|UzC}eSCRzlbBQY;MHN{p*A10ECC7oCprkWa>nOo{wnj{(PnphYc>L!_5 zChHm`nWvbinI>B%8JWWL7w4yylqVLYI;N-QmDnn|XXX}wLsmfp9K)J0b>$hUpy)F& zGSoFN)ip8;F*LU_F}E_Z1QlEc21@!wxgVQriA&XxK!LjgSHwY-p?L~Y5(mKYzk-pe zo}rO~MtEjkN`84U+>1zo3-XOVsH}uUj6QmtA)*|XzZ~YQA1b(HR$zZy} za7pjqW~Udk4Y|eV@gL3JJ@xaXFU4LLOge0s+=O?`*%|-(@R_aQJydg?^_d;p{~wc=z4dShw~ksfsAb^k L>gTe~DWM4f=cCC@ diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta deleted file mode 100644 index ce9216fdd..000000000 --- a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom.png.mcmeta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ldlib": { - "connection": "tfg:block/casings/coils/machine_coil_copper_bloom_ctm", - "emissive": true - }, - "gtceu": { - "bloom": true - } -} diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png deleted file mode 100644 index fd24da44251a267035e7929bca98043cdfa8194a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2653 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANNf=9$jU0gfs8NvR4!?oJ9C zhL)BVnhXpY6Q}m?_c|OP(!O8X_2|MdjzM~)H12NA9Vc4S;KsEWwUb&4{P`RFLUo(%A8|doOFF|TVUJgh}C76C$4*b z`lfi=45kLZ8B5Dnmof;b7aozg|DL1ay6^6HCdYo)8_6&8VpdMrEuE^^!F6H(rIl=k zEN2$X&l2EoSm}4mRKVY1<@Ddu0bE7@8N5z?tr3WCxLIr~-(z`zrzoD$M>aOQA!-ue zmB{xYr&py$UV5kIsM60qv+tboPWkpuFX5{f1I16gXHGDb&oP(X8MbxJ-mmrlYz41> zPR*O|&f%bAD<0`su~4r*RKj}l>!jlal6>zIt3pzCn-^?n>200A5O zih{)C?9>v4q}24xJX@vryZ0+8WTx0Eg`4^s_!c;)W@LI)6{QAO`Gq7`WhYyvDB0U7 z*i=|mnkaMm6T-LDnTMN!Z$#{Ilm}X!BWpq zH`&0zNWt7vFVQT~%-GUQN5ROz$VA`3Sl`e{*TCG$#KOwRSOE%@>=bN@Qqrt~T->0R z6{V!vDrJbkMLA#(q$KO7=A`DP=9Lud z8|oRtt#bGD4S=f#c{n{Yw*ai8BDVmpsv@@lt_Z8+VOAGpn0kQnCqID7+UIDCK{RPrkE#Nq$XJ;CR$piC@G{QTe;;IWl30>RP%%8sSUKnCpY9W-Blc@mCTvmz65Ix0-WvMAjP{HJk#Ju#>6k8>Im`Em;bYfwc zYHDa^ZmDZ&l4PuFVqt8kn`CO4tZR^Do?@P6nrxY5WD3(?oS#-wo>-LXn4X$fVyony znOgu3Sp^MntZBm3m1m@aqQt<+P}jgz*T^iy(A>(z+{(xjRAd<#DCraBer&EKE>%MU z1?~!55eHF*<|#-S901Gt3Pz@ShDHh+;hA|U`Q^oMFCqml$T#|+QW6p|`si^6mP0C0 z?G$XlLP0KWASSr<2h{|23WzEuH7~_hsYuD*F6r;h*9;6yCY~;iArY->r`hM;Tvn6m-GD;YSW+SHP@;n>-aWlk8Lj7SDjG^6ciky@@RO6_`M#H*Ugd^8 zza4D#?#-)PuUZ>Fr2gs4-TCp{j5+2H-p?@*_!qkT=3?81`1{|i?$5h^posbMOo`LK z4mJ<9V$UAa() zli6H0v)+`)#VRqu$a-R<^Ox5K3J=d41(cmXy)NmW?1T^UX$v0Ao6a~Z(c#kk)Cad- zF}B3p{q8Oev1lkTI{m8Yn+fx#e+B||G2B^~XG$D*;Mx5pwDb(agRQTM{)N>(XEs>z zVEI(`RWlm=DaZjUO-e)UAPM}BI- zzE7d1E}kBx=?uj$@%~Q diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta deleted file mode 100644 index 5f4d1c8fd..000000000 --- a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_bloom_ctm.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gtceu": { - "bloom": true - } -} diff --git a/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_ctm.png b/kubejs/assets/tfg/textures/block/casings/coils/machine_coil_copper_ctm.png deleted file mode 100644 index 5bbd2fd924a985df51d28f96e3539d2ef4a4ef89..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2826 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 JS?83{1OR3ZDa-%> 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)