Merge pull request 'dev-3.0.3' (#9) from dev-3.0.3 into main
Reviewed-on: #9
This commit is contained in:
commit
af608fad02
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>T2C-OPSecurity</artifactId>
|
<artifactId>T2C-OPSecurity</artifactId>
|
||||||
<version>3.0.2</version>
|
<version>3.0.3_SNAPSHOT-1</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>T2C-OPSecurity</name>
|
<name>T2C-OPSecurity</name>
|
||||||
@ -17,6 +17,7 @@
|
|||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
<finalName>${project.artifactId}_${project.version}</finalName>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
@ -81,7 +82,9 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>net.t2code</groupId>
|
<groupId>net.t2code</groupId>
|
||||||
<artifactId>T2CodeLib</artifactId>
|
<artifactId>T2CodeLib</artifactId>
|
||||||
<version>13.2</version>
|
<version>DEV-13.4</version>
|
||||||
|
<classifier>snapshot-2</classifier>
|
||||||
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
|
<!-- https://mvnrepository.com/artifact/org.projectlombok/lombok -->
|
||||||
<dependency>
|
<dependency>
|
||||||
@ -90,11 +93,5 @@
|
|||||||
<version>1.18.24</version>
|
<version>1.18.24</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.projectlombok</groupId>
|
|
||||||
<artifactId>lombok</artifactId>
|
|
||||||
<version>1.18.22</version>
|
|
||||||
<scope>compile</scope>
|
|
||||||
</dependency>
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
@ -8,7 +8,7 @@ public class Util {
|
|||||||
private static String infoText = "";
|
private static String infoText = "";
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private static String requiredT2CodeLibVersion = "13.2";
|
private static String requiredT2CodeLibVersion = "13.4";
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private static String prefix = "§8[§4T2C§8-§2OP§4Security§8]";
|
private static String prefix = "§8[§4T2C§8-§2OP§4Security§8]";
|
||||||
@ -16,6 +16,9 @@ public class Util {
|
|||||||
@Getter
|
@Getter
|
||||||
private static Integer spigotID = 90739;
|
private static Integer spigotID = 90739;
|
||||||
|
|
||||||
|
@Getter
|
||||||
|
private static String git = "JaTiTV/T2C-OPSecurity";
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
private static Integer bstatsID = 10858;
|
private static Integer bstatsID = 10858;
|
||||||
|
|
||||||
|
@ -9,6 +9,10 @@ public enum Config {
|
|||||||
language("plugin.language", "english", ConfigParam.STRING),
|
language("plugin.language", "english", ConfigParam.STRING),
|
||||||
onlyOPcanUseThePlugin("plugin.onlyOPcanUseThePlugin", true, ConfigParam.BOOLEAN),
|
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),
|
checkOnJoin("check.onJoin", true, ConfigParam.BOOLEAN),
|
||||||
checkOnInteract("check.onInteract", true, ConfigParam.BOOLEAN),
|
checkOnInteract("check.onInteract", true, ConfigParam.BOOLEAN),
|
||||||
checkOnCommand("check.onCommand", true, ConfigParam.BOOLEAN),
|
checkOnCommand("check.onCommand", true, ConfigParam.BOOLEAN),
|
||||||
|
@ -3,6 +3,7 @@ package net.t2code.opsecurity.system;
|
|||||||
import net.t2code.opsecurity.Util;
|
import net.t2code.opsecurity.Util;
|
||||||
import net.t2code.opsecurity.command.CmdExecuter;
|
import net.t2code.opsecurity.command.CmdExecuter;
|
||||||
import net.t2code.opsecurity.config.FileSelect;
|
import net.t2code.opsecurity.config.FileSelect;
|
||||||
|
import net.t2code.opsecurity.config.config.Config;
|
||||||
import net.t2code.opsecurity.config.config.Converter;
|
import net.t2code.opsecurity.config.config.Converter;
|
||||||
import net.t2code.opsecurity.events.Events;
|
import net.t2code.opsecurity.events.Events;
|
||||||
import net.t2code.opsecurity.events.OpCommand;
|
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.messages.T2Ctemplate;
|
||||||
import net.t2code.t2codelib.SPIGOT.api.register.T2Cregister;
|
import net.t2code.t2codelib.SPIGOT.api.register.T2Cregister;
|
||||||
import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
|
import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
|
||||||
|
import org.checkerframework.checker.units.qual.C;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
@ -39,7 +41,8 @@ public class Load {
|
|||||||
|
|
||||||
Timer.refreshTimer();
|
Timer.refreshTimer();
|
||||||
Permissions.register();
|
Permissions.register();
|
||||||
T2CupdateAPI.onUpdateCheck(plugin, Util.getPrefix(), 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());
|
Metrics.Bstats(plugin, Util.getBstatsID());
|
||||||
T2Ctemplate.onLoadFooter(Util.getPrefix(), long_);
|
T2Ctemplate.onLoadFooter(Util.getPrefix(), long_);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user