From dab5a4f557f5b06d40d808af72c2b57efa93657e Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Mon, 14 Nov 2022 14:19:07 +0100 Subject: [PATCH 1/4] Update pom.xml --- OpSecurity V3/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OpSecurity V3/pom.xml b/OpSecurity V3/pom.xml index 2772c25..8884959 100644 --- a/OpSecurity V3/pom.xml +++ b/OpSecurity V3/pom.xml @@ -81,7 +81,8 @@ net.t2code T2CodeLib - 13.2 + DEV-13.4 + dev-1 -- 2.34.1 From 31a958ce7f576cebae4590fe8caafc2d629401a0 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Mon, 14 Nov 2022 19:50:48 +0100 Subject: [PATCH 2/4] Update pom.xml --- OpSecurity V3/pom.xml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/OpSecurity V3/pom.xml b/OpSecurity V3/pom.xml index 8884959..839a0c0 100644 --- a/OpSecurity V3/pom.xml +++ b/OpSecurity V3/pom.xml @@ -17,6 +17,7 @@ + ${project.artifactId}_${project.version} org.apache.maven.plugins @@ -82,7 +83,8 @@ net.t2code T2CodeLib DEV-13.4 - dev-1 + snapshot-1 + provided @@ -91,11 +93,5 @@ 1.18.24 provided - - org.projectlombok - lombok - 1.18.22 - compile - -- 2.34.1 From 6fbd56ea632f286e4ea0ab79d9a6fce860dec608 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Mon, 14 Nov 2022 20:15:30 +0100 Subject: [PATCH 3/4] 3.0.3 New Update Checker --- OpSecurity V3/pom.xml | 2 +- OpSecurity V3/src/main/java/net/t2code/opsecurity/Util.java | 5 ++++- .../src/main/java/net/t2code/opsecurity/system/Load.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/OpSecurity V3/pom.xml b/OpSecurity V3/pom.xml index 839a0c0..fa8984b 100644 --- a/OpSecurity V3/pom.xml +++ b/OpSecurity V3/pom.xml @@ -6,7 +6,7 @@ net.t2code T2C-OPSecurity - 3.0.2 + 3.0.3 jar T2C-OPSecurity diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/Util.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/Util.java index 89aae40..f424423 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/Util.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/Util.java @@ -8,7 +8,7 @@ public class Util { private static String infoText = ""; @Getter - private static String requiredT2CodeLibVersion = "13.2"; + private static String requiredT2CodeLibVersion = "13.4"; @Getter private static String prefix = "§8[§4T2C§8-§2OP§4Security§8]"; @@ -16,6 +16,9 @@ public class Util { @Getter private static Integer spigotID = 90739; + @Getter + private static String git = "JaTiTV/T2C-OPSecurity"; + @Getter private static Integer bstatsID = 10858; diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java index d93ccff..e0d9388 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java @@ -39,7 +39,7 @@ public class Load { Timer.refreshTimer(); Permissions.register(); - T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(), Util.getSpigotID(), Util.getDiscord()); + T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(),Util.getGit(),Util.getSpigotID(),Util.getDiscord()); Metrics.Bstats(plugin, Util.getBstatsID()); T2Ctemplate.onLoadFooter(Util.getPrefix(), long_); } -- 2.34.1 From 632c23b1ff9f8b605fb67d43bf42e2e1f83e98f7 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Tue, 15 Nov 2022 00:35:45 +0100 Subject: [PATCH 4/4] update to T2CodeLib 13.4 (sn 1) --- OpSecurity V3/pom.xml | 4 ++-- .../java/net/t2code/opsecurity/config/config/Config.java | 4 ++++ .../src/main/java/net/t2code/opsecurity/system/Load.java | 5 ++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/OpSecurity V3/pom.xml b/OpSecurity V3/pom.xml index fa8984b..a79e4d9 100644 --- a/OpSecurity V3/pom.xml +++ b/OpSecurity V3/pom.xml @@ -6,7 +6,7 @@ net.t2code T2C-OPSecurity - 3.0.3 + 3.0.3_SNAPSHOT-1 jar T2C-OPSecurity @@ -83,7 +83,7 @@ net.t2code T2CodeLib DEV-13.4 - snapshot-1 + snapshot-2 provided diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java index 7de3578..58c6ebd 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/config/config/Config.java @@ -9,6 +9,10 @@ public enum Config { language("plugin.language", "english", ConfigParam.STRING), onlyOPcanUseThePlugin("plugin.onlyOPcanUseThePlugin", true, ConfigParam.BOOLEAN), + updateCheckOnJoin("plugin.updateCheck.onJoin",true,ConfigParam.BOOLEAN), + updateCheckSeePreReleaseUpdates("plugin.updateCheck.seePreReleaseUpdates",true,ConfigParam.BOOLEAN), + updateCheckTimeInterval("plugin.updateCheck.timeInterval",60,ConfigParam.INTEGER), + checkOnJoin("check.onJoin", true, ConfigParam.BOOLEAN), checkOnInteract("check.onInteract", true, ConfigParam.BOOLEAN), checkOnCommand("check.onCommand", true, ConfigParam.BOOLEAN), diff --git a/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java b/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java index e0d9388..93ca1fc 100644 --- a/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java +++ b/OpSecurity V3/src/main/java/net/t2code/opsecurity/system/Load.java @@ -3,6 +3,7 @@ package net.t2code.opsecurity.system; import net.t2code.opsecurity.Util; import net.t2code.opsecurity.command.CmdExecuter; import net.t2code.opsecurity.config.FileSelect; +import net.t2code.opsecurity.config.config.Config; import net.t2code.opsecurity.config.config.Converter; import net.t2code.opsecurity.events.Events; import net.t2code.opsecurity.events.OpCommand; @@ -11,6 +12,7 @@ import net.t2code.opsecurity.check.Timer; import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; import net.t2code.t2codelib.SPIGOT.api.register.T2Cregister; import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI; +import org.checkerframework.checker.units.qual.C; import java.util.List; import java.util.logging.Level; @@ -39,7 +41,8 @@ public class Load { Timer.refreshTimer(); Permissions.register(); - T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(),Util.getGit(),Util.getSpigotID(),Util.getDiscord()); + T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(),Util.getGit(),Util.getSpigotID(),Util.getDiscord(), Config.updateCheckOnJoin.valueBoolean, + Config.updateCheckSeePreReleaseUpdates.valueBoolean, Config.updateCheckTimeInterval.valueInt); Metrics.Bstats(plugin, Util.getBstatsID()); T2Ctemplate.onLoadFooter(Util.getPrefix(), long_); } -- 2.34.1