Removed usage of reflection and unsafe stuff

Author: Pascalpex

src/main/java/de/pascalpex/pexnpc/commands/PexNPCCommand.java

@@ -2,7 +2,6 @@
 
 import de.pascalpex.pexnpc.PexNPC;
 import de.pascalpex.pexnpc.commands.subcommands.SubCommands;
-import de.pascalpex.pexnpc.files.NPCData;
 import de.pascalpex.pexnpc.util.MessageHandler;
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
@@ -17,6 +16,9 @@ public class PexNPCCommand implements BasicCommand {
     @Override
     public void execute(CommandSourceStack commandSourceStack, String @NotNull [] args) {
         CommandSender sender = commandSourceStack.getSender();
+        if(sender != commandSourceStack.getExecutor()) {
+            sender.sendMessage(MessageHandler.errorMessage("Different senders and executors are currently not supported"));
+        }
         if(sender instanceof Player player) {
             if(args.length == 0) {
                 SubCommands.HELP.getSubCommand().invoke(player, new String[0]);
@@ -33,7 +35,7 @@ public void execute(CommandSourceStack commandSourceStack, String @NotNull [] ar
     }
 
     @Override
-    public Collection<String> suggest(CommandSourceStack commandSourceStack, String[] args) {
+    public @NotNull Collection<String> suggest(CommandSourceStack commandSourceStack, String @NotNull [] args) {
         CommandSender sender = commandSourceStack.getSender();
         final List<String> completions = new ArrayList<>();
 

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

@@ -1,11 +1,9 @@
 package de.pascalpex.pexnpc.events;
 
 import de.pascalpex.pexnpc.npc.PlaceableNPC;
-import de.pascalpex.pexnpc.util.ReflectionHelper;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageDecoder;
-import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.network.protocol.game.ServerboundInteractPacket;
 import net.minecraft.server.level.ServerPlayer;
@@ -26,8 +24,7 @@ public class PacketReader {
     public void inject(Player player) throws NoSuchFieldException, IllegalAccessException {
         CraftPlayer craftPlayer = (CraftPlayer) player;
         ServerGamePacketListenerImpl serverConnection = craftPlayer.getHandle().connection;
-        Connection connection = (Connection) ReflectionHelper.getValue(serverConnection, "e");
-        channel = connection.channel;
+        channel = serverConnection.connection.channel;
         channels.put(player.getUniqueId(), channel);
 
         if (channel.pipeline().get("PacketInjector") != null) {
@@ -61,11 +58,8 @@ public void uninject(Player player) {
     }
 
     public void readPacket(Player player, Packet<?> packet) {
-
-        String packetName = packet.getClass().getSimpleName();
-        if (packetName.equalsIgnoreCase("PacketPlayInUseEntity") || packetName.equalsIgnoreCase("ServerboundInteractPacket")) {
-
-            int id = (int) ReflectionHelper.getValue(packet, "b");
+        if (packet instanceof ServerboundInteractPacket serverboundInteractPacket) {
+            int id = serverboundInteractPacket.getEntityId();
 
             for (ServerPlayer npc : PexNPC.getPlacedNpcs().stream().map(PlaceableNPC::getServerPlayer).toList()) {
                 if (npc.getId() == id) {

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

@@ -30,7 +30,7 @@ public static void load() {
             configFile.getParentFile().mkdirs();
             if (!configFile.exists()) {
                 configFile.createNewFile();
-                save();
+                config.save(configFile);
             }
             config.load(configFile);
         } catch (IOException | InvalidConfigurationException e) {
@@ -50,7 +50,7 @@ public void run() {
                     PexNPC.logger().log(Level.SEVERE, e.toString());
                 }
             }
-        }.runTask(PexNPC.getInstance());
+        }.runTaskAsynchronously(PexNPC.getInstance());
     }
 
     public static void saveNpc(NPC npc) {

src/main/java/de/pascalpex/pexnpc/npc/NPCSender.java

@@ -4,7 +4,6 @@
 import com.mojang.datafixers.util.Pair;
 import de.pascalpex.pexnpc.PexNPC;
 import de.pascalpex.pexnpc.files.Config;
-import de.pascalpex.pexnpc.util.ReflectionHelper;
 import net.minecraft.network.chat.ComponentUtils;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.level.ServerPlayer;
@@ -66,7 +65,7 @@ private static void sendNPC(PlaceableNPC placeableNPC, Player player) {
         ServerPlayer serverPlayer = placeableNPC.getServerPlayer();
 
         ServerGamePacketListenerImpl connection = ((CraftPlayer) player).getHandle().connection;
-        connection.send(ReflectionHelper.createInitPacket(serverPlayer));
+        connection.send(new ClientboundPlayerInfoUpdatePacket(ClientboundPlayerInfoUpdatePacket.Action.ADD_PLAYER, serverPlayer));
         // connection.send(new ClientboundEntityEventPacket(serverPlayer, (byte) 1));
         Vec3 pos = serverPlayer.position();
         connection.send(new ClientboundAddEntityPacket(serverPlayer.getId(), serverPlayer.getUUID(), pos.x(), pos.y(), pos.z(), serverPlayer.getXRot(), serverPlayer.getYRot(), serverPlayer.getType(), 0, serverPlayer.getDeltaMovement(), serverPlayer.getYHeadRot()));

src/main/java/de/pascalpex/pexnpc/util/ReflectionHelper.java

@@ -18,12 +18,12 @@
 public class SkinDownloader {
 
     public static NPCSkin downloadSkin(String playerName) throws IOException, URISyntaxException {
-        URL url = new URI("https://api.mojang.com/users/profiles/minecraft/" + playerName).toURL();
-        InputStreamReader profileReader = new InputStreamReader(url.openStream());
+        URL profileUrl = new URI("https://api.mojang.com/users/profiles/minecraft/" + playerName).toURL();
+        InputStreamReader profileReader = new InputStreamReader(profileUrl.openStream());
         String uuid = JsonParser.parseReader(profileReader).getAsJsonObject().get("id").getAsString();
 
-        URL url2 = new URI("https://sessionserver.mojang.com/session/minecraft/profile/" + uuid + "?unsigned=false").toURL();
-        InputStreamReader skinReader = new InputStreamReader(url2.openStream());
+        URL skinUrl = new URI("https://sessionserver.mojang.com/session/minecraft/profile/" + uuid + "?unsigned=false").toURL();
+        InputStreamReader skinReader = new InputStreamReader(skinUrl.openStream());
         JsonObject property = JsonParser.parseReader(skinReader).getAsJsonObject().get("properties").getAsJsonArray().get(0).getAsJsonObject();
         String texture = property.get("value").getAsString();
         String signature = property.get("signature").getAsString();