From a95cf0342d61144841b2b162b5da5fb604275f2e Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Tue, 10 Mar 2026 15:26:23 +0000 Subject: [PATCH 01/12] maybe fixed? --- .../multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js | 2 +- .../hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js | 2 +- .../hardmode/machines/multiblocks/pre_lv/steam_forge.js | 2 +- .../hardmode/machines/single block/stirling_generator.js | 2 +- .../hardmode/machines/single block/ulv_gt_machines.js | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js b/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js index f0d639501..1f4eb6a06 100644 --- a/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js +++ b/kubejs/startup_scripts/hardmode/machines/multiblocks/Resource_Gen.js/High_Pressure_Steam_Sifter.js @@ -34,6 +34,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { .where('D', Predicates.blocks('kubejs:meshblock')) .where('@', Predicates.controller(Predicates.blocks(definition.get()))) .build()) - .workableCasingModel('kubejs:block/hm/high_steam_machine_casing', 'gtceu:block/machines/sifter') + .workableCasingModel('kubejs:block/casings/basic/high_steam_machine_casing', 'gtceu:block/machines/sifter') }); \ No newline at end of file diff --git a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js index 72462cc1a..05a1ad5e8 100644 --- a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js +++ b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/Rugged_Alloyer.js @@ -21,7 +21,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { .where('#', Predicates.blocks('minecraft:air')) .where('B', Predicates.controller(Predicates.blocks(definition.get()))) .build()) - .workableCasingModel('kubejs:block/hm/reinforced_stone_bricks', 'gtceu:block/machines/electric_furnace') + .workableCasingModel('kubejs:block/hardmode/reinforced_stone_bricks', 'gtceu:block/machines/electric_furnace') .editableUI( global.ui_builder({ group: 'primitive', diff --git a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js index 035622a42..b9793068e 100644 --- a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js +++ b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js @@ -28,6 +28,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { .where('#', Predicates.any()) .where('@', Predicates.controller(Predicates.blocks(definition.get()))) .build()) - .workableCasingModel('kubejs:block/hm/high_steam_machine_casing', 'gtceu:block/machines/blasting') + .workableCasingModel('kubejs:block/casings/basic/high_steam_machine_casing', 'gtceu:block/machines/blasting') }); \ No newline at end of file diff --git a/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js b/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js index 80571e36c..4e910417b 100644 --- a/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js +++ b/kubejs/startup_scripts/hardmode/machines/single block/stirling_generator.js @@ -18,6 +18,6 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { builder .recipeType('stirling_generator') .regressWhenWaiting(false) - .simpleGeneratorMachineRenderer('gtceu:block/generators/steam_turbine') + .simpleGeneratorModel('gtceu:block/generators/steam_turbine') }); }); \ No newline at end of file diff --git a/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js b/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js index fe7887750..9aa9b7277 100644 --- a/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js +++ b/kubejs/startup_scripts/hardmode/machines/single block/ulv_gt_machines.js @@ -4,7 +4,9 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { const ulv_machine = (machine) => { event.create(machine, 'simple') .tiers(GTValues.ULV) - .definition((tier, builder) => builder.recipeType(machine)); + .definition((tier, builder) => builder + .recipeType(machine) + .workableTieredHullModel(`gtceu:block/machines/${machine}`)); } ulv_machine('mixer'); From 0e58f62c0f4d7a2ae8d4c985b34c60365c5af020 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Tue, 10 Mar 2026 15:40:00 +0000 Subject: [PATCH 02/12] texture fixes --- kubejs/startup_scripts/hardmode/objects/blocks.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/startup_scripts/hardmode/objects/blocks.js b/kubejs/startup_scripts/hardmode/objects/blocks.js index a2dc8efd2..b35fa7f24 100644 --- a/kubejs/startup_scripts/hardmode/objects/blocks.js +++ b/kubejs/startup_scripts/hardmode/objects/blocks.js @@ -26,7 +26,7 @@ StartupEvents.registry('block', event => { .soundType('sand') .requiresTool(false) .tagBlock("mineable/shovel") - .textureAll('kubejs:block/hm/refined_sand'); + .textureAll('kubejs:block/hardmode/refined_sand'); event.create('refined_dust', 'falling') .hardness(1) @@ -34,7 +34,7 @@ StartupEvents.registry('block', event => { .soundType('sand') .requiresTool(false) .tagBlock("mineable/shovel") - .textureAll('kubejs:block/hm/refined_dust'); + .textureAll('kubejs:block/hardmode/refined_dust'); // === Casings === event.create('reinforced_stone_bricks') @@ -44,5 +44,5 @@ StartupEvents.registry('block', event => { .requiresTool(true) .tagBlock("mineable/pickaxe") .tagBlock('minecraft:needs_stone_tool') - .textureAll('kubejs:block/hm/reinforced_stone_bricks'); + .textureAll('kubejs:block/hardmode/reinforced_stone_bricks'); }); \ No newline at end of file From 128273f0c08a4f8be11ccec991a6477c9a91b9b6 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Thu, 2 Apr 2026 08:07:01 +0100 Subject: [PATCH 03/12] fixed kube errors --- .../progression/general_progression/casings.js | 14 +++++++------- kubejs/server_scripts/hardmode/progression/misc.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kubejs/server_scripts/hardmode/progression/general_progression/casings.js b/kubejs/server_scripts/hardmode/progression/general_progression/casings.js index 806a2ab76..885fcffa9 100644 --- a/kubejs/server_scripts/hardmode/progression/general_progression/casings.js +++ b/kubejs/server_scripts/hardmode/progression/general_progression/casings.js @@ -12,7 +12,7 @@ ServerEvents.recipes(event => { const SpecialCasing = (material,tier,f,p,g,e) => { let type = (material == 'tungsten_steel') ? 'tungstensteel' : material ; if (f == true) { - let mod = (type == 'enriched_naquadah') ? 'start_core' : 'gtceu' ; + let mod = (type == 'enriched_naquadah') ? 'kubejs' : 'gtceu' ; event.recipes.gtceu.assembler(id(`${type}_firebox_casing_hm`)) .itemInputs(`6x gtceu:${material}_plate`, `6x gtceu:${material}_rod`, `gtceu:${material}_frame`) .circuit(2) @@ -41,7 +41,7 @@ ServerEvents.recipes(event => { } if (e == true) { let casingType = (type == 'titanium') ? 'gtceu:stable' : (type == 'tungstensteel') ? 'gtceu:robust' : `kubejs:${type}` ; - let engineType = (type == 'titanium') ? 'gtceu:' : `start_core:${type}_` ; + let engineType = (type == 'titanium') ? 'gtceu:' : `kubejs:${type}_` ; event.recipes.gtceu.assembler(id(`${engineType.split(':')[1]}engine_intake_casing_hm`)) .itemInputs(`4x gtceu:${material}_rotor`, `6x gtceu:${material}_normal_fluid_pipe`, `${casingType}_machine_casing`) .circuit(7) @@ -153,7 +153,7 @@ ServerEvents.recipes(event => { Hulls('iv','tungsten_steel','platinum','polytetrafluoroethylene',5); Hulls('luv','rhodium_plated_palladium','niobium_titanium','polybenzimidazole',6); Hulls('zpm','naquadah_alloy','vanadium_gallium','polybenzimidazole',7); - Hulls('uv','darmstadium','yttrium_barium_cuprate','polyether_ether_ketone',8); + Hulls('uv','darmstadtium','yttrium_barium_cuprate','polyether_ether_ketone',8); // Hulls('uhv','neutronium','europium','polyether_ether_ketone',9); // Hulls('uev','mythrolic_alloy','cerium_tritelluride','poly_34_ethylenedioxythiophene_polystyrene_sulfate',10); // Hulls('uiv','chaotixic_alloy','polonium_bismide','poly_34_ethylenedioxythiophene_polystyrene_sulfate',11); @@ -171,10 +171,10 @@ ServerEvents.recipes(event => { HermeticCasings('hv','stainless_steel','polytetrafluoroethylene',3); HermeticCasings('ev','titanium','titanium',4); HermeticCasings('iv','tungsten_steel','niobium_titanium',5); - HermeticCasings('luv','rhodium_plated_palladium','iridium',6); - HermeticCasings('zpm','naquadah_alloy','europium',7); - HermeticCasings('uv','darmstadtium','enriched_naquadah',8); - HermeticCasings('uhv','neutronium','neutronium',9); + // HermeticCasings('luv','rhodium_plated_palladium','iridium',6); + // HermeticCasings('zpm','naquadah_alloy','europium',7); + // HermeticCasings('uv','darmstadtium','enriched_naquadah',8); + // HermeticCasings('uhv','neutronium','neutronium',9); // Standard Casings diff --git a/kubejs/server_scripts/hardmode/progression/misc.js b/kubejs/server_scripts/hardmode/progression/misc.js index 69e5d824a..f9b5f463d 100644 --- a/kubejs/server_scripts/hardmode/progression/misc.js +++ b/kubejs/server_scripts/hardmode/progression/misc.js @@ -166,7 +166,7 @@ ServerEvents.recipes(event => { mold('pill',false,25); mold('nugget',false,26); mold('anvil',false,27); - mold('credit',false,28); + // mold('credit',false,28); mold('name',false,29); event.recipes.gtceu.mixer(id('cast_iron_dust')) From d4f3f8463e6e3af0d5303795fdb526da31e4e988 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Thu, 2 Apr 2026 08:43:23 +0100 Subject: [PATCH 04/12] fixed hm UIs --- .../recipe_type/advanced_machine_facility.rtui | Bin 0 -> 18319 bytes .../gtceu/ui/recipe_type/circuit_facility.rtui | Bin 0 -> 17731 bytes .../gtceu/ui/recipe_type/component_chamber.rtui | Bin 0 -> 14896 bytes .../ui/recipe_type/simple_machine_facility.rtui | Bin 0 -> 14279 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 kubejs/assets/gtceu/ui/recipe_type/advanced_machine_facility.rtui create mode 100644 kubejs/assets/gtceu/ui/recipe_type/circuit_facility.rtui create mode 100644 kubejs/assets/gtceu/ui/recipe_type/component_chamber.rtui create mode 100644 kubejs/assets/gtceu/ui/recipe_type/simple_machine_facility.rtui diff --git a/kubejs/assets/gtceu/ui/recipe_type/advanced_machine_facility.rtui b/kubejs/assets/gtceu/ui/recipe_type/advanced_machine_facility.rtui new file mode 100644 index 0000000000000000000000000000000000000000..3b53381b180e082183705638dc7e82668a78094c GIT binary patch literal 18319 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/ui/recipe_type/circuit_facility.rtui b/kubejs/assets/gtceu/ui/recipe_type/circuit_facility.rtui new file mode 100644 index 0000000000000000000000000000000000000000..1021338b937b0781addce23df889b5a10d401dcf GIT binary patch literal 17731 zcmeHPPjB1E6(3rXBh&v~!v%KHR+~eSLt$^?Z8jUA*_ABC7Q#q|%)sjtL5U-Y2t^9y zXchMq6g}wBFR+IKJ@w%BTlCUz(NEH{Z)P+kB~h}x)(Vj!Um}w8=e^(j=FOXVZz3a< zM(ZxFnQg3*>o!IQ4N}9Mmo?L^bxfkw^_pp!GpYt6bWv5(kNbgQMvY@{Ep%3-7^OOp`gHE z03;j4aV%oCRs4Z?fC^P`x2o6PH(aM<8}xO@#eI=dNH$w~17Fe+`Sv41DfH;NT(5hW z4henw5I(`k)f~%lefUeEwCfO^4m2$&Bf09h26pMVMMhYPN-RNpDX*qmnD?~Kx;|qB zpl{M>lf6-#8gDqm=|{N8-ch4t9#wS@A9DEnh0KEYNqw4Q5ADJ{-F%4)EhDkGR?Mn&$k`6>J0Qs_s zZ8j`Y8l`m0Y}kB?NN6({G1Y8)QqbjQgFsufL8=?&BxQ0uV-A*#0h6)FjCnd|#ynXv zX2BWrY|e~%xn#_OGv;{Cj1hj!!P1XeP(S9YIWtE1F-yiQs^|OrIWtE1F-yiQDr26{ znK8nTSu$o(8T0j=86*6dCrdwOLH(E)b7qY2W0s6rR2%cnoEanhm?dKtj4`q}^L;w+ zLto*@EGe_Fl$rObZz(v#1IX&8W#vr>?y-=~dRDp2UR`Lf-ziF5$Vfu6*L1qs7KDt5 zB%xgvhC8v$+WWk#n>IE^A{#qlk=M`{lo*M2{G^E1!bY!tJ1%-vw>qZ5;yiPVVey!i z%=^A2Xca`IwrEr;6nAo1O3>{9sxRp__h9L#O}9z5?|yW9vZNbCxR-Q;hCWXt! z(k*TwOrTAk<8rPWhG{owHUT%Ka6B+&)IaDjMN=@^!ir9nrt+8m8vYAfYbbr@vuJX~ zXCTl0(r0MG$@ruLaV)Y-Q&~v=6SA~^jy#n)Pnr09n09}T9K_6#{pcLohXUJe*MUqj z&l^sJ8lU$B6U%EszFYIWUln}cAqQtuDZExSwX9W&r)Q9SG>{w>&3ck~O>E?JH|t`^ z@L_Wy`? zUFzBfhHnP|cRFqj(h7Ml7YxJ(Zneqv&j158(G!-#PYMQDUIdI61h;9v-cE>`_!OWP zH{JMZlon<0zA6P(QC#ygSpXsbPB6fe(QhonGOLG>&36bHoy2hu*}8Zr^894UBqR{cVULSKPRIFZKYFHSL!<$U?FMCb9l^9M1BpD-X_3S?OZWq=$^Vy)i6);@*@__K+mT2u<*vh(VnV-sxu9Tjk&W$4Bx*h2a+J7vhw-~+~Kk(mI`6o!CCm~_632Zrfc+oQ`8HEw36ekL^Ij@pOpS5@yPlM^x7Mh5H$PpcFhK}(F3ibw&mk=dfg#&ANG6U z-HhY}+Y+0HeH1g=Tn%i1^C&JOXjQ9&XE0g*6&1EO$<9ncB%Xy&K*$jy-OijCgrjD8 z4W(%F-~_?d7#T@z?!9e?rdV&cEetm$PT0viZ0aSl8!EInDjaYqxiDt)^B7*t`7(!$ z4sV}w)L|MLeF%vduG79~>W0%DvLXqz9g_Nl-jU%pV*KryHP^AMi#EmvzY8;V!zk{g ztd`1^w^=2D_Ds8O=>&(jP1qF|FkRwW)iYWL6hKlot~lFb23Bb!sw!}4YtWyGwKfmd zllk)uJegJQ2*v_8do#TfwR|ggHPgR}nT}li85reERJ2TJ!-j8H$tVGiK!BIQRoyPu;F=SPR8bOtQkiL!8KJPYYUyAJj*g4=i|-h$!`m>BC-#jT!Z z&9Ny=fk7WVYvZa7`LnRm?Nf?hz~r0?o!X$i%>jA>Lc83N%Y?(UWE#EAJT23v^7%b* zGq5|+C;-c*yPO+!K+`B~iR-m%-1^t6E!ZK_O_$Z7$sylSDhRh@Yfumv{^z%QPkf^j zyKRBl$lrs7`QMI9<1yi-T(R>J-QAot@y0XPo^{jHIWeAIY9SikGV4E(O++j$8mbuD(YeD?Dy zfs%FCX#q*W?O7oX{P9mr)^6T|F{LCru3jSHe2g9Ojl|sJv zSLreMTB?>~aXj|Qr*`L&s$HHH)j|)<7JE9a6bhx@u@B#%xI&|T8f~qYzkveD^J3|Z z?;pd@)&6_d3p^;rw}oE!CeK>QDcO@Z`Nxl;(-iydv)|BLt^$FG-c1+EK_x0ONDLyc zt6Dx=dBfi1;SV^bYF7nCDPMwY$Fv<<(-$>QuCgFzw+qdbE7{U%!S{RAjxueimj@hE zwYS;RLP^c`Zt^!!@cdonTq*cJQt?wvQP2b`K~MZsk9|r2U_Jv(z9?iBP#=`>pFV$) zKr#n}A$@ZLZT4Rt2|Y&`~BlH%kuoaAsYd^Q+RH|(&-It0S$^t%X0en7#FG&&d0U@ByuSZM>rw;t5Bd&?PG}_<=^bTpl7JvH;X19}h OV_JGn_nKe86#YLCn|*`; literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/ui/recipe_type/component_chamber.rtui b/kubejs/assets/gtceu/ui/recipe_type/component_chamber.rtui new file mode 100644 index 0000000000000000000000000000000000000000..4dc68dd78e535dd04c5f3ab4ab67cd4395bed6c2 GIT binary patch literal 14896 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/ui/recipe_type/simple_machine_facility.rtui b/kubejs/assets/gtceu/ui/recipe_type/simple_machine_facility.rtui new file mode 100644 index 0000000000000000000000000000000000000000..549f2df751e74c46110f4ac712f64fa53e5f20af GIT binary patch literal 14279 zcmeHOO>g7I86H`ZSEl7p7@HtLT4fJGQ3Q6fP8UItk4l!-7FKHsG8c|d1TBsvVkuH3 zsc7BP9(vHN=N=05?DpDU&`bYCe@V+eGb4UTqHH;<2x~*WSRBsB`#$r|`#F>d$&huM zHuNr4+^a4npS0Wt?S13uovuNZj@oGJCRLhhLpOByN+K!SvfK<=HPkDs=aSTE^|U0B ztV4}v&2n^Cx6C9-ydfl!#Q!To$Ug~2Ir<-IlBD~(=C;vxog}Mms<+xM9`;FsZ0b(& z%2Ydg;|x7Dw0x`@hSmSER4$t>n`$~W-Re)&erfd_nph(l5N2pLH6_fD#0r|~sH7Sg=~^4o6$=na4GGC&o%M!l)_QK)r5z_RiPvtFu3hxs)@-$ZVgV2a z3N{0fWL?WLT)ivPH?9Lz7=t^PYU6dwwtA+- z6D|O(B||oNOT}u4iE}~R1{j$>(J` zcyqztNMw!AJVxCZo@@dx{hNXpWw+d>s==iEV_RzKfC*z6_} zWQV6Bjtsr=x@fD&hiDVg-FDdJIo3jtiHPrKMfLYKg8yt<1m84zy2fMO1;+6rZkNQ` zw*>A%WWLEF^N`$|Lvvr;9%J}Y+!mfNdcVc(rl^0axW#FvB-s#&*P5zny4e!RFP4*n z?>%EGDp)Yh@`7DotY^xd{&}cW*Vw4BobE@_jNeC~=iPF;EDJh46Xxemmzl78<_}0b z)rr!%>etI$<2g~W82-B_&hr$^d zvp5@-(sNmnt4h6me1eSlNX9;zikHMlsuff_Z&Re5`I!rH=sdfAr&2*M^x_97ryJ}* zl#DbPsR&@;gj7F^@h5!jluOk>5|BtEF-G4_3 z+~eip*y=87*F3z-vC3;KcyH$p-n-SsKaDw9VT3vzySW#}C9>|Sm$@!;U8ojd=NILf z?H_d;c*At3Cfrwa{CT$X`|In!Pq+=a7{EZdqZqWwFA{`i&o>pmYKMdH)$Im>--}RK zX2~BHfRV9PP478%nXv>0r&yL6F215En#F2-5A66N7M6Ew7O@n;uRO@&pn|bcOe}6{=#ji|byvrgOwoo(SF( z?oP#e#1VNo4=_BgY)3vE4^5TC=V0SzFbt{+Jd?lC4mvkJtq* zp(CbW-CDCP!#L|ws)>tOQv*Z)Le%PMwf-_+Ns?XNY#ORd!>dmGeic-gf2Z#$8v_PN zA|KbChmwI-%0^j*ENzbZGqKv{!Fn=(nu8~^DjdOB;O4KUSE8D4<*sV_lbGWu$e)8! z&P7Sfg*t5fYM(@sa0CLpe9uLkps0~U%T31n{q$UfC5#5U6QL}Re#f-UD5FV|9iDoA zOH@D;RW7)O>&JM^w5%}G5+EAI@a@eQ`VLTx8Jl*$^xYhVI6pd6rE`$N?Wh!PPnSYw zXxE|tBDhVL#9L6DgCxd!RdLo+Z&)USDNyK>`8C1Xm_Lg^cPLWg_OFns(5VgP+ZYi~ zAhaVKxm>tSOG#r_>1UO+nS6c+ZU(h)R0@!?*=~kM9ncKP82;VvHKF~RmmNfiEa)*0CHpDz8f3N!^2Dk(GL>IQVPg34ASCDe!t7Z}OPlc_b_6CuO-bfZF0u$MsU_ba3e5 z9lBRobx&cl4T{(3kgAnWUwGajey$GN`6_s*lwXzx{p%v1rBKNqy(m6;f<@E(x5s~D zwL%?*h{1Iq{V<4;42nVWx~vrQ^%uOQh(E}ftXz~TmFhWYJ7n{)k)A*D=pqj?`+ZDP zt>;gVOP)7idX#g+ygbO5th~%0mrmvU;JV1Z2dllR*D59NFO2*&XB3=Z5LObe2K-eL zfO#A+>8zBmfPFCIefjL`B#{Il9O>(8%sFh}cyojT&{&@V?*l#=Yy%Ekis9sOoTP9w zJiZwi8!kBD3xYJk-hi|BXvmN!7!vq^S>Ur4z~^!JQVbyv2tjmyHK9U;=-`VtTc=Kj dWJL$H=e7~zZ=K+DTe%myp%zr9{V9&<{{b-(#g+g7 literal 0 HcmV?d00001 From 1bda5d31d85dfaddb55e3a88d1970da0f73ddc16 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Thu, 2 Apr 2026 18:31:51 +0100 Subject: [PATCH 05/12] fixed hm custom blast furnaces --- .../hardmode/Resource_Gen/blast_furnaces.js | 4 ++-- .../machines/multiblocks/pre_lv/steam_forge.js | 18 +++++++++--------- .../machines/single block/steam_machines.js | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js b/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js index bbc8c170c..00c878d55 100644 --- a/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js +++ b/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js @@ -31,7 +31,7 @@ ServerEvents.recipes(event => { .blasting(`gtceu:${dust}_ingot`, `gtceu:${dust}_dust`) .id(`start:blasting/${dust}_dust_manual_only`); // event.recipes.gtceu - // .gt_blasting(id(`${dust}_from_dust`)) + // .electric_vanilla_blast_furnace(id(`${dust}_from_dust`)) // .itemInputs(`gtceu:${dust}_dust`) // .itemOutputs(`gtceu:${dust}_ingot`) // .duration(100) @@ -43,7 +43,7 @@ ServerEvents.recipes(event => { // let InItem = ParseBlast.inputs.item[0].content; // let OutItem = ParseBlast.outputs.item[0].content; - // event.recipes.gtceu.gt_blasting(id(`smelt_${OutItem.value.item}_from_${InItem.value.item}`)) + // event.recipes.gtceu.electric_vanilla_blast_furnace(id(`smelt_${OutItem.value.item}_from_${InItem.value.item}`)) // .itemInputs(InItem.ingredient.item) // .itemOutputs(OutItem.ingredient.item) // .duration(100) diff --git a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js index b9793068e..86e54cfa8 100644 --- a/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js +++ b/kubejs/startup_scripts/hardmode/machines/multiblocks/pre_lv/steam_forge.js @@ -1,18 +1,18 @@ // packmode: hard -GTCEuStartupEvents.registry('gtceu:recipe_type', event => { - event.create('gt_blasting') - .category('primitive') - .setMaxIOSize(1, 1, 0, 0) - .setSound(GTSoundEntries.FURNACE) -}); +// GTCEuStartupEvents.registry('gtceu:recipe_type', event => { +// event.create('gt_blasting') +// .category('primitive') +// .setMaxIOSize(1, 1, 0, 0) +// .setSound(GTSoundEntries.FURNACE) +// }); GTCEuStartupEvents.registry('gtceu:machine', event => { event.create('steam_forge', 'multiblock') .rotationState(RotationState.NON_Y_AXIS) - .recipeType('gt_blasting') - .machine((holder) => new $StartSteamMulti(holder)) - .recipeModifier($StarTRecipeModifiers.START_STEAM_PARALLEL) + .recipeType('electric_vanilla_blast_furnace') + .machine((holder) => new $SteamMulti(holder, 4)) + .recipeModifier((machine, recipe) => $SteamMulti.recipeModifier(machine, recipe), true) .appearanceBlock(() => Block.getBlock('kubejs:high_steam_machine_casing')) .pattern(definition => FactoryBlockPattern.start() .aisle('BBB','CCC','CCC','#C#') diff --git a/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js b/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js index adfa706d5..5367371c7 100644 --- a/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js +++ b/kubejs/startup_scripts/hardmode/machines/single block/steam_machines.js @@ -4,7 +4,7 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { event.create('steam_blaster', 'steam') .definition((tier, builder) =>{ builder - .recipeType('gt_blasting') + .recipeType('electric_vanilla_blast_furnace') .workableCasingModel('gtceu:block/casings/steam/bricked_steel/side', 'gtceu:block/machines/blasting_single'); }); From 2be645a30f4108160512d42f79c92dda5d1da22b Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Thu, 2 Apr 2026 18:34:29 +0100 Subject: [PATCH 06/12] fixed lang error --- kubejs/assets/gtceu/lang/ja_jp.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubejs/assets/gtceu/lang/ja_jp.json b/kubejs/assets/gtceu/lang/ja_jp.json index 7478623bd..aac612f83 100644 --- a/kubejs/assets/gtceu/lang/ja_jp.json +++ b/kubejs/assets/gtceu/lang/ja_jp.json @@ -1437,5 +1437,5 @@ "material.gtceu.einsteinium_253": "アインシュタニウム 253", "material.gtceu.fermium": "フェルミウム 257", - "block.gtceu.theta2Removals.tooltip": "§4§l非推奨。Theta 2で削除される予定である。", + "block.gtceu.theta2Removals.tooltip": "§4§l非推奨。Theta 2で削除される予定である。" } \ No newline at end of file From bbd7df5a0f4399424255cc4710f96154903c6745 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Thu, 2 Apr 2026 18:51:21 +0100 Subject: [PATCH 07/12] moved most kube ulv components to the gtceu ones --- .../hardmode/Resource_Gen/blast_furnaces.js | 4 +- .../hardmode/Resource_Gen/pre-lv.js | 2 +- .../general_progression/circuits.js | 4 +- .../general_progression/machines.js | 4 +- .../hardmode/progression/pre_lv/create.js | 10 ++-- .../hardmode/progression/pre_lv/misc.js | 6 +-- .../hardmode/progression/pre_lv/ulv.js | 47 ++++++++++--------- 7 files changed, 39 insertions(+), 38 deletions(-) diff --git a/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js b/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js index 00c878d55..9041cb374 100644 --- a/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js +++ b/kubejs/server_scripts/hardmode/Resource_Gen/blast_furnaces.js @@ -84,7 +84,7 @@ ServerEvents.recipes(event => { event.recipes.gtceu.assembler(id('solid_blast_furnace')) .itemInputs('gtceu:rugged_alloyer', '2x gtceu:double_steel_plate', '2x gtceu:steel_gear', - '2x #gtceu:circuits/ulv' ,'kubejs:ulv_conveyor_module', 'kubejs:ulv_robot_arm') + '2x #gtceu:circuits/ulv' ,'gtceu:ulv_conveyor_module', 'gtceu:ulv_robot_arm') .inputFluids('gtceu:tin_alloy 432') .itemOutputs('gtceu:solid_blast_furnace') .duration(300) @@ -92,7 +92,7 @@ ServerEvents.recipes(event => { event.recipes.gtceu.assembler(id('bessemer_forgery')) .itemInputs('gtceu:lv_machine_hull','4x gtceu:long_steel_rod','4x #gtceu:circuits/lv','create:basin','2x gtceu:potin_gear', - '4x gtceu:small_steel_gear','4x kubejs:ulv_robot_arm','3x kubejs:ulv_electric_pump') + '4x gtceu:small_steel_gear','4x gtceu:ulv_robot_arm','3x gtceu:ulv_electric_pump') .inputFluids('gtceu:tin_alloy 1152') .itemOutputs('gtceu:bessemer_forgery') .duration(400) diff --git a/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js b/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js index bde9bb1fe..3ea98833c 100644 --- a/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js +++ b/kubejs/server_scripts/hardmode/Resource_Gen/pre-lv.js @@ -299,7 +299,7 @@ ServerEvents.recipes(event => { }); event.recipes.gtceu.assembler(id('industrial_pump')) - .itemInputs('1x gtceu:primitive_pump','6x gtceu:double_steel_plate','2x kubejs:ulv_electric_pump', + .itemInputs('1x gtceu:primitive_pump','6x gtceu:double_steel_plate','2x gtceu:ulv_electric_pump', '2x #gtceu:circuits/ulv','4x gtceu:rubber_ring') .circuit(3) .inputFluids('gtceu:rubber 288') diff --git a/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js b/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js index 0cb8b019d..65b8a01bc 100644 --- a/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js +++ b/kubejs/server_scripts/hardmode/progression/general_progression/circuits.js @@ -29,8 +29,8 @@ ServerEvents.recipes(event => { // to be revamped post-theta // Manufacturing Facility Controller event.recipes.gtceu.assembler(id('circuit_manufacturing_facility')) - .itemInputs('1x gtceu:lv_machine_hull', '6x #gtceu:circuits/ulv', '6x kubejs:ulv_robot_arm', '3x kubejs:ulv_conveyor_module', - '4x gtceu:steel_gear', '2x kubejs:ulv_electric_motor','2x kubejs:ulv_emitter', '4x gtceu:tin_single_cable') + .itemInputs('1x gtceu:lv_machine_hull', '6x #gtceu:circuits/ulv', '6x gtceu:ulv_robot_arm', '3x gtceu:ulv_conveyor_module', + '4x gtceu:steel_gear', '2x gtceu:ulv_electric_motor','2x kubejs:ulv_emitter', '4x gtceu:tin_single_cable') .inputFluids('gtceu:tin 576') .itemOutputs('gtceu:circuit_manufacturing_facility') .duration(2400) diff --git a/kubejs/server_scripts/hardmode/progression/general_progression/machines.js b/kubejs/server_scripts/hardmode/progression/general_progression/machines.js index c3f8ffb9f..66a33e138 100644 --- a/kubejs/server_scripts/hardmode/progression/general_progression/machines.js +++ b/kubejs/server_scripts/hardmode/progression/general_progression/machines.js @@ -85,8 +85,8 @@ ServerEvents.recipes(event => { // ME Pattern Buffer blanket diabled and ME I/O is in AE-Machinery as a Packmode determinate event.recipes.gtceu.assembler(id(`machine_facility`)) - .itemInputs('gtceu:ulv_assembler','6x kubejs:ulv_robot_arm','4x #gtceu:circuits/lv', - '2x kubejs:ulv_conveyor_module','2x kubejs:ulv_emitter','2x kubejs:ulv_electric_pump', + .itemInputs('gtceu:ulv_assembler','6x gtceu:ulv_robot_arm','4x #gtceu:circuits/lv', + '2x gtceu:ulv_conveyor_module','2x kubejs:ulv_emitter','2x gtceu:ulv_electric_pump', '2x gtceu:steel_gear','2x gtceu:small_damascus_steel_gear') .inputFluids('gtceu:tin 864') .itemOutputs(`gtceu:machine_facility`) diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/create.js b/kubejs/server_scripts/hardmode/progression/pre_lv/create.js index bd8c8f725..c7172f05a 100644 --- a/kubejs/server_scripts/hardmode/progression/pre_lv/create.js +++ b/kubejs/server_scripts/hardmode/progression/pre_lv/create.js @@ -801,7 +801,7 @@ ServerEvents.recipes(event => { N: 'create_new_age:overcharged_iron_sheet', R: 'gtceu:cast_iron_rod', S: 'create:shaft', - M: 'kubejs:ulv_electric_motor', + M: 'gtceu:ulv_electric_motor', P: 'gtceu:cast_iron_plate' }).id('start:mechanical_crafter/basic_motor'); @@ -970,9 +970,9 @@ ServerEvents.recipes(event => { ], { N: 'gtceu:pig_iron_ring', L: 'create:andesite_funnel', - A: 'kubejs:ulv_robot_arm', + A: 'gtceu:ulv_robot_arm', F: 'gtceu:pig_iron_frame', - C: 'kubejs:ulv_conveyor_module', + C: 'gtceu:ulv_conveyor_module', R: 'xycraft_world:xychorium_gem_red', B: 'create:bound_cardboard_block', P: 'minecraft:stone_pressure_plate' @@ -985,9 +985,9 @@ ServerEvents.recipes(event => { ], { N: 'gtceu:pig_iron_ring', L: 'create:andesite_funnel', - A: 'kubejs:ulv_robot_arm', + A: 'gtceu:ulv_robot_arm', F: 'gtceu:pig_iron_frame', - C: 'kubejs:ulv_conveyor_module', + C: 'gtceu:ulv_conveyor_module', R: 'xycraft_world:xychorium_gem_red', B: 'create:bound_cardboard_block', P: '#minecraft:wooden_pressure_plates' diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js b/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js index 20e2261b3..1128e3c1c 100644 --- a/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js +++ b/kubejs/server_scripts/hardmode/progression/pre_lv/misc.js @@ -211,7 +211,7 @@ ServerEvents.recipes(event => { ], { S: 'minecraft:stone', U: '#gtceu:circuits/ulv', - P: 'kubejs:ulv_electric_pump', + P: 'gtceu:ulv_electric_pump', T: 'gtceu:steel_small_fluid_pipe', B: 'gtceu:ulv_stone_barrel' }).id('start:mechanical_crafting/large_stone_barrel'); @@ -225,7 +225,7 @@ ServerEvents.recipes(event => { ], { S: 'gtceu:treated_wood_planks', U: '#gtceu:circuits/ulv', - P: 'kubejs:ulv_electric_pump', + P: 'gtceu:ulv_electric_pump', T: 'gtceu:lead_small_fluid_pipe', B: 'gtceu:ulv_barrel' }).id('start:mechanical_crafting/large_barrel'); @@ -239,7 +239,7 @@ ServerEvents.recipes(event => { ], { S: 'gtceu:treated_wood_planks', U: '#gtceu:circuits/ulv', - P: 'kubejs:ulv_conveyor_module', + P: 'gtceu:ulv_conveyor_module', T: 'thermal:compost', B: 'thermal:device_composter' }).id('start:mechanical_crafting/large_farm'); diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js index 783fa0cf8..e9d73be9d 100644 --- a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js +++ b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js @@ -94,10 +94,10 @@ ServerEvents.recipes(event => { A: inputs[0],B: inputs[1],C: inputs[2],D: inputs[3],E: inputs[4],F: inputs[5],G: inputs[6],H: inputs[7],I: inputs[8] }).id(`start:mechanical_crafting/ulv_${output}`); } - UlvMachine('assembler',['kubejs:ulv_robot_arm','#gtceu:circuits/ulv','kubejs:ulv_robot_arm','kubejs:ulv_conveyor_module','gtceu:ulv_machine_hull','kubejs:ulv_conveyor_module','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable']); - UlvMachine('centrifuge',['#gtceu:circuits/ulv','kubejs:ulv_electric_motor','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable','gtceu:ulv_machine_hull','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','kubejs:ulv_electric_motor','#gtceu:circuits/ulv']); - UlvMachine('mixer',['#forge:glass','gtceu:cast_iron_rotor','#forge:glass','#forge:glass','kubejs:ulv_electric_motor','#forge:glass','#gtceu:circuits/ulv','gtceu:ulv_machine_hull','#gtceu:circuits/ulv']); - UlvMachine('stirling_generator',['gtceu:tin_alloy_normal_fluid_pipe','#gtceu:circuits/ulv','gtceu:tin_alloy_normal_fluid_pipe','gtceu:cast_iron_rotor','gtceu:ulv_machine_hull','gtceu:cast_iron_rotor','kubejs:ulv_electric_motor','gtceu:red_alloy_single_cable','kubejs:ulv_electric_motor']); + UlvMachine('assembler',['gtceu:ulv_robot_arm','#gtceu:circuits/ulv','gtceu:ulv_robot_arm','gtceu:ulv_conveyor_module','gtceu:ulv_machine_hull','gtceu:ulv_conveyor_module','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable']); + UlvMachine('centrifuge',['#gtceu:circuits/ulv','gtceu:ulv_electric_motor','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable','gtceu:ulv_machine_hull','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:ulv_electric_motor','#gtceu:circuits/ulv']); + UlvMachine('mixer',['#forge:glass','gtceu:cast_iron_rotor','#forge:glass','#forge:glass','gtceu:ulv_electric_motor','#forge:glass','#gtceu:circuits/ulv','gtceu:ulv_machine_hull','#gtceu:circuits/ulv']); + UlvMachine('stirling_generator',['gtceu:tin_alloy_normal_fluid_pipe','#gtceu:circuits/ulv','gtceu:tin_alloy_normal_fluid_pipe','gtceu:cast_iron_rotor','gtceu:ulv_machine_hull','gtceu:cast_iron_rotor','gtceu:ulv_electric_motor','gtceu:red_alloy_single_cable','gtceu:ulv_electric_motor']); UlvMachine('charger_4x',['gtceu:lead_quadruple_wire','minecraft:chest','gtceu:lead_quadruple_wire','gtceu:lead_quadruple_wire','gtceu:ulv_machine_hull','gtceu:lead_quadruple_wire','gtceu:red_alloy_single_cable','#gtceu:circuits/ulv','gtceu:red_alloy_single_cable']); UlvMachine('battery_buffer_4x',['gtceu:lead_quadruple_wire','minecraft:chest','gtceu:lead_quadruple_wire','gtceu:lead_quadruple_wire','gtceu:ulv_machine_hull','gtceu:lead_quadruple_wire','','','']); UlvMachine('battery_buffer_8x',['gtceu:lead_octal_wire','minecraft:chest','gtceu:lead_octal_wire','gtceu:lead_octal_wire','gtceu:ulv_machine_hull','gtceu:lead_octal_wire','','','']); @@ -119,7 +119,7 @@ ServerEvents.recipes(event => { let motor = 'gtceu:magnetic_iron_rod' event.recipes.create.sequenced_assembly([ - Item.of(`kubejs:ulv_electric_motor`), + Item.of(`gtceu:ulv_electric_motor`), ], motor, [ event.recipes.createDeploying(motor, [motor, 'gtceu:iron_rod']), event.recipes.createDeploying(motor, [motor, `gtceu:lead_single_wire`]), @@ -130,29 +130,29 @@ ServerEvents.recipes(event => { let conv = 'gtceu:red_alloy_single_cable' event.recipes.create.sequenced_assembly([ - Item.of(`kubejs:ulv_conveyor_module`), + Item.of(`gtceu:ulv_conveyor_module`), ], conv, [ event.recipes.createDeploying(conv, [conv, 'create:belt_connector']), - event.recipes.createDeploying(conv, [conv, `kubejs:ulv_electric_motor`]), + event.recipes.createDeploying(conv, [conv, `gtceu:ulv_electric_motor`]), event.recipes.createDeploying(conv, [conv, `create:belt_connector`]), event.recipes.createDeploying(conv, [conv, 'gtceu:potin_rod']), event.recipes.createDeploying(conv, [conv, `create:belt_connector`]) ]).transitionalItem(conv).loops(2).id('start:sequenced_assembly/ulv_conveyor_module'); - let arm = 'kubejs:ulv_electric_piston' + let arm = 'gtceu:ulv_electric_piston' event.recipes.create.sequenced_assembly([ - Item.of(`kubejs:ulv_robot_arm`), + Item.of(`gtceu:ulv_robot_arm`), ], arm, [ event.recipes.createDeploying(arm, [arm, 'gtceu:potin_rod']), - event.recipes.createDeploying(arm, [arm, `kubejs:ulv_electric_motor`]), + event.recipes.createDeploying(arm, [arm, `gtceu:ulv_electric_motor`]), event.recipes.createDeploying(arm, [arm, `gtceu:red_alloy_single_cable`]), event.recipes.createDeploying(arm, [arm, `#gtceu:circuits/ulv`]), event.recipes.createDeploying(arm, [arm, `gtceu:red_alloy_single_cable`]) ]).transitionalItem(arm).loops(2).id('start:sequenced_assembly/ulv_robot_arm'); - let pist = 'kubejs:ulv_electric_motor' + let pist = 'gtceu:ulv_electric_motor' event.recipes.create.sequenced_assembly([ - Item.of(`kubejs:ulv_electric_piston`), + Item.of(`gtceu:ulv_electric_piston`), ], pist, [ event.recipes.createDeploying(pist, [pist, 'gtceu:potin_rod']), event.recipes.createDeploying(pist, [pist, 'gtceu:small_potin_gear']), @@ -167,36 +167,37 @@ ServerEvents.recipes(event => { // removing recylcing recipes event.remove({id: /gtceu:(arc_furnace\/arc_|macerator\/macerate_)ulv_(electric_(piston|pump)|conveyor_module|robot_arm)/}); // ulv electric motor does not have recycling recipes const UlvComponent = (output,inputs,fluid) => { + const mod = (output == 'emitter') ? 'kubejs' : 'gtceu'; if(output == 'electric_motor') event.recipes.gtceu.assembler(id(`ulv_${output}`)) .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3]) - .itemOutputs(`gtceu:ulv_${output}`) + .itemOutputs(`${mod}:ulv_${output}`) .duration(100) .EUt(6); if(output == 'electric_piston') event.recipes.gtceu.assembler(id(`ulv_${output}`)) .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4]) - .itemOutputs(`gtceu:ulv_${output}`) + .itemOutputs(`${mod}:ulv_${output}`) .duration(100) .circuit(1) .EUt(6); if(output == 'robot_arm') event.recipes.gtceu.assembler(id(`ulv_${output}`)) .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4]) - .itemOutputs(`gtceu:ulv_${output}`) + .itemOutputs(`${mod}:ulv_${output}`) .duration(100) .circuit(1) .EUt(6); if(output == 'electric_pump') event.recipes.gtceu.assembler(id(`ulv_${output}`)) .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4],inputs[5]) - .itemOutputs(`gtceu:ulv_${output}`) + .itemOutputs(`${mod}:ulv_${output}`) .duration(100) .EUt(6); if(output == 'emitter') event.recipes.gtceu.assembler(id(`ulv_${output}`)) .itemInputs(inputs[0],inputs[1],inputs[2],inputs[3],inputs[4]) - .itemOutputs(`kubejs:ulv_${output}`) + .itemOutputs(`${mod}:ulv_${output}`) .duration(100) .circuit(1) .EUt(6); @@ -204,17 +205,17 @@ ServerEvents.recipes(event => { event.recipes.gtceu.assembler(id(`${output}_ulv`)) .itemInputs(inputs[0],inputs[1]) .inputFluids(fluid) - .itemOutputs(`gtceu:ulv_${output}`) + .itemOutputs(`${mod}:ulv_${output}`) .duration(100) .circuit(1) .EUt(6); } UlvComponent('electric_motor',['2x gtceu:red_alloy_single_cable','2x gtceu:iron_rod','1x gtceu:magnetic_iron_rod','4x gtceu:lead_single_wire'],''); - UlvComponent('conveyor_module',['1x gtceu:red_alloy_single_cable','2x kubejs:ulv_electric_motor'],'gtceu:rubber 864'); - UlvComponent('electric_piston',['2x gtceu:potin_rod','2x gtceu:red_alloy_single_cable','3x gtceu:potin_plate','1x gtceu:small_potin_gear','1x kubejs:ulv_electric_motor'],''); - UlvComponent('robot_arm',['3x gtceu:red_alloy_single_cable','2x gtceu:potin_rod','2x kubejs:ulv_electric_motor','1x kubejs:ulv_electric_piston','1x #gtceu:circuits/ulv'],''); - UlvComponent('electric_pump',['1x gtceu:red_alloy_single_cable','1x gtceu:tin_alloy_normal_fluid_pipe','1x gtceu:cast_iron_screw','1x gtceu:cast_iron_rotor','2x gtceu:rubber_ring','1x kubejs:ulv_electric_motor'],''); - UlvComponent('emitter',['1x kubejs:ulv_electric_motor','4x gtceu:zinc_rod','2x gtceu:red_alloy_single_cable','2x #gtceu:circuits/ulv','1x minecraft:prismarine_crystals'],''); + UlvComponent('conveyor_module',['1x gtceu:red_alloy_single_cable','2x gtceu:ulv_electric_motor'],'gtceu:rubber 864'); + UlvComponent('electric_piston',['2x gtceu:potin_rod','2x gtceu:red_alloy_single_cable','3x gtceu:potin_plate','1x gtceu:small_potin_gear','1x gtceu:ulv_electric_motor'],''); + UlvComponent('robot_arm',['3x gtceu:red_alloy_single_cable','2x gtceu:potin_rod','2x gtceu:ulv_electric_motor','1x gtceu:ulv_electric_piston','1x #gtceu:circuits/ulv'],''); + UlvComponent('electric_pump',['1x gtceu:red_alloy_single_cable','1x gtceu:tin_alloy_normal_fluid_pipe','1x gtceu:cast_iron_screw','1x gtceu:cast_iron_rotor','2x gtceu:rubber_ring','1x gtceu:ulv_electric_motor'],''); + UlvComponent('emitter',['1x gtceu:ulv_electric_motor','4x gtceu:zinc_rod','2x gtceu:red_alloy_single_cable','2x #gtceu:circuits/ulv','1x minecraft:prismarine_crystals'],''); event.recipes.gtceu.assembler(id('ulv_battery')) .itemInputs('4x gtceu:copper_foil', '4x minecraft:paper', '2x gtceu:iron_single_wire') From 3914fd4e7b78af13df78fb32c3893af6e16baaff Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Thu, 2 Apr 2026 19:07:38 +0100 Subject: [PATCH 08/12] removed unneeded ulv components --- .../item/HM/Pre-LV/ulv_conveyor_module.png | Bin 450 -> 0 bytes .../item/HM/Pre-LV/ulv_electric_motor.png | Bin 444 -> 0 bytes .../item/HM/Pre-LV/ulv_electric_piston.png | Bin 414 -> 0 bytes .../textures/item/HM/Pre-LV/ulv_electric_pump.png | Bin 420 -> 0 bytes .../textures/item/HM/Pre-LV/ulv_robot_arm.png | Bin 438 -> 0 bytes .../hardmode/Resource_Gen/pre-lv.js | 3 +-- kubejs/startup_scripts/hardmode/objects/items.js | 2 +- 7 files changed, 2 insertions(+), 3 deletions(-) delete mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_conveyor_module.png delete mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_motor.png delete mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_piston.png delete mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_pump.png delete mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_robot_arm.png diff --git a/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_conveyor_module.png b/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_conveyor_module.png deleted file mode 100644 index 0a3a9580f7a690e79bdda01673b9ead8a1b23e92..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 450 zcmV;z0X_bSP)`ANS65&V6A=NM@#@VRhMPAZFn|ofY6Hx4kYbR{AkA;yyoEd9`}bcA-@g4s7ywda zYi)vJI!v{&FfRj00|;<(vcU~``}Q-$0CXF)G}OUPgxLsE$i>AD*9bEN<_fR@AO*-0 zAk`oz!T`(wV?$lI*xB=!!D`?Jz$9T3$RQ320}ucO+`I(~!R*fVdN3dEh4RWqu*Ce? zlTo|?5(9Yy1VEab%Sym(-{>fYhT3KZMsabG{~I=~N0FG+KM^H;y?gfw%x`F}W!SuQ z8JKNoVZktG!BU6;=n~h?JY%r2w_@m;+KOV3kPsh3ke@GD45azx%Quj805T*cAsQ^P zZqsJCrj*EBhB?b8!}+2d3Jf=&T>|q#nn5%?A%P4*u@1_y(s5)sc4a@9r!J+3lDtt2 sz@`}{21?#<-@V1qOtb;`3M{U>X3@JZsHbu)+%$ z&!Je_P*e`)iwW|9=~wSRfenGX0H!&>*%ho{!`|HtTh^_C8}j_oBZe2xo-sVWcb@@d z2}m8>055xU6hDHT2r?ioBp7Ufsf{(g2dfj$#0X3ET^2n#w3%c=-4! zLqlID!|DA8Py!MZ2J9?y3^w*w3|(E7sDUWX!|^{QJDp+9)R|ySFaxwT?HI0JKLidy z7y!9o*UBRd>-Vlk!~#eXW(bJAY1wjygw#rg1+&}1Q3eArOVm}Z7!IA^hcE!7+1OYg zt`HPmDr)u&f?|KbV#qG|@`;<_{hKQcpwtLY2OtAbJj}qr0I~(75Eno(0GA?N1w*jG mmmi$Rns128OgNnYlmGzLtho_F!rBf10000M-EeyXoLw1^4Z&-GuB_O9QyXiB)Pf?03m4CU z4KdI+Vn8;8paFhSkqkaTA#elG4Z&&v$mUn?KQV|2@-bAl^)Xz%avH@DWLIDq0MeXQ zTMc(A$Pkb#o|Brm-oBo24am`r5ep#A38|F~M-Coia0|C#cyjk1gN(8g!}94H z8E)P_#?a8$33oDjx&gbOx2gaCyRQ$xnn0RC0OaTQuUOy)&Y3zBCH`Rsfei?B4*d_a z8KxPgKwHy}p{uJBt7ecIumN_4PXGUNFfiEJ>4I&B0a$>Qm9;Yz*A-%oa=0MK5RiXC z0f!#iAQ!IRyBfa%Fk6u`j=HK9gRqb=11`;QFA$R>aj5|SrVF*t00000NkvXX Iu0mjf0G{5Y>;M1& diff --git a/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_pump.png b/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_pump.png deleted file mode 100644 index 36bfae866996d5d8f7964826193947deede77f6b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 420 zcmV;V0bBlwP)!`>~+8M11t!J02zJjd|l?mdR{Cr*G3K`|gHGVuSrAhx8O9K)QcGZ~N# z0ci$--J7;BoVtD&)c}~SAkC(Z4qzL%tXqR(h+kABTr)^Lh8K`EgPaQjr}rOV*t&T; zgR!wb!{dAR!C?Zk49+0B=Z_vST)A+G;o;+_7>2+N00kb*uOLHY zl$F4mVF1|>kl4#FKfroXynt+otdb&wp@jw5b{GJ;0u*q_u>|M9;<=%y9PUg`9$p3= z13j>MY?|RNKu#nezoQ!hQV8-t%-I+&02xr*)dNo?AO)cK2Zj3Cvlqb{LEgh@07!$G zrt*JRKOdAt0!x)JjUc|auO|a6v0(%v$PkbqdO#sN8J$g1Zp3B~068kn5hfQ*e*gdg O07*qoM6N<$f&c(PC#*>T diff --git a/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_robot_arm.png b/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_robot_arm.png deleted file mode 100644 index d31e62ceddcafd94d30f177227f1faa5c44253ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 438 zcmV;n0ZIOeP)t_%a${|djAQ|fBEGHP6HXmc{osP z_xAM!8wN7OFDjBjMp=nrT5~JhKx1QlxWU^Fo@B%@8Dt>HkkdzwGJsqL0w4oH25nxt zjG?xx2W~)4RsjP}1GaA74p%59$Oks;#j|H%11?-V$MEFtJ%$~7jzA1R4n&y3vu7_d zfcy?}QA&0?!hWjgA6q2Dxa?%ta6bV9o}yLAJm&Bg=tY1TxUr*ccvWXV0ER zgaLA3B8PgQbLjs&w+?~>6yyq!Yo0%P!~io8Z+!PQ_5UxfD+GH36tEyoFdAkFUIRe3 zuiv{G9@Xf!gS?2>06Rmc|A)@+g9jwc>FTOh3?OlW26)+<|2MR-07vJwGtU?V#s0wk z4s#t&7l1S)Cz>tm)-VWhD=>h<1Y{u51|TOIIRPaGP?&%WfO!wE3(yk{DBeLfzkT { }); [0,1,2,3,4].forEach(tier => { - let PumpMod = (tier == 0) ? 'kubejs' : 'gtceu' ; let PumpTier = (tier == 0) ? 'ulv' : (tier == 1) ? 'lv' : (tier == 2) ? 'mv' : (tier == 3) ? 'hv' : 'ev' ; event.recipes.gtceu.industrial_pump(id(`water_${tier}`)) - .notConsumable(`${PumpMod}:${PumpTier}_electric_pump`) + .notConsumable(`gtceu:${PumpTier}_electric_pump`) .outputFluids(`minecraft:water ${3000 * ( 2 ** tier )}`) .duration(20); }); diff --git a/kubejs/startup_scripts/hardmode/objects/items.js b/kubejs/startup_scripts/hardmode/objects/items.js index 17050484b..3912087e2 100644 --- a/kubejs/startup_scripts/hardmode/objects/items.js +++ b/kubejs/startup_scripts/hardmode/objects/items.js @@ -74,7 +74,7 @@ StartupEvents.registry('item', event => { .texture(`kubejs:item/hm/pre-lv/scavenging_rod`); // === ULV Parts === - ['electric_motor', 'electric_pump', 'conveyor_module', 'robot_arm', 'electric_piston', 'emitter'].forEach(type => { + ['emitter'].forEach(type => { event.create(`ulv_${type}`) .texture(`kubejs:item/hm/pre-lv/ulv_${type}`); }); From 74b42db820527cc6151d54d8ff1baa032127aa19 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Sat, 4 Apr 2026 07:04:30 +0100 Subject: [PATCH 09/12] readded kube ulv components --- .../item/HM/Pre-LV/ulv_conveyor_module.png | Bin 0 -> 450 bytes .../item/HM/Pre-LV/ulv_electric_motor.png | Bin 0 -> 444 bytes .../item/HM/Pre-LV/ulv_electric_piston.png | Bin 0 -> 414 bytes .../textures/item/HM/Pre-LV/ulv_electric_pump.png | Bin 0 -> 420 bytes .../textures/item/HM/Pre-LV/ulv_robot_arm.png | Bin 0 -> 438 bytes kubejs/startup_scripts/hardmode/objects/items.js | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_conveyor_module.png create mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_motor.png create mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_piston.png create mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_pump.png create mode 100644 kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_robot_arm.png diff --git a/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_conveyor_module.png b/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_conveyor_module.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3a9580f7a690e79bdda01673b9ead8a1b23e92 GIT binary patch literal 450 zcmV;z0X_bSP)`ANS65&V6A=NM@#@VRhMPAZFn|ofY6Hx4kYbR{AkA;yyoEd9`}bcA-@g4s7ywda zYi)vJI!v{&FfRj00|;<(vcU~``}Q-$0CXF)G}OUPgxLsE$i>AD*9bEN<_fR@AO*-0 zAk`oz!T`(wV?$lI*xB=!!D`?Jz$9T3$RQ320}ucO+`I(~!R*fVdN3dEh4RWqu*Ce? zlTo|?5(9Yy1VEab%Sym(-{>fYhT3KZMsabG{~I=~N0FG+KM^H;y?gfw%x`F}W!SuQ z8JKNoVZktG!BU6;=n~h?JY%r2w_@m;+KOV3kPsh3ke@GD45azx%Quj805T*cAsQ^P zZqsJCrj*EBhB?b8!}+2d3Jf=&T>|q#nn5%?A%P4*u@1_y(s5)sc4a@9r!J+3lDtt2 sz@`}{21?#<-@V1qOtb;`3M{U>X3@JZsHbu)+%$ z&!Je_P*e`)iwW|9=~wSRfenGX0H!&>*%ho{!`|HtTh^_C8}j_oBZe2xo-sVWcb@@d z2}m8>055xU6hDHT2r?ioBp7Ufsf{(g2dfj$#0X3ET^2n#w3%c=-4! zLqlID!|DA8Py!MZ2J9?y3^w*w3|(E7sDUWX!|^{QJDp+9)R|ySFaxwT?HI0JKLidy z7y!9o*UBRd>-Vlk!~#eXW(bJAY1wjygw#rg1+&}1Q3eArOVm}Z7!IA^hcE!7+1OYg zt`HPmDr)u&f?|KbV#qG|@`;<_{hKQcpwtLY2OtAbJj}qr0I~(75Eno(0GA?N1w*jG mmmi$Rns128OgNnYlmGzLtho_F!rBf10000M-EeyXoLw1^4Z&-GuB_O9QyXiB)Pf?03m4CU z4KdI+Vn8;8paFhSkqkaTA#elG4Z&&v$mUn?KQV|2@-bAl^)Xz%avH@DWLIDq0MeXQ zTMc(A$Pkb#o|Brm-oBo24am`r5ep#A38|F~M-Coia0|C#cyjk1gN(8g!}94H z8E)P_#?a8$33oDjx&gbOx2gaCyRQ$xnn0RC0OaTQuUOy)&Y3zBCH`Rsfei?B4*d_a z8KxPgKwHy}p{uJBt7ecIumN_4PXGUNFfiEJ>4I&B0a$>Qm9;Yz*A-%oa=0MK5RiXC z0f!#iAQ!IRyBfa%Fk6u`j=HK9gRqb=11`;QFA$R>aj5|SrVF*t00000NkvXX Iu0mjf0G{5Y>;M1& literal 0 HcmV?d00001 diff --git a/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_pump.png b/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_electric_pump.png new file mode 100644 index 0000000000000000000000000000000000000000..36bfae866996d5d8f7964826193947deede77f6b GIT binary patch literal 420 zcmV;V0bBlwP)!`>~+8M11t!J02zJjd|l?mdR{Cr*G3K`|gHGVuSrAhx8O9K)QcGZ~N# z0ci$--J7;BoVtD&)c}~SAkC(Z4qzL%tXqR(h+kABTr)^Lh8K`EgPaQjr}rOV*t&T; zgR!wb!{dAR!C?Zk49+0B=Z_vST)A+G;o;+_7>2+N00kb*uOLHY zl$F4mVF1|>kl4#FKfroXynt+otdb&wp@jw5b{GJ;0u*q_u>|M9;<=%y9PUg`9$p3= z13j>MY?|RNKu#nezoQ!hQV8-t%-I+&02xr*)dNo?AO)cK2Zj3Cvlqb{LEgh@07!$G zrt*JRKOdAt0!x)JjUc|auO|a6v0(%v$PkbqdO#sN8J$g1Zp3B~068kn5hfQ*e*gdg O07*qoM6N<$f&c(PC#*>T literal 0 HcmV?d00001 diff --git a/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_robot_arm.png b/kubejs/assets/kubejs/textures/item/HM/Pre-LV/ulv_robot_arm.png new file mode 100644 index 0000000000000000000000000000000000000000..d31e62ceddcafd94d30f177227f1faa5c44253ec GIT binary patch literal 438 zcmV;n0ZIOeP)t_%a${|djAQ|fBEGHP6HXmc{osP z_xAM!8wN7OFDjBjMp=nrT5~JhKx1QlxWU^Fo@B%@8Dt>HkkdzwGJsqL0w4oH25nxt zjG?xx2W~)4RsjP}1GaA74p%59$Oks;#j|H%11?-V$MEFtJ%$~7jzA1R4n&y3vu7_d zfcy?}QA&0?!hWjgA6q2Dxa?%ta6bV9o}yLAJm&Bg=tY1TxUr*ccvWXV0ER zgaLA3B8PgQbLjs&w+?~>6yyq!Yo0%P!~io8Z+!PQ_5UxfD+GH36tEyoFdAkFUIRe3 zuiv{G9@Xf!gS?2>06Rmc|A)@+g9jwc>FTOh3?OlW26)+<|2MR-07vJwGtU?V#s0wk z4s#t&7l1S)Cz>tm)-VWhD=>h<1Y{u51|TOIIRPaGP?&%WfO!wE3(yk{DBeLfzkT { .texture(`kubejs:item/hm/pre-lv/scavenging_rod`); // === ULV Parts === - ['emitter'].forEach(type => { + ['electric_motor', 'electric_pump', 'conveyor_module', 'robot_arm', 'electric_piston', 'emitter'].forEach(type => { event.create(`ulv_${type}`) .texture(`kubejs:item/hm/pre-lv/ulv_${type}`); }); From b9254d06d4764dc8bce8c6ac93163e3b5894ae67 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Sat, 4 Apr 2026 07:14:03 +0100 Subject: [PATCH 10/12] added conversion from old to new component --- kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js index e9d73be9d..98f16fc32 100644 --- a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js +++ b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js @@ -282,6 +282,15 @@ ServerEvents.recipes(event => { .duration(60) .EUt(-8); + // Old ULV to new ULV component recipes + + ['electric_motor', 'electric_pump', 'conveyor_module', 'robot_arm', 'electric_piston'].forEach(component => { + event.shapeless( + Item.of(`kubejs:${component}`), + [`gtceu:${component}`] + ).id(id(`old_to_new_HM_${component}`)); + }); + //ulv removals ['charger_4x','battery_buffer_4x','battery_buffer_8x','battery_buffer_16x','transformer_1a','transformer_2a', 'transformer_4a','transformer_16a','machine_casing','machine_hull'].forEach(UlvRemove=>{ From 3605e043dec5c85f009a5faadd5c3d5e8fd3f286 Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Sat, 4 Apr 2026 07:15:26 +0100 Subject: [PATCH 11/12] small fix --- kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js index 98f16fc32..777ae86ab 100644 --- a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js +++ b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js @@ -286,9 +286,9 @@ ServerEvents.recipes(event => { ['electric_motor', 'electric_pump', 'conveyor_module', 'robot_arm', 'electric_piston'].forEach(component => { event.shapeless( - Item.of(`kubejs:${component}`), - [`gtceu:${component}`] - ).id(id(`old_to_new_HM_${component}`)); + Item.of(`kubejs:ulv_${component}`), + [`gtceu:ulv_${component}`] + ).id(id(`old_to_new_HM_ulv_${component}`)); }); //ulv removals From 51231c54fddd81e7cbe26efcee07f57e7c5509bb Mon Sep 17 00:00:00 2001 From: oTurquoise Date: Sat, 4 Apr 2026 07:16:03 +0100 Subject: [PATCH 12/12] typo fix --- kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js | 1 - 1 file changed, 1 deletion(-) diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js index 777ae86ab..23c1af80b 100644 --- a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js +++ b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js @@ -283,7 +283,6 @@ ServerEvents.recipes(event => { .EUt(-8); // Old ULV to new ULV component recipes - ['electric_motor', 'electric_pump', 'conveyor_module', 'robot_arm', 'electric_piston'].forEach(component => { event.shapeless( Item.of(`kubejs:ulv_${component}`),