Merge pull request #15 from Turnip-Labs/7.3-new

Update 7.3 branch

Author: MartinSVK12

.gitattributes

@@ -0,0 +1,5 @@
+* text=auto eol=lf
+gradlew text eol=lf
+*.bat text eol=crlf
+*.cmd text eol=crlf
+gradle-wrapper.jar -text -diff -merge -filter

.github/workflows/build.yml

@@ -12,29 +12,30 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          17,    # Current Java LTS & minimum supported by Minecraft
+          21,    # Current Java LTS & minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
       - name: checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: validate gradle wrapper
-        uses: gradle/wrapper-validation-action@v2
+        uses: gradle/actions/wrapper-validation@v5
       - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'
+          cache: gradle
       - name: make gradle wrapper executable
         if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' && matrix.java == '17' }} # Only upload artifacts built from latest java on one OS
-        uses: actions/upload-artifact@v4
+        if: ${{ runner.os == 'Linux' && matrix.java == '21' }} # Only upload artifacts built from latest java on one OS
+        uses: actions/upload-artifact@v5
         with:
           name: Artifacts
           path: build/libs/

README.md

@@ -5,7 +5,7 @@ Template for making Babric mods for BTA!
 **Note: *DO NOT fork this repository unless you want to contribute!***
 
 ## Prerequisites
-- JDK for Java 17 ([Eclipse Temurin](https://adoptium.net/temurin/releases/) recommended)
+- JDK for Java 21 ([Eclipse Temurin](https://adoptium.net/temurin/releases/) recommended)
 - [Intellij IDEA](https://www.jetbrains.com/idea/download/) (Scroll down for the free community edition, if using linux **DO NOT** use the flatpak distribution)
 - Minecraft Development plugin (Optional, but highly recommended)
 
@@ -32,6 +32,8 @@ Template for making Babric mods for BTA!
 1. If you haven't already you should join the BTA modding discord! https://discord.gg/FTUNJhswBT
 2. You can set your username when launching the client run configuration by setting `--username <username>` in your program arguments.
 3. When launching the server run configuration you may want to remove the `nogui` program argument in order to see the regular server GUI.
-4. In Intellij you can double press shift or press ctrl+N to search class files, change the search from the default `Project Files` to `All Places` you can easily explore the classes for you dependencies and even BTA itself.
-5. In Intellij if ctrl+left click on a field or method you can quickly get information on when and where that field or method is assign or used.
+4. In Intellij you can double press shift or press ctrl+N to search class files, change the search from the default `Project Files` to `All Places` you can easily explore the classes for your dependencies and even BTA itself.
+5. In Intellij if ctrl+left-click on a field or method you can quickly get information on when and where that field or method is assign or used.
+6. Ensure IntelliJ is updated to the latest version. This is important because this template uses the latest Gradle version and if your IntelliJ installation is outdated, it may not support the latest version.
+7. In the `examplemod.mixins.json` you'll see `"compatibilityLevel": "JAVA_${java}",` along with an error message from the `Minecraft Development` plugin stating `Cannot resolve compatibility level 'JAVA_${java}'`. You can safely ignore this. The Gradle build system has been set up to grab the Java version from your `gradle.properties` and replace `${java}` with it. So the compiled binary will properly have it as `JAVA_8`.
 

build.gradle.kts

@@ -3,157 +3,176 @@
 import org.apache.tools.ant.taskdefs.condition.Os
 
 plugins {
-    id("fabric-loom") version "1.10.0-bta"
-    id("java")
+    id("fabric-loom")
+    java
 }
 
-val lwjglVersion = "3.3.4"
-
+val lwjglVersion = providers.gradleProperty("lwjgl_version")
 val lwjglNatives = when {
     Os.isFamily(Os.FAMILY_UNIX) && !Os.isFamily(Os.FAMILY_MAC) -> "natives-linux"
     Os.isFamily(Os.FAMILY_WINDOWS) -> "natives-windows"
     Os.isFamily(Os.FAMILY_MAC) -> "natives-macos${if (Os.isArch("aarch64")) "-arm64" else ""}"
     else -> error("Unsupported OS")
 }
 
-val mod_group: String by project
-val mod_name: String by project
-val mod_version: String by project
+val modVersion = providers.gradleProperty("mod_version")
+val modGroup = providers.gradleProperty("mod_group")
+val modName = providers.gradleProperty("mod_name")
+
+val btaChannel = providers.gradleProperty("bta_channel")
+val btaVersion = providers.gradleProperty("bta_version")
 
-val bta_channel: String by project
-val bta_version: String by project
+val loaderVersion = providers.gradleProperty("loader_version")
 
-val loader_version: String by project
+val halplibeVersion = providers.gradleProperty("halplibe_version")
+val modMenuVersion = providers.gradleProperty("mod_menu_version")
 
-val halplibe_version: String by project
-val mod_menu_version: String by project
+val slf4jApiVersion = providers.gradleProperty("slf4j_api_version")
+val log4jVersion = providers.gradleProperty("log4j_version")
+val guavaVersion = providers.gradleProperty("guava_version")
+val gsonVersion = providers.gradleProperty("gson_version")
+val commonsLang3Version = providers.gradleProperty("commons_lang3_version")
 
-group = mod_group
-base.archivesName.set(mod_name)
-version = mod_version
+val javaVersion = providers.gradleProperty("java_version")
+
+group = modGroup.get()
+base.archivesName = modName.get()
+version = modVersion.get()
 
 loom {
     noIntermediateMappings()
-    customMinecraftMetadata.set("https://downloads.betterthanadventure.net/bta-client/$bta_channel/v$bta_version/manifest.json")
+    customMinecraftMetadata.set("https://downloads.betterthanadventure.net/bta-client/${btaChannel.get()}/v${btaVersion.get()}/manifest.json")
 }
 
 repositories {
     mavenCentral()
-    maven { url = uri("https://jitpack.io") }
-    maven {
-        name = "Babric"
-        url = uri("https://maven.glass-launcher.net/babric")
-    }
-    maven {
-        name = "Fabric"
-        url = uri("https://maven.fabricmc.net/")
-    }
-    maven {
-        name = "SignalumMavenInfrastructure"
-        url = uri("https://maven.thesignalumproject.net/infrastructure")
-    }
-    maven {
-        name = "SignalumMavenReleases"
-        url = uri("https://maven.thesignalumproject.net/releases")
-    }
-    ivy {
-        url = uri("https://github.com/Better-than-Adventure")
-        patternLayout {
-            artifact("[organisation]/releases/download/v[revision]/[module].jar")
-        }
+	maven("https://jitpack.io")
+    maven("https://maven.glass-launcher.net/babric") { name = "Babric" }
+    maven("https://maven.fabricmc.net/") { name = "Fabric" }
+    maven("https://maven.thesignalumproject.net/infrastructure") { name = "SignalumMavenInfrastructure" }
+    maven("https://maven.thesignalumproject.net/releases") { name = "SignalumMavenReleases" }
+    ivy("https://github.com/Better-than-Adventure") {
+        patternLayout { artifact("[organisation]/releases/download/v[revision]/[module].jar") }
         metadataSources { artifact() }
     }
-    ivy {
-        url = uri("https://downloads.betterthanadventure.net/bta-client/$bta_channel/")
-        patternLayout {
-            artifact("/v[revision]/client.jar")
-        }
+    ivy("https://downloads.betterthanadventure.net/bta-client/${btaChannel.get()}/") {
+        patternLayout { artifact("/v[revision]/client.jar") }
         metadataSources { artifact() }
     }
-    ivy {
-        url = uri("https://downloads.betterthanadventure.net/bta-server/$bta_channel/")
-        patternLayout {
-            artifact("/v[revision]/server.jar")
-        }
+    ivy("https://downloads.betterthanadventure.net/bta-server/${btaChannel.get()}/") {
+        patternLayout { artifact("/v[revision]/server.jar") }
         metadataSources { artifact() }
     }
-    ivy {
-        url = uri("https://piston-data.mojang.com")
-        patternLayout {
-            artifact("v1/[organisation]/[revision]/[module].jar")
-        }
+    ivy("https://piston-data.mojang.com") {
+        patternLayout { artifact("v1/[organisation]/[revision]/[module].jar") }
         metadataSources { artifact() }
     }
 }
 
 dependencies {
-    minecraft("::${bta_version}")
+    minecraft("::${btaVersion.get()}")
     mappings(loom.layered {})
 
-    modRuntimeOnly("objects:client:43db9b498cb67058d2e12d394e6507722e71bb45") // https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar
-    modImplementation("net.fabricmc:fabric-loader:$loader_version")
-
-    // Helper library
-    // If you do not need Halplibe you can comment this line out or delete this line
-    modImplementation("turniplabs:halplibe:$halplibe_version")
-
-    modImplementation("turniplabs:modmenu-bta:$mod_menu_version")
-
-    implementation("org.slf4j:slf4j-api:1.8.0-beta4")
-    implementation("org.apache.logging.log4j:log4j-slf4j18-impl:2.16.0")
-
-    implementation("com.google.guava:guava:33.0.0-jre")
-    implementation("com.google.code.gson:gson:2.10.1")
-
-    val log4jVersion = "2.20.0"
-    implementation("org.apache.logging.log4j:log4j-core:$log4jVersion")
-    implementation("org.apache.logging.log4j:log4j-api:$log4jVersion")
-    implementation("org.apache.logging.log4j:log4j-1.2-api:$log4jVersion")
-
-    implementation("org.apache.commons:commons-lang3:3.12.0")
-    include("org.apache.commons:commons-lang3:3.12.0")
-
-    modImplementation("com.github.Better-than-Adventure:legacy-lwjgl3:1.0.5")
-    implementation(platform("org.lwjgl:lwjgl-bom:$lwjglVersion"))
-
-    runtimeOnly("org.lwjgl:lwjgl::$lwjglNatives")
-    runtimeOnly("org.lwjgl:lwjgl-assimp::$lwjglNatives")
-    runtimeOnly("org.lwjgl:lwjgl-glfw::$lwjglNatives")
-    runtimeOnly("org.lwjgl:lwjgl-openal::$lwjglNatives")
-    runtimeOnly("org.lwjgl:lwjgl-opengl::$lwjglNatives")
-    runtimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
-    implementation("org.lwjgl:lwjgl:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-assimp:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-glfw:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-openal:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-opengl:$lwjglVersion")
-    implementation("org.lwjgl:lwjgl-stb:$lwjglVersion")
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
-    withSourcesJar()
-}
-
-tasks.compileJava {
-    options.release.set(8)
+	// https://piston-data.mojang.com/v1/objects/43db9b498cb67058d2e12d394e6507722e71bb45/client.jar
+    modRuntimeOnly("objects:client:43db9b498cb67058d2e12d394e6507722e71bb45")
+    // If you do not need Halplibe you can comment out or delete this line.
+    modImplementation("turniplabs:halplibe:${halplibeVersion.get()}")
+	modImplementation("turniplabs:modmenu-bta:${modMenuVersion.get()}")
+	modImplementation("net.fabricmc:fabric-loader:${loaderVersion.get()}")
+	modImplementation("com.github.Better-than-Adventure:legacy-lwjgl3:1.0.5")
+
+	implementation(platform("org.lwjgl:lwjgl-bom:${lwjglVersion.get()}"))
+	implementation("org.slf4j:slf4j-api:${slf4jApiVersion.get()}")
+
+	implementation("com.google.guava:guava:${guavaVersion.get()}")
+	implementation("com.google.code.gson:gson:${gsonVersion.get()}")
+
+	implementation("org.apache.logging.log4j:log4j-slf4j2-impl:${log4jVersion.get()}")
+	implementation("org.apache.logging.log4j:log4j-core:${log4jVersion.get()}")
+	implementation("org.apache.logging.log4j:log4j-api:${log4jVersion.get()}")
+	implementation("org.apache.logging.log4j:log4j-1.2-api:${log4jVersion.get()}")
+
+	implementation("org.apache.commons:commons-lang3:${commonsLang3Version.get()}")
+	include("org.apache.commons:commons-lang3:${commonsLang3Version.get()}")
+
+	implementation("org.lwjgl:lwjgl:${lwjglVersion.get()}")
+	implementation("org.lwjgl:lwjgl-assimp:${lwjglVersion.get()}")
+	implementation("org.lwjgl:lwjgl-glfw:${lwjglVersion.get()}")
+	implementation("org.lwjgl:lwjgl-openal:${lwjglVersion.get()}")
+	implementation("org.lwjgl:lwjgl-opengl:${lwjglVersion.get()}")
+	implementation("org.lwjgl:lwjgl-stb:${lwjglVersion.get()}")
+
+	runtimeOnly("org.lwjgl:lwjgl::$lwjglNatives")
+	runtimeOnly("org.lwjgl:lwjgl-assimp::$lwjglNatives")
+	runtimeOnly("org.lwjgl:lwjgl-glfw::$lwjglNatives")
+	runtimeOnly("org.lwjgl:lwjgl-openal::$lwjglNatives")
+	runtimeOnly("org.lwjgl:lwjgl-opengl::$lwjglNatives")
+	runtimeOnly("org.lwjgl:lwjgl-stb::$lwjglNatives")
 }
 
-tasks.jar {
-    from("LICENSE") {
-        rename { "${it}_${base.archivesName.get()}" }
-    }
-}
-
-configurations.configureEach {
-    // Removes LWJGL2 dependencies
-    exclude(group = "org.lwjgl.lwjgl")
-}
-
-tasks.processResources {
-    inputs.property("version", version)
-    filesMatching("fabric.mod.json") {
-        expand("version" to version)
-    }
+tasks {
+	withType<JavaCompile>().configureEach {
+		options.encoding = "UTF-8"
+		sourceCompatibility = javaVersion.get()
+		targetCompatibility = javaVersion.get()
+		if (javaVersion.get().toInt() > 8) options.release = javaVersion.get().toInt()
+	}
+	withType<JavaExec>().configureEach { defaultCharacterEncoding = "UTF-8" }
+	withType<Javadoc>().configureEach { options.encoding = "UTF-8" }
+	withType<Test>().configureEach { defaultCharacterEncoding = "UTF-8" }
+	named<Jar>("jar") {
+		val rootLicense = layout.projectDirectory.file("LICENSE")
+		val parentLicense = layout.projectDirectory.file("../LICENSE")
+		val licenseFile = when {
+			rootLicense.asFile.exists() -> {
+				logger.lifecycle("Using LICENSE from project root: ${rootLicense.asFile}")
+				rootLicense
+			}
+			parentLicense.asFile.exists() -> {
+				logger.lifecycle("Using LICENSE from parent directory: ${parentLicense.asFile}")
+				parentLicense
+			}
+			else -> {
+				logger.warn("No LICENSE file found in project or parent directory.")
+				null
+			}
+		}
+		licenseFile?.let {
+			from(it) {
+				rename { original -> "${original}_${archiveBaseName.get()}" }
+			}
+		}
+	}
+	processResources {
+		val stringModVersion = modVersion.get()
+		val stringLoaderVersion = loaderVersion.get()
+		val stringJavaVersion = javaVersion.get()
+		val stringHalplibeVersion = halplibeVersion.get()
+		val stringModMenuVersion = modMenuVersion.get()
+		inputs.property("modVersion", stringModVersion)
+		inputs.property("loaderVersion", stringLoaderVersion)
+		inputs.property("javaVersion", stringJavaVersion)
+		inputs.property("HalplibeVersion", stringHalplibeVersion)
+		inputs.property("modMenuVersion", stringModMenuVersion)
+		filesMatching("fabric.mod.json") {
+			expand(
+				mapOf(
+					"version" to stringModVersion,
+					"fabricloader" to stringLoaderVersion,
+					"halplibe" to stringHalplibeVersion,
+					"java" to stringJavaVersion,
+					"modmenu" to stringModMenuVersion
+				)
+			)
+		}
+		filesMatching("*.mixins.json") { expand(mapOf("java" to stringJavaVersion)) }
+	}
+	java {
+		toolchain.languageVersion = JavaLanguageVersion.of(javaVersion.get())
+		sourceCompatibility = JavaVersion.toVersion(javaVersion.get().toInt())
+		targetCompatibility = JavaVersion.toVersion(javaVersion.get().toInt())
+		withSourcesJar()
+	}
 }
+// Removes LWJGL2 dependencies
+configurations.configureEach { exclude(group = "org.lwjgl.lwjgl") }