Updated to Minecraft 1.20.6 (Fabric 0.98.0+1.20.6, Neoforge 20.6.119)

- Removed Forge support until the capability system is re-added - Updated BucketLib to 1.20.6-3.3.0.3 - Updated Cloth Config support (14.0.126) (Fabric/Quilt) - Updated ModMenu support (10.0.0-beta.1) (Fabric/Quilt) - fixed known issue: max stack size was not taken into account and defaulted to 1 (Fabric)
cech12 · Jun 20, 2024 · 14ae375 · 14ae375
1 parent 4f40b61
commit 14ae375
Show file tree

Hide file tree

Showing 24 changed files with 95 additions and 63 deletions.
diff --git a/.github/workflows/cicd-workflow.yml b/.github/workflows/cicd-workflow.yml
@@ -15,20 +15,20 @@ jobs:
     name: Build
     uses: cech12/MinecraftModActions/.github/workflows/build.yml@main
     with:
-      java-version: 17
+      java-version: 21
   codeql:
     needs: build
     name: CodeQL
     uses: cech12/MinecraftModActions/.github/workflows/codeql-analysis.yml@main
     with:
-      java-version: 17
+      java-version: 21
   publish-github:
     needs: codeql
     if: startsWith(github.ref, 'refs/tags/')
     name: Publish Github
     uses: cech12/MinecraftModActions/.github/workflows/multi-publish-github.yml@main
     with:
-      java-version: 17
+      java-version: 21
       mod-name: Ceramic Bucket
       mod-id: ceramicbucket
     secrets:
@@ -39,12 +39,12 @@ jobs:
     name: Publish Forge on Curseforge
     uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main
     with:
-      java-version: 17
+      java-version: 21
       subproject: forge
       title-prefix: forge-
       curseforge-id: 363799
       game-versions: |
-        1.20.4
+        1.20.6
       release-type: release
       loaders: |
         forge
@@ -57,12 +57,12 @@ jobs:
     name: Publish Forge on Modrinth
     uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main
     with:
-      java-version: 17
+      java-version: 21
       subproject: forge
       title-prefix: forge-
       modrinth-id: M9G5zpf1
       game-versions: |
-        1.20.4
+        1.20.6
       release-type: release
       loaders: |
         forge
@@ -75,12 +75,12 @@ jobs:
     name: Publish NeoForge on Curseforge
     uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main
     with:
-      java-version: 17
+      java-version: 21
       subproject: neoforge
       title-prefix: neoforge-
       curseforge-id: 363799
       game-versions: |
-        1.20.4
+        1.20.6
       release-type: release
       loaders: |
         neoforge
@@ -93,12 +93,12 @@ jobs:
     name: Publish NeoForge on Modrinth
     uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main
     with:
-      java-version: 17
+      java-version: 21
       subproject: neoforge
       title-prefix: neoforge-
       modrinth-id: M9G5zpf1
       game-versions: |
-        1.20.4
+        1.20.6
       release-type: release
       loaders: |
         neoforge
@@ -111,12 +111,12 @@ jobs:
     name: Publish Fabric on Curseforge
     uses: cech12/MinecraftModActions/.github/workflows/publish-curseforge.yml@main
     with:
-      java-version: 17
+      java-version: 21
       subproject: fabric
       title-prefix: fabric-
       curseforge-id: 363799
       game-versions: |
-        1.20.4
+        1.20.6
       release-type: release
       loaders: |
         fabric
@@ -130,12 +130,12 @@ jobs:
     name: Publish Fabric on Modrinth
     uses: cech12/MinecraftModActions/.github/workflows/publish-modrinth.yml@main
     with:
-      java-version: 17
+      java-version: 21
       subproject: fabric
       title-prefix: fabric-
       modrinth-id: M9G5zpf1
       game-versions: |
-        1.20.4
+        1.20.6
       release-type: release
       loaders: |
         fabric

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -10,4 +10,4 @@ jobs:
     name: Analyze
     uses: cech12/MinecraftModActions/.github/workflows/codeql-analysis.yml@main
     with:
-      java-version: 17
+      java-version: 21
diff --git a/.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
@@ -10,6 +10,6 @@ jobs:
     name: Update Gradle Wrapper
     uses: cech12/MinecraftModActions/.github/workflows/update-gradle-wrapper.yml@main
     with:
-      java-version: 17
+      java-version: 21
     secrets:
       github-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@ 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.6-5.3.0.0] - 2024-06-20
+### Changed
+- Updated to Minecraft 1.20.6 (Fabric 0.98.0+1.20.6, Neoforge 20.6.119)
+- Removed Forge support until the capability system is re-added
+- Updated BucketLib to 1.20.6-3.3.0.3
+- Updated Cloth Config support (14.0.126) (Fabric/Quilt)
+- Updated ModMenu support (10.0.0-beta.1) (Fabric/Quilt)
+
+### Fixed
+- fixed known issue: max stack size was not taken into account and defaulted to 1 (Fabric)
+
 ## [1.20.4-5.2.0.0] - 2024-05-11
 ### Added
 - add Fabric (>=0.96.11+1.20.4) support (Fabric, Quilt)

diff --git a/README.md b/README.md
@@ -15,12 +15,12 @@ This is a Minecraft mod that adds a **Ceramic Bucket** to the game. (Forge, NeoF
 
 ## Dependencies
 
-Since mod version 3.0.0.0 the library mod BucketLib ([Github](https://github.com/cech12/BucketLib/), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/bucketlib), [Modrinth](https://modrinth.com/mod/bucketlib)) is required.
+Since mod version 3.0.0.0 the library mod BucketLib ([GitHub](https://github.com/cech12/BucketLib/), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/bucketlib), [Modrinth](https://modrinth.com/mod/bucketlib)) is required.
 
 The Fabric / Quilt version needs also the following mods:
 
-- Fabric API ([Github](https://github.com/FabricMC/fabric), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/fabric-api), [Modrinth](https://modrinth.com/mod/fabric-api))
-- Cloth Config API ([Github](https://github.com/shedaniel/cloth-config), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/cloth-config), [Modrinth](https://modrinth.com/mod/cloth-config))
+- Fabric API ([GitHub](https://github.com/FabricMC/fabric), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/fabric-api), [Modrinth](https://modrinth.com/mod/fabric-api))
+- Cloth Config API ([GitHub](https://github.com/shedaniel/cloth-config), [Curseforge](https://www.curseforge.com/minecraft/mc-mods/cloth-config), [Modrinth](https://modrinth.com/mod/cloth-config))
 
 ## Features
 

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ subprojects {
 
     version "$project.minecraft_version-$project.mod_version"
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(java_version)
     //java.withSourcesJar()
     //java.withJavadocJar()
 
@@ -50,15 +50,11 @@ subprojects {
         }
     }
 
-    tasks.withType(JavaCompile).configureEach {
-        it.options.encoding = 'UTF-8'
-        it.options.getRelease().set(17)
-    }
-
     processResources {
         def expandProps = [
                 "version": version,
                 "group": project.group, //Else we target the task's group.
+                "java_version": java_version,
                 "minecraft_version": minecraft_version,
                 "minecraft_version_range": minecraft_version_range,
                 "forge_version": forge_version,
@@ -82,7 +78,7 @@ subprojects {
                 "bucketlib_version_range": bucketlib_version_range
         ]
 
-        filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', '*.mixins.json']) {
+        filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/neoforge.mods.toml', 'META-INF/mods.toml', '*.mixins.json']) {
             expand expandProps
         }
         inputs.properties(expandProps)

diff --git a/common/src/main/resources/assets/ceramicbucket/lang/en_us.json b/common/src/main/resources/assets/ceramicbucket/lang/en_us.json
@@ -1,4 +1,6 @@
 {
+  "tag.fluid.woodenbucket.ceramic_cracking": "Fluids that crack the Ceramic Bucket",
+
   "item.ceramicbucket.ceramic_bucket": "Ceramic Bucket",
   "item.ceramicbucket.ceramic_bucket.entity": "Ceramic Bucket of %s",
   "item.ceramicbucket.ceramic_bucket.filled": "Ceramic %s Bucket",

diff --git a/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/ceramic_bucket.json b/common/src/main/resources/data/ceramicbucket/advancements/recipes/misc/ceramic_bucket.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:clay_ball"
-            ]
+            "items": "minecraft:clay_ball"
           }
         ]
       }

diff --git a/.../src/main/resources/data/ceramicbucket/advancements/recipes/misc/unfired_clay_bucket.json b/.../src/main/resources/data/ceramicbucket/advancements/recipes/misc/unfired_clay_bucket.json
@@ -11,9 +11,7 @@
       "conditions": {
         "items": [
           {
-            "items": [
-              "minecraft:clay_ball"
-            ]
+            "items": "minecraft:clay_ball"
           }
         ]
       }

diff --git a/common/src/main/resources/data/ceramicbucket/recipes/ceramic_bucket.json b/common/src/main/resources/data/ceramicbucket/recipes/ceramic_bucket.json
@@ -4,7 +4,9 @@
   "ingredient": {
     "item": "ceramicbucket:unfired_clay_bucket"
   },
-  "result": "ceramicbucket:ceramic_bucket",
+  "result": {
+    "id": "ceramicbucket:ceramic_bucket"
+  },
   "experience": 0.3,
   "cookingtime": 200
 }
diff --git a/common/src/main/resources/data/ceramicbucket/recipes/unfired_clay_bucket.json b/common/src/main/resources/data/ceramicbucket/recipes/unfired_clay_bucket.json
@@ -11,6 +11,6 @@
     }
   },
   "result": {
-    "item": "ceramicbucket:unfired_clay_bucket"
+    "id": "ceramicbucket:unfired_clay_bucket"
   }
 }
diff --git a/common/src/main/resources/data/minecraft/tags/items/dyeable.json b/common/src/main/resources/data/minecraft/tags/items/dyeable.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "ceramicbucket:ceramic_bucket"
+  ]
+}
diff --git a/common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json b/common/src/main/resources/data/minecraft/tags/items/enchantable/durability.json
@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "ceramicbucket:ceramic_bucket"
+  ]
+}
diff --git 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": 15
+        "pack_format": 32
     }
 }
diff --git 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.6,1.7)'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
 }
 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
