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')