Update to 1.20.5 (#35)

* Remove one advancement for now
* Package and class renames
* Update common tags
* Update CI and Publish workflows
* Fix Wall Closet
* Use custom item components
* Drop coffee machine in creative mode
* Make some blocks explosion resistant

FML 3
Gradle 8.7
Java 21

.gitattributes

@@ -1,6 +1,15 @@
-# Disable autocrlf on generated files, they always generate with LF
-# Add any extra files or paths here to make git stop saying they
-# are changed when only line endings change.
-src/generated/**/.cache/cache text eol=lf
-src/generated/**/*.json text eol=lf
-src/main/**/*.toml text eol=lf
+* text eol=lf
+*.bat text eol=crlf
+*.patch text eol=lf
+*.java text eol=lf
+*.gradle text eol=crlf
+*.png binary
+*.gif binary
+*.exe binary
+*.dll binary
+*.jar binary
+*.lzma binary
+*.zip binary
+*.pyd binary
+*.cfg text eol=lf
+*.jks binary

.github/workflows/java_ci.yml

@@ -15,3 +15,5 @@ permissions:
 jobs:
   ci:
     uses: TheMCBrothers/.github/.github/workflows/mod_ci.yml@main
+    with:
+      java_version: '21'

.github/workflows/publish.yml

@@ -12,6 +12,8 @@ permissions:
 jobs:
   publish:
     uses: TheMCBrothers/.github/.github/workflows/mod_publish_unified.yml@main
+    with:
+      java_version: '21'
     secrets:
       CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_TOKEN }}
       MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}

.gitignore

@@ -20,7 +20,6 @@ build
 # other
 eclipse
 run
-secrets.properties
-
-# Files from Forge MDK
-forge*changelog.txt
+runs
+run-data
+/src/generated/**/.cache/

build.gradle

@@ -1,24 +1,22 @@
 plugins {
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.+'
+    id 'net.neoforged.gradle.userdev' version '7.0.105'
     id 'me.shedaniel.unified-publishing' version '0.1.+'
 }
 
 version = mod_version
 group = mod_group_id
 
-repositories {
-    maven { url = "https://nexus.themcbrothers.net/repository/maven-mod-dependencies" }
-    mavenLocal()
-}
-
 base {
     archivesName = mod_id
 }
 
-// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}
 
 println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
 
@@ -67,6 +65,11 @@ runs {
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
+repositories {
+    maven { url = "https://nexus.themcbrothers.net/repository/maven-mod-dependencies" }
+    mavenLocal()
+}
+
 dependencies {
     // NeoForge
     implementation "net.neoforged:neoforge:$neo_version"
@@ -75,13 +78,14 @@ dependencies {
     implementation "net.themcbrothers:themcbroslib:$minecraft_version-$lib_version"
 
     // JEI
-    compileOnly("mezz.jei:jei-$minecraft_version-common-api:$jei_version")
-    compileOnly("mezz.jei:jei-$minecraft_version-neoforge-api:$jei_version")
-    runtimeOnly("mezz.jei:jei-$minecraft_version-neoforge:$jei_version")
+    // TODO update JEI mc version
+    compileOnly("mezz.jei:jei-1.20.4-common-api:$jei_version")
+    compileOnly("mezz.jei:jei-1.20.4-neoforge-api:$jei_version")
+//    runtimeOnly("mezz.jei:jei-1.20.4-neoforge:$jei_version")
 }
 
 tasks.named('processResources', ProcessResources).configure {
-    filesMatching(['META-INF/mods.toml', 'pack.mcmeta']) {
+    filesMatching(['META-INF/neoforge.mods.toml', 'pack.mcmeta']) {
         expand project: project
     }
 }
@@ -144,7 +148,7 @@ unifiedPublishing {
                 token = curseforgeToken
                 id = project.curse_project_id
                 changelog = changes
-                gameVersions.addAll "Java 17"
+                gameVersions.addAll "Java 21"
 
                 relations {
                     depends "themcbroslib"

gradle.properties

@@ -5,21 +5,21 @@ org.gradle.daemon=false
 org.gradle.debug=false
 
 # Version
-mod_version=9.2.0
+mod_version=10.0.0-alpha
 artifact_type=release
 
 # Minecraft
-minecraft_version=1.20.4
-minecraft_version_range=[1.20.4, 1.21)
+minecraft_version=1.20.5
+minecraft_version_range=[1.20.5, 1.21)
 
 # NeoForge
-neo_version=20.4.184
-neo_version_range=[20.4.167,)
-loader_version_range=[2,)
+neo_version=20.5.21-beta
+neo_version_range=[20.5,)
+loader_version_range=[3,)
 
 # Mappings
-neogradle.subsystems.parchment.minecraftVersion=1.20.3
-neogradle.subsystems.parchment.mappingsVersion=2023.12.31
+neogradle.subsystems.parchment.minecraftVersion=1.20.5
+neogradle.subsystems.parchment.mappingsVersion=2024.04.29-nightly-SNAPSHOT
 
 # Mod Properties
 mod_name=Useless Mod
@@ -32,8 +32,8 @@ mod_license=MIT License
 catalogue_item_icon=uselessmod:useless_ingot
 
 # Dependencies
-lib_version=6.1.0
-lib_version_range=[1.20.4-6.1.0,)
+lib_version=7.0.0-SNAPSHOT
+lib_version_range=1.20.5-7.0.0
 jei_version=17.3.0.49
 
 # Publishing

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists