bump axolotlclient dependency

- cleanup build scripts
- fix tiny bug

Author: moehreag

.editorconfig

@@ -12,8 +12,9 @@ max_line_length = 120
 [*.json]
 indent_size = 2
 
-[quilt.mod.json]
-tab_width = 2
-
 [*.properties]
 indent_size = 2
+
+[.github/**/*.yml]
+indent_style = space
+indent_size = 2

.github/workflows/release.yml

@@ -33,9 +33,12 @@ jobs:
       - name: Build
         run: ./gradlew build collectBuilds
 
+      - name: Generate Version Changelog
+        run: ./gradlew generateVersionChangelog
+
       - name: Release
         uses: Kira-NT/mc-publish@v3.3
         with:
-          github-token: "${{ secrets.GH_TOKEN }}"
-          changelog-file: "CHANGELOG.md"
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+          changelog-file: "build/changelog"
           files: builds/*.jar

1.20/build.gradle.kts

@@ -86,7 +86,7 @@ java {
 
 tasks.runClient {
 	classpath(sourceSets.getByName("test").runtimeClasspath)
-	jvmArgs("-XX:+AllowEnhancedClassRedefinition")
+	jvmArgs("-XX:+AllowEnhancedClassRedefinition -XX:+IgnoreUnrecognizedVMOptions")
 }
 
 // Configure the maven publication
@@ -132,7 +132,7 @@ modrinth {
 	additionalFiles.set(listOf(tasks.remapSourcesJar))
 	dependencies {
 		required.project("fabric-api")
-		optional.project("axolotlclient")
+		optional.version("axolotlclient", project.property("axolotlclient").toString())
 	}
 
 	// Changelog fetching: Credit LambdAurora.

1.20/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -180,7 +180,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, float tick,
 			pose.pushPose();
 			pose.translate(0, Math.max(height, projHeight + 4) / 2f + 4, 0);
 			var pos = pose.last().pose().transformPosition(new Vector3f());
-			if (_3dOnScreen) {
+			if ((projWidth >= width || projHeight >= height) && _3dOnScreen) {
 				pos.y = Math.min(pos.y, displayEnd.y()+6);
 			}
 			positionDrawn.set(() -> {

1.21.8/build.gradle.kts

@@ -23,9 +23,6 @@ loom {
 			sourceSet("test")
 		}
 	}
-	runs {
-		getByName("client").vmArg("-XX:+AllowEnhancedClassRedefinition")
-	}
 }
 
 repositories {
@@ -92,11 +89,11 @@ java {
 
 tasks.runClient {
 	classpath(sourceSets.getByName("test").runtimeClasspath)
-	jvmArgs("-XX:+AllowEnhancedClassRedefinition")
+	jvmArgs("-XX:+AllowEnhancedClassRedefinition -XX:+IgnoreUnrecognizedVMOptions")
 }
 
 tasks.runServer {
-	jvmArgs("-XX:+AllowEnhancedClassRedefinition")
+	jvmArgs("-XX:+AllowEnhancedClassRedefinition -XX:+IgnoreUnrecognizedVMOptions")
 }
 
 // Configure the maven publication
@@ -142,7 +139,7 @@ modrinth {
 	additionalFiles.set(listOf(tasks.remapSourcesJar))
 	dependencies {
 		required.project("fabric-api")
-		optional.project("axolotlclient")
+		optional.version("axolotlclient", project.property("axolotlclient").toString())
 	}
 
 	// Changelog fetching: Credit LambdAurora.

1.21.8/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -205,7 +205,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, DeltaTracke
 			pose.pushMatrix();
 			pose.translate(0, Math.max(height, projHeight + 4) / 2f + 4);
 			var pos = pose.transformPosition(new Vector2f());
-			if (_3dOnScreen) {
+			if ((projWidth >= width || projHeight >= height) && _3dOnScreen) {
 				pos.y = Math.min(pos.y, displayEnd.y()+6);
 			}
 			positionDrawn.set(() -> {

1.21/build.gradle.kts

@@ -86,7 +86,7 @@ java {
 
 tasks.runClient {
 	classpath(sourceSets.getByName("test").runtimeClasspath)
-	jvmArgs("-XX:+AllowEnhancedClassRedefinition")
+	jvmArgs("-XX:+AllowEnhancedClassRedefinition -XX:+IgnoreUnrecognizedVMOptions")
 }
 
 // Configure the maven publication
@@ -132,7 +132,7 @@ modrinth {
 	additionalFiles.set(listOf(tasks.remapSourcesJar))
 	dependencies {
 		required.project("fabric-api")
-		optional.project("axolotlclient")
+		optional.version("axolotlclient", project.property("axolotlclient").toString())
 	}
 
 	// Changelog fetching: Credit LambdAurora.

1.21/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -186,7 +186,7 @@ private void renderWaypoint(Waypoint waypoint, GuiGraphics graphics, DeltaTracke
 			pose.pushPose();
 			pose.translate(0, Math.max(height, projHeight + 4) / 2f + 4, 0);
 			var pos = pose.last().pose().transformPosition(new Vector3f());
-			if (_3dOnScreen) {
+			if ((projWidth >= width || projHeight >= height) && _3dOnScreen) {
 				pos.y = Math.min(pos.y, displayEnd.y()+6);
 			}
 			positionDrawn.set(() -> {

1.8.9/build.gradle.kts

@@ -94,7 +94,7 @@ tasks.runClient {
 		jvmArgs("-Dorg.lwjgl.glfw.libname=$glfwPath")
 	}
 	classpath(sourceSets.getByName("test").runtimeClasspath)
-	jvmArgs("-XX:+AllowEnhancedClassRedefinition")
+	jvmArgs("-XX:+AllowEnhancedClassRedefinition -XX:+IgnoreUnrecognizedVMOptions")
 }
 
 tasks.withType(JavaCompile::class).configureEach {
@@ -156,7 +156,7 @@ modrinth {
 	dependencies {
 		required.project("osl")
 		required.project("moehreag-legacy-lwjgl3")
-		optional.project("axolotlclient")
+		optional.version("axolotlclient", project.property("axolotlclient").toString())
 	}
 
 	// Changelog fetching: Credit LambdAurora.

1.8.9/src/main/java/io/github/axolotlclient/waypoints/waypoints/WaypointRenderer.java

@@ -209,7 +209,7 @@ private void renderWaypoint(Waypoint waypoint, float tick, Entity camera, Atomic
 				GlStateManager.pushMatrix();
 				GlStateManager.translatef(result.x(), result.y(), 0);
 				GlStateManager.translatef(0, Math.max(height, projHeight + 4) / 2f + 4, 0);
-				if (_3dOnScreen) {
+				if ((projWidth >= width || projHeight >= height) && _3dOnScreen) {
 					float y = result.y()+Math.max(height, projHeight + 4) / 2f + 4;
 					var y2 = Math.min(y, displayEnd.y()+6);
 					GlStateManager.translatef(0, y2-y, 0);