mirror of
https://github.com/mcMMO-Dev/mcMMO.git
synced 2024-11-26 07:06:45 +01:00
I honestly forgot this was in here. Fixes #2863
This commit is contained in:
t00thpick1
parent
321fcd7b84
commit
707195f237
@ -392,11 +392,6 @@ public class PlayerListener implements Listener {
|
|||||||
if (plugin.isXPEventEnabled()) {
|
if (plugin.isXPEventEnabled()) {
|
||||||
player.sendMessage(LocaleLoader.getString("XPRate.Event", ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
|
player.sendMessage(LocaleLoader.getString("XPRate.Event", ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Permissions.updateNotifications(player) && plugin.isUpdateAvailable()) {
|
|
||||||
player.sendMessage(LocaleLoader.getString("UpdateChecker.Outdated"));
|
|
||||||
player.sendMessage(LocaleLoader.getString("UpdateChecker.NewAvailable"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -90,9 +90,6 @@ public class mcMMO extends JavaPlugin {
|
|||||||
// Jar Stuff
|
// Jar Stuff
|
||||||
public static File mcmmo;
|
public static File mcmmo;
|
||||||
|
|
||||||
// Update Check
|
|
||||||
private boolean updateAvailable;
|
|
||||||
|
|
||||||
/* Plugin Checks */
|
/* Plugin Checks */
|
||||||
private static boolean healthBarPluginEnabled;
|
private static boolean healthBarPluginEnabled;
|
||||||
|
|
||||||
@ -264,14 +261,6 @@ public class mcMMO extends JavaPlugin {
|
|||||||
return modDirectory;
|
return modDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isUpdateAvailable() {
|
|
||||||
return updateAvailable;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUpdateAvailable(boolean available) {
|
|
||||||
this.updateAvailable = available;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isXPEventEnabled() {
|
public boolean isXPEventEnabled() {
|
||||||
return xpEventEnabled;
|
return xpEventEnabled;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,558 +0,0 @@
|
|||||||
/*
|
|
||||||
* Updater for Bukkit.
|
|
||||||
*
|
|
||||||
* This class provides the means to safely and easily update a plugin, or check to see if it is updated using dev.bukkit.org
|
|
||||||
*/
|
|
||||||
|
|
||||||
package net.gravitydevelopment.updater.mcmmo;
|
|
||||||
|
|
||||||
import java.io.BufferedInputStream;
|
|
||||||
import java.io.BufferedOutputStream;
|
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.File;
|
|
||||||
import java.io.FileOutputStream;
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLConnection;
|
|
||||||
import java.util.Enumeration;
|
|
||||||
import java.util.zip.ZipEntry;
|
|
||||||
import java.util.zip.ZipFile;
|
|
||||||
|
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
|
||||||
import org.bukkit.plugin.Plugin;
|
|
||||||
|
|
||||||
import com.gmail.nossr50.config.Config;
|
|
||||||
|
|
||||||
import org.json.simple.JSONArray;
|
|
||||||
import org.json.simple.JSONObject;
|
|
||||||
import org.json.simple.JSONValue;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check dev.bukkit.org to find updates for a given plugin, and download the updates if needed.
|
|
||||||
* <p/>
|
|
||||||
* <b>VERY, VERY IMPORTANT</b>: Because there are no standards for adding auto-update toggles in your plugin's config, this system provides NO CHECK WITH YOUR CONFIG to make sure the user has allowed auto-updating.
|
|
||||||
* <br>
|
|
||||||
* It is a <b>BUKKIT POLICY</b> that you include a boolean value in your config that prevents the auto-updater from running <b>AT ALL</b>.
|
|
||||||
* <br>
|
|
||||||
* If you fail to include this option in your config, your plugin will be <b>REJECTED</b> when you attempt to submit it to dev.bukkit.org.
|
|
||||||
* <p/>
|
|
||||||
* An example of a good configuration option would be something similar to 'auto-update: true' - if this value is set to false you may NOT run the auto-updater.
|
|
||||||
* <br>
|
|
||||||
* If you are unsure about these rules, please read the plugin submission guidelines: http://goo.gl/8iU5l
|
|
||||||
*
|
|
||||||
* @author Gravity
|
|
||||||
* @version 2.0
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class Updater {
|
|
||||||
|
|
||||||
private Plugin plugin;
|
|
||||||
private UpdateType type;
|
|
||||||
private String versionName;
|
|
||||||
private String versionLink;
|
|
||||||
private String versionType;
|
|
||||||
private String versionGameVersion;
|
|
||||||
|
|
||||||
private boolean announce; // Whether to announce file downloads
|
|
||||||
|
|
||||||
private URL url; // Connecting to RSS
|
|
||||||
private File file; // The plugin's file
|
|
||||||
private Thread thread; // Updater thread
|
|
||||||
|
|
||||||
private int id = -1; // Project's Curse ID
|
|
||||||
private String apiKey = null; // BukkitDev ServerMods API key
|
|
||||||
private static final String TITLE_VALUE = "name"; // Gets remote file's title
|
|
||||||
private static final String LINK_VALUE = "downloadUrl"; // Gets remote file's download link
|
|
||||||
private static final String TYPE_VALUE = "releaseType"; // Gets remote file's release type
|
|
||||||
private static final String VERSION_VALUE = "gameVersion"; // Gets remote file's build version
|
|
||||||
private static final String QUERY = "/servermods/files?projectIds="; // Path to GET
|
|
||||||
private static final String HOST = "https://api.curseforge.com"; // Slugs will be appended to this to get to the project's RSS feed
|
|
||||||
|
|
||||||
private static final int BYTE_SIZE = 1024; // Used for downloading files
|
|
||||||
private YamlConfiguration config; // Config file
|
|
||||||
private String updateFolder;// The folder that downloads will be placed in
|
|
||||||
private Updater.UpdateResult result = Updater.UpdateResult.SUCCESS; // Used for determining the outcome of the update process
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gives the dev the result of the update process. Can be obtained by called getResult().
|
|
||||||
*/
|
|
||||||
public enum UpdateResult {
|
|
||||||
/**
|
|
||||||
* The updater found an update, and has readied it to be loaded the next time the server restarts/reloads.
|
|
||||||
*/
|
|
||||||
SUCCESS,
|
|
||||||
/**
|
|
||||||
* The updater did not find an update, and nothing was downloaded.
|
|
||||||
*/
|
|
||||||
NO_UPDATE,
|
|
||||||
/**
|
|
||||||
* The server administrator has disabled the updating system
|
|
||||||
*/
|
|
||||||
DISABLED,
|
|
||||||
/**
|
|
||||||
* The updater found an update, but was unable to download it.
|
|
||||||
*/
|
|
||||||
FAIL_DOWNLOAD,
|
|
||||||
/**
|
|
||||||
* For some reason, the updater was unable to contact dev.bukkit.org to download the file.
|
|
||||||
*/
|
|
||||||
FAIL_DBO,
|
|
||||||
/**
|
|
||||||
* When running the version check, the file on DBO did not contain the a version in the format 'vVersion' such as 'v1.0'.
|
|
||||||
*/
|
|
||||||
FAIL_NOVERSION,
|
|
||||||
/**
|
|
||||||
* The id provided by the plugin running the updater was invalid and doesn't exist on DBO.
|
|
||||||
*/
|
|
||||||
FAIL_BADID,
|
|
||||||
/**
|
|
||||||
* The server administrator has improperly configured their API key in the configuration
|
|
||||||
*/
|
|
||||||
FAIL_APIKEY,
|
|
||||||
/**
|
|
||||||
* The updater found an update, but because of the UpdateType being set to NO_DOWNLOAD, it wasn't downloaded.
|
|
||||||
*/
|
|
||||||
UPDATE_AVAILABLE
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Allows the dev to specify the type of update that will be run.
|
|
||||||
*/
|
|
||||||
public enum UpdateType {
|
|
||||||
/**
|
|
||||||
* Run a version check, and then if the file is out of date, download the newest version.
|
|
||||||
*/
|
|
||||||
DEFAULT,
|
|
||||||
/**
|
|
||||||
* Don't run a version check, just find the latest update and download it.
|
|
||||||
*/
|
|
||||||
NO_VERSION_CHECK,
|
|
||||||
/**
|
|
||||||
* Get information about the version and the download size, but don't actually download anything.
|
|
||||||
*/
|
|
||||||
NO_DOWNLOAD
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize the updater
|
|
||||||
*
|
|
||||||
* @param plugin The plugin that is checking for an update.
|
|
||||||
* @param id The dev.bukkit.org id of the project
|
|
||||||
* @param file The file that the plugin is running from, get this by doing this.getFile() from within your main class.
|
|
||||||
* @param type Specify the type of update this will be. See {@link UpdateType}
|
|
||||||
* @param announce True if the program should announce the progress of new updates in console
|
|
||||||
*/
|
|
||||||
public Updater(Plugin plugin, int id, File file, UpdateType type, boolean announce) {
|
|
||||||
this.plugin = plugin;
|
|
||||||
this.type = type;
|
|
||||||
this.announce = announce;
|
|
||||||
this.file = file;
|
|
||||||
this.id = id;
|
|
||||||
this.updateFolder = plugin.getServer().getUpdateFolder();
|
|
||||||
|
|
||||||
final File pluginFile = plugin.getDataFolder().getParentFile();
|
|
||||||
final File updaterFile = new File(pluginFile, "Updater");
|
|
||||||
final File updaterConfigFile = new File(updaterFile, "config.yml");
|
|
||||||
|
|
||||||
if (!updaterFile.exists()) {
|
|
||||||
updaterFile.mkdir();
|
|
||||||
}
|
|
||||||
if (!updaterConfigFile.exists()) {
|
|
||||||
try {
|
|
||||||
updaterConfigFile.createNewFile();
|
|
||||||
}
|
|
||||||
catch (final IOException e) {
|
|
||||||
plugin.getLogger().severe("The updater could not create a configuration in " + updaterFile.getAbsolutePath());
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.config = YamlConfiguration.loadConfiguration(updaterConfigFile);
|
|
||||||
|
|
||||||
this.config.options().header("This configuration file affects all plugins using the Updater system (version 2+ - http://forums.bukkit.org/threads/96681/ )" + '\n'
|
|
||||||
+ "If you wish to use your API key, read http://wiki.bukkit.org/ServerMods_API and place it below." + '\n'
|
|
||||||
+ "Some updating systems will not adhere to the disabled value, but these may be turned off in their plugin's configuration.");
|
|
||||||
this.config.addDefault("api-key", "PUT_API_KEY_HERE");
|
|
||||||
this.config.addDefault("disable", false);
|
|
||||||
|
|
||||||
if (this.config.get("api-key", null) == null) {
|
|
||||||
this.config.options().copyDefaults(true);
|
|
||||||
try {
|
|
||||||
this.config.save(updaterConfigFile);
|
|
||||||
}
|
|
||||||
catch (final IOException e) {
|
|
||||||
plugin.getLogger().severe("The updater could not save the configuration in " + updaterFile.getAbsolutePath());
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.config.getBoolean("disable")) {
|
|
||||||
this.result = UpdateResult.DISABLED;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String key = this.config.getString("api-key");
|
|
||||||
if (key.equalsIgnoreCase("PUT_API_KEY_HERE") || key.equals("")) {
|
|
||||||
key = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.apiKey = key;
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.url = new URL(Updater.HOST + Updater.QUERY + id);
|
|
||||||
}
|
|
||||||
catch (final MalformedURLException e) {
|
|
||||||
plugin.getLogger().severe("The project ID provided for updating, " + id + " is invalid.");
|
|
||||||
this.result = UpdateResult.FAIL_BADID;
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
this.thread = new Thread(new UpdateRunnable());
|
|
||||||
this.thread.start();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the result of the update process.
|
|
||||||
*/
|
|
||||||
public Updater.UpdateResult getResult() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's release type (release, beta, or alpha).
|
|
||||||
*/
|
|
||||||
public String getLatestType() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.versionType;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's game version.
|
|
||||||
*/
|
|
||||||
public String getLatestGameVersion() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.versionGameVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's name.
|
|
||||||
*/
|
|
||||||
public String getLatestName() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.versionName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's file link.
|
|
||||||
*/
|
|
||||||
public String getLatestFileLink() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.versionLink;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* As the result of Updater output depends on the thread's completion, it is necessary to wait for the thread to finish
|
|
||||||
* before allowing anyone to check the result.
|
|
||||||
*/
|
|
||||||
private void waitForThread() {
|
|
||||||
if ((this.thread != null) && this.thread.isAlive()) {
|
|
||||||
try {
|
|
||||||
this.thread.join();
|
|
||||||
}
|
|
||||||
catch (final InterruptedException e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save an update from dev.bukkit.org into the server's update folder.
|
|
||||||
*/
|
|
||||||
private void saveFile(File folder, String file, String u) {
|
|
||||||
if (!folder.exists()) {
|
|
||||||
folder.mkdir();
|
|
||||||
}
|
|
||||||
BufferedInputStream in = null;
|
|
||||||
FileOutputStream fout = null;
|
|
||||||
try {
|
|
||||||
// Download the file
|
|
||||||
final URL url = new URL(u);
|
|
||||||
final int fileLength = url.openConnection().getContentLength();
|
|
||||||
in = new BufferedInputStream(url.openStream());
|
|
||||||
fout = new FileOutputStream(folder.getAbsolutePath() + "/" + file);
|
|
||||||
|
|
||||||
final byte[] data = new byte[Updater.BYTE_SIZE];
|
|
||||||
int count;
|
|
||||||
if (this.announce) {
|
|
||||||
this.plugin.getLogger().info("About to download a new update: " + this.versionName);
|
|
||||||
}
|
|
||||||
long downloaded = 0;
|
|
||||||
while ((count = in.read(data, 0, Updater.BYTE_SIZE)) != -1) {
|
|
||||||
downloaded += count;
|
|
||||||
fout.write(data, 0, count);
|
|
||||||
final int percent = (int) ((downloaded * 100) / fileLength);
|
|
||||||
if (this.announce && ((percent % 10) == 0)) {
|
|
||||||
this.plugin.getLogger().info("Downloading update: " + percent + "% of " + fileLength + " bytes.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//Just a quick check to make sure we didn't leave any files from last time...
|
|
||||||
for (final File xFile : new File(this.plugin.getDataFolder().getParent(), this.updateFolder).listFiles()) {
|
|
||||||
if (xFile.getName().endsWith(".zip")) {
|
|
||||||
xFile.delete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Check to see if it's a zip file, if it is, unzip it.
|
|
||||||
final File dFile = new File(folder.getAbsolutePath() + "/" + file);
|
|
||||||
if (dFile.getName().endsWith(".zip")) {
|
|
||||||
// Unzip
|
|
||||||
this.unzip(dFile.getCanonicalPath());
|
|
||||||
}
|
|
||||||
if (this.announce) {
|
|
||||||
this.plugin.getLogger().info("Finished updating.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (final Exception ex) {
|
|
||||||
this.plugin.getLogger().warning("The auto-updater tried to download a new update, but was unsuccessful.");
|
|
||||||
this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
|
|
||||||
}
|
|
||||||
finally {
|
|
||||||
try {
|
|
||||||
if (in != null) {
|
|
||||||
in.close();
|
|
||||||
}
|
|
||||||
if (fout != null) {
|
|
||||||
fout.close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (final Exception ex) {
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Part of Zip-File-Extractor, modified by Gravity for use with Bukkit
|
|
||||||
*/
|
|
||||||
private void unzip(String file) {
|
|
||||||
try {
|
|
||||||
final File fSourceZip = new File(file);
|
|
||||||
final String zipPath = file.substring(0, file.length() - 4);
|
|
||||||
ZipFile zipFile = new ZipFile(fSourceZip);
|
|
||||||
Enumeration<? extends ZipEntry> e = zipFile.entries();
|
|
||||||
while (e.hasMoreElements()) {
|
|
||||||
ZipEntry entry = e.nextElement();
|
|
||||||
File destinationFilePath = new File(zipPath, entry.getName());
|
|
||||||
destinationFilePath.getParentFile().mkdirs();
|
|
||||||
if (entry.isDirectory()) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
final BufferedInputStream bis = new BufferedInputStream(zipFile.getInputStream(entry));
|
|
||||||
int b;
|
|
||||||
final byte buffer[] = new byte[Updater.BYTE_SIZE];
|
|
||||||
final FileOutputStream fos = new FileOutputStream(destinationFilePath);
|
|
||||||
final BufferedOutputStream bos = new BufferedOutputStream(fos, Updater.BYTE_SIZE);
|
|
||||||
while ((b = bis.read(buffer, 0, Updater.BYTE_SIZE)) != -1) {
|
|
||||||
bos.write(buffer, 0, b);
|
|
||||||
}
|
|
||||||
bos.flush();
|
|
||||||
bos.close();
|
|
||||||
bis.close();
|
|
||||||
final String name = destinationFilePath.getName();
|
|
||||||
if (name.endsWith(".jar") && this.pluginFile(name)) {
|
|
||||||
destinationFilePath.renameTo(new File(this.plugin.getDataFolder().getParent(), this.updateFolder + "/" + name));
|
|
||||||
}
|
|
||||||
|
|
||||||
entry = null;
|
|
||||||
destinationFilePath = null;
|
|
||||||
}
|
|
||||||
e = null;
|
|
||||||
zipFile.close();
|
|
||||||
zipFile = null;
|
|
||||||
|
|
||||||
// Move any plugin data folders that were included to the right place, Bukkit won't do this for us.
|
|
||||||
for (final File dFile : new File(zipPath).listFiles()) {
|
|
||||||
if (dFile.isDirectory()) {
|
|
||||||
if (this.pluginFile(dFile.getName())) {
|
|
||||||
final File oFile = new File(this.plugin.getDataFolder().getParent(), dFile.getName()); // Get current dir
|
|
||||||
final File[] contents = oFile.listFiles(); // List of existing files in the current dir
|
|
||||||
for (final File cFile : dFile.listFiles()) // Loop through all the files in the new dir
|
|
||||||
{
|
|
||||||
boolean found = false;
|
|
||||||
for (final File xFile : contents) // Loop through contents to see if it exists
|
|
||||||
{
|
|
||||||
if (xFile.getName().equals(cFile.getName())) {
|
|
||||||
found = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!found) {
|
|
||||||
// Move the new file into the current dir
|
|
||||||
cFile.renameTo(new File(oFile.getCanonicalFile() + "/" + cFile.getName()));
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
// This file already exists, so we don't need it anymore.
|
|
||||||
cFile.delete();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dFile.delete();
|
|
||||||
}
|
|
||||||
new File(zipPath).delete();
|
|
||||||
fSourceZip.delete();
|
|
||||||
}
|
|
||||||
catch (final IOException ex) {
|
|
||||||
this.plugin.getLogger().warning("The auto-updater tried to unzip a new update file, but was unsuccessful.");
|
|
||||||
this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
|
|
||||||
ex.printStackTrace();
|
|
||||||
}
|
|
||||||
new File(file).delete();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the name of a jar is one of the plugins currently installed, used for extracting the correct files out of a zip.
|
|
||||||
*/
|
|
||||||
private boolean pluginFile(String name) {
|
|
||||||
for (final File file : new File("plugins").listFiles()) {
|
|
||||||
if (file.getName().equals(name)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check to see if the program should continue by evaluation whether the plugin is already updated, or shouldn't be updated
|
|
||||||
*/
|
|
||||||
private boolean versionCheck(String title) {
|
|
||||||
if (type != UpdateType.NO_VERSION_CHECK) {
|
|
||||||
String version = plugin.getDescription().getVersion();
|
|
||||||
title = title.substring(6);
|
|
||||||
|
|
||||||
String[] oldTokens = version.split("-");
|
|
||||||
String[] newTokens = title.split("-");
|
|
||||||
|
|
||||||
int oldVersion = Integer.parseInt(oldTokens[0].replaceAll("[.]", ""));
|
|
||||||
int newVersion = Integer.parseInt(newTokens[0].replaceAll("[.]", ""));
|
|
||||||
|
|
||||||
// Check versions
|
|
||||||
if (oldVersion < newVersion) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check release vs. beta & SNAPSHOT
|
|
||||||
if (newTokens.length == 1 && oldTokens.length == 3 && oldVersion == newVersion) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check beta vs. SNAPSHOT
|
|
||||||
if (version.contains("SNAPSHOT") && title.contains("beta")) {
|
|
||||||
if (Integer.parseInt(oldTokens[1].substring(8)) <= Integer.parseInt(newTokens[1].substring(4))) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
result = UpdateResult.NO_UPDATE;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check beta vs. beta
|
|
||||||
if (version.contains("beta") && title.contains("beta")) {
|
|
||||||
if (Integer.parseInt(oldTokens[1].substring(4)) < Integer.parseInt(newTokens[1].substring(4))) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
result = UpdateResult.NO_UPDATE;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (oldTokens.length == 3 && !version.contains("beta") && !version.contains("SNAPSHOT")) {
|
|
||||||
plugin.getLogger().warning("Could not get information about this mcMMO version; perhaps you are running a custom one?");
|
|
||||||
result = UpdateResult.FAIL_NOVERSION;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
result = UpdateResult.NO_UPDATE;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean read() {
|
|
||||||
try {
|
|
||||||
final URLConnection conn = this.url.openConnection();
|
|
||||||
conn.setConnectTimeout(5000);
|
|
||||||
|
|
||||||
if (this.apiKey != null) {
|
|
||||||
conn.addRequestProperty("X-API-Key", this.apiKey);
|
|
||||||
}
|
|
||||||
conn.addRequestProperty("User-Agent", "Updater (by Gravity)");
|
|
||||||
|
|
||||||
conn.setDoOutput(true);
|
|
||||||
|
|
||||||
final BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
|
|
||||||
final String response = reader.readLine();
|
|
||||||
|
|
||||||
final JSONArray array = (JSONArray) JSONValue.parse(response);
|
|
||||||
|
|
||||||
if (array.size() == 0) {
|
|
||||||
this.plugin.getLogger().warning("The updater could not find any files for the project id " + this.id);
|
|
||||||
this.result = UpdateResult.FAIL_BADID;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.versionName = (String) ((JSONObject) array.get(array.size() - 1)).get(Updater.TITLE_VALUE);
|
|
||||||
this.versionLink = (String) ((JSONObject) array.get(array.size() - 1)).get(Updater.LINK_VALUE);
|
|
||||||
this.versionType = (String) ((JSONObject) array.get(array.size() - 1)).get(Updater.TYPE_VALUE);
|
|
||||||
this.versionGameVersion = (String) ((JSONObject) array.get(array.size() - 1)).get(Updater.VERSION_VALUE);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
catch (final IOException e) {
|
|
||||||
if (e.getMessage().contains("HTTP response code: 403")) {
|
|
||||||
this.plugin.getLogger().warning("dev.bukkit.org rejected the API key provided in plugins/Updater/config.yml");
|
|
||||||
this.plugin.getLogger().warning("Please double-check your configuration to ensure it is correct.");
|
|
||||||
this.result = UpdateResult.FAIL_APIKEY;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
this.plugin.getLogger().warning("The updater could not contact dev.bukkit.org for updating.");
|
|
||||||
this.plugin.getLogger().warning("If you have not recently modified your configuration and this is the first time you are seeing this message, the site may be experiencing temporary downtime.");
|
|
||||||
this.result = UpdateResult.FAIL_DBO;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Config.getInstance().getVerboseLoggingEnabled()) {
|
|
||||||
e.printStackTrace();
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private class UpdateRunnable implements Runnable {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
if (Updater.this.url != null) {
|
|
||||||
// Obtain the results of the project's file feed
|
|
||||||
if (Updater.this.read()) {
|
|
||||||
if (Updater.this.versionCheck(Updater.this.versionName)) {
|
|
||||||
if ((Updater.this.versionLink != null) && (Updater.this.type != UpdateType.NO_DOWNLOAD)) {
|
|
||||||
String name = Updater.this.file.getName();
|
|
||||||
// If it's a zip file, it shouldn't be downloaded as the plugin's name
|
|
||||||
if (Updater.this.versionLink.endsWith(".zip")) {
|
|
||||||
final String[] split = Updater.this.versionLink.split("/");
|
|
||||||
name = split[split.length - 1];
|
|
||||||
}
|
|
||||||
Updater.this.saveFile(new File(Updater.this.plugin.getDataFolder().getParent(), Updater.this.updateFolder), name, Updater.this.versionLink);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
Updater.this.result = UpdateResult.UPDATE_AVAILABLE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user