This commit is contained in:
parent
141bdd163f
commit
a5c53696b8
@ -20,13 +20,13 @@ jobs:
|
|||||||
- name: Upload
|
- name: Upload
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: d7serverlite
|
name: LSServerLite
|
||||||
path: target/d7serverlite*.jar
|
path: target/LSServerLite*.jar
|
||||||
- name: Create Pre Release
|
- name: Create Pre Release
|
||||||
run: |
|
run: |
|
||||||
FILES=./target/d7serverlite*.jar
|
FILES=./target/LSServerLite*.jar
|
||||||
USER=LagacySurvival
|
USER=LagacySurvival
|
||||||
REPO=D7ServerLite
|
REPO=ServerLite
|
||||||
# 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"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# D7 Server Lite
|
# Server Lite
|
||||||
D7ServerUtil in a more stable Version
|
D7ServerUtil in a more stable Version
|
||||||
|
|
||||||
Version 1.17.1+
|
Version 1.17.1+
|
||||||
|
2
pom.xml
2
pom.xml
@ -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>d7serverlite</artifactId>
|
<artifactId>LSServerLite</artifactId>
|
||||||
<version>1.0</version>
|
<version>1.0</version>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@ -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.D7ServerLite;
|
import de.npid7.serverlite.ServerLite;
|
||||||
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;
|
||||||
@ -35,11 +35,11 @@ public class D7Command implements CommandExecutor {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (strings[1].equals("reload")) {
|
if (strings[1].equals("reload")) {
|
||||||
D7ServerLite.getInst().getPluginConfig().Load();
|
ServerLite.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")) {
|
||||||
D7ServerLite.getInst().getPluginConfig().Save();
|
ServerLite.getInst().getPluginConfig().Save();
|
||||||
sender.sendMessage(ChatColor.GREEN.toString() + "Config gespeichert!");
|
sender.sendMessage(ChatColor.GREEN.toString() + "Config gespeichert!");
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
@ -52,7 +52,7 @@ public class D7Command implements CommandExecutor {
|
|||||||
printUsage(sender);
|
printUsage(sender);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
PluginConfig pcfg = D7ServerLite.getInst().getPluginConfig();
|
PluginConfig pcfg = ServerLite.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!");
|
||||||
@ -81,8 +81,8 @@ public class D7Command implements CommandExecutor {
|
|||||||
sender.sendMessage(ChatColor.RED.toString() + "Player existiert nicht!");
|
sender.sendMessage(ChatColor.RED.toString() + "Player existiert nicht!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
D7ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), "");
|
ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), "");
|
||||||
D7ServerLite.getInst().getPlayerConfig().Save();
|
ServerLite.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")) {
|
||||||
@ -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!");
|
sender.sendMessage(ChatColor.RED.toString() + "Dieser Status ist nicht erlaubt!");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
D7ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), color + status);
|
ServerLite.getInst().getPlayerConfig().setStatus(pl.getUniqueId(), color + status);
|
||||||
D7ServerLite.getInst().getPlayerConfig().Save();
|
ServerLite.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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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.D7ServerLite;
|
import de.npid7.serverlite.ServerLite;
|
||||||
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 : D7ServerLite.getInst().getPluginConfig().getDefaultStatusList()) {
|
for (String st : ServerLite.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 = D7ServerLite.getInst().getPlayerConfig();
|
PlayerConfig pcfg = ServerLite.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 (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!");
|
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 = D7ServerLite.getInst().getPlayerConfig();
|
PlayerConfig pcfg = ServerLite.getInst().getPlayerConfig();
|
||||||
pcfg.setStatus(((Player) sender).getUniqueId(), color + str);
|
pcfg.setStatus(((Player) sender).getUniqueId(), color + str);
|
||||||
pcfg.Save();
|
pcfg.Save();
|
||||||
return false;
|
return false;
|
||||||
|
@ -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.D7ServerLite;
|
import de.npid7.serverlite.ServerLite;
|
||||||
|
|
||||||
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")) {
|
||||||
D7ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true);
|
ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true);
|
||||||
D7ServerLite.getInst().getPlayerConfig().Save();
|
ServerLite.getInst().getPlayerConfig().Save();
|
||||||
} else if (strings[0].equals("hide")) {
|
} else if (strings[0].equals("hide")) {
|
||||||
D7ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true);
|
ServerLite.getInst().getPlayerConfig().setTimer(((Player) sender).getUniqueId(), true);
|
||||||
D7ServerLite.getInst().getPlayerConfig().Save();
|
ServerLite.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;
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
package de.npid7.serverlite.Listeners;
|
package de.npid7.serverlite.Listeners;
|
||||||
|
|
||||||
import de.npid7.serverlite.Configs.PlayerConfig;
|
import de.npid7.serverlite.Configs.PlayerConfig;
|
||||||
import de.npid7.serverlite.D7ServerLite;
|
import de.npid7.serverlite.ServerLite;
|
||||||
|
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@ -15,10 +15,10 @@ public class PlayerListener implements Listener {
|
|||||||
public void onPlayerMessage(AsyncPlayerChatEvent e) {
|
public void onPlayerMessage(AsyncPlayerChatEvent e) {
|
||||||
String msg = e.getMessage();
|
String msg = e.getMessage();
|
||||||
String prefix = "";
|
String prefix = "";
|
||||||
String status = D7ServerLite.getInst().getPlayerConfig().getStatus(e.getPlayer().getUniqueId());
|
String status = ServerLite.getInst().getPlayerConfig().getStatus(e.getPlayer().getUniqueId());
|
||||||
String statusColor = "";
|
String statusColor = "";
|
||||||
if (!status.equals("")) {
|
if (!status.equals("")) {
|
||||||
statusColor = D7ServerLite.getInst().getPluginConfig().getStatusColor(status);
|
statusColor = ServerLite.getInst().getPluginConfig().getStatusColor(status);
|
||||||
if (statusColor == null) {
|
if (statusColor == null) {
|
||||||
statusColor = ChatColor.WHITE.toString();
|
statusColor = ChatColor.WHITE.toString();
|
||||||
}
|
}
|
||||||
@ -31,11 +31,11 @@ public class PlayerListener implements Listener {
|
|||||||
@EventHandler
|
@EventHandler
|
||||||
public void onJoin(PlayerJoinEvent event) {
|
public void onJoin(PlayerJoinEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
if (D7ServerLite.getInst().getPlayerConfig().Find(player.getUniqueId()) == null) {
|
if (ServerLite.getInst().getPlayerConfig().Find(player.getUniqueId()) == null) {
|
||||||
D7ServerLite.getInst().getPlayerConfig().Add(player.getUniqueId(),
|
ServerLite.getInst().getPlayerConfig().Add(player.getUniqueId(),
|
||||||
new PlayerConfig.PlayerEntry(
|
new PlayerConfig.PlayerEntry(
|
||||||
D7ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false));
|
ServerLite.getInst().getPluginConfig().getDefaultStatus(), player.getName(), false));
|
||||||
D7ServerLite.getInst().getPlayerConfig().Save();
|
ServerLite.getInst().getPlayerConfig().Save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -19,10 +19,10 @@ import org.bukkit.plugin.java.JavaPlugin;
|
|||||||
/*
|
/*
|
||||||
* d7serverlite java plugin
|
* d7serverlite java plugin
|
||||||
*/
|
*/
|
||||||
public class D7ServerLite extends JavaPlugin {
|
public class ServerLite 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 D7ServerLite inst;
|
private static ServerLite inst;
|
||||||
|
|
||||||
// declare TablistTask and Configs
|
// declare TablistTask and Configs
|
||||||
private TablistTask tablistUpdater;
|
private TablistTask tablistUpdater;
|
||||||
@ -65,7 +65,7 @@ public class D7ServerLite extends JavaPlugin {
|
|||||||
* Getters declared below
|
* Getters declared below
|
||||||
*/
|
*/
|
||||||
|
|
||||||
public static D7ServerLite getInst() {
|
public static ServerLite getInst() {
|
||||||
return inst;
|
return inst;
|
||||||
}
|
}
|
||||||
|
|
@ -1,6 +1,6 @@
|
|||||||
package de.npid7.serverlite.TabCompleters;
|
package de.npid7.serverlite.TabCompleters;
|
||||||
|
|
||||||
import de.npid7.serverlite.D7ServerLite;
|
import de.npid7.serverlite.ServerLite;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
@ -41,7 +41,7 @@ public class D7Completer 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 : D7ServerLite.getInst().getPluginConfig().getWordBlacklist().getList()) {
|
for (String s : ServerLite.getInst().getPluginConfig().getWordBlacklist().getList()) {
|
||||||
completions.add(s);
|
completions.add(s);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package de.npid7.serverlite.TabCompleters;
|
package de.npid7.serverlite.TabCompleters;
|
||||||
|
|
||||||
import de.npid7.serverlite.D7ServerLite;
|
import de.npid7.serverlite.ServerLite;
|
||||||
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 : D7ServerLite.getInst().getPluginConfig().getDefaultStatusList()) {
|
for (String s : ServerLite.getInst().getPluginConfig().getDefaultStatusList()) {
|
||||||
completions.add(s);
|
completions.add(s);
|
||||||
}
|
}
|
||||||
completions.add("custom");
|
completions.add("custom");
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
package de.npid7.serverlite.Tasks;
|
package de.npid7.serverlite.Tasks;
|
||||||
|
|
||||||
import de.npid7.serverlite.D7ServerLite;
|
import de.npid7.serverlite.ServerLite;
|
||||||
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.ChatMessageType;
|
||||||
import net.md_5.bungee.api.chat.TextComponent;
|
import net.md_5.bungee.api.chat.TextComponent;
|
||||||
@ -64,10 +64,10 @@ public class TablistTask {
|
|||||||
+ "\n");
|
+ "\n");
|
||||||
pl.setPlayerListFooter("\n");
|
pl.setPlayerListFooter("\n");
|
||||||
String body = "";
|
String body = "";
|
||||||
String status = D7ServerLite.getInst().getPlayerConfig().getStatus(pl.getUniqueId());
|
String status = ServerLite.getInst().getPlayerConfig().getStatus(pl.getUniqueId());
|
||||||
if (!status.equals("")) {
|
if (!status.equals("")) {
|
||||||
body += "[";
|
body += "[";
|
||||||
String color = D7ServerLite.getInst().getPluginConfig().getStatusColor(status);
|
String color = ServerLite.getInst().getPluginConfig().getStatusColor(status);
|
||||||
if (color == null) {
|
if (color == null) {
|
||||||
color = ChatColor.WHITE.toString();
|
color = ChatColor.WHITE.toString();
|
||||||
}
|
}
|
||||||
@ -79,7 +79,7 @@ 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 (D7ServerLite.getInst().getPlayerConfig().getTimer(pl.getUniqueId())) {
|
if (ServerLite.getInst().getPlayerConfig().getTimer(pl.getUniqueId())) {
|
||||||
pl.spigot().sendMessage(ChatMessageType.ACTION_BAR,
|
pl.spigot().sendMessage(ChatMessageType.ACTION_BAR,
|
||||||
new TextComponent(ChatColor.GOLD.toString()
|
new TextComponent(ChatColor.GOLD.toString()
|
||||||
+ Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME))));
|
+ Spielzeit.formatTicks(pl.getStatistic(Statistic.TOTAL_WORLD_TIME))));
|
||||||
@ -94,6 +94,6 @@ public class TablistTask {
|
|||||||
CalcTPS();
|
CalcTPS();
|
||||||
displayTablist();
|
displayTablist();
|
||||||
}
|
}
|
||||||
}.runTaskTimer(D7ServerLite.getInst(), 0, 0);
|
}.runTaskTimer(ServerLite.getInst(), 0, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
name: D7SerevrLite
|
name: LSSerevrLite
|
||||||
main: de.npid7.serverlite.D7ServerLite
|
main: de.npid7.serverlite.ServerLite
|
||||||
version: 1.0
|
version: 1.0
|
||||||
api-version: 1.17
|
api-version: 1.17
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user