Merge pull request #9 from Orphey98/quality-updates

- Reload command improvement
Orphey98 · Dec 27, 2024 · 08c6ee2 · 08c6ee2
2 parents 6103a4c + 98ac60e
commit 08c6ee2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/me/orphey/typinginchat/Command.java b/src/main/java/me/orphey/typinginchat/Command.java
@@ -6,8 +6,6 @@
 import org.bukkit.command.TabExecutor;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.entity.Player;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -16,7 +14,7 @@
 
 public class Command implements CommandExecutor, TabExecutor {
     @Override
-    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull org.bukkit.command.Command command, @NotNull String s, @NotNull String[] strings) {
+    public boolean onCommand(CommandSender commandSender, org.bukkit.command.Command command, String s, String[] strings) {
 
         if (strings.length == 1 && strings[0].equalsIgnoreCase("reload")) {
             cmdReload(commandSender);
@@ -27,7 +25,7 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull org.bukk
     }
 
     @Override
-    public @Nullable List<String> onTabComplete(@NotNull CommandSender commandSender, @NotNull org.bukkit.command.Command command, @NotNull String s, @NotNull String[] strings) {
+    public List<String> onTabComplete(CommandSender commandSender, org.bukkit.command.Command command, String s, String[] strings) {
         if (strings.length == 1)
             return List.of("reload");
         return new ArrayList<>();
@@ -38,6 +36,7 @@ public static void cmdReload(CommandSender sender) {
             if (TypingInChat.checkPermission(player, "tic.admin")) {
                 try {
                     ConfigLoader.getInstance().load(); // Update data from config.yml
+                    Holograms.getHologramAPI().removeAll();
                     sender.sendMessage(ChatColor.YELLOW + "[TypingInChat] Configuration reloaded");
                     TypingInChat.getInstance().getPluginLogger().info("Configuration reloaded.");
                 } catch (FileNotFoundException e) {
@@ -54,6 +53,7 @@ public static void cmdReload(CommandSender sender) {
         } else {
             try {
                 ConfigLoader.getInstance().load();
+                Holograms.getHologramAPI().removeAll();
                 TypingInChat.getInstance().getPluginLogger().info("Configuration reloaded");
             } catch (IOException | InvalidConfigurationException e) {
                 TypingInChat.getInstance().getPluginLogger().severe("config.yml reading error." + e.getMessage());

diff --git a/target/classes/config.yml b/target/classes/config.yml
@@ -24,6 +24,6 @@ text-shadow: false
 #Changing these values are not recommended
 #Attached hologram spawn location offset, relative to player position.
 #Custom value need to be adjusted to transformation value.
-location: [0, 0.35, 0]
+location: [0, 1.35, 0]
 #Hologram entity position offset, relative to player position.
 transformation: [0, 0.72F, 0]
diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml
@@ -2,7 +2,7 @@ name: TypingInChat
 version: '1.0'
 main: me.orphey.typinginchat.TypingInChat
 api-version: '1.19'
-depend: [HologramAPI, packetevents]
+depend: [HologramLib, packetevents]
 softdepend: [VaultAPI]
 commands:
   typinginchat: