Merge pull request #6 from LAGonauta/better-extension-detection

Better extension detection

.github/workflows/gradle.yml

@@ -10,10 +10,10 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: 17
+        java-version: 21
         distribution: adopt
     - name: Cache/Uncache
       uses: actions/cache@v3
@@ -33,7 +33,7 @@ jobs:
       run: ref="${GITHUB_REF#refs/heads/}" && echo "::set-output name=branch::${ref////-}"
       id: ref
     - name: Upload build artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: openalmc-artifacts-${{ steps.ref.outputs.branch }}
         # Filter built files to disregard -sources and -dev, and leave only the minecraft-compatible jars.

.github/workflows/publish.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout sources
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
-          java-version: 17
+          java-version: 21
           distribution: adopt
       - name: Build artifacts
         run: ./gradlew build -PreleaseType=stable

build.gradle

@@ -1,20 +1,16 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+base {
+	archivesName = project.archives_base_name
+}
+
 repositories {
-	//maven {
-	//	name = 'GrossFabricHacks'
-	//	url = 'https://maven.concern.i.ng/'
-	//}
 	maven {
 		name = 'Cloth Config Maven'
 		url = 'https://maven.shedaniel.me/'
@@ -25,6 +21,8 @@ repositories {
 	}
 }
 
+loom {}
+
 dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
@@ -36,8 +34,6 @@ dependencies {
 	modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_version}") {
 		exclude(group: "net.fabricmc.fabric-api")
 	}
-
-	//modImplementation group: 'net.devtech', name: 'grossfabrichacks', version: "${project.grossfabrichacks_version}"
 }
 
 processResources {
@@ -48,25 +44,25 @@ processResources {
 	}
 }
 
-loom {
-	accessWidenerPath = file("src/main/resources/openalmc.accesswidener")
-}
-
 tasks.withType(JavaCompile).configureEach {
-	// Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {
+	inputs.property "archivesName", project.base.archivesName
+
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.base.archivesName.get()}"}
 	}
 }
 

gradle.properties

@@ -1,18 +1,18 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
+org.gradle.parallel=true
 
 # Fabric Properties
-	# check these on https://fabricmc.net/use
-	minecraft_version=1.19.2
-	yarn_mappings=1.19.2+build.18
-	loader_version=0.14.9
+# check these on https://fabricmc.net/use
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.10
 
 # Mod Properties
-	mod_version = 1.0.0+1.19.2
-	maven_group = net.openalmc
-	archives_base_name = OpenALMC
+mod_version=1.0.0+1.21.4
+maven_group=net.openalmc
+archives_base_name=OpenALMC
 
 # Dependencies
-	modmenu_version=4.0.6
-	cloth_version=8.2.88
-    grossfabrichacks_version=8.1
+modmenu_version=13.0.2
+cloth_version=17.0.144

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.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists