Compare commits

..

No commits in common. "653ba71f737db5c1f84ca5531896ae78adecf45f" and "36f4896dce39dcd2cf8dc70ab60e0e8ffeb02746" have entirely different histories.

6 changed files with 14 additions and 37 deletions

View File

@ -6,7 +6,7 @@
<groupId>hu.ditservices</groupId> <groupId>hu.ditservices</groupId>
<artifactId>SimplifyTools</artifactId> <artifactId>SimplifyTools</artifactId>
<version>1.2.4-SNAPSHOT</version> <version>1.2.3</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>SimplifyTools</name> <name>SimplifyTools</name>
@ -126,7 +126,7 @@
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.21.5-R0.1-SNAPSHOT</version> <version>1.21.4-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- from downloaded craftbukkit-x.xx.x.jar\META-INF\versions\ --> <!-- from downloaded craftbukkit-x.xx.x.jar\META-INF\versions\ -->

View File

@ -99,9 +99,9 @@ public final class STPlugin extends JavaPlugin implements CommandExecutor, Liste
try { try {
this.ServerStartTime = ManagementFactory.getRuntimeMXBean().getStartTime(); this.ServerStartTime = ManagementFactory.getRuntimeMXBean().getStartTime();
if (Version.ServerVersion.isCurrentLower(Version.ServerVersion.v1_12_R1) || if (Version.ServerVersion.isCurrentLower(Version.ServerVersion.v1_12_R1) ||
Version.ServerVersion.isCurrentHigher(Version.ServerVersion.v1_21_5_R1)) Version.ServerVersion.isCurrentHigher(Version.ServerVersion.v1_21_4_R1))
{ {
throw new Exception("The server version is not supported! Update to a version between 1.12 - 1.21.5 to run this plugin."); throw new Exception("The server version is not supported! Update to a version between 1.12 - 1.21.4 to run this plugin.");
} }
if (this.reload()) { if (this.reload()) {

View File

@ -10,21 +10,13 @@ public class StatCommand {
public static boolean Run(CommandSender sender){ public static boolean Run(CommandSender sender){
Player player = (Player) sender; Player player = (Player) sender;
// Calculate total play time from ticks (Minecraft runs at 20 ticks per second) player.sendMessage(STPlugin.getInstance().getPrefix()+ ChatColor.GREEN+" === Your statistics === ");
long totalTicks = player.getStatistic(Statistic.TOTAL_WORLD_TIME); player.sendMessage(ChatColor.AQUA+"Connects: "+(player.getStatistic(Statistic.LEAVE_GAME)+1));
long totalSeconds = totalTicks / 20; player.sendMessage(ChatColor.AQUA+"Deaths: "+player.getStatistic(Statistic.DEATHS));
long hours = totalSeconds / 3600; player.sendMessage(ChatColor.AQUA+"Mob kills: "+player.getStatistic(Statistic.MOB_KILLS));
long minutes = (totalSeconds % 3600) / 60; player.sendMessage(ChatColor.AQUA+"Player kills: "+player.getStatistic(Statistic.PLAYER_KILLS));
long seconds = totalSeconds % 60; player.sendMessage(ChatColor.AQUA+"Sleep count: "+player.getStatistic(Statistic.SLEEP_IN_BED));
player.sendMessage(ChatColor.AQUA+"Enchant count: "+player.getStatistic(Statistic.ITEM_ENCHANTED));
player.sendMessage(STPlugin.getInstance().getPrefix() + ChatColor.GREEN + " === Your statistics === ");
player.sendMessage(ChatColor.AQUA+"Connects: " + (player.getStatistic(Statistic.LEAVE_GAME)+1));
player.sendMessage(ChatColor.AQUA+"Deaths: " + player.getStatistic(Statistic.DEATHS));
player.sendMessage(ChatColor.AQUA+"Mob kills: " + player.getStatistic(Statistic.MOB_KILLS));
player.sendMessage(ChatColor.AQUA+"Player kills: " + player.getStatistic(Statistic.PLAYER_KILLS));
player.sendMessage(ChatColor.AQUA+"Sleep count: " + player.getStatistic(Statistic.SLEEP_IN_BED));
player.sendMessage(ChatColor.AQUA+"Enchant count: " + player.getStatistic(Statistic.ITEM_ENCHANTED));
player.sendMessage(ChatColor.AQUA + "Total Play Time: " + hours + "h " + minutes + "m " + seconds + "s");
player.sendMessage(ChatColor.GREEN+" =================== "); player.sendMessage(ChatColor.GREEN+" =================== ");
return true; return true;
} }

View File

@ -1,6 +1,5 @@
package hu.ditservices.handlers; package hu.ditservices.handlers;
import hu.ditservices.STPlugin;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.*; import org.bukkit.command.*;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@ -59,12 +58,8 @@ public class DITTabCompleter implements TabCompleter {
} }
} }
if (args[0].equalsIgnoreCase("pmanager") && args[1].equalsIgnoreCase("unload") || args[1].equalsIgnoreCase("load")) { if (args[0].equalsIgnoreCase("pmanager")&& args[1].equalsIgnoreCase("unload") || args[1].equalsIgnoreCase("load")) {
if ((args.length == 3) && STPlugin.getInstance().getConfig().getBoolean("PluginManager.enabled") & if (args.length == 3) {
(commandSender.hasPermission("st.pmanager")
|| commandSender.hasPermission("st.pmanager.load")
|| commandSender.hasPermission("st.pmanager.unload"))
) {
result.clear(); result.clear();
PluginManager pm = Bukkit.getServer().getPluginManager(); PluginManager pm = Bukkit.getServer().getPluginManager();
for (Plugin pl : pm.getPlugins()) { for (Plugin pl : pm.getPlugins()) {

View File

@ -37,8 +37,7 @@ public class Version {
v1_21_1_R1, v1_21_1_R1,
v1_21_2_R1, v1_21_2_R1,
v1_21_3_R1, v1_21_3_R1,
v1_21_4_R1, v1_21_4_R1;
v1_21_5_R1;
private int value; private int value;

View File

@ -74,15 +74,6 @@ Saving:
broadcastMsgProgress: '{PREFIX}Auto save in progress..' broadcastMsgProgress: '{PREFIX}Auto save in progress..'
broadcastMsgDone: '{PREFIX}Auto save done.' broadcastMsgDone: '{PREFIX}Auto save done.'
# Server Password options
# You can configure a same password for all players on the server.
# Players not logged in can't move, cant build/destroy.
ServerPassword:
enabled: false
password: 'changeme'
exceptOps: true # Server operators don't need to login.
# Cooldown options (only applicable for this plugin!) # Cooldown options (only applicable for this plugin!)
Cooldown: Cooldown:
enabled: true enabled: true