From f119b226b1f14bfacb8516697dee719e325d1151 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Tue, 15 Nov 2022 15:40:38 +0100 Subject: [PATCH] 1.4 --- pom.xml | 5 ++-- .../net/t2code/t2callayduplicate/Util.java | 6 +++- .../t2callayduplicate/config/ConfigFile.java | 29 +++++++++++++++++++ .../t2code/t2callayduplicate/system/Main.java | 5 ++-- 4 files changed, 39 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 5667b35..eac3163 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2C-AllayDuplicate - 1.3 + 1.4 jar T2C AllayDuplicate @@ -89,8 +89,7 @@ net.t2code T2CodeLib - DEV-13.0 - dev-5 + 13.4 net.t2code.plotsquared diff --git a/src/main/java/net/t2code/t2callayduplicate/Util.java b/src/main/java/net/t2code/t2callayduplicate/Util.java index bbdaa53..a3f229f 100644 --- a/src/main/java/net/t2code/t2callayduplicate/Util.java +++ b/src/main/java/net/t2code/t2callayduplicate/Util.java @@ -7,7 +7,7 @@ public class Util { } public static String getRequiredT2CodeLibVersion() { - return "13.0"; + return "13.4"; } public static String getPrefix() { @@ -18,6 +18,10 @@ public class Util { return 103745; } + public static String getGit() { + return "JaTiTV/T2C-AllayDuplicate"; + } + public static Integer getBstatsID() { return 15932; } diff --git a/src/main/java/net/t2code/t2callayduplicate/config/ConfigFile.java b/src/main/java/net/t2code/t2callayduplicate/config/ConfigFile.java index 6998e73..e2eaac3 100644 --- a/src/main/java/net/t2code/t2callayduplicate/config/ConfigFile.java +++ b/src/main/java/net/t2code/t2callayduplicate/config/ConfigFile.java @@ -18,6 +18,10 @@ public class ConfigFile { YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); T2Cconfig.set("Plugin.Language", "ENGLISH", yamlConfiguration); + T2Cconfig.set("Plugin.updateCheck.onJoin",true,yamlConfiguration); + T2Cconfig.set("Plugin.updateCheck.seePreReleaseUpdates",true,yamlConfiguration); + T2Cconfig.set("Plugin.updateCheck.timeInterval",60,yamlConfiguration); + T2Cconfig.set("Duplicate.SneakRequired", true, yamlConfiguration); T2Cconfig.set("Duplicate.Item.Enable", true, yamlConfiguration); T2Cconfig.set("Duplicate.Item.Material", Material.AMETHYST_SHARD.toString(), yamlConfiguration); @@ -71,6 +75,9 @@ public class ConfigFile { File config = new File(Main.getPath(), "config.yml"); YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); language = yamlConfiguration.getString("Plugin.Language"); + updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.updateCheck.onJoin"); + updateCheckSeePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.updateCheck.seePreReleaseUpdates"); + updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.updateCheck.timeInterval"); sneakRequired = yamlConfiguration.getBoolean("Duplicate.SneakRequired"); itemEnable = yamlConfiguration.getBoolean("Duplicate.Item.Enable"); @@ -122,6 +129,11 @@ public class ConfigFile { } private static String language; + + + private static Boolean updateCheckOnJoin; + private static Boolean updateCheckSeePreReleaseUpdates; + private static Integer updateCheckTimeInterval; private static Boolean sneakRequired; private static Boolean itemEnable; private static String itemMaterial; @@ -153,6 +165,22 @@ public class ConfigFile { private static String reset; private static String ResetAll; + public static String getLanguage() { + return language; + } + + public static Boolean getUpdateCheckOnJoin() { + return updateCheckOnJoin; + } + + public static Boolean getUpdateCheckSeePreReleaseUpdates() { + return updateCheckSeePreReleaseUpdates; + } + + public static Integer getUpdateCheckTimeInterval() { + return updateCheckTimeInterval; + } + public static Boolean getSneakRequired() { return sneakRequired; } @@ -240,6 +268,7 @@ public class ConfigFile { public static String getErrorReset() { return errorReset; } + public static String getErrorCanNotBuild() { return errorCanNotBuild; } diff --git a/src/main/java/net/t2code/t2callayduplicate/system/Main.java b/src/main/java/net/t2code/t2callayduplicate/system/Main.java index 655e9ce..e192dd0 100644 --- a/src/main/java/net/t2code/t2callayduplicate/system/Main.java +++ b/src/main/java/net/t2code/t2callayduplicate/system/Main.java @@ -50,7 +50,7 @@ public final class Main extends JavaPlugin { if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return; enable = true; long long_ = T2Ctemplate.onLoadHeader(Util.getPrefix(), this.getDescription().getAuthors(), this.getDescription().getVersion(), Util.getSpigot(), Util.getDiscord()); - T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(), Util.getSpigotID(), Util.getDiscord()); + Metrics.Bstats(); if (T2CpluginCheck.plotSquared()) { @@ -66,7 +66,8 @@ public final class Main extends JavaPlugin { ConfigFile.create(); ConfigFile.select(); - + T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(),Util.getGit(), Util.getSpigotID(), Util.getDiscord() + ,ConfigFile.getUpdateCheckOnJoin(),ConfigFile.getUpdateCheckSeePreReleaseUpdates(),ConfigFile.getUpdateCheckTimeInterval()); this.getCommand("t2c-allayduplicate").setExecutor(new CmdExecuter()); T2Cregister.listener(new Event(), this); T2Ctemplate.onLoadFooter(Util.getPrefix(), long_);