Updated to Minecraft 1.21 (Fabric 0.100.3+1.21, Neoforge 21.0.20-beta)

- Updated BucketLib to 1.21-4.0.0.1 - Updated Cloth Config support (15.0.127) (Fabric/Quilt) - Updated ModMenu support (11.0.0) (Fabric/Quilt)
cech12 · Jun 20, 2024 · 3d2d7b1 · 3d2d7b1
1 parent 592d935
commit 3d2d7b1
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 26 deletions.
diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml
@@ -6,7 +6,7 @@ on:
   workflow_dispatch:
   push:
     branches: [ "*" ]
-    tags: ["1.20*"]
+    tags: ["1.21*"]
   pull_request:
     branches: [ "*" ]
 
@@ -44,7 +44,7 @@ jobs:
 #      title-prefix: forge-
 #      curseforge-id: 363799
 #      game-versions: |
-#        1.20.6
+#        1.21
 #      release-type: release
 #      loaders: |
 #        forge
@@ -62,7 +62,7 @@ jobs:
 #      title-prefix: forge-
 #      modrinth-id: M9G5zpf1
 #      game-versions: |
-#        1.20.6
+#        1.21
 #      release-type: release
 #      loaders: |
 #        forge
@@ -80,7 +80,7 @@ jobs:
       title-prefix: neoforge-
       curseforge-id: 363799
       game-versions: |
-        1.20.6
+        1.21
       release-type: release
       loaders: |
         neoforge
@@ -98,7 +98,7 @@ jobs:
       title-prefix: neoforge-
       modrinth-id: M9G5zpf1
       game-versions: |
-        1.20.6
+        1.21
       release-type: release
       loaders: |
         neoforge
@@ -116,7 +116,7 @@ jobs:
       title-prefix: fabric-
       curseforge-id: 363799
       game-versions: |
-        1.20.6
+        1.21
       release-type: release
       loaders: |
         fabric
@@ -135,7 +135,7 @@ jobs:
       title-prefix: fabric-
       modrinth-id: M9G5zpf1
       game-versions: |
-        1.20.6
+        1.21
       release-type: release
       loaders: |
         fabric

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Forge Recommended Versioning](https://mcforge.readthedocs.io/en/latest/conventions/versioning/).
 
+## [1.21-6.0.0.0] - 2024-06-21
+### Changed
+- Updated to Minecraft 1.21 (Fabric 0.100.3+1.21, Neoforge 21.0.20-beta)
+- (Forge support is still not available until the capability system is re-added)
+- Updated BucketLib to 1.21-4.0.0.1
+- Updated Cloth Config support (15.0.127) (Fabric/Quilt)
+- Updated ModMenu support (11.0.0) (Fabric/Quilt)
+
 ## [1.20.6-5.3.0.0] - 2024-06-20
 ### Changed
 - Updated to Minecraft 1.20.6 (Fabric 0.98.0+1.20.6, Neoforge 20.6.119)

diff --git a/common/src/main/java/de/cech12/ceramicbucket/Constants.java b/common/src/main/java/de/cech12/ceramicbucket/Constants.java
@@ -1,5 +1,6 @@
 package de.cech12.ceramicbucket;
 
+import net.minecraft.resources.ResourceLocation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -17,4 +18,8 @@ public class Constants {
 
     private Constants() {}
 
+    public static ResourceLocation id(String name) {
+        return ResourceLocation.fromNamespaceAndPath(MOD_ID, name);
+    }
+
 }
diff --git a/common/src/main/java/de/cech12/ceramicbucket/init/ModTags.java b/common/src/main/java/de/cech12/ceramicbucket/init/ModTags.java
@@ -2,7 +2,6 @@
 
 import de.cech12.ceramicbucket.Constants;
 import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.material.Fluid;
 
@@ -15,7 +14,7 @@ public static class Fluids {
         public static final TagKey<Fluid> CERAMIC_CRACKING = tag("ceramic_cracking");
 
         private static TagKey<Fluid> tag(@Nonnull String name) {
-            return TagKey.create(Registries.FLUID, new ResourceLocation(Constants.MOD_ID, name));
+            return TagKey.create(Registries.FLUID, Constants.id(name));
         }
 
     }

diff --git a/...ncements/recipes/misc/ceramic_bucket.json → ...ancement/recipes/misc/ceramic_bucket.json b/...ncements/recipes/misc/ceramic_bucket.json → ...ancement/recipes/misc/ceramic_bucket.json
diff --git a/...nts/recipes/misc/unfired_clay_bucket.json → ...ent/recipes/misc/unfired_clay_bucket.json b/...nts/recipes/misc/unfired_clay_bucket.json → ...ent/recipes/misc/unfired_clay_bucket.json
diff --git a/...ceramicbucket/recipes/ceramic_bucket.json → .../ceramicbucket/recipe/ceramic_bucket.json b/...ceramicbucket/recipes/ceramic_bucket.json → .../ceramicbucket/recipe/ceramic_bucket.json
diff --git a/...icbucket/recipes/unfired_clay_bucket.json → ...micbucket/recipe/unfired_clay_bucket.json b/...icbucket/recipes/unfired_clay_bucket.json → ...micbucket/recipe/unfired_clay_bucket.json
diff --git a/...cbucket/tags/fluids/ceramic_cracking.json → ...icbucket/tags/fluid/ceramic_cracking.json b/...cbucket/tags/fluids/ceramic_cracking.json → ...icbucket/tags/fluid/ceramic_cracking.json
diff --git a/...es/data/minecraft/tags/items/dyeable.json → ...ces/data/minecraft/tags/item/dyeable.json b/...es/data/minecraft/tags/items/dyeable.json → ...ces/data/minecraft/tags/item/dyeable.json
diff --git a/...ft/tags/items/enchantable/durability.json → ...aft/tags/item/enchantable/durability.json b/...ft/tags/items/enchantable/durability.json → ...aft/tags/item/enchantable/durability.json
diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta
@@ -3,6 +3,6 @@
         "description": {
             "text": "${mod_id} resources"
         },
-        "pack_format": 32
+        "pack_format": 48
     }
 }
