4.2.3.0 branch

build.gradle

@@ -119,21 +119,28 @@ task sourceJar(type: Jar) {
 
 tasks.register('checkArtifactExists') {
     doLast {
+		// Skip this task if --force is present
+		if (project.hasProperty('force')) {
+			logger.lifecycle("Skipping artifact existence check due to --force flag.")
+			return
+		}
+
         def repoUrl = project.hasProperty('mavenRepoUrl') ? project.mavenRepoUrl : mavenLocalUrl
-        def artifactPath = "${repoUrl}/${project.group.replace('.', '/')}/com/wildermods/workspace/gradle/plugin/${project.version}/workspace-${project.version}.jar"
+        def artifactName = "com.wildermods.workspace.gradle.plugin"
+        def artifactPath = "${repoUrl}/${project.group.replace('.', '/')}/${project.archivesBaseName}/${artifactName}/${project.version}/${artifactName}-${project.version}.jar"
         logger.lifecycle("Checking if artifact exists at: $artifactPath")
 
         if (artifactPath.startsWith('file:/')) {
             def file = new File(new URI(artifactPath))
             if (file.exists()) {
-                throw new IllegalStateException("Artifact '${project.group}:${project.archivesBaseName}:${project.version}' already exists. Publishing aborted.")
+                throw new IllegalStateException("Artifact '${artifactPath}' already exists. Publishing aborted.")
             }
         } else {
             def url = new URL(artifactPath)
             def connection = url.openConnection()
             connection.setRequestMethod('HEAD')
             if (connection.responseCode == 200) {
-                throw new IllegalStateException("Artifact '${project.group}:${project.archivesBaseName}:${project.version}' already exists. Publishing aborted.")
+                throw new IllegalStateException("Artifact '${artifactPath}' already exists. Publishing aborted.")
             }
         }
         logger.lifecycle("Artifact does not exist, proceeding with publish.")

gradle.properties

@@ -1,2 +1,2 @@
 #The version of the WilderWorkspace gradle plugin
-workspaceVersion = 4.2.1.0
+workspaceVersion = 4.2.3.0

gradle/libs.versions.toml

@@ -3,8 +3,8 @@ commons_lang_version = "3.17.0"
 commons_text_version = "1.13.0"
 commons_io_version = "2.18.0"
 fabric_loom_version = "1.9.2"
+provider_version = "1.7.1.0"
 log4j_version = "2.24.3"
-provider_version = "1.7.0.0"
 vineflower_version = "1.10.1"
 gson_version = "2.11.0"
 fabric_loader_version = "0.16.9"
@@ -25,4 +25,4 @@ log4j_slf4j2_impl = { module = "org.apache.logging.log4j:log4j-slf4j2-impl", ver
 
 
 [bundles]
-fabric = ["fabric-loader", "fabric-loom", "vineflower", "provider", "log4j-core", "log4j-api", "log4j-slf4j2-impl"]
+fabric = ["fabric-loader", "fabric-loom", "vineflower", "provider", "log4j-core", "log4j-api", "log4j-slf4j2-impl"]

src/main/java/com/wildermods/workspace/WilderWorkspacePluginImpl.java

@@ -33,7 +33,6 @@
 
 import java.io.File;
 import java.io.InputStreamReader;
-import java.net.MalformedURLException;
 import java.net.URL;
 import java.nio.file.Path;
 import java.util.HashSet;
@@ -176,14 +175,16 @@ private void addPluginDependencies(Project project) {
 
 		buildscript.getConfigurations().forEach((config -> {
 			Set<File> dependencies = config.resolve();
-			VisitableURLClassLoader classLoader = (VisitableURLClassLoader) WilderWorkspacePlugin.class.getClassLoader();
-			for(File dependency : dependencies) {
-				try {
+			 
+			try(VisitableURLClassLoader classLoader = (VisitableURLClassLoader) WilderWorkspacePlugin.class.getClassLoader()) {
+				for(File dependency : dependencies) {
 					classLoader.addURL(dependency.toURI().toURL());
-				} catch (MalformedURLException e) {
-					throw new LinkageError("Could not resolve dependency", e);
 				}
 			}
+			catch(Throwable t) {
+					throw new LinkageError("Could not resolve dependency", t);
+			}
+
 		}));
 	}
 

src/main/java/com/wildermods/workspace/tasks/DecompileJarsTask.java

@@ -21,13 +21,6 @@
 import net.fabricmc.loom.decompilers.ClassLineNumbers;
 import net.fabricmc.loom.decompilers.LineNumberRemapper;
 
-/**
- * Task to decompile JAR files and remap their line numbers.
- * <p>
- * This task identifies specific JAR files to decompile, adds other JAR files as libraries, and processes 
- * line number mappings to produce decompiled sources with accurate line numbers.
- * </p>
- */
 public class DecompileJarsTask extends DefaultTask {
 
 	@Input
@@ -43,7 +36,7 @@ public void decompile() throws IOException {
 		DecompilerBuilder b = new DecompilerBuilder(this);
 		b.setDecompDest(Path.of(decompDir));
 		HashMap<String, Path> compiledJars = new HashMap<String, Path>();
-		HashMap<String, Path> lineMappedJarDests = new HashMap<String, Path>();
+		HashMap<String, Path> decompiledJarDests = new HashMap<String, Path>();
 
 		/*
 		 * Add jars to decompile
@@ -68,7 +61,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 					case "wildermyth.jar":
 						System.out.println("Adding " + file.toAbsolutePath().normalize().toString() + " as input for the decompiler.");
 						compiledJars.put(file.getFileName().toString(), file);
-						lineMappedJarDests.put(file.getFileName().toString(), compiledDir.resolve(GameJars.fromPath(file).getPath()));
+						decompiledJarDests.put(file.getFileName().toString(), compiledDir.resolve("remapped").resolve(GameJars.fromPath(file).getPath()));
 						b.addJarsToDecomp(file.normalize().toAbsolutePath());
 						return FileVisitResult.CONTINUE;
 				}
@@ -111,9 +104,9 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO
 		WilderWorkspaceDecompiler decompiler = b.build();
 		decompiler.decompile();
 
-		Path linemapDir = Path.of(decompDir).resolve("linemaps");
+		Path linemapDir = Path.of(decompDir).resolve("decomp").resolve("linemaps");
 		if(Files.exists(linemapDir)) {
-			Files.walkFileTree(Path.of(decompDir).resolve("linemaps"), new SimpleFileVisitor<Path>() {
+			Files.walkFileTree(linemapDir, new SimpleFileVisitor<Path>() {
 				@Override
 				public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
 					if(!dir.equals(linemapDir)) { //there are no subdirectories we want to visit
@@ -130,7 +123,7 @@ public FileVisitResult visitFile(Path linemap, BasicFileAttributes attrs) throws
 					if(Files.exists(unmappedJar)) {
 						System.out.println("Found jar to remap: " + unmappedJar.getFileName());
 						try {
-							remap(linemap, unmappedJar, lineMappedJarDests.get(jarName));
+							remap(linemap, unmappedJar, decompiledJarDests.get(jarName));
 						} catch (Throwable e) {
 							throw new IOException(e);
 						}
@@ -162,7 +155,7 @@ private void remap(Path linemap, Path jarToRemap, Path remappedJarDest) throws T
 		ClassLineNumbers lineNumbers = ClassLineNumbers.readMappings(linemap);
 		LineNumberRemapper remapper = new LineNumberRemapper(lineNumbers);
 		if(Files.notExists(remappedJarDest)) {
-			//Files.createFile(remappedJarDest);
+			Files.createDirectories(remappedJarDest.getParent());
 		}
 		remapper.process(jarToRemap, remappedJarDest);
 	}

src/main/java/com/wildermods/workspace/util/Version.java

@@ -1,5 +1,6 @@
 package com.wildermods.workspace.util;
 
+@SuppressWarnings("rawtypes")
 public class Version implements Comparable {
 
 	private static final String SPLITTER = "\\.";