From 7e0c8370a44901d68439fdfd05231ceeed09ca12 Mon Sep 17 00:00:00 2001 From: Forstride Date: Sat, 20 Jan 2024 18:13:13 -0500 Subject: [PATCH] Changed default seasonal crop tags --- .../tags/blocks/autumn_crops.json | 24 ----------------- .../tags/blocks/spring_crops.json | 27 +------------------ .../tags/blocks/summer_crops.json | 24 ----------------- .../blocks/unbreakable_infertile_crops.json | 27 +++++++++++++++++++ .../tags/blocks/winter_crops.json | 26 +++--------------- .../tags/items/autumn_crops.json | 20 -------------- .../tags/items/spring_crops.json | 22 +-------------- .../tags/items/summer_crops.json | 19 ------------- .../tags/items/winter_crops.json | 18 +------------ 9 files changed, 33 insertions(+), 174 deletions(-) diff --git a/common/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json b/common/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json index 46a26357..5bfa51a8 100644 --- a/common/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json @@ -4,38 +4,14 @@ "minecraft:oak_sapling", "minecraft:birch_sapling", "minecraft:spruce_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", "minecraft:dark_oak_sapling", - "minecraft:mangrove_leaves", - "minecraft:mangrove_propagule", - "minecraft:cherry_sapling", - "minecraft:azalea", - "minecraft:flowering_azalea", "minecraft:red_mushroom", "minecraft:brown_mushroom", "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:twisting_vines_plant", - "minecraft:weeping_vines", - "minecraft:weeping_vines_plant", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:kelp_plant", - "minecraft:glow_lichen", "minecraft:cave_vines", "minecraft:cave_vines_plant", - "minecraft:sweet_berry_bush", - "minecraft:grass_block", - "minecraft:moss_block", - "minecraft:rooted_dirt", - "minecraft:short_grass", - "minecraft:fern", "minecraft:wheat", "minecraft:pumpkin_stem", "minecraft:beetroots", diff --git a/common/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json b/common/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json index b4016d29..61e073ca 100644 --- a/common/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json @@ -4,11 +4,6 @@ "minecraft:oak_sapling", "minecraft:birch_sapling", "minecraft:spruce_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", - "minecraft:dark_oak_sapling", - "minecraft:mangrove_leaves", - "minecraft:mangrove_propagule", "minecraft:cherry_sapling", "minecraft:azalea", "minecraft:flowering_azalea", @@ -17,29 +12,9 @@ "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:twisting_vines_plant", - "minecraft:weeping_vines", - "minecraft:weeping_vines_plant", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:kelp_plant", - "minecraft:glow_lichen", + "minecraft:sweet_berry_bush", "minecraft:cave_vines", "minecraft:cave_vines_plant", - "minecraft:small_dripleaf", - "minecraft:big_dripleaf", - "minecraft:big_dripleaf_stem", - "minecraft:pink_petals", - "minecraft:sweet_berry_bush", - "minecraft:grass_block", - "minecraft:moss_block", - "minecraft:rooted_dirt", - "minecraft:short_grass", - "minecraft:fern", "minecraft:bamboo", "minecraft:bamboo_sapling", "minecraft:carrots", diff --git a/common/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json b/common/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json index b5e0be0e..5f3c7657 100644 --- a/common/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json @@ -2,14 +2,10 @@ "replace": false, "values": [ "minecraft:oak_sapling", - "minecraft:birch_sapling", - "minecraft:spruce_sapling", "minecraft:jungle_sapling", "minecraft:acacia_sapling", - "minecraft:dark_oak_sapling", "minecraft:mangrove_leaves", "minecraft:mangrove_propagule", - "minecraft:cherry_sapling", "minecraft:azalea", "minecraft:flowering_azalea", "minecraft:red_mushroom", @@ -17,28 +13,8 @@ "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:twisting_vines_plant", - "minecraft:weeping_vines", - "minecraft:weeping_vines_plant", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:kelp_plant", - "minecraft:glow_lichen", "minecraft:cave_vines", "minecraft:cave_vines_plant", - "minecraft:small_dripleaf", - "minecraft:big_dripleaf", - "minecraft:big_dripleaf_stem", - "minecraft:sweet_berry_bush", - "minecraft:grass_block", - "minecraft:moss_block", - "minecraft:rooted_dirt", - "minecraft:short_grass", - "minecraft:fern", "minecraft:bamboo", "minecraft:bamboo_sapling", "minecraft:cactus", diff --git a/common/src/main/resources/data/sereneseasons/tags/blocks/unbreakable_infertile_crops.json b/common/src/main/resources/data/sereneseasons/tags/blocks/unbreakable_infertile_crops.json index 4f53ca27..00b1fe2d 100644 --- a/common/src/main/resources/data/sereneseasons/tags/blocks/unbreakable_infertile_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/blocks/unbreakable_infertile_crops.json @@ -1,6 +1,17 @@ { "replace": false, "values": [ + "minecraft:oak_sapling", + "minecraft:birch_sapling", + "minecraft:spruce_sapling", + "minecraft:jungle_sapling", + "minecraft:acacia_sapling", + "minecraft:dark_oak_sapling", + "minecraft:mangrove_leaves", + "minecraft:mangrove_propagule", + "minecraft:cherry_sapling", + "minecraft:azalea", + "minecraft:flowering_azalea", "minecraft:grass_block", "minecraft:moss_block", "minecraft:rooted_dirt", @@ -8,9 +19,18 @@ "minecraft:big_dripleaf_stem", "minecraft:small_dripleaf", "minecraft:mangrove_leaves", + "minecraft:mangrove_propagule", + "minecraft:short_grass", + "minecraft:fern", + "minecraft:pink_petals", + "minecraft:sunflower", + "minecraft:lilac", + "minecraft:rose_bush", + "minecraft:peony", "minecraft:sugar_cane", "minecraft:cactus", "minecraft:bamboo", + "minecraft:bamboo_sapling", "minecraft:red_mushroom", "minecraft:brown_mushroom", "minecraft:nether_wart", @@ -22,8 +42,15 @@ "minecraft:twisting_vines_plant", "minecraft:weeping_vines", "minecraft:weeping_vines_plant", + "minecraft:cave_vines", + "minecraft:cave_vines_plant", + "minecraft:small_dripleaf", + "minecraft:big_dripleaf", + "minecraft:big_dripleaf_stem", "minecraft:seagrass", "minecraft:sea_pickle", + "minecraft:kelp", + "minecraft:kelp_plant", "minecraft:glow_lichen" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json b/common/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json index 71bf101a..357ffa8a 100644 --- a/common/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json @@ -1,35 +1,15 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", - "minecraft:birch_sapling", + "minecraft:oak_sapling", "minecraft:spruce_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", - "minecraft:dark_oak_sapling", - "minecraft:mangrove_leaves", - "minecraft:mangrove_propagule", - "minecraft:cherry_sapling", - "minecraft:azalea", - "minecraft:flowering_azalea", "minecraft:red_mushroom", "minecraft:brown_mushroom", "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:twisting_vines_plant", - "minecraft:weeping_vines", - "minecraft:weeping_vines_plant", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:kelp_plant", - "minecraft:glow_lichen", + "minecraft:sweet_berry_bush", "minecraft:cave_vines", - "minecraft:cave_vines_plant", - "minecraft:rooted_dirt" + "minecraft:cave_vines_plant" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json b/common/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json index cdebf094..56c79158 100644 --- a/common/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json @@ -4,33 +4,13 @@ "minecraft:oak_sapling", "minecraft:birch_sapling", "minecraft:spruce_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", "minecraft:dark_oak_sapling", - "minecraft:mangrove_leaves", - "minecraft:mangrove_propagule", - "minecraft:azalea", - "minecraft:flowering_azalea", "minecraft:red_mushroom", "minecraft:brown_mushroom", "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:weeping_vines", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:glow_lichen", "minecraft:glow_berries", - "minecraft:sweet_berries", - "minecraft:grass_block", - "minecraft:moss_block", - "minecraft:rooted_dirt", - "minecraft:short_grass", - "minecraft:fern", "minecraft:wheat_seeds", "minecraft:pumpkin_seeds", "minecraft:beetroot_seeds", diff --git a/common/src/main/resources/data/sereneseasons/tags/items/spring_crops.json b/common/src/main/resources/data/sereneseasons/tags/items/spring_crops.json index 60754445..8c1a25dd 100644 --- a/common/src/main/resources/data/sereneseasons/tags/items/spring_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/items/spring_crops.json @@ -4,11 +4,7 @@ "minecraft:oak_sapling", "minecraft:birch_sapling", "minecraft:spruce_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", - "minecraft:dark_oak_sapling", - "minecraft:mangrove_leaves", - "minecraft:mangrove_propagule", + "minecraft:cherry_sapling", "minecraft:azalea", "minecraft:flowering_azalea", "minecraft:red_mushroom", @@ -16,24 +12,8 @@ "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:weeping_vines", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:glow_lichen", "minecraft:glow_berries", "minecraft:sweet_berries", - "minecraft:small_dripleaf", - "minecraft:big_dripleaf", - "minecraft:pink_petals", - "minecraft:grass_block", - "minecraft:moss_block", - "minecraft:rooted_dirt", - "minecraft:short_grass", - "minecraft:fern", "minecraft:bamboo", "minecraft:carrot", "minecraft:potato" diff --git a/common/src/main/resources/data/sereneseasons/tags/items/summer_crops.json b/common/src/main/resources/data/sereneseasons/tags/items/summer_crops.json index 81e87aca..71c0f04f 100644 --- a/common/src/main/resources/data/sereneseasons/tags/items/summer_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/items/summer_crops.json @@ -2,11 +2,8 @@ "replace": false, "values": [ "minecraft:oak_sapling", - "minecraft:birch_sapling", - "minecraft:spruce_sapling", "minecraft:jungle_sapling", "minecraft:acacia_sapling", - "minecraft:dark_oak_sapling", "minecraft:mangrove_leaves", "minecraft:mangrove_propagule", "minecraft:azalea", @@ -16,23 +13,7 @@ "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:weeping_vines", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:glow_lichen", "minecraft:glow_berries", - "minecraft:sweet_berries", - "minecraft:small_dripleaf", - "minecraft:big_dripleaf", - "minecraft:grass_block", - "minecraft:moss_block", - "minecraft:rooted_dirt", - "minecraft:short_grass", - "minecraft:fern", "minecraft:bamboo", "minecraft:cactus", "minecraft:sugar_cane", diff --git a/common/src/main/resources/data/sereneseasons/tags/items/winter_crops.json b/common/src/main/resources/data/sereneseasons/tags/items/winter_crops.json index 2e57b80f..d82d020d 100644 --- a/common/src/main/resources/data/sereneseasons/tags/items/winter_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/items/winter_crops.json @@ -2,29 +2,13 @@ "replace": false, "values": [ "minecraft:oak_sapling", - "minecraft:birch_sapling", "minecraft:spruce_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", - "minecraft:dark_oak_sapling", - "minecraft:mangrove_leaves", - "minecraft:mangrove_propagule", - "minecraft:azalea", - "minecraft:flowering_azalea", "minecraft:red_mushroom", "minecraft:brown_mushroom", "minecraft:nether_wart", "minecraft:crimson_fungus", "minecraft:warped_fungus", - "minecraft:crimson_nylium", - "minecraft:warped_nylium", - "minecraft:twisting_vines", - "minecraft:weeping_vines", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:kelp", - "minecraft:glow_lichen", "minecraft:glow_berries", - "minecraft:rooted_dirt" + "minecraft:sweet_berries" ] } \ No newline at end of file