diff --git a/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java b/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java
@@ -16,8 +16,8 @@
 @SuppressWarnings("unused")
 public class CeramicBucketMod implements ModInitializer {
 
-    public static final ResourceLocation UNFIRED_CLAY_BUCKET_LOCATION = new ResourceLocation(Constants.MOD_ID, "unfired_clay_bucket");
-    public static final ResourceLocation CERAMIC_BUCKET_LOCATION = new ResourceLocation(Constants.MOD_ID, "ceramic_bucket");
+    public static final ResourceLocation UNFIRED_CLAY_BUCKET_LOCATION = Constants.id("unfired_clay_bucket");
+    public static final ResourceLocation CERAMIC_BUCKET_LOCATION = Constants.id("ceramic_bucket");
 
     public static final Item UNFIRED_CLAY_BUCKET = Registry.register(BuiltInRegistries.ITEM, UNFIRED_CLAY_BUCKET_LOCATION, new Item(new Item.Properties()));
     public static final Item CERAMIC_BUCKET = Registry.register(BuiltInRegistries.ITEM, CERAMIC_BUCKET_LOCATION, new UniversalBucketItem(new UniversalBucketItem.Properties()

diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -31,7 +31,7 @@
     "cloth-config": ">=${cloth_config_version}",
     "bucketlib": ">=${bucketlib_version}"
   },
-  "recommends": {
+  "suggests": {
     "modmenu": ">=${mod_menu_version}"
   }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 
 # Project
 group=de.cech12.ceramicbucket
-mod_version=5.3.0.0
+mod_version=6.0.0.0
 mod_id=ceramicbucket
 mod_name=Ceramic Bucket
 mod_author=Cech12
@@ -15,28 +15,28 @@ description=A mod which adds a Ceramic Bucket.
 
 # Common
 java_version=21
-minecraft_version=1.20.6
-minecraft_version_range=[1.20.6, 1.21)
+minecraft_version=1.21
+minecraft_version_range=[1.21, 1.22)
 
 # Fabric
-fabric_version=0.98.0+1.20.6
+fabric_version=0.100.3+1.21
 fabric_loader_version=0.15.11
-cloth_config_version=14.0.126
-mod_menu_version=10.0.0-beta.1
+cloth_config_version=15.0.127
+mod_menu_version=11.0.0
 
 # Forge
-forge_version=50.1.3
-forge_version_range=[50.1.3,)
-forge_loader_version_range=[50,)
+forge_version=51.0.16
+forge_version_range=[51.0.16,)
+forge_loader_version_range=[51,)
 
 # NeoForge
-neoforge_version=20.6.119
-neoforge_version_range=[20.6.119,)
+neoforge_version=21.0.20-beta
+neoforge_version_range=[21.0.20-beta,)
 neoforge_loader_version_range=[2,)
 
 #Bucket Lib
-bucketlib_version=1.20.6-3.3.0.3
-bucketlib_version_range=[1.20.6-3.3.0.2,)
+bucketlib_version=1.21-4.0.0.1
+bucketlib_version_range=[1.21-4.0.0.1,)
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G