@@ -9,6 +9,7 @@
 import net.minecraft.core.Registry;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
 
@@ -24,7 +25,7 @@ public class CeramicBucketMod implements ModInitializer {
             .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING)
             .milking(Services.CONFIG::isMilkingEnabled)
             .entityObtaining(Services.CONFIG::isFishObtainingEnabled)
-            .dyeable(14975336)
+            .dyeable(FastColor.ARGB32.color(255, 14975336))
             .durability(Services.CONFIG::getDurability)
     ));
 

diff --git a/forge/build.gradle b/forge/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'idea'
     id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '[6.0.16,6.2)'
+    id 'net.minecraftforge.gradle' version '6.0.24'
     id 'org.spongepowered.mixin' version '0.7-SNAPSHOT'
 }
 base {
@@ -15,6 +15,7 @@ base {
 
 minecraft {
     mappings channel: 'official', version: minecraft_version
+    reobf = false
 
     copyIdeResources = true //Calls processResources when in dev
 
@@ -63,6 +64,8 @@ dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
     compileOnly project(":common")
     //annotationProcessor("org.spongepowered:mixin:0.8.5-SNAPSHOT:processor")
+    //temporary necessary:
+    implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 
     implementation fg.deobf("com.github.cech12.BucketLib:forge:${bucketlib_version}")
 }
@@ -81,8 +84,6 @@ processResources {
     from project(":common").sourceSets.main.resources
 }
 
-jar.finalizedBy('reobfJar')
-
 publishing {
     publications {
         mavenJava(MavenPublication) {

diff --git a/forge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java b/forge/src/main/java/de/cech12/ceramicbucket/CeramicBucketMod.java
@@ -5,6 +5,7 @@
 import de.cech12.ceramicbucket.init.ModTags;
 import de.cech12.ceramicbucket.platform.Services;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.FastColor;
 import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
@@ -34,7 +35,7 @@ public class CeramicBucketMod {
                     .crackingFluids(ModTags.Fluids.CERAMIC_CRACKING)
                     .milking(Services.CONFIG::isMilkingEnabled)
                     .entityObtaining(Services.CONFIG::isFishObtainingEnabled)
-                    .dyeable(14975336)
+                    .dyeable(FastColor.ARGB32.color(255, 14975336))
                     .durability(Services.CONFIG::getDurability)
     ));