Made most of the code loader agnostic, better support for relative paths

Author: LatvianModder

src/main/java/dev/latvian/mods/packsync/Checksum.java

@@ -1,7 +1,7 @@
 package dev.latvian.mods.packsync;
 
-import net.neoforged.fml.ModLoadingIssue;
-import net.neoforged.neoforgespi.IIssueReporting;
+import dev.latvian.mods.packsync.platform.Issue;
+import dev.latvian.mods.packsync.platform.PackSyncPlatformContext;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -28,7 +28,7 @@ static ByteBuffer allocateTempBuffer(int maxBufferSize, long fileSize) {
 		return ByteBuffer.allocate(Math.min(maxBufferSize, (int) Math.min(Integer.MAX_VALUE, fileSize)));
 	}
 
-	static String checksum(Path path, String algorithm, IIssueReporting issues) {
+	static String checksum(PackSyncPlatformContext context, Path path, String algorithm) {
 		if (Files.notExists(path)) {
 			return "";
 		}
@@ -45,17 +45,17 @@ static String checksum(Path path, String algorithm, IIssueReporting issues) {
 
 			return toHex(md.digest());
 		} catch (Exception ex) {
-			issues.addIssue(ModLoadingIssue.error("Failed to read checksum of file %s!", path.getFileName().toString()).withCause(ex).withAffectedPath(path));
+			context.addIssue(Issue.error("Failed to read checksum of file %s!", path.getFileName().toString()).cause(ex).path(path));
 		}
 
 		return "";
 	}
 
-	static String md5(Path path, IIssueReporting issues) {
-		return checksum(path, "MD5", issues);
+	static String md5(PackSyncPlatformContext context, Path path) {
+		return checksum(context, path, "MD5");
 	}
 
-	static String sha512(Path path, IIssueReporting issues) {
-		return checksum(path, "SHA-512", issues);
+	static String sha512(PackSyncPlatformContext context, Path path) {
+		return checksum(context, path, "SHA-512");
 	}
 }

src/main/java/dev/latvian/mods/packsync/FileInfo.java

@@ -1,7 +1,7 @@
 package dev.latvian.mods.packsync;
 
 import com.google.gson.JsonObject;
-import net.neoforged.neoforgespi.IIssueReporting;
+import dev.latvian.mods.packsync.platform.PackSyncPlatformContext;
 import org.jetbrains.annotations.NotNull;
 
 import java.nio.file.Path;
@@ -25,8 +25,8 @@ public FileInfo(String filename, long size) {
 		this("", filename, size, Artifact.NONE);
 	}
 
-	public boolean isEqual(Path path, IIssueReporting issues) {
-		return size == PackSync.size(path) && checksum.equals(Checksum.md5(path, issues));
+	public boolean isEqual(PackSyncPlatformContext context, Path path) {
+		return size == PackSync.size(path) && checksum.equals(Checksum.md5(context, path));
 	}
 
 	public void write(JsonObject json) {

src/main/java/dev/latvian/mods/packsync/PackSync.java

@@ -1,7 +1,7 @@
 package dev.latvian.mods.packsync;
 
 import com.google.gson.JsonObject;
-import net.neoforged.neoforgespi.IIssueReporting;
+import dev.latvian.mods.packsync.platform.PackSyncPlatformContext;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -25,7 +25,7 @@ public RemoteFile(JsonObject json) {
 		);
 	}
 
-	public boolean replace(Path path, IIssueReporting issues) {
-		return lazy ? Files.notExists(path) : !fileInfo.isEqual(path, issues);
+	public boolean replace(PackSyncPlatformContext context, Path path) {
+		return lazy ? Files.notExists(path) : !fileInfo.isEqual(context, path);
 	}
 }

src/main/java/dev/latvian/mods/packsync/RemoteFile.java

@@ -0,0 +1,37 @@
+package dev.latvian.mods.packsync.platform;
+
+import java.nio.file.Path;
+
+public class Issue {
+	public static Issue error(String message, Object... args) {
+		var issue = new Issue();
+		issue.warning = false;
+		issue.message = message;
+		issue.args = args;
+		return issue;
+	}
+
+	public static Issue warning(String message, Object... args) {
+		var issue = new Issue();
+		issue.warning = true;
+		issue.message = message;
+		issue.args = args;
+		return issue;
+	}
+
+	public boolean warning;
+	public String message;
+	public Object[] args;
+	public Throwable cause;
+	public Path path;
+
+	public Issue cause(Throwable cause) {
+		this.cause = cause;
+		return this;
+	}
+
+	public Issue path(Path path) {
+		this.path = path;
+		return this;
+	}
+}

src/main/java/dev/latvian/mods/packsync/platform/Issue.java

@@ -0,0 +1,73 @@
+package dev.latvian.mods.packsync.platform;
+
+import dev.latvian.mods.packsync.PackSync;
+import net.neoforged.fml.ModLoadingIssue;
+import net.neoforged.fml.loading.FMLLoader;
+import net.neoforged.fml.loading.FMLPaths;
+import net.neoforged.neoforgespi.ILaunchContext;
+import net.neoforged.neoforgespi.locating.IDiscoveryPipeline;
+import net.neoforged.neoforgespi.locating.IModFileCandidateLocator;
+import net.neoforged.neoforgespi.locating.IncompatibleFileReporting;
+import net.neoforged.neoforgespi.locating.ModFileDiscoveryAttributes;
+
+import java.nio.file.Path;
+
+public class PackSyncModFileCandidateLocator implements IModFileCandidateLocator {
+	private record NeoForgeContext(ILaunchContext context, IDiscoveryPipeline pipeline) implements PackSyncPlatformContext {
+		@Override
+		public void addIssue(Issue issue) {
+			pipeline.addIssue((issue.warning ? ModLoadingIssue.warning(issue.message, issue.args) : ModLoadingIssue.error(issue.message, issue.args)).withAffectedPath(issue.path).withCause(issue.cause));
+		}
+
+		@Override
+		public String getMinecraftVersion() {
+			return context.getVersions().mcVersion();
+		}
+
+		@Override
+		public String getLoaderVersion() {
+			return context.getVersions().neoFormVersion() + "/" + context.getVersions().neoForgeVersion();
+		}
+
+		@Override
+		public String getDataVersion() {
+			// FIXME: Figure out how to get SharedConstants.getCurrentVersion().getDataVersion().getVersion()
+			return "4325";
+		}
+
+		@Override
+		public boolean isDev() {
+			return !FMLLoader.getCurrent().isProduction();
+		}
+
+		@Override
+		public boolean isServer() {
+			return context.getRequiredDistribution().isDedicatedServer();
+		}
+
+		@Override
+		public Path getGameDirectory() {
+			return FMLPaths.GAMEDIR.get();
+		}
+
+		@Override
+		public Path getModsDirectory() {
+			return FMLPaths.MODSDIR.get();
+		}
+
+		@Override
+		public void addPath(Path path) {
+			pipeline.addPath(path, ModFileDiscoveryAttributes.DEFAULT, IncompatibleFileReporting.WARN_ALWAYS);
+		}
+	}
+
+	@Override
+	public void findCandidates(ILaunchContext context, IDiscoveryPipeline pipeline) {
+		PackSync.load(new NeoForgeContext(context, pipeline));
+	}
+
+	@Override
+	public String toString() {
+		return "PackSync";
+	}
+}

src/main/java/dev/latvian/mods/packsync/platform/PackSyncModFileCandidateLocator.java

@@ -0,0 +1,29 @@
+package dev.latvian.mods.packsync.platform;
+
+import java.nio.file.Path;
+
+public interface PackSyncPlatformContext {
+	void addIssue(Issue issue);
+
+	String getMinecraftVersion();
+
+	String getLoaderVersion();
+
+	String getDataVersion();
+
+	boolean isDev();
+
+	boolean isServer();
+
+	Path getGameDirectory();
+
+	default Path getModsDirectory() {
+		return getGameDirectory().resolve("mods");
+	}
+
+	default Path getLocalDirectory() {
+		return getGameDirectory().resolve("local");
+	}
+
+	void addPath(Path path);
+}

src/main/java/dev/latvian/mods/packsync/platform/PackSyncPlatformContext.java

@@ -1 +1 @@
-dev.latvian.mods.packsync.PackSync
+dev.latvian.mods.packsync.platform.PackSyncModFileCandidateLocator