パケット変更

Author: Elic0de

pom.xml

@@ -82,12 +82,12 @@
             <version>1.19.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
+<!--        <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot</artifactId>
             <version>1.19.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>

src/main/java/com/github/elic0de/thejpspit/spigot/TheJpsPit.java

@@ -12,12 +12,18 @@
 import com.github.elic0de.thejpspit.spigot.hook.Hook;
 import com.github.elic0de.thejpspit.spigot.hook.VaultEconomyHook;
 import com.github.elic0de.thejpspit.spigot.item.ItemManager;
-import com.github.elic0de.thejpspit.spigot.item.items.*;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemCobweb;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemDiamondBoots;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemDiamondChestPlate;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemDiamondSword;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemFishingRod;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemObsidian;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemTurtleShell;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemUltimateSword;
+import com.github.elic0de.thejpspit.spigot.item.items.ItemVividSword;
 import com.github.elic0de.thejpspit.spigot.listener.CombatTagger;
 import com.github.elic0de.thejpspit.spigot.listener.EventListener;
 import com.github.elic0de.thejpspit.spigot.network.PluginMessageReceiver;
-import com.github.elic0de.thejpspit.spigot.nms.PacketManager;
-import com.github.elic0de.thejpspit.spigot.nms.PacketManager1_19_R1;
 import com.github.elic0de.thejpspit.spigot.player.PitPlayer;
 import com.github.elic0de.thejpspit.spigot.player.PitPlayerManager;
 import com.github.elic0de.thejpspit.spigot.queue.QueueManager;
@@ -28,19 +34,15 @@
 import com.github.elic0de.thejpspit.spigot.villager.villagers.ShopVillager;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.bukkit.Bukkit;
-import org.bukkit.GameRule;
-import org.bukkit.attribute.Attribute;
-import org.bukkit.plugin.PluginManager;
-import org.bukkit.plugin.java.JavaPlugin;
-
-
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
+import org.bukkit.Bukkit;
+import org.bukkit.GameRule;
+import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.java.JavaPlugin;
 
 public final class TheJpsPit extends JavaPlugin {
 
@@ -56,8 +58,6 @@ public final class TheJpsPit extends JavaPlugin {
 
     private Optional<PitPreferences> pitPreferences;
 
-    private PacketManager packetManager;
-
     public static TheJpsPit getInstance() {
         return instance;
     }
@@ -92,7 +92,7 @@ public void onEnable() {
         queueTask = new QueueTask();
 
         setPreferences();
-        setPacketManager();
+        //setPacketManager();
 
         getServer().getMessenger()
                 .registerIncomingPluginChannel(this, PluginMessageReceiver.BUNGEE_CHANNEL_ID,
@@ -144,7 +144,7 @@ private void setPreferences() {
         this.pitPreferences = preferences;
     }
 
-    private void setPacketManager() {
+/*    private void setPacketManager() {
         final String serverVersion = Bukkit.getServer().getClass().getPackage().getName().split("\\.")[3].trim();
         PacketManager packetManager;
         switch (serverVersion) {
@@ -155,7 +155,7 @@ private void setPacketManager() {
                 throw new RuntimeException("Failed to create version specific server accessor");
         }
         this.packetManager = packetManager;
-    }
+    }*/
 
     private void registerCommands() {
         PaperCommandManager commandManager = new PaperCommandManager(this);
@@ -265,9 +265,6 @@ public Optional<PitPreferences> getPitPreferences() {
         return pitPreferences;
     }
 
-    public PacketManager getPacketManager() {
-        return packetManager;
-    }
 
     public Gson getGson() {
         return Converters.registerOffsetDateTime(new GsonBuilder().excludeFieldsWithoutExposeAnnotation()).create();

src/main/java/com/github/elic0de/thejpspit/spigot/leveler/Levels.java

@@ -1,15 +1,14 @@
 package com.github.elic0de.thejpspit.spigot.leveler;
 
 import com.github.elic0de.thejpspit.spigot.player.PitPlayer;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import org.bukkit.ChatColor;
 
 public class Levels {
 
-    private final static HashMap<Integer,Level> LEVELS = new HashMap();
+    private final static HashMap<Integer,Level> LEVELS = new HashMap<>();
 
     static {
         initialize(

src/main/java/com/github/elic0de/thejpspit/spigot/listener/EventListener.java

@@ -5,11 +5,13 @@
 import com.github.elic0de.thejpspit.spigot.item.IUsable;
 import com.github.elic0de.thejpspit.spigot.item.ItemManager;
 import com.github.elic0de.thejpspit.spigot.item.PitItemEntry;
-import com.github.elic0de.thejpspit.spigot.nms.PacketManager;
 import com.github.elic0de.thejpspit.spigot.player.PitPlayer;
 import com.github.elic0de.thejpspit.spigot.player.PitPlayerManager;
+import com.github.elic0de.thejpspit.spigot.util.NoCollisionUtil;
 import com.github.elic0de.thejpspit.spigot.villager.VillagerNPC;
 import com.github.elic0de.thejpspit.spigot.villager.VillagerNPCManager;
+import java.util.Objects;
+import java.util.Optional;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
@@ -20,16 +22,24 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
-import org.bukkit.event.entity.*;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
-import org.bukkit.event.player.*;
+import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
+import org.bukkit.event.entity.PlayerDeathEvent;
+import org.bukkit.event.player.PlayerDropItemEvent;
+import org.bukkit.event.player.PlayerExpChangeEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerItemConsumeEvent;
+import org.bukkit.event.player.PlayerItemDamageEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
 
-import java.util.Objects;
-import java.util.Optional;
-
 public class EventListener implements Listener {
 
     private final TheJpsPit plugin = TheJpsPit.getInstance();
@@ -41,13 +51,13 @@ public EventListener() {
     @EventHandler
     public void onJoin(PlayerJoinEvent event) {
         event.setJoinMessage("");
-        //new NoCollisionUtil().sendNoCollisionPacket(event.getPlayer());
+        new NoCollisionUtil().sendNoCollisionPacket(event.getPlayer());
         final Player player = event.getPlayer();
         final Optional<PitPlayer> userData = plugin.getDatabase().getPitPlayer(player);
 
-        final PacketManager packetManager = TheJpsPit.getInstance().getPacketManager();
+        /*final PacketManager packetManager = TheJpsPit.getInstance().getPacketManager();
         Object packet = packetManager.buildScoreboardTeam(player);
-        packetManager.sendPacket(packet, player);
+        packetManager.sendPacket(packet, player);*/
 
         plugin.getPitPreferences().ifPresent(pitPreferences -> {
             final Location location = pitPreferences.getSpawn().get().getLocation();