Compare commits

..

No commits in common. "main" and "p20241125_1252" have entirely different histories.

15 changed files with 189 additions and 228 deletions

View File

@ -20,13 +20,13 @@ jobs:
- name: Upload - name: Upload
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: LSServerLite name: d7serverlite
path: target/LSServerLite*.jar path: target/d7serverlite*.jar
- name: Create Pre Release - name: Create Pre Release
run: | run: |
FILES=./target/LSServerLite*.jar FILES=./target/d7serverlite*.jar
USER=LagacySurvival USER=D7MC
REPO=ServerLite REPO=D7ServerLite
# Set up variables # Set up variables
AUTH_HEADER="Authorization: token ${{ secrets.TOKEN }}" AUTH_HEADER="Authorization: token ${{ secrets.TOKEN }}"
CONTENT_TYPE="Content-Type: application/json" CONTENT_TYPE="Content-Type: application/json"

View File

@ -1,4 +1,4 @@
# Server Lite # D7 Server Lite
D7ServerUtil in a more stable Version D7ServerUtil in a more stable Version
Version 1.17.1+ Version 1.17.1+

View File

@ -6,7 +6,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.npid7.serverlite</groupId> <groupId>de.npid7.serverlite</groupId>
<artifactId>LSServerLite</artifactId> <artifactId>d7serverlite</artifactId>
<version>1.0</version> <version>1.0</version>
<properties> <properties>

View File

@ -1,7 +1,7 @@
package de.npid7.serverlite.Commands; package de.npid7.serverlite.Commands;
import de.npid7.serverlite.Configs.PluginConfig; import de.npid7.serverlite.Configs.PluginConfig;
import de.npid7.serverlite.ServerLite; import de.npid7.serverlite.D7ServerLite;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
@ -9,17 +9,16 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class SystemCommand implements CommandExecutor { public class D7Command implements CommandExecutor {
private void printUsage(CommandSender sender) { private void printUsage(CommandSender sender) {
sender.sendMessage("Verwendung: "); sender.sendMessage("Verwendung: ");
sender.sendMessage("/system config reload -> Läd Config nau"); sender.sendMessage("/d7 config reload -> Läd Config nau");
sender.sendMessage("/system config save -> Speichert die Config"); sender.sendMessage("/d7 config save -> Speichert die Config");
sender.sendMessage("/system wordlist add <word>"); sender.sendMessage("/d7 wordlist add <word>");
sender.sendMessage("/system wordlist remove <word>"); sender.sendMessage("/d7 wordlist remove <word>");
sender.sendMessage("/system status <playername> set <status> <color> (color ist optional)"); sender.sendMessage("/d7 status <playername> set <status> <color> (color ist optional)");
sender.sendMessage("/system status <playername> remove -> Entfernt einem Spieler den Status"); sender.sendMessage("/d7 status <playername> remove -> Entfernt einem Spieler den Status");
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) {
if (!sender.hasPermission("d7.d7")) { if (!sender.hasPermission("d7.d7")) {
@ -36,11 +35,11 @@ public class SystemCommand implements CommandExecutor {
return false; return false;
} }
if (strings[1].equals("reload")) { if (strings[1].equals("reload")) {
ServerLite.getInst().getPluginConfig().Load(); D7ServerLite.getInst().getPluginConfig().Load();
sender.sendMessage(ChatColor.GREEN.toString() + "Config neu geladen!"); sender.sendMessage(ChatColor.GREEN.toString() + "Config neu geladen!");
return false; return false;
} else if (strings[1].equals("save")) { } else if (strings[1].equals("save")) {
ServerLite.getInst().getPluginConfig().Save(); D7ServerLite.getInst().getPluginConfig().Save();
sender.sendMessage(ChatColor.GREEN.toString() + "Config gespeichert!"); sender.sendMessage(ChatColor.GREEN.toString() + "Config gespeichert!");
return false; return false;
} else { } else {
@ -53,7 +52,7 @@ public class SystemCommand implements CommandExecutor {
printUsage(sender); printUsage(sender);
return false; return false;
} }
PluginConfig pcfg = ServerLite.getInst().getPluginConfig(); PluginConfig pcfg = D7ServerLite.getInst().getPluginConfig();
if (strings[1].equals("add")) { if (strings[1].equals("add")) {
if (!pcfg.getWordBlacklist().add(strings[2])) { if (!pcfg.getWordBlacklist().add(strings[2])) {
sender.sendMessage(ChatColor.RED.toString() + "Wort ist bereits in der Liste!"); sender.sendMessage(ChatColor.RED.toString() + "Wort ist bereits in der Liste!");
@ -82,8 +81,8 @@ public class SystemCommand implements CommandExecutor {
sender.sendMessage(ChatColor.RED.toString() + "Player existiert nicht!"); sender.sendMessage(ChatColor.RED.toString() + "Player existiert nicht!");
return false; return false;
} }
ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), ""); D7ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), "");
ServerLite.getInst().getPlayerConfig().Save(); D7ServerLite.getInst().getPlayerConfig().Save();
sender.sendMessage(ChatColor.GREEN.toString() + "Status entfernt von " + pl.getName()); sender.sendMessage(ChatColor.GREEN.toString() + "Status entfernt von " + pl.getName());
return false; return false;
} else if (strings[2].equals("set")) { } else if (strings[2].equals("set")) {
@ -101,12 +100,12 @@ public class SystemCommand implements CommandExecutor {
} }
} }
} }
if (ServerLite.getInst().getPluginConfig().getWordBlacklist().find(status) != null) { if (D7ServerLite.getInst().getPluginConfig().getWordBlacklist().find(status) != null) {
sender.sendMessage(ChatColor.RED.toString() + "Dieser Status ist nicht erlaubt!"); sender.sendMessage(ChatColor.RED.toString() + "Dieser Status ist nicht erlaubt!");
return false; return false;
} }
ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), color + status); D7ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), color + status);
ServerLite.getInst().getPlayerConfig().Save(); D7ServerLite.getInst().getPlayerConfig().Save();
sender.sendMessage(ChatColor.GREEN.toString() + "Status gesetzt für " + pl.getName()); sender.sendMessage(ChatColor.GREEN.toString() + "Status gesetzt für " + pl.getName());
} }
} }

