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

…x Forge Logo not showing up (#532)

* Backport of add year_round_crops Block and Item Tags

* Fix Logo not displaying on Forge

* Build Updates

* Push Loom to 1.10

.github/workflows/gradle-publish.yml

@@ -15,7 +15,7 @@ jobs:
         fetch-depth: 0
         fetch-tags: true
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'oracle'

.gitignore

@@ -21,4 +21,5 @@ build
 # other
 eclipse
 run
-runs
+runs
+*.cache

common/src/main/java/sereneseasons/init/ModTags.java

@@ -24,6 +24,7 @@ private static void setup() {}
         public static final TagKey<Block> SUMMER_CROPS = create(new ResourceLocation("sereneseasons:summer_crops"));
         public static final TagKey<Block> AUTUMN_CROPS = create(new ResourceLocation("sereneseasons:autumn_crops"));
         public static final TagKey<Block> WINTER_CROPS = create(new ResourceLocation("sereneseasons:winter_crops"));
+        public static final TagKey<Block> YEAR_ROUND_CROPS = create(new ResourceLocation("sereneseasons:year_round_crops"));
 
         public static final TagKey<Block> GREENHOUSE_GLASS = create(new ResourceLocation("sereneseasons:greenhouse_glass"));
         public static final TagKey<Block> UNBREAKABLE_INFERTILE_CROPS = create(new ResourceLocation("sereneseasons:unbreakable_infertile_crops"));
@@ -42,6 +43,7 @@ private static void setup() {}
         public static final TagKey<Item> SUMMER_CROPS = create(new ResourceLocation("sereneseasons:summer_crops"));
         public static final TagKey<Item> AUTUMN_CROPS = create(new ResourceLocation("sereneseasons:autumn_crops"));
         public static final TagKey<Item> WINTER_CROPS = create(new ResourceLocation("sereneseasons:winter_crops"));
+        public static final TagKey<Item> YEAR_ROUND_CROPS = create(new ResourceLocation("sereneseasons:year_round_crops"));
 
         public static TagKey<Item> create(ResourceLocation name)
         {

common/src/main/resources/data/sereneseasons/tags/blocks/autumn_crops.json

@@ -1,20 +1,13 @@
 {
-  "replace": false,
-  "values": [
-	"minecraft:oak_sapling",
-	"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",
-	"minecraft:carrots"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:birch_sapling",
+		"minecraft:spruce_sapling",
+		"minecraft:dark_oak_sapling",
+		"minecraft:wheat",
+		"minecraft:pumpkin_stem",
+		"minecraft:beetroots",
+		"minecraft:carrots"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/blocks/spring_crops.json

@@ -1,23 +1,16 @@
 {
-  "replace": false,
-  "values": [
-    "minecraft:oak_sapling",
-	"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",
-	"minecraft:potatoes"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:birch_sapling",
+		"minecraft:spruce_sapling",
+		"minecraft:cherry_sapling",
+		"minecraft:azalea",
+		"minecraft:flowering_azalea",
+		"minecraft:sweet_berry_bush",
+		"minecraft:bamboo",
+		"minecraft:bamboo_sapling",
+		"minecraft:carrots",
+		"minecraft:potatoes"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/blocks/summer_crops.json

@@ -1,28 +1,21 @@
 {
-  "replace": false,
-  "values": [
-	"minecraft:oak_sapling",
-	"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",
-	"minecraft:sugar_cane",
-	"minecraft:wheat",
-	"minecraft:melon_stem",
-	"minecraft:cocoa",
-	"minecraft:torchflower_crop",
-	"minecraft:pitcher_crop"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:jungle_sapling",
+		"minecraft:acacia_sapling",
+		"minecraft:mangrove_leaves",
+		"minecraft:mangrove_propagule",
+		"minecraft:azalea",
+		"minecraft:flowering_azalea",
+		"minecraft:bamboo",
+		"minecraft:bamboo_sapling",
+		"minecraft:cactus",
+		"minecraft:sugar_cane",
+		"minecraft:wheat",
+		"minecraft:melon_stem",
+		"minecraft:cocoa",
+		"minecraft:torchflower_crop",
+		"minecraft:pitcher_crop"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/blocks/winter_crops.json

@@ -1,15 +1,8 @@
 {
-  "replace": false,
-  "values": [
-    "minecraft:oak_sapling",
-	"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"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:spruce_sapling",
+		"minecraft:sweet_berry_bush"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/blocks/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"
+  ]
+}

common/src/main/resources/data/sereneseasons/tags/items/autumn_crops.json

@@ -1,19 +1,13 @@
 {
-  "replace": false,
-  "values": [
-	"minecraft:oak_sapling",
-	"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",
-	"minecraft:carrot"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:birch_sapling",
+		"minecraft:spruce_sapling",
+		"minecraft:dark_oak_sapling",
+		"minecraft:wheat_seeds",
+		"minecraft:pumpkin_seeds",
+		"minecraft:beetroot_seeds",
+		"minecraft:carrot"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/items/spring_crops.json

@@ -1,21 +1,15 @@
 {
-  "replace": false,
-  "values": [
-    "minecraft:oak_sapling",
-	"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",
-	"minecraft:potato"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:birch_sapling",
+		"minecraft:spruce_sapling",
+		"minecraft:cherry_sapling",
+		"minecraft:azalea",
+		"minecraft:flowering_azalea",
+		"minecraft:sweet_berries",
+		"minecraft:bamboo",
+		"minecraft:carrot",
+		"minecraft:potato"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/items/summer_crops.json

@@ -1,26 +1,20 @@
 {
-  "replace": false,
-  "values": [
-	"minecraft:oak_sapling",
-	"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",
-	"minecraft:wheat_seeds",
-	"minecraft:melon_seeds",
-	"minecraft:cocoa_beans",
-	"minecraft:torchflower_seeds",
-	"minecraft:pitcher_pod"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:jungle_sapling",
+		"minecraft:acacia_sapling",
+		"minecraft:mangrove_leaves",
+		"minecraft:mangrove_propagule",
+		"minecraft:azalea",
+		"minecraft:flowering_azalea",
+		"minecraft:bamboo",
+		"minecraft:cactus",
+		"minecraft:sugar_cane",
+		"minecraft:wheat_seeds",
+		"minecraft:melon_seeds",
+		"minecraft:cocoa_beans",
+		"minecraft:torchflower_seeds",
+		"minecraft:pitcher_pod"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/items/winter_crops.json

@@ -1,14 +1,8 @@
 {
-  "replace": false,
-  "values": [
-	"minecraft:oak_sapling",
-	"minecraft:spruce_sapling",
-	"minecraft:red_mushroom",
-	"minecraft:brown_mushroom",
-	"minecraft:nether_wart",
-	"minecraft:crimson_fungus",
-	"minecraft:warped_fungus",
-	"minecraft:glow_berries",
-	"minecraft:sweet_berries"
-  ]
+	"replace": false,
+	"values": [
+		"#sereneseasons:year_round_crops",
+		"minecraft:spruce_sapling",
+		"minecraft:sweet_berries"
+	]
 }

common/src/main/resources/data/sereneseasons/tags/items/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"
+  ]
+}

common/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
   "pack": {
     "description": "Resources used for Serene Seasons",
-    "pack_format": 13
+    "pack_format": 15
   }
 }

common/src/main/resources/sereneseasons.accesswidener

@@ -1,4 +1,4 @@
-accessWidener v1 named
+accessWidener v2 named
 
 # Block entity registration
 accessible class net/minecraft/world/level/block/entity/BlockEntityType$BlockEntitySupplier

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.6-SNAPSHOT"
+    id "fabric-loom" version "1.10-SNAPSHOT"
     id "com.matthewprenger.cursegradle" version "1.4.0"
 }