diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 220770fec..7a919f65d 100755 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -47,6 +47,7 @@ String mavenArtifactId = name task generateSources(type: Copy) { from 'src/main/java' + from 'src/core/java' into "$buildDir/generated-src" filter(org.apache.tools.ant.filters.ReplaceTokens, tokens: [ 'HELLO_MINECRAFT_LAUNCHER_VERSION_FOR_GRADLE_REPLACING': mavenVersion diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java index 2f091535c..c1fb867ba 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/asset/AssetsIndex.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.asset; +import com.google.gson.annotations.SerializedName; import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; @@ -29,7 +30,11 @@ import java.util.Set; public class AssetsIndex { public static final String DEFAULT_ASSET_NAME = "legacy"; + + @SerializedName("objects") public Map objects; + + @SerializedName("virtual") public boolean virtual; public AssetsIndex() { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java index 2d4390c9f..fdacf1f93 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/auth/yggdrasil/Response.java @@ -17,14 +17,24 @@ */ package org.jackhuang.hellominecraft.launcher.core.auth.yggdrasil; +import com.google.gson.annotations.SerializedName; + public class Response { - public String accessToken, clientToken; + @SerializedName("accessToken") + public String accessToken; + @SerializedName("clientToken") + public String clientToken; + @SerializedName("selectedProfile") public GameProfile selectedProfile; + @SerializedName("availableProfiles") public GameProfile[] availableProfiles; + @SerializedName("user") public User user; - + @SerializedName("error") public String error; + @SerializedName("errorMessage") public String errorMessage; + @SerializedName("cause") public String cause; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java index 5ce82cade..ddee725cd 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/download/MinecraftRemoteVersions.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.download; +import com.google.gson.annotations.SerializedName; import java.util.ArrayList; import org.jackhuang.hellominecraft.util.C; import org.jackhuang.hellominecraft.util.NetUtils; @@ -28,7 +29,9 @@ import org.jackhuang.hellominecraft.util.OverridableSwingWorker; */ public class MinecraftRemoteVersions { + @SerializedName("versions") public ArrayList versions; + @SerializedName("latest") public MinecraftRemoteLatestVersion latest; private static volatile MinecraftRemoteVersions INSTANCE = null; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java index dc066ae24..eadf7b065 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/Install.java @@ -17,20 +17,31 @@ */ package org.jackhuang.hellominecraft.launcher.core.install.forge; +import com.google.gson.annotations.SerializedName; + /** * * @author huangyuhui */ public class Install { + @SerializedName("profileName") private String profileName; + @SerializedName("target") private String target; + @SerializedName("path") private String path; + @SerializedName("version") private String version; + @SerializedName("filePath") private String filePath; + @SerializedName("welcome") private String welcome; + @SerializedName("minecraft") private String minecraft; + @SerializedName("mirrorList") private String mirrorList; + @SerializedName("logo") private String logo; public Install() { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java index bab9a917b..a282fbe03 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/forge/MinecraftForgeVersionRoot.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.install.forge; +import com.google.gson.annotations.SerializedName; import java.util.Map; /** @@ -25,8 +26,22 @@ import java.util.Map; */ public class MinecraftForgeVersionRoot { - public String artifact, webpath, adfly, homepage, name; - public Map branches, mcversion; + @SerializedName("artifact") + public String artifact; + @SerializedName("webpath") + public String webpath; + @SerializedName("adfly") + public String adfly; + @SerializedName("homepage") + public String homepage; + @SerializedName("name") + public String name; + @SerializedName("branches") + public Map branches; + @SerializedName("mcversion") + public Map mcversion; + @SerializedName("promos") public Map promos; + @SerializedName("number") public Map number; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java index f7fac6370..f6539c365 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderMCVersions.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.install.liteloader; +import com.google.gson.annotations.SerializedName; import java.util.Map; /** @@ -25,5 +26,6 @@ import java.util.Map; */ public class LiteLoaderMCVersions { + @SerializedName("artefacts") public Map> artefacts; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java index 472e4d8c2..a1f5fdb73 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersion.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.install.liteloader; +import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; /** @@ -25,6 +26,16 @@ import org.jackhuang.hellominecraft.launcher.core.version.MinecraftLibrary; */ public class LiteLoaderVersion { - public String tweakClass, file, version, md5, timestamp; + @SerializedName("tweakClass") + public String tweakClass; + @SerializedName("file") + public String file; + @SerializedName("version") + public String version; + @SerializedName("md5") + public String md5; + @SerializedName("timestamp") + public String timestamp; + @SerializedName("libraries") public MinecraftLibrary[] libraries; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java index 0f1d15d42..ee7a991e6 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsMeta.java @@ -17,13 +17,20 @@ */ package org.jackhuang.hellominecraft.launcher.core.install.liteloader; +import com.google.gson.annotations.SerializedName; + /** * * @author huangyuhui */ public class LiteLoaderVersionsMeta { - private String description, authors, url; + @SerializedName("versions") + private String description; + @SerializedName("authors") + private String authors; + @SerializedName("url") + private String url; public LiteLoaderVersionsMeta() { } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java index 7fa67fb51..d8051e41c 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/install/liteloader/LiteLoaderVersionsRoot.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.install.liteloader; +import com.google.gson.annotations.SerializedName; import java.util.Map; /** @@ -25,6 +26,8 @@ import java.util.Map; */ public class LiteLoaderVersionsRoot { + @SerializedName("versions") public Map versions; + @SerializedName("meta") public LiteLoaderVersionsMeta meta; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java index b25bfd90a..f508b2acc 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/mod/ModInfo.java @@ -18,6 +18,7 @@ package org.jackhuang.hellominecraft.launcher.core.mod; import com.google.gson.JsonSyntaxException; +import com.google.gson.annotations.SerializedName; import com.google.gson.reflect.TypeToken; import java.io.File; import java.io.IOException; @@ -37,8 +38,27 @@ import org.jackhuang.hellominecraft.util.system.FileUtils; */ public class ModInfo implements Comparable { + @SerializedName("location") public File location; - public String modid, name, description, author, version, mcversion, url, updateUrl, credits; + @SerializedName("modid") + public String modid; + @SerializedName("name") + public String name; + @SerializedName("description") + public String description; + @SerializedName("author") + public String author; + @SerializedName("version") + public String version; + @SerializedName("mcversion") + public String mcversion; + @SerializedName("url") + public String url; + @SerializedName("updateUrl") + public String updateUrl; + @SerializedName("credits") + public String credits; + @SerializedName("authorList") public String[] authorList; public boolean isActive() { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java index 994177b08..8e6d04580 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Extract.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; import java.util.ArrayList; import java.util.List; import org.jackhuang.hellominecraft.util.StrUtils; @@ -27,6 +28,7 @@ import org.jackhuang.hellominecraft.util.StrUtils; */ public class Extract implements Cloneable { + @SerializedName("exclude") public List exclude = new ArrayList<>(); public boolean allow(String path) { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java index 2398eb3b3..bbd0b4b91 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/GameDownloadInfo.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; /** @@ -25,8 +26,11 @@ import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; */ public class GameDownloadInfo implements Cloneable { + @SerializedName("sha1") public String sha1; + @SerializedName("size") public int size; + @SerializedName("url") protected String url; /** diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java index 3e6d986e0..3830639b1 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibrariesDownloadInfo.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; import java.util.Map; /** @@ -25,6 +26,8 @@ import java.util.Map; */ public class LibrariesDownloadInfo { + @SerializedName("classifiers") Map classifiers; + @SerializedName("artifact") LibraryDownloadInfo artifact; } diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java index 84cb553ea..f2cb07a3e 100644 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/LibraryDownloadInfo.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.launcher.core.download.DownloadType; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.system.IOUtils; @@ -27,7 +28,9 @@ import org.jackhuang.hellominecraft.util.system.IOUtils; */ public class LibraryDownloadInfo extends GameDownloadInfo { + @SerializedName("path") public String path; + @SerializedName("forgeURL") public String forgeURL; @Override diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java index 91259565c..42717940f 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftLibrary.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -30,10 +31,15 @@ import org.jackhuang.hellominecraft.util.StrUtils; */ public class MinecraftLibrary extends IMinecraftLibrary { + @SerializedName("rules") public ArrayList rules; + @SerializedName("url") public String url; + @SerializedName("natives") public Natives natives; + @SerializedName("extract") public Extract extract; + @SerializedName("downloads") public LibrariesDownloadInfo downloads; public MinecraftLibrary(String name) { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java index a5753d3dd..5141b6612 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/MinecraftVersion.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; import java.io.File; import java.util.ArrayList; import java.util.HashMap; @@ -37,14 +38,37 @@ import org.jackhuang.hellominecraft.util.Utils; */ public class MinecraftVersion implements Cloneable, Comparable { - public String minecraftArguments, mainClass, time, id, type, processArguments, - releaseTime, jar, inheritsFrom, runDir; + @SerializedName("minecraftArguments") + public String minecraftArguments; + @SerializedName("mainClass") + public String mainClass; + @SerializedName("time") + public String time; + @SerializedName("id") + public String id; + @SerializedName("type") + public String type; + @SerializedName("processArguments") + public String processArguments; + @SerializedName("releaseTime") + public String releaseTime; + @SerializedName("jar") + public String jar; + @SerializedName("inheritsFrom") + public String inheritsFrom; + @SerializedName("runDir") + public String runDir; + @SerializedName("assets") protected String assets; + @SerializedName("minimumLauncherVersion") public int minimumLauncherVersion; + @SerializedName("hidden") public boolean hidden; + @SerializedName("assetIndex") public AssetIndexDownloadInfo assetIndex; + @SerializedName("downloads") private Map downloads; - + @SerializedName("libraries") public ArrayList libraries; public MinecraftVersion() { diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java index 703fb9c92..c13051e4a 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Natives.java @@ -17,13 +17,20 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; + /** * * @author huangyuhui */ public class Natives implements Cloneable { - public String windows, osx, linux; + @SerializedName("windows") + public String windows; + @SerializedName("osx") + public String osx; + @SerializedName("linux") + public String linux; @Override @SuppressWarnings("CloneDeclaresCloneNotSupported") diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java index 3e7b6eff2..2e276adcf 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/OSRestriction.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; import org.jackhuang.hellominecraft.util.StrUtils; import org.jackhuang.hellominecraft.util.system.OS; @@ -26,7 +27,10 @@ import org.jackhuang.hellominecraft.util.system.OS; */ public class OSRestriction { - private String version, name; + @SerializedName("version") + private String version; + @SerializedName("name") + public String name; public String getVersion() { return version; diff --git a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java index dc3fdfa3b..1831a0536 100755 --- a/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java +++ b/HMCL/src/core/java/org/jackhuang/hellominecraft/launcher/core/version/Rules.java @@ -17,13 +17,17 @@ */ package org.jackhuang.hellominecraft.launcher.core.version; +import com.google.gson.annotations.SerializedName; + /** * * @author huangyuhui */ public class Rules { + @SerializedName("action") private String action; + @SerializedName("os") private OSRestriction os; public Rules() { diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java index 7337d0420..1657642f9 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/Config.java @@ -43,7 +43,14 @@ public final class Config implements Cloneable { private String bgpath; @SerializedName("clientToken") private final String clientToken; - private String proxyHost, proxyPort, proxyUserName, proxyPassword; + @SerializedName("proxyHost") + private String proxyHost; + @SerializedName("proxyPort") + private String proxyPort; + @SerializedName("proxyUserName") + private String proxyUserName; + @SerializedName("proxyPassword") + private String proxyPassword; @SerializedName("enableShadow") private boolean enableShadow; @SerializedName("decorated") diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java index 4ed0a09a8..e9c69b195 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/setting/VersionSetting.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.launcher.setting; +import com.google.gson.annotations.SerializedName; import java.io.File; import java.io.IOException; import org.jackhuang.hellominecraft.launcher.Main; @@ -39,21 +40,48 @@ public class VersionSetting { public transient String id; - private String javaArgs, minecraftArgs, maxMemory, permSize, width, height; - private String javaDir, precalledCommand, serverIp, java, wrapper; - private boolean fullscreen, noJVMArgs, notCheckGame; + @SerializedName("javaArgs") + private String javaArgs; + @SerializedName("minecraftArgs") + private String minecraftArgs; + @SerializedName("maxMemory") + private String maxMemory; + @SerializedName("permSize") + private String permSize; + @SerializedName("width") + private String width; + @SerializedName("height") + private String height; + @SerializedName("javaDir") + private String javaDir; + @SerializedName("precalledCommand") + private String precalledCommand; + @SerializedName("serverIp") + private String serverIp; + @SerializedName("java") + private String java; + @SerializedName("wrapper") + private String wrapper; + @SerializedName("fullscreen") + private boolean fullscreen; + @SerializedName("noJVMArgs") + private boolean noJVMArgs; + @SerializedName("notCheckGame") + private boolean notCheckGame; /** * 0 - Close the launcher when the game starts.
* 1 - Hide the launcher when the game starts.
* 2 - Keep the launcher open.
*/ + @SerializedName("launcherVisibility") private int launcherVisibility; /** * 0 - .minecraft
* 1 - .minecraft/versions/<version>/
*/ + @SerializedName("gameDirType") private int gameDirType; public transient final EventHandler propertyChanged = new EventHandler<>(this); diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteLatestVersion.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteLatestVersion.java index f0f04f5ab..04e6e890f 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteLatestVersion.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteLatestVersion.java @@ -17,12 +17,17 @@ */ package org.jackhuang.hellominecraft.svrmgr.util.version; +import com.google.gson.annotations.SerializedName; + /** * * @author huangyuhui */ public class MinecraftRemoteLatestVersion { - public String snapshot, release; + @SerializedName("snapshot") + public String snapshot; + @SerializedName("release") + public String release; } diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersion.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersion.java index daa0a6fed..04e114da9 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersion.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersion.java @@ -17,12 +17,21 @@ */ package org.jackhuang.hellominecraft.svrmgr.util.version; +import com.google.gson.annotations.SerializedName; + /** * * @author huangyuhui */ public class MinecraftRemoteVersion { - public String id, time, releaseTime, type; + @SerializedName("id") + public String id; + @SerializedName("time") + public String time; + @SerializedName("releaseTime") + public String releaseTime; + @SerializedName("type") + public String type; } diff --git a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersions.java b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersions.java index d6b863218..15585e47c 100755 --- a/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersions.java +++ b/HMCSM/src/main/java/org/jackhuang/hellominecraft/svrmgr/util/version/MinecraftRemoteVersions.java @@ -17,6 +17,7 @@ */ package org.jackhuang.hellominecraft.svrmgr.util.version; +import com.google.gson.annotations.SerializedName; import java.util.ArrayList; /** @@ -25,7 +26,9 @@ import java.util.ArrayList; */ public class MinecraftRemoteVersions { + @SerializedName("versions") public ArrayList versions; + @SerializedName("latest") public MinecraftRemoteLatestVersion latest; }