View File

@ -1,6 +1,5 @@
package de.npid7.serverlite.Commands; package de.npid7.serverlite.Commands;
import de.npid7.serverlite.Helpers.Spielzeit;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.OfflinePlayer; import org.bukkit.OfflinePlayer;
@ -10,36 +9,30 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import de.npid7.serverlite.Helpers.Spielzeit;
public class PlaytimeCommand implements CommandExecutor { public class PlaytimeCommand implements CommandExecutor {
private void makeMessage(OfflinePlayer pl, Player exec) { private void makeMessage(OfflinePlayer pl, Player exec) {
if (pl == null) { if (pl == null) {
return; return;
} }
exec.sendMessage("- " + ChatColor.GOLD.toString() + "PlayTime: "); exec.sendMessage("- " + ChatColor.GOLD.toString() + "PLAYTIME: ");
exec.sendMessage( exec.sendMessage("- " + ChatColor.GRAY.toString() + "Player: " + ChatColor.WHITE.toString() + pl.getName());
"- " + ChatColor.GRAY.toString() + "Player: " + ChatColor.WHITE.toString() + pl.getName());
// exec.sendMessage("- First Join: "); // exec.sendMessage("- First Join: ");
int playtime = Spielzeit.getHours(pl.getStatistic(Statistic.TOTAL_WORLD_TIME));
String str = " Stunden";
if (playtime == 1) {
str = " Stunde";
}
exec.sendMessage("- " + ChatColor.GRAY.toString() + "Spielzeit: " + ChatColor.GREEN.toString() exec.sendMessage("- " + ChatColor.GRAY.toString() + "Spielzeit: " + ChatColor.GREEN.toString()
+ playtime + str); + Spielzeit.getHours(pl.getStatistic(Statistic.TOTAL_WORLD_TIME)));
exec.sendMessage("- " + ChatColor.GRAY.toString() exec.sendMessage(
+ "Detailierte Spielzeit: " + ChatColor.GREEN.toString() "- " + ChatColor.GRAY.toString() + "Detailierte Spielzeit: " + ChatColor.GREEN.toString()
+ Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME))); + Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME)));
exec.sendMessage("- " + ChatColor.GRAY.toString() + "Server " + ChatColor.GREEN.toString() exec.sendMessage("- " + ChatColor.GRAY.toString() + "Du hast den Server " + ChatColor.GREEN.toString()
+ (pl.getStatistic(Statistic.LEAVE_GAME) + 1) + ChatColor.GRAY.toString() + (pl.getStatistic(Statistic.LEAVE_GAME) + 1) + ChatColor.GRAY.toString() + " mal betreten.");
+ " mal betreten.");
} }
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) {
if (strings.length != 0) { if (strings.length != 0) {
if (!sender.hasPermission("d7.d7")) { if (!sender.hasPermission("d7.d7")) {
sender.sendMessage( sender.sendMessage(ChatColor.RED.toString() + "Nur Admins dürfen /plytime auf spieler anwenden");
ChatColor.RED.toString() + "Nur Admins dürfen /plytime auf spieler anwenden");
return false; return false;
} }
OfflinePlayer pl = Bukkit.getOfflinePlayer(strings[0]); OfflinePlayer pl = Bukkit.getOfflinePlayer(strings[0]);

View File

@ -1,7 +1,7 @@
package de.npid7.serverlite.Commands; package de.npid7.serverlite.Commands;
import de.npid7.serverlite.Configs.PlayerConfig; import de.npid7.serverlite.Configs.PlayerConfig;
import de.npid7.serverlite.ServerLite; import de.npid7.serverlite.D7ServerLite;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
@ -18,7 +18,7 @@ public class StatusCommand implements CommandExecutor {
String str = ""; String str = "";
String color = ChatColor.WHITE.toString(); // Default to White String color = ChatColor.WHITE.toString(); // Default to White
boolean is_def = false; boolean is_def = false;
for (String st : ServerLite.getInst().getPluginConfig().getDefaultStatusList()) { for (String st : D7ServerLite.getInst().getPluginConfig().getDefaultStatusList()) {
if (strings[0].equals(st)) { if (strings[0].equals(st)) {
str = strings[0]; str = strings[0];
is_def = true; is_def = true;
@ -44,7 +44,7 @@ public class StatusCommand implements CommandExecutor {
} }
} }
} else if (strings[0].equals("remove")) { } else if (strings[0].equals("remove")) {
PlayerConfig pcfg = ServerLite.getInst().getPlayerConfig(); PlayerConfig pcfg = D7ServerLite.getInst().getPlayerConfig();
pcfg.setStatus(((Player) sender).getUniqueId(), ""); pcfg.setStatus(((Player) sender).getUniqueId(), "");
pcfg.Save(); pcfg.Save();
return false; return false;
@ -53,7 +53,7 @@ public class StatusCommand implements CommandExecutor {
ChatColor.RED.toString() + "Was auch immer du versuchst... lass es einfach!"); ChatColor.RED.toString() + "Was auch immer du versuchst... lass es einfach!");
return false; return false;
} }
if (ServerLite.getInst().getPluginConfig().getWordBlacklist().find(str) != null) { if (D7ServerLite.getInst().getPluginConfig().getWordBlacklist().find(str) != null) {
sender.sendMessage(ChatColor.RED.toString() + "Dieser Status ist nicht erlaubt!"); sender.sendMessage(ChatColor.RED.toString() + "Dieser Status ist nicht erlaubt!");
return false; return false;
} }
@ -61,7 +61,7 @@ public class StatusCommand implements CommandExecutor {
if (is_def) { if (is_def) {
color = ""; color = "";
} }
PlayerConfig pcfg = ServerLite.getInst().getPlayerConfig(); PlayerConfig pcfg = D7ServerLite.getInst().getPlayerConfig();
pcfg.setStatus(((Player) sender).getUniqueId(), color + str); pcfg.setStatus(((Player) sender).getUniqueId(), color + str);
pcfg.Save(); pcfg.Save();
return false; return false;

View File

@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import de.npid7.serverlite.ServerLite; import de.npid7.serverlite.D7ServerLite;
public class TimerCommand implements CommandExecutor { public class TimerCommand implements CommandExecutor {
@Override @Override
@ -16,11 +16,11 @@ public class TimerCommand implements CommandExecutor {
return false; return false;
} }
if (strings[0].equals("show")) { if (strings[0].equals("show")) {
ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true); D7ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true);
ServerLite.getInst().getPlayerConfig().Save(); D7ServerLite.getInst().getPlayerConfig().Save();
} else if (strings[0].equals("hide")) { } else if (strings[0].equals("hide")) {
ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), false); D7ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true);
ServerLite.getInst().getPlayerConfig().Save(); D7ServerLite.getInst().getPlayerConfig().Save();
} else { } else {
sender.sendMessage(ChatColor.RED.toString() + "argument nicht erlaubt!"); sender.sendMessage(ChatColor.RED.toString() + "argument nicht erlaubt!");
return false; return false;

View File

@ -1,13 +1,13 @@
package de.npid7.serverlite; package de.npid7.serverlite;
import de.npid7.serverlite.Commands.SystemCommand; import de.npid7.serverlite.Commands.D7Command;
import de.npid7.serverlite.Commands.PlaytimeCommand; import de.npid7.serverlite.Commands.PlaytimeCommand;
import de.npid7.serverlite.Commands.StatusCommand; import de.npid7.serverlite.Commands.StatusCommand;
import de.npid7.serverlite.Commands.TimerCommand; import de.npid7.serverlite.Commands.TimerCommand;
import de.npid7.serverlite.Configs.PlayerConfig; import de.npid7.serverlite.Configs.PlayerConfig;
import de.npid7.serverlite.Configs.PluginConfig; import de.npid7.serverlite.Configs.PluginConfig;
import de.npid7.serverlite.Listeners.PlayerListener; import de.npid7.serverlite.Listeners.JoinListener;
import de.npid7.serverlite.TabCompleters.SystemCompleter; import de.npid7.serverlite.TabCompleters.D7Completer;
import de.npid7.serverlite.TabCompleters.PlaytimeCompleter; import de.npid7.serverlite.TabCompleters.PlaytimeCompleter;
import de.npid7.serverlite.TabCompleters.StatusCompleter; import de.npid7.serverlite.TabCompleters.StatusCompleter;
import de.npid7.serverlite.TabCompleters.TimerCompleter; import de.npid7.serverlite.TabCompleters.TimerCompleter;
@ -19,10 +19,10 @@ import org.bukkit.plugin.java.JavaPlugin;
/* /*
* d7serverlite java plugin * d7serverlite java plugin
*/ */
public class ServerLite extends JavaPlugin { public class D7ServerLite extends JavaPlugin {
// Declare static Instance To access with getInst(); // Declare static Instance To access with getInst();
// using this to access Configs from this Class // using this to access Configs from this Class
private static ServerLite inst; private static D7ServerLite inst;
// declare TablistTask and Configs // declare TablistTask and Configs
private TablistTask tablistUpdater; private TablistTask tablistUpdater;
@ -50,22 +50,22 @@ public class ServerLite extends JavaPlugin {
// declare commands // declare commands
getCommand("status").setExecutor(new StatusCommand()); getCommand("status").setExecutor(new StatusCommand());
getCommand("status").setTabCompleter(new StatusCompleter()); getCommand("status").setTabCompleter(new StatusCompleter());
getCommand("system").setExecutor(new SystemCommand()); getCommand("d7").setExecutor(new D7Command());
getCommand("system").setTabCompleter(new SystemCompleter()); getCommand("d7").setTabCompleter(new D7Completer());
getCommand("timer").setExecutor(new TimerCommand()); getCommand("timer").setExecutor(new TimerCommand());
getCommand("timer").setTabCompleter(new TimerCompleter()); getCommand("timer").setTabCompleter(new TimerCompleter());
getCommand("playtime").setExecutor(new PlaytimeCommand()); getCommand("playtime").setExecutor(new PlaytimeCommand());
getCommand("playtime").setTabCompleter(new PlaytimeCompleter()); getCommand("playtime").setTabCompleter(new PlaytimeCompleter());
// Register onJoin Event to generate PlayerConfigEntry and customize chat message // Register onJoin Event to generate PlayerConfigEntry
Bukkit.getPluginManager().registerEvents(new PlayerListener(), this); Bukkit.getPluginManager().registerEvents(new JoinListener(), this);
} }
/** /**
* Getters declared below * Getters declared below
*/ */
public static ServerLite getInst() { public static D7ServerLite getInst() {
return inst; return inst;
} }

View File

@ -2,6 +2,8 @@ package de.npid7.serverlite.Helpers;
import com.google.gson.JsonArray; import com.google.gson.JsonArray;
import com.google.gson.JsonElement; import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import java.util.Map;
import java.util.Vector; import java.util.Vector;
public class Wordlist { public class Wordlist {

View File

@ -0,0 +1,21 @@
package de.npid7.serverlite.Listeners;
import de.npid7.serverlite.Configs.PlayerConfig;
import de.npid7.serverlite.D7ServerLite;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.PlayerJoinEvent;
public class JoinListener implements Listener {
@EventHandler
public void onJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
if (D7ServerLite.getInst().getPlayerConfig().Find(player.getUniqueId()) == null) {
D7ServerLite.getInst().getPlayerConfig().Add(player.getUniqueId(),
new PlayerConfig.PlayerEntry(
D7ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false));
D7ServerLite.getInst().getPlayerConfig().Save();
}
}
}

View File

@ -1,41 +0,0 @@
package de.npid7.serverlite.Listeners;
import de.npid7.serverlite.Configs.PlayerConfig;
import de.npid7.serverlite.ServerLite;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.player.AsyncPlayerChatEvent;
import org.bukkit.event.player.PlayerJoinEvent;
public class PlayerListener implements Listener {
@EventHandler
public void onPlayerMessage(AsyncPlayerChatEvent e) {
String msg = e.getMessage();
String prefix = "";
String status = ServerLite.getInst().getPlayerConfig().getStatus(e.getPlayer().getUniqueId());
String statusColor = "";
if (!status.equals("")) {
statusColor = ServerLite.getInst().getPluginConfig().getStatusColor(status);
if (statusColor == null) {
statusColor = ChatColor.WHITE.toString();
}
prefix = "[" + statusColor + status + ChatColor.WHITE.toString() + "] ";
}
prefix += "<" + e.getPlayer().getDisplayName() + "> ";
e.setFormat(prefix + msg);
}
@EventHandler
public void onJoin(PlayerJoinEvent event) {
Player player = event.getPlayer();
if (ServerLite.getInst().getPlayerConfig().Find(player.getUniqueId()) == null) {
ServerLite.getInst().getPlayerConfig().Add(player.getUniqueId(),
new PlayerConfig.PlayerEntry(
ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false));
ServerLite.getInst().getPlayerConfig().Save();
}
}
}

View File

@ -1,6 +1,6 @@
package de.npid7.serverlite.TabCompleters; package de.npid7.serverlite.TabCompleters;
import de.npid7.serverlite.ServerLite; import de.npid7.serverlite.D7ServerLite;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
@ -10,13 +10,13 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.TabCompleter; import org.bukkit.command.TabCompleter;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
public class SystemCompleter implements TabCompleter { public class D7Completer implements TabCompleter {
@Override @Override
public List<String> onTabComplete( public List<String> onTabComplete(
CommandSender sender, Command command, String alias, String[] args) { CommandSender sender, Command command, String alias, String[] args) {
List<String> completions = new ArrayList<>(); List<String> completions = new ArrayList<>();
if (command.getName().equals("system")) { if (command.getName().equals("d7")) {
if (!sender.hasPermission("ls.system")) { if (!sender.hasPermission("d7.d7")) {
return completions; return completions;
} }
if (args.length == 1) { if (args.length == 1) {
@ -41,7 +41,7 @@ public class SystemCompleter implements TabCompleter {
completions.add("set"); completions.add("set");
} else if (args[0].equals("wordlist")) { } else if (args[0].equals("wordlist")) {
if (args[1].equals("remove")) { if (args[1].equals("remove")) {
for (String s : ServerLite.getInst().getPluginConfig().getWordBlacklist().getList()) { for (String s : D7ServerLite.getInst().getPluginConfig().getWordBlacklist().getList()) {
completions.add(s); completions.add(s);
} }
} }

View File

@ -1,6 +1,6 @@
package de.npid7.serverlite.TabCompleters; package de.npid7.serverlite.TabCompleters;
import de.npid7.serverlite.ServerLite; import de.npid7.serverlite.D7ServerLite;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -15,7 +15,7 @@ public class StatusCompleter implements TabCompleter {
List<String> completions = new ArrayList<>(); List<String> completions = new ArrayList<>();
if (command.getName().equalsIgnoreCase("status")) { if (command.getName().equalsIgnoreCase("status")) {
if (args.length == 1) { if (args.length == 1) {
for (String s : ServerLite.getInst().getPluginConfig().getDefaultStatusList()) { for (String s : D7ServerLite.getInst().getPluginConfig().getDefaultStatusList()) {
completions.add(s); completions.add(s);
} }
completions.add("custom"); completions.add("custom");

View File

@ -1,11 +1,9 @@
package de.npid7.serverlite.Tasks; package de.npid7.serverlite.Tasks;
import de.npid7.serverlite.ServerLite; import de.npid7.serverlite.D7ServerLite;
import de.npid7.serverlite.Helpers.Spielzeit; import de.npid7.serverlite.Helpers.Spielzeit;
import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.Statistic; import org.bukkit.Statistic;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
@ -48,26 +46,20 @@ public class TablistTask {
if (playtime == 1) { if (playtime == 1) {
str = " Stunde"; str = " Stunde";
} }
String tpsclr = ChatColor.GREEN.toString();
if (tps < 18.0 && tps > 15.0) {
tpsclr = ChatColor.GOLD.toString();
} else if (tps <= 15 || tps > 20) {
tpsclr = ChatColor.RED.toString();
}
pl.setPlayerListHeader( pl.setPlayerListHeader(
"\n§x§B§1§9§1§6§9§lʟ§x§A§D§8§E§6§8§lᴇ§x§A§A§8§C§6§7§lɢ§x§A§6§8§9§6§6§lᴀ§x§A§2§8§7§6§5§l§x§9§F§8§4§6§4§lʏ §x§9§8§7§F§6§2§lѕ§x§9§4§7§C§6§0§l§x§9§0§7§A§5§F§lʀ§x§8§D§7§7§5§E§l§x§8§9§7§5§5§D§lɪ§x§8§5§7§2§5§C§l§x§8§2§7§0§5§B§lᴀ§x§7§E§6§D§5§A§lʟ\n" "\n§x§5§5§5§5§5§5§lѕ§x§5§B§5§B§5§B§l§x§6§1§6§1§6§1§lʀ§x§6§7§6§7§6§7§l§x§6§D§6§D§6§D§lɪ§x§7§3§7§3§7§3§l§x§7§9§7§9§7§9§lᴀ§x§8§0§8§0§8§0§lʟ§x§8§6§8§6§8§6§lᴘ§x§8§C§8§C§8§C§lʀ§x§9§2§9§2§9§2§l§x§9§8§9§8§9§8§lᴊ§x§9§E§9§E§9§E§lᴇ§x§A§4§A§4§A§4§lᴋ§x§A§A§A§A§A§A§lᴛ\n"
+ "\n" + ChatColor.GRAY.toString() + "ᴅᴇɪɴ ᴘɪɴɢ" + ChatColor.DARK_GRAY.toString() + ": " + "\n" + ChatColor.GRAY.toString() + "ᴅᴇɪɴ ᴘɪɴɢ" + ChatColor.DARK_GRAY.toString() + ": "
+ ChatColor.GREEN.toString() + pl.getPing() + " " + ChatColor.GRAY.toString() + ChatColor.GREEN.toString() + pl.getPing() + " " + ChatColor.GRAY.toString()
+ "ѕᴇʀᴠᴇʀ ᴛᴘѕ" + ChatColor.DARK_GRAY.toString() + ": " + ChatColor.GREEN.toString() + "ѕᴇʀᴠᴇʀ ᴛᴘѕ" + ChatColor.DARK_GRAY.toString() + ": " + ChatColor.GREEN.toString()
+ tpsclr + String.format("%.1f", tps) + "\n\n" + ChatColor.GRAY.toString() + "ѕᴘɪᴇʟᴢᴇɪᴛ" + String.format("%.1f", tps) + "\n\n" + ChatColor.GRAY.toString() + "ѕᴘɪᴇʟᴢᴇɪᴛ"
+ ChatColor.DARK_GRAY.toString() + ": " + ChatColor.GREEN.toString() + playtime + str + ChatColor.DARK_GRAY.toString() + ": " + ChatColor.GREEN.toString() + playtime + str
+ "\n"); + "\n");
pl.setPlayerListFooter("\n"); pl.setPlayerListFooter("\n");
String body = ""; String body = "";
String status = ServerLite.getInst().getPlayerConfig().getStatus(pl.getUniqueId()); String status = D7ServerLite.getInst().getPlayerConfig().getStatus(pl.getUniqueId());
if (!status.equals("")) { if (!status.equals("")) {
body += "["; body += "[";
String color = ServerLite.getInst().getPluginConfig().getStatusColor(status); String color = D7ServerLite.getInst().getPluginConfig().getStatusColor(status);
if (color == null) { if (color == null) {
color = ChatColor.WHITE.toString(); color = ChatColor.WHITE.toString();
} }
@ -79,11 +71,6 @@ public class TablistTask {
body += ChatColor.WHITE.toString() + pl.getDisplayName(); body += ChatColor.WHITE.toString() + pl.getDisplayName();
body += " " + ChatColor.RED.toString() + pl.getStatistic(Statistic.DEATHS); body += " " + ChatColor.RED.toString() + pl.getStatistic(Statistic.DEATHS);
pl.setPlayerListName(body); pl.setPlayerListName(body);
if (ServerLite.getInst().getPlayerConfig().getTimer(pl.getUniqueId())) {
pl.spigot().sendMessage(ChatMessageType.ACTION_BAR,
new TextComponent(ChatColor.GOLD.toString()
+ Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME))));
}
} }
} }
@ -94,6 +81,6 @@ public class TablistTask {
CalcTPS(); CalcTPS();
displayTablist(); displayTablist();
} }
}.runTaskTimer(ServerLite.getInst(), 0, 0); }.runTaskTimer(D7ServerLite.getInst(), 0, 0);
} }
} }

View File

@ -1,14 +1,14 @@
name: LSSerevrLite name: D7SerevrLite
main: de.npid7.serverlite.ServerLite main: de.npid7.serverlite.D7ServerLite
version: 1.0 version: 1.0
api-version: 1.17 api-version: 1.17
commands: commands:
status: status:
description: Play Status Command description: Play Status Command
system: d7:
description: Admin Command Interface description: Admin Command Interface
permission: ls.system permission: d7.d7
timer: timer:
description: Display Timer in Actionbar description: Display Timer in Actionbar
playtime: playtime: