diff --git a/CHANGELOG.md b/CHANGELOG.md index 7270f4165..956a1f48b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ - Removed gems tag from flint @Pyritie - Updated texture for aqueous accumulator (#1168) @Redeix - Kaolin Klayzes now also drop blood lilies @Pyritie +- You can put liquid glue in wooden barrels and buckets now @Pyritie ## [0.9.11] - 13.06.2025 ### New features diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index e126e4f7e..67bce5440 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -1080,6 +1080,17 @@ const registerGTCEURecipes = (event) => { .EUt(GTValues.VA[GTValues.ULV]) //#endregion + + //#region glowstone + event.recipes.gtceu.alloy_blast_smelter('abs:liquid_glowstone') + .itemInputs('#forge:dusts/gold', '#forge:dusts/redstone', '#forge:dusts/sulfur') + .outputFluids(Fluid.of('gtceu:glowstone', 288)) + .duration(20*60/1.3) + .EUt(GTValues.VA[GTValues.LV]) + .blastFurnaceTemp(1064) + .circuit(9) + //#endregion + //#region Large boilers fuel rebalance diff --git a/kubejs/server_scripts/main_server_script.js b/kubejs/server_scripts/main_server_script.js index fd73f09b0..1d968086e 100644 --- a/kubejs/server_scripts/main_server_script.js +++ b/kubejs/server_scripts/main_server_script.js @@ -4,6 +4,7 @@ * Событие регистрации предмет-тэгов. */ ServerEvents.tags('item', event => { + registerAdAstraItemTags(event) registerAdvancedPeripheralsItemTags(event) registerAE2ItemTags(event) @@ -44,6 +45,7 @@ ServerEvents.tags('item', event => { registerTFCItemTags(event) registerTFCTextileItemTags(event) registerTFGItemTags(event) + registerTFCLunchboxItemTags(event) registerVintageImprovementsItemTags(event) }) diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index a46993c62..0d0ea3b55 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -482,9 +482,15 @@ const registerTFCFluidTags = (event) => { event.add('tfc:usable_in_wooden_bucket', 'gtceu:ice') event.add('tfc:usable_in_red_steel_bucket', 'gtceu:ice') + event.add('tfc:usable_in_barrel', 'gtceu:glue') + event.add('tfc:usable_in_wooden_bucket', 'gtceu:glue') + event.add('tfc:usable_in_blue_steel_bucket', 'tfc:spring_water') + event.add('tfc:usable_in_red_steel_bucket', 'gtceu:glue') + event.add('tfc:ingredients', 'tfc:spring_water') event.add('tfc:usable_in_barrel', 'tfc:spring_water') event.add('tfc:usable_in_wooden_bucket', 'tfc:spring_water') + event.add('tfc:usable_in_blue_steel_bucket', 'tfc:spring_water') event.add('tfc:usable_in_red_steel_bucket', 'tfc:spring_water') // Добавляем тег для скрытия в EMI diff --git a/kubejs/server_scripts/tfclunchbox/recipes.js b/kubejs/server_scripts/tfclunchbox/recipes.js index 0654a12b2..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:500}').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:500}').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 3e2566214..b030c5cfc 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -962,45 +962,6 @@ } ] }, - { - "pakku_id": "LVF7UEBiNQpjRDSW", - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "better-foliage-renewed" - }, - "name": { - "curseforge": "Better Foliage Renewed" - }, - "id": { - "curseforge": "470013" - }, - "files": [ - { - "type": "curseforge", - "file_name": "betterfoliage-5.0.2.jar", - "mc_versions": [ - "1.20.2", - "1.20.1" - ], - "loaders": [ - "neoforge", - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/4923/669/betterfoliage-5.0.2.jar", - "id": "4923669", - "parent_id": "470013", - "hashes": { - "sha1": "4163772d08837daf22034e5333ddefc8532cdb69", - "md5": "22f5753234b465c44688f9555acb4713" - }, - "required_dependencies": [], - "size": 396130, - "date_published": "2023-12-03T18:03:18.697Z" - } - ] - }, { "pakku_id": "hn4E1S13hPaLVPSH", "type": "MOD", @@ -4681,7 +4642,7 @@ "files": [ { "type": "curseforge", - "file_name": "guideme-20.1.8.jar", + "file_name": "guideme-20.1.9.jar", "mc_versions": [ "1.20.1" ], @@ -4689,16 +4650,16 @@ "forge" ], "release_type": "release", - "url": "https://edge.forgecdn.net/files/6634/593/guideme-20.1.8.jar", - "id": "6634593", + "url": "https://edge.forgecdn.net/files/6654/696/guideme-20.1.9.jar", + "id": "6654696", "parent_id": "1173950", "hashes": { - "sha1": "cc5e96b09949c5f1ad5d6aa5c45695f760715e95", - "md5": "38d8791dc9114d9cf6bcd5f2af1402e7" + "sha1": "5619e9e6c4e2f14c3e7f093698e2103c75f4dcf2", + "md5": "e3692a66b10b1df1b3d40cdc99773a6e" }, "required_dependencies": [], - "size": 9401167, - "date_published": "2025-06-09T21:54:55.087Z" + "size": 9403366, + "date_published": "2025-06-15T15:50:42.330Z" } ] }, @@ -6836,7 +6797,6 @@ "id": { "curseforge": "585406" }, - "export": false, "files": [ { "type": "curseforge", @@ -8077,7 +8037,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" ], @@ -8086,16 +8046,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" } ] }, @@ -8751,44 +8711,6 @@ } ] }, - { - "pakku_id": "mxWVAqlbiiejXL6S", - "type": "MOD", - "slug": { - "curseforge": "visual-workbench" - }, - "name": { - "curseforge": "Visual Workbench" - }, - "id": { - "curseforge": "500273" - }, - "files": [ - { - "type": "curseforge", - "file_name": "VisualWorkbench-v8.0.0-1.20.1-Forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/4612/695/VisualWorkbench-v8.0.0-1.20.1-Forge.jar", - "id": "4612695", - "parent_id": "500273", - "hashes": { - "sha1": "7ebf579edcf2440eadf1ed6c8c895e1bc2d77bf1", - "md5": "d741bc2d4d3a385116d094b874474a6b" - }, - "required_dependencies": [ - "495476" - ], - "size": 82055, - "date_published": "2023-06-27T21:00:10.803Z" - } - ] - }, { "pakku_id": "SZ5c7Jc5GOwlNtbX", "type": "MOD", diff --git a/pakku.json b/pakku.json index f3b69e9b5..f8605373b 100644 --- a/pakku.json +++ b/pakku.json @@ -32,9 +32,6 @@ "better-chat": { "side": "CLIENT" }, - "better-foliage-renewed": { - "side": "CLIENT" - }, "betterf3": { "side": "CLIENT" },