diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml index addfa62..bf45a1c 100644 --- a/.github/workflows/cicd-workflow.yml +++ b/.github/workflows/cicd-workflow.yml @@ -44,8 +44,8 @@ jobs: # title-prefix: forge- # curseforge-id: 363799 # game-versions: | -# 1.21 -# 1.21.1 +# 1.21.3 +# 1.21.4 # release-type: release # loaders: | # forge @@ -63,8 +63,8 @@ jobs: # title-prefix: forge- # modrinth-id: M9G5zpf1 # game-versions: | -# 1.21 -# 1.21.1 +# 1.21.3 +# 1.21.4 # release-type: release # loaders: | # forge @@ -82,8 +82,8 @@ jobs: title-prefix: neoforge- curseforge-id: 363799 game-versions: | - 1.21 - 1.21.1 + 1.21.3 + 1.21.4 release-type: release loaders: | neoforge @@ -101,8 +101,8 @@ jobs: title-prefix: neoforge- modrinth-id: M9G5zpf1 game-versions: | - 1.21 - 1.21.1 + 1.21.3 + 1.21.4 release-type: release loaders: | neoforge @@ -120,8 +120,8 @@ jobs: title-prefix: fabric- curseforge-id: 363799 game-versions: | - 1.21 - 1.21.1 + 1.21.3 + 1.21.4 release-type: release loaders: | fabric @@ -140,8 +140,8 @@ jobs: title-prefix: fabric- modrinth-id: M9G5zpf1 game-versions: | - 1.21 - 1.21.1 + 1.21.3 + 1.21.4 release-type: release loaders: | fabric diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c0d4b6..75097a2 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.3-6.2.0.0] - 2025-01-29 +### Changed +- Updated to Minecraft 1.21.3 (Fabric 0.107.0+1.21.3, Neoforge 21.3.56) +- (Forge support is still not available until the capability system is re-added) +- Updated BucketLib to 1.21.3-4.2.0.4 +- Updated Cloth Config support (16.0.141) (Fabric/Quilt) +- Updated ModMenu support (12.0.0) (Fabric/Quilt) + ## [1.21-6.1.1.0] - 2024-08-30 ### Changed - number config options are now text fields instead of sliders (Fabric) diff --git a/common/src/main/java/de/cech12/ceramicbucket/Constants.java b/common/src/main/java/de/cech12/ceramicbucket/Constants.java index bf2887b..8423367 100644 --- a/common/src/main/java/de/cech12/ceramicbucket/Constants.java +++ b/common/src/main/java/de/cech12/ceramicbucket/Constants.java @@ -16,6 +16,9 @@ public class Constants { /** Logger instance */ public static final Logger LOG = LoggerFactory.getLogger(MOD_NAME); + public static final String UNFIRED_CLAY_BUCKET_NAME = "unfired_clay_bucket"; + public static final String CERAMIC_BUCKET_NAME = "ceramic_bucket"; + private Constants() {} public static ResourceLocation id(String name) { diff --git a/common/src/main/resources/data/ceramicbucket/recipe/ceramic_bucket.json b/common/src/main/resources/data/ceramicbucket/recipe/ceramic_bucket.json index bdeebcc..054e506 100644 --- a/common/src/main/resources/data/ceramicbucket/recipe/ceramic_bucket.json +++ b/common/src/main/resources/data/ceramicbucket/recipe/ceramic_bucket.json @@ -1,9 +1,7 @@ { "type": "minecraft:smelting", "category": "misc", - "ingredient": { - "item": "ceramicbucket:unfired_clay_bucket" - }, + "ingredient": "ceramicbucket:unfired_clay_bucket", "result": { "id": "ceramicbucket:ceramic_bucket" }, diff --git a/common/src/main/resources/data/ceramicbucket/recipe/unfired_clay_bucket.json b/common/src/main/resources/data/ceramicbucket/recipe/unfired_clay_bucket.json index 41fc51b..bc5946c 100644 --- a/common/src/main/resources/data/ceramicbucket/recipe/unfired_clay_bucket.json +++ b/common/src/main/resources/data/ceramicbucket/recipe/unfired_clay_bucket.json @@ -6,9 +6,7 @@ " # " ], "key": { - "#": { - "item": "minecraft:clay_ball" - } + "#": "minecraft:clay_ball" }, "result": { "id": "ceramicbucket:unfired_clay_bucket" diff --git a/common/src/main/resources/pack.mcmeta b/common/src/main/resources/pack.mcmeta index b835ba9..dfd85a2 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": 48 + "pack_format": 57 } } \ No newline at end of file diff --git a/fabric/build.gradle b/fabric/build.gradle index 89c7f51..f86ea0e 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'idea' id 'maven-publish' - id 'fabric-loom' version '1.6-SNAPSHOT' + id 'fabric-loom' version '[1.9,1.10)' } base { archivesName = "${mod_id}-fabric" diff --git a/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java b/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java index c34a1d3..2227ee4 100644 --- a/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java +++ b/fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java @@ -8,25 +8,28 @@ import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; import net.minecraft.core.Registry; import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.FastColor; +import net.minecraft.util.ARGB; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; @SuppressWarnings("unused") public class CeramicBucketMod implements ModInitializer { - 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 ResourceLocation UNFIRED_CLAY_BUCKET_LOCATION = Constants.id(Constants.UNFIRED_CLAY_BUCKET_NAME); + public static final ResourceLocation CERAMIC_BUCKET_LOCATION = Constants.id(Constants.CERAMIC_BUCKET_NAME); - 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() - .upperCrackingTemperature(Services.CONFIG::getBreakTemperature) - .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING) - .milking(Services.CONFIG::isMilkingEnabled) - .entityObtaining(Services.CONFIG::isFishObtainingEnabled) - .dyeable(FastColor.ARGB32.color(255, 14975336)) - .durability(Services.CONFIG::getDurability) + public static final Item UNFIRED_CLAY_BUCKET = Registry.register(BuiltInRegistries.ITEM, UNFIRED_CLAY_BUCKET_LOCATION, new Item(new Item.Properties().setId(ResourceKey.create(BuiltInRegistries.ITEM.key(), UNFIRED_CLAY_BUCKET_LOCATION)))); + public static final Item CERAMIC_BUCKET = Registry.register(BuiltInRegistries.ITEM, CERAMIC_BUCKET_LOCATION, new UniversalBucketItem( + ResourceKey.create(BuiltInRegistries.ITEM.key(), CERAMIC_BUCKET_LOCATION), + new UniversalBucketItem.Properties() + .upperCrackingTemperature(Services.CONFIG::getBreakTemperature) + .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING) + .milking(Services.CONFIG::isMilkingEnabled) + .entityObtaining(Services.CONFIG::isFishObtainingEnabled) + .dyeable(ARGB.color(255, 14975336)) + .durability(Services.CONFIG::getDurability) )); @Override diff --git a/gradle.properties b/gradle.properties index 4862b70..b799d19 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ # Project group=de.cech12.ceramicbucket -mod_version=6.1.1.0 +mod_version=6.2.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.21 -minecraft_version_range=[1.21, 1.22) +minecraft_version=1.21.3 +minecraft_version_range=[1.21.3, 1.22) # Fabric -fabric_version=0.100.3+1.21 -fabric_loader_version=0.15.11 -cloth_config_version=15.0.127 -mod_menu_version=11.0.0 +fabric_version=0.107.0+1.21.3 +fabric_loader_version=0.16.9 +cloth_config_version=16.0.141 +mod_menu_version=12.0.0 # Forge -forge_version=51.0.16 -forge_version_range=[51.0.16,) +forge_version=53.0.7 +forge_version_range=[53.0.7,) forge_loader_version_range=[51,) # NeoForge -neoforge_version=21.0.94-beta -neoforge_version_range=[21.0.94-beta,) +neoforge_version=21.3.56 +neoforge_version_range=[21.3.56,) neoforge_loader_version_range=[2,) #Bucket Lib -bucketlib_version=1.21-4.1.0.0 -bucketlib_version_range=[1.21-4.1.0.0,) +bucketlib_version=1.21.3-4.2.0.4 +bucketlib_version_range=[1.21.3-4.2.0.4,) # Gradle org.gradle.jvmargs=-Xmx3G diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fb602ee..d710477 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionSha256Sum=31c55713e40233a8303827ceb42ca48a47267a0ad4bab9177123121e71524c26 -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionSha256Sum=8d97a97984f6cbd2b85fe4c60a743440a347544bf18818048e611f5288d46c94 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 45d2f46..fd6e1fa 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -1,6 +1,6 @@ plugins { id 'idea' - id 'net.neoforged.gradle.userdev' version '7.0.158' + id 'net.neoforged.gradle.userdev' version '7.0.171' id 'java-library' } base { diff --git a/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java b/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java index 6193c73..f98c536 100644 --- a/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java +++ b/neoforge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java @@ -4,7 +4,9 @@ import de.cech12.bucketlib.api.item.UniversalBucketItem; import de.cech12.ceramicbucket.init.ModTags; import de.cech12.ceramicbucket.platform.Services; -import net.minecraft.util.FastColor; +import net.minecraft.core.registries.BuiltInRegistries; +import net.minecraft.resources.ResourceKey; +import net.minecraft.util.ARGB; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.neoforged.bus.api.IEventBus; @@ -19,15 +21,15 @@ public class CeramicBucketMod { public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Constants.MOD_ID); - public static final DeferredItem UNFIRED_CLAY_BUCKET = ITEMS.register("unfired_clay_bucket", () -> new Item(new Item.Properties())); - - public static final DeferredItem CERAMIC_BUCKET = ITEMS.register("ceramic_bucket", () -> new UniversalBucketItem( + public static final DeferredItem UNFIRED_CLAY_BUCKET = ITEMS.register(Constants.UNFIRED_CLAY_BUCKET_NAME, () -> new Item(new Item.Properties().setId(ResourceKey.create(BuiltInRegistries.ITEM.key(), Constants.id(Constants.UNFIRED_CLAY_BUCKET_NAME))))); + public static final DeferredItem CERAMIC_BUCKET = ITEMS.register(Constants.CERAMIC_BUCKET_NAME, () -> new UniversalBucketItem( + ResourceKey.create(BuiltInRegistries.ITEM.key(), Constants.id(Constants.CERAMIC_BUCKET_NAME)), new UniversalBucketItem.Properties() .upperCrackingTemperature(Services.CONFIG::getBreakTemperature) .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING) .milking(Services.CONFIG::isMilkingEnabled) .entityObtaining(Services.CONFIG::isFishObtainingEnabled) - .dyeable(FastColor.ARGB32.color(255, 14975336)) + .dyeable(ARGB.color(255, 14975336)) .durability(Services.CONFIG::getDurability) ));