reformat code

This commit is contained in:
FalsePattern committed 2022-06-08 16:01:06 +02:00
1 parent c4248f7100
commit 025b47669f
21 files changed
+731 -498

No files matched your search

@@ -1,15 +1,15 @@
package com.falsepattern.lib.dependencies;
import com.falsepattern.lib.StableAPI;
import lombok.NonNull;
import lombok.val;
import java.util.Arrays;
import java.util.stream.Collectors;
import lombok.NonNull;
import lombok.val;
@StableAPI(since = "0.6.0")
public class ComplexVersion extends Version {
final Version[] versions;
public ComplexVersion(@NonNull Version mainVersion, Version... subVersions) {
this.versions = new Version[subVersions.length + 1];
this.versions[0] = mainVersion;
@@ -23,7 +23,9 @@ public class ComplexVersion extends Version {
int count = Math.min(versions.length, other.versions.length);
for (int i = 0; i < count; i++) {
val result = versions[i].compareTo(other.versions[i]);
if (result != 0) return result;
if (result != 0) {
return result;
}
}
if (versions.length != other.versions.length) {
return versions.length - other.versions.length;
@@ -3,16 +3,22 @@ package com.falsepattern.lib.dependencies;
import com.falsepattern.lib.StableAPI;
import com.falsepattern.lib.internal.CoreLoadingPlugin;
import com.falsepattern.lib.internal.FalsePatternLib;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.net.ssl.HttpsURLConnection;
import lombok.NonNull;
import lombok.val;
import lombok.var;
import net.minecraft.launchwrapper.LaunchClassLoader;
import javax.net.ssl.HttpsURLConnection;
import java.io.*;
import java.net.URL;
import java.util.*;
@StableAPI(since = "0.6.0")
public class DependencyLoader {
@@ -25,39 +31,66 @@ public class DependencyLoader {
mavenRepositories.add(url);
}
public static void loadLibrary(String loadingModId, String groupId, String artifactId, @NonNull Version minVersion, Version maxVersion, @NonNull Version preferredVersion, String regularSuffix, String devSuffix) {
public static void loadLibrary(String loadingModId,
String groupId,
String artifactId,
@NonNull Version minVersion,
Version maxVersion,
@NonNull Version preferredVersion,
String regularSuffix,
String devSuffix) {
val suffix = FalsePatternLib.isDeveloperEnvironment() ? devSuffix : regularSuffix;
FalsePatternLib.getLog().info("Adding library {}:{}:{}{}, requested by mod {}", groupId, artifactId, preferredVersion, suffix != null ? "-" + suffix : "", loadingModId);
FalsePatternLib.getLog()
.info("Adding library {}:{}:{}{}, requested by mod {}",
groupId,
artifactId,
preferredVersion,
suffix != null ? "-" + suffix : "",
loadingModId);
var artifact = groupId + ":" + artifactId + ":" + suffix;
if (loadedLibraries.containsKey(artifact)) {
val currentVer = loadedLibraries.get(artifact);
if (currentVer.equals(preferredVersion)) return;
if (currentVer.equals(preferredVersion)) {
return;
}
val rangeString = "(minimum: " + minVersion + (maxVersion == null ? "" : ", maximum: " + maxVersion) + ")";
if (minVersion.compareTo(currentVer) > 0 || (maxVersion != null && maxVersion.compareTo(currentVer) < 0)) {
for (int i = 0; i < 16; i++) {
FalsePatternLib.getLog().fatal("ALERT VVVVVVVVVVVV ALERT");
}
FalsePatternLib.getLog().fatal("Library {}:{}{} already loaded with version {}, " +
"but a version in the range {} was requested! Thing may go horribly wrong! " +
"Requested by mod: {}, previously loaded by mod: {}",
groupId, artifactId, suffix != null ? ":" + suffix : "", currentVer,
rangeString,
loadingModId, loadedLibraryMods.get(artifact));
FalsePatternLib.getLog()
.fatal("Library {}:{}{} already loaded with version {}, " +
"but a version in the range {} was requested! Thing may go horribly wrong! " +
"Requested by mod: {}, previously loaded by mod: {}",
groupId,
artifactId,
suffix != null ? ":" + suffix : "",
currentVer,
rangeString,
loadingModId,
loadedLibraryMods.get(artifact));
for (int i = 0; i < 16; i++) {
FalsePatternLib.getLog().fatal("ALERT ^^^^^^^^^^^^ ALERT");
}
} else {
FalsePatternLib.getLog().info("Attempted loading of library {}:{}{} with preferred version {}, " +
"but version {} was already loaded, which matched the range {}. This is not an error. " +
"Requested by mod: {}, previously loaded by mod: {}",
groupId, artifactId, suffix != null ? ":" + suffix : "", preferredVersion,
currentVer, rangeString,
loadingModId, loadedLibraryMods.get(artifact));
FalsePatternLib.getLog()
.info("Attempted loading of library {}:{}{} with preferred version {}, " +
"but version {} was already loaded, which matched the range {}. This is not an " +
"error. " + "Requested by mod: {}, previously loaded by mod: {}",
groupId,
artifactId,
suffix != null ? ":" + suffix : "",
preferredVersion,
currentVer,
rangeString,
loadingModId,
loadedLibraryMods.get(artifact));
}
return;
}
val modsDir = new File(CoreLoadingPlugin.mcDir, "mods");
val mavenJarName = String.format("%s-%s%s.jar", artifactId, preferredVersion, (suffix != null) ? ("-" + suffix) : "");
val mavenJarName =
String.format("%s-%s%s.jar", artifactId, preferredVersion, (suffix != null) ? ("-" + suffix) : "");
val jarName = groupId + "-" + mavenJarName;
val libDir = new File(modsDir, "falsepattern");
if (!libDir.exists()) {
@@ -68,37 +101,74 @@ public class DependencyLoader {
try {
addToClasspath(file);
loadedLibraries.put(artifact, preferredVersion);
FalsePatternLib.getLog().info("Library {}:{}:{}{} successfully loaded from disk!", groupId, artifactId, preferredVersion, (suffix != null) ? ":" + suffix : "");
FalsePatternLib.getLog()
.info("Library {}:{}:{}{} successfully loaded from disk!",
groupId,
artifactId,
preferredVersion,
(suffix != null) ? ":" + suffix : "");
return;
} catch (RuntimeException e) {
FalsePatternLib.getLog().warn("Failed to load library {}:{}:{}{} from file! Redownloading...", groupId, artifactId, preferredVersion, (suffix != null) ? ":" + suffix : "");
FalsePatternLib.getLog()
.warn("Failed to load library {}:{}:{}{} from file! Redownloading...",
groupId,
artifactId,
preferredVersion,
(suffix != null) ? ":" + suffix : "");
file.delete();
}
}
for (var repo: mavenRepositories) {
for (var repo : mavenRepositories) {
try {
if (!repo.endsWith("/")) repo = repo + "/";
val url = new URL(String.format("%s%s/%s/%s/%s", repo, groupId.replace('.', '/'), artifactId, preferredVersion, mavenJarName));
if (!repo.endsWith("/")) {
repo = repo + "/";
}
val url = new URL(String.format("%s%s/%s/%s/%s",
repo,
groupId.replace('.', '/'),
artifactId,
preferredVersion,
mavenJarName));
val connection = (HttpsURLConnection) url.openConnection();
connection.setConnectTimeout(1500);
connection.setReadTimeout(1500);
connection.setRequestProperty("User-Agent", "FalsePatternLib Downloader");
if (connection.getResponseCode() != 200) {
FalsePatternLib.getLog().info("Artifact {}:{}:{}{} was not found on repo {}", groupId, artifactId, preferredVersion, (suffix != null) ? ":" + suffix : "", repo);
FalsePatternLib.getLog()
.info("Artifact {}:{}:{}{} was not found on repo {}",
groupId,
artifactId,
preferredVersion,
(suffix != null) ? ":" + suffix : "",
repo);
connection.disconnect();
continue;
}
FalsePatternLib.getLog().info("Downloading {}:{}:{}{} from {}", groupId, artifactId, preferredVersion, (suffix != null) ? ":" + suffix : "", repo);
FalsePatternLib.getLog()
.info("Downloading {}:{}:{}{} from {}",
groupId,
artifactId,
preferredVersion,
(suffix != null) ? ":" + suffix : "",
repo);
download(connection.getInputStream(), file);
FalsePatternLib.getLog().info("Downloaded {}:{}:{}{}", groupId, artifactId, preferredVersion, (suffix != null) ? ":" + suffix : "");
FalsePatternLib.getLog()
.info("Downloaded {}:{}:{}{}",
groupId,
artifactId,
preferredVersion,
(suffix != null) ? ":" + suffix : "");
loadedLibraries.put(artifact, preferredVersion);
loadedLibraryMods.put(artifact, loadingModId);
addToClasspath(file);
return;
} catch (IOException ignored) {}
} catch (IOException ignored) {
}
}
val errorMessage = "Failed to download library " + groupId + ":" + artifactId + ":" + preferredVersion + ((suffix != null) ? ":" + suffix : "") + " from any repository! Requested by mod: " + loadingModId;
val errorMessage = "Failed to download library " + groupId + ":" + artifactId + ":" + preferredVersion +
((suffix != null) ? ":" + suffix : "") + " from any repository! Requested by mod: " +
loadingModId;
FalsePatternLib.getLog().fatal(errorMessage);
throw new IllegalStateException(errorMessage);
}
@@ -114,7 +184,9 @@ public class DependencyLoader {
}
private static void download(InputStream is, File target) throws IOException {
if (target.exists()) return;
if (target.exists()) {
return;
}
var bytesRead = 0;
@@ -1,25 +1,23 @@
package com.falsepattern.lib.dependencies;
import com.falsepattern.lib.StableAPI;
import java.util.Objects;
import lombok.Builder;
import lombok.Getter;
import lombok.NonNull;
import lombok.val;
import java.util.Objects;
@StableAPI(since = "0.6.0")
public class SemanticVersion extends Version {
@Getter
private final int majorVersion;
@Getter
private final int minorVersion;
@Getter
private final int patchVersion;
@Getter
private final String preRelease;
@Getter
private final String build;
@Getter private final int majorVersion;
@Getter private final int minorVersion;
@Getter private final int patchVersion;
@Getter private final String preRelease;
@Getter private final String build;
public SemanticVersion(int majorVersion, int minorVersion, int patchVersion, String preRelease) {
this(majorVersion, minorVersion, patchVersion, preRelease, null);
}
@Builder
public SemanticVersion(int majorVersion, int minorVersion, int patchVersion, String preRelease, String build) {
@@ -32,10 +30,6 @@ public class SemanticVersion extends Version {
this.build = "".equals(build) ? null : build;
}
public SemanticVersion(int majorVersion, int minorVersion, int patchVersion, String preRelease) {
this(majorVersion, minorVersion, patchVersion, preRelease, null);
}
public SemanticVersion(int majorVersion, int minorVersion, int patchVersion) {
this(majorVersion, minorVersion, patchVersion, null, null);
}
@@ -43,7 +37,7 @@ public class SemanticVersion extends Version {
@Override
public int compareTo(@NonNull Version o) {
if (o instanceof ComplexVersion) {
val result = this.compareTo(((ComplexVersion)o).versions[0]);
val result = this.compareTo(((ComplexVersion) o).versions[0]);
if (result != 0) {
return result;
} else if (((ComplexVersion) o).versions.length > 1) {
@@ -52,7 +46,7 @@ public class SemanticVersion extends Version {
return 0;
}
} else if (o instanceof SemanticVersion) {
val other = (SemanticVersion)o;
val other = (SemanticVersion) o;
if (majorVersion != other.majorVersion) {
return majorVersion - other.majorVersion;
} else if (minorVersion != other.minorVersion) {
@@ -75,6 +69,7 @@ public class SemanticVersion extends Version {
@Override
public String toString() {
return majorVersion + "." + minorVersion + "." + patchVersion + (preRelease == null ? "" : "-" + preRelease) + (build == null ? "" : "+" + build);
return majorVersion + "." + minorVersion + "." + patchVersion + (preRelease == null ? "" : "-" + preRelease) +
(build == null ? "" : "+" + build);
}
}
@@ -4,15 +4,18 @@ import com.falsepattern.lib.StableAPI;
@StableAPI(since = "0.6.0")
public abstract class Version implements Comparable<Version> {
protected Version(){}
public boolean equals(Version other) {
return compareTo(other) == 0;
protected Version() {
}
@Override
public boolean equals(Object obj) {
if (!(obj instanceof Version)) return false;
if (!(obj instanceof Version)) {
return false;
}
return equals((Version) obj);
}
public boolean equals(Version other) {
return compareTo(other) == 0;
}
}