Merge branch 'server-renderer' into 1.20.4

src/main/java/xiamomc/morph/backends/server/renderer/network/PacketFactory.java

@@ -5,11 +5,8 @@
 import com.comphenix.protocol.wrappers.WrappedDataValue;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.*;
-import net.minecraft.world.entity.Attackable;
-import net.minecraft.world.entity.ai.attributes.Attribute;
 import net.minecraft.world.level.GameType;
 import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.EntityType;

src/main/java/xiamomc/morph/backends/server/renderer/network/ProtocolEquipment.java

@@ -2,10 +2,9 @@
 
 import com.mojang.datafixers.util.Pair;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.entity.EquipmentSlot;
+import net.minecraft.world.item.ItemStack;
 import org.bukkit.inventory.EntityEquipment;
-import xiamomc.morph.misc.DisguiseEquipment;
 
 public class ProtocolEquipment
 {

src/main/java/xiamomc/morph/backends/server/renderer/network/ProtocolHandler.java

@@ -2,7 +2,10 @@
 
 import com.comphenix.protocol.ProtocolLibrary;
 import xiamomc.morph.MorphPluginObject;
-import xiamomc.morph.backends.server.renderer.network.listeners.*;
+import xiamomc.morph.backends.server.renderer.network.listeners.EquipmentPacketListener;
+import xiamomc.morph.backends.server.renderer.network.listeners.MetaPacketListener;
+import xiamomc.morph.backends.server.renderer.network.listeners.PlayerLookPacketListener;
+import xiamomc.morph.backends.server.renderer.network.listeners.SpawnPacketHandler;
 import xiamomc.pluginbase.Annotations.Initializer;
 
 public class ProtocolHandler extends MorphPluginObject

src/main/java/xiamomc/morph/backends/server/renderer/network/TestPacketListener.java

@@ -6,7 +6,6 @@
 import com.comphenix.protocol.events.PacketListener;
 import com.comphenix.protocol.injector.GamePhase;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import net.minecraft.server.packs.repository.Pack;
 import org.bukkit.plugin.Plugin;
 import xiamomc.morph.MorphPlugin;
 import xiamomc.morph.MorphPluginObject;

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/SingleValue.java

@@ -2,7 +2,6 @@
 
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/basetypes/AnimalValues.java

@@ -1,7 +1,5 @@
 package xiamomc.morph.backends.server.renderer.network.datawatcher.values.basetypes;
 
-import xiamomc.morph.backends.server.renderer.network.datawatcher.values.basetypes.AgeableMobValues;
-
 public class AnimalValues extends AgeableMobValues
 {
 }

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/values/basetypes/ChestedHorseValues.java

@@ -1,7 +1,6 @@
 package xiamomc.morph.backends.server.renderer.network.datawatcher.values.basetypes;
 
 import xiamomc.morph.backends.server.renderer.network.datawatcher.values.SingleValue;
-import xiamomc.morph.backends.server.renderer.network.datawatcher.values.basetypes.AbstractHorseValues;
 
 public class ChestedHorseValues extends AbstractHorseValues
 {

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/SingleWatcher.java

@@ -89,7 +89,7 @@ public SingleWatcher(Player bindingPlayer, EntityType entityType)
     @Initializer
     private void load()
     {
-        if (!syncedOnce.get())
+        if (!syncedOnce.get() && !disposed)
             sync();
     }
 
@@ -285,4 +285,33 @@ protected void sendPacketToAffectedPlayers(PacketContainer packet)
         var protocol = ProtocolLibrary.getProtocolManager();
         players.forEach(p -> protocol.sendServerPacket(p, packet));
     }
+
+    private boolean disposed;
+
+    public boolean disposed()
+    {
+        return disposed;
+    }
+
+    public final void dispose()
+    {
+        if (disposed)
+            throw new RuntimeException("Already disposed!");
+
+        disposed = true;
+
+        try
+        {
+            onDispose();
+        }
+        catch (Throwable t)
+        {
+            logger.warn("Error occurred while disposing: " + t.getMessage());
+            t.printStackTrace();
+        }
+    }
+
+    protected void onDispose()
+    {
+    }
 }

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/EntityWatcher.java

@@ -2,8 +2,8 @@
 
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.SingleWatcher;
+import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.misc.NmsRecord;
 
 public class EntityWatcher extends SingleWatcher

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/LivingEntityWatcher.java

@@ -1,9 +1,9 @@
 package xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.InteractionHand;
 import org.bukkit.Bukkit;
 import org.bukkit.Color;
 import org.bukkit.entity.EntityType;
@@ -64,8 +64,8 @@ protected void doSync()
 
             if (handInUse == null)
             {
-                logger.warn("No hand in use but using item? Defaulting to HAND");
-                handInUse = EquipmentSlot.HAND;
+                var nmsHand = nmsPlayer.getUsedItemHand();
+                handInUse = nmsHand == InteractionHand.MAIN_HAND ? EquipmentSlot.HAND : EquipmentSlot.OFF_HAND;
             }
 
             boolean isOffhand = handInUse == EquipmentSlot.OFF_HAND;
@@ -121,4 +121,10 @@ protected void doSync()
 
         super.doSync();
     }
+
+    @Override
+    protected void onDispose()
+    {
+        PlayerInteractEvent.getHandlerList().unregister(this);
+    }
 }

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/PlayerWatcher.java

@@ -8,9 +8,9 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import xiamomc.morph.backends.server.renderer.network.DisplayParameters;
-import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.backends.server.renderer.network.registries.EntryIndex;
 import xiamomc.morph.backends.server.renderer.network.registries.RegistryKey;
+import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 
 import java.util.UUID;
 

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/SnowGolemWatcher.java

