Merge branch 'server-renderer' into 1.20.4

src/main/java/xiamomc/morph/MorphPlugin.java

@@ -166,6 +166,7 @@ public void onEnable()
                             mirrorProcessor,
                             new CommonEventProcessor(),
                             new RevealingEventProcessor(),
+                            new DisguiseAnimationProcessor(),
                             new ForcedDisguiseProcessor()
                     });
 

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

@@ -8,11 +8,11 @@
 public class LivingEntityValues extends EntityValues
 {
     public final SingleValue<Byte> LIVING_FLAGS = getSingle("living_flags", (byte)0);
-    public final SingleValue<Float> HEALTH = getSingle("living_health", 1f);
     public final SingleValue<Integer> POTION_COLOR = getSingle("living_option_color", 0);
     public final SingleValue<Boolean> POTION_ISAMBIENT = getSingle("living_potion_is_ambient", false);
     public final SingleValue<Integer> STUCKED_ARROWS = getSingle("living_stucked_arrows", 0);
     public final SingleValue<Integer> BEE_STINGERS = getSingle("living_bee_stingers", 0);
+    public final SingleValue<Float> HEALTH = getSingle("living_health", 1f);
     public final SingleValue<Optional<BlockPos>> BED_POS = getSingle("living_bed_pos", Optional.of(new BlockPos(0,0,0)));
 
     public LivingEntityValues()

src/main/java/xiamomc/morph/events/CommonEventProcessor.java

@@ -221,31 +221,11 @@ public void onPlayerInteractEntity(PlayerInteractEntityEvent e)
             e.setCancelled(tryInvokeSkillOrQuickDisguise(e.getPlayer(), Action.RIGHT_CLICK_AIR, e.getHand()) || e.isCancelled());
     }
 
-    @Resolved
-    private PlayerTracker tracker;
-
-    @EventHandler
-    public void onEntityDamagedByEntity(EntityDamageByEntityEvent e)
-    {
-        var state = morphs.getDisguiseStateFor(e.getDamager());
-        if (state == null) return;
-
-        state.getDisguiseWrapper().playAttackAnimation();
-    }
-
     @EventHandler
     public void onPlayerInteract(PlayerInteractEvent e)
     {
         if (tryInvokeSkillOrQuickDisguise(e.getPlayer(), e.getAction(), e.getHand()))
             e.setCancelled(true);
-
-        var player = e.getPlayer();
-        if (e.getAction().isLeftClick() && !tracker.isBreakingSuspect(player))
-        {
-            var state = morphs.getDisguiseStateFor(player);
-            if (state != null)
-                state.getDisguiseWrapper().playAttackAnimation();
-        }
     }
 
     /**

src/main/java/xiamomc/morph/events/DisguiseAnimationProcessor.java

@@ -0,0 +1,40 @@
+package xiamomc.morph.events;
+
+import com.destroystokyo.paper.event.player.PlayerJumpEvent;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import xiamomc.morph.MorphManager;
+import xiamomc.morph.MorphPluginObject;
+import xiamomc.pluginbase.Annotations.Resolved;
+
+public class DisguiseAnimationProcessor extends MorphPluginObject implements Listener
+{
+    @Resolved(shouldSolveImmediately = true)
+    private PlayerTracker tracker;
+
+    @Resolved(shouldSolveImmediately = true)
+    private MorphManager morphManager;
+
+    @EventHandler
+    public void onPlayerInteract(PlayerInteractEvent e)
+    {
+        var player = e.getPlayer();
+        if (e.getAction().isLeftClick() && !tracker.isBreakingSuspect(player))
+        {
+            var state = morphManager.getDisguiseStateFor(player);
+            if (state != null)
+                state.getDisguiseWrapper().playAttackAnimation();
+        }
+    }
+
+    @EventHandler
+    public void onEntityDamagedByEntity(EntityDamageByEntityEvent e)
+    {
+        var state = morphManager.getDisguiseStateFor(e.getDamager());
+        if (state == null) return;
+
+        state.getDisguiseWrapper().playAttackAnimation();
+    }
+}