From 41338704ed205b73e6af1b57c587ca8fdc38efc4 Mon Sep 17 00:00:00 2001 From: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:15:07 -0500 Subject: [PATCH] Hotfix Sculk Pylon, EIO (#436) --- config/extendedcrafting-common.toml | 4 +- .../ftbquests/quests/chapters/late_game.snbt | 80 +++++++----------- .../assets/extendedcrafting/lang/en_us.json | 4 +- .../block/flux_alternator_base_side.png | Bin 0 -> 1456 bytes .../block/flux_alternator_base_top.png | Bin 0 -> 1552 bytes .../textures/block/flux_alternator_side.png | Bin 0 -> 1461 bytes .../textures/block/flux_alternator_top.png | Bin 0 -> 1507 bytes .../textures/gui/flux_alternator.png | Bin 0 -> 1241 bytes kubejs/client_scripts/JEI.js | 2 +- kubejs/server_scripts/energy_cores.js | 16 ++++ manifest.json | 2 +- 11 files changed, 51 insertions(+), 57 deletions(-) create mode 100644 kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_side.png create mode 100644 kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_top.png create mode 100644 kubejs/assets/extendedcrafting/textures/block/flux_alternator_side.png create mode 100644 kubejs/assets/extendedcrafting/textures/block/flux_alternator_top.png create mode 100644 kubejs/assets/extendedcrafting/textures/gui/flux_alternator.png diff --git a/config/extendedcrafting-common.toml b/config/extendedcrafting-common.toml index 38f493305..056eb4cb2 100644 --- a/config/extendedcrafting-common.toml +++ b/config/extendedcrafting-common.toml @@ -92,10 +92,10 @@ defaultPowerRate = 200000000 #How much FE the Flux Alternator should hold. #Range: > 0 - powerCapacity = 2000000000 + powerCapacity = 200000000 #How much FE the Auto Flux Crafter should hold. #Range: > 0 - autoCrafterPowerCapacity = 2000000000 + autoCrafterPowerCapacity = 200000000 #How much FE the Auto Flux Crafter should use when auto inserting items. #Range: > 0 autoCrafterInsertPowerRate = 100 diff --git a/config/ftbquests/quests/chapters/late_game.snbt b/config/ftbquests/quests/chapters/late_game.snbt index 86e9beda9..4a3b1221f 100644 --- a/config/ftbquests/quests/chapters/late_game.snbt +++ b/config/ftbquests/quests/chapters/late_game.snbt @@ -166,6 +166,18 @@ x: 17.0d y: 22.25d } + { + id: "33B08B68738FB6E3" + linked_quest: "49D33146A1F417E8" + x: -6.0d + y: 6.0d + } + { + id: "3580707E636655C2" + linked_quest: "11154356854B64DA" + x: -6.0d + y: 8.25d + } ] quests: [ { @@ -311,8 +323,8 @@ } { dependencies: [ - "71602D44E1D0013E" "6E5343E45E99CBAD" + "11154356854B64DA" ] description: [ "&6QBit CPUs&r are an advanced Circuit Wafer crucial for &6Quantum Circuits&r." @@ -1811,7 +1823,7 @@ description: [ "The multiblock uses energy cores to &erelease extremely large amounts of energy at once&r to craft things. While the batteries themselves are lost, you are able to recover some of the spent energy. " "" - "&5...once energy voiding is implmented in gtm." + "&5...once energy voiding is implemented in gtm." ] icon: "gtceu:discharger" id: "713FAECEE5046121" @@ -2297,7 +2309,6 @@ y: 15.25d } { - dependencies: ["71602D44E1D0013E"] description: [ "Some Micro Miner missions use a &6Gemstone Sensor&r to scout out gems instead of ores." "" @@ -2364,47 +2375,6 @@ x: 3.0d y: 24.0d } - { - dependencies: ["49D33146A1F417E8"] - description: [ - "&9Radon&r will be needed in large quantities." - "" - "For now, you'll need to obtain it from Tier Two Micro Miner missions, in the form of &6Radium Salt&r. Electrolyze it for Radon and &6Rock Salt&r. &2You can also get it from distilling liquid Ender Air.&r" - "" - "Later it will be possible to make Radon using a &bGregTech &3Fusion Reactor&r." - ] - disable_toast: true - icon: "gtceu:radon_bucket" - id: "6B0A547EA42CD35A" - shape: "hexagon" - tasks: [{ - amount: 1000L - fluid: "gtceu:radon" - id: "613824353565F9CF" - type: "fluid" - }] - title: "&2Radon" - x: -6.0d - y: 6.25d - } - { - dependencies: [ - "11154356854B64DA" - "6B0A547EA42CD35A" - ] - description: ["You'll need an HV or better &3Chemical Bath&r to make these. The recipe is quite slow, so invest in the highest tier Chemical Baths you can and consider parallelizing the recipe."] - disable_toast: true - id: "71602D44E1D0013E" - shape: "hexagon" - subtitle: "When &6Ender Eyes&r just aren't creepy enough." - tasks: [{ - id: "52E1C27170D352B7" - item: "gtceu:quantum_eye" - type: "item" - }] - x: -6.0d - y: 8.25d - } { dependencies: ["53EC3831D66769CA"] description: [ @@ -2734,10 +2704,11 @@ description: [ "Interestingly enough, sculk itself functions great as a &9biobattery&r, being able to store and quickly release mass amounts of energy, perfect for some upcoming items. The &9sculk charger&r should be able to get started in tacking advantage of it." "" - "To use it, set the recipe &ein the same way you would for an autocrafting table&r, then place an inventory (such as a barrel on top), and connect power to the charger. Items can be extacted from the charger in any manner." + "To use it, set the recipe &ein the same way you would for an autocrafting table&r, then place an inventory (such as a barrel on top), and connect power to the charger and a pylon. Items can be extacted from the charger in any manner." "" - "The charger itself &ehas extreme throughput&r, so don't worry about having to wait for it to craft items." + "The charger and pylon themselves &ehave extreme throughput&r, so don't worry about having to wait for it to craft items." ] + icon: "extendedcrafting:auto_flux_crafter" id: "7F75D961B102A72D" rewards: [{ id: "4CF3CFEF57B863A3" @@ -2746,11 +2717,18 @@ }] shape: "hexagon" size: 1.5d - tasks: [{ - id: "338DCAE7D9D78C51" - item: "extendedcrafting:auto_flux_crafter" - type: "item" - }] + tasks: [ + { + id: "338DCAE7D9D78C51" + item: "extendedcrafting:auto_flux_crafter" + type: "item" + } + { + id: "00EF32A94D627A37" + item: "extendedcrafting:flux_alternator" + type: "item" + } + ] title: "&9Sculk Charging" x: 25.25d y: 8.25d diff --git a/kubejs/assets/extendedcrafting/lang/en_us.json b/kubejs/assets/extendedcrafting/lang/en_us.json index d4008ab9c..b64afb9e1 100644 --- a/kubejs/assets/extendedcrafting/lang/en_us.json +++ b/kubejs/assets/extendedcrafting/lang/en_us.json @@ -26,7 +26,7 @@ "block.extendedcrafting.ender_alternator": "Ender Alternator", "block.extendedcrafting.ender_crafter": "Ender Crafter", "block.extendedcrafting.auto_ender_crafter": "Auto Ender Crafter", - "block.extendedcrafting.flux_alternator": "If you see this you have to eat a LuV circuit", + "block.extendedcrafting.flux_alternator": "Sculk Pylon", "block.extendedcrafting.flux_crafter": "Sculk Charger", "block.extendedcrafting.auto_flux_crafter": "Sculk Charger", @@ -78,7 +78,7 @@ "container.extendedcrafting.ultimate_table": "Ultimate Crafting", "container.extendedcrafting.compressor": "Quantum Compressor", "container.extendedcrafting.ender_crafter": "Ender Crafting", - "container.extendedcrafting.flux_alternator": "Flux Alternator", + "container.extendedcrafting.flux_alternator": "Sculk Pylon", "container.extendedcrafting.flux_crafter": "Sculk Charging", "screen.extendedcrafting.crafting_core.pedestals": "Pedestals: %s", diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_side.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_side.png new file mode 100644 index 0000000000000000000000000000000000000000..1fc73acf6d0b7dbbec76b6229393fb1b03fdcf5b GIT binary patch literal 1456 zcmbtUO>5LZ7>?GK+ES2;Ac{Do9$GM;o9%9f#!@$}T{N|}3#~V2C$qbun@mh*ySw#b z^`ubz054MT7w8YrgZ>r|oKO;b^IMb{;ckm7d0 zP)iEpi9Ul(VjOuP^JoAPMpUK^W{KR@ZVY~y(gtx)C$5;%LZPC`Y7$ci=;9O?HlljR zxQi81Cq4;S%&}UE4QrIqxJG|Noo*j6z_oRp)W)H{_1LPQXwQHj!eKU2$nmw}#@r@aMr#N?2q<|WlA=^8Y0P|Hbb7OH9&>QL9Kv=4>mVb(kV<>llehW-k6 zF|5$YM_dcfM^&PPK~)5)!mvQ=G~$N2cbSeCjsuH9%us+y(Y8b`hwOPS%;r$JqGe2J zS}W%zT{p0lH!>ATb@Rm3kb!bIJ#SOoNRr+^@BZWYn~}%64%Ls$lk{RzEpX9`c^=!n zW?3b7d#kz!It2m|P72==aguT3ioM_7krn9DHfw~F{vq96SWGLdi6Syre(%#$J{0w$Jy*)_VE4z~tL^a* z_Omay1{TKdA72<69DMv-939}-!xv}TZ=YN^e*&rBwugn+J43tUwU3{ZnOdA*vfo_2 G^WY~0gS&PB literal 0 HcmV?d00001 diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_top.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_base_top.png new file mode 100644 index 0000000000000000000000000000000000000000..6c3fac8c46efc6181053db1f494c0cd3a1b27749 GIT binary patch literal 1552 zcmbtUO^Do79M7UIw%bCbhh06?XIf#4P4beN*_k{W+wEj^1~=PbJJ9hqZ{B+|lkOxh zO|m;P3qmPETXFYL#DgEuo1RLwhf)+>Jm^6|!HeKY!BY=~invhxc$tsTmQ}F^lDy>o z-tYha|NbABDoZcz-Tl;VNs{)KOZKvO?@R8-C&lyWU;f16wJRvS5=qk3{^XvJ-hOvR zk{&zcR%>z1Sww_;DyF=_)Sedzv?Lup)(bFMVKHd1mg`&c?Tvik>q}L#zCuhYAA12D?IA(nu^5A%*YP9Nv*ZCU66@r*CW8SaUa{o)#2~0S6;R|M z1E#7g1VRJkO|_ZHWm%IP0R}WOnyzcmRCEJnAu{q{bjiY8NSkQcesN?>d|7fkjsv7= z-ELRyW>g-wG~F~!4H}wZC<38GeLu!M#g7h-8Eh7j&<$dj`ygS&4Za#%vT$`6gBPT< zel*faD5mvrpy?`1Vj2J`NpZny*clk7L}MN1F+Yw3R!^}(o5wtA^S_}^x9>9`v~`@+ z#*V&tUTPwW7uG}=BSCgVN7a77v}G3Y)sV1-HR0yLB$@yfLxy7>RypsCGgTS842+yQ z2WCZXve3|V)l-eESpY_!7V>!RFaWcsU7zx9bod@FX5*Mya&kz41qEiShK{m%WMmYW zLl6$34ySIjza!KX==-3eoG6a*zk(@2O&)q!XyJOe#k9b0$sko26?un;!m#izGw{N3 zP}z@S>=RbDEm_E+x-LbOn2^j7s$hdPlswF4l|rUqD02-nLvw|^5QB}++nlT>Ngto5 z|MC3E&=p;WI}gp1^kPyisN_Z>kNr`zoMLB3tBwl>1%fb13g41Rl5s}m(Qo&m6&TWX z+f0!DL%N5sh&SUd4%vK5sP%s;O%rixN%syz)E4@y+iygNe(R?1@9u*ROo# z-TnQoC%*XO*IUz%pywAW2cG>J?%BTc^VHd^TWsqF-#1nJmVWx`1>@0OGXQLDetyAx zZ)2l04eq`(bMCvT+1Fw9NB#KX8`JNvT)VlsU8~dA>L(_ze3^OX+!^V~{`sFi*($kf alhVaAN5WgrU3@v2+2w^L`|64M`M&@OVd=^M literal 0 HcmV?d00001 diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_side.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_side.png new file mode 100644 index 0000000000000000000000000000000000000000..ca97343416d472bec4bbf81e70104a77d6495c4c GIT binary patch literal 1461 zcmbtU%WKp?7>`JOv=)3I6g@bk3N4sqlHGJSgR#_ZZ5K@KW5Ie5oJ?kSV>g+YOuO4& zEPBy{-n@w5!JC43_t1g|FJ1*t{sSIFyb5))k6@)L)2~HCr^hYsqd^`S>j916+~E|Vvo60 zZ3U4)OVWk$R)oni<-nyiKeXj9Z#HG%d$xSdbf6PW(z-vh9@EA3*$P=-CYC3UUj!Fg zNDu^+W6%m3VS-w=+~!4Mo&MHj(1!43Tb@V_f+c4TOtP2)OVt$up#ch(TFsexS|#U! z0gard>l(Ba-9UMWi~{IhvM?8WRkTpL+%+b?Y`M;Pgfy+$Y^u$i%Ho=)Tb89kLo*CT zAe3Y+iJI)lLjSl+lJsS0|yE*20mdt1ykJ4fIHc zi&o-B+qg$G+Modqc_OfShK=fsv!u>`L!E8!Fd(#boXp0qz63#LBH>f3B8;veyP}iI zT12%4ny{6a(5Y47=5QKKgeGH(Ig2ZdHF}wv>$waJQyl{%A~$(x=(-xHM&2p{qu><_ zcx)7ak!ybFv1T&*6BjLEPHj0oq`;yA^A$r!`2sR51)2!L4%A_uUtQY`YC@#%go<+V zFvouddjwTk9AKe^AK)6*qOc}|Okp(18Y~uug?G8O7mkCV{o*YSIgPp*D=_elS~dFR=&>-QhXpQi_h)B|wg$?=1q2HtK-(#Q8l VPH(+_`63;x<*C`yt4lZU{s2gY!^i*t literal 0 HcmV?d00001 diff --git a/kubejs/assets/extendedcrafting/textures/block/flux_alternator_top.png b/kubejs/assets/extendedcrafting/textures/block/flux_alternator_top.png new file mode 100644 index 0000000000000000000000000000000000000000..3476df324508e83cbde21ffadec430457491836b GIT binary patch literal 1507 zcmbtUONbmr7;as%XktJRi3B7?M`c6o?&_YIo#`U&x|!KHi}t!~2C^cEHB~h;%}#f9 zx@$ADi{RkNAfg8^iYGzMLA`m2ha3d)CioyHNxVq#qM*m%`qw;~RaV8=(B1X;{_lVP zm)F;xI(qo{VZ$(vt~MJR@V{Tb_sqlh#IJi4e)p!$=W@e1@_>HtGTwRjA;UQINYvU? zo8dEr$=Ie`wuL>6Q$QQWnWbS$*_KeKExJ(>m_L7Z%|sCo%nOwehiP5(qULTU&hM_Z z*zOkdxw-TNIx{3d5DP`oFzzQg83yKBG@rBdQJgTcTalx&%G z9oP4L2YZg^S%9$eokY>0mEgcdGD373QX)IKiJph^U$7P4^7!sV9dl5&-lDi*E~j3>}g@~E?O z5VV3x1;qA2p`18X^k2c8k&et_3bBY{+7(WkbWK!5nABxoW}q0XD~+uPL$aFWiY82~ zHUbmEVMh@s9(T*_s>`jC5ZLm)a@Fz~uUP_%cDu4z<8Eo<1;{rf+tx{+$@Bjx|7;dP z*U|nR^XOjG)k2z44td;}Hp_W&ak}b9Xj~wKGF|wA$#ljAH>bzZ9Y%g zBVXR!`}+Nbm%g~w`{<`%u8v%C{KIqa-G}CH{&x4=+y~XBH+u6MI+}ms$=AAPM;C8( bA2UAgJ$Pd2$79dyF}%96*7)S?i?93v3q#oM literal 0 HcmV?d00001 diff --git a/kubejs/assets/extendedcrafting/textures/gui/flux_alternator.png b/kubejs/assets/extendedcrafting/textures/gui/flux_alternator.png new file mode 100644 index 0000000000000000000000000000000000000000..71d43a7ae198f7dcd1ae769ea0a82958d2a795d0 GIT binary patch literal 1241 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6%U;1OBOz`!jG!i)^F=14Fw zuylL6IEGZrd3(pUOQcfbz{7g}$v%%5d3;;_%%a4_5*ORH$Q?Lx<^Xq2M#6>!6{B(k zA(n%8+DuKpFtGVWNdIW;xn=EBYJBx~^}LLI6{}yo{C6>w_kC7P*`_#uX1)VA(>DM5 z^wp&D*11BPW6Q<=zZO5g{#VQcr@X%(pMS|^*|A4izmD(h-sAjxlkZM^{Mp{3_V+8T zbIf{gzFfRq`1aUW!(%g!N!;T+Q}E@jdEB21MPKgMGyRF@WM~;h5$e=+K)UfvTWT)(`!U%slqQsW)tneSf@S_1{L&DX_0 z-Fcw3w&Hu;oLsZjnX}gY3gNqTy`S;C+3c$lhZmo8{PCwIRgJaPz?@MLY$C+mAw#~2 ZZ|L0lT;SeG4q#cu;OXk;vd$@?2>{TIW=#M9 literal 0 HcmV?d00001 diff --git a/kubejs/client_scripts/JEI.js b/kubejs/client_scripts/JEI.js index 2560908e6..e2de2c7f0 100644 --- a/kubejs/client_scripts/JEI.js +++ b/kubejs/client_scripts/JEI.js @@ -27,7 +27,7 @@ JEIEvents.hideItems(event => { //Extended Crafting event.hide([Item.of('extendedcrafting:recipe_maker', '{Shapeless:0b,Type:"CraftTweaker"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:tin"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:copper"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:iron"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:coal"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:steel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:invar"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:silver"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:platinum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lead"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:glowstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:lapis_lazuli"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:electrum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:redstone"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:aluminum"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:diamond"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:nickel"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:gold"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:emerald"}'), Item.of('extendedcrafting:singularity', '{Id:"extendedcrafting:bronze"}')]) - event.hide(['extendedcrafting:enhanced_ender_catalyst', 'extendedcrafting:enhanced_redstone_catalyst', 'extendedcrafting:enhanced_redstone_component', 'extendedcrafting:enhanced_ender_component', 'extendedcrafting:ender_component', 'extendedcrafting:black_iron_block', 'extendedcrafting:black_iron_ingot', 'extendedcrafting:redstone_ingot_block', 'extendedcrafting:redstone_ingot', 'extendedcrafting:enhanced_redstone_ingot_block', 'extendedcrafting:enhanced_redstone_ingot', 'extendedcrafting:ender_ingot_block', 'extendedcrafting:ender_ingot', 'extendedcrafting:enhanced_ender_ingot_block', 'extendedcrafting:enhanced_ender_ingot', 'extendedcrafting:ender_star_block', 'extendedcrafting:ender_star', 'extendedcrafting:flux_star_block', 'extendedcrafting:flux_star', 'extendedcrafting:frame', 'extendedcrafting:basic_table', 'extendedcrafting:basic_auto_table', 'extendedcrafting:compressor', 'extendedcrafting:ender_alternator', 'extendedcrafting:ender_crafter', 'extendedcrafting:auto_ender_crafter', 'extendedcrafting:flux_alternator', 'extendedcrafting:flux_crafter', 'extendedcrafting:black_iron_slate', 'extendedcrafting:ender_catalyst']) + event.hide(['extendedcrafting:enhanced_ender_catalyst', 'extendedcrafting:enhanced_redstone_catalyst', 'extendedcrafting:enhanced_redstone_component', 'extendedcrafting:enhanced_ender_component', 'extendedcrafting:ender_component', 'extendedcrafting:black_iron_block', 'extendedcrafting:black_iron_ingot', 'extendedcrafting:redstone_ingot_block', 'extendedcrafting:redstone_ingot', 'extendedcrafting:enhanced_redstone_ingot_block', 'extendedcrafting:enhanced_redstone_ingot', 'extendedcrafting:ender_ingot_block', 'extendedcrafting:ender_ingot', 'extendedcrafting:enhanced_ender_ingot_block', 'extendedcrafting:enhanced_ender_ingot', 'extendedcrafting:ender_star_block', 'extendedcrafting:ender_star', 'extendedcrafting:flux_star_block', 'extendedcrafting:flux_star', 'extendedcrafting:frame', 'extendedcrafting:basic_table', 'extendedcrafting:basic_auto_table', 'extendedcrafting:compressor', 'extendedcrafting:ender_alternator', 'extendedcrafting:ender_crafter', 'extendedcrafting:auto_ender_crafter', 'extendedcrafting:flux_crafter', 'extendedcrafting:black_iron_slate', 'extendedcrafting:ender_catalyst']) event.hide(['extendedcrafting:black_iron_nugget', 'extendedcrafting:redstone_nugget', 'extendedcrafting:enhanced_redstone_nugget', 'extendedcrafting:ender_nugget', 'extendedcrafting:enhanced_ender_nugget']) //Thermal diff --git a/kubejs/server_scripts/energy_cores.js b/kubejs/server_scripts/energy_cores.js index 94f9429db..1bad58ea3 100644 --- a/kubejs/server_scripts/energy_cores.js +++ b/kubejs/server_scripts/energy_cores.js @@ -20,6 +20,22 @@ ServerEvents.recipes(event => { R: 'gtceu:luv_lapotronic_battery', X: 'kubejs:cryolobus_casing', A: 'gtceu:luv_charger_4x', + E: 'gtceu:luv_sensor', + C: '#gtceu:circuits/luv' + } + ) + + event.recipes.extendedcrafting.shaped_table( + 'extendedcrafting:flux_alternator', [ + " PEP ", + " PCP ", + " PCP ", + "PPCPP", + "XRRRX" + ], { + P: 'gtceu:double_cryolobus_plate', + R: 'gtceu:luv_lapotronic_battery', + X: 'kubejs:cryolobus_casing', E: 'gtceu:luv_emitter', C: '#gtceu:circuits/luv' } diff --git a/manifest.json b/manifest.json index d436fde09..f284e9999 100644 --- a/manifest.json +++ b/manifest.json @@ -637,7 +637,7 @@ }, { "projectID": 1018621, - "fileID": 5593016, + "fileID": 5597556, "required": true }, {