diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index 412b0ca10..ca9bf3b2d 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -42,6 +42,7 @@ ServerEvents.tags('item', event => { registerTFCItemTags(event) registerTFCTextileItemTags(event) registerTFGItemTags(event) + registerTFCLunchboxItemTags(event) registerVintageImprovementsItemTags(event) }) diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index badc96045..c3d57818b 100644 --- a/kubejs/server_scripts/tfclunchbox/recipes.js +++ b/kubejs/server_scripts/tfclunchbox/recipes.js @@ -2,58 +2,30 @@ function registerTFCLunchBoxRecipes(event) { - event.shaped('tfclunchbox:lunchbox', [ - ' CE', - 'ABA', - 'DAD' - ], { - A: '#forge:plates/sterling_silver', - B: '#forge:chests/wooden', - C: '#forge:bolts/brass', - D: '#forge:screws/wrought_iron', - E: '#forge:tools/hammers' - }).id('tfclunchbox:lunchbox') + const fluidCells = [ + { id: 'gtceu:universal_fluid_cell', capacity: 1000, name: 'universal' }, + { id: 'gtceu:fluid_cell', capacity: 1000, name: 'basic' }, + { id: 'gtceu:steel_fluid_cell', capacity: 8000, name: 'steel' }, + { id: 'gtceu:aluminium_fluid_cell', capacity: 32000, name: 'aluminium' }, + { id: 'gtceu:stainless_steel_fluid_cell', capacity: 64000, name: 'stainless_steel' }, + { id: 'gtceu:titanium_fluid_cell', capacity: 128000, name: 'titanium' }, + { id: 'gtceu:tungstensteel_fluid_cell', capacity: 512000, name: 'tungstensteel' }, + { id: 'gtceu:glass_vial', capacity: 1000, name: 'glass_vial' } + ]; - event.shaped('tfclunchbox:cooling_lunchbox', [ - ' CE', - 'ABA', - 'DAD' - ], { - A: '#forge:plates/red_steel', - B: '#forge:chests/wooden', - C: '#forge:bolts/brass', - D: '#forge:screws/steel', - E: '#forge:tools/hammers' - }).id('tfclunchbox:cooling_lunchbox') + // Убираем оригинальные рецепты капсул + // Remove original capsule recipes + event.remove({ id: 'tfclunchbox:universal_capsule' }) + event.remove({ id: 'tfclunchbox:fill_capsule_with_ice' }) - event.shaped('tfclunchbox:cooling_lunchbox', [ - ' C ', - 'ABA' - ], { - A: '#forge:plates/red_steel', - B: 'tfclunchbox:lunchbox', - C: '#forge:tools/hammers' - }).id('tfclunchbox:upgrade_to_cooling_lunchbox') - - event.remove({ id: 'tfclunchbox:universal_capsule' }) - event.remove({ id: 'tfclunchbox:fill_capsule_with_ice' }) - - event.recipes.gtceu.assembler('tfclunchbox:universal_capsule') - .itemInputs('1x #forge:foils/red_steel', '1x #forge:rings/sterling_silver') - .itemOutputs('tfclunchbox:universal_capsule') - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice') - .itemInputs('tfclunchbox:universal_capsule') - .inputFluids(Fluid.of('gtceu:ice', 45 * 144)) - .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:1000}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) - - event.recipes.gtceu.canner('tfclunchbox:fill_capsule_with_ice_solid') - .itemInputs('tfclunchbox:universal_capsule', '5x minecraft:packed_ice') - .itemOutputs(Item.of('tfclunchbox:universal_capsule', '{Durability:1000}').withName(Text.translate('item.tfclunchbox.universal_capsule.filled'))) - .duration(100) - .EUt(GTValues.VA[GTValues.LV]) -} + // Рецепты заполнения fluid cells жидким льдом + // Recipes for filling fluid cells with liquid ice + fluidCells.forEach(cell => { + event.recipes.gtceu.canner(`tfclunchbox:fill_${cell.name}_cell_with_liquid_ice`) + .itemInputs(cell.id) + .inputFluids(Fluid.of('gtceu:ice', cell.capacity)) + .itemOutputs(Item.of(cell.id, '{Fluid:{Amount:' + cell.capacity + ',FluidName:"gtceu:ice"}}')) + .duration(Math.max(16, Math.floor(cell.capacity / 64))) + .EUt(GTValues.VA[GTValues.LV]); + }); +} \ No newline at end of file diff --git a/kubejs/server_scripts/tfclunchbox/tags.js b/kubejs/server_scripts/tfclunchbox/tags.js new file mode 100644 index 000000000..b6ce2806e --- /dev/null +++ b/kubejs/server_scripts/tfclunchbox/tags.js @@ -0,0 +1,14 @@ +// priority: 0 + +function registerTFCLunchboxItemTags(event) { + + const DISABLED_ITEMS = [ + 'tfclunchbox:universal_capsule', + ] + + DISABLED_ITEMS.forEach(item => { + event.removeAllTagsFrom(item) + event.add('c:hidden_from_recipe_viewers', item) + }) + +} \ No newline at end of file diff --git a/pakku-lock.json b/pakku-lock.json index 63dc9eb43..1252cbdf9 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -7914,7 +7914,7 @@ "files": [ { "type": "curseforge", - "file_name": "tfclunchbox-1.20.1-1.0.0.14.jar", + "file_name": "tfclunchbox-1.20.1-1.0.0.20.jar", "mc_versions": [ "1.20.1" ], @@ -7923,16 +7923,16 @@ "forge" ], "release_type": "beta", - "url": "https://edge.forgecdn.net/files/6646/846/tfclunchbox-1.20.1-1.0.0.14.jar", - "id": "6646846", + "url": "https://edge.forgecdn.net/files/6675/072/tfclunchbox-1.20.1-1.0.0.20.jar", + "id": "6675072", "parent_id": "1283445", "hashes": { - "sha1": "de4051c4345290b9d99f2d26090ad466f112b3ec", - "md5": "ada6f65d0fc9785a34b9deb76c53e882" + "sha1": "334167b4cc5ec81a917d168b6ec8a876f315298e", + "md5": "3dc59cd3d685fe4f5d097ca4e66746f4" }, "required_dependencies": [], - "size": 95828, - "date_published": "2025-06-13T12:54:20.803Z" + "size": 111379, + "date_published": "2025-06-20T14:40:33.51Z" } ] },