diff --git a/CHANGELOG.md b/CHANGELOG.md index 9912e07c7..47370fc92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,12 +19,13 @@ - Added mossy, stairs, slabs, walls, and more to the non-TFC stone types (#1845) @vidal-adrien - Added back vanilla stone and all its variants, craftable out of the stone dust you get from ore processing (#1845) @vidal-adrien - Tweaked the moon worldgen a bit to add the new stone stuff @Pyritie -- Added rice and pasta to meal bags (#1864) @Nashy1232 +- Added rice, pasta, icecream, and chocolates to meal bags @Nashy1232 & @Redeix - Added back minecart with furnace as a minecart with boiler, and now it can accept any forge fuel (#1860) @Nashy1232 - Adds EMI pages for Create Blaze Burner Fuels and for in-world block modifications @BlueBoat29 - Added recipes for the rest of Create's windows and window panes @Pyritie - Halved how quickly the durability decreases on the various hiking/steel toe boots @Pyritie - Added curving press/extruder recipes for TFC shields @Pyritie +- Added `#minecraft:flowers` block tags to flower crops @Redeix ### Bug fixes - Ice soup now requires a bowl to craft, so it doesn't generate free bowls @Pyritie - Fixed repairing an iron flask consuming the knife, also added some flask recipes with rubber instead of a bladder (#1826) @Pyritie diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_empty.png b/kubejs/assets/tfg/textures/item/fuel_rod_empty.png new file mode 100644 index 000000000..8e528423d Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_empty.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png b/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png new file mode 100644 index 000000000..e14c6652b Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_p_1.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png b/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png new file mode 100644 index 000000000..d88bfb28f Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_p_2.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png b/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png new file mode 100644 index 000000000..9e8990485 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_p_4.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png b/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png new file mode 100644 index 000000000..a351e0e9a Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_t_1.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png b/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png new file mode 100644 index 000000000..7cd5a1f4e Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_t_2.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png b/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png new file mode 100644 index 000000000..55098653a Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_t_4.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png new file mode 100644 index 000000000..9543a8cc6 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_1.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png new file mode 100644 index 000000000..a2fa5a565 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_2.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png new file mode 100644 index 000000000..9aa966ddf Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_tbu_4.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png b/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png new file mode 100644 index 000000000..6a85b2d1a Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_u_1.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png b/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png new file mode 100644 index 000000000..0783dd415 Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_u_2.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png b/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png new file mode 100644 index 000000000..cfc048e6e Binary files /dev/null and b/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png differ diff --git a/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png.mcmeta b/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png.mcmeta new file mode 100644 index 000000000..be167b255 --- /dev/null +++ b/kubejs/assets/tfg/textures/item/fuel_rod_u_4.png.mcmeta @@ -0,0 +1 @@ +{"animation": {"frametime": 2, "frames": [{"index": 0, "time":30}, 1, 2, 3, 4, 5, 6, 7, 8, 9]}} \ No newline at end of file diff --git a/kubejs/server_scripts/tfg/tags.js b/kubejs/server_scripts/tfg/tags.js index 9c0292532..3bac4ed64 100644 --- a/kubejs/server_scripts/tfg/tags.js +++ b/kubejs/server_scripts/tfg/tags.js @@ -283,22 +283,38 @@ const registerTFGItemTags = (event) => { event.add('tfc:foods/usable_in_jam_sandwich_2', item); }); - //meal bags + //#region Meal Bag + /** + * List of item tags and item IDs that are allowed to be used in a meal bag. + * @type {string[]} + */ + const usable_in_meal_bag = [ + '#tfc:foods/meats', + '#tfc:foods/grains', + '#tfc:foods/vegetables', + '#tfc:foods/fruits', + '#tfc:foods/dairy', + '#firmalife:foods/chocolate', + '#tfcchannelcasting:foods/chocolate_sweet', + 'firmalife:food/chocolate_chip_cookie', + 'firmalife:food/vanilla_ice_cream', + 'firmalife:food/strawberry_ice_cream', + 'firmalife:food/chocolate_ice_cream', + 'firmalife:food/banana_split', + 'tfc:food/cooked_egg', + 'tfc:food/boiled_egg', + 'tfc:food/cooked_rice', + 'firmalife:food/cooked_pasta', + 'firmalife:food/pasta_with_tomato_sauce', + 'firmalife:food/cooked_rice_noodles', + 'tfg:roasted_sunflower_seeds' + ]; + usable_in_meal_bag.forEach(item => { + event.add('tfg:foods/usable_in_meal_bag', item); + }); event.add('tfg:foil_packs', 'tfg:foil_pack'); event.add('tfg:foil_packs', 'tfg:clean_foil_pack') - event.add('tfg:foods/usable_in_meal_bag', '#tfc:foods/meats'); - event.add('tfg:foods/usable_in_meal_bag', '#tfc:foods/grains'); - event.add('tfg:foods/usable_in_meal_bag', '#tfc:foods/vegetables'); - event.add('tfg:foods/usable_in_meal_bag', '#tfc:foods/fruits'); - event.add('tfg:foods/usable_in_meal_bag', '#tfc:foods/dairy'); - event.add('tfg:foods/usable_in_meal_bag', '#firmalife:foods/chocolate'); - event.add('tfg:foods/usable_in_meal_bag', 'tfc:food/cooked_egg'); - event.add('tfg:foods/usable_in_meal_bag', 'tfc:food/boiled_egg'); - event.add('tfg:foods/usable_in_meal_bag', 'tfc:food/cooked_rice'); - event.add('tfg:foods/usable_in_meal_bag', 'firmalife:food/cooked_pasta'); - event.add('tfg:foods/usable_in_meal_bag', 'firmalife:food/pasta_with_tomato_sauce'); - event.add('tfg:foods/usable_in_meal_bag', 'firmalife:food/cooked_rice_noodles'); - event.add('tfg:foods/usable_in_meal_bag', 'tfg:roasted_sunflower_seeds'); + //#endregion //#endregion //#region Blacklisted from the railgun diff --git a/kubejs/startup_scripts/tfg/blocks.plants.js b/kubejs/startup_scripts/tfg/blocks.plants.js index 581b6c45f..1b8d29912 100644 --- a/kubejs/startup_scripts/tfg/blocks.plants.js +++ b/kubejs/startup_scripts/tfg/blocks.plants.js @@ -14,6 +14,7 @@ const registerTFGCrops = (event) => { .hardness(0.4) .growthModifier(0.8) .tagBlock('minecraft:mineable/hoe') + .tagBlock('minecraft:flowers') .productItem(product => { product.texture('tfg:item/sunflower_product') }) @@ -34,6 +35,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('minecraft:flowers') .tagItem('c:hidden_from_recipe_viewers') event.create('tfg:rapeseed', 'tfc:double_crop') @@ -44,6 +46,7 @@ const registerTFGCrops = (event) => { .doubleStages(3) .hardness(0.4) .tagBlock('minecraft:mineable/hoe') + .tagBlock('minecraft:flowers') .deadBlock(dead => { dead.hardness(0.2) dead.soundType('crop') @@ -58,6 +61,7 @@ const registerTFGCrops = (event) => { .hardness(0.2) .tagBoth('tfc:wild_crops') .tagBlock('minecraft:mineable/hoe') + .tagBlock('minecraft:flowers') .tagItem('c:hidden_from_recipe_viewers') event.create('tfg:flax', 'tfc:double_crop') diff --git a/pakku-lock.json b/pakku-lock.json index 09f140d67..69040c49a 100644 --- a/pakku-lock.json +++ b/pakku-lock.json @@ -9498,135 +9498,6 @@ } ] }, - { - "pakku_id": "6taQC9WcabYRbAS4", - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "moremcmeta", - "modrinth": "moremcmeta" - }, - "name": { - "curseforge": "MoreMcmeta (Forge)", - "modrinth": "MoreMcmeta" - }, - "id": { - "curseforge": "442169", - "modrinth": "HFlxNpln" - }, - "files": [ - { - "type": "curseforge", - "file_name": "moremcmeta-1.20.1-4.5.2-forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/6082/464/moremcmeta-1.20.1-4.5.2-forge.jar", - "id": "6082464", - "parent_id": "442169", - "hashes": { - "sha1": "6046753a29d6963ad2a9c557b557bd7a2d793354", - "md5": "4525163236b7d903bf2a6d994382367d" - }, - "required_dependencies": [], - "size": 554659, - "date_published": "2025-01-13T03:40:19.353Z" - }, - { - "type": "modrinth", - "file_name": "moremcmeta-1.20.1-4.5.2-forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/HFlxNpln/versions/1Gk4ti96/moremcmeta-1.20.1-4.5.2-forge.jar", - "id": "1Gk4ti96", - "parent_id": "HFlxNpln", - "hashes": { - "sha512": "b13db1cea49baeca40f5d345c88233f05beca5d3607fbabd05498a86c6e68ddc57593360f786f3cf856ce76a7b685f20ff65d89f8d3712ef79068a836cea3dcb", - "sha1": "6046753a29d6963ad2a9c557b557bd7a2d793354" - }, - "required_dependencies": [], - "size": 554659, - "date_published": "2025-01-13T03:40:23.347410Z" - } - ] - }, - { - "pakku_id": "5QAlfVTX7sQ7PswM", - "pakku_links": [ - "6taQC9WcabYRbAS4" - ], - "type": "MOD", - "side": "CLIENT", - "slug": { - "curseforge": "moremcmeta-emissive-forge", - "modrinth": "moremcmeta-emissive" - }, - "name": { - "curseforge": "MoreMcmeta Emissive Textures (Forge)", - "modrinth": "MoreMcmeta Emissive Textures" - }, - "id": { - "curseforge": "880880", - "modrinth": "oQ0dIGZg" - }, - "files": [ - { - "type": "curseforge", - "file_name": "emissive-plugin-1.20.1-2.0.4-forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://edge.forgecdn.net/files/4898/803/emissive-plugin-1.20.1-2.0.4-forge.jar", - "id": "4898803", - "parent_id": "880880", - "hashes": { - "sha1": "3e8b0ff63e1fe62caed7fb6dfa86011a5f931fcc", - "md5": "6f1e35ebd7e1bd5218316598a2ce8ed2" - }, - "required_dependencies": [ - "442169" - ], - "size": 102164, - "date_published": "2023-11-25T05:31:26.873Z" - }, - { - "type": "modrinth", - "file_name": "emissive-plugin-1.20.1-2.0.4-forge.jar", - "mc_versions": [ - "1.20.1" - ], - "loaders": [ - "forge" - ], - "release_type": "release", - "url": "https://cdn.modrinth.com/data/oQ0dIGZg/versions/rkJ3fswP/emissive-plugin-1.20.1-2.0.4-forge.jar", - "id": "rkJ3fswP", - "parent_id": "oQ0dIGZg", - "hashes": { - "sha512": "1282ae1aad8000fd0976a984786022c452d43d9a173928e80bb91baf9c5125fac75330c813a1e9df33b560597887f9ede6af0e6c97e8f788e5f46f009879f8f2", - "sha1": "3e8b0ff63e1fe62caed7fb6dfa86011a5f931fcc" - }, - "required_dependencies": [ - "HFlxNpln" - ], - "size": 102164, - "date_published": "2023-11-25T05:31:30.775870Z" - } - ] - }, { "pakku_id": "ceWqlD7cralxbs8z", "type": "MOD", @@ -14690,4 +14561,4 @@ } ], "lockfile_version": 1 -} \ No newline at end of file +}