forked from Upstream/CommandPanels
Source Update
This commit is contained in:
rockyhawk64
BuildTools
parent
6b93dc1f85
commit
820beebaaf
3
.idea/.gitignore
vendored
Normal file
3
.idea/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
# Default ignored files
|
||||||
|
/shelf/
|
||||||
|
/workspace.xml
|
||||||
9
.idea/artifacts/Command_Panels.xml
Normal file
9
.idea/artifacts/Command_Panels.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<component name="ArtifactManager">
|
||||||
|
<artifact type="jar" name="Command Panels">
|
||||||
|
<output-path>$PROJECT_DIR$/out/artifacts/Command_Panels</output-path>
|
||||||
|
<root id="archive" name="Command Panels.jar">
|
||||||
|
<element id="file-copy" path="$PROJECT_DIR$/resource/plugin.yml" />
|
||||||
|
<element id="module-output" name="Command Panels" />
|
||||||
|
</root>
|
||||||
|
</artifact>
|
||||||
|
</component>
|
||||||
16
.idea/inspectionProfiles/Project_Default.xml
Normal file
16
.idea/inspectionProfiles/Project_Default.xml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
<component name="InspectionProjectProfileManager">
|
||||||
|
<profile version="1.0">
|
||||||
|
<option name="myName" value="Project Default" />
|
||||||
|
<inspection_tool class="MismatchedCollectionQueryUpdate" enabled="false" level="WARNING" enabled_by_default="false">
|
||||||
|
<option name="queryNames">
|
||||||
|
<value />
|
||||||
|
</option>
|
||||||
|
<option name="updateNames">
|
||||||
|
<value />
|
||||||
|
</option>
|
||||||
|
<option name="ignoredClasses">
|
||||||
|
<value />
|
||||||
|
</option>
|
||||||
|
</inspection_tool>
|
||||||
|
</profile>
|
||||||
|
</component>
|
||||||
9
.idea/libraries/HeadDatabaseAPI1.xml
Normal file
9
.idea/libraries/HeadDatabaseAPI1.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="HeadDatabaseAPI1">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$APPLICATION_HOME_DIR$/Tools/Build Tools/Jar Libraries/HeadDatabaseAPI.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
9
.idea/libraries/PlaceholderAPI_2_10_21.xml
Normal file
9
.idea/libraries/PlaceholderAPI_2_10_21.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="PlaceholderAPI-2.10.21">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$APPLICATION_HOME_DIR$/Tools/Build Tools/Jar Libraries/PlaceholderAPI-2.10.2.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
9
.idea/libraries/TokenManager_3_2_4.xml
Normal file
9
.idea/libraries/TokenManager_3_2_4.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="TokenManager-3.2.4">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$APPLICATION_HOME_DIR$/Tools/Build Tools/Jar Libraries/TokenManager-3.2.4.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
9
.idea/libraries/Vault.xml
Normal file
9
.idea/libraries/Vault.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="Vault">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$APPLICATION_HOME_DIR$/Tools/Build Tools/Jar Libraries/Vault.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
9
.idea/libraries/VotingPlugin.xml
Normal file
9
.idea/libraries/VotingPlugin.xml
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="VotingPlugin">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$APPLICATION_HOME_DIR$/Tools/Build Tools/Jar Libraries/VotingPlugin.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES />
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
11
.idea/libraries/spigot_1_16_1.xml
Normal file
11
.idea/libraries/spigot_1_16_1.xml
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
<component name="libraryTable">
|
||||||
|
<library name="spigot-1.16.1">
|
||||||
|
<CLASSES>
|
||||||
|
<root url="jar://$APPLICATION_HOME_DIR$/Tools/Build Tools/Jar Libraries/spigot-1.16.1.jar!/" />
|
||||||
|
</CLASSES>
|
||||||
|
<JAVADOC />
|
||||||
|
<SOURCES>
|
||||||
|
<root url="jar://$APPLICATION_HOME_DIR$/Tools/Build Tools/Jar Libraries/spigot-1.16.1.jar!/" />
|
||||||
|
</SOURCES>
|
||||||
|
</library>
|
||||||
|
</component>
|
||||||
6
.idea/misc.xml
Normal file
6
.idea/misc.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
8
.idea/modules.xml
Normal file
8
.idea/modules.xml
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="ProjectModuleManager">
|
||||||
|
<modules>
|
||||||
|
<module fileurl="file://$PROJECT_DIR$/Command Panels.iml" filepath="$PROJECT_DIR$/Command Panels.iml" />
|
||||||
|
</modules>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
124
.idea/uiDesigner.xml
Normal file
124
.idea/uiDesigner.xml
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Palette2">
|
||||||
|
<group name="Swing">
|
||||||
|
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="Button" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="RadioButton" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="CheckBox" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
|
||||||
|
<initial-values>
|
||||||
|
<property name="text" value="Label" />
|
||||||
|
</initial-values>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
|
<preferred-size width="150" height="-1" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
|
<preferred-size width="150" height="-1" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
|
||||||
|
<preferred-size width="150" height="-1" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
|
||||||
|
<preferred-size width="150" height="50" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
|
<preferred-size width="200" height="200" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
|
||||||
|
<preferred-size width="200" height="200" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
|
||||||
|
<preferred-size width="-1" height="20" />
|
||||||
|
</default-constraints>
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
|
||||||
|
</item>
|
||||||
|
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
|
||||||
|
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
|
||||||
|
</item>
|
||||||
|
</group>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
6
.idea/vcs.xml
Normal file
6
.idea/vcs.xml
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="VcsDirectoryMappings">
|
||||||
|
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -1,8 +1,8 @@
|
|||||||
version: 3.2.0-pre3
|
version: 3.2.0
|
||||||
name: CommandPanels
|
|
||||||
main: me.rockyhawk.commandPanels.commandpanels
|
main: me.rockyhawk.commandPanels.commandpanels
|
||||||
|
name: CommandPanels
|
||||||
author: RockyHawk
|
author: RockyHawk
|
||||||
api-version: 1.13
|
api-version: '1.13'
|
||||||
description: Fully Custom GUIs. Make your Server Professional.
|
description: Fully Custom GUIs. Make your Server Professional.
|
||||||
softdepend: [PlaceholderAPI, Vault, HeadDatabase, TokenManager, VotingPlugin]
|
softdepend: [PlaceholderAPI, Vault, HeadDatabase, TokenManager, VotingPlugin]
|
||||||
commands:
|
commands:
|
||||||
|
|||||||
@ -1,773 +0,0 @@
|
|||||||
package me.rockyhawk.commandPanels;
|
|
||||||
import java.io.*;
|
|
||||||
import java.net.HttpURLConnection;
|
|
||||||
import java.net.MalformedURLException;
|
|
||||||
import java.net.URL;
|
|
||||||
import java.net.URLConnection;
|
|
||||||
import java.util.Enumeration;
|
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.zip.ZipEntry;
|
|
||||||
import java.util.zip.ZipFile;
|
|
||||||
|
|
||||||
import org.bukkit.configuration.file.YamlConfiguration;
|
|
||||||
import org.bukkit.plugin.Plugin;
|
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
|
||||||
import org.json.simple.JSONArray;
|
|
||||||
import org.json.simple.JSONObject;
|
|
||||||
import org.json.simple.JSONValue;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check for updates on BukkitDev 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.4
|
|
||||||
*/
|
|
||||||
|
|
||||||
public class Updater {
|
|
||||||
|
|
||||||
/* Constants */
|
|
||||||
|
|
||||||
// Remote file's title
|
|
||||||
private static final String TITLE_VALUE = "name";
|
|
||||||
// Remote file's download link
|
|
||||||
private static final String LINK_VALUE = "downloadUrl";
|
|
||||||
// Remote file's release type
|
|
||||||
private static final String TYPE_VALUE = "releaseType";
|
|
||||||
// Remote file's build version
|
|
||||||
private static final String VERSION_VALUE = "gameVersion";
|
|
||||||
// Path to GET
|
|
||||||
private static final String QUERY = "/servermods/files?projectIds=";
|
|
||||||
// Slugs will be appended to this to get to the project's RSS feed
|
|
||||||
private static final String HOST = "https://api.curseforge.com";
|
|
||||||
// User-agent when querying Curse
|
|
||||||
private static final String USER_AGENT = "Updater (by Gravity)";
|
|
||||||
// Used for locating version numbers in file names
|
|
||||||
private static final String DELIMETER = "[^\\d.]";
|
|
||||||
//original: ^v|[\s_-]v edit: ^\d.
|
|
||||||
// If the version number contains one of these, don't update.
|
|
||||||
private static final String[] NO_UPDATE_TAG = { "-DEV", "-PRE", "-SNAPSHOT" };
|
|
||||||
// Used for downloading files
|
|
||||||
private static final int BYTE_SIZE = 1024;
|
|
||||||
// Config key for api key
|
|
||||||
private static final String API_KEY_CONFIG_KEY = "api-key";
|
|
||||||
// Config key for disabling Updater
|
|
||||||
private static final String DISABLE_CONFIG_KEY = "disable";
|
|
||||||
// Default api key value in config
|
|
||||||
private static final String API_KEY_DEFAULT = "PUT_API_KEY_HERE";
|
|
||||||
// Default disable value in config
|
|
||||||
private static final boolean DISABLE_DEFAULT = false;
|
|
||||||
|
|
||||||
/* User-provided variables */
|
|
||||||
|
|
||||||
// Plugin running Updater
|
|
||||||
private final Plugin plugin;
|
|
||||||
// Type of update check to run
|
|
||||||
private final UpdateType type;
|
|
||||||
// Whether to announce file downloads
|
|
||||||
private final boolean announce;
|
|
||||||
// The plugin file (jar)
|
|
||||||
private final File file;
|
|
||||||
// The folder that downloads will be placed in
|
|
||||||
private final File updateFolder;
|
|
||||||
// The provided callback (if any)
|
|
||||||
private final UpdateCallback callback;
|
|
||||||
// Project's Curse ID
|
|
||||||
private int id = -1;
|
|
||||||
// BukkitDev ServerMods API key
|
|
||||||
private String apiKey = null;
|
|
||||||
|
|
||||||
/* Collected from Curse API */
|
|
||||||
|
|
||||||
private String versionName;
|
|
||||||
private String versionLink;
|
|
||||||
private String versionType;
|
|
||||||
private String versionGameVersion;
|
|
||||||
|
|
||||||
/* Update process variables */
|
|
||||||
|
|
||||||
// Connection to RSS
|
|
||||||
private URL url;
|
|
||||||
// Updater thread
|
|
||||||
private Thread thread;
|
|
||||||
// Used for determining the outcome of the update process
|
|
||||||
private Updater.UpdateResult result = Updater.UpdateResult.SUCCESS;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Gives the developer the result of the update process. Can be obtained by called {@link #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 a recognizable version.
|
|
||||||
*/
|
|
||||||
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 developer 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
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Represents the various release types of a file on BukkitDev.
|
|
||||||
*/
|
|
||||||
public enum ReleaseType {
|
|
||||||
/**
|
|
||||||
* An "alpha" file.
|
|
||||||
*/
|
|
||||||
ALPHA,
|
|
||||||
/**
|
|
||||||
* A "beta" file.
|
|
||||||
*/
|
|
||||||
BETA,
|
|
||||||
/**
|
|
||||||
* A "release" file.
|
|
||||||
*/
|
|
||||||
RELEASE
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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, id, file, type, null, announce);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize the updater with the provided callback.
|
|
||||||
*
|
|
||||||
* @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 callback The callback instance to notify when the Updater has finished
|
|
||||||
*/
|
|
||||||
public Updater(Plugin plugin, int id, File file, UpdateType type, UpdateCallback callback) {
|
|
||||||
this(plugin, id, file, type, callback, false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize the updater with the provided callback.
|
|
||||||
*
|
|
||||||
* @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 callback The callback instance to notify when the Updater has finished
|
|
||||||
* @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, UpdateCallback callback, boolean announce) {
|
|
||||||
this.plugin = plugin;
|
|
||||||
this.type = type;
|
|
||||||
this.announce = announce;
|
|
||||||
this.file = file;
|
|
||||||
this.id = id;
|
|
||||||
this.updateFolder = this.plugin.getServer().getUpdateFolderFile();
|
|
||||||
this.callback = callback;
|
|
||||||
|
|
||||||
final File pluginFile = this.plugin.getDataFolder().getParentFile();
|
|
||||||
final File updaterFile = new File(pluginFile, "Updater");
|
|
||||||
final File updaterConfigFile = new File(updaterFile, "config.yml");
|
|
||||||
|
|
||||||
YamlConfiguration config = new YamlConfiguration();
|
|
||||||
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.");
|
|
||||||
config.addDefault(API_KEY_CONFIG_KEY, API_KEY_DEFAULT);
|
|
||||||
config.addDefault(DISABLE_CONFIG_KEY, DISABLE_DEFAULT);
|
|
||||||
|
|
||||||
if (!updaterFile.exists()) {
|
|
||||||
this.fileIOOrError(updaterFile, updaterFile.mkdir(), true);
|
|
||||||
}
|
|
||||||
|
|
||||||
boolean createFile = !updaterConfigFile.exists();
|
|
||||||
try {
|
|
||||||
if (createFile) {
|
|
||||||
this.fileIOOrError(updaterConfigFile, updaterConfigFile.createNewFile(), true);
|
|
||||||
config.options().copyDefaults(true);
|
|
||||||
config.save(updaterConfigFile);
|
|
||||||
} else {
|
|
||||||
config.load(updaterConfigFile);
|
|
||||||
}
|
|
||||||
} catch (final Exception e) {
|
|
||||||
final String message;
|
|
||||||
if (createFile) {
|
|
||||||
message = "The updater could not create configuration at " + updaterFile.getAbsolutePath();
|
|
||||||
} else {
|
|
||||||
message = "The updater could not load configuration at " + updaterFile.getAbsolutePath();
|
|
||||||
}
|
|
||||||
this.plugin.getLogger().log(Level.SEVERE, message, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (config.getBoolean(DISABLE_CONFIG_KEY)) {
|
|
||||||
this.result = UpdateResult.DISABLED;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
String key = config.getString(API_KEY_CONFIG_KEY);
|
|
||||||
if (API_KEY_DEFAULT.equalsIgnoreCase(key) || "".equals(key)) {
|
|
||||||
key = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.apiKey = key;
|
|
||||||
|
|
||||||
try {
|
|
||||||
this.url = new URL(Updater.HOST + Updater.QUERY + this.id);
|
|
||||||
} catch (final MalformedURLException e) {
|
|
||||||
this.plugin.getLogger().log(Level.SEVERE, "The project ID provided for updating, " + this.id + " is invalid.", e);
|
|
||||||
this.result = UpdateResult.FAIL_BADID;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.result != UpdateResult.FAIL_BADID) {
|
|
||||||
this.thread = new Thread(new UpdateRunnable());
|
|
||||||
this.thread.start();
|
|
||||||
} else {
|
|
||||||
runUpdater();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the result of the update process.
|
|
||||||
*
|
|
||||||
* @return result of the update process.
|
|
||||||
* @see UpdateResult
|
|
||||||
*/
|
|
||||||
public Updater.UpdateResult getResult() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's release type.
|
|
||||||
*
|
|
||||||
* @return latest version's release type.
|
|
||||||
* @see ReleaseType
|
|
||||||
*/
|
|
||||||
public ReleaseType getLatestType() {
|
|
||||||
this.waitForThread();
|
|
||||||
if (this.versionType != null) {
|
|
||||||
for (ReleaseType type : ReleaseType.values()) {
|
|
||||||
if (this.versionType.equalsIgnoreCase(type.name())) {
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's game version (such as "CB 1.2.5-R1.0").
|
|
||||||
*
|
|
||||||
* @return latest version's game version.
|
|
||||||
*/
|
|
||||||
public String getLatestGameVersion() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.versionGameVersion;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's name (such as "Project v1.0").
|
|
||||||
*
|
|
||||||
* @return latest version's name.
|
|
||||||
*/
|
|
||||||
public String getLatestName() {
|
|
||||||
this.waitForThread();
|
|
||||||
return this.versionName;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the latest version's direct file link.
|
|
||||||
*
|
|
||||||
* @return 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) {
|
|
||||||
this.plugin.getLogger().log(Level.SEVERE, null, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Save an update from dev.bukkit.org into the server's update folder.
|
|
||||||
*
|
|
||||||
* @param file the name of the file to save it as.
|
|
||||||
*/
|
|
||||||
private void saveFile(String file) {
|
|
||||||
final File folder = this.updateFolder;
|
|
||||||
|
|
||||||
deleteOldFiles();
|
|
||||||
if (!folder.exists()) {
|
|
||||||
this.fileIOOrError(folder, folder.mkdir(), true);
|
|
||||||
}
|
|
||||||
downloadFile();
|
|
||||||
|
|
||||||
// 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.getAbsolutePath());
|
|
||||||
}
|
|
||||||
if (this.announce) {
|
|
||||||
this.plugin.getLogger().info("Finished updating.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Download a file and save it to the specified folder.
|
|
||||||
*/
|
|
||||||
private void downloadFile() {
|
|
||||||
BufferedInputStream in = null;
|
|
||||||
FileOutputStream fout = null;
|
|
||||||
try {
|
|
||||||
URL fileUrl = followRedirects(this.versionLink);
|
|
||||||
final int fileLength = fileUrl.openConnection().getContentLength();
|
|
||||||
in = new BufferedInputStream(fileUrl.openStream());
|
|
||||||
fout = new FileOutputStream(new File(this.updateFolder, file.getName()));
|
|
||||||
|
|
||||||
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.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception ex) {
|
|
||||||
this.plugin.getLogger().log(Level.WARNING, "The auto-updater tried to download a new update, but was unsuccessful.", ex);
|
|
||||||
this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
|
|
||||||
} finally {
|
|
||||||
try {
|
|
||||||
if (in != null) {
|
|
||||||
in.close();
|
|
||||||
}
|
|
||||||
} catch (final IOException ex) {
|
|
||||||
this.plugin.getLogger().log(Level.SEVERE, null, ex);
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
if (fout != null) {
|
|
||||||
fout.close();
|
|
||||||
}
|
|
||||||
} catch (final IOException ex) {
|
|
||||||
this.plugin.getLogger().log(Level.SEVERE, null, ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private URL followRedirects(String location) throws IOException {
|
|
||||||
URL resourceUrl, base, next;
|
|
||||||
HttpURLConnection conn;
|
|
||||||
String redLoc;
|
|
||||||
while (true) {
|
|
||||||
resourceUrl = new URL(location);
|
|
||||||
conn = (HttpURLConnection) resourceUrl.openConnection();
|
|
||||||
|
|
||||||
conn.setConnectTimeout(15000);
|
|
||||||
conn.setReadTimeout(15000);
|
|
||||||
conn.setInstanceFollowRedirects(false);
|
|
||||||
conn.setRequestProperty("User-Agent", "Mozilla/5.0...");
|
|
||||||
|
|
||||||
switch (conn.getResponseCode()) {
|
|
||||||
case HttpURLConnection.HTTP_MOVED_PERM:
|
|
||||||
case HttpURLConnection.HTTP_MOVED_TEMP:
|
|
||||||
redLoc = conn.getHeaderField("Location");
|
|
||||||
base = new URL(location);
|
|
||||||
next = new URL(base, redLoc); // Deal with relative URLs
|
|
||||||
location = next.toExternalForm();
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return conn.getURL();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Remove possibly leftover files from the update folder.
|
|
||||||
*/
|
|
||||||
private void deleteOldFiles() {
|
|
||||||
//Just a quick check to make sure we didn't leave any files from last time...
|
|
||||||
File[] list = listFilesOrError(this.updateFolder);
|
|
||||||
for (final File xFile : list) {
|
|
||||||
if (xFile.getName().endsWith(".zip")) {
|
|
||||||
this.fileIOOrError(xFile, xFile.mkdir(), true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Part of Zip-File-Extractor, modified by Gravity for use with Updater.
|
|
||||||
*
|
|
||||||
* @param file the location of the file to extract.
|
|
||||||
*/
|
|
||||||
private void unzip(String file) {
|
|
||||||
final File fSourceZip = new File(file);
|
|
||||||
try {
|
|
||||||
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());
|
|
||||||
this.fileIOOrError(destinationFilePath.getParentFile(), destinationFilePath.getParentFile().mkdirs(), true);
|
|
||||||
if (!entry.isDirectory()) {
|
|
||||||
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.pluginExists(name)) {
|
|
||||||
File output = new File(this.updateFolder, name);
|
|
||||||
this.fileIOOrError(output, destinationFilePath.renameTo(output), true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
zipFile.close();
|
|
||||||
|
|
||||||
// Move any plugin data folders that were included to the right place, Bukkit won't do this for us.
|
|
||||||
moveNewZipFiles(zipPath);
|
|
||||||
|
|
||||||
} catch (final IOException e) {
|
|
||||||
this.plugin.getLogger().log(Level.SEVERE, "The auto-updater tried to unzip a new update file, but was unsuccessful.", e);
|
|
||||||
this.result = Updater.UpdateResult.FAIL_DOWNLOAD;
|
|
||||||
} finally {
|
|
||||||
this.fileIOOrError(fSourceZip, fSourceZip.delete(), false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find any new files extracted from an update into the plugin's data directory.
|
|
||||||
* @param zipPath path of extracted files.
|
|
||||||
*/
|
|
||||||
private void moveNewZipFiles(String zipPath) {
|
|
||||||
File[] list = listFilesOrError(new File(zipPath));
|
|
||||||
for (final File dFile : list) {
|
|
||||||
if (dFile.isDirectory() && this.pluginExists(dFile.getName())) {
|
|
||||||
// Current dir
|
|
||||||
final File oFile = new File(this.plugin.getDataFolder().getParent(), dFile.getName());
|
|
||||||
// List of existing files in the new dir
|
|
||||||
final File[] dList = listFilesOrError(dFile);
|
|
||||||
// List of existing files in the current dir
|
|
||||||
final File[] oList = listFilesOrError(oFile);
|
|
||||||
for (File cFile : dList) {
|
|
||||||
// Loop through all the files in the new dir
|
|
||||||
boolean found = false;
|
|
||||||
for (final File xFile : oList) {
|
|
||||||
// Loop through all the contents in the current dir to see if it exists
|
|
||||||
if (xFile.getName().equals(cFile.getName())) {
|
|
||||||
found = true;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!found) {
|
|
||||||
// Move the new file into the current dir
|
|
||||||
File output = new File(oFile, cFile.getName());
|
|
||||||
this.fileIOOrError(output, cFile.renameTo(output), true);
|
|
||||||
} else {
|
|
||||||
// This file already exists, so we don't need it anymore.
|
|
||||||
this.fileIOOrError(cFile, cFile.delete(), false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
this.fileIOOrError(dFile, dFile.delete(), false);
|
|
||||||
}
|
|
||||||
File zip = new File(zipPath);
|
|
||||||
this.fileIOOrError(zip, zip.delete(), false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if the name of a jar is one of the plugins currently installed, used for extracting the correct files out of a zip.
|
|
||||||
*
|
|
||||||
* @param name a name to check for inside the plugins folder.
|
|
||||||
* @return true if a file inside the plugins folder is named this.
|
|
||||||
*/
|
|
||||||
private boolean pluginExists(String name) {
|
|
||||||
File[] plugins = listFilesOrError(new File("plugins"));
|
|
||||||
for (final File file : plugins) {
|
|
||||||
if (file.getName().equals(name)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check to see if the program should continue by evaluating whether the plugin is already updated, or shouldn't be updated.
|
|
||||||
*
|
|
||||||
* @return true if the version was located and is not the same as the remote's newest.
|
|
||||||
*/
|
|
||||||
private boolean versionCheck() {
|
|
||||||
final String title = this.versionName;
|
|
||||||
if (this.type != UpdateType.NO_VERSION_CHECK) {
|
|
||||||
final String localVersion = this.plugin.getDescription().getVersion();
|
|
||||||
if (title.split(DELIMETER).length >= 2) {
|
|
||||||
// Get the newest file's version number
|
|
||||||
final String remoteVersion = title.split(DELIMETER)[title.split(DELIMETER).length - 1].split(" ")[0];
|
|
||||||
|
|
||||||
if (this.hasTag(localVersion) || !this.shouldUpdate(localVersion, remoteVersion)) {
|
|
||||||
// We already have the latest version, or this build is tagged for no-update
|
|
||||||
this.result = Updater.UpdateResult.NO_UPDATE;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// The file's name did not contain the string 'vVersion'
|
|
||||||
final String authorInfo = this.plugin.getDescription().getAuthors().isEmpty() ? "" : " (" + this.plugin.getDescription().getAuthors().get(0) + ")";
|
|
||||||
this.plugin.getLogger().warning("The author of this plugin" + authorInfo + " has misconfigured their Auto Update system");
|
|
||||||
this.plugin.getLogger().warning("File versions should follow the format 'PluginName vVERSION'");
|
|
||||||
this.plugin.getLogger().warning("Please notify the author of this error.");
|
|
||||||
this.result = Updater.UpdateResult.FAIL_NOVERSION;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <b>If you wish to run mathematical versioning checks, edit this method.</b>
|
|
||||||
* <p>
|
|
||||||
* With default behavior, Updater will NOT verify that a remote version available on BukkitDev
|
|
||||||
* which is not this version is indeed an "update".
|
|
||||||
* If a version is present on BukkitDev that is not the version that is currently running,
|
|
||||||
* Updater will assume that it is a newer version.
|
|
||||||
* This is because there is no standard versioning scheme, and creating a calculation that can
|
|
||||||
* determine whether a new update is actually an update is sometimes extremely complicated.
|
|
||||||
* </p>
|
|
||||||
* <p>
|
|
||||||
* Updater will call this method from {@link #versionCheck()} before deciding whether
|
|
||||||
* the remote version is actually an update.
|
|
||||||
* If you have a specific versioning scheme with which a mathematical determination can
|
|
||||||
* be reliably made to decide whether one version is higher than another, you may
|
|
||||||
* revise this method, using the local and remote version parameters, to execute the
|
|
||||||
* appropriate check.
|
|
||||||
* </p>
|
|
||||||
* <p>
|
|
||||||
* Returning a value of <b>false</b> will tell the update process that this is NOT a new version.
|
|
||||||
* Without revision, this method will always consider a remote version at all different from
|
|
||||||
* that of the local version a new update.
|
|
||||||
* </p>
|
|
||||||
* @param localVersion the current version
|
|
||||||
* @param remoteVersion the remote version
|
|
||||||
* @return true if Updater should consider the remote version an update, false if not.
|
|
||||||
*/
|
|
||||||
public boolean shouldUpdate(String localVersion, String remoteVersion) {
|
|
||||||
return !localVersion.equalsIgnoreCase(remoteVersion);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Evaluate whether the version number is marked showing that it should not be updated by this program.
|
|
||||||
*
|
|
||||||
* @param version a version number to check for tags in.
|
|
||||||
* @return true if updating should be disabled.
|
|
||||||
*/
|
|
||||||
private boolean hasTag(String version) {
|
|
||||||
for (final String string : Updater.NO_UPDATE_TAG) {
|
|
||||||
if (version.contains(string)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Make a connection to the BukkitDev API and request the newest file's details.
|
|
||||||
*
|
|
||||||
* @return true if successful.
|
|
||||||
*/
|
|
||||||
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.USER_AGENT);
|
|
||||||
|
|
||||||
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.isEmpty()) {
|
|
||||||
this.plugin.getLogger().warning("The updater could not find any files for the project id " + this.id);
|
|
||||||
this.result = UpdateResult.FAIL_BADID;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
JSONObject latestUpdate = (JSONObject) array.get(array.size() - 1);
|
|
||||||
this.versionName = (String) latestUpdate.get(Updater.TITLE_VALUE);
|
|
||||||
this.versionLink = (String) latestUpdate.get(Updater.LINK_VALUE);
|
|
||||||
this.versionType = (String) latestUpdate.get(Updater.TYPE_VALUE);
|
|
||||||
this.versionGameVersion = (String) latestUpdate.get(Updater.VERSION_VALUE);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
} catch (final IOException e) {
|
|
||||||
if (e.getMessage().contains("HTTP response code: 403")) {
|
|
||||||
this.plugin.getLogger().severe("dev.bukkit.org rejected the API key provided in plugins/Updater/config.yml");
|
|
||||||
this.plugin.getLogger().severe("Please double-check your configuration to ensure it is correct.");
|
|
||||||
this.result = UpdateResult.FAIL_APIKEY;
|
|
||||||
} else {
|
|
||||||
this.plugin.getLogger().severe("The updater could not contact dev.bukkit.org for updating.");
|
|
||||||
this.plugin.getLogger().severe("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;
|
|
||||||
}
|
|
||||||
this.plugin.getLogger().log(Level.SEVERE, null, e);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Perform a file operation and log any errors if it fails.
|
|
||||||
* @param file file operation is performed on.
|
|
||||||
* @param result result of file operation.
|
|
||||||
* @param create true if a file is being created, false if deleted.
|
|
||||||
*/
|
|
||||||
private void fileIOOrError(File file, boolean result, boolean create) {
|
|
||||||
if (!result) {
|
|
||||||
this.plugin.getLogger().severe("The updater could not " + (create ? "create" : "delete") + " file at: " + file.getAbsolutePath());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private File[] listFilesOrError(File folder) {
|
|
||||||
File[] contents = folder.listFiles();
|
|
||||||
if (contents == null) {
|
|
||||||
this.plugin.getLogger().severe("The updater could not access files at: " + this.updateFolder.getAbsolutePath());
|
|
||||||
return new File[0];
|
|
||||||
} else {
|
|
||||||
return contents;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Called on main thread when the Updater has finished working, regardless
|
|
||||||
* of result.
|
|
||||||
*/
|
|
||||||
public interface UpdateCallback {
|
|
||||||
/**
|
|
||||||
* Called when the updater has finished working.
|
|
||||||
* @param updater The updater instance
|
|
||||||
*/
|
|
||||||
void onFinish(Updater updater);
|
|
||||||
}
|
|
||||||
|
|
||||||
private class UpdateRunnable implements Runnable {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
runUpdater();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void runUpdater() {
|
|
||||||
if (this.url != null && (this.read() && this.versionCheck())) {
|
|
||||||
// Obtain the results of the project's file feed
|
|
||||||
if ((this.versionLink != null) && (this.type != UpdateType.NO_DOWNLOAD)) {
|
|
||||||
String name = this.file.getName();
|
|
||||||
// If it's a zip file, it shouldn't be downloaded as the plugin's name
|
|
||||||
if (this.versionLink.endsWith(".zip")) {
|
|
||||||
name = this.versionLink.substring(this.versionLink.lastIndexOf("/") + 1);
|
|
||||||
}
|
|
||||||
this.saveFile(name);
|
|
||||||
} else {
|
|
||||||
this.result = UpdateResult.UPDATE_AVAILABLE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.callback != null) {
|
|
||||||
new BukkitRunnable() {
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
runCallback();
|
|
||||||
}
|
|
||||||
}.runTask(this.plugin);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void runCallback() {
|
|
||||||
this.callback.onFinish(this);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -140,25 +140,9 @@ public class commandpanels extends JavaPlugin {
|
|||||||
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Could not find config version! Your config may be missing some information!");
|
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: Could not find config version! Your config may be missing some information!");
|
||||||
}
|
}
|
||||||
|
|
||||||
githubNewUpdate();
|
if (this.config.getString("config.update-notifications").equalsIgnoreCase("true")) {
|
||||||
/*try {
|
githubNewUpdate();
|
||||||
if (this.config.getString("config.update-notifications").trim().equalsIgnoreCase("true")) {
|
}
|
||||||
if(!this.getDescription().getVersion().contains("-")) {
|
|
||||||
Updater check = new Updater(this, 325941, this.getFile(), Updater.UpdateType.NO_DOWNLOAD, true);
|
|
||||||
if (!check.getLatestName().toLowerCase().trim().equals("commandpanels v" + this.getDescription().getVersion())) {
|
|
||||||
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " WARNING: CommandPanels is not running the latest version (" + check.getLatestName().trim() + ") Download a new version at");
|
|
||||||
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " https://www.spigotmc.org/resources/command-panels-custom-guis.67788/");
|
|
||||||
this.update = true;
|
|
||||||
} else {
|
|
||||||
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.GREEN + " CommandPanels is up to date.");
|
|
||||||
}
|
|
||||||
}else{
|
|
||||||
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.GREEN + " CommandPanels is running a custom version.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Exception var9) {
|
|
||||||
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " Could not check for update online.");
|
|
||||||
}*/
|
|
||||||
|
|
||||||
//load panelFiles
|
//load panelFiles
|
||||||
reloadPanelFiles();
|
reloadPanelFiles();
|
||||||
@ -1558,14 +1542,27 @@ public class commandpanels extends JavaPlugin {
|
|||||||
|
|
||||||
public void githubNewUpdate(){
|
public void githubNewUpdate(){
|
||||||
HttpURLConnection connection;
|
HttpURLConnection connection;
|
||||||
String WRITE;
|
|
||||||
String gitVersion;
|
String gitVersion;
|
||||||
|
if(this.getDescription().getVersion().contains("-")){
|
||||||
|
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.GREEN + " Running a custom version.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
try{
|
try{
|
||||||
connection = (HttpURLConnection) new URL("https://raw.githubusercontent.com/rockyhawk64/CommandPanels/master/resource/plugin.yml").openConnection();
|
connection = (HttpURLConnection) new URL("https://raw.githubusercontent.com/rockyhawk64/CommandPanels/master/resource/plugin.yml").openConnection();
|
||||||
connection.connect();
|
connection.connect();
|
||||||
gitVersion = new BufferedReader(new InputStreamReader(connection.getInputStream())).readLine().split("\\s")[1];
|
gitVersion = new BufferedReader(new InputStreamReader(connection.getInputStream())).readLine().split("\\s")[1];
|
||||||
getServer().getConsoleSender().sendMessage(ChatColor.GREEN + gitVersion);
|
if(gitVersion.contains("-")){
|
||||||
|
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " Cannot check for update.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if(this.getDescription().getVersion().equals(gitVersion)){
|
||||||
|
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.GREEN + " Up to date.");
|
||||||
|
}else{
|
||||||
|
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " Outdated version.");
|
||||||
|
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " Your version " + this.getDescription().getVersion() + " Current version " + gitVersion);
|
||||||
|
}
|
||||||
}catch(IOException e){
|
}catch(IOException e){
|
||||||
|
Bukkit.getConsoleSender().sendMessage("[CommandPanels]" + ChatColor.RED + " Error checking for updates online.");
|
||||||
debug(e);
|
debug(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user