Skip to content

Commit

Permalink
Move kick messages to new language system
Browse files Browse the repository at this point in the history
Almighty-Satan committed Jan 17, 2025
1 parent 5f00c83 commit 68656b4
Showing 15 changed files with 91 additions and 72 deletions.
6 changes: 3 additions & 3 deletions src/main/java/de/cuuky/varo/command/varo/PlayerCommand.java
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@
import de.cuuky.varo.Main;
import de.cuuky.varo.command.VaroChatListMessages;
import de.cuuky.varo.command.VaroCommand;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.gui.player.PlayerGUI;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.stats.stat.PlayerState;
@@ -124,7 +124,7 @@ public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String l
if (args.length >= 2 && args[1].equalsIgnoreCase("@a")) {
for (VaroPlayer pl : new ArrayList<>(VaroPlayer.getVaroPlayers())) {
if (pl.isOnline())
pl.getPlayer().kickPlayer(ConfigMessages.JOIN_KICK_NOT_USER_OF_PROJECT.getValue(vp));
Messages.PLAYER_KICK_NOT_USER_OF_PROJECT.kick(pl);

pl.delete();
}
@@ -137,7 +137,7 @@ public void onCommand(CommandSender sender, VaroPlayer vp, Command cmd, String l
}

if (vps.isOnline())
vps.getPlayer().kickPlayer(ConfigMessages.JOIN_KICK_NOT_USER_OF_PROJECT.getValue(vp));
Messages.PLAYER_KICK_NOT_USER_OF_PROJECT.kick(vps);

vps.delete();
sender.sendMessage(Main.getPrefix() + Main.getColorCode() + args[1] + " §7wurde erfolgreich aus " + Main.getColorCode() + Main.getProjectName() + " §7entfernt!");
39 changes: 33 additions & 6 deletions src/main/java/de/cuuky/varo/config/language/Messages.java
Original file line number Diff line number Diff line change
@@ -102,8 +102,25 @@ public final class Messages {
public static final VaroMessage PLAYER_JOIN_SPECTATOR = message("player.join.spectator");
public static final VaroMessage PLAYER_JOIN_MASS_RECORDING = message("player.join.massrecording");
public static final VaroMessage PLAYER_JOIN_REMAINING_TIME = message("player.join.remainingTime");

public static final VaroMessage PLAYER_KICK_DEATH = message("player.kick.death");
public static final VaroMessage PLAYER_KICK_KILL = message("player.kick.kill");
public static final VaroMessage PLAYER_KICK_NOT_USER_OF_PROJECT = message("player.kick.notUserOfProject");
public static final VaroMessage PLAYER_KICK_SERVER_FULL = message("player.kick.serverFull");
public static final VaroMessage PLAYER_KICK_STRIKE_BAN = message("player.kick.strikeBan");
public static final VaroMessage PLAYER_KICK_BANNED = message("player.kick.banned");
public static final VaroMessage PLAYER_KICK_NO_PREPRODUCES_LEFT = message("player.kick.noPreproduceLeft");
public static final VaroMessage PLAYER_KICK_NO_SESSIONS_LEFT = message("player.kick.noSessionLeft");
public static final VaroMessage PLAYER_KICK_NO_TIME_LEFT = message("player.kick.noTimeLeft");
public static final VaroMessage PLAYER_KICK_NOT_STARTED = message("player.kick.notStarted");
public static final VaroMessage PLAYER_KICK_SESSION_OVER = message("player.kick.sessionOver");
public static final VaroMessage PLAYER_KICK_MASS_REC_SESSION_OVER = message("player.kick.kickMessageMassRec");
public static final VaroMessage PLAYER_KICK_TOO_MANY_STRIKES = message("player.kick.tooManyStrikes");
public static final VaroMessage PLAYER_KICK_COMMAND = message("player.kick.command");

public static final VaroMessage PLAYER_MOVE_PROTECTION = message("player.moveProtection");
public static final VaroMessage PLAYER_SPECTATOR_HEIGHT = message("player.spectator.height");
public static final VaroMessage PLAYER_CRAFTING_DISALLOWED = message("player.crafting.disallowed");

public static final VaroMessageArray PLAYER_SCOREBOARD_TITLE = array("player.scoreboard.title");
public static final VaroMessageArray2d PLAYER_SCOREBOARD_CONTENT = array2d("player.scoreboard.content");
@@ -260,11 +277,7 @@ public final class Messages {
public static final VaroMessage COMMANDS_PING = message("commands.ping");

public static final VaroMessageArray BROADCAST = array("broadcast");

public static final VaroMessage SPECTATOR_HEIGHT = message("spectator.height");

public static final VaroMessage CRAFTING_DISALLOWED = message("crafting.disallowed");


public static final VaroMessage TEAMREQUEST_NAME_INVALID = message("teamrequest.name.invalid");
public static final VaroMessage TEAMREQUEST_NAME_DUPLICATE = message("teamrequest.name.duplicate");
public static final VaroMessage TEAMREQUEST_NAME_TOO_LONG = message("teamrequest.name.tooLong");
@@ -378,12 +391,18 @@ public void send(CommandSender subject) {
subject.sendMessage(message.value());
}

@Override
public void kick(VaroPlayer recipient, VaroContext context) {
// TODO Auto-generated method stub

}

@Override
public void kick(VaroPlayer subject) {
// TODO Auto-generated method stub

}

@Override
public String value(VaroPlayer subject, PlaceholderResolver placeholders) {
// TODO Auto-generated method stub
@@ -394,6 +413,12 @@ public String value(VaroPlayer subject, PlaceholderResolver placeholders) {
public String value(VaroPlayer subject) {
return message.value(new PlayerContext(subject));
}

@Override
public String value(PlaceholderResolver placeholders) {
// TODO Auto-generated method stub
return null;
}

@Override
public void log(LogType type, VaroContext context, PlaceholderResolver placeholders) {
@@ -508,6 +533,7 @@ public interface VaroMessage {
void send(CommandSender subject, PlaceholderResolver placeholders);
void send(CommandSender subject);

void kick(VaroPlayer recipient, VaroContext context);
void kick(VaroPlayer subject);

void log(LogType type, VaroContext context, PlaceholderResolver placeholders);
@@ -522,6 +548,7 @@ public interface VaroMessage {

String value(VaroPlayer subject, PlaceholderResolver placeholders);
String value(VaroPlayer subject);
String value(PlaceholderResolver placeholders);
}

public interface VaroMessageArray {
Original file line number Diff line number Diff line change
@@ -47,21 +47,6 @@ public enum ConfigMessages implements DefaultLanguage {
QUIT_KICK_PLAYER_NEARBY("quitmessage.noKickPlayerNearby", "&cEs befindet sich ein Spieler &4%distance% &cBlöcke in deiner Nähe!%nextLine%&7Um gekickt zu werden, entferne dich von diesem Spieler!"),
QUIT_KICK_SERVER_CLOSE_SOON("quitmessage.serverCloseSoon", "&7Der Server schliesst in &c%minutes% &7Minuten!"),

DEATH_KICK_DEAD("kick.kickedKilled", "&cDu bist gestorben! %nextLine% &7Damit bist du aus %projectname% &7ausgeschieden"),
DEATH_KICK_KILLED("kick.killedKick", "&7Du wurdest von &c%killer% &7getötet! %nextLine% &7Damit bist du aus %projectname% &7ausgeschieden!"),
JOIN_KICK_NOT_USER_OF_PROJECT("kick.notUserOfTheProject", "&7Du bist kein Teilnehmer dieses %projectname%&7's!"),
JOIN_KICK_SERVER_FULL("kick.serverFull", "&cDer Server ist voll!%nextLine%&7Sprich mit dem Owner, falls das das ein Irrtum sein sollte!"),
JOIN_KICK_STRIKE_BAN("kick.strikeBan", "&cDu wurdest aufgrund deines letzten Strikes für %hours% gebannt!\nVersuche es später erneut"),
JOIN_KICK_BANNED("kick.banned", "&4Du bist vom Server gebannt!\n&7Melde dich bei einem Admin, falls dies ein Fehler sein sollte.\n&7Grund: &c%reason%"),
JOIN_KICK_NO_PREPRODUCES_LEFT("kick.noPreproduceLeft", "&cDu hast bereits vorproduziert! %nextLine%&7Versuche es morgen erneut."),
JOIN_KICK_NO_SESSIONS_LEFT("kick.noSessionLeft", "&cDu hast keine Sessions mehr übrig! %nextLine%&7Warte bis morgen, damit du wieder spielen kannst!"),
JOIN_KICK_NO_TIME_LEFT("kick.noTimeLeft", "&cDu darfst nur alle &4%timeHours% &cStunden regulär spielen! %nextLine%&7Du kannst erst in &c%stunden%&7:&c%minuten%&7:&c%sekunden% &7wieder joinen!"),
JOIN_KICK_NOT_STARTED("kick.notStarted", "&cDer Server wurde noch nicht eröffnet! %nextLine%&7Gedulde dich noch ein wenig!"),
KICK_SESSION_OVER("kick.kickMessage", "&cDeine Aufnahmezeit ist abgelaufen, %nextLine%&7deswegen wurdest du gekickt!"),
KICK_MASS_REC_SESSION_OVER("kick.kickMessageMassRec", "&cDie Massenaufnahme ist beendet, %nextLine%&7deswegen wurdest du gekickt!"),
KICK_TOO_MANY_STRIKES("kick.tooManyStrikes", "&7Du hast zu viele Strikes bekommen und wurdest daher aus dem Projekt %projectname% &7entfernt."),
KICK_COMMAND("kick.kick", "%colorcode%%player% &7wurde gekick.kickt!"),

SERVER_MODT_CANT_JOIN_HOURS("motd.cantJoinHours", "&cDu kannst nur zwischen &4%minHour% &cund &4%maxHour%&c Uhr joinen! %nextLine%&7Versuche es später erneut! &7%currHour%&7:&7%currMin%&7:&7%currSec%"),
SERVER_MODT_NOT_OPENED("motd.serverNotOpened", "&cDer Server wurde noch nicht für alle geöffnet! %nextLine%&7Versuche es später erneut!"),
SERVER_MODT_OPEN("motd.serverOpen", "&aSei nun bei %projectname% &adabei! \n&7Viel Spass!"),
Original file line number Diff line number Diff line change
@@ -43,21 +43,6 @@ public enum LanguageEN implements LoadableMessage {
QUIT_KICK_PLAYER_NEARBY("quitmessage.noKickPlayerNearby", "&cThere is a player &4%distance% &cblocks near you!%nextLine%&7To get kicked, move away from this player!"),
QUIT_KICK_SERVER_CLOSE_SOON("quitmessage.serverCloseSoon", "&7The server closes in &c%minutes% &7minutes!"),

DEATH_KICK_DEAD("kick.kickedKilled", "&cYou died! %nextLine% &7With this you are removed from %projectname%"),
DEATH_KICK_KILLED("kick.killedKick", "&7You were killed by &c%killer%&7! %nextLine% &7You have been removed from %projectname%&7!"),
JOIN_KICK_NOT_USER_OF_PROJECT("kick.notUserOfTheProject", "&7You are not a participant of this %projectname%&7!"),
JOIN_KICK_SERVER_FULL("kick.serverFull", "&cThe server is full!%nextLine%&7Talk to the owner if this is a mistake!"),
JOIN_KICK_STRIKE_BAN("kick.strikeBan", "&cYou were banned for %hours% hours because of your last strike!\nTry again later."),
JOIN_KICK_BANNED("kick.banned", "&4You are banned from the server!\n&7Report to an admin if this is an error.\n&7Reason: &c%reason%"),
JOIN_KICK_NO_PREPRODUCES_LEFT("kick.noPreproduceLeft", "&cYou already have pre-produced! %nextLine%&7Try again tomorrow."),
JOIN_KICK_NO_SESSIONS_LEFT("kick.noSessionLeft", "&cYou have no more sessions left! %nextLine%&7Wait until tomorrow so you can play again!"),
JOIN_KICK_NO_TIME_LEFT("kick.noTimeLeft", "You are only allowed to play all &4%timeHours% &chours regularly! %nextLine%&7You can only join in &c%stunden%&7:&c%minuten%&7:&c%sekunden% &7join again!"),
JOIN_KICK_NOT_STARTED("kick.notStarted", "&cThe server has not been opened yet! %nextLine%&7Please be patient a little longer!"),
KICK_SESSION_OVER("kick.kickMessage", "&cYour recording time has expired, %nextLine%&7this is why you got kicked!"),
KICK_MASS_REC_SESSION_OVER("kick.kickMessageMassRec", "&cThe mass recording is finished, %nextLine%&7that's why you got kicked!"),
KICK_TOO_MANY_STRIKES("kick.tooManyStrikes", "&7You got too many strikes and were therefore removed from the project %projectname%"),
KICK_COMMAND("kick.kick", "%colorcode%%player% &7was kicked!"),

SERVER_MODT_CANT_JOIN_HOURS("motd.cantJoinHours", "&cYou can only join between &4%minHour% &cand &4%maxHour%&c o'clock! %nextLine%&7Please try again later! &7%currHour%&7:&7%currMin%&7:&7%currSec%"),
SERVER_MODT_NOT_OPENED("motd.serverNotOpened", "&cThe server has not yet been opened for everyone! %nextLine%&7Try again later!"),
SERVER_MODT_OPEN("motd.serverOpen", "&aBe now with us in %projectname%&a!\n&7Have fun!"),
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@
import com.cryptomorin.xseries.XMaterial;

import de.cuuky.varo.Main;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.event.VaroEvent;
@@ -98,7 +99,7 @@ public void onDisable() {
vp.setMassRecordingKick(true);
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_BROADCAST, vp);
vp.onEvent(BukkitEventType.KICKED);
vp.getPlayer().kickPlayer(ConfigMessages.KICK_MASS_REC_SESSION_OVER.getValue(vp, vp));
Messages.PLAYER_KICK_MASS_REC_SESSION_OVER.kick(vp);
}
}
}
Original file line number Diff line number Diff line change
@@ -72,7 +72,7 @@ public void run() {
if (countdown == 0 && !VaroEvent.getEvent(VaroEventType.MASS_RECORDING).isEnabled()) {
Main.getLanguageManager().broadcastMessage(ConfigMessages.QUIT_KICK_BROADCAST, vp);
vp.onEvent(BukkitEventType.KICKED);
vp.getPlayer().kickPlayer(ConfigMessages.KICK_SESSION_OVER.getValue(null, vp));
Messages.PLAYER_KICK_SESSION_OVER.kick(vp);
continue;
}
if (countdown == 1) {
4 changes: 2 additions & 2 deletions src/main/java/de/cuuky/varo/listener/PlayerDeathListener.java
Original file line number Diff line number Diff line change
@@ -29,9 +29,9 @@ public void run() {
return;

if (killerPlayer == null)
deadPlayer.getPlayer().kickPlayer(ConfigMessages.DEATH_KICK_DEAD.getValue(deadPlayer, deadPlayer));
Messages.PLAYER_KICK_DEATH.kick(deadPlayer);
else
deadPlayer.getPlayer().kickPlayer(ConfigMessages.DEATH_KICK_KILLED.getValue(deadPlayer, deadPlayer).replace("%killer%", killerPlayer.getName()));
Messages.PLAYER_KICK_KILL.kick(deadPlayer, new Contexts.KillContext(deadPlayer, killerPlayer));
}
}.runTaskLater(Main.getInstance(), 1L);
}
26 changes: 16 additions & 10 deletions src/main/java/de/cuuky/varo/listener/PlayerLoginListener.java
Original file line number Diff line number Diff line change
@@ -16,11 +16,14 @@
import de.cuuky.varo.Main;
import de.cuuky.varo.bot.discord.BotRegister;
import de.cuuky.varo.bot.discord.VaroDiscordBot;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.stats.KickResult;
import de.cuuky.varo.player.stats.stat.PlayerState;
import io.github.almightysatan.slams.Placeholder;
import io.github.almightysatan.slams.PlaceholderResolver;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.User;
import net.dv8tion.jda.api.entities.UserSnowflake;
@@ -32,7 +35,7 @@ public class PlayerLoginListener implements Listener {
public void onPlayerPreLogin(AsyncPlayerPreLoginEvent event) {
BanEntry entry = Bukkit.getBanList(Type.NAME).getBanEntry(event.getName());
if (entry != null)
event.disallow(org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result.KICK_BANNED, ConfigMessages.JOIN_KICK_BANNED.getValue().replace("%reason%", entry.getReason()));
event.disallow(AsyncPlayerPreLoginEvent.Result.KICK_BANNED, Messages.PLAYER_KICK_NOT_USER_OF_PROJECT.value(Placeholder.constant("reason", entry.getReason())));
}

@EventHandler(priority = EventPriority.LOW)
@@ -98,25 +101,25 @@ public void onPlayerLogin(PlayerLoginEvent event) {

switch (kickResult) {
case NO_PROJECTUSER:
event.disallow(Result.KICK_OTHER, ConfigMessages.JOIN_KICK_NOT_USER_OF_PROJECT.getValue(vp, vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_NOT_USER_OF_PROJECT.value(vp));
break;
case DEAD:
event.disallow(Result.KICK_OTHER, ConfigMessages.DEATH_KICK_DEAD.getValue(vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_DEATH.value(vp));
break;
case STRIKE_BAN:
event.disallow(Result.KICK_OTHER, ConfigMessages.JOIN_KICK_STRIKE_BAN.getValue(vp, vp).replace("%hours%", String.valueOf(ConfigSetting.STRIKE_BAN_AFTER_STRIKE_HOURS.getValueAsInt())));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_DEATH.value(vp, Placeholder.constant("ban-hours", String.valueOf(ConfigSetting.STRIKE_BAN_AFTER_STRIKE_HOURS.getValueAsInt()))));
break;
case NOT_IN_TIME:
event.disallow(Result.KICK_OTHER, ConfigMessages.SERVER_MODT_CANT_JOIN_HOURS.getValue(vp, vp).replace("%minHour%", String.valueOf(ConfigSetting.ONLY_JOIN_BETWEEN_HOURS_HOUR1.getValueAsInt())).replace("%maxHour%", String.valueOf(ConfigSetting.ONLY_JOIN_BETWEEN_HOURS_HOUR2.getValueAsInt())));
break;
case SERVER_FULL:
event.disallow(Result.KICK_FULL, ConfigMessages.JOIN_KICK_SERVER_FULL.getValue(vp, vp));
event.disallow(Result.KICK_FULL, Messages.PLAYER_KICK_SERVER_FULL.value(vp));
break;
case NO_SESSIONS_LEFT:
event.disallow(Result.KICK_OTHER, ConfigMessages.JOIN_KICK_NO_SESSIONS_LEFT.getValue(vp, vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_NO_SESSIONS_LEFT.value(vp));
break;
case NO_PREPRODUCES_LEFT:
event.disallow(Result.KICK_OTHER, ConfigMessages.JOIN_KICK_NO_PREPRODUCES_LEFT.getValue(vp, vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_NO_PREPRODUCES_LEFT.value(vp));
break;
case NO_TIME:
Date current = new Date();
@@ -137,11 +140,14 @@ public void onPlayerLogin(PlayerLoginEvent event) {
hours = "0" + hr;
else
hours = "" + hr;

event.disallow(Result.KICK_OTHER, ConfigMessages.JOIN_KICK_NO_TIME_LEFT.getValue(vp).replace("%timeHours%", String.valueOf(ConfigSetting.JOIN_AFTER_HOURS.getValueAsInt())).replace("%stunden%", hours).replace("%minuten%", minutes).replace("%sekunden%", seconds));

PlaceholderResolver placeholders = PlaceholderResolver.builder().constant("join-hours", hours)
.constant("join-minutes", minutes)
.constant("join-seconds", seconds).build();
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_NO_TIME_LEFT.value(vp, placeholders));
break;
case SERVER_NOT_PUBLISHED:
event.disallow(Result.KICK_OTHER, ConfigMessages.JOIN_KICK_NOT_STARTED.getValue(vp, vp));
event.disallow(Result.KICK_OTHER, Messages.PLAYER_KICK_NOT_STARTED.value(vp));
break;
case ALLOW:
case SPECTATOR:
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ public void onEnchant(EnchantItemEvent event) {
if (Main.getDataManager().getListManager().getBlockedEnchantments().isBlocked(enc, event.getEnchantsToAdd().get(enc))) {
event.setCancelled(true);
VaroPlayer vp = VaroPlayer.getPlayer(event.getEnchanter());
Messages.CRAFTING_DISALLOWED.send(vp);
Messages.PLAYER_CRAFTING_DISALLOWED.send(vp);
return;
}
}
@@ -56,7 +56,7 @@ public void onInventoryClick(InventoryClickEvent event) {
if (Main.getDataManager().getListManager().getBlockedEnchantments().isBlocked(enc, item.getEnchantments().get(enc))) {
event.setCancelled(true);
VaroPlayer vp = VaroPlayer.getPlayer((Player) event.getWhoClicked());
Messages.CRAFTING_DISALLOWED.send(vp);
Messages.PLAYER_CRAFTING_DISALLOWED.send(vp);
return;
}
}
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ public void onCraft(CraftItemEvent event) {

event.setCancelled(true);
VaroPlayer vp = VaroPlayer.getPlayer((Player) event.getWhoClicked());
Messages.CRAFTING_DISALLOWED.send(vp);
Messages.PLAYER_CRAFTING_DISALLOWED.send(vp);
}

@EventHandler
@@ -35,6 +35,6 @@ public void onInteract(PlayerInteractEvent event) {

event.setCancelled(true);
VaroPlayer vp = VaroPlayer.getPlayer(event.getPlayer());
Messages.CRAFTING_DISALLOWED.send(vp);
Messages.PLAYER_CRAFTING_DISALLOWED.send(vp);
}
}
Original file line number Diff line number Diff line change
@@ -176,7 +176,7 @@ public void onPlayerMove(PlayerMoveEvent event) {
tp.setY(ConfigSetting.MINIMAL_SPECTATOR_HEIGHT.getValueAsInt());
event.setTo(tp);
VaroPlayer vp = VaroPlayer.getPlayer(event.getPlayer());
Messages.SPECTATOR_HEIGHT.send(vp);
Messages.PLAYER_SPECTATOR_HEIGHT.send(vp);
}
}

2 changes: 1 addition & 1 deletion src/main/java/de/cuuky/varo/player/VaroPlayer.java
Original file line number Diff line number Diff line change
@@ -226,7 +226,7 @@ public void delete() {
rank.remove();

if (isOnline())
player.kickPlayer(ConfigMessages.JOIN_KICK_NOT_USER_OF_PROJECT.getValue(this, this));
Messages.PLAYER_KICK_NOT_USER_OF_PROJECT.kick(this);

if (villager != null)
villager.remove();
3 changes: 1 addition & 2 deletions src/main/java/de/cuuky/varo/player/stats/stat/Strike.java
Original file line number Diff line number Diff line change
@@ -9,7 +9,6 @@
import de.cuuky.varo.config.language.Contexts.StrikeContext;
import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.logger.logger.EventLogger.LogType;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.serialize.identifier.VaroSerializeField;
@@ -71,7 +70,7 @@ public void activate(int number) {
default:
striked.getStats().setState(PlayerState.DEAD);
if (striked.isOnline())
striked.getPlayer().kickPlayer(ConfigMessages.KICK_TOO_MANY_STRIKES.getValue(striked, striked));
Messages.PLAYER_KICK_TOO_MANY_STRIKES.kick(this.striked);
break;
}

Original file line number Diff line number Diff line change
@@ -2,7 +2,6 @@

import de.cuuky.varo.config.language.Messages;
import de.cuuky.varo.configuration.configurations.config.ConfigSetting;
import de.cuuky.varo.configuration.configurations.language.languages.ConfigMessages;
import de.cuuky.varo.logger.logger.EventLogger.LogType;
import de.cuuky.varo.player.VaroPlayer;
import de.cuuky.varo.player.VaroPlayerDisconnect;
@@ -31,7 +30,7 @@ public void check() {
for (VaroPlayer vp : VaroPlayer.getVaroPlayers()) {
if (!vp.getStats().hasFullTime()) {
if (vp.isOnline())
vp.getPlayer().kickPlayer(ConfigMessages.KICK_SESSION_OVER.getValue(vp));
Messages.PLAYER_KICK_SESSION_OVER.kick(vp);

vp.onEvent(BukkitEventType.KICKED);
Messages.LOG_SESSIONS_ENDED.log(LogType.LOG, vp);
35 changes: 26 additions & 9 deletions src/main/resources/en.yml
Original file line number Diff line number Diff line change
@@ -13,7 +13,30 @@ player:
spectator: "<prefix>§a<name>§7 has entered the server as a spectator!"
massrecording: "<prefix>§a<name>§7 has entered the server during mass recording and is vulnerable in <colorcode><config-Protections-joinProtectionTime>§7 seconds!"
remainingTime: "<prefix>§a<name>§7 left the server too early and has <colorcode><seconds>§7 seconds left! Remaining §cDisconnects§7: §c<remaining-disconnects>"
kick:
death: "§cYou died!"
noSessionLeft: "§cYou have no more sessions left!\n§7Wait until tomorrow to play again!"
command: "<colorcode><name> §7was kicked!"
banned: |-
§4You are banned from this server!
§7Reason: §c<reason>
tooManyStrikes: "§7You received too many strikes and were therefore removed from <projectname>"
noPreproduceLeft: "§cYou have no more pre-produce sessions left! \n§7Try again tomorrow."
sessionOver: "§cYour session has expired!"
noTimeLeft: You are only allowed to play all §4<config-JoinSystems-joinAfterHours> §chours regularly! \n§7You can only join in §c%stunden%§7:§c%minuten%§7:§c%sekunden% §7join again!
strikeBan: |-
§cYou are banned for <ban-hours> hours because you received a strike!
Try again later.
notUserOfProject: "§7You are not a participant of <projectname>§7!"
kill: "§7You were killed by §c<killer-name>§7!"
kickMessageMassRec: "§cThe mass recording is finished, \n§7everybody got kicked!"
notStarted: "§cThe server has not been opened yet! \n§7Please be patient a little longer!"
serverFull: "§cThe server is full!\n§7Talk to the owner if this is a mistake!"
moveProtection: "<prefix>You cannot move until your <colorcode>protection§7 has expired!"
spectator:
height: "§cYou can not fly any lower!"
crafting:
disallowed: "§cYou are not allowed to craft, use or brew this item!"
scoreboard:
title:
- "<projectname>"
@@ -301,20 +324,14 @@ broadcast:
- "<prefix> A broadcast message"
- "<prefix> Another broadcast message"

spectator:
height: "§cYou can not fly any lower!"

crafting:
disallowed: "§cYou are not allowed to craft, use or brew this item!"

teamrequest:
invitedInTeam: "<prefix>§7You have invited <colorcode>%invited% §7to your team!"
enterTeamName: "<prefix><colorcode>§lPlease enter a team name for you and %invited%:"
invitedInTeam: "<prefix>§7You have invited <colorcode><invited> §7to your team!"
enterTeamName: "<prefix><colorcode>§lPlease enter a team name for you and <invited>:"
playerNotOnline: "<prefix><colorcode><inviter> is offline!"
teamRequestRecieved: "<prefix><colorcode><inviter> §7has invited you to join their team (/varo tr)!"
noteamname: "<prefix>§7You have no team name!"
invationRevoked: "<prefix>Invitation withdrawn!"
teamIsFull: "<prefix>%invited% can't join your team - team member limit reached!"
teamIsFull: "<prefix><invited> can't join your team - team member limit reached!"
items:
invite:
name: "§6Invite Player"

0 comments on commit 68656b4

Please sign in to comment.