@@ -3,8 +3,8 @@
 import net.minecraft.nbt.CompoundTag;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.values.SnowGolemValues;
+import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 
 public class SnowGolemWatcher extends LivingEntityWatcher
 {

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/WardenWatcher.java

@@ -6,7 +6,6 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
-import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.SingleWatcher;
 import xiamomc.morph.backends.server.renderer.network.registries.EntryIndex;
 import xiamomc.morph.backends.server.renderer.network.registries.RegistryKey;
 

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/horses/AbstractHorseWatcher.java

@@ -3,8 +3,8 @@
 import net.minecraft.nbt.CompoundTag;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types.AgeableMobWatcher;
+import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 
 public class AbstractHorseWatcher extends AgeableMobWatcher
 {

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/llama/LlamaWatcher.java

@@ -3,8 +3,8 @@
 import net.minecraft.nbt.CompoundTag;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types.horses.ChestedHorseWatcher;
+import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 
 public class LlamaWatcher extends ChestedHorseWatcher
 {

src/main/java/xiamomc/morph/backends/server/renderer/network/datawatcher/watchers/types/slimemagma/AbstractSlimeWatcher.java

@@ -3,8 +3,8 @@
 import net.minecraft.nbt.CompoundTag;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types.LivingEntityWatcher;
+import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 
 public class AbstractSlimeWatcher extends LivingEntityWatcher
 {

src/main/java/xiamomc/morph/backends/server/renderer/network/listeners/EquipmentPacketListener.java

@@ -10,7 +10,6 @@
 import xiamomc.morph.backends.server.renderer.network.PacketFactory;
 import xiamomc.morph.backends.server.renderer.network.registries.EntryIndex;
 import xiamomc.morph.backends.server.renderer.network.registries.RenderRegistry;
-import xiamomc.morph.utilities.NmsUtils;
 import xiamomc.pluginbase.Annotations.Resolved;
 
 import java.util.Map;

src/main/java/xiamomc/morph/backends/server/renderer/network/listeners/MetaPacketListener.java

@@ -8,8 +8,8 @@
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import xiamomc.morph.backends.server.renderer.network.PacketFactory;
-import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.morph.backends.server.renderer.network.registries.RenderRegistry;
+import xiamomc.morph.backends.server.renderer.network.registries.ValueIndex;
 import xiamomc.pluginbase.Annotations.Resolved;
 
 public class MetaPacketListener extends ProtocolListener

src/main/java/xiamomc/morph/backends/server/renderer/network/listeners/PlayerLookPacketListener.java

@@ -5,9 +5,9 @@
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.injector.GamePhase;
-import net.minecraft.network.protocol.common.ClientboundKeepAlivePacket;
-import net.minecraft.network.protocol.game.*;
-import net.minecraft.server.packs.repository.Pack;
+import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket;
+import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket;
+import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import xiamomc.morph.backends.server.renderer.network.PacketFactory;

src/main/java/xiamomc/morph/backends/server/renderer/network/listeners/ProtocolListener.java

@@ -5,12 +5,10 @@
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.events.PacketListener;
 import net.minecraft.world.entity.Entity;
-import org.bukkit.entity.Player;
 import org.jetbrains.annotations.Nullable;
 import xiamomc.morph.MorphPlugin;
 import xiamomc.morph.MorphPluginObject;
 import xiamomc.morph.backends.server.renderer.network.PacketFactory;
-import xiamomc.morph.backends.server.renderer.network.queue.PacketQueue;
 import xiamomc.morph.config.ConfigOption;
 import xiamomc.morph.config.MorphConfigManager;
 import xiamomc.morph.utilities.NmsUtils;

src/main/java/xiamomc/morph/backends/server/renderer/network/listeners/SpawnPacketHandler.java

@@ -23,8 +23,8 @@
 import xiamomc.morph.backends.server.renderer.network.registries.EntryIndex;
 import xiamomc.morph.backends.server.renderer.network.registries.RenderRegistry;
 import xiamomc.morph.backends.server.renderer.utilties.WatcherUtils;
-import xiamomc.morph.misc.skins.PlayerSkinProvider;
 import xiamomc.morph.misc.NmsRecord;
+import xiamomc.morph.misc.skins.PlayerSkinProvider;
 import xiamomc.pluginbase.Annotations.Resolved;
 import xiamomc.pluginbase.Exceptions.NullDependencyException;
 
@@ -82,6 +82,8 @@ private void unDisguiseForPlayer(@Nullable Player player, SingleWatcher disguise
             ));
         }
 
+        watcher.dispose();
+
         affectedPlayers.forEach(p ->
         {
             protocolManager.sendServerPacket(p, rmPacketContainer);

src/main/java/xiamomc/morph/backends/server/renderer/network/registries/RegistryKey.java

@@ -1,7 +1,5 @@
 package xiamomc.morph.backends.server.renderer.network.registries;
 
-import org.jetbrains.annotations.NotNull;
-
 public class RegistryKey<T>
 {
     public final Class<T> type;

src/main/java/xiamomc/morph/backends/server/renderer/network/registries/RenderRegistry.java

@@ -103,6 +103,8 @@ public void unregister(UUID uuid)
     {
         var watcher = watcherMap.remove(uuid);
         callUnregister(Bukkit.getPlayer(uuid), watcher);
+
+        watcher.dispose();
     }
 
     /**

src/main/java/xiamomc/morph/backends/server/renderer/network/registries/WatcherIndex.java

@@ -3,7 +3,6 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
-import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types.GoatWatcher;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.SingleWatcher;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types.*;
 import xiamomc.morph.backends.server.renderer.network.datawatcher.watchers.types.horses.AbstractHorseWatcher;