diff --git a/common/src/main/java/sereneseasons/init/ModTags.java b/common/src/main/java/sereneseasons/init/ModTags.java index 054fadbb..10f37b3a 100644 --- a/common/src/main/java/sereneseasons/init/ModTags.java +++ b/common/src/main/java/sereneseasons/init/ModTags.java @@ -27,6 +27,7 @@ private static void setup() {} public static final TagKey SUMMER_CROPS = create(ResourceLocation.parse("sereneseasons:summer_crops")); public static final TagKey AUTUMN_CROPS = create(ResourceLocation.parse("sereneseasons:autumn_crops")); public static final TagKey WINTER_CROPS = create(ResourceLocation.parse("sereneseasons:winter_crops")); + public static final TagKey YEAR_ROUND_CROPS = create(ResourceLocation.parse("sereneseasons:year_round_crops")); public static final TagKey GREENHOUSE_GLASS = create(ResourceLocation.parse("sereneseasons:greenhouse_glass")); public static final TagKey UNBREAKABLE_INFERTILE_CROPS = create(ResourceLocation.parse("sereneseasons:unbreakable_infertile_crops")); @@ -45,6 +46,7 @@ private static void setup() {} public static final TagKey SUMMER_CROPS = create(ResourceLocation.parse("sereneseasons:summer_crops")); public static final TagKey AUTUMN_CROPS = create(ResourceLocation.parse("sereneseasons:autumn_crops")); public static final TagKey WINTER_CROPS = create(ResourceLocation.parse("sereneseasons:winter_crops")); + public static final TagKey YEAR_ROUND_CROPS = create(ResourceLocation.parse("sereneseasons:year_round_crops")); public static TagKey create(ResourceLocation name) { diff --git a/common/src/main/resources/data/sereneseasons/tags/block/autumn_crops.json b/common/src/main/resources/data/sereneseasons/tags/block/autumn_crops.json index 5bfa51a8..369750f6 100644 --- a/common/src/main/resources/data/sereneseasons/tags/block/autumn_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/block/autumn_crops.json @@ -1,17 +1,10 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:birch_sapling", "minecraft:spruce_sapling", "minecraft:dark_oak_sapling", - "minecraft:red_mushroom", - "minecraft:brown_mushroom", - "minecraft:nether_wart", - "minecraft:crimson_fungus", - "minecraft:warped_fungus", - "minecraft:cave_vines", - "minecraft:cave_vines_plant", "minecraft:wheat", "minecraft:pumpkin_stem", "minecraft:beetroots", diff --git a/common/src/main/resources/data/sereneseasons/tags/block/spring_crops.json b/common/src/main/resources/data/sereneseasons/tags/block/spring_crops.json index 61e073ca..2ac92089 100644 --- a/common/src/main/resources/data/sereneseasons/tags/block/spring_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/block/spring_crops.json @@ -1,20 +1,13 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:birch_sapling", "minecraft:spruce_sapling", "minecraft:cherry_sapling", "minecraft:azalea", "minecraft:flowering_azalea", - "minecraft:red_mushroom", - "minecraft:brown_mushroom", - "minecraft:nether_wart", - "minecraft:crimson_fungus", - "minecraft:warped_fungus", "minecraft:sweet_berry_bush", - "minecraft:cave_vines", - "minecraft:cave_vines_plant", "minecraft:bamboo", "minecraft:bamboo_sapling", "minecraft:carrots", diff --git a/common/src/main/resources/data/sereneseasons/tags/block/summer_crops.json b/common/src/main/resources/data/sereneseasons/tags/block/summer_crops.json index 5f3c7657..9a2b0c2b 100644 --- a/common/src/main/resources/data/sereneseasons/tags/block/summer_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/block/summer_crops.json @@ -1,20 +1,13 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:jungle_sapling", "minecraft:acacia_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:cave_vines", - "minecraft:cave_vines_plant", "minecraft:bamboo", "minecraft:bamboo_sapling", "minecraft:cactus", diff --git a/common/src/main/resources/data/sereneseasons/tags/block/winter_crops.json b/common/src/main/resources/data/sereneseasons/tags/block/winter_crops.json index 357ffa8a..f57f828b 100644 --- a/common/src/main/resources/data/sereneseasons/tags/block/winter_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/block/winter_crops.json @@ -1,15 +1,8 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:spruce_sapling", - "minecraft:red_mushroom", - "minecraft:brown_mushroom", - "minecraft:nether_wart", - "minecraft:crimson_fungus", - "minecraft:warped_fungus", - "minecraft:sweet_berry_bush", - "minecraft:cave_vines", - "minecraft:cave_vines_plant" + "minecraft:sweet_berry_bush" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/sereneseasons/tags/block/year_round_crops.json b/common/src/main/resources/data/sereneseasons/tags/block/year_round_crops.json new file mode 100644 index 00000000..0b13ee61 --- /dev/null +++ b/common/src/main/resources/data/sereneseasons/tags/block/year_round_crops.json @@ -0,0 +1,13 @@ +{ + "replace": false, + "values": [ + "minecraft:oak_sapling", + "minecraft:red_mushroom", + "minecraft:brown_mushroom", + "minecraft:nether_wart", + "minecraft:crimson_fungus", + "minecraft:warped_fungus", + "minecraft:cave_vines", + "minecraft:cave_vines_plant" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/data/sereneseasons/tags/item/autumn_crops.json b/common/src/main/resources/data/sereneseasons/tags/item/autumn_crops.json index 56c79158..96ecbaa3 100644 --- a/common/src/main/resources/data/sereneseasons/tags/item/autumn_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/item/autumn_crops.json @@ -1,16 +1,10 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:birch_sapling", "minecraft:spruce_sapling", "minecraft:dark_oak_sapling", - "minecraft:red_mushroom", - "minecraft:brown_mushroom", - "minecraft:nether_wart", - "minecraft:crimson_fungus", - "minecraft:warped_fungus", - "minecraft:glow_berries", "minecraft:wheat_seeds", "minecraft:pumpkin_seeds", "minecraft:beetroot_seeds", diff --git a/common/src/main/resources/data/sereneseasons/tags/item/spring_crops.json b/common/src/main/resources/data/sereneseasons/tags/item/spring_crops.json index 8c1a25dd..49c2c0ac 100644 --- a/common/src/main/resources/data/sereneseasons/tags/item/spring_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/item/spring_crops.json @@ -1,18 +1,12 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:birch_sapling", "minecraft:spruce_sapling", "minecraft:cherry_sapling", "minecraft:azalea", "minecraft:flowering_azalea", - "minecraft:red_mushroom", - "minecraft:brown_mushroom", - "minecraft:nether_wart", - "minecraft:crimson_fungus", - "minecraft:warped_fungus", - "minecraft:glow_berries", "minecraft:sweet_berries", "minecraft:bamboo", "minecraft:carrot", diff --git a/common/src/main/resources/data/sereneseasons/tags/item/summer_crops.json b/common/src/main/resources/data/sereneseasons/tags/item/summer_crops.json index 71c0f04f..006f8ff6 100644 --- a/common/src/main/resources/data/sereneseasons/tags/item/summer_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/item/summer_crops.json @@ -1,19 +1,13 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:jungle_sapling", "minecraft:acacia_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:glow_berries", "minecraft:bamboo", "minecraft:cactus", "minecraft:sugar_cane", diff --git a/common/src/main/resources/data/sereneseasons/tags/item/winter_crops.json b/common/src/main/resources/data/sereneseasons/tags/item/winter_crops.json index d82d020d..0bd19aaa 100644 --- a/common/src/main/resources/data/sereneseasons/tags/item/winter_crops.json +++ b/common/src/main/resources/data/sereneseasons/tags/item/winter_crops.json @@ -1,14 +1,8 @@ { "replace": false, "values": [ - "minecraft:oak_sapling", + "#sereneseasons:year_round_crops", "minecraft:spruce_sapling", - "minecraft:red_mushroom", - "minecraft:brown_mushroom", - "minecraft:nether_wart", - "minecraft:crimson_fungus", - "minecraft:warped_fungus", - "minecraft:glow_berries", "minecraft:sweet_berries" ] } \ No newline at end of file diff --git a/common/src/main/resources/data/sereneseasons/tags/item/year_round_crops.json b/common/src/main/resources/data/sereneseasons/tags/item/year_round_crops.json new file mode 100644 index 00000000..ac0f599c --- /dev/null +++ b/common/src/main/resources/data/sereneseasons/tags/item/year_round_crops.json @@ -0,0 +1,12 @@ +{ + "replace": false, + "values": [ + "minecraft:oak_sapling", + "minecraft:red_mushroom", + "minecraft:brown_mushroom", + "minecraft:nether_wart", + "minecraft:crimson_fungus", + "minecraft:warped_fungus", + "minecraft:glow_berries" + ] +} \ No newline at end of file diff --git a/common/src/main/resources/ss_logo.png b/common/src/main/resources/sereneseasons_logo.png similarity index 100% rename from common/src/main/resources/ss_logo.png rename to common/src/main/resources/sereneseasons_logo.png