From c7e21358fb35ab543c2a9ae8a2b3769f1701d3f8 Mon Sep 17 00:00:00 2001 From: destro174 <40720638+destro174@users.noreply.github.com> Date: Mon, 14 Mar 2022 22:16:15 +0100 Subject: [PATCH] commit --- src/main/java/com/alttd/afkdectector/AFKCheckTimer.java | 4 +++- src/main/java/com/alttd/afkdectector/AFKDetector.java | 4 ++++ src/main/java/com/alttd/afkdectector/MessageTimer.java | 2 +- src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java | 4 +++- .../java/com/alttd/afkdectector/command/AFKCheckCommand.java | 2 +- .../java/com/alttd/afkdectector/command/AFKListCommand.java | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java index 8ba0fce..8c14939 100755 --- a/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java +++ b/src/main/java/com/alttd/afkdectector/AFKCheckTimer.java @@ -5,6 +5,7 @@ import java.util.UUID; import com.alttd.afkdectector.afkplayer.AFKPlayer; import com.alttd.afkdectector.config.Config; import com.alttd.afkdectector.config.Messages; +import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.template.TemplateResolver; @@ -61,7 +62,8 @@ public class AFKCheckTimer extends BukkitRunnable{ player.setSleepingIgnored(true); //player.setCanPickupItems(false); plugin.AFKPlayers.addEntry(player.getName()); - Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.AFKTOGGLEON.getMessage(), TemplateResolver.templates(Template.template("player", player.getName()))), "afkdetector.notify"); + Component component = AFKDetector.miniMessage.deserialize(Messages.AFKTOGGLEON.getMessage(), TemplateResolver.templates(Template.template("player", player.getName()))); + Bukkit.broadcast(component, "afkdetector.notify"); } if(System.currentTimeMillis() - standingTime > afkplayer.getafkTime() * 60 * 1000) { MessageTimer currentTimer = plugin.messageTimers.get(uuid); diff --git a/src/main/java/com/alttd/afkdectector/AFKDetector.java b/src/main/java/com/alttd/afkdectector/AFKDetector.java index b9c836f..6ede7bf 100755 --- a/src/main/java/com/alttd/afkdectector/AFKDetector.java +++ b/src/main/java/com/alttd/afkdectector/AFKDetector.java @@ -6,6 +6,7 @@ import com.alttd.afkdectector.command.AFKListCommand; import com.alttd.afkdectector.command.ReloadCommand; import com.alttd.afkdectector.config.Config; import com.alttd.afkdectector.config.MessagesConfig; +import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; @@ -33,6 +34,8 @@ public class AFKDetector extends JavaPlugin implements Listener{ public HashMap PlayerAfkTime = new HashMap<>(); public boolean fulloverride; + + public static MiniMessage miniMessage; /** * afkplayers need to be added to a team. */ @@ -42,6 +45,7 @@ public class AFKDetector extends JavaPlugin implements Listener{ public void onEnable() { try { instance = this; + miniMessage = MiniMessage.miniMessage(); loadConfig(null); settupAfkState(); getServer().getPluginManager().registerEvents(this, this); diff --git a/src/main/java/com/alttd/afkdectector/MessageTimer.java b/src/main/java/com/alttd/afkdectector/MessageTimer.java index 378118e..ff984bd 100755 --- a/src/main/java/com/alttd/afkdectector/MessageTimer.java +++ b/src/main/java/com/alttd/afkdectector/MessageTimer.java @@ -45,7 +45,7 @@ public class MessageTimer extends BukkitRunnable { return; } if(Config.COUNTDOWNENABLED) { - MiniMessage miniMessage = MiniMessage.miniMessage(); + MiniMessage miniMessage = AFKDetector.miniMessage; Title title = Title.title(miniMessage.deserialize(Messages.COUNTDOWNTITLE1.getMessage()), miniMessage.deserialize(Messages.COUNTDOWNTITLE2.getMessage())); //Title.Times.of(Config.FADEIN, Config.STAY, Config.STAY); diff --git a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java index 4cdaba9..dbe3057 100755 --- a/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java +++ b/src/main/java/com/alttd/afkdectector/afkplayer/AFKPlayer.java @@ -3,6 +3,7 @@ package com.alttd.afkdectector.afkplayer; import java.util.UUID; import com.alttd.afkdectector.config.Messages; +import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.minimessage.Template; import net.kyori.adventure.text.minimessage.template.TemplateResolver; @@ -70,7 +71,8 @@ public class AFKPlayer { public void ResetAFK() { if(isafk) { - Bukkit.broadcast(MiniMessage.miniMessage().deserialize(Messages.AFKTOGGLEOFF.getMessage(), TemplateResolver.templates(Template.template("player", playerName))), "afkdetector.notify"); + Component component = AFKDetector.miniMessage.deserialize(Messages.AFKTOGGLEOFF.getMessage(), TemplateResolver.templates(Template.template("player", playerName))); + Bukkit.broadcast(component, "afkdetector.notify"); } standingTime = System.currentTimeMillis(); playerToSphereCenter = Bukkit.getPlayer(getPlayerUuid()).getLocation(); diff --git a/src/main/java/com/alttd/afkdectector/command/AFKCheckCommand.java b/src/main/java/com/alttd/afkdectector/command/AFKCheckCommand.java index c853bb4..04fd963 100755 --- a/src/main/java/com/alttd/afkdectector/command/AFKCheckCommand.java +++ b/src/main/java/com/alttd/afkdectector/command/AFKCheckCommand.java @@ -40,7 +40,7 @@ public class AFKCheckCommand implements CommandExecutor, TabCompleter { sender.sendMessage(Component.text(command.getUsage(), NamedTextColor.RED)); return true; } - MiniMessage miniMessage = MiniMessage.miniMessage(); + MiniMessage miniMessage = AFKDetector.miniMessage; target.showTitle(Title.title(miniMessage.deserialize(Messages.AFKCHECKTITLE.getMessage()), miniMessage.deserialize(Messages.AFKCHECKSUBTITLE.getMessage()))); if(sender instanceof Player) { diff --git a/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java b/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java index e9d86df..b2309da 100755 --- a/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java +++ b/src/main/java/com/alttd/afkdectector/command/AFKListCommand.java @@ -29,7 +29,7 @@ public class AFKListCommand implements CommandExecutor, TabCompleter { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { int afkplayers = 0; Component message = Component.empty(); - MiniMessage miniMessage = MiniMessage.miniMessage(); + MiniMessage miniMessage = AFKDetector.miniMessage; for (AFKPlayer afkplayer : plugin.players.values()) { long standingTime = afkplayer.getstandingTime(); if(System.currentTimeMillis() - standingTime > Config.TOGGLETIME * 60 * 1000) {