Compare commits
No commits in common. "main" and "1.2.0" have entirely different histories.
@ -1,12 +1,7 @@
|
||||
# SimplifyTools
|
||||
### An 'All-in-one' plugin for MC servers.
|
||||
#### TabList Customizing, Custom Advancement, Connect messages, AutoSave, Logger
|
||||
[![Build Status](https://ci.ditservices.hu/job/SimplifyTools/badge/icon)](https://ci.ditservices.hu/job/SimplifyTools/) ![ MC Version](https://ci.ditservices.hu/job/SimplifyTools/badge/icon?subject=MC&status=1.12%20-%201.20.1&color=darkblue) ![Git latest release](https://img.shields.io/github/v/release/LabodiDavid/SimplifyTools) [![bStats](https://ci.ditservices.hu/job/SimplifyTools/badge/icon?subject=bStats&status=3.0&color=brightgreen)](https://bstats.org/plugin/bukkit/SimplifyTools/15108) ![Lines of code](https://tokei.rs/b1/github/LabodiDavid/SimplifyTools?category=code)
|
||||
<br>[Changelog](docs/ChangeLog.md)
|
||||
<hr>
|
||||
|
||||
|
||||
|
||||
[![Build Status](https://ci.ditservices.hu/job/SimplifyTools/badge/icon)](https://ci.ditservices.hu/job/SimplifyTools/) ![ MC Version](https://ci.ditservices.hu/job/SimplifyTools/badge/icon?subject=MC&status=1.12%20-%201.19.3&color=darkblue) ![Git latest release](https://img.shields.io/github/v/release/LabodiDavid/SimplifyTools) [![bStats](https://ci.ditservices.hu/job/SimplifyTools/badge/icon?subject=bStats&status=3.0&color=brightgreen)](https://bstats.org/plugin/bukkit/SimplifyTools/15108) ![ Lines of code](https://tokei.rs/b1/github/LabodiDavid/SimplifyTools?category=code)
|
||||
## Features
|
||||
|
||||
- **Tab Manager** - Allows you to specify colored texts, with animations on the tab window.
|
||||
@ -15,7 +10,7 @@
|
||||
- **Automatic/command saving** - Allows you to schedule auto saving of the world/player data on your server, or you can initiate a save by a command.
|
||||
- **Custom Connect/Disconnect messages** - Allows you to customize the message that is broadcasted when someone joins or leaves the server.
|
||||
![Connect messages preview](docs/img/2.gif)
|
||||
- **Plugin Manager** - Allows you to unload/load plugins without a server restart. (Disabled by default since v1.2.1)
|
||||
- **Plugin Manager** - Allows you to unload/load plugins without a server restart.
|
||||
- **Gameplay statistics** - You can check your gameplay statistics such as player/mob kills, etc.
|
||||
(Note: The plugin just shows the stats not recording itself, so stats before installing this plugin are counted too.)
|
||||
![Stats preview](docs/img/3.gif)
|
||||
|
@ -27,7 +27,7 @@
|
||||
<orderEntry type="library" name="Maven: com.jeff_media:SpigotUpdateChecker:2.2.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bstats:bstats-bukkit:3.0.0" level="project" />
|
||||
<orderEntry type="library" name="Maven: org.bstats:bstats-base:3.0.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.20.1-R0.1-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.19.3-R0.1-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
|
||||
@ -36,9 +36,8 @@
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.10" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.joml:joml:1.10.5" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:2.0" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.20.1-R0.1-SNAPSHOT" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.33" level="project" />
|
||||
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:craftbukkit:1.19.3-R0.1-SNAPSHOT" level="project" />
|
||||
</component>
|
||||
</module>
|
@ -1,11 +1,4 @@
|
||||
# SimplifyTools - Changelog
|
||||
|
||||
- 1.2.1
|
||||
- Added support for version up to 1.20.1
|
||||
- Plugin manager added setting, now disabled by default in the config.
|
||||
- Removed coloring of the logs in the server console
|
||||
- TPS number displayed in the TAB now rounded to the nearest integer.
|
||||
- Minor code refactors
|
||||
- 1.2.0
|
||||
- Added TPS command `/st tps`
|
||||
- Added `{MOTD}`, `{TPS}` variable for TAB customization in the config
|
||||
|
6
pom.xml
6
pom.xml
@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>hu.ditservices</groupId>
|
||||
<artifactId>SimplifyTools</artifactId>
|
||||
<version>1.2.1</version>
|
||||
<version>1.2.0</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<name>SimplifyTools</name>
|
||||
@ -130,14 +130,14 @@
|
||||
<dependency>
|
||||
<groupId>org.spigotmc</groupId>
|
||||
<artifactId>spigot-api</artifactId>
|
||||
<version>1.20.1-R0.1-SNAPSHOT</version>
|
||||
<version>1.19.3-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<!-- from downloaded craftbukkit-x.xx.x.jar\META-INF\versions\ -->
|
||||
<dependency>
|
||||
<groupId>org.bukkit</groupId>
|
||||
<artifactId>craftbukkit</artifactId>
|
||||
<version>1.20.1-R0.1-SNAPSHOT</version>
|
||||
<version>1.19.3-R0.1-SNAPSHOT</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
|
||||
|
@ -6,7 +6,7 @@ import hu.ditservices.handlers.TabHandler;
|
||||
import hu.ditservices.utils.*;
|
||||
import hu.ditservices.utils.Math;
|
||||
import org.bstats.bukkit.Metrics;
|
||||
import hu.ditservices.handlers.CommandHandler;
|
||||
import hu.ditservices.commands.DitCmd;
|
||||
import hu.ditservices.listeners.ChatEvents;
|
||||
import hu.ditservices.listeners.LogChat;
|
||||
import hu.ditservices.listeners.LogCommand;
|
||||
@ -34,153 +34,109 @@ public final class STPlugin extends JavaPlugin implements CommandExecutor, Liste
|
||||
private static STPlugin instance;
|
||||
private final Logger log = Bukkit.getLogger();
|
||||
|
||||
private FileConfiguration config;
|
||||
public FileConfiguration config = getConfig();
|
||||
|
||||
public long ServerStartTime;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
instance = this;
|
||||
|
||||
if (this.initPlugin()) {
|
||||
this.log.info(ChatColor.stripColor(this.getPrefix())+"Started running.");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileConfiguration getConfig() {
|
||||
//TODO Implement defaults everywhere when config is not loaded for some reasons
|
||||
if (this.config != null) {
|
||||
return this.config;
|
||||
}
|
||||
|
||||
return super.getConfig();
|
||||
}
|
||||
|
||||
|
||||
private void registerEvents() {
|
||||
getServer().getPluginManager().registerEvents(this, this);
|
||||
getServer().getPluginManager().registerEvents(new LogChat(this), this);
|
||||
getServer().getPluginManager().registerEvents(new LogCommand(this), this);
|
||||
getServer().getPluginManager().registerEvents(new LogConnect(this), this);
|
||||
|
||||
if (this.config.isSet("CustomAdvancement.enabled") && this.config.getBoolean("CustomAdvancement.enabled")) {
|
||||
getServer().getPluginManager().registerEvents(new ChatEvents(this), this);
|
||||
this.log.info(ChatColor.stripColor(this.getPrefix()) + "Custom Advancement Messages enabled!");
|
||||
}
|
||||
}
|
||||
|
||||
private void scheduleTasks() {
|
||||
Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new TPS(), 0, 1);
|
||||
|
||||
if (this.config.getBoolean("Saving.enabled") && this.config.getInt("Saving.interval") > 0) {
|
||||
long intervalTicks = Math.convert(Math.Convert.SECONDS, Math.Convert.TICKS, instance.config.getInt("Saving.interval"));
|
||||
Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new SaveHandler(), 0L, intervalTicks);
|
||||
}
|
||||
}
|
||||
|
||||
private void initUpdateChecker() {
|
||||
new UpdateChecker(this, UpdateCheckSource.GITHUB_RELEASE_TAG, "LabodiDavid/SimplifyTools")
|
||||
.setDownloadLink("https://github.com/LabodiDavid/SimplifyTools/releases")
|
||||
.setDonationLink("https://paypal.me/labodidavid")
|
||||
.setChangelogLink("https://github.com/LabodiDavid/SimplifyTools/blob/main/docs/ChangeLog.md")
|
||||
.setNotifyOpsOnJoin(true)
|
||||
.setNotifyByPermissionOnJoin("st.admin")
|
||||
.setUserAgent(new UserAgentBuilder().addPluginNameAndVersion())
|
||||
.checkEveryXHours(24)
|
||||
.checkNow();
|
||||
}
|
||||
|
||||
private void initMetrics() {
|
||||
Metrics metrics = new Metrics(this, 15108);
|
||||
}
|
||||
|
||||
private boolean initPlugin() {
|
||||
try {
|
||||
this.ServerStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
|
||||
if (Version.ServerVersion.isCurrentLower(Version.ServerVersion.v1_12_R1) ||
|
||||
Version.ServerVersion.isCurrentHigher(Version.ServerVersion.v1_20_R1))
|
||||
{
|
||||
throw new Exception("The server version is not supported! Update to a version between 1.12 - 1.20.1 to run this plugin.");
|
||||
}
|
||||
|
||||
if (this.reload()) {
|
||||
TabHandler tab = new TabHandler();
|
||||
|
||||
PluginCommand stCommand = this.getCommand("st");
|
||||
stCommand.setExecutor(new CommandHandler(this));
|
||||
stCommand.setTabCompleter(new DITTabCompleter());
|
||||
|
||||
registerEvents();
|
||||
scheduleTasks();
|
||||
initUpdateChecker();
|
||||
initMetrics();
|
||||
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
this.Init();
|
||||
} catch (Exception e) {
|
||||
this.log.warning("[SimplifyTools] - INITIALIZATION ERROR: " + e.getMessage());
|
||||
this.log.warning("[SimplifyTools] - INITIALIZATION ERROR: "+e.getMessage());
|
||||
this.log.warning("[SimplifyTools] - Plugin disabled!");
|
||||
this.setEnabled(false);
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
//this.dplug = new DitPluginManager(this);
|
||||
this.log.info(this.getPrefix()+"Started running.");
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the plugin's prefix.
|
||||
*
|
||||
* @return String
|
||||
*/
|
||||
|
||||
private void Init() throws Exception {
|
||||
this.ServerStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
|
||||
if (Version.ServerVersion.isCurrentLower(Version.ServerVersion.v1_12_R1)){
|
||||
throw new Exception("The server version is not supported! Update to a version between 1.12 - 1.19.3 to run this plugin.");
|
||||
}
|
||||
if (this.Reload()){
|
||||
|
||||
|
||||
TabHandler tab = new TabHandler();
|
||||
PluginCommand ditCmd = this.getCommand("st");
|
||||
ditCmd.setExecutor(new DitCmd(this));
|
||||
ditCmd.setTabCompleter(new DITTabCompleter());
|
||||
|
||||
getServer().getPluginManager().registerEvents(this, this);
|
||||
getServer().getPluginManager().registerEvents(new LogChat(this), this);
|
||||
getServer().getPluginManager().registerEvents(new LogCommand(this), this);
|
||||
getServer().getPluginManager().registerEvents(new LogConnect(this), this);
|
||||
if (this.config.isSet("CustomAdvancement.enabled") && this.config.getBoolean("CustomAdvancement.enabled")){
|
||||
getServer().getPluginManager().registerEvents(new ChatEvents(this), this);
|
||||
this.log.info(this.getPrefix()+"Custom Advancement Messages enabled!");
|
||||
}
|
||||
Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new TPS(), 0, 1);
|
||||
|
||||
if (this.config.getBoolean("Saving.enabled") && this.config.getInt("Saving.interval")>0){
|
||||
Bukkit.getScheduler().scheduleSyncRepeatingTask(this, new SaveHandler(), 0L, Math.convert(Math.Convert.SECONDS,Math.Convert.TICKS,instance.config.getInt("Saving.interval")));
|
||||
}
|
||||
|
||||
new UpdateChecker(this, UpdateCheckSource.GITHUB_RELEASE_TAG, "LabodiDavid/SimplifyTools")
|
||||
.setDownloadLink("https://github.com/LabodiDavid/SimplifyTools/releases")
|
||||
.setDonationLink("https://paypal.me/labodidavid")
|
||||
.setChangelogLink("https://github.com/LabodiDavid/SimplifyTools/blob/main/docs/ChangeLog.md")
|
||||
.setNotifyOpsOnJoin(true)
|
||||
.setNotifyByPermissionOnJoin("st.admin")
|
||||
.setUserAgent(new UserAgentBuilder().addPluginNameAndVersion())
|
||||
.checkEveryXHours(24)
|
||||
.checkNow();
|
||||
|
||||
Metrics metrics = new Metrics(this, 15108);
|
||||
}
|
||||
}
|
||||
public String getPrefix(){
|
||||
if (this.config.isSet("Prefix") && !Objects.requireNonNull(this.config.getString("Prefix")).isEmpty()) {
|
||||
if (this.config.isSet("Prefix") && !Objects.requireNonNull(this.config.getString("Prefix")).isEmpty()){
|
||||
return ChatColor.translateAlternateColorCodes('&', this.config.getString("Prefix"));
|
||||
}else{
|
||||
return ChatColor.translateAlternateColorCodes('&',"&a[&fSimplify&7Tools&2] &4- &f");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the main plugin instance.
|
||||
*
|
||||
* @return STPlugin
|
||||
*/
|
||||
public static STPlugin getInstance(){
|
||||
return instance;
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the server's uptime in a human readable format.
|
||||
*
|
||||
* @return String
|
||||
*/
|
||||
public static String getUptime() {
|
||||
long uptime = (System.currentTimeMillis() - instance.ServerStartTime) / 1000;
|
||||
StringBuilder returnText = new StringBuilder();
|
||||
public static String getUptime(){
|
||||
int uptime = (int)(System.currentTimeMillis() - instance.ServerStartTime)/1000;
|
||||
String returnText = "";
|
||||
|
||||
int days = (int) (uptime / 86400);
|
||||
int hours = (int) ((uptime % 86400) / 3600);
|
||||
int minutes = (int) ((uptime % 3600) / 60);
|
||||
int seconds = (int) (uptime % 60);
|
||||
// Get remaining seconds from total minutes.
|
||||
int seconds = uptime % 60;
|
||||
// Convert to minutes, get remaining minutes from total hours.
|
||||
int minutes = (uptime / 60) % 60;
|
||||
// Convert to hours, get remaining hours from total days.
|
||||
int hours = (uptime / 3600) % 24;
|
||||
// Convert to days.
|
||||
int days = uptime / 86400;
|
||||
|
||||
if (days > 1) {
|
||||
returnText.append(days).append(" days ");
|
||||
if (days>1){
|
||||
returnText = returnText+ days+" days ";
|
||||
}
|
||||
if (hours > 1) {
|
||||
returnText.append(hours).append(" hours ");
|
||||
if (hours>1){
|
||||
returnText = returnText+ hours+ " hours ";
|
||||
}
|
||||
if (minutes > 1) {
|
||||
returnText.append(minutes).append(" min ");
|
||||
if (minutes>1){
|
||||
returnText = returnText+ minutes+ " min ";
|
||||
}
|
||||
if (seconds > 1) {
|
||||
returnText.append(seconds).append("s ");
|
||||
if (seconds>1){
|
||||
returnText = returnText+ seconds+ "s ";
|
||||
}
|
||||
|
||||
return returnText.toString();
|
||||
return returnText;
|
||||
|
||||
}
|
||||
|
||||
public boolean reload(){
|
||||
public boolean Reload(){
|
||||
File configFile = new File(getDataFolder(), "config.yml");
|
||||
|
||||
try {
|
||||
@ -198,6 +154,6 @@ public final class STPlugin extends JavaPlugin implements CommandExecutor, Liste
|
||||
}
|
||||
@Override
|
||||
public void onDisable() {
|
||||
this.log.info(ChatColor.stripColor(this.getPrefix()) + "Stopped running.");
|
||||
System.out.println(this.getPrefix()+" stopped.");
|
||||
}
|
||||
}
|
||||
|
123
src/main/java/hu/ditservices/commands/DitCmd.java
Normal file
123
src/main/java/hu/ditservices/commands/DitCmd.java
Normal file
@ -0,0 +1,123 @@
|
||||
package hu.ditservices.commands;
|
||||
|
||||
import hu.ditservices.utils.TPS;
|
||||
import hu.ditservices.STPlugin;
|
||||
import hu.ditservices.utils.Cooldown;
|
||||
import hu.ditservices.utils.Version;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.*;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class DitCmd implements CommandExecutor {
|
||||
private final String noArgMsg;
|
||||
private final STPlugin plugin;
|
||||
private final Cooldown cd;
|
||||
private final FileConfiguration config;
|
||||
|
||||
public DitCmd(final STPlugin instance){
|
||||
this.plugin = instance;
|
||||
this.noArgMsg = plugin.getPrefix()+ ChatColor.DARK_RED + "To list all SimplifyTools commands use the '/help SIMPLIFYTOOLS' command!";
|
||||
this.cd = new Cooldown(plugin);
|
||||
this.config = plugin.config;
|
||||
}
|
||||
|
||||
public boolean addToCoolDown(CommandSender sender){
|
||||
if (sender instanceof Player){
|
||||
Player p = (Player) sender;
|
||||
this.cd.Add(p);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
if (command.getName().equals("st")){
|
||||
|
||||
if (cd.Check(sender)){
|
||||
if (command.getName().equals("st") && args.length==0)
|
||||
{
|
||||
this.addToCoolDown(sender);
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Version: "+plugin.getDescription().getVersion());
|
||||
sender.sendMessage(this.noArgMsg);
|
||||
return true;
|
||||
}
|
||||
if (command.getName().equals("st") && args[0].contains("help"))
|
||||
{
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Version: "+plugin.getDescription().getVersion());
|
||||
sender.sendMessage(this.noArgMsg);
|
||||
return true;
|
||||
}
|
||||
if (command.getName().equals("st") && args[0].contains("settings"))
|
||||
{
|
||||
this.addToCoolDown(sender);
|
||||
sender.sendMessage(plugin.getPrefix()+ ChatColor.GREEN+" === Plugin Information === ");
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Plugin Version: "+plugin.getDescription().getVersion());
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Server Version: "+ Version.ServerVersion.getCurrent().toString());
|
||||
sender.sendMessage(ChatColor.GREEN+" -------- Features -------- ");
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Tab customization: "+(config.getBoolean("Tab.enabled") ? ChatColor.GREEN+"Enabled" : ChatColor.RED+"Disabled"));
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Custom Advancement Msg: "+(config.getBoolean("CustomAdvancement.enabled") ? ChatColor.GREEN+"Enabled" : ChatColor.RED+"Disabled"));
|
||||
sender.sendMessage(ChatColor.GREEN+" ========================== ");
|
||||
return true;
|
||||
}
|
||||
|
||||
if (command.getName().equals("st") && args[0].contains("reload") && sender.hasPermission("st.reload")){
|
||||
|
||||
if(plugin.Reload()){
|
||||
this.addToCoolDown(sender);
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Successfully reload!");
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.RED+"Notice: Restart your server if the settings didn't applied.");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (command.getName().equals("st") && args[0].contains("tps") && sender.hasPermission("st.tps")){
|
||||
this.addToCoolDown(sender);
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Plugin Calculated TPS: "+TPS.getColor()+String.format("%.2f", TPS.getTPS()));
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("pmanager")){
|
||||
|
||||
if (sender.hasPermission("st.pmanager.unload") || sender.hasPermission("st.pmanager.load") || sender.hasPermission("st.pmanager")) {
|
||||
this.addToCoolDown(sender);
|
||||
if (args.length==1){
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.DARK_RED+"Invalid arguments!");
|
||||
return true;
|
||||
}
|
||||
if (args[1].equalsIgnoreCase("load")) {
|
||||
//PluginCmd.handleLoad(sender,args);
|
||||
PluginCmd.LoadPlugin(sender,args);
|
||||
}
|
||||
if (args[1].equalsIgnoreCase("unload")) {
|
||||
//PluginCmd.handleUnload(sender,args);
|
||||
PluginCmd.UnloadPlugin(sender, args);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("save-all") && sender.hasPermission("st.save")){
|
||||
this.addToCoolDown(sender);
|
||||
return SaveCmd.Run(sender);
|
||||
}
|
||||
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("ping") && sender.hasPermission("st.ping")){
|
||||
this.addToCoolDown(sender);
|
||||
return PingCmd.Run(sender);
|
||||
}
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("stats") && sender.hasPermission("st.stats")){
|
||||
this.addToCoolDown(sender);
|
||||
return StatCmd.Run(sender);
|
||||
}
|
||||
}else{
|
||||
cd.CDText(sender);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.command.ConsoleCommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class PingCommand {
|
||||
public class PingCmd {
|
||||
public static boolean Run(CommandSender sender) {
|
||||
STPlugin plugin = STPlugin.getInstance();
|
||||
if (sender instanceof Player) {
|
@ -7,7 +7,7 @@ import hu.ditservices.STPlugin;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
|
||||
public class PluginManagerCommand {
|
||||
public class PluginCmd {
|
||||
public static boolean LoadPlugin(CommandSender sender, String[] args){
|
||||
Plugin plugin = Bukkit.getPluginManager().getPlugin(args[2]);
|
||||
if (plugin == null) {
|
@ -3,17 +3,13 @@ package hu.ditservices.commands;
|
||||
import hu.ditservices.STPlugin;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
public class SaveCommand {
|
||||
/**
|
||||
* Saves all worlds and players data.
|
||||
*
|
||||
* @return boolean
|
||||
*/
|
||||
public static boolean Run(){
|
||||
public class SaveCmd {
|
||||
public static boolean Run(CommandSender sender){
|
||||
STPlugin plugin = STPlugin.getInstance();
|
||||
String p = plugin.getConfig().getString("Saving.broadcastMsgProgress").replace("{PREFIX}",plugin.getPrefix());
|
||||
String d = plugin.getConfig().getString("Saving.broadcastMsgDone").replace("{PREFIX}",plugin.getPrefix());
|
||||
String p = plugin.config.getString("Saving.broadcastMsgProgress").replace("{PREFIX}",plugin.getPrefix());
|
||||
String d = plugin.config.getString("Saving.broadcastMsgDone").replace("{PREFIX}",plugin.getPrefix());
|
||||
Bukkit.broadcast(p,"st.st");
|
||||
for(World w : Bukkit.getServer().getWorlds()){
|
||||
w.save();
|
@ -1,23 +0,0 @@
|
||||
package hu.ditservices.commands;
|
||||
|
||||
import hu.ditservices.STPlugin;
|
||||
import hu.ditservices.utils.Version;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
|
||||
public class SettingsCommand {
|
||||
public static boolean Run(CommandSender sender) {
|
||||
STPlugin plugin = STPlugin.getInstance();
|
||||
|
||||
sender.sendMessage( ChatColor.GREEN+" === Plugin Information === " + "\n"
|
||||
+ ChatColor.GREEN+"Plugin Version: " + ChatColor.translateAlternateColorCodes('&',"&a[&fSimplify&7Tools&2] &4- &f") + plugin.getDescription().getVersion() + "\n"
|
||||
+ ChatColor.GREEN+"Server Version: " + Version.ServerVersion.getCurrent().toString() + "\n"
|
||||
+ ChatColor.GREEN+" -------- Features -------- " + "\n"
|
||||
+ ChatColor.GREEN+"Tab customization: "+(plugin.getConfig().getBoolean("Tab.enabled") ? ChatColor.GREEN + "Enabled" : ChatColor.RED+"Disabled") + "\n"
|
||||
+ ChatColor.GREEN+"Custom Advancement Msg: " + (plugin.getConfig().getBoolean("CustomAdvancement.enabled") ? ChatColor.GREEN+"Enabled" : ChatColor.RED+"Disabled") + "\n"
|
||||
+ ChatColor.GREEN+" ========================== "
|
||||
);
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
@ -6,7 +6,7 @@ import org.bukkit.Statistic;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class StatCommand {
|
||||
public class StatCmd {
|
||||
public static boolean Run(CommandSender sender){
|
||||
Player player = (Player) sender;
|
||||
|
@ -1,113 +0,0 @@
|
||||
package hu.ditservices.handlers;
|
||||
|
||||
import hu.ditservices.commands.*;
|
||||
import hu.ditservices.utils.TPS;
|
||||
import hu.ditservices.STPlugin;
|
||||
import hu.ditservices.utils.Cooldown;
|
||||
import hu.ditservices.utils.Version;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.*;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class CommandHandler implements CommandExecutor {
|
||||
private final String noArgMsg;
|
||||
private final STPlugin plugin;
|
||||
private final Cooldown cd;
|
||||
private final FileConfiguration config;
|
||||
|
||||
public CommandHandler(final STPlugin instance) {
|
||||
this.plugin = instance;
|
||||
this.noArgMsg = plugin.getPrefix() + ChatColor.DARK_RED + "To list all SimplifyTools commands use the '/help SIMPLIFYTOOLS' command!";
|
||||
this.cd = new Cooldown(plugin);
|
||||
this.config = plugin.getConfig();
|
||||
}
|
||||
|
||||
public boolean addToCoolDown(CommandSender sender) {
|
||||
if (sender instanceof Player) {
|
||||
Player p = (Player) sender;
|
||||
this.cd.Add(p);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
|
||||
if (command.getName().equals("st")){
|
||||
|
||||
if (cd.Check(sender)){
|
||||
|
||||
if (command.getName().equals("st")) {
|
||||
this.addToCoolDown(sender);
|
||||
}
|
||||
|
||||
if (command.getName().equals("st") && (args.length == 0 || args[0].contains("help")))
|
||||
{
|
||||
sender.sendMessage(plugin.getPrefix() + ChatColor.GREEN+"Version: " + plugin.getDescription().getVersion());
|
||||
sender.sendMessage(this.noArgMsg);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (command.getName().equals("st") && args[0].contains("settings"))
|
||||
{
|
||||
return SettingsCommand.Run(sender);
|
||||
}
|
||||
|
||||
if (command.getName().equals("st") && args[0].contains("reload") && sender.hasPermission("st.reload")){
|
||||
|
||||
if(plugin.reload()){
|
||||
sender.sendMessage(plugin.getPrefix()+ChatColor.GREEN+"Successfully reload!" + "\n"
|
||||
+ plugin.getPrefix() + ChatColor.RED + "Notice: Restart your server if the settings didn't applied.");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
if (command.getName().equals("st") && args[0].contains("tps") && sender.hasPermission("st.tps")) {
|
||||
sender.sendMessage(plugin.getPrefix() + ChatColor.GREEN+"Plugin Calculated TPS: "+TPS.getColor()+String.format("%.2f", TPS.getTPS()));
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("pmanager")) {
|
||||
if (sender.hasPermission("st.pmanager.unload") || sender.hasPermission("st.pmanager.load") || sender.hasPermission("st.pmanager")) {
|
||||
if (args.length==1){
|
||||
sender.sendMessage(plugin.getPrefix() + ChatColor.DARK_RED+"Invalid arguments!");
|
||||
return true;
|
||||
}
|
||||
if (config.getBoolean("PluginManager.enabled")) {
|
||||
if (args[1].equalsIgnoreCase("load")) {
|
||||
//PluginCmd.handleLoad(sender,args);
|
||||
PluginManagerCommand.LoadPlugin(sender,args);
|
||||
}
|
||||
if (args[1].equalsIgnoreCase("unload")) {
|
||||
//PluginCmd.handleUnload(sender,args);
|
||||
PluginManagerCommand.UnloadPlugin(sender, args);
|
||||
}
|
||||
} else {
|
||||
sender.sendMessage(plugin.getPrefix() + ChatColor.DARK_RED + "Plugin manager commands are disabled in the config!");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("save-all") && sender.hasPermission("st.save")) {
|
||||
return SaveCommand.Run();
|
||||
}
|
||||
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("ping") && sender.hasPermission("st.ping")) {
|
||||
return PingCommand.Run(sender);
|
||||
}
|
||||
if (command.getName().equalsIgnoreCase("st") && args[0].contains("stats") && sender.hasPermission("st.stats")) {
|
||||
return StatCommand.Run(sender);
|
||||
}
|
||||
}else{
|
||||
cd.CDText(sender);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -44,38 +44,38 @@ public class DITTabCompleter implements TabCompleter {
|
||||
return result;
|
||||
}
|
||||
if (args.length >= 2) {
|
||||
for (String a : arguments) {
|
||||
vizsg_2 = false;
|
||||
if (a.contains(" ")){
|
||||
vizsg_list = Arrays.asList(a.split(" "));
|
||||
vizsg_2 = true;
|
||||
}
|
||||
if (vizsg_2 && args.length ==2){ // length-1
|
||||
idea.add(vizsg_list.get(1));
|
||||
}
|
||||
if (vizsg_2&& args[1].startsWith(vizsg_list.get(1))) {
|
||||
idea.add(vizsg_list.get(1));
|
||||
}
|
||||
}
|
||||
for (String a : arguments) {
|
||||
vizsg_2 = false;
|
||||
if (a.contains(" ")){
|
||||
vizsg_list = Arrays.asList(a.split(" "));
|
||||
vizsg_2 = true;
|
||||
}
|
||||
if (vizsg_2 && args.length ==2){ // length-1
|
||||
idea.add(vizsg_list.get(1));
|
||||
}
|
||||
if (vizsg_2&& args[1].startsWith(vizsg_list.get(1))) {
|
||||
idea.add(vizsg_list.get(1));
|
||||
}
|
||||
}
|
||||
|
||||
if (args[0].equalsIgnoreCase("pmanager")&& args[1].equalsIgnoreCase("unload") || args[1].equalsIgnoreCase("load")) {
|
||||
if (args.length == 3) {
|
||||
result.clear();
|
||||
PluginManager pm = Bukkit.getServer().getPluginManager();
|
||||
for (Plugin pl : pm.getPlugins()) {
|
||||
if (pl.getName().toLowerCase().startsWith(args[2].toLowerCase()) && args[1].equalsIgnoreCase("unload")) {
|
||||
result.add(pl.getName());
|
||||
}
|
||||
if (!pl.isEnabled()){
|
||||
if (pl.getName().toLowerCase().startsWith(args[2].toLowerCase()) && args[1].equalsIgnoreCase("load")) {
|
||||
if (args[0].equalsIgnoreCase("pmanager")&& args[1].equalsIgnoreCase("unload") || args[1].equalsIgnoreCase("load")) {
|
||||
if (args.length == 3) {
|
||||
result.clear();
|
||||
PluginManager pm = Bukkit.getServer().getPluginManager();
|
||||
for (Plugin pl : pm.getPlugins()) {
|
||||
if (pl.getName().toLowerCase().startsWith(args[2].toLowerCase()) && args[1].equalsIgnoreCase("unload")) {
|
||||
result.add(pl.getName());
|
||||
}
|
||||
if (!pl.isEnabled()){
|
||||
if (pl.getName().toLowerCase().startsWith(args[2].toLowerCase()) && args[1].equalsIgnoreCase("load")) {
|
||||
result.add(pl.getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return idea;
|
||||
return idea;
|
||||
}
|
||||
}
|
||||
return null;
|
||||
|
@ -1,10 +1,33 @@
|
||||
package hu.ditservices.handlers;
|
||||
|
||||
import hu.ditservices.commands.SaveCommand;
|
||||
import hu.ditservices.STPlugin;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.entity.Player;
|
||||
|
||||
public class SaveHandler implements Runnable{
|
||||
STPlugin plugin = STPlugin.getInstance();
|
||||
@Override
|
||||
public void run() {
|
||||
SaveCommand.Run();
|
||||
|
||||
String p = plugin.config.isSet("Saving.broadcastMsgProgress") ? plugin.config.getString("Saving.broadcastMsgProgress").replace("{PREFIX}",plugin.getPrefix()) : plugin.getPrefix()+"Auto save in progress..";
|
||||
String d = plugin.config.isSet("Saving.broadcastMsgDone") ? plugin.config.getString("Saving.broadcastMsgDone").replace("{PREFIX}",plugin.getPrefix()) : plugin.getPrefix()+"Auto save done.";
|
||||
if (Bukkit.getOnlinePlayers().size()>0){
|
||||
for (Player player : Bukkit.getOnlinePlayers()){
|
||||
player.sendMessage(p);
|
||||
}
|
||||
}
|
||||
plugin.getLogger().info(p);
|
||||
for(World w : Bukkit.getServer().getWorlds()){
|
||||
w.save();
|
||||
}
|
||||
Bukkit.savePlayers();
|
||||
if (Bukkit.getOnlinePlayers().size()>0){
|
||||
for (Player player : Bukkit.getOnlinePlayers()){
|
||||
player.sendMessage(d);
|
||||
}
|
||||
}
|
||||
plugin.getLogger().info(d);
|
||||
|
||||
}
|
||||
}
|
||||
|
@ -261,7 +261,7 @@ public class TabHandler {
|
||||
msg = msg.replace("{MOTD}", plugin.getServer().getMotd()); //LegacyComponentSerializer.legacyAmpersand().serialize(plugin.getServer().motd().asComponent())
|
||||
}
|
||||
if (msg.contains("{TPS}")){
|
||||
msg = msg.replace("{TPS}",String.valueOf(java.lang.Math.round(TPS.getTPS())));
|
||||
msg = msg.replace("{TPS}",String.format("%.2f", TPS.getTPS()));
|
||||
}
|
||||
return ChatColor.translateAlternateColorCodes('&',msg);
|
||||
}
|
||||
|
@ -14,12 +14,10 @@ import hu.ditservices.utils.AdvancementHelper;
|
||||
public class ChatEvents implements Listener {
|
||||
private STPlugin plugin;
|
||||
private FileConfiguration config;
|
||||
|
||||
public ChatEvents(STPlugin instance){
|
||||
this.plugin = instance;
|
||||
this.config = plugin.getConfig();
|
||||
this.config = plugin.config;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onAdvance(PlayerAdvancementDoneEvent e){
|
||||
if (config.isSet("CustomAdvancement.enabled") && config.getBoolean("CustomAdvancement.enabled")){
|
||||
|
@ -15,7 +15,7 @@ public class LogChat implements Listener {
|
||||
FileConfiguration config;
|
||||
public LogChat(STPlugin instance){
|
||||
this.plugin = instance;
|
||||
this.config = plugin.getConfig();
|
||||
this.config = plugin.config;
|
||||
}
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onChat(AsyncPlayerChatEvent event){
|
||||
|
@ -16,7 +16,7 @@ public class LogCommand implements Listener {
|
||||
public LogCommand(STPlugin instance){
|
||||
|
||||
this.plugin = instance;
|
||||
this.config = plugin.getConfig();
|
||||
this.config = plugin.config;
|
||||
}
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onCommand(PlayerCommandPreprocessEvent event){
|
||||
|
@ -19,10 +19,10 @@ public class LogConnect implements Listener {
|
||||
FileConfiguration config;
|
||||
public LogConnect(STPlugin instance){
|
||||
this.plugin = instance;
|
||||
this.config = plugin.getConfig();
|
||||
if (config.getBoolean("CustomMsg.enabled")) {
|
||||
this.config = plugin.config;
|
||||
if (config.getBoolean("CustomMsg.enabled")){
|
||||
this.JoinMsg = this.config.isSet("CustomMsg.connect") ? this.config.getString("CustomMsg.connect") : "{PREFIX}{NAME} &aconnected to the server.";
|
||||
this.LeaveMsg = this.config.isSet("CustomMsg.connect") ? this.config.getString("CustomMsg.disconnect") : "{PREFIX}{NAME} left the game.";
|
||||
this.LeaveMsg = this.config.isSet("CustomMsg.connect") ? this.config.getString("CustomMsg.disconnect") : "{PREFIX}{NAME} leaved the game.";
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -1,7 +1,6 @@
|
||||
package hu.ditservices.utils;
|
||||
|
||||
import hu.ditservices.STPlugin;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.GameRule;
|
||||
import org.bukkit.World;
|
||||
import org.bukkit.configuration.file.FileConfiguration;
|
||||
@ -116,26 +115,24 @@ public class AdvancementHelper {
|
||||
if (config.isSet("CustomAdvancement.formats.challenge")) {
|
||||
out_type[2] = config.getString("CustomAdvancement.formats.challenge");
|
||||
}
|
||||
|
||||
String disablemsg = plugin.getPrefix()+"Disabling vanilla advancement messages for ";
|
||||
List<World> worlds = this.plugin.getServer().getWorlds();
|
||||
Method setRuleMethod, getRuleMethod;
|
||||
try {
|
||||
String disableMsg = ChatColor.stripColor(plugin.getPrefix()) + "Disabling vanilla advancement messages for ";
|
||||
List<World> worlds = this.plugin.getServer().getWorlds();
|
||||
Method setRuleMethod, getRuleMethod;
|
||||
|
||||
for (World w : worlds) {
|
||||
if (Version.ServerVersion.isCurrentEqualOrLower(Version.ServerVersion.v1_12_R1)){
|
||||
getRuleMethod = w.getClass().getDeclaredMethod("getGameRuleValue", String.class);
|
||||
if (getRuleMethod.invoke(w,"announceAdvancements")=="true"){
|
||||
setRuleMethod = w.getClass().getDeclaredMethod("setGameRuleValue", String.class, String.class);
|
||||
setRuleMethod.invoke(w,"announceAdvancements", "false");
|
||||
this.plugin.getLogger().info(disableMsg + w.getName());
|
||||
this.plugin.getLogger().info(disablemsg + w.getName());
|
||||
}
|
||||
}else{
|
||||
getRuleMethod = w.getClass().getDeclaredMethod("getGameRuleValue", GameRule.class);
|
||||
if ((boolean)getRuleMethod.invoke(w,GameRule.ANNOUNCE_ADVANCEMENTS)){
|
||||
setRuleMethod = w.getClass().getDeclaredMethod("setGameRule", GameRule.class, Object.class);
|
||||
setRuleMethod.invoke(w,GameRule.ANNOUNCE_ADVANCEMENTS,false);
|
||||
this.plugin.getLogger().info(disableMsg + w.getName());
|
||||
this.plugin.getLogger().info(disablemsg + w.getName());
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -19,7 +19,7 @@ public class Cooldown {
|
||||
|
||||
public Cooldown(STPlugin instance){
|
||||
this.plugin = instance;
|
||||
this.config = plugin.getConfig();
|
||||
this.config = plugin.config;
|
||||
if (config.isSet("Cooldown.seconds")){
|
||||
int cd = this.delay;
|
||||
if (cd!=config.getInt("Cooldown.seconds")){
|
||||
|
@ -26,8 +26,7 @@ public class Version {
|
||||
v1_18_R1,
|
||||
v1_18_R2,
|
||||
v1_19_R1,
|
||||
v1_19_R2,
|
||||
v1_20_R1;
|
||||
v1_19_R2;
|
||||
|
||||
private int value;
|
||||
|
||||
|
@ -80,12 +80,6 @@ Cooldown:
|
||||
# The time must be passed between using this plugin commands.
|
||||
seconds: 2 #The command cooldown in seconds
|
||||
Msg: '{PREFIX} Please wait {SECONDS} seconds!' # The message when the user spamming a command
|
||||
#
|
||||
# Plugin Manager - Enable/Disable plugins without server restart
|
||||
# Attention! It may cause errors in other plugins if you use this feature, not recommended!
|
||||
# If this is set to 'true' you can use the /st pmanager commands. Set it to 'false' to prevent its use.
|
||||
#
|
||||
PluginManager:
|
||||
enabled: false
|
||||
|
||||
# Miscellaneous
|
||||
Prefix: '&a[&fSimplify&7Tools&2] &4- &f' # The prefix which is inserted to the beginning of every plugin message.
|
||||
Prefix: '&a[&fSimplify&7Tools&2] &4- &f'
|
||||
|
Loading…
Reference in New Issue
Block a user