From 4a62548600b3bd9f572cb154ce4c3fd23461c6c0 Mon Sep 17 00:00:00 2001 From: Pansmith <70342772+ThePansmith@users.noreply.github.com> Date: Sun, 4 Aug 2024 11:32:13 -0500 Subject: [PATCH] Sculk Charger Textures, various tweaks (#435) * Sculk doesnt really fit in wetware * Added catalysts to mesol core to offset above * updated lang * textures for sculk charger * discharger shape --- .../ftbquests/quests/chapters/end_game.snbt | 6 ++- config/ftbquests/quests/chapters/genesis.snbt | 34 +++++++----- .../ftbquests/quests/chapters/late_game.snbt | 10 +++- .../textures/block/auto_flux_crafter_side.png | Bin 0 -> 190 bytes .../block/auto_flux_crafter_side.png.mcmeta | 6 +++ .../textures/block/flux_crafter_side.png | Bin 0 -> 190 bytes .../block/flux_crafter_side.png.mcmeta | 6 +++ .../textures/block/flux_crafter_top.png | Bin 0 -> 170 bytes .../textures/block/redstone_ingot_block.png | Bin 0 -> 121 bytes .../textures/gui/auto_flux_crafter.png | Bin 0 -> 1620 bytes .../textures/jei/flux_crafting.png | Bin 0 -> 1642 bytes kubejs/assets/gtceu/lang/en_us.json | 2 +- .../item/wetware_printed_circuit_board.png | Bin 9298 -> 0 bytes .../wetware_printed_circuit_board.png.mcmeta | 6 --- kubejs/server_scripts/End_Game.js | 49 +----------------- kubejs/server_scripts/energy_cores.js | 6 +-- kubejs/server_scripts/gregtech/circuits.js | 20 +------ kubejs/server_scripts/gregtech/discharger.js | 2 +- kubejs/startup_scripts/Multiblock_Registry.js | 20 +++---- 19 files changed, 62 insertions(+), 105 deletions(-) create mode 100644 kubejs/assets/extendedcrafting/textures/block/auto_flux_crafter_side.png create mode 100644 kubejs/assets/extendedcrafting/textures/block/auto_flux_crafter_side.png.mcmeta create mode 100644 kubejs/assets/extendedcrafting/textures/block/flux_crafter_side.png create mode 100644 kubejs/assets/extendedcrafting/textures/block/flux_crafter_side.png.mcmeta create mode 100644 kubejs/assets/extendedcrafting/textures/block/flux_crafter_top.png create mode 100644 kubejs/assets/extendedcrafting/textures/block/redstone_ingot_block.png create mode 100644 kubejs/assets/extendedcrafting/textures/gui/auto_flux_crafter.png create mode 100644 kubejs/assets/extendedcrafting/textures/jei/flux_crafting.png delete mode 100644 kubejs/assets/gtceu/textures/item/wetware_printed_circuit_board.png delete mode 100644 kubejs/assets/gtceu/textures/item/wetware_printed_circuit_board.png.mcmeta diff --git a/config/ftbquests/quests/chapters/end_game.snbt b/config/ftbquests/quests/chapters/end_game.snbt index 572f54ed4..1af6a4bee 100644 --- a/config/ftbquests/quests/chapters/end_game.snbt +++ b/config/ftbquests/quests/chapters/end_game.snbt @@ -878,6 +878,7 @@ y: -18.0d } { + dependencies: ["49C8716030809478"] description: ["An amalgamation of gems, all of them combined will be needed for the final circuit tier."] hide_dependency_lines: true id: "2343B68110805282" @@ -1013,7 +1014,7 @@ subtitle: "Gee that's a lot of Infinity Ingots" tasks: [{ id: "0BB7A824F7B03BDC" - item: "kubejs:fury_enhanced_infinity_catalyst" + item: "kubejs:furious_infinity_catalyst" type: "item" }] x: 35.0d @@ -1026,9 +1027,10 @@ subtitle: "Spend Monium to make Monium" tasks: [{ id: "2A554D0488C990D6" - item: "kubejs:serenity_enhanced_infinity_catalyst" + item: "kubejs:serene_infinity_catalyst" type: "item" }] + title: "&9Serene Infinity Catalyst" x: 55.0d y: -26.5d } diff --git a/config/ftbquests/quests/chapters/genesis.snbt b/config/ftbquests/quests/chapters/genesis.snbt index 1fb90db64..d4d1c813d 100644 --- a/config/ftbquests/quests/chapters/genesis.snbt +++ b/config/ftbquests/quests/chapters/genesis.snbt @@ -259,7 +259,7 @@ } { dependencies: ["66FCC26399376B55"] - description: ["&9Still very barebone at the moment. Currently shows which multiblocks can be made at what tier. How machines function, ore generation, tools, multiblocks, filters and finally covers.&r"] + description: ["&9Can be used to autobuild multiblocks&r."] disable_toast: true icon: "gtceu:terminal" id: "07DC7FC23332B847" @@ -274,6 +274,7 @@ title: "Terminal" type: "checkmark" }] + title: "&9Terminal" x: 1.75d y: 0.5d } @@ -396,7 +397,6 @@ "" "Later on, you also gain access to &9LaserIO&r, which trades some speed in exchange for allowing rather complex and compact filtering." ] - icon: "enderio:pressurized_fluid_conduit" id: "64AAF0CD958D836A" rewards: [{ count: 2 @@ -404,18 +404,26 @@ item: "ulvcovm:ulv_electric_pump" type: "item" }] - tasks: [ - { - id: "150F57D9BEE7CCEE" - item: "enderio:pressurized_fluid_conduit" - type: "item" - } - { - id: "277C38246AE179F6" - item: "gtceu:potin_normal_fluid_pipe" - type: "item" + tasks: [{ + id: "150F57D9BEE7CCEE" + item: { + Count: 1b + id: "itemfilters:or" + tag: { + items: [ + { + Count: 1b + id: "enderio:pressurized_fluid_conduit" + } + { + Count: 1b + id: "gtceu:steel_normal_fluid_pipe" + } + ] + } } - ] + type: "item" + }] title: "&9Fluid Transport" x: -4.0d y: 3.5d diff --git a/config/ftbquests/quests/chapters/late_game.snbt b/config/ftbquests/quests/chapters/late_game.snbt index f945688e7..86e9beda9 100644 --- a/config/ftbquests/quests/chapters/late_game.snbt +++ b/config/ftbquests/quests/chapters/late_game.snbt @@ -839,7 +839,7 @@ description: [ "The most advanced substrate available, prepared for bleeding-edge bioengineering technology." "" - "&6Wetware Circuit Boards&r are the basis of &6Wetware&r circuits, the final theme that spans tiers six through nine." + "&6Wetware Circuit Boards&r are the basis of &6Wetware&r circuits." ] icon: "gtceu:wetware_printed_circuit_board" id: "4AC51394FB5152E5" @@ -1002,6 +1002,8 @@ "" "&6Enderium&r doesn't require much power (running on as little as MV) but it does need a lot of heat and is incredibly slow without overclocking. &2You can use small amounts of Krypton from Liquid Ender Air distillation to significantly decrease the smelting time.&r" "" + "&9Enderium also requires Tantalum, which can be renewably created by macerating and processing dragon scales." + "" "As with all later blast furnace materials, dedicate a furnace to keeping these in stock and have it running constantly to ensure a stable supply (turning it off when you have an acceptably vast stockpile)." "" "In addition to its other uses, Enderium gets you access to &aResonant Integral Components&r for machines. These quests can be found on the &eProgression&r tab." @@ -1806,7 +1808,11 @@ } { dependencies: ["22144A6785524FDF"] - description: ["The multiblock uses energy cores to release extremely large amounts of energy at once to craft things. While the batteries themselves are lost, you are able to recover some of the spent energy."] + 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." + ] icon: "gtceu:discharger" id: "713FAECEE5046121" rewards: [{ diff --git a/kubejs/assets/extendedcrafting/textures/block/auto_flux_crafter_side.png b/kubejs/assets/extendedcrafting/textures/block/auto_flux_crafter_side.png new file mode 100644 index 0000000000000000000000000000000000000000..7a2d47f6add0bd1cdf3100846639c063ab3f749e GIT binary patch literal 190 zcmeAS@N?(olHy`uVBq!ia0vp^0zj<5!3HFyJAa%3Qk(@Ik;M!Q+`=Ht$S`Y;1W>TR z)5S5wqcb_>!u9{>9T*c56M&%R-$b3W|5blV&d}I6x3Mu%K;pom4eVCyu*1(B3AtfN-$N2=)hL;SFn7A0YneFXe^(1up*wtjTR z)5S5wqcb_>!u9{>9T*c56M&%R-$b3W|5blV&d}I6x3Mu%K;pom4eVCyu*1(B3AtfN-$N2=)hL;SFn7A0YneFXe^(1up*wtj6AioK5)vG~vgw({iT6}BmN;w_58yfQ%*Cm}D(;8=N&jt(3|IXObz*l`%?8@T N;OXk;vd$@?2>^(PIxheK literal 0 HcmV?d00001 diff --git a/kubejs/assets/extendedcrafting/textures/block/redstone_ingot_block.png b/kubejs/assets/extendedcrafting/textures/block/redstone_ingot_block.png new file mode 100644 index 0000000000000000000000000000000000000000..f976bc8fbd06ef40af334cb377e615fdda4481ef GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|oCO|{#S9F5M?jcysy3fAP*B^` z#W6%dv1?@ayqPf5|Z=naXQ=rPM zoCBVz54i$U*pIP_bfoYuEap;hI(FmPIiF`T`<}maxK{5j_B=Ih-Lo@6d&@uGn!31& zZ;!1-j8yeA{(d>VKkxtldX@F}=dZ6T?LYrs`}SggC6D;3d%FLszssMg)hW=kE`KlM zE7+)bPPkD_H~P<)XV1R9RXZQCe*L<0wH)zp4t?DJVq;QD<-Xm~_iKK~hE6qZY@BBQ z&)J`yZ|$p>J_$eH$TRK>(HH#jM2I1%cW*}Z4w(Wr2H~u~J`M~CPWJYdM&A|ZoKj`j zv;9TV-^}dSn?LW1kC!jjst;3Jj7jZHyex3R;oRgtv)$*h9stg9R?upe; zWjLTw74s*QiJ|%Ht{cNaFB(eiIagv zn1Mr$LBNMWVFrVP0b@e~6HH?E-^hmL{c`;CHg4J(nE&nD>{-QMFFie2oRGDdeZi}{ zO_E93xqHh%;+KEbeF%6e#IOjTaS(gfbhbCnxF_KsJMU=lguj9f3eNM3Y`T{#{C+IN z&~&zrZ3ED*=98|&WHS9Z^LwPb!V=jeF>rVEDM^B1x#2o|$X7HHs$ z{L|ygV3qvQSdH;T$I?>v zNHSb5&TpQ~;n1;qy54S`hr)V{7-5Sg(9`NARsapQF?9zTY;Y|&Ywg)axg9J>5rRb% zfhfeTWA3lK1E7fg*D&>LZ`J1Q`F)n$=XX}U{Pe(b&YLsSo7d&!@%(C7yY=g>o43u6 z&uM*L5&60#h6y!wU^g0`0Nz~r%MfN}o|TaK5~J^{Q9%_y1qDoxR<=+5Sm=K}m@TF!i4RDlxG?-sf<+kRN|SMR!UW zi_!9*mOenOPy;q9Pp~|Dexve*k~_?#g{N%enan!A%a*0?3KXU?Bmqb=RkdU*;FaR8$x2*i!uc+{LqRZ`bVGl5b2NKUL Rvw_tFgQu&X%Q~loCIHDhR8#-} literal 0 HcmV?d00001 diff --git a/kubejs/assets/extendedcrafting/textures/jei/flux_crafting.png b/kubejs/assets/extendedcrafting/textures/jei/flux_crafting.png new file mode 100644 index 0000000000000000000000000000000000000000..7883357bc9648fc8a17450a31daa53a20bdbb26d GIT binary patch literal 1642 zcmeH|?N6F#6vpod7$73fP+2>%Y>tBMOpuyX6l?3ER#p|QtF6&l&=nVLeVaP1Kyle> zD^WL@Q-%>!v$pA4huX{`R`8X%!Q8TJ(#E1zi_xJDXn7e<_qfC*P4*}B!=2xKa$V=c zxpIwCHp`Wst|aSi%}foJdZ>_3ct1g!qyE0p_q;BldG!3;Qs1J3>g)(Q0W12qLK@#l2N zlw#+xoG8F3fTgWKUM# zk0+LMOMZ|Z>-7g;WU9|DtK38{;61VQxn-X@A))KHnQz<*E?J|Jv1fX?tI-rCt7iTW zRhH$RTNdDgV8L<7HBe!j_2djziB8SP?GN&(W94(~pUlrY|u=LohrF^@8;rP3K9B(0AIb5ZMa{NjX?S5jg##Bcn}9S{eS67wlK z)HRUb>(9F$FJYQ6;rtNY-~&u}S%@wg1`@7fB9Lx+C&*m5nXT>FycD9lEr$$Ov8qA= zh{&_`!zi-fmOiVY1c!-#AHnm`FedQ4$1tYwyipiNJnwp#c#?+>k0Tw+XCmA8N|nsU z!^rlB3gJ)ymXs)mlGjpV%~+Igw-MZUN>d)x24E-OL+`|3dQA{yZ4-f@r9~oL6vjWd zGp_(n1P>bIa9|N2Q~(&9~w{3B37&HIrP?aeXkoQB9JOr3P wfd(J2hX_JxAT1f51srF-5MD&Gy9~YCV0Mv<6C~1e;Nt-}390ctZ}C3*2aHi@O8@`> literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/lang/en_us.json b/kubejs/assets/gtceu/lang/en_us.json index c6dc652f5..fe9243b8f 100644 --- a/kubejs/assets/gtceu/lang/en_us.json +++ b/kubejs/assets/gtceu/lang/en_us.json @@ -42,7 +42,7 @@ "gtceu.basic_microverse": "Basic Microverse Projector", "gtceu.advanced_microverse": "Advanced Microverse Projector", "gtceu.advanced_microverse_ii": "Advanced Microverse Projector II", - "gtceu.advanced_microverse_iii": "Advanced Microverse Projector III", + "gtceu.advanced_microverse_iii": "Hyperbolic Microverse Projector", "gtceu.naquadah_reactor_i": "Naquadah Reactor I", "gtceu.naquadah_reactor_ii": "Naquadah Reactor II", "block.gtceu.lv_atomic_reconstructor": "ยง7Basic Atomic Reconstructor", diff --git a/kubejs/assets/gtceu/textures/item/wetware_printed_circuit_board.png b/kubejs/assets/gtceu/textures/item/wetware_printed_circuit_board.png deleted file mode 100644 index 788debf98866fe5296da3910fedecaa23e656f01..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9298 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 { event.remove({ id: 'gtceu:chemical_reactor/stem_cells' }) event.remove({ id: 'gtceu:large_chemical_reactor/stem_cells' }) event.recipes.gtceu.chemical_reactor("kubejs_stem_cells") - .itemInputs('minecraft:dragon_egg', '4x minecraft:sculk_catalyst') + .itemInputs('minecraft:dragon_egg') .inputFluids('gtceu:sterilized_growth_medium 500', 'gtceu:bacteria 500') .itemOutputs('64x gtceu:stem_cells', '64x gtceu:stem_cells') .outputFluids('gtceu:bacterial_sludge 500') @@ -409,30 +409,6 @@ ServerEvents.recipes(event => { } ) - // Creative Efficiency Upgrade - event.recipes.extendedcrafting.shaped_table( - 'thermal:machine_efficiency_creative_augment', [ - "UPPCGCPPU", - 'PPCGSGCPP', - 'PCGSRSGCP', - 'CGSRORSGC', - 'GSROIORSG', - 'CGSRORSGC', - 'PCGSRSGCP', - 'PPCGSGCPP', - "UPPCGCPPU", - ], { - U: 'gtceu:max_battery', - P: 'thermal:upgrade_augment_3', - C: 'thermal:upgrade_augment_4', - G: 'thermal:upgrade_augment_2', - S: 'thermal:machine_speed_augment', - R: 'thermal:machine_speed_augment', - O: 'thermal:machine_efficiency_augment', - I: 'kubejs:infinity_catalyst' - } - ) - // Creative Chest event.recipes.extendedcrafting.shaped_table( 'gtceu:max_machine_casing', [ @@ -546,27 +522,4 @@ ServerEvents.recipes(event => { Z: 'kubejs:infinity_wire_cutter' } )} - - - - // Creative Catalyst augment - event.recipes.extendedcrafting.shaped_table( - 'thermal:machine_catalyst_creative_augment', [ - 'TTTTTTTTT', - 'TNNIIINNT', - 'TNINNNINT', - 'TNINCIIIT', - 'TNICRCINT', - 'TIIICNINT', - 'TNINNNINT', - 'TNNIIINNT', - 'TTTTTTTTT' - ], { - I: 'gtceu:infinity_plate', - R: 'kubejs:infinity_catalyst', - N: 'gtceu:neutronium_plate', - T: 'gtceu:titanium_plate', - C: 'thermal:machine_catalyst_augment' - } - ) }) diff --git a/kubejs/server_scripts/energy_cores.js b/kubejs/server_scripts/energy_cores.js index 40c1d8025..94f9429db 100644 --- a/kubejs/server_scripts/energy_cores.js +++ b/kubejs/server_scripts/energy_cores.js @@ -32,7 +32,7 @@ ServerEvents.recipes(event => { ], { A: "gtceu:cryolobus_ingot", B: "gtceu:tungsten_carbide_ingot", - C: "gtceu:palis_empowered_gem" + C: "minecraft:sculk_catalyst" }, 200000000).powerRate(200000000); event.recipes.gtceu.assembler("kubejs:mesol_energy_core") @@ -50,14 +50,14 @@ ServerEvents.recipes(event => { .EUt(32) event.recipes.gtceu.assembler("kubejs:abyssal_energy_core") - .itemInputs("4x kubejs:bathyal_energy_core", "4x gtceu:restonia_empowered_gem", 'gtceu:cryococcus_ingot', 'kubejs:stabilized_einsteinium') + .itemInputs("4x kubejs:bathyal_energy_core", "4x gtceu:restonia_empowered_gem", 'gtceu:cryococcus_plate', 'kubejs:stabilized_einsteinium') .inputFluids('enderio:xp_juice 1000') .itemOutputs("kubejs:abyssal_energy_core") .duration(100) .EUt(32) event.recipes.gtceu.assembler("kubejs:hadal_energy_core") - .itemInputs("5x kubejs:abyssal_energy_core", "gtceu:void_empowered_block", 'kubejs:hadal_shard', '2x gtceu:omnium_plate', '2x gtceu:neutronium_ingot') + .itemInputs("5x kubejs:abyssal_energy_core", 'kubejs:hadal_shard', "gtceu:void_empowered_block", '2x gtceu:omnium_plate', '2x gtceu:neutronium_plate') .inputFluids('enderio:xp_juice 1000') .itemOutputs("kubejs:hadal_energy_core") .duration(100) diff --git a/kubejs/server_scripts/gregtech/circuits.js b/kubejs/server_scripts/gregtech/circuits.js index e5f732adf..ebac6e31b 100644 --- a/kubejs/server_scripts/gregtech/circuits.js +++ b/kubejs/server_scripts/gregtech/circuits.js @@ -128,27 +128,9 @@ ServerEvents.recipes(event => { .EUt(9600) // Wetware tweaks - - event.remove({output: 'gtceu:wetware_printed_circuit_board'}) - event.recipes.gtceu.large_chemical_reactor('wetware_printed_board_iron3') - .itemInputs('gtceu:wetware_circuit_board', '32x minecraft:sculk_vein', '4x gtceu:stem_cells') - .inputFluids('gtceu:iron_iii_chloride 5000', 'enderio:xp_juice 4000', 'gtceu:sterilized_growth_medium 100') - .itemOutputs('gtceu:wetware_printed_circuit_board') - .cleanroom(CleanroomType.CLEANROOM) - .duration(1800) - .EUt(480) - - event.recipes.gtceu.large_chemical_reactor('wetware_printed_board_persulfate') - .itemInputs('gtceu:wetware_circuit_board', '32x minecraft:sculk_vein', '4x gtceu:stem_cells') - .inputFluids('gtceu:sodium_persulfate 10000', 'enderio:xp_juice 8000', 'gtceu:sterilized_growth_medium 100') - .itemOutputs('gtceu:wetware_printed_circuit_board') - .cleanroom(CleanroomType.CLEANROOM) - .duration(1800) - .EUt(480) - event.remove({output: 'gtceu:neuro_processing_unit'}) event.recipes.gtceu.circuit_assembler('neuro_processing_unit') - .itemInputs('gtceu:wetware_printed_circuit_board', '4x gtceu:stem_cells', '8x gtceu:polybenzimidazole_small_fluid_pipe', '4x gtceu:cryolobus_plate', '16x gtceu:silicone_rubber_foil', '8x gtceu:hsse_bolt') + .itemInputs('gtceu:wetware_printed_circuit_board', '4x gtceu:stem_cells', '8x gtceu:polybenzimidazole_small_fluid_pipe', '4x gtceu:enderium_plate', '16x gtceu:silicone_rubber_foil', '8x gtceu:hsse_bolt') .inputFluids('gtceu:sterilized_growth_medium 100') .itemOutputs('gtceu:neuro_processing_unit') .duration(600) diff --git a/kubejs/server_scripts/gregtech/discharger.js b/kubejs/server_scripts/gregtech/discharger.js index 7773aba97..64a2ad9ea 100644 --- a/kubejs/server_scripts/gregtech/discharger.js +++ b/kubejs/server_scripts/gregtech/discharger.js @@ -35,7 +35,7 @@ ServerEvents.recipes(event => { .itemInputs(input) .itemOutputs(output) .duration(10) //wip - .EUt(-(refund / 4)) + // .EUt(-(refund / 4)) Enable once that gets fixed. } Discharge('hadal_solar', '2x solarflux:sp_custom_hadal', ['kubejs:hadal_energy_core', '2x solarflux:sp_custom_abyssal', '2x kubejs:abyssal_energy_core'], 1000000) diff --git a/kubejs/startup_scripts/Multiblock_Registry.js b/kubejs/startup_scripts/Multiblock_Registry.js index 8e54dbe0a..05854202e 100644 --- a/kubejs/startup_scripts/Multiblock_Registry.js +++ b/kubejs/startup_scripts/Multiblock_Registry.js @@ -748,19 +748,19 @@ GTCEuStartupEvents.registry('gtceu:machine', event => { .recipeTypes('discharger') .appearanceBlock(() => Block.getBlock('kubejs:cryolobus_casing')) .pattern(definition => FactoryBlockPattern.start() - .aisle("CCCCC", " ", " ", " ", "CCCCC") - .aisle("CCCCC", " HHH ", " HHH ", " HHH ", "CCCCC") - .aisle("CCCCC", " HAH ", " HAH ", " HAH ", "CCCCC") - .aisle("CCCCC", " HHH ", " HHH ", " HHH ", "CCCCC") - .aisle("CCYCC", " ", " ", " ", "CCCCC") + .aisle(" CCC ", " CCC ", " CCC ", " CCC ", " CCC ") + .aisle("CCCCC", "C C", "C C", "C C", "CCCCC") + .aisle("CCCCC", "C C", "C C", "C C", "CCCCC") + .aisle("CCCCC", "C C", "C C", "C C", "CCCCC") + .aisle("CCCCC", "C C", "C C", "C C", "CCCCC") + .aisle("CCCCC", "C C", "C C", "C C", "CCCCC") + .aisle("CCCCC", "C C", "C C", "CCCCC", " ") + .aisle(" CCC ", " CYC ", " CCC ", " ", " ") .where('Y', Predicates.controller(Predicates.blocks(definition.get()))) - .where('H', Predicates.blocks("kubejs:cryolobus_casing")) - .where('C', Predicates.blocks("kubejs:cryolobus_casing") + .where('C', Predicates.blocks("kubejs:cryolobus_casing").setMinGlobalLimited(109) .or(Predicates.autoAbilities(definition.getRecipeTypes())) - .or(Predicates.abilities(PartAbility.MAINTENANCE))) - .where('A', Predicates.any()) + .or(Predicates.abilities(PartAbility.MAINTENANCE).setExactLimit(1))) .where(' ', Predicates.any()) - .where('#', Predicates.any()) .build()) .workableCasingRenderer("kubejs:block/cryolobus/cryolobus_casing", "gtceu:block/multiblock/implosion_compressor", false)