V2 update. servers.dat merging, file repository, less crashes

Author: LatvianModder

build.gradle

@@ -5,17 +5,17 @@ plugins {
 	id 'java'
 	id 'idea'
 	id 'maven-publish'
-	id 'net.neoforged.moddev' version "2.0.75"
+	id 'net.neoforged.moddev' version "2.0.118"
 }
 
 ext.ENV = System.getenv()
 def isLocal = !ENV.containsKey("GITHUB_RUN_NUMBER")
 
 version = "${mod_version}-${isLocal ? "local.${Instant.now().epochSecond}" : "build.${ENV.GITHUB_RUN_NUMBER}"}"
 group = project.maven_group
-base.archivesBaseName = project.archives_base_name
+base.archivesName = project.archives_base_name
 
-println("Building version: ${version}")
+println("Building version: $version")
 
 neoForge {
 	version = project.neoforge_version
@@ -76,6 +76,13 @@ repositories {
 		url "https://maven.neoforged.net/releases"
 	}
 
+	maven {
+		url = 'https://maven.latvian.dev/releases'
+		content {
+			includeGroup "dev.latvian.apps"
+		}
+	}
+
 	maven {
 		name = 'ParchmentMC'
 		url = 'https://maven.parchmentmc.org'

gradle.properties

@@ -8,8 +8,8 @@ mod_name=Pack Sync
 maven_group=dev.latvian.mods
 mod_author=latvian.dev
 
-mod_version=2104.1.0
+mod_version=2104.1.1
 
-neoforge_version=21.4.124
-neoForge.parchment.minecraftVersion=1.21.4
-neoForge.parchment.mappingsVersion=2025.03.23
+neoforge_version=21.5.95
+neoForge.parchment.minecraftVersion=1.21.5
+neoForge.parchment.mappingsVersion=2025.06.15

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

@@ -0,0 +1,47 @@
+package dev.latvian.mods.packsync;
+
+import net.neoforged.fml.ModLoadingIssue;
+import net.neoforged.neoforgespi.IIssueReporting;
+
+import java.io.BufferedInputStream;
+import java.math.BigInteger;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.security.MessageDigest;
+
+public interface Checksum {
+	static String checksum(Path path, String algorithm, String format, IIssueReporting issues) {
+		if (Files.notExists(path)) {
+			return "";
+		}
+
+		try (var in = new BufferedInputStream(Files.newInputStream(path))) {
+			var md = MessageDigest.getInstance(algorithm);
+			var tempBuffer = new byte[32768];
+
+			while (true) {
+				int len = in.read(tempBuffer);
+
+				if (len >= 0) {
+					md.update(tempBuffer, 0, len);
+				} else {
+					break;
+				}
+			}
+
+			return format.formatted(new BigInteger(1, md.digest()));
+		} catch (Exception ex) {
+			issues.addIssue(ModLoadingIssue.error("Failed to read checksum of file %s!", path.getFileName().toString()).withCause(ex).withAffectedPath(path));
+		}
+
+		return "";
+	}
+
+	static String md5(Path path, IIssueReporting issues) {
+		return checksum(path, "MD5", "%032x", issues);
+	}
+
+	static String sha512(Path path, IIssueReporting issues) {
+		return checksum(path, "SHA-512", "%0128x", issues);
+	}
+}

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

@@ -0,0 +1,46 @@
+package dev.latvian.mods.packsync;
+
+import com.google.gson.JsonObject;
+import net.neoforged.neoforgespi.IIssueReporting;
+
+import java.nio.file.Path;
+
+public record FileInfo(
+	String checksum,
+	String filename,
+	long size,
+	String artifact,
+	String version
+) {
+	public FileInfo(JsonObject json) {
+		this(
+			json.get("checksum").getAsString(),
+			json.get("filename").getAsString(),
+			json.get("size").getAsLong(),
+			json.has("artifact") ? json.get("artifact").getAsString() : "",
+			json.has("version") ? json.get("version").getAsString() : ""
+		);
+	}
+
+	public FileInfo(String filename, long size) {
+		this("", filename, size, "", "");
+	}
+
+	public boolean isEqual(Path path, IIssueReporting issues) {
+		return size == PackSync.size(path) && checksum.equals(Checksum.md5(path, issues));
+	}
+
+	public void toJson(JsonObject json) {
+		json.addProperty("checksum", checksum);
+		json.addProperty("filename", filename);
+		json.addProperty("size", size);
+
+		if (!artifact.isEmpty()) {
+			json.addProperty("artifact", artifact);
+		}
+
+		if (!version.isEmpty()) {
+			json.addProperty("version", version);
+		}
+	}
+}