Skip to content

Fix #1165: Ensure that version checker always finds a higher version #1184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2025
Merged

Fix #1165: Ensure that version checker always finds a higher version #1184

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 42 additions & 34 deletions src/client/java/aztech/modern_industrialization/misc/version/VersionEvents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.net.URL;
import java.net.URLConnection;
import java.text.SimpleDateFormat;
Expand All @@ -43,7 +45,9 @@
import net.neoforged.fml.ModList;
import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent;
import net.neoforged.neoforge.common.NeoForge;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

public class VersionEvents {

Expand All @@ -58,16 +62,15 @@ public int compareTo(@NotNull VersionEvents.Version o) {
}
}

private static Version fetchVersion(boolean isIncludeAlphaVersion) throws Exception {
@Nullable
private static Version fetchLatestVersion(boolean isIncludeAlphaVersion) throws Exception {
String mcVersion = ModList.get().getModContainerById("minecraft").get().getModInfo().getVersion().toString();

URLConnection connection;
connection = new URL(url).openConnection();
try (Scanner scanner = new Scanner(connection.getInputStream())) {
PriorityQueue<Version> queue = new PriorityQueue<>();
URLConnection connection = new URL(url).openConnection();
try (var reader = new BufferedReader(new InputStreamReader(connection.getInputStream()))) {
JsonObject jo = (JsonObject) JsonParser.parseReader(reader);

String response = scanner.useDelimiter("\\A").next();
JsonObject jo = (JsonObject) JsonParser.parseString(response);
List<Version> versions = new ArrayList<>();

for (JsonElement file : jo.getAsJsonArray("files")) {
JsonObject fileAsJsonObject = file.getAsJsonObject();
Expand All @@ -88,45 +91,50 @@ private static Version fetchVersion(boolean isIncludeAlphaVersion) throws Except
String date = fileAsJsonObject.get("uploaded_at").getAsString();

if (isIncludeAlphaVersion || !type.equals(alphaPostfix)) {
queue.add(new Version(name, url, format.parse(date)));
versions.add(new Version(name, url, format.parse(date)));
}
}

if (!queue.isEmpty()) {
return queue.poll();
if (!versions.isEmpty()) {
return Collections.min(versions);
}

}
return null;
}

public static void startVersionCheck(ModContainer miContainer, LocalPlayer player) {
new Thread(() -> {
try {
if (MIClientConfig.INSTANCE.newVersionMessage.getAsBoolean()) {
String currentVersion = miContainer.getModInfo().getVersion().toString();
Version lastVersion = fetchVersion(currentVersion.contains(alphaPostfix));

if (lastVersion != null) {
String lastVersionString = lastVersion.name.replaceFirst("Modern Industrialization v", "").strip();

if (!lastVersionString.equals(currentVersion)) {
String url = lastVersion.url;

Style styleClick = Style.EMPTY.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url))
.applyFormat(ChatFormatting.UNDERLINE).applyFormat(ChatFormatting.GREEN).withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT, MIText.ClickUrl.text()));

Minecraft.getInstance().execute(() -> {
if (Minecraft.getInstance().player == player) {
player.displayClientMessage(
MIText.NewVersion.text(lastVersionString,
MIText.CurseForge.text().setStyle(styleClick)),
false);
}
});
if (!MIClientConfig.INSTANCE.newVersionMessage.getAsBoolean()) {
return;
}

String currentVersionString = miContainer.getModInfo().getVersion().toString();
var currentVersion = new DefaultArtifactVersion(currentVersionString);
var latestVersion = fetchLatestVersion(currentVersionString.contains(alphaPostfix));

if (latestVersion == null) {
return;
}

String latestVersionString = latestVersion.name.replaceFirst("Modern Industrialization v", "").strip();
var latestArtifactVersion = new DefaultArtifactVersion(latestVersionString);

if (latestArtifactVersion.compareTo(currentVersion) > 0) {
String url = latestVersion.url;

Style styleClick = Style.EMPTY.withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, url))
.applyFormat(ChatFormatting.UNDERLINE).applyFormat(ChatFormatting.GREEN).withHoverEvent(new HoverEvent(
HoverEvent.Action.SHOW_TEXT, MIText.ClickUrl.text()));

Minecraft.getInstance().execute(() -> {
if (Minecraft.getInstance().player == player) {
player.displayClientMessage(
MIText.NewVersion.text(latestVersionString,
MIText.CurseForge.text().setStyle(styleClick)),
false);
}
}
});
}
} catch (Exception e) {
MI.LOGGER.error("Failed to get release information from Curseforge.", e);
Expand Down
Loading