diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 6c47cb5..cf1aa87 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -20,13 +20,13 @@ jobs: - name: Upload uses: actions/upload-artifact@v3 with: - name: d7serverlite - path: target/d7serverlite*.jar + name: LSServerLite + path: target/LSServerLite*.jar - name: Create Pre Release run: | - FILES=./target/d7serverlite*.jar + FILES=./target/LSServerLite*.jar USER=LagacySurvival - REPO=D7ServerLite + REPO=ServerLite # Set up variables AUTH_HEADER="Authorization: token ${{ secrets.TOKEN }}" CONTENT_TYPE="Content-Type: application/json" diff --git a/README.md b/README.md index d4f1afa..78f9be2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# D7 Server Lite +# Server Lite D7ServerUtil in a more stable Version Version 1.17.1+ diff --git a/pom.xml b/pom.xml index 828e040..f775a43 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 de.npid7.serverlite - d7serverlite + LSServerLite 1.0 diff --git a/src/main/java/de/npid7/serverlite/Commands/D7Command.java b/src/main/java/de/npid7/serverlite/Commands/D7Command.java index beb6866..d64413a 100644 --- a/src/main/java/de/npid7/serverlite/Commands/D7Command.java +++ b/src/main/java/de/npid7/serverlite/Commands/D7Command.java @@ -1,7 +1,7 @@ package de.npid7.serverlite.Commands; import de.npid7.serverlite.Configs.PluginConfig; -import de.npid7.serverlite.D7ServerLite; +import de.npid7.serverlite.ServerLite; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -35,11 +35,11 @@ public class D7Command implements CommandExecutor { return false; } if (strings[1].equals("reload")) { - D7ServerLite.getInst().getPluginConfig().Load(); + ServerLite.getInst().getPluginConfig().Load(); sender.sendMessage(ChatColor.GREEN.toString() + "Config neu geladen!"); return false; } else if (strings[1].equals("save")) { - D7ServerLite.getInst().getPluginConfig().Save(); + ServerLite.getInst().getPluginConfig().Save(); sender.sendMessage(ChatColor.GREEN.toString() + "Config gespeichert!"); return false; } else { @@ -52,7 +52,7 @@ public class D7Command implements CommandExecutor { printUsage(sender); return false; } - PluginConfig pcfg = D7ServerLite.getInst().getPluginConfig(); + PluginConfig pcfg = ServerLite.getInst().getPluginConfig(); if (strings[1].equals("add")) { if (!pcfg.getWordBlacklist().add(strings[2])) { sender.sendMessage(ChatColor.RED.toString() + "Wort ist bereits in der Liste!"); @@ -81,8 +81,8 @@ public class D7Command implements CommandExecutor { sender.sendMessage(ChatColor.RED.toString() + "Player existiert nicht!"); return false; } - D7ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), ""); - D7ServerLite.getInst().getPlayerConfig().Save(); + ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), ""); + ServerLite.getInst().getPlayerConfig().Save(); sender.sendMessage(ChatColor.GREEN.toString() + "Status entfernt von " + pl.getName()); return false; } else if (strings[2].equals("set")) { @@ -100,12 +100,12 @@ public class D7Command implements CommandExecutor { } } } - if (D7ServerLite.getInst().getPluginConfig().getWordBlacklist().find(status) != null) { + if (ServerLite.getInst().getPluginConfig().getWordBlacklist().find(status) != null) { sender.sendMessage(ChatColor.RED.toString() + "Dieser Status ist nicht erlaubt!"); return false; } - D7ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), color + status); - D7ServerLite.getInst().getPlayerConfig().Save(); + ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), color + status); + ServerLite.getInst().getPlayerConfig().Save(); sender.sendMessage(ChatColor.GREEN.toString() + "Status gesetzt für " + pl.getName()); } } diff --git a/src/main/java/de/npid7/serverlite/Commands/StatusCommand.java b/src/main/java/de/npid7/serverlite/Commands/StatusCommand.java index 460a4ad..4370094 100644 --- a/src/main/java/de/npid7/serverlite/Commands/StatusCommand.java +++ b/src/main/java/de/npid7/serverlite/Commands/StatusCommand.java @@ -1,7 +1,7 @@ package de.npid7.serverlite.Commands; import de.npid7.serverlite.Configs.PlayerConfig; -import de.npid7.serverlite.D7ServerLite; +import de.npid7.serverlite.ServerLite; import org.bukkit.ChatColor; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -18,7 +18,7 @@ public class StatusCommand implements CommandExecutor { String str = ""; String color = ChatColor.WHITE.toString(); // Default to White boolean is_def = false; - for (String st : D7ServerLite.getInst().getPluginConfig().getDefaultStatusList()) { + for (String st : ServerLite.getInst().getPluginConfig().getDefaultStatusList()) { if (strings[0].equals(st)) { str = strings[0]; is_def = true; @@ -44,7 +44,7 @@ public class StatusCommand implements CommandExecutor { } } } else if (strings[0].equals("remove")) { - PlayerConfig pcfg = D7ServerLite.getInst().getPlayerConfig(); + PlayerConfig pcfg = ServerLite.getInst().getPlayerConfig(); pcfg.setStatus(((Player) sender).getUniqueId(), ""); pcfg.Save(); return false; @@ -53,7 +53,7 @@ public class StatusCommand implements CommandExecutor { ChatColor.RED.toString() + "Was auch immer du versuchst... lass es einfach!"); return false; } - if (D7ServerLite.getInst().getPluginConfig().getWordBlacklist().find(str) != null) { + if (ServerLite.getInst().getPluginConfig().getWordBlacklist().find(str) != null) { sender.sendMessage(ChatColor.RED.toString() + "Dieser Status ist nicht erlaubt!"); return false; } @@ -61,7 +61,7 @@ public class StatusCommand implements CommandExecutor { if (is_def) { color = ""; } - PlayerConfig pcfg = D7ServerLite.getInst().getPlayerConfig(); + PlayerConfig pcfg = ServerLite.getInst().getPlayerConfig(); pcfg.setStatus(((Player) sender).getUniqueId(), color + str); pcfg.Save(); return false; diff --git a/src/main/java/de/npid7/serverlite/Commands/TimerCommand.java b/src/main/java/de/npid7/serverlite/Commands/TimerCommand.java index 16a2808..603e1f2 100644 --- a/src/main/java/de/npid7/serverlite/Commands/TimerCommand.java +++ b/src/main/java/de/npid7/serverlite/Commands/TimerCommand.java @@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import de.npid7.serverlite.D7ServerLite; +import de.npid7.serverlite.ServerLite; public class TimerCommand implements CommandExecutor { @Override @@ -16,11 +16,11 @@ public class TimerCommand implements CommandExecutor { return false; } if (strings[0].equals("show")) { - D7ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true); - D7ServerLite.getInst().getPlayerConfig().Save(); + ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true); + ServerLite.getInst().getPlayerConfig().Save(); } else if (strings[0].equals("hide")) { - D7ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true); - D7ServerLite.getInst().getPlayerConfig().Save(); + ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true); + ServerLite.getInst().getPlayerConfig().Save(); } else { sender.sendMessage(ChatColor.RED.toString() + "argument nicht erlaubt!"); return false; diff --git a/src/main/java/de/npid7/serverlite/Listeners/PlayerListener.java b/src/main/java/de/npid7/serverlite/Listeners/PlayerListener.java index 9954bfa..bd92aea 100644 --- a/src/main/java/de/npid7/serverlite/Listeners/PlayerListener.java +++ b/src/main/java/de/npid7/serverlite/Listeners/PlayerListener.java @@ -1,7 +1,7 @@ package de.npid7.serverlite.Listeners; import de.npid7.serverlite.Configs.PlayerConfig; -import de.npid7.serverlite.D7ServerLite; +import de.npid7.serverlite.ServerLite; import org.bukkit.ChatColor; import org.bukkit.entity.Player; @@ -15,10 +15,10 @@ public class PlayerListener implements Listener { public void onPlayerMessage(AsyncPlayerChatEvent e) { String msg = e.getMessage(); String prefix = ""; - String status = D7ServerLite.getInst().getPlayerConfig().getStatus(e.getPlayer().getUniqueId()); + String status = ServerLite.getInst().getPlayerConfig().getStatus(e.getPlayer().getUniqueId()); String statusColor = ""; if (!status.equals("")) { - statusColor = D7ServerLite.getInst().getPluginConfig().getStatusColor(status); + statusColor = ServerLite.getInst().getPluginConfig().getStatusColor(status); if (statusColor == null) { statusColor = ChatColor.WHITE.toString(); } @@ -31,11 +31,11 @@ public class PlayerListener 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(), + if (ServerLite.getInst().getPlayerConfig().Find(player.getUniqueId()) == null) { + ServerLite.getInst().getPlayerConfig().Add(player.getUniqueId(), new PlayerConfig.PlayerEntry( - D7ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false)); - D7ServerLite.getInst().getPlayerConfig().Save(); + ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false)); + ServerLite.getInst().getPlayerConfig().Save(); } } } \ No newline at end of file diff --git a/src/main/java/de/npid7/serverlite/D7ServerLite.java b/src/main/java/de/npid7/serverlite/ServerLite.java similarity index 92% rename from src/main/java/de/npid7/serverlite/D7ServerLite.java rename to src/main/java/de/npid7/serverlite/ServerLite.java index 402b26f..901aea9 100644 --- a/src/main/java/de/npid7/serverlite/D7ServerLite.java +++ b/src/main/java/de/npid7/serverlite/ServerLite.java @@ -1,79 +1,79 @@ -package de.npid7.serverlite; - -import de.npid7.serverlite.Commands.D7Command; -import de.npid7.serverlite.Commands.PlaytimeCommand; -import de.npid7.serverlite.Commands.StatusCommand; -import de.npid7.serverlite.Commands.TimerCommand; -import de.npid7.serverlite.Configs.PlayerConfig; -import de.npid7.serverlite.Configs.PluginConfig; -import de.npid7.serverlite.Listeners.PlayerListener; -import de.npid7.serverlite.TabCompleters.D7Completer; -import de.npid7.serverlite.TabCompleters.PlaytimeCompleter; -import de.npid7.serverlite.TabCompleters.StatusCompleter; -import de.npid7.serverlite.TabCompleters.TimerCompleter; -import de.npid7.serverlite.Tasks.TablistTask; - -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; - -/* - * d7serverlite java plugin - */ -public class D7ServerLite extends JavaPlugin { - // Declare static Instance To access with getInst(); - // using this to access Configs from this Class - private static D7ServerLite inst; - - // declare TablistTask and Configs - private TablistTask tablistUpdater; - private PluginConfig pluginConfig; - private PlayerConfig playerConfig; - - // Override onLoad to set static inst to this class - @Override - public void onLoad() { - inst = this; - } - - // Override on Enabel to init the Plugin - @Override - public void onEnable() { - // Create Data Folder - if (!getDataFolder().exists()) { - getDataFolder().mkdirs(); - } - // Init Configs - pluginConfig = new PluginConfig(getDataFolder() + "/config.json"); - playerConfig = new PlayerConfig(getDataFolder() + "/player_config.json"); - // Run Tablist Updater - tablistUpdater = new TablistTask(); - // declare commands - getCommand("status").setExecutor(new StatusCommand()); - getCommand("status").setTabCompleter(new StatusCompleter()); - getCommand("d7").setExecutor(new D7Command()); - getCommand("d7").setTabCompleter(new D7Completer()); - getCommand("timer").setExecutor(new TimerCommand()); - getCommand("timer").setTabCompleter(new TimerCompleter()); - getCommand("playtime").setExecutor(new PlaytimeCommand()); - getCommand("playtime").setTabCompleter(new PlaytimeCompleter()); - - // Register onJoin Event to generate PlayerConfigEntry and customize chat message - Bukkit.getPluginManager().registerEvents(new PlayerListener(), this); - } - - /** - * Getters declared below - */ - - public static D7ServerLite getInst() { - return inst; - } - - public PluginConfig getPluginConfig() { - return this.pluginConfig; - } - - public PlayerConfig getPlayerConfig() { - return this.playerConfig; - } -} +package de.npid7.serverlite; + +import de.npid7.serverlite.Commands.D7Command; +import de.npid7.serverlite.Commands.PlaytimeCommand; +import de.npid7.serverlite.Commands.StatusCommand; +import de.npid7.serverlite.Commands.TimerCommand; +import de.npid7.serverlite.Configs.PlayerConfig; +import de.npid7.serverlite.Configs.PluginConfig; +import de.npid7.serverlite.Listeners.PlayerListener; +import de.npid7.serverlite.TabCompleters.D7Completer; +import de.npid7.serverlite.TabCompleters.PlaytimeCompleter; +import de.npid7.serverlite.TabCompleters.StatusCompleter; +import de.npid7.serverlite.TabCompleters.TimerCompleter; +import de.npid7.serverlite.Tasks.TablistTask; + +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; + +/* + * d7serverlite java plugin + */ +public class ServerLite extends JavaPlugin { + // Declare static Instance To access with getInst(); + // using this to access Configs from this Class + private static ServerLite inst; + + // declare TablistTask and Configs + private TablistTask tablistUpdater; + private PluginConfig pluginConfig; + private PlayerConfig playerConfig; + + // Override onLoad to set static inst to this class + @Override + public void onLoad() { + inst = this; + } + + // Override on Enabel to init the Plugin + @Override + public void onEnable() { + // Create Data Folder + if (!getDataFolder().exists()) { + getDataFolder().mkdirs(); + } + // Init Configs + pluginConfig = new PluginConfig(getDataFolder() + "/config.json"); + playerConfig = new PlayerConfig(getDataFolder() + "/player_config.json"); + // Run Tablist Updater + tablistUpdater = new TablistTask(); + // declare commands + getCommand("status").setExecutor(new StatusCommand()); + getCommand("status").setTabCompleter(new StatusCompleter()); + getCommand("d7").setExecutor(new D7Command()); + getCommand("d7").setTabCompleter(new D7Completer()); + getCommand("timer").setExecutor(new TimerCommand()); + getCommand("timer").setTabCompleter(new TimerCompleter()); + getCommand("playtime").setExecutor(new PlaytimeCommand()); + getCommand("playtime").setTabCompleter(new PlaytimeCompleter()); + + // Register onJoin Event to generate PlayerConfigEntry and customize chat message + Bukkit.getPluginManager().registerEvents(new PlayerListener(), this); + } + + /** + * Getters declared below + */ + + public static ServerLite getInst() { + return inst; + } + + public PluginConfig getPluginConfig() { + return this.pluginConfig; + } + + public PlayerConfig getPlayerConfig() { + return this.playerConfig; + } +} diff --git a/src/main/java/de/npid7/serverlite/TabCompleters/D7Completer.java b/src/main/java/de/npid7/serverlite/TabCompleters/D7Completer.java index 936a0ab..ab116f1 100644 --- a/src/main/java/de/npid7/serverlite/TabCompleters/D7Completer.java +++ b/src/main/java/de/npid7/serverlite/TabCompleters/D7Completer.java @@ -1,6 +1,6 @@ package de.npid7.serverlite.TabCompleters; -import de.npid7.serverlite.D7ServerLite; +import de.npid7.serverlite.ServerLite; import java.util.ArrayList; import java.util.List; import org.bukkit.Bukkit; @@ -41,7 +41,7 @@ public class D7Completer implements TabCompleter { completions.add("set"); } else if (args[0].equals("wordlist")) { if (args[1].equals("remove")) { - for (String s : D7ServerLite.getInst().getPluginConfig().getWordBlacklist().getList()) { + for (String s : ServerLite.getInst().getPluginConfig().getWordBlacklist().getList()) { completions.add(s); } } diff --git a/src/main/java/de/npid7/serverlite/TabCompleters/StatusCompleter.java b/src/main/java/de/npid7/serverlite/TabCompleters/StatusCompleter.java index 5985ac3..21b333f 100644 --- a/src/main/java/de/npid7/serverlite/TabCompleters/StatusCompleter.java +++ b/src/main/java/de/npid7/serverlite/TabCompleters/StatusCompleter.java @@ -1,6 +1,6 @@ package de.npid7.serverlite.TabCompleters; -import de.npid7.serverlite.D7ServerLite; +import de.npid7.serverlite.ServerLite; import java.util.ArrayList; import java.util.List; import org.bukkit.ChatColor; @@ -15,7 +15,7 @@ public class StatusCompleter implements TabCompleter { List completions = new ArrayList<>(); if (command.getName().equalsIgnoreCase("status")) { if (args.length == 1) { - for (String s : D7ServerLite.getInst().getPluginConfig().getDefaultStatusList()) { + for (String s : ServerLite.getInst().getPluginConfig().getDefaultStatusList()) { completions.add(s); } completions.add("custom"); diff --git a/src/main/java/de/npid7/serverlite/Tasks/TablistTask.java b/src/main/java/de/npid7/serverlite/Tasks/TablistTask.java index e464098..696aa74 100644 --- a/src/main/java/de/npid7/serverlite/Tasks/TablistTask.java +++ b/src/main/java/de/npid7/serverlite/Tasks/TablistTask.java @@ -1,6 +1,6 @@ package de.npid7.serverlite.Tasks; -import de.npid7.serverlite.D7ServerLite; +import de.npid7.serverlite.ServerLite; import de.npid7.serverlite.Helpers.Spielzeit; import net.md_5.bungee.api.ChatMessageType; import net.md_5.bungee.api.chat.TextComponent; @@ -64,10 +64,10 @@ public class TablistTask { + "\n"); pl.setPlayerListFooter("\n"); String body = ""; - String status = D7ServerLite.getInst().getPlayerConfig().getStatus(pl.getUniqueId()); + String status = ServerLite.getInst().getPlayerConfig().getStatus(pl.getUniqueId()); if (!status.equals("")) { body += "["; - String color = D7ServerLite.getInst().getPluginConfig().getStatusColor(status); + String color = ServerLite.getInst().getPluginConfig().getStatusColor(status); if (color == null) { color = ChatColor.WHITE.toString(); } @@ -79,7 +79,7 @@ public class TablistTask { body += ChatColor.WHITE.toString() + pl.getDisplayName(); body += " " + ChatColor.RED.toString() + pl.getStatistic(Statistic.DEATHS); pl.setPlayerListName(body); - if (D7ServerLite.getInst().getPlayerConfig().getTimer(pl.getUniqueId())) { + 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 +94,6 @@ public class TablistTask { CalcTPS(); displayTablist(); } - }.runTaskTimer(D7ServerLite.getInst(), 0, 0); + }.runTaskTimer(ServerLite.getInst(), 0, 0); } } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index b1afd7e..9265a4d 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ -name: D7SerevrLite -main: de.npid7.serverlite.D7ServerLite +name: LSSerevrLite +main: de.npid7.serverlite.ServerLite version: 1.0 api-version: 1.17