Update scala version, and buildscript

build.gradle

@@ -1,29 +1,26 @@
 plugins {
-    id "java-library"
-    id "scala"
-    id "maven-publish"
-    id 'fabric-loom' version '0.10.30'
-    id "com.matthewprenger.cursegradle" version "1.4.0"
+	id 'java-library'
+	id 'scala'
+	id 'maven-publish'
+	id 'fabric-loom' version '1.5-SNAPSHOT'
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
-
 archivesBaseName = project.archives_base_name
 group = project.maven_group
 
-version = mod_version
-def ENV = System.getenv()
-version = version + "+scala." + project.scala_version + (ENV.GITHUB_ACTIONS ? "" : ".local")
+version = mod_version + "+scala." + project.scala_version + (System.getenv('GITHUB_ACTIONS') ? "" : ".local")
 
 dependencies {
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
+	minecraft "com.mojang:minecraft:${project.minecraft_version}"
+	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-	include(api("org.scala-lang:scala3-library_3:${project.scala_version}"))
-	// Depended on by scala3
-	include(api("org.scala-lang:scala-library:2.13.6"))
+	// Scala Dependencies
+	implementation "org.scala-lang:scala3-library_3:${project.scala_version}"
+	implementation "org.scala-lang:scala-reflect:${project.scala_reflect_version}"
+	implementation "org.scala-lang.modules:scala-xml_3:${project.scala_xml_version}"// might be unnecessary but wtv
 }
 
 processResources {
@@ -39,49 +36,22 @@ java {
 }
 
 publishing {
-    publications {
-        maven(MavenPublication) {
+	publications {
+		maven(MavenPublication) {
 			from components.java
-        }
-    }
-    repositories {
-		repositories {
-			if (ENV.MAVEN_URL) {
-				maven {
-					url ENV.MAVEN_URL
-					credentials {
-						username ENV.MAVEN_USERNAME
-						password ENV.MAVEN_PASSWORD
-					}
+		}
+	}
+	repositories {
+		if (System.getenv('MAVEN_URL')) {
+			maven {
+				url System.getenv('MAVEN_URL')
+				credentials {
+					username System.getenv('MAVEN_USERNAME')
+					password System.getenv('MAVEN_PASSWORD')
 				}
 			}
 		}
-    }
-}
-
-curseforge {
-	if (ENV.CURSEFORGE_API_KEY) {
-		apiKey = ENV.CURSEFORGE_API_KEY
 	}
-
-    project {
-        id = '309275'
-        changelog = 'A changelog can be found at https://github.com/FabricMC/fabric-language-scala/commits/master'
-        releaseType = 'release'
-		addGameVersion '1.17.1'
-        addGameVersion '1.16.5'
-		addGameVersion '1.15.2'
-		addGameVersion '1.14.4'
-		addGameVersion "Fabric"
-
-        mainArtifact(file("${project.buildDir}/libs/${base.archivesBaseName}-${version}.jar")) {
-            displayName = "Fabric Language Scala $version"
-        }
-    }
-
-    options {
-        forgeGradleIntegration = false
-    }
 }
 
 // A task to ensure that the version being released has not already been released.
@@ -95,6 +65,3 @@ task checkVersion {
 		}
 	}
 }
-
-publish.mustRunAfter checkVersion
-project.tasks.curseforge.mustRunAfter checkVersion

gradle.properties

@@ -2,14 +2,18 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/use
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.61
-loader_version=0.11.7
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.7
+
 # Mod Properties
 mod_version=2.0.0
 maven_group=net.fabricmc
 archives_base_name=fabric-language-scala
 description=Fabric language module for Scala
 url=https://github.com/FabricMC/fabric-language-scala/
-# Other
-scala_version=3.0.2
+
+# Scala
+scala_version=3.4.0
+scala_reflect_version=2.13.13
+scala_xml_version=2.2.0

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-rc-1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

src/main/scala/net/fabricmc/language/scala/ScalaLanguageAdapter.scala

@@ -16,20 +16,21 @@
 
 package net.fabricmc.language.scala
 
-
 import net.fabricmc.loader.api.{LanguageAdapter, ModContainer}
 
+import scala.util.{Failure, Success, Try}
+
 class ScalaLanguageAdapter extends LanguageAdapter {
 
   override def create[T](modContainer: ModContainer, s: String, aClass: Class[T]): T = {
-    try {
+    Try {
       val objectClass = Class.forName(s + "$")
       val moduleField = objectClass.getField("MODULE$")
       val instance = moduleField.get(null).asInstanceOf[T]
-      if (instance == null) throw new NullPointerException
-      instance
-    } catch {
-      case _: Exception =>
+      Option(instance).getOrElse(throw new NullPointerException)
+    } match {
+      case Success(instance) => instance
+      case Failure(_) =>
         println(s"Unable to find ${aClass.getName}$$MODULE$$")
         aClass.getConstructor().newInstance()
     }

src/test/scala/net/fabricmc/language/scala/TestMod.scala

@@ -20,11 +20,13 @@ import net.fabricmc.api.ModInitializer
 import net.minecraft.block.Blocks
 
 object TestMod extends ModInitializer {
-
 	override def onInitialize(): Unit = {
-		System.out.println("**********************")
-		System.out.println("Hello from Scala!")
-		System.out.println("Hello " + Blocks.DIRT)
-		System.out.println("**********************")
+		val message = """
+				|**********************
+			        |Hello from Scala!
+			        |Hello ${Blocks.DIRT}!
+				|**********************
+				|""".stripMargin
+		println(message)
 	}
 }