TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-14 04:47:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix Updater not recognizing core build, imports

Browse source
This commit is contained in:
Jack Lin 2015-08-22 14:19:30 +12:00
parent eeae6d217b
commit c47ee36097
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/com/projectkorra/projectkorra/util/Updater.java
View file

@ -1,5 +1,11 @@
package com.projectkorra.projectkorra.util; package com.projectkorra.projectkorra.util;
import org.bukkit.plugin.Plugin;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
@ -8,12 +14,6 @@ import java.net.UnknownHostException;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import org.bukkit.plugin.Plugin;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
/** /**
* Updater class that takes an rss feed and checks for updates there * Updater class that takes an rss feed and checks for updates there
* <br> * <br>
@ -73,9 +73,9 @@ public class Updater {
* *
*/ */
public void checkUpdate() { public void checkUpdate() {
if (getUpdateVersion()==null) if (getUpdateVersion() == null) {
return; return;
else if (updateAvailable()) { } else if (updateAvailable()) {
plugin.getLogger().info("===================[Update Available]==================="); plugin.getLogger().info("===================[Update Available]===================");
plugin.getLogger().info("You are running version " + getCurrentVersion()); plugin.getLogger().info("You are running version " + getCurrentVersion());
plugin.getLogger().info("The latest version avaliable is " + getUpdateVersion()); plugin.getLogger().info("The latest version avaliable is " + getUpdateVersion());
@ -90,7 +90,7 @@ public class Updater {
* @return Latest plugin version, or null if it cannot connect * @return Latest plugin version, or null if it cannot connect
*/ */
public String getUpdateVersion() { public String getUpdateVersion() {
if (document!=null) { if (document != null) {
Node latestFile = document.getElementsByTagName("item").item(0); Node latestFile = document.getElementsByTagName("item").item(0);
NodeList children = latestFile.getChildNodes(); NodeList children = latestFile.getChildNodes();
@ -107,7 +107,22 @@ public class Updater {
*/ */
public boolean updateAvailable() { public boolean updateAvailable() {
String updateVersion = getUpdateVersion(); String updateVersion = getUpdateVersion();
if (updateVersion==null || currentVersion.equalsIgnoreCase(getUpdateVersion())) { if (updateVersion == null) {
return false;
}
int currentNumber = Integer.parseInt(currentVersion.substring(0, 5).replaceAll("\\.", ""));
int updateNumber = Integer.parseInt(updateVersion.substring(0, 5).replaceAll("\\.", ""));
if (updateNumber == currentNumber) {
if (currentVersion.contains("BETA") && updateVersion.contains("BETA")) {
int currentBeta = Integer.parseInt(currentVersion.substring(currentVersion.lastIndexOf(" ") + 1));
int updateBeta = Integer.parseInt(updateVersion.substring(updateVersion.lastIndexOf(" ") + 1));
if (currentBeta == updateBeta || currentBeta > updateBeta) {
return false;
}
} else if (!currentVersion.contains("BETA") && updateVersion.contains("BETA")) {
return false;
}
} else if (currentVersion.equalsIgnoreCase(updateVersion) || currentNumber > updateNumber) {
return false; return false;
} }
return true; return true;