Updated dependencies

Author: Pascalpex

README.md

@@ -11,7 +11,7 @@ PexNPC offers a few advantages over some other NPC plugins:
 - Lightweight and small in file size
 - Fast updates for new Minecraft versions. Most of the time, the updates arrive at the same day as the Paper API does
 
-Please note, that this plugin only supports the latest version of Minecraft. Older versions may or may not work.
+Please note that this plugin only supports the latest version of Minecraft. Older versions may or may not work.
 ## Building
 ```
 ./gradlew build

build.gradle.kts

@@ -16,7 +16,7 @@ repositories {
 }
 
 dependencies {
-    testImplementation(platform("org.junit:junit-bom:5.12.2"))
+    testImplementation(platform("org.junit:junit-bom:5.13.0"))
     testImplementation("org.junit.jupiter:junit-jupiter")
     compileOnly("me.clip:placeholderapi:2.11.6")
     paperweight.paperDevBundle("1.21.5-R0.1-SNAPSHOT")

src/main/java/de/pascalpex/pexnpc/PexNPC.java

@@ -17,7 +17,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class PexNPC extends JavaPlugin {
@@ -53,11 +52,7 @@ public void onEnable() {
         loadAllNPCs();
 
         for (Player player : Bukkit.getOnlinePlayers()) {
-            try {
-                packetReader.inject(player);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                logger.log(Level.SEVERE, "Could not inject the PacketReader!");
-            }
+            packetReader.inject(player);
         }
 
         // Listeners
@@ -137,12 +132,8 @@ public void reload() {
         this.getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord");
 
         for (Player player : Bukkit.getOnlinePlayers()) {
-            try {
-                packetReader.uninject(player);
-                packetReader.inject(player);
-            } catch (NoSuchFieldException | IllegalAccessException e) {
-                logger.log(Level.SEVERE, "Could not inject the PacketReader!");
-            }
+            packetReader.uninject(player);
+            packetReader.inject(player);
         }
 
         NPCClickListener.inspectors.clear();

src/main/java/de/pascalpex/pexnpc/PexNPCLoader.java

@@ -2,10 +2,11 @@
 
 import io.papermc.paper.plugin.loader.PluginClasspathBuilder;
 import io.papermc.paper.plugin.loader.PluginLoader;
+import org.jetbrains.annotations.NotNull;
 
 public class PexNPCLoader implements PluginLoader {
     @Override
-    public void classloader(PluginClasspathBuilder pluginClasspathBuilder) {
+    public void classloader(@NotNull PluginClasspathBuilder pluginClasspathBuilder) {
 
     }
 }

src/main/java/de/pascalpex/pexnpc/commands/subcommands/CreateSubcommand.java

@@ -3,7 +3,6 @@
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import de.pascalpex.pexnpc.PexNPC;
 import de.pascalpex.pexnpc.files.NPCData;
 import de.pascalpex.pexnpc.npc.NPC;
@@ -18,7 +17,7 @@
 
 public class CreateSubcommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) {
         CommandSender sender = context.getSource().getSender();
         Entity executor = context.getSource().getExecutor();
 

src/main/java/de/pascalpex/pexnpc/commands/subcommands/InspectSubcommand.java

@@ -2,7 +2,6 @@
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import de.pascalpex.pexnpc.events.listener.NPCClickListener;
 import de.pascalpex.pexnpc.util.MessageHandler;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
@@ -14,7 +13,7 @@
 
 public class InspectSubcommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) {
         CommandSender sender = context.getSource().getSender();
         Entity executor = context.getSource().getExecutor();
 

src/main/java/de/pascalpex/pexnpc/commands/subcommands/ReloadSubcommand.java

@@ -2,15 +2,14 @@
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.context.CommandContext;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
 import de.pascalpex.pexnpc.PexNPC;
 import de.pascalpex.pexnpc.util.MessageHandler;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import org.bukkit.command.CommandSender;
 
 public class ReloadSubcommand implements Command<CommandSourceStack> {
     @Override
-    public int run(CommandContext<CommandSourceStack> context) throws CommandSyntaxException {
+    public int run(CommandContext<CommandSourceStack> context) {
         CommandSender sender = context.getSource().getSender();
 
         PexNPC.getInstance().reload();

src/main/java/de/pascalpex/pexnpc/events/PacketReader.java

@@ -18,12 +18,12 @@
 public class PacketReader {
 
     Channel channel;
-    public static Map<UUID, Channel> channels = new HashMap<>();
-    public static Map<UUID, Boolean> clicking = new HashMap<>();
+    public static final Map<UUID, Channel> channels = new HashMap<>();
+    public static final Map<UUID, Boolean> clicking = new HashMap<>();
 
     private static final String PACKET_INJECTOR_NAME = "PacketInjector";
 
-    public void inject(Player player) throws NoSuchFieldException, IllegalAccessException {
+    public void inject(Player player) {
         CraftPlayer craftPlayer = (CraftPlayer) player;
         ServerGamePacketListenerImpl serverConnection = craftPlayer.getHandle().connection;
         channel = serverConnection.connection.channel;

src/main/java/de/pascalpex/pexnpc/events/listener/JoinEventListener.java

@@ -10,8 +10,6 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerJoinEvent;
 
-import java.util.logging.Level;
-
 public class JoinEventListener implements Listener {
 
     @EventHandler(priority = EventPriority.HIGHEST)
@@ -24,11 +22,7 @@ public void onJoin(PlayerJoinEvent event) {
         }
 
         PacketReader reader = new PacketReader();
-        try {
-            reader.inject(player);
-        } catch (NoSuchFieldException | IllegalAccessException e) {
-            PexNPC.logger().log(Level.SEVERE, "Could not inject the PacketReader!");
-        }
+        reader.inject(player);
         NPCSender.sendNpcsToPlayer(player);
     }
 

src/main/java/de/pascalpex/pexnpc/files/Config.java

@@ -12,8 +12,8 @@
 
 public class Config {
 
-    public static File configFile = new File("plugins/PexNPC", "config.yml");
-    public static FileConfiguration config = YamlConfiguration.loadConfiguration(configFile);
+    public static final File configFile = new File("plugins/PexNPC", "config.yml");
+    public static final FileConfiguration config = YamlConfiguration.loadConfiguration(configFile);
 
     public static void load() {
         try {