Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
c4282817b0 | |||
|
b00b201bce | ||
709bd16317 | |||
66dc27483b | |||
623d6f8c12 |
2
pom.xml
2
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>T2CodeLib</artifactId>
|
<artifactId>T2CodeLib</artifactId>
|
||||||
<version>14.4</version>
|
<version>14.6</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>T2CodeLib</name>
|
<name>T2CodeLib</name>
|
||||||
|
@@ -5,6 +5,7 @@ import net.md_5.bungee.api.ProxyServer;
|
|||||||
import net.md_5.bungee.api.plugin.Plugin;
|
import net.md_5.bungee.api.plugin.Plugin;
|
||||||
import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend;
|
import net.t2code.t2codelib.BUNGEE.api.messages.T2CBsend;
|
||||||
import net.t2code.t2codelib.BUNGEE.system.config.T2CBlibConfig;
|
import net.t2code.t2codelib.BUNGEE.system.config.T2CBlibConfig;
|
||||||
|
import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig;
|
||||||
import net.t2code.t2codelib.T2CupdateObject;
|
import net.t2code.t2codelib.T2CupdateObject;
|
||||||
import net.t2code.t2codelib.T2CupdateWebData;
|
import net.t2code.t2codelib.T2CupdateWebData;
|
||||||
import net.t2code.t2codelib.UpdateType;
|
import net.t2code.t2codelib.UpdateType;
|
||||||
@@ -48,8 +49,13 @@ public class T2CBupdateAPI {
|
|||||||
private static String pluginVersion;
|
private static String pluginVersion;
|
||||||
|
|
||||||
public static void onUpdateCheckTimer(Plugin plugin, String prefix, String discord, Integer spigotID, String url) {
|
public static void onUpdateCheckTimer(Plugin plugin, String prefix, String discord, Integer spigotID, String url) {
|
||||||
|
Integer finalInterval;
|
||||||
|
if (T2CBlibConfig.getUpdateTimer() < 1){
|
||||||
|
finalInterval = 1;
|
||||||
|
} else finalInterval = T2CBlibConfig.getUpdateTimer();
|
||||||
ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() {
|
ProxyServer.getInstance().getScheduler().schedule(plugin, new Runnable() {
|
||||||
public void run() {
|
public void run() {
|
||||||
|
if (T2CBlibConfig.getUpdateCheckFullDisable()) return;
|
||||||
(new T2CBupdateCheckerGit(plugin, spigotID)).getVersion((webData) -> {
|
(new T2CBupdateCheckerGit(plugin, spigotID)).getVersion((webData) -> {
|
||||||
pluginVersion = plugin.getDescription().getVersion();
|
pluginVersion = plugin.getDescription().getVersion();
|
||||||
T2CupdateObject update = new T2CupdateObject(
|
T2CupdateObject update = new T2CupdateObject(
|
||||||
@@ -72,6 +78,6 @@ public class T2CBupdateAPI {
|
|||||||
}
|
}
|
||||||
}, pluginVersion, spigotID, url);
|
}, pluginVersion, spigotID, url);
|
||||||
}
|
}
|
||||||
}, 0, T2CBlibConfig.getUpdateTimer() * 60 * 20L, TimeUnit.SECONDS);
|
}, 0, finalInterval * 60 * 20L, TimeUnit.SECONDS);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -26,6 +26,7 @@ public class T2CBupdateCheckerGit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String gitKey) {
|
public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String gitKey) {
|
||||||
|
if (T2CBlibConfig.getUpdateCheckFullDisable()) return;
|
||||||
String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1";
|
String RepoURL = "https://git.t2code.net/api/v1/repos/" + gitKey + "/releases?limit=1";
|
||||||
if (!T2CBlibConfig.getSeePreReleaseUpdates()) {
|
if (!T2CBlibConfig.getSeePreReleaseUpdates()) {
|
||||||
RepoURL = RepoURL + "&pre-release=false";
|
RepoURL = RepoURL + "&pre-release=false";
|
||||||
|
@@ -1,5 +1,6 @@
|
|||||||
package net.t2code.t2codelib.BUNGEE.system.config;
|
package net.t2code.t2codelib.BUNGEE.system.config;
|
||||||
|
|
||||||
|
import lombok.Getter;
|
||||||
import net.md_5.bungee.config.Configuration;
|
import net.md_5.bungee.config.Configuration;
|
||||||
import net.md_5.bungee.config.ConfigurationProvider;
|
import net.md_5.bungee.config.ConfigurationProvider;
|
||||||
import net.md_5.bungee.config.YamlConfiguration;
|
import net.md_5.bungee.config.YamlConfiguration;
|
||||||
@@ -22,6 +23,8 @@ public class T2CBlibConfig {
|
|||||||
}
|
}
|
||||||
Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config);
|
Configuration configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(config);
|
||||||
T2CBconfig.set("UpdateCheck.TimerInMin", 60, configuration);
|
T2CBconfig.set("UpdateCheck.TimerInMin", 60, configuration);
|
||||||
|
T2CBconfig.set("UpdateCheck.SeePreReleaseUpdates", true, configuration);
|
||||||
|
T2CBconfig.set("Plugin.UpdateCheck.AllPlugins.FullDisable", false, configuration);
|
||||||
|
|
||||||
T2CBconfig.set("API.CommandGUI.Enable", false, configuration);
|
T2CBconfig.set("API.CommandGUI.Enable", false, configuration);
|
||||||
T2CBconfig.set("API.AutoResponse.Enable", false, configuration);
|
T2CBconfig.set("API.AutoResponse.Enable", false, configuration);
|
||||||
@@ -37,35 +40,24 @@ public class T2CBlibConfig {
|
|||||||
|
|
||||||
updateTimer = configuration.getInt("UpdateCheck.TimerInMin");
|
updateTimer = configuration.getInt("UpdateCheck.TimerInMin");
|
||||||
seePreReleaseUpdates = configuration.getBoolean("UpdateCheck.SeePreReleaseUpdates");
|
seePreReleaseUpdates = configuration.getBoolean("UpdateCheck.SeePreReleaseUpdates");
|
||||||
|
updateCheckFullDisable = configuration.getBoolean("Plugin.UpdateCheck.AllPlugins.FullDisable");
|
||||||
|
|
||||||
apiCommandGUIEnable = configuration.getBoolean("API.CommandGUI.Enable");
|
apiCommandGUIEnable = configuration.getBoolean("API.CommandGUI.Enable");
|
||||||
apiAutoResponse = configuration.getBoolean("API.AutoResponse.Enable");
|
apiAutoResponse = configuration.getBoolean("API.AutoResponse.Enable");
|
||||||
apiOpSecurity = configuration.getBoolean("API.OPSecurity.Enable");
|
apiOpSecurity = configuration.getBoolean("API.OPSecurity.Enable");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Getter
|
||||||
private static Integer updateTimer;
|
private static Integer updateTimer;
|
||||||
|
@Getter
|
||||||
private static Boolean seePreReleaseUpdates;
|
private static Boolean seePreReleaseUpdates;
|
||||||
|
@Getter
|
||||||
|
private static Boolean updateCheckFullDisable;
|
||||||
|
@Getter
|
||||||
private static Boolean apiCommandGUIEnable;
|
private static Boolean apiCommandGUIEnable;
|
||||||
|
@Getter
|
||||||
private static Boolean apiAutoResponse;
|
private static Boolean apiAutoResponse;
|
||||||
|
@Getter
|
||||||
private static Boolean apiOpSecurity;
|
private static Boolean apiOpSecurity;
|
||||||
|
|
||||||
public static Integer getUpdateTimer() {
|
|
||||||
return updateTimer;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean getSeePreReleaseUpdates() {
|
|
||||||
return seePreReleaseUpdates;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean getApiCommandGUIEnable() {
|
|
||||||
return apiCommandGUIEnable;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean getApiAutoResponse() {
|
|
||||||
return apiAutoResponse;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Boolean getApiOpSecurity() {
|
|
||||||
return apiOpSecurity;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@@ -2,6 +2,7 @@ package net.t2code.t2codelib.SPIGOT.api.update;
|
|||||||
|
|
||||||
import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
|
import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
|
||||||
import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
|
import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
|
||||||
|
import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig;
|
||||||
import net.t2code.t2codelib.UpdateType;
|
import net.t2code.t2codelib.UpdateType;
|
||||||
import net.t2code.t2codelib.T2CupdateObject;
|
import net.t2code.t2codelib.T2CupdateObject;
|
||||||
import net.t2code.t2codelib.T2CupdateWebData;
|
import net.t2code.t2codelib.T2CupdateWebData;
|
||||||
@@ -180,6 +181,7 @@ public class T2CupdateAPI {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void onUpdateCheck(Plugin plugin, String prefix, String gitKey, Integer spigotID, String discord, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
|
public static void onUpdateCheck(Plugin plugin, String prefix, String gitKey, Integer spigotID, String discord, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
|
||||||
|
if (SelectLibConfig.getUpdateCheckFullDisable()) return;
|
||||||
new T2CupdateCheckerGit((JavaPlugin) plugin, prefix, gitKey, spigotID, discord, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
|
new T2CupdateCheckerGit((JavaPlugin) plugin, prefix, gitKey, spigotID, discord, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,6 +1,8 @@
|
|||||||
package net.t2code.t2codelib.SPIGOT.api.update;
|
package net.t2code.t2codelib.SPIGOT.api.update;
|
||||||
|
|
||||||
import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
|
import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
|
||||||
|
import net.t2code.t2codelib.SPIGOT.system.T2CodeLibMain;
|
||||||
|
import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig;
|
||||||
import net.t2code.t2codelib.T2CupdateObject;
|
import net.t2code.t2codelib.T2CupdateObject;
|
||||||
import net.t2code.t2codelib.T2CupdateWebData;
|
import net.t2code.t2codelib.T2CupdateWebData;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@@ -30,9 +32,15 @@ public class T2CupdateCheckerGit {
|
|||||||
}
|
}
|
||||||
String finalRepoURL = RepoURL;
|
String finalRepoURL = RepoURL;
|
||||||
|
|
||||||
|
Integer finalInterval;
|
||||||
|
if (timeInterval < 1){
|
||||||
|
finalInterval = 1;
|
||||||
|
} else finalInterval = timeInterval;
|
||||||
|
|
||||||
Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
|
Bukkit.getScheduler().runTaskTimerAsynchronously(plugin, new Runnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
|
if (SelectLibConfig.getUpdateCheckFullDisable()) return;
|
||||||
getVersion((webData) -> {
|
getVersion((webData) -> {
|
||||||
T2CupdateObject update = new T2CupdateObject(
|
T2CupdateObject update = new T2CupdateObject(
|
||||||
plugin.getName(),
|
plugin.getName(),
|
||||||
@@ -65,7 +73,7 @@ public class T2CupdateCheckerGit {
|
|||||||
|
|
||||||
}, plugin.getDescription().getVersion(), spigotID, finalRepoURL, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
|
}, plugin.getDescription().getVersion(), spigotID, finalRepoURL, updateCheckOnJoin, seePreReleaseUpdates, timeInterval);
|
||||||
}
|
}
|
||||||
}, 0L, timeInterval * 60 * 20L);
|
}, 0L, finalInterval * 60 * 20L);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String URL, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
|
public void getVersion(Consumer<T2CupdateWebData> consumer, String pluginVersion, Integer spigotID, String URL, Boolean updateCheckOnJoin, Boolean seePreReleaseUpdates, Integer timeInterval) {
|
||||||
|
@@ -22,9 +22,11 @@ public class ConfigCreate {
|
|||||||
File config = new File(T2CodeLibMain.getPath(), "config.yml");
|
File config = new File(T2CodeLibMain.getPath(), "config.yml");
|
||||||
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
|
||||||
|
|
||||||
|
|
||||||
T2Cconfig.set("Plugin.UpdateCheck.OnJoin", true, yamlConfiguration);
|
T2Cconfig.set("Plugin.UpdateCheck.OnJoin", true, yamlConfiguration);
|
||||||
T2Cconfig.set("Plugin.UpdateCheck.TimeInterval", 60, yamlConfiguration);
|
T2Cconfig.set("Plugin.UpdateCheck.TimeInterval", 60, yamlConfiguration);
|
||||||
T2Cconfig.set("Plugin.UpdateCheck.SeePreReleaseUpdates", true, yamlConfiguration);
|
T2Cconfig.set("Plugin.UpdateCheck.SeePreReleaseUpdates", true, yamlConfiguration);
|
||||||
|
T2Cconfig.set("Plugin.UpdateCheck.AllPlugins.FullDisable", false, yamlConfiguration);
|
||||||
T2Cconfig.set("Plugin.language", "english", yamlConfiguration);
|
T2Cconfig.set("Plugin.language", "english", yamlConfiguration);
|
||||||
|
|
||||||
T2Cconfig.set("BungeeCord.Enable", T2CodeLibMain.getIsBungee(), yamlConfiguration);
|
T2Cconfig.set("BungeeCord.Enable", T2CodeLibMain.getIsBungee(), yamlConfiguration);
|
||||||
|
@@ -17,6 +17,8 @@ public class SelectLibConfig {
|
|||||||
@Getter
|
@Getter
|
||||||
private static Boolean seePreReleaseUpdates;
|
private static Boolean seePreReleaseUpdates;
|
||||||
@Getter
|
@Getter
|
||||||
|
private static Boolean updateCheckFullDisable;
|
||||||
|
@Getter
|
||||||
private static Boolean debug;
|
private static Boolean debug;
|
||||||
@Getter
|
@Getter
|
||||||
private static String language;
|
private static String language;
|
||||||
@@ -36,6 +38,7 @@ public class SelectLibConfig {
|
|||||||
updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheck.OnJoin");
|
updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheck.OnJoin");
|
||||||
updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.UpdateCheck.TimeInterval");
|
updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.UpdateCheck.TimeInterval");
|
||||||
seePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.UpdateCheck.SeePreReleaseUpdates");
|
seePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.UpdateCheck.SeePreReleaseUpdates");
|
||||||
|
updateCheckFullDisable = yamlConfiguration.getBoolean("Plugin.UpdateCheck.AllPlugins.FullDisable");
|
||||||
debug = yamlConfiguration.getBoolean("Plugin.Debug");
|
debug = yamlConfiguration.getBoolean("Plugin.Debug");
|
||||||
language = yamlConfiguration.getString("Plugin.language");
|
language = yamlConfiguration.getString("Plugin.language");
|
||||||
bungee = yamlConfiguration.getBoolean("BungeeCord.Enable");
|
bungee = yamlConfiguration.getBoolean("BungeeCord.Enable");
|
||||||
|
Reference in New Issue
Block a user