From 64d94e4d682cf335d2f4e89b467e7af3d2d53a93 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Tue, 11 Aug 2020 17:25:20 -0400 Subject: [PATCH] 1.1.10 --- CHANGELOG.md | 3 +++ gradle.properties | 6 +++--- .../modupdater/strategy/CurseForgeStrategy.java | 4 ++-- .../modupdater/strategy/GitHubReleasesStrategy.java | 2 +- .../com/thebrokenrail/modupdater/strategy/JSONStrategy.java | 2 +- .../thebrokenrail/modupdater/strategy/MavenStrategy.java | 2 +- src/main/java/com/thebrokenrail/modupdater/util/Util.java | 4 ++-- 7 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f6f61e9..81f6f6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**1.1.10** +* Improve + **1.1.9** * Add ```modupdater``` Entry-Point diff --git a/gradle.properties b/gradle.properties index b214270..43b3cf2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,17 +2,17 @@ org.gradle.jvmargs = -Xmx1G # Fabric Properties - minecraft_version = 1.16.2 + minecraft_version = 1.16.2-rc2 curseforge_id = 391583 simple_minecraft_version = 1.16.2 yarn_build = 1 fabric_loader_version = 0.9.1+build.205 # Mod Properties - mod_version = 1.1.9 + mod_version = 1.1.10 maven_group = com.thebrokenrail # Dependencies fabric_api_version = 0.17.2+build.396-1.16 - modmenu_version = 1.14.2+build.27 + modmenu_version = 1.14.6+build.31 moshi_version = 1.9.2 diff --git a/src/main/java/com/thebrokenrail/modupdater/strategy/CurseForgeStrategy.java b/src/main/java/com/thebrokenrail/modupdater/strategy/CurseForgeStrategy.java index e513f25..f3e169d 100644 --- a/src/main/java/com/thebrokenrail/modupdater/strategy/CurseForgeStrategy.java +++ b/src/main/java/com/thebrokenrail/modupdater/strategy/CurseForgeStrategy.java @@ -10,7 +10,7 @@ import com.thebrokenrail.modupdater.api.UpdateStrategy; import com.thebrokenrail.modupdater.data.ModUpdate; import com.thebrokenrail.modupdater.util.Util; import net.fabricmc.loader.api.SemanticVersion; -import net.fabricmc.loader.util.version.VersionParsingException; +import net.fabricmc.loader.api.VersionParsingException; import javax.annotation.Nullable; import java.io.IOException; @@ -65,7 +65,7 @@ public class CurseForgeStrategy implements UpdateStrategy { String versionStr; GameVersion version = Util.getMinecraftVersion(); if (version.isStable()) { - versionStr = version.getName(); + versionStr = version.getId(); } else { versionStr = version.getReleaseTarget() + "-Snapshot"; } diff --git a/src/main/java/com/thebrokenrail/modupdater/strategy/GitHubReleasesStrategy.java b/src/main/java/com/thebrokenrail/modupdater/strategy/GitHubReleasesStrategy.java index 60a8f76..5429322 100644 --- a/src/main/java/com/thebrokenrail/modupdater/strategy/GitHubReleasesStrategy.java +++ b/src/main/java/com/thebrokenrail/modupdater/strategy/GitHubReleasesStrategy.java @@ -9,7 +9,7 @@ import com.thebrokenrail.modupdater.api.UpdateStrategy; import com.thebrokenrail.modupdater.data.ModUpdate; import com.thebrokenrail.modupdater.util.Util; import net.fabricmc.loader.api.SemanticVersion; -import net.fabricmc.loader.util.version.VersionParsingException; +import net.fabricmc.loader.api.VersionParsingException; import javax.annotation.Nullable; import java.io.IOException; diff --git a/src/main/java/com/thebrokenrail/modupdater/strategy/JSONStrategy.java b/src/main/java/com/thebrokenrail/modupdater/strategy/JSONStrategy.java index afcbf8a..f45f474 100644 --- a/src/main/java/com/thebrokenrail/modupdater/strategy/JSONStrategy.java +++ b/src/main/java/com/thebrokenrail/modupdater/strategy/JSONStrategy.java @@ -61,7 +61,7 @@ public class JSONStrategy implements UpdateStrategy { return null; } - String version = Util.getMinecraftVersion().getName(); + String version = Util.getMinecraftVersion().getId(); if (map.containsKey(version)) { LatestVersionEntry entry = map.get(version); if (!oldVersion.equals(entry.version)) { diff --git a/src/main/java/com/thebrokenrail/modupdater/strategy/MavenStrategy.java b/src/main/java/com/thebrokenrail/modupdater/strategy/MavenStrategy.java index 9e96af1..c514c35 100644 --- a/src/main/java/com/thebrokenrail/modupdater/strategy/MavenStrategy.java +++ b/src/main/java/com/thebrokenrail/modupdater/strategy/MavenStrategy.java @@ -6,7 +6,7 @@ import com.thebrokenrail.modupdater.api.UpdateStrategy; import com.thebrokenrail.modupdater.data.ModUpdate; import com.thebrokenrail.modupdater.util.Util; import net.fabricmc.loader.api.SemanticVersion; -import net.fabricmc.loader.util.version.VersionParsingException; +import net.fabricmc.loader.api.VersionParsingException; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; diff --git a/src/main/java/com/thebrokenrail/modupdater/util/Util.java b/src/main/java/com/thebrokenrail/modupdater/util/Util.java index e309d06..038175a 100644 --- a/src/main/java/com/thebrokenrail/modupdater/util/Util.java +++ b/src/main/java/com/thebrokenrail/modupdater/util/Util.java @@ -75,13 +75,13 @@ public class Util { if (parts.length > 1) { return String.format("%s.%s", parts[0], parts[1]); } else { - return minecraftVersion.getName(); + return minecraftVersion.getId(); } } private static boolean isVersionCompatible(String versionStr, char prefix, boolean strict) { updateMinecraftVersion(); - return versionStr.endsWith(prefix + minecraftVersionSemantic) || versionStr.endsWith(prefix + minecraftVersion.getName()) || (!strict && (versionStr.endsWith(prefix + minecraftVersion.getReleaseTarget()) || versionStr.endsWith(prefix + getMajorVersion()))); + return versionStr.endsWith(prefix + minecraftVersionSemantic) || versionStr.endsWith(prefix + minecraftVersion.getId()) || (!strict && (versionStr.endsWith(prefix + minecraftVersion.getReleaseTarget()) || versionStr.endsWith(prefix + getMajorVersion()))); } public static boolean isVersionCompatible(String id, String versionStr, boolean strict) {