FIXED: Validating old meta files failed after source changed

CHANGED: Disabled outlet version lookup for now
NikitaCartes-forks · Aug 25, 2023 · c286f52 · c286f52
1 parent 24caa99
commit c286f52
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/main/groovy/com/github/winplay02/RemoteHelper.java b/src/main/groovy/com/github/winplay02/RemoteHelper.java
@@ -100,6 +100,7 @@ public static boolean checksumCheckFileIsValidAndExists(File targetFile, String
 					if (GitCraft.config.checksumRemoveInvalidFiles) {
 						MiscHelper.println("Checksum of %s %s %s is %s, expected %s. The mismatching file will now be removed (checksums mismatch)", fileVerbParticiple, outputFileKind, outputFileId, actualSha1, sha1sum);
 						targetFile.delete();
+						cached_hashes.remove(targetFile);
 						return false;
 					} else {
 						MiscHelper.println("Checksum of %s %s %s is %s, expected %s. (checksums mismatch)", fileVerbParticiple, outputFileKind, outputFileId, actualSha1, sha1sum);

diff --git a/src/main/groovy/dex/mcgitmaker/GitCraft.java b/src/main/groovy/dex/mcgitmaker/GitCraft.java
@@ -73,6 +73,7 @@ public class GitCraft {
 
 	GitCraft() throws IOException, VersionParsingException {
 		this.mcMetadata = new McMetadata();
+		MiscHelper.println("If generated semver is incorrect, it will break the order of the generated repo.\nConsider updating Fabric Loader. (run ./gradlew run --refresh-dependencies)");
 		versions = Util.orderVersionMap(mcMetadata.metadata);
 		nonLinearVersions = Util.nonLinearVersionList(mcMetadata.metadata);
 		MiscHelper.println("Saving updated metadata...");

diff --git a/src/main/groovy/dex/mcgitmaker/Util.java b/src/main/groovy/dex/mcgitmaker/Util.java
@@ -53,7 +53,7 @@ static String fixupSemver(String proposedSemVer) {
 	public static void addLoaderVersion(McVersion mcVersion) {
 		if (mcVersion.loaderVersion == null) {
 			// Attempt lookup in Outlet database as newer MC versions require a loader update
-			Optional<McFabric> v = Outlet.INSTANCE.outletDatabase.getVersions().stream().filter((it) -> Objects.equals(it.getId(), mcVersion.version)).findAny();
+			Optional<McFabric> v = Outlet.INSTANCE.outletDatabase.getVersion(mcVersion);
 			if (v.isPresent()) {
 				mcVersion.loaderVersion = fixupSemver(v.get().getNormalized());
 				MiscHelper.println("Successfully looked up new semver version for: %s as %s", mcVersion.version, mcVersion.loaderVersion);
@@ -77,7 +77,6 @@ public static void addLoaderVersion(McVersion mcVersion) {
 			}
 			mcVersion.loaderVersion = fixupSemver(x.getNormalized());
 			MiscHelper.println("Semver made for: %s as %s", x.getRaw(), mcVersion.loaderVersion);
-			MiscHelper.println("If generated semver is incorrect, it will break the order of the generated repo.\nConsider updating Fabric Loader. (run ./gradlew run --refresh-dependencies)");
 		}
 	}
 

diff --git a/src/main/groovy/dex/mcgitmaker/data/outlet/McOutletMeta.groovy b/src/main/groovy/dex/mcgitmaker/data/outlet/McOutletMeta.groovy
@@ -1,9 +1,14 @@
 package dex.mcgitmaker.data.outlet
 
+import dex.mcgitmaker.data.McVersion
 import groovy.transform.ToString
 
 @ToString
 class McOutletMeta {
 	Date lastChanged
 	ArrayList<McFabric> versions
+
+	Optional<McFabric> getVersion(McVersion version) {
+		return Optional.empty();
+	}
 }