Update about screen and update checker

Pokechu22 · Jan 3, 2017 · f60f748 · f60f748
1 parent 9c06623
commit f60f748
Show file tree

Hide file tree

Showing 3 changed files with 428 additions and 431 deletions.
diff --git a/share/src/main/java/wdl/gui/GuiWDLAbout.java b/share/src/main/java/wdl/gui/GuiWDLAbout.java
@@ -18,8 +18,7 @@ public class GuiWDLAbout extends GuiScreen {
 	private final GuiScreen parent;
 
 	private static final String FORUMS_THREAD = "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2520465";
-	private static final String COREMOD_GITHUB = "https://github.com/Pokechu22/WorldDownloader";
-	private static final String LITEMOD_GITHUB = "https://github.com/uyjulian/LiteModWDL/";
+	private static final String ALL_GITHUB = "https://github.com/Pokechu22/WorldDownloader";
 
 	private TextList list;
 
@@ -65,9 +64,7 @@ public void initGui() {
 
 		list.addLinkLine(I18n.format("wdl.gui.about.forumThread"), FORUMS_THREAD);
 		list.addBlankLine();
-		list.addLinkLine(I18n.format("wdl.gui.about.coremodSrc"), COREMOD_GITHUB);
-		list.addBlankLine();
-		list.addLinkLine(I18n.format("wdl.gui.about.litemodSrc"), LITEMOD_GITHUB);
+		list.addLinkLine(I18n.format("wdl.gui.about.allSrc"), ALL_GITHUB);
 	}
 
 	@Override

diff --git a/share/src/main/java/wdl/update/WDLUpdateChecker.java b/share/src/main/java/wdl/update/WDLUpdateChecker.java
@@ -263,18 +263,19 @@ public void run() {
 				return;
 			}
 
+			String expectedTag = "v" + VersionConstants.getModVersion();
 			for (int i = 0; i < releases.size(); i++) {
 				Release release = releases.get(i);
 
-				if (release.tag.equalsIgnoreCase(VersionConstants.getModVersion())) {
+				if (release.tag.equalsIgnoreCase(expectedTag)) {
 					runningRelease = release;
 				}
 			}
 
 			if (runningRelease == null) {
 				WDLMessages.chatMessageTranslated(WDLMessageTypes.UPDATE_DEBUG,
 						"wdl.messages.updates.failedToFindMatchingRelease",
-						VersionConstants.getModVersion());
+						expectedTag);
 				return;
 			}
 
@@ -297,7 +298,7 @@ public void run() {
 			if (runningRelease.hiddenInfo == null) {
 				WDLMessages.chatMessageTranslated(WDLMessageTypes.UPDATE_DEBUG,
 						"wdl.messages.updates.failedToFindMetadata",
-						VersionConstants.getModVersion());
+						expectedTag);
 				return;
 			}
 			//Check the hashes, and list any failing ones.