Altitude/AFKDetector
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update minimessage

Browse Source
This commit is contained in:
destro174 2022-01-08 14:16:47 +01:00
parent b7dd650052
commit c487b621e2
7 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>groupId</groupId> <groupId>groupId</groupId>
<artifactId>AFKDetector</artifactId> <artifactId>AFKDetector</artifactId>
<version>2.1.3</version> <version>2.1.4</version>
<name>AFKDetector</name> <name>AFKDetector</name>
<build> <build>
<finalName>${project.artifactId}</finalName> <finalName>${project.artifactId}</finalName>

3
src/main/java/com/alttd/afkdectector/AFKCheckTimer.java
View File

@ -7,6 +7,7 @@ import com.alttd.afkdectector.config.Config;
import com.alttd.afkdectector.config.Messages; import com.alttd.afkdectector.config.Messages;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
@ -60,7 +61,7 @@ public class AFKCheckTimer extends BukkitRunnable{
player.setSleepingIgnored(true); player.setSleepingIgnored(true);
//player.setCanPickupItems(false); //player.setCanPickupItems(false);
plugin.AFKPlayers.addEntry(player.getName()); plugin.AFKPlayers.addEntry(player.getName());
Bukkit.broadcast(MiniMessage.get().parse(Messages.AFKTOGGLEON.getMessage(), Template.of("player", player.getName())), "afkdetector.notify"); Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.AFKTOGGLEON.getMessage(), TemplateResolver.templates(Template.template("player", player.getName()))), "afkdetector.notify");
} }
if(System.currentTimeMillis() - standingTime > afkplayer.getafkTime() * 60 * 1000) { if(System.currentTimeMillis() - standingTime > afkplayer.getafkTime() * 60 * 1000) {
MessageTimer currentTimer = plugin.messageTimers.get(uuid); MessageTimer currentTimer = plugin.messageTimers.get(uuid);

20
src/main/java/com/alttd/afkdectector/AFKDetector.java
View File

@ -113,10 +113,8 @@ public class AFKDetector extends JavaPlugin implements Listener{
@EventHandler @EventHandler
public void onJoin(PlayerJoinEvent event) { public void onJoin(PlayerJoinEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
if (player != null) { PlayerAfkTime.put(player.getUniqueId(), getPlayerAfktime(player));
PlayerAfkTime.put(player.getUniqueId(), getPlayerAfktime(player)); players.put(player.getUniqueId(), new AFKPlayer(player, this));
players.put(player.getUniqueId(), new AFKPlayer(player, this));
}
if(Bukkit.getOnlinePlayers().size() >= Config.PLAYERLIMIT && !Config.SERVERFULL) { if(Bukkit.getOnlinePlayers().size() >= Config.PLAYERLIMIT && !Config.SERVERFULL) {
fulloverride = true; fulloverride = true;
} }
@ -126,9 +124,7 @@ public class AFKDetector extends JavaPlugin implements Listener{
public void onQuit(PlayerQuitEvent event) { public void onQuit(PlayerQuitEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
// Remove the players from the timer if they logout // Remove the players from the timer if they logout
if (player != null) { players.remove(player.getUniqueId());
players.remove(player.getUniqueId());
}
if(Bukkit.getOnlinePlayers().size() < Config.PLAYERLIMIT && fulloverride){ if(Bukkit.getOnlinePlayers().size() < Config.PLAYERLIMIT && fulloverride){
fulloverride = false; fulloverride = false;
} }
@ -140,9 +136,7 @@ public class AFKDetector extends JavaPlugin implements Listener{
return; return;
} }
Player player = event.getPlayer(); Player player = event.getPlayer();
if (player != null) { getPlayer(player).ResetAFK();
getPlayer(player).ResetAFK();
}
} }
@EventHandler @EventHandler
@ -151,10 +145,8 @@ public class AFKDetector extends JavaPlugin implements Listener{
return; return;
} }
Player player = event.getPlayer(); Player player = event.getPlayer();
if (player != null) { getPlayer(player).ResetAFK();
getPlayer(player).ResetAFK(); }
}
}
/* @EventHandler /* @EventHandler
public void onPlayerMove(PlayerMoveEvent event) { public void onPlayerMove(PlayerMoveEvent event) {

8
src/main/java/com/alttd/afkdectector/MessageTimer.java
View File

@ -45,12 +45,12 @@ public class MessageTimer extends BukkitRunnable {
return; return;
} }
if(Config.COUNTDOWNENABLED) { if(Config.COUNTDOWNENABLED) {
MiniMessage miniMessage = MiniMessage.get(); MiniMessage miniMessage = MiniMessage.miniMessage();
Title title = Title.title(miniMessage.parse(Messages.COUNTDOWNTITLE1.getMessage()), Title title = Title.title(miniMessage.deserialize(Messages.COUNTDOWNTITLE1.getMessage()),
miniMessage.parse(Messages.COUNTDOWNTITLE2.getMessage())); miniMessage.deserialize(Messages.COUNTDOWNTITLE2.getMessage()));
//Title.Times.of(Config.FADEIN, Config.STAY, Config.STAY); //Title.Times.of(Config.FADEIN, Config.STAY, Config.STAY);
player.showTitle(title); player.showTitle(title);
player.sendMessage(miniMessage.parse(Messages.COUNTDOWNMESSAGE.getMessage())); player.sendMessage(miniMessage.deserialize(Messages.COUNTDOWNMESSAGE.getMessage()));
} }
repeats = repeats - 1; repeats = repeats - 1;

3
src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java
View File

@ -5,6 +5,7 @@ import java.util.UUID;
import com.alttd.afkdectector.config.Messages; import com.alttd.afkdectector.config.Messages;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.Location; import org.bukkit.Location;
@ -69,7 +70,7 @@ public class AFKPlayer {
public void ResetAFK() { public void ResetAFK() {
if(isafk) { if(isafk) {
Bukkit.broadcast(MiniMessage.get().parse(Messages.AFKTOGGLEOFF.getMessage(), Template.of("player", playerName)), "afkdetector.notify"); Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.AFKTOGGLEOFF.getMessage(), TemplateResolver.templates(Template.template("player", playerName))), "afkdetector.notify");
} }
standingTime = System.currentTimeMillis(); standingTime = System.currentTimeMillis();
playerToSphereCenter = Bukkit.getPlayer(getPlayerUuid()).getLocation(); playerToSphereCenter = Bukkit.getPlayer(getPlayerUuid()).getLocation();

14
src/main/java/com/alttd/afkdectector/command/AFKCheckCommand.java
View File

@ -1,6 +1,7 @@
package com.alttd.afkdectector.command; package com.alttd.afkdectector.command;
import com.alttd.afkdectector.AFKDetector; import com.alttd.afkdectector.AFKDetector;
import com.alttd.afkdectector.afkplayer.AFKPlayer;
import com.alttd.afkdectector.config.Messages; import com.alttd.afkdectector.config.Messages;
import net.kyori.adventure.audience.Audience; import net.kyori.adventure.audience.Audience;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@ -14,8 +15,11 @@ 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;
import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent;
import org.bukkit.util.StringUtil;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
public class AFKCheckCommand implements CommandExecutor, TabCompleter { public class AFKCheckCommand implements CommandExecutor, TabCompleter {
@ -36,9 +40,9 @@ public class AFKCheckCommand implements CommandExecutor, TabCompleter {
sender.sendMessage(Component.text(command.getUsage(), NamedTextColor.RED)); sender.sendMessage(Component.text(command.getUsage(), NamedTextColor.RED));
return true; return true;
} }
MiniMessage miniMessage = MiniMessage.get(); MiniMessage miniMessage = MiniMessage.miniMessage();
target.showTitle(Title.title(miniMessage.parse(Messages.AFKCHECKTITLE.getMessage()), target.showTitle(Title.title(miniMessage.deserialize(Messages.AFKCHECKTITLE.getMessage()),
miniMessage.parse(Messages.AFKCHECKSUBTITLE.getMessage()))); miniMessage.deserialize(Messages.AFKCHECKSUBTITLE.getMessage())));
if(sender instanceof Player) { if(sender instanceof Player) {
Player player = (Player) sender; Player player = (Player) sender;
String cmd = "msg " + args[0] + " " + Messages.AFKCHECKMESSAGE.getMessage(); String cmd = "msg " + args[0] + " " + Messages.AFKCHECKMESSAGE.getMessage();
@ -53,6 +57,10 @@ public class AFKCheckCommand implements CommandExecutor, TabCompleter {
@Override @Override
public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] strings) { public List<String> onTabComplete(CommandSender commandSender, Command command, String s, String[] strings) {
List<String> completions = new ArrayList<>();
if (strings.length == 1) {
StringUtil.copyPartialMatches(strings[0], plugin.players.values().stream().filter(AFKPlayer::isafk).map(AFKPlayer::getPlayerName).collect(Collectors.toList()), completions);
}
return null; return null;
} }
} }

13
src/main/java/com/alttd/afkdectector/command/AFKListCommand.java
View File

@ -8,6 +8,7 @@ import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor; import net.kyori.adventure.text.format.NamedTextColor;
import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.Template;
import net.kyori.adventure.text.minimessage.template.TemplateResolver;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
@ -28,24 +29,24 @@ public class AFKListCommand implements CommandExecutor, TabCompleter {
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
int afkplayers = 0; int afkplayers = 0;
Component message = Component.empty(); Component message = Component.empty();
MiniMessage miniMessage = MiniMessage.get(); MiniMessage miniMessage = MiniMessage.miniMessage();
for (AFKPlayer afkplayer : plugin.players.values()) { for (AFKPlayer afkplayer : plugin.players.values()) {
long standingTime = afkplayer.getstandingTime(); long standingTime = afkplayer.getstandingTime();
if(System.currentTimeMillis() - standingTime > Config.TOGGLETIME * 60 * 1000) { if(System.currentTimeMillis() - standingTime > Config.TOGGLETIME * 60 * 1000) {
afkplayers += 1; afkplayers += 1;
message = message.append(Component.newline()); message = message.append(Component.newline());
List<Template> templates = new ArrayList<>(List.of( List<Template> templates = new ArrayList<>(List.of(
Template.of("player", afkplayer.getPlayerName()), Template.template("player", afkplayer.getPlayerName()),
Template.of("afktime", (System.currentTimeMillis() - standingTime) / 1000 + "") Template.template("afktime", (System.currentTimeMillis() - standingTime) / 1000 + "")
)); ));
Component userinfo = miniMessage.parse(Messages.AFK_LIST_ENTRY.getMessage(), templates); Component userinfo = miniMessage.deserialize(Messages.AFK_LIST_ENTRY.getMessage(), TemplateResolver.templates(templates));
message = message.append(userinfo); message = message.append(userinfo);
} }
} }
List<Template> templates = new ArrayList<>(List.of( List<Template> templates = new ArrayList<>(List.of(
Template.of("afkplayers", Integer.toString(afkplayers)) Template.template("afkplayers", Integer.toString(afkplayers))
)); ));
Component component = miniMessage.parse(Messages.AFK_LIST.getMessage(), templates); Component component = miniMessage.deserialize(Messages.AFK_LIST.getMessage(), TemplateResolver.templates(templates));
sender.sendMessage(component.append(message)); sender.sendMessage(component.append(message));
return true; return true;
} }