Skip to content

Commit

Permalink
Updated to Minecraft 1.21.3 (Fabric 0.107.0+1.21.3, Neoforge 21.3.56)
Browse files Browse the repository at this point in the history
- (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)
  • Loading branch information
cech12 committed Jan 28, 2025
1 parent 6f710dc commit 901a362
Show file tree
Hide file tree
Showing 13 changed files with 65 additions and 54 deletions.
24 changes: 12 additions & 12 deletions .github/workflows/cicd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions common/src/main/java/de/cech12/ceramicbucket/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
" # "
],
"key": {
"#": {
"item": "minecraft:clay_ball"
}
"#": "minecraft:clay_ball"
},
"result": {
"id": "ceramicbucket:unfired_clay_bucket"
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/resources/pack.mcmeta
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"description": {
"text": "${mod_id} resources"
},
"pack_format": 48
"pack_format": 57
}
}
2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
25 changes: 14 additions & 11 deletions fabric/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 13 additions & 13 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 1 addition & 2 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion neoforge/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -19,15 +21,15 @@ public class CeramicBucketMod {

public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Constants.MOD_ID);

public static final DeferredItem<Item> UNFIRED_CLAY_BUCKET = ITEMS.register("unfired_clay_bucket", () -> new Item(new Item.Properties()));

public static final DeferredItem<Item> CERAMIC_BUCKET = ITEMS.register("ceramic_bucket", () -> new UniversalBucketItem(
public static final DeferredItem<Item> 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<Item> 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)
));

Expand Down

0 comments on commit 901a362

Please sign in to comment.