✨ 1.2.0: Swampier Swamps & Port to 1.21

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       - uses: gradle/wrapper-validation-action@v1
       - uses: actions/setup-java@v4
         with:
-          java-version: '17'
+          java-version: '21'
           distribution: 'microsoft'
       - run: chmod +x ./gradlew
       - run: ./gradlew build

.gitignore

@@ -116,3 +116,5 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+
+src/generated/.cache

build.gradle.kts

@@ -0,0 +1,78 @@
+plugins {
+    java
+    id("fabric-loom") version "1.7-SNAPSHOT"
+}
+
+class ModInfo {
+    val id = property("mod.id").toString()
+    val group = property("mod.group").toString()
+    val version = property("mod.version").toString()
+}
+
+class Dependencies {
+    val minecraft = property("deps.minecraft").toString()
+    val loader = property("deps.loader").toString()
+    val yarn = property("deps.yarn").toString()
+
+    val fabricApi = property("deps.fabricapi").toString()
+    val cabinetApi = property("deps.cabinetapi").toString()
+}
+
+val mod = ModInfo()
+val deps = Dependencies()
+
+loom {
+    accessWidenerPath = file("src/main/resources/hollow.accesswidener")
+}
+
+fabricApi {
+    configureDataGeneration()
+}
+
+repositories {
+    maven("https://maven.callmeecho.dev/releases/")
+    maven("https://maven.terraformersmc.com/releases/")
+}
+
+dependencies {
+    minecraft("com.mojang:minecraft:${deps.minecraft}")
+    mappings("net.fabricmc:yarn:${deps.yarn}:v2")
+    modImplementation("net.fabricmc:fabric-loader:${deps.loader}")
+
+    modImplementation("net.fabricmc.fabric-api:fabric-api:${deps.fabricApi}")
+    include("dev.callmeecho:cabinetapi:${deps.cabinetApi}")
+    modImplementation("dev.callmeecho:cabinetapi:${deps.cabinetApi}")
+
+    // not ported
+    // modCompileOnly("maven.modrinth:lambdynamiclights:2.3.2+1.20.1")
+}
+
+tasks.processResources {
+    inputs.property("id", mod.id)
+    inputs.property("version", mod.version)
+    inputs.property("loader_version", deps.loader)
+    inputs.property("minecraft_version", deps.minecraft)
+
+    val map = mapOf(
+        "id" to mod.id,
+        "version" to mod.version,
+        "loader_version" to deps.loader,
+        "minecraft_version" to deps.minecraft
+    )
+
+    filesMatching("fabric.mod.json") { expand(map) }
+}
+
+java {
+    withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+
+tasks.withType<JavaCompile> {
+    options.encoding = "UTF-8"
+    options.release = 21
+}
+

gradle.properties

@@ -1,13 +1,13 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-minecraft_version=1.20.1
-yarn_mappings=1.20.1+build.10
-loader_version=0.15.7
+mod.version = 1.2.0
+mod.group = dev.callmeecho
+mod.id = hollow
 
-mod_version=1.1.0
-maven_group=dev.callmeecho
-archives_base_name=hollow
+deps.minecraft=1.21
+deps.loader=0.15.11
+deps.yarn=1.21+build.9
 
-fabric_version=0.92.0+1.20.1
-cabinet_version=1.1.1+1.20.1
+deps.fabricapi=0.100.7+1.21
+deps.cabinetapi=1.3.5+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

settings.gradle.kts

@@ -0,0 +1,7 @@
+pluginManagement {
+    repositories {
+        maven("https://maven.fabricmc.net/")
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}