Skip to content

Commit

Permalink
Updated to Minecraft 1.21 (Fabric 0.100.3+1.21, Neoforge 21.0.20-beta)
Browse files Browse the repository at this point in the history
- 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)
  • Loading branch information
cech12 committed Jun 20, 2024
1 parent 44cf790 commit 05f8978
Show file tree
Hide file tree
Showing 16 changed files with 38 additions and 26 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/cicd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
workflow_dispatch:
push:
branches: [ "*" ]
tags: ["1.20*"]
tags: ["1.21*"]
pull_request:
branches: [ "*" ]

Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
# title-prefix: forge-
# curseforge-id: 585328
# game-versions: |
# 1.20.6
# 1.21
# release-type: release
# loaders: |
# forge
Expand All @@ -62,7 +62,7 @@ jobs:
# title-prefix: forge-
# modrinth-id: xsNAEIke
# game-versions: |
# 1.20.6
# 1.21
# release-type: release
# loaders: |
# forge
Expand All @@ -80,7 +80,7 @@ jobs:
title-prefix: neoforge-
curseforge-id: 585328
game-versions: |
1.20.6
1.21
release-type: release
loaders: |
neoforge
Expand All @@ -98,7 +98,7 @@ jobs:
title-prefix: neoforge-
modrinth-id: xsNAEIke
game-versions: |
1.20.6
1.21
release-type: release
loaders: |
neoforge
Expand All @@ -116,7 +116,7 @@ jobs:
title-prefix: fabric-
curseforge-id: 585328
game-versions: |
1.20.6
1.21
release-type: release
loaders: |
fabric
Expand All @@ -135,7 +135,7 @@ jobs:
title-prefix: fabric-
modrinth-id: xsNAEIke
game-versions: |
1.20.6
1.21
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-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)
Expand Down
5 changes: 5 additions & 0 deletions common/src/main/java/de/cech12/woodenbucket/Constants.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package de.cech12.woodenbucket;

import net.minecraft.resources.ResourceLocation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -17,4 +18,8 @@ public class Constants {

private Constants() {}

public static ResourceLocation id(String name) {
return ResourceLocation.fromNamespaceAndPath(MOD_ID, name);
}

}
5 changes: 2 additions & 3 deletions common/src/main/java/de/cech12/woodenbucket/init/ModTags.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +17,7 @@ public static class Fluids {
public static final TagKey<Fluid> FREEZING = tag("freezing");

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));
}

}
Expand All @@ -29,7 +28,7 @@ public static class Blocks {
public static final TagKey<Block> FREEZING = tag("freezing");

private static TagKey<Block> tag(@Nonnull String name) {
return TagKey.create(Registries.BLOCK, new ResourceLocation(Constants.MOD_ID, name));
return TagKey.create(Registries.BLOCK, Constants.id(name));
}

}
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": 32
"pack_format": 48
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"cloth-config": ">=${cloth_config_version}",
"bucketlib": ">=${bucketlib_version}"
},
"recommends": {
"suggests": {
"modmenu": ">=${mod_menu_version}"
}
}
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.woodenbucket
mod_version=3.3.0.0
mod_version=4.0.0.0
mod_id=woodenbucket
mod_name=Wooden Bucket
mod_author=Cech12
Expand All @@ -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
Expand Down

0 comments on commit 05f8978

Please sign in to comment.