Update to Minecraft 1.20.4 (Forge 49.0.22, Neoforge 20.4.138-beta)

- Update BucketLib to 1.20.4-3.1.0.0
cech12 · Jan 29, 2024 · dc80b6f · dc80b6f
1 parent 7cc4dee
commit dc80b6f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 26 deletions.
diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml
@@ -44,7 +44,7 @@ jobs:
       title-prefix: forge-
       curseforge-id: 363799
       game-versions: |
-        1.20.2
+        1.20.4
       release-type: release
       loaders: |
         forge
@@ -62,7 +62,7 @@ jobs:
       title-prefix: forge-
       modrinth-id: M9G5zpf1
       game-versions: |
-        1.20.2
+        1.20.4
       release-type: release
       loaders: |
         forge
@@ -80,7 +80,7 @@ jobs:
       title-prefix: neoforge-
       curseforge-id: 363799
       game-versions: |
-        1.20.2
+        1.20.4
       release-type: release
       loaders: |
         neoforge
@@ -98,7 +98,7 @@ jobs:
       title-prefix: neoforge-
       modrinth-id: M9G5zpf1
       game-versions: |
-        1.20.2
+        1.20.4
       release-type: release
       loaders: |
         neoforge

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ 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.20.4-5.1.0.0] - 2024-01-29
+- Update to Minecraft 1.20.4 (Forge 49.0.22, Neoforge 20.4.138-beta)
+- Update BucketLib to 1.20.4-3.1.0.0
+
 ## [1.20.2-5.0.0.0] - 2024-01-03
 ### Changed
 - Update to Forge 48.1.0 & Neoforge 20.2.86

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -33,13 +33,6 @@ minecraft {
             property 'forge.logging.console.level', 'debug'
             property 'mixin.env.remapRefMap', 'true'
             property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-            mods {
-                "${mod_id}" {
-                    source sourceSets.main
-                    source project(":common").sourceSets.main
-                    //source sourceSets.test
-                }
-            }
         }
         client {
             property 'forge.enabledGameTestNamespaces', mod_id
@@ -58,6 +51,12 @@ minecraft {
     }
 }
 
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
 sourceSets.main.resources.srcDir 'src/generated/resources'
 
 repositories {

diff --git a/gradle.properties b/gradle.properties
@@ -4,7 +4,7 @@
 
 # Project
 group=de.cech12.ceramicbucket
-mod_version=5.0.0.0
+mod_version=5.1.0.0
 mod_id=ceramicbucket
 mod_name=Ceramic Bucket
 mod_author=Cech12
@@ -14,26 +14,26 @@ mod_issue_tracker=https://github.com/cech12/CeramicBucket/issues
 description=A mod which adds a Ceramic Bucket.
 
 # Common
-minecraft_version=1.20.2
-minecraft_version_range=[1.20.2, 1.21)
+minecraft_version=1.20.4
+minecraft_version_range=[1.20.4, 1.21)
 
 # Fabric
 #fabric_version=0.91.0+1.20.2
 #fabric_loader_version=0.15.0
 
 # Forge
-forge_version=48.1.0
-forge_version_range=[48.1.0,)
-forge_loader_version_range=[48,)
+forge_version=49.0.22
+forge_version_range=[49.0.22,)
+forge_loader_version_range=[49,)
 
 # NeoForge
-neoforge_version=20.2.86
-neoforge_version_range=[20.2.86,)
-neoforge_loader_version_range=[1,)
+neoforge_version=20.4.138-beta
+neoforge_version_range=[20.4.138-beta,)
+neoforge_loader_version_range=[2,)
 
 #Bucket Lib
-bucketlib_version=1.20.2-3.0.0.4
-bucketlib_version_range=[1.20.2-3.0.0.4,)
+bucketlib_version=1.20.4-3.1.0.0
+bucketlib_version_range=[1.20.4-3.1.0.0,)
 
 # Gradle
 org.gradle.jvmargs=-Xmx3G

diff --git a/neoforge/build.gradle b/neoforge/build.gradle
@@ -1,6 +1,6 @@
 plugins {
     id 'idea'
-    id 'net.neoforged.gradle.userdev' version '7.0.41'
+    id 'net.neoforged.gradle.userdev' version '7.0.81'
     id 'java-library'
 }
 base {

diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
@@ -12,19 +12,19 @@ authors="${mod_author}"
 description='''${mod_description}'''
 [[dependencies.${mod_id}]]
 modId="neoforge"
-mandatory=true
+type="required"
 versionRange="${neoforge_version_range}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.${mod_id}]]
 modId="minecraft"
-mandatory=true
+type="required"
 versionRange="${minecraft_version_range}"
 ordering="NONE"
 side="BOTH"
 [[dependencies.${mod_id}]]
 modId="bucketlib"
-mandatory=true
+type="required"
 versionRange="${bucketlib_version_range}"
 referralUrl="https://github.com/cech12/BucketLib"
 ordering="NONE"