Better handling for updates checking, can now autoupdate on dev and release builds

This commit is contained in:
libraryaddict
2020-04-27 05:09:13 +12:00
parent 41dffe1b46
commit b247a49a23
14 changed files with 760 additions and 457 deletions

View File

@@ -16,6 +16,7 @@ import me.libraryaddict.disguise.utilities.LibsPremium;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
import org.bukkit.*;
import org.bukkit.configuration.InvalidConfigurationException;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.*;
import org.bukkit.inventory.EquipmentSlot;
@@ -158,21 +159,13 @@ public class ReflectionManager {
return true;
}
/**
* Copied from Bukkit
*/
public static YamlConfiguration getPluginYAML(File file) {
public static String getResourceAsString(File file, String fileName) {
try (JarFile jar = new JarFile(file)) {
JarEntry entry = jar.getJarEntry("plugin.yml");
JarEntry entry = jar.getJarEntry(fileName);
try (InputStream stream = jar.getInputStream(entry)) {
YamlConfiguration config = new YamlConfiguration();
String configString = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)).lines()
return new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)).lines()
.collect(Collectors.joining("\n"));
config.loadFromString(configString);
return config;
}
}
catch (Exception ex) {
@@ -182,6 +175,30 @@ public class ReflectionManager {
return null;
}
/**
* Copied from Bukkit
*/
public static YamlConfiguration getPluginYAML(File file) {
try {
String s = getResourceAsString(file, "plugin.yml");
if (s == null) {
return null;
}
YamlConfiguration config = new YamlConfiguration();
config.loadFromString(getResourceAsString(file, "plugin.yml"));
return config;
}
catch (InvalidConfigurationException e) {
e.printStackTrace();
}
return null;
}
public static int getNewEntityId() {
return getNewEntityId(true);
}