From 05f8978f800872aad63f225599f3bafce8819e30 Mon Sep 17 00:00:00 2001 From: cech12 Date: Thu, 20 Jun 2024 23:58:10 +0200 Subject: [PATCH] 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) --- .github/workflows/cicd-workflow.yml | 14 +++++----- CHANGELOG.md | 8 ++++++ .../de/cech12/woodenbucket/Constants.java | 5 ++++ .../de/cech12/woodenbucket/init/ModTags.java | 5 ++-- .../enchantable/durability.json | 0 .../recipes/misc/wooden_bucket.json | 0 .../{recipes => recipe}/wooden_bucket.json | 0 .../tags/{blocks => block}/burning.json | 0 .../tags/{blocks => block}/freezing.json | 0 .../tags/{fluids => fluid}/burning.json | 0 .../tags/{fluids => fluid}/cracking.json | 0 .../tags/{fluids => fluid}/freezing.json | 0 common/src/main/resources/pack.mcmeta | 2 +- .../cech12/woodenbucket/WoodenBucketMod.java | 2 +- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 26 +++++++++---------- 16 files changed, 38 insertions(+), 26 deletions(-) rename common/src/main/resources/data/minecraft/tags/{items => item}/enchantable/durability.json (100%) rename common/src/main/resources/data/woodenbucket/{advancements => advancement}/recipes/misc/wooden_bucket.json (100%) rename common/src/main/resources/data/woodenbucket/{recipes => recipe}/wooden_bucket.json (100%) rename common/src/main/resources/data/woodenbucket/tags/{blocks => block}/burning.json (100%) rename common/src/main/resources/data/woodenbucket/tags/{blocks => block}/freezing.json (100%) rename common/src/main/resources/data/woodenbucket/tags/{fluids => fluid}/burning.json (100%) rename common/src/main/resources/data/woodenbucket/tags/{fluids => fluid}/cracking.json (100%) rename common/src/main/resources/data/woodenbucket/tags/{fluids => fluid}/freezing.json (100%) diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index fb83295..d9336ec 100644 --- 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: 585328 # game-versions: | -# 1.20.6 +# 1.21 # release-type: release # loaders: | # forge @@ -62,7 +62,7 @@ jobs: # title-prefix: forge- # modrinth-id: xsNAEIke # game-versions: | -# 1.20.6 +# 1.21 # release-type: release # loaders: | # forge @@ -80,7 +80,7 @@ jobs: title-prefix: neoforge- curseforge-id: 585328 game-versions: | - 1.20.6 + 1.21 release-type: release loaders: | neoforge @@ -98,7 +98,7 @@ jobs: title-prefix: neoforge- modrinth-id: xsNAEIke game-versions: | - 1.20.6 + 1.21 release-type: release loaders: | neoforge @@ -116,7 +116,7 @@ jobs: title-prefix: fabric- curseforge-id: 585328 game-versions: | - 1.20.6 + 1.21 release-type: release loaders: | fabric @@ -135,7 +135,7 @@ jobs: title-prefix: fabric- modrinth-id: xsNAEIke game-versions: | - 1.20.6 + 1.21 release-type: release loaders: | fabric diff --git a/CHANGELOG.md b/CHANGELOG.md index 468d54a..981c11e 100644 --- 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-4.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-3.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/woodenbucket/Constants.java b/common/src/main/java/de/cech12/woodenbucket/Constants.java index ff571d4..582193e 100644 --- a/common/src/main/java/de/cech12/woodenbucket/Constants.java +++ b/common/src/main/java/de/cech12/woodenbucket/Constants.java @@ -1,5 +1,6 @@ package de.cech12.woodenbucket; +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); + } + } \ No newline at end of file diff --git a/common/src/main/java/de/cech12/woodenbucket/init/ModTags.java b/common/src/main/java/de/cech12/woodenbucket/init/ModTags.java index 88fcd57..3d4b962 100644 --- a/common/src/main/java/de/cech12/woodenbucket/init/ModTags.java +++ b/common/src/main/java/de/cech12/woodenbucket/init/ModTags.java @@ -2,7 +2,6 @@ import de.cech12.woodenbucket.Constants; import net.minecraft.core.registries.Registries; -import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.material.Fluid; @@ -18,7 +17,7 @@ public static class Fluids { public static final TagKey FREEZING = tag("freezing"); private static TagKey tag(@Nonnull String name) { - return TagKey.create(Registries.FLUID, new ResourceLocation(Constants.MOD_ID, name)); + return TagKey.create(Registries.FLUID, Constants.id(name)); } } @@ -29,7 +28,7 @@ public static class Blocks { public static final TagKey FREEZING = tag("freezing"); private static TagKey tag(@Nonnull String name) { - return TagKey.create(Registries.BLOCK, new ResourceLocation(Constants.MOD_ID, name)); + return TagKey.create(Registries.BLOCK, Constants.id(name)); } } diff --git a/common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json b/common/src/main/resources/data/minecraft/tags/item/enchantable/durability.json similarity index 100% rename from common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json rename to common/src/main/resources/data/minecraft/tags/item/enchantable/durability.json diff --git a/common/src/main/resources/data/woodenbucket/advancements/recipes/misc/wooden_bucket.json b/common/src/main/resources/data/woodenbucket/advancement/recipes/misc/wooden_bucket.json similarity index 100% rename from common/src/main/resources/data/woodenbucket/advancements/recipes/misc/wooden_bucket.json rename to common/src/main/resources/data/woodenbucket/advancement/recipes/misc/wooden_bucket.json diff --git a/common/src/main/resources/data/woodenbucket/recipes/wooden_bucket.json b/common/src/main/resources/data/woodenbucket/recipe/wooden_bucket.json similarity index 100% rename from common/src/main/resources/data/woodenbucket/recipes/wooden_bucket.json rename to common/src/main/resources/data/woodenbucket/recipe/wooden_bucket.json diff --git a/common/src/main/resources/data/woodenbucket/tags/blocks/burning.json b/common/src/main/resources/data/woodenbucket/tags/block/burning.json similarity index 100% rename from common/src/main/resources/data/woodenbucket/tags/blocks/burning.json rename to common/src/main/resources/data/woodenbucket/tags/block/burning.json diff --git a/common/src/main/resources/data/woodenbucket/tags/blocks/freezing.json b/common/src/main/resources/data/woodenbucket/tags/block/freezing.json similarity index 100% rename from common/src/main/resources/data/woodenbucket/tags/blocks/freezing.json rename to common/src/main/resources/data/woodenbucket/tags/block/freezing.json diff --git a/common/src/main/resources/data/woodenbucket/tags/fluids/burning.json b/common/src/main/resources/data/woodenbucket/tags/fluid/burning.json similarity index 100% rename from common/src/main/resources/data/woodenbucket/tags/fluids/burning.json rename to common/src/main/resources/data/woodenbucket/tags/fluid/burning.json diff --git a/common/src/main/resources/data/woodenbucket/tags/fluids/cracking.json b/common/src/main/resources/data/woodenbucket/tags/fluid/cracking.json similarity index 100% rename from common/src/main/resources/data/woodenbucket/tags/fluids/cracking.json rename to common/src/main/resources/data/woodenbucket/tags/fluid/cracking.json diff --git a/common/src/main/resources/data/woodenbucket/tags/fluids/freezing.json b/common/src/main/resources/data/woodenbucket/tags/fluid/freezing.json similarity index 100% rename from common/src/main/resources/data/woodenbucket/tags/fluids/freezing.json rename to common/src/main/resources/data/woodenbucket/tags/fluid/freezing.json diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta index 13aa4c9..b835ba9 100644 --- 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 } } \ No newline at end of file diff --git a/fabric/src/main/java/de/cech12/woodenbucket/WoodenBucketMod.java b/fabric/src/main/java/de/cech12/woodenbucket/WoodenBucketMod.java index e6da792..8103928 100644 --- a/fabric/src/main/java/de/cech12/woodenbucket/WoodenBucketMod.java +++ b/fabric/src/main/java/de/cech12/woodenbucket/WoodenBucketMod.java @@ -13,7 +13,7 @@ @SuppressWarnings("unused") public class WoodenBucketMod implements ModInitializer { - public static final ResourceLocation WOODEN_BUCKET_LOCATION = new ResourceLocation(Constants.MOD_ID, "wooden_bucket"); + public static final ResourceLocation WOODEN_BUCKET_LOCATION = Constants.id("wooden_bucket"); public static final Item WOODEN_BUCKET = Registry.register(BuiltInRegistries.ITEM, WOODEN_BUCKET_LOCATION, new UniversalBucketItem(new UniversalBucketItem.Properties() .durability(Services.CONFIG::getDurability) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index b0646a1..f705866 100644 --- 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 index 9f24e78..9913e8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ # Project group=de.cech12.woodenbucket -mod_version=3.3.0.0 +mod_version=4.0.0.0 mod_id=woodenbucket mod_name=Wooden Bucket mod_author=Cech12 @@ -15,28 +15,28 @@ description=A mod which adds a Wooden 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