[1.21.3] Backport of add year_round_crops Block and Item Tags, and Fi…

…x Forge/NeoForge Logo not showing up (#525)
Glitchfiend · Feb 11, 2025 · 209d78d · 209d78d
1 parent 2b1db2e
commit 209d78d
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 61 deletions.
diff --git 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<Block> SUMMER_CROPS = create(ResourceLocation.parse("sereneseasons:summer_crops"));
         public static final TagKey<Block> AUTUMN_CROPS = create(ResourceLocation.parse("sereneseasons:autumn_crops"));
         public static final TagKey<Block> WINTER_CROPS = create(ResourceLocation.parse("sereneseasons:winter_crops"));
+        public static final TagKey<Block> YEAR_ROUND_CROPS = create(ResourceLocation.parse("sereneseasons:year_round_crops"));
 
         public static final TagKey<Block> GREENHOUSE_GLASS = create(ResourceLocation.parse("sereneseasons:greenhouse_glass"));
         public static final TagKey<Block> UNBREAKABLE_INFERTILE_CROPS = create(ResourceLocation.parse("sereneseasons:unbreakable_infertile_crops"));
@@ -45,6 +46,7 @@ private static void setup() {}
         public static final TagKey<Item> SUMMER_CROPS = create(ResourceLocation.parse("sereneseasons:summer_crops"));
         public static final TagKey<Item> AUTUMN_CROPS = create(ResourceLocation.parse("sereneseasons:autumn_crops"));
         public static final TagKey<Item> WINTER_CROPS = create(ResourceLocation.parse("sereneseasons:winter_crops"));
+        public static final TagKey<Item> YEAR_ROUND_CROPS = create(ResourceLocation.parse("sereneseasons:year_round_crops"));
 
         public static TagKey<Item> 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
@@ -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
@@ -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
@@ -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
@@ -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"
   ]
 }
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
@@ -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"
+  ]
+}
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
@@ -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
@@ -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
@@ -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
@@ -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"
   ]
 }
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
@@ -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"
+  ]
+}
diff --git a/common/src/main/resources/ss_logo.png → ...src/main/resources/sereneseasons_logo.png b/common/src/main/resources/ss_logo.png → ...src/main/resources/sereneseasons_logo.png