fix particle packet issue + per player glow (#13)

* per player color --------- Co-authored-by: iam4722202468 <aceparent@gmail.com>
AtlasEngineCa · Mar 10, 2024 · 4dfe193 · 4dfe193
1 parent 2236bd2
commit 4dfe193
Show file tree

Hide file tree

Showing 14 changed files with 207 additions and 25 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -38,7 +38,7 @@ publishing {
 dependencies {
     testImplementation("org.junit.jupiter:junit-jupiter-api:5.8.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
-    implementation("net.minestom:minestom-snapshots:aad7bdab0f")
+    implementation("net.minestom:minestom-snapshots:2ff143a61d")
 
     implementation("commons-io:commons-io:2.11.0")
     implementation("org.zeroturnaround:zt-zip:1.8")

diff --git a/src/main/java/net/worldseed/multipart/GenericModel.java b/src/main/java/net/worldseed/multipart/GenericModel.java
@@ -1,11 +1,12 @@
 package net.worldseed.multipart;
 
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.Viewable;
 import net.minestom.server.collision.Shape;
-import net.minestom.server.color.Color;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Entity;
+import net.minestom.server.entity.Player;
 import net.minestom.server.event.EventHandler;
 import net.minestom.server.instance.Instance;
 import net.worldseed.multipart.animations.AnimationHandlerImpl;
@@ -131,7 +132,10 @@ public interface GenericModel extends Viewable, EventHandler<ModelEvent>, Shape
     void setScale(float scale);
 
     void removeGlowing();
-    void setGlowing(Color color);
+    void setGlowing(RGBLike color);
+
+    void removeGlowing(Player player);
+    void setGlowing(Player player, RGBLike color);
 
     void attachModel(GenericModel model, String boneName);
     Map<String, List<GenericModel>> getAttachedModels();

diff --git a/src/main/java/net/worldseed/multipart/GenericModelImpl.java b/src/main/java/net/worldseed/multipart/GenericModelImpl.java
@@ -4,6 +4,7 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import net.kyori.adventure.audience.Audience;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.ServerProcess;
 import net.minestom.server.collision.BoundingBox;
@@ -57,6 +58,7 @@ public abstract class GenericModelImpl implements GenericModel {
 
     private final Set<Player> viewers = ConcurrentHashMap.newKeySet();
     private final EventNode<ModelEvent> eventNode;
+    private final Map<Player, RGBLike> playerGlowColors = Collections.synchronizedMap(new WeakHashMap<>());
 
     public GenericModelImpl() {
         final ServerProcess process = MinecraftServer.process();
@@ -369,6 +371,11 @@ public void sendPacketToViewersAndSelf(@NotNull SendablePacket packet) {
     @Override
     public boolean addViewer(@NotNull Player player) {
         getParts().forEach(part -> part.addViewer(player));
+
+        var foundPlayerGlowing = this.playerGlowColors.get(player);
+        if(foundPlayerGlowing != null)
+            this.viewableBones.forEach(part -> part.setGlowing(player, foundPlayerGlowing));
+
         return this.viewers.add(player);
     }
 
@@ -451,7 +458,7 @@ public boolean intersectBoxSwept(@NotNull Point rayStart, @NotNull Point rayDire
     }
 
     @Override
-    public void setGlowing(Color color) {
+    public void setGlowing(RGBLike color) {
         this.viewableBones.forEach(part -> part.setGlowing(color));
     }
 
@@ -460,6 +467,18 @@ public void removeGlowing() {
         this.viewableBones.forEach(ModelBoneImpl::removeGlowing);
     }
 
+    @Override
+    public void setGlowing(Player player, RGBLike color) {
+        this.playerGlowColors.put(player, color);
+        this.viewableBones.forEach(part -> part.setGlowing(player, color));
+    }
+
+    @Override
+    public void removeGlowing(Player player) {
+        this.playerGlowColors.remove(player);
+        this.viewableBones.forEach(part -> part.removeGlowing(player));
+    }
+
     @Override
     public void attachModel(GenericModel model, String boneName) {
         ModelBone bone = this.parts.get(boneName);

diff --git a/src/main/java/net/worldseed/multipart/model_bones/ModelBone.java b/src/main/java/net/worldseed/multipart/model_bones/ModelBone.java
@@ -1,6 +1,6 @@
 package net.worldseed.multipart.model_bones;
 
-import net.minestom.server.color.Color;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.entity.Player;
@@ -47,7 +47,10 @@ public interface ModelBone {
     void setScale(float scale);
 
     void removeGlowing();
-    void setGlowing(Color color);
+    void setGlowing(RGBLike color);
+
+    void removeGlowing(Player player);
+    void setGlowing(Player player, RGBLike color);
 
     void attachModel(GenericModel model);
     List<GenericModel> getAttachedModels();

diff --git a/...n/java/net/worldseed/multipart/model_bones/armour_stand/ModelBonePartArmourStandHand.java b/...n/java/net/worldseed/multipart/model_bones/armour_stand/ModelBonePartArmourStandHand.java
@@ -1,6 +1,6 @@
 package net.worldseed.multipart.model_bones.armour_stand;
 
-import net.minestom.server.color.Color;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
@@ -41,10 +41,20 @@ public void removeGlowing() {
     }
 
     @Override
-    public void setGlowing(Color color) {
+    public void setGlowing(RGBLike color) {
         if (this.stand != null) this.stand.setGlowing(true);
     }
 
+    @Override
+    public void removeGlowing(Player player) {
+
+    }
+
+    @Override
+    public void setGlowing(Player player, RGBLike color) {
+
+    }
+
     @Override
     public void attachModel(GenericModel model) {
         throw new UnsupportedOperationException("Cannot attach a model to this bone type");

diff --git a/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java b/src/main/java/net/worldseed/multipart/model_bones/display_entity/ModelBonePartDisplay.java
@@ -1,17 +1,18 @@
 package net.worldseed.multipart.model_bones.display_entity;
 
-import net.minestom.server.MinecraftServer;
-import net.minestom.server.color.Color;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
 import net.minestom.server.entity.Entity;
 import net.minestom.server.entity.EntityType;
+import net.minestom.server.entity.Metadata;
 import net.minestom.server.entity.Player;
 import net.minestom.server.entity.metadata.display.ItemDisplayMeta;
 import net.minestom.server.entity.metadata.other.ArmorStandMeta;
 import net.minestom.server.instance.Instance;
 import net.minestom.server.item.ItemStack;
+import net.minestom.server.network.packet.server.play.EntityMetaDataPacket;
 import net.minestom.server.network.packet.server.play.SetPassengersPacket;
 import net.worldseed.multipart.GenericModel;
 import net.worldseed.multipart.Quaternion;
@@ -22,7 +23,9 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 
 public class ModelBonePartDisplay extends ModelBoneImpl implements ModelBoneViewable {
@@ -57,16 +60,64 @@ public void removeGlowing() {
     }
 
     @Override
-    public void setGlowing(Color color) {
+    public void setGlowing(RGBLike color) {
         if (this.stand != null) {
+            int rgb = 0;
+            rgb |= color.red() << 16;
+            rgb |= color.green() << 8;
+            rgb |= color.blue();
+
             var meta = (ItemDisplayMeta) this.stand.getEntityMeta();
             meta.setHasGlowingEffect(true);
-            meta.setGlowColorOverride(color.asRGB());
+            meta.setGlowColorOverride(rgb);
         }
 
         this.attached.forEach(model -> model.setGlowing(color));
     }
 
+    @Override
+    public void removeGlowing(Player player) {
+        if(this.stand == null)
+            return;
+
+        EntityMetaDataPacket oldMetadataPacket = this.stand.getMetadataPacket();
+        Map<Integer, Metadata.Entry<?>> oldEntries = oldMetadataPacket.entries();
+        byte previousFlags = oldEntries.containsKey(0)
+                ? (byte) oldEntries.get(0).value()
+                : 0;
+
+        Map<Integer, Metadata.Entry<?>> entries = new HashMap<>(oldMetadataPacket.entries());
+        entries.put(0, Metadata.Byte((byte) (previousFlags & ~0x40)));
+        entries.put(22, Metadata.VarInt(-1));
+
+        player.sendPacket(new EntityMetaDataPacket(this.stand.getEntityId(), entries));
+        this.attached.forEach(model -> model.removeGlowing(player));
+    }
+
+    @Override
+    public void setGlowing(Player player, RGBLike color) {
+        if(this.stand == null)
+            return;
+
+        int rgb = 0;
+        rgb |= color.red() << 16;
+        rgb |= color.green() << 8;
+        rgb |= color.blue();
+
+        EntityMetaDataPacket oldMetadataPacket = this.stand.getMetadataPacket();
+        Map<Integer, Metadata.Entry<?>> oldEntries = oldMetadataPacket.entries();
+        byte previousFlags = oldEntries.containsKey(0)
+                ? (byte) oldEntries.get(0).value()
+                : 0;
+
+        Map<Integer, Metadata.Entry<?>> entries = new HashMap<>(oldEntries);
+        entries.put(0, Metadata.Byte((byte) (previousFlags | 0x40)));
+        entries.put(22, Metadata.VarInt(rgb));
+
+        player.sendPacket(new EntityMetaDataPacket(this.stand.getEntityId(), entries));
+        this.attached.forEach(model -> model.setGlowing(player, color));
+    }
+
     @Override
     public void attachModel(GenericModel model) {
         attached.add(model);

diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneHitbox.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneHitbox.java
@@ -1,8 +1,8 @@
 package net.worldseed.multipart.model_bones.misc;
 
 import com.google.gson.JsonArray;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.MinecraftServer;
-import net.minestom.server.color.Color;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
@@ -59,7 +59,15 @@ public void removeGlowing() {
     }
 
     @Override
-    public void setGlowing(Color color) {
+    public void setGlowing(RGBLike color) {
+    }
+
+    @Override
+    public void removeGlowing(Player player) {
+    }
+
+    @Override
+    public void setGlowing(Player player, RGBLike color) {
     }
 
     @Override

diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneNametag.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneNametag.java
@@ -1,6 +1,6 @@
 package net.worldseed.multipart.model_bones.misc;
 
-import net.minestom.server.color.Color;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
@@ -30,7 +30,17 @@ public void removeGlowing() {
     }
 
     @Override
-    public void setGlowing(Color color) {
+    public void setGlowing(RGBLike color) {
+
+    }
+
+    @Override
+    public void removeGlowing(Player player) {
+
+    }
+
+    @Override
+    public void setGlowing(Player player, RGBLike color) {
 
     }
 

diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneSeat.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneSeat.java
@@ -1,6 +1,6 @@
 package net.worldseed.multipart.model_bones.misc;
 
-import net.minestom.server.color.Color;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
@@ -35,7 +35,17 @@ public void removeGlowing() {
     }
 
     @Override
-    public void setGlowing(Color color) {
+    public void setGlowing(RGBLike color) {
+
+    }
+
+    @Override
+    public void removeGlowing(Player player) {
+
+    }
+
+    @Override
+    public void setGlowing(Player player, RGBLike color) {
 
     }
 

diff --git a/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneVFX.java b/src/main/java/net/worldseed/multipart/model_bones/misc/ModelBoneVFX.java
@@ -1,6 +1,6 @@
 package net.worldseed.multipart.model_bones.misc;
 
-import net.minestom.server.color.Color;
+import net.kyori.adventure.util.RGBLike;
 import net.minestom.server.coordinate.Point;
 import net.minestom.server.coordinate.Pos;
 import net.minestom.server.coordinate.Vec;
@@ -106,8 +106,18 @@ public void removeGlowing() {
     }
 
     @Override
-    public void setGlowing(Color color) {
+    public void setGlowing(RGBLike color) {
         this.attached.forEach(model -> model.setGlowing(color));
     }
 
+    @Override
+    public void removeGlowing(Player player) {
+        this.attached.forEach(model -> model.removeGlowing(player));
+    }
+
+    @Override
+    public void setGlowing(Player player, RGBLike color) {
+        this.attached.forEach(model -> model.setGlowing(player, color));
+    }
+
 }
diff --git a/src/test/java/demo_models/bulbasaur/BulbasaurMob.java b/src/test/java/demo_models/bulbasaur/BulbasaurMob.java
@@ -115,10 +115,23 @@ public void remove() {
         this.animationHandler.playOnce("animation.bulbasaur.faint", (cb) -> {
             this.model.destroy();
             this.animationHandler.destroy();
-            ParticlePacket packet = new ParticlePacket(Particle.POOF, position.x(), position.y() + 1, position.z(), 1, 1, 1, 0, 50);
+
+            ParticlePacket packet = new ParticlePacket(
+                    Particle.POOF,
+                    false,
+                    this.position.x(),
+                    this.position.y() + 1,
+                    this.position.z(),
+                    1,
+                    1,
+                    1,
+                    0,
+                    50
+            );
             viewers.forEach(v -> v.sendPacket(packet));
 
             super.remove();
         });
     }
+
 }