From 1d16abdacf29f9e9041418142d5cd531153ce878 Mon Sep 17 00:00:00 2001
From: OmeWillem <cryptoaafje@gmail.com>
Date: Fri, 5 Jul 2024 18:17:26 +0200
Subject: [PATCH] Added colors, added a bundle packet, added authors and
 removed practically all annoying debug messages

---
 .../common/packet/BundlePacket.java           |  20 ++
 .../common/packet/CustomEntityDataPacket.java |   4 +
 .../geyserutils/geyser/GeyserUtils.java       | 331 ++++++++++--------
 .../JavaAddEntityTranslatorReplace.java       |   4 +-
 geyser/src/main/resources/extension.yml       |   2 +-
 .../geyserutils/spigot/api/PlayerUtils.java   |  51 ++-
 spigot/src/main/resources/plugin.yml          |   3 +
 7 files changed, 257 insertions(+), 158 deletions(-)
 create mode 100644 common/src/main/java/me/zimzaza4/geyserutils/common/packet/BundlePacket.java

diff --git a/common/src/main/java/me/zimzaza4/geyserutils/common/packet/BundlePacket.java b/common/src/main/java/me/zimzaza4/geyserutils/common/packet/BundlePacket.java
new file mode 100644
index 0000000..a9eae80
--- /dev/null
+++ b/common/src/main/java/me/zimzaza4/geyserutils/common/packet/BundlePacket.java
@@ -0,0 +1,20 @@
+package me.zimzaza4.geyserutils.common.packet;
+
+import lombok.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class BundlePacket extends CustomPayloadPacket {
+
+    private List<CustomPayloadPacket> packets = new ArrayList<>();
+
+    public void addPacket(CustomPayloadPacket packet) {
+        this.packets.add(packet);
+    }
+
+}
diff --git a/common/src/main/java/me/zimzaza4/geyserutils/common/packet/CustomEntityDataPacket.java b/common/src/main/java/me/zimzaza4/geyserutils/common/packet/CustomEntityDataPacket.java
index 0454b66..9774f8a 100644
--- a/common/src/main/java/me/zimzaza4/geyserutils/common/packet/CustomEntityDataPacket.java
+++ b/common/src/main/java/me/zimzaza4/geyserutils/common/packet/CustomEntityDataPacket.java
@@ -5,6 +5,8 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 
+import java.awt.*;
+
 @AllArgsConstructor
 @NoArgsConstructor
 @Getter
@@ -17,4 +19,6 @@ public class CustomEntityDataPacket extends CustomPayloadPacket {
 
     private Float scale;
 
+    private Integer color;
+
 }
diff --git a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java
index d4297f9..baf507d 100644
--- a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java
+++ b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/GeyserUtils.java
@@ -23,6 +23,7 @@ import me.zimzaza4.geyserutils.geyser.scoreboard.EntityScoreboard;
 import me.zimzaza4.geyserutils.geyser.translator.NPCFormResponseTranslator;
 import me.zimzaza4.geyserutils.geyser.util.Converter;
 import me.zimzaza4.geyserutils.geyser.util.ReflectionUtils;
+import net.kyori.adventure.text.format.TextColor;
 import org.cloudburstmc.math.vector.Vector3f;
 import org.cloudburstmc.nbt.NbtMap;
 import org.cloudburstmc.nbt.NbtType;
@@ -65,6 +66,7 @@ import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.level.Clien
 import org.jetbrains.annotations.NotNull;
 
 import javax.imageio.ImageIO;
+import java.awt.*;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileReader;
@@ -72,6 +74,7 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.*;
 
 public class GeyserUtils implements Extension {
@@ -322,156 +325,7 @@ public class GeyserUtils implements Extension {
                    if (packet instanceof ClientboundCustomPayloadPacket payloadPacket) {
                        if (ReflectionUtils.getChannel(payloadPacket).toString().equals(GeyserUtilsChannels.MAIN)) {
                            CustomPayloadPacket customPacket = packetManager.decodePacket(payloadPacket.getData());
-                           if (customPacket instanceof CameraShakeCustomPayloadPacket cameraShakePacket) {
-                               session.camera().shakeCamera(cameraShakePacket.getIntensity(), cameraShakePacket.getDuration(), CameraShake.values()[cameraShakePacket.getType()]);
-                           } else if (customPacket instanceof NpcDialogueFormDataCustomPayloadPacket formData) {
-
-                               if (formData.action().equals("CLOSE")) {
-                                   NpcDialogueForm openForm = NpcDialogueForms.getOpenNpcDialogueForms(session);
-                                   if (openForm != null) {
-                                       openForm.close(session);
-                                   }
-                                   return;
-                               }
-
-                               NpcDialogueForm form = new NpcDialogueForm();
-                               form.title(formData.title())
-                                       .dialogue(formData.dialogue())
-                                       .bindEntity(session.getEntityCache().getEntityByJavaId(formData.bindEntity()))
-                                       .hasNextForm(formData.hasNextForm());
-
-                               if (formData.skinData() != null) {
-                                   form.skinData(formData.skinData());
-                               }
-
-
-                               List<Button> buttons = new ArrayList<>();
-
-                               if (formData.buttons() != null) {
-
-                                   int i = 0;
-                                   for (NpcDialogueButton button : formData.buttons()) {
-
-
-                                       int finalI = i;
-                                       buttons.add(new Button(button.text(), button.commands(),
-                                               button.mode(), () -> {
-                                           if (button.mode() == NpcDialogueButton.ButtonMode.BUTTON_MODE) {
-                                               session.sendDownstreamPacket(ReflectionUtils.buildServerboundPayloadPacket(GeyserUtilsChannels.MAIN, packetManager.encodePacket(new NpcFormResponseCustomPayloadPacket(formData.formId(), finalI))));
-                                           }
-                                       }, button.hasNextForm()));
-                                       i++;
-                                   }
-                               }
-
-                               form.closeHandler(() -> session.sendDownstreamPacket(ReflectionUtils.buildServerboundPayloadPacket(GeyserUtilsChannels.MAIN, packetManager.encodePacket(new NpcFormResponseCustomPayloadPacket(formData.formId(), -1)))));
-                               form.buttons(buttons);
-
-                               form.createAndSend(session);
-
-                           } else if (customPacket instanceof AnimateEntityCustomPayloadPacket animateEntityCustomPayloadPacket) {
-                               AnimateEntityPacket animateEntityPacket = getAnimateEntityPacket(animateEntityCustomPayloadPacket);
-                               for (int id : animateEntityCustomPayloadPacket.getEntityJavaIds()) {
-                                   Entity entity = session.getEntityCache().getEntityByJavaId(id);
-                                   if (entity != null) {
-                                       try {
-                                           // because of shaded jar
-                                           Object object = AnimateEntityPacket.class.getMethod("getRuntimeEntityIds").invoke(animateEntityPacket);
-                                           object.getClass().getMethod("add", Long.class).invoke(object, entity.getGeyserId());
-
-                                       } catch (Exception e) {
-                                           e.printStackTrace();
-                                       }
-                                   }
-                               }
-                               session.sendUpstreamPacket(animateEntityPacket);
-                           } else if (customPacket instanceof CameraInstructionCustomPayloadPacket cameraInstructionPacket) {
-                               if (cameraInstructionPacket.getInstruction() instanceof SetInstruction instruction) {
-                                   session.camera().sendCameraPosition(Converter.serializeSetInstruction(instruction));
-                                   session.getCameraData().forceCameraPerspective(Converter.serializeCameraPerspective(instruction.getPreset()));
-
-                               } else if (cameraInstructionPacket.getInstruction() instanceof FadeInstruction instruction) {
-                                   session.camera().sendCameraFade(Converter.serializeFadeInstruction(instruction));
-                               } else if (cameraInstructionPacket.getInstruction() instanceof ClearInstruction) {
-                                   session.camera().clearCameraInstructions();
-                               }
-
-                           } else if (customPacket instanceof CustomParticleEffectPayloadPacket customParticleEffectPacket) {
-                               SpawnParticleEffectPacket spawnParticleEffectPacket = new SpawnParticleEffectPacket();
-                               spawnParticleEffectPacket.setDimensionId(DimensionUtils.javaToBedrock(session.getDimension()));
-                               spawnParticleEffectPacket.setPosition(Converter.serializePos(customParticleEffectPacket.getPos()));
-                               spawnParticleEffectPacket.setIdentifier(customParticleEffectPacket.getParticle().identifier());
-                               spawnParticleEffectPacket.setMolangVariablesJson(Optional.ofNullable(customParticleEffectPacket.getParticle().molangVariablesJson()));
-                               session.sendUpstreamPacket(spawnParticleEffectPacket);
-                           } else if (customPacket instanceof CustomSkinPayloadPacket customSkinPayloadPacket) {
-                               if (session.getEntityCache().getEntityByJavaId(customSkinPayloadPacket.getEntityId()) instanceof PlayerEntity player) {
-                                   SkinData data = LOADED_SKIN_DATA.get(customSkinPayloadPacket.getSkinId());
-                                   if (data != null) {
-                                       sendSkinPacket(session, player, data);
-                                   }
-                               }
-
-                           } else if (customPacket instanceof CustomEntityDataPacket customEntityDataPacket) {
-                               Entity entity = (session.getEntityCache().getEntityByJavaId(customEntityDataPacket.getEntityId()));
-                               if (entity != null) {
-                                   if (customEntityDataPacket.getHeight() != null) entity.setBoundingBoxHeight(customEntityDataPacket.getHeight());
-                                   if (customEntityDataPacket.getWidth() != null) entity.setBoundingBoxWidth(customEntityDataPacket.getWidth());
-                                   if (customEntityDataPacket.getScale() != null) entity.getDirtyMetadata().put(EntityDataTypes.SCALE, customEntityDataPacket.getScale());
-                                   entity.updateBedrockMetadata();
-                               }
-                           } else if (customPacket instanceof EntityPropertyPacket entityPropertyPacket) {
-                               Entity entity = (session.getEntityCache().getEntityByJavaId(entityPropertyPacket.getEntityId()));
-                               if (entity != null) {
-                                   if (entityPropertyPacket.getIdentifier() == null
-                                           || entityPropertyPacket.getValue() == null) return;
-
-                                   String def = CUSTOM_ENTITIES.get(session).getIfPresent(entity.getEntityId());
-                                   if (def == null) return;
-
-                                   if (!containsProperty(def, entityPropertyPacket.getIdentifier())) {
-                                       addProperty(def, entityPropertyPacket.getIdentifier(), entityPropertyPacket.getValue().getClass());
-
-                                       registerProperties(def);
-                                   }
-
-                                   if (entity.getPropertyManager() == null) return;
-                                   entity.getPropertyManager().add(entityPropertyPacket.getIdentifier(),
-                                           (Boolean) entityPropertyPacket.getValue());
-
-                                   entity.updateBedrockEntityProperties();
-                               }
-                           } else if (customPacket instanceof EntityPropertyRegisterPacket entityPropertyRegisterPacket) {
-                               if (entityPropertyRegisterPacket.getIdentifier() == null
-                                       || entityPropertyRegisterPacket.getType() == null) return;
-
-                               Entity entity = (session.getEntityCache().getEntityByJavaId(entityPropertyRegisterPacket.getEntityId()));
-                               if (entity != null) {
-                                   String def = CUSTOM_ENTITIES.get(session).getIfPresent(entity.getEntityId());
-                                   if (def == null) return;
-
-                                   if (!containsProperty(def, entityPropertyRegisterPacket.getIdentifier())) {
-                                       addProperty(def, entityPropertyRegisterPacket.getIdentifier(), entityPropertyRegisterPacket.getType());
-
-                                       registerProperties(def);
-                                       logger().info("Defined property: " + entityPropertyRegisterPacket.getIdentifier() + " in registry.");
-                                   }
-                               }
-
-
-                           } else if (customPacket instanceof CustomEntityPacket customEntityPacket) {
-                               if (!LOADED_ENTITY_DEFINITIONS.containsKey(customEntityPacket.getIdentifier())) {
-                                   return;
-                               }
-
-                               Cache<Integer, String> cache = CUSTOM_ENTITIES.get(session);
-                               cache.put(customEntityPacket.getEntityId(), customEntityPacket.getIdentifier());
-                           } else if (customPacket instanceof UpdateEntityScorePacket updateEntityScorePacket) {
-                               EntityScoreboard scoreboard = scoreboards.computeIfAbsent(session, k -> new EntityScoreboard(session));
-                               Entity entity = (session.getEntityCache().getEntityByJavaId(updateEntityScorePacket.getEntityId()));
-                               if (entity != null) {
-                                   scoreboard.updateScore(updateEntityScorePacket.getObjective(), entity.getGeyserId(), updateEntityScorePacket.getScore());
-                               }
-                           }
+                           handleCustomPacket(session, customPacket);
                        }
                    } else if (packet instanceof ClientboundLevelParticlesPacket particlesPacket) {
                        if (particlesPacket.getParticle().getData() instanceof ItemParticleData data) {
@@ -505,9 +359,6 @@ public class GeyserUtils implements Extension {
                                        }
                                    }
                                    session.sendUpstreamPacket(stringPacket);
-
-
-
                                }
                            }
                        }
@@ -519,6 +370,155 @@ public class GeyserUtils implements Extension {
        }, 80, TimeUnit.MILLISECONDS);
     }
 
+    private void handleCustomPacket(GeyserSession session, CustomPayloadPacket customPacket) {
+        if (customPacket instanceof BundlePacket bundlePacket) {
+            bundlePacket.getPackets().forEach(p -> handleCustomPacket(session, p));
+        }
+
+        else if (customPacket instanceof CameraShakeCustomPayloadPacket cameraShakePacket) {
+            session.camera().shakeCamera(cameraShakePacket.getIntensity(), cameraShakePacket.getDuration(), CameraShake.values()[cameraShakePacket.getType()]);
+        } else if (customPacket instanceof NpcDialogueFormDataCustomPayloadPacket formData) {
+
+            if (formData.action().equals("CLOSE")) {
+                NpcDialogueForm openForm = NpcDialogueForms.getOpenNpcDialogueForms(session);
+                if (openForm != null) {
+                    openForm.close(session);
+                }
+                return;
+            }
+
+            NpcDialogueForm form = new NpcDialogueForm();
+            form.title(formData.title())
+                    .dialogue(formData.dialogue())
+                    .bindEntity(session.getEntityCache().getEntityByJavaId(formData.bindEntity()))
+                    .hasNextForm(formData.hasNextForm());
+
+            if (formData.skinData() != null) {
+                form.skinData(formData.skinData());
+            }
+
+
+            List<Button> buttons = new ArrayList<>();
+
+            if (formData.buttons() != null) {
+
+                int i = 0;
+                for (NpcDialogueButton button : formData.buttons()) {
+
+
+                    int finalI = i;
+                    buttons.add(new Button(button.text(), button.commands(),
+                            button.mode(), () -> {
+                        if (button.mode() == NpcDialogueButton.ButtonMode.BUTTON_MODE) {
+                            session.sendDownstreamPacket(ReflectionUtils.buildServerboundPayloadPacket(GeyserUtilsChannels.MAIN, packetManager.encodePacket(new NpcFormResponseCustomPayloadPacket(formData.formId(), finalI))));
+                        }
+                    }, button.hasNextForm()));
+                    i++;
+                }
+            }
+
+            form.closeHandler(() -> session.sendDownstreamPacket(ReflectionUtils.buildServerboundPayloadPacket(GeyserUtilsChannels.MAIN, packetManager.encodePacket(new NpcFormResponseCustomPayloadPacket(formData.formId(), -1)))));
+            form.buttons(buttons);
+
+            form.createAndSend(session);
+
+        } else if (customPacket instanceof AnimateEntityCustomPayloadPacket animateEntityCustomPayloadPacket) {
+            AnimateEntityPacket animateEntityPacket = getAnimateEntityPacket(animateEntityCustomPayloadPacket);
+            for (int id : animateEntityCustomPayloadPacket.getEntityJavaIds()) {
+                Entity entity = session.getEntityCache().getEntityByJavaId(id);
+                if (entity != null) {
+                    try {
+                        // because of shaded jar
+                        Object object = AnimateEntityPacket.class.getMethod("getRuntimeEntityIds").invoke(animateEntityPacket);
+                        object.getClass().getMethod("add", Long.class).invoke(object, entity.getGeyserId());
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+            session.sendUpstreamPacket(animateEntityPacket);
+        } else if (customPacket instanceof CameraInstructionCustomPayloadPacket cameraInstructionPacket) {
+            if (cameraInstructionPacket.getInstruction() instanceof SetInstruction instruction) {
+                session.camera().sendCameraPosition(Converter.serializeSetInstruction(instruction));
+                session.getCameraData().forceCameraPerspective(Converter.serializeCameraPerspective(instruction.getPreset()));
+
+            } else if (cameraInstructionPacket.getInstruction() instanceof FadeInstruction instruction) {
+                session.camera().sendCameraFade(Converter.serializeFadeInstruction(instruction));
+            } else if (cameraInstructionPacket.getInstruction() instanceof ClearInstruction) {
+                session.camera().clearCameraInstructions();
+            }
+
+        } else if (customPacket instanceof CustomParticleEffectPayloadPacket customParticleEffectPacket) {
+            SpawnParticleEffectPacket spawnParticleEffectPacket = new SpawnParticleEffectPacket();
+            spawnParticleEffectPacket.setDimensionId(DimensionUtils.javaToBedrock(session.getDimension()));
+            spawnParticleEffectPacket.setPosition(Converter.serializePos(customParticleEffectPacket.getPos()));
+            spawnParticleEffectPacket.setIdentifier(customParticleEffectPacket.getParticle().identifier());
+            spawnParticleEffectPacket.setMolangVariablesJson(Optional.ofNullable(customParticleEffectPacket.getParticle().molangVariablesJson()));
+            session.sendUpstreamPacket(spawnParticleEffectPacket);
+        } else if (customPacket instanceof CustomSkinPayloadPacket customSkinPayloadPacket) {
+            if (session.getEntityCache().getEntityByJavaId(customSkinPayloadPacket.getEntityId()) instanceof PlayerEntity player) {
+                SkinData data = LOADED_SKIN_DATA.get(customSkinPayloadPacket.getSkinId());
+                if (data != null) {
+                    sendSkinPacket(session, player, data);
+                }
+            }
+
+        } else if (customPacket instanceof CustomEntityDataPacket customEntityDataPacket) {
+            Entity entity = session.getEntityCache().getEntityByJavaId(customEntityDataPacket.getEntityId());
+            if (entity != null) {
+                if (customEntityDataPacket.getHeight() != null) entity.setBoundingBoxHeight(customEntityDataPacket.getHeight());
+                if (customEntityDataPacket.getWidth() != null) entity.setBoundingBoxWidth(customEntityDataPacket.getWidth());
+                if (customEntityDataPacket.getScale() != null) entity.getDirtyMetadata().put(EntityDataTypes.SCALE, customEntityDataPacket.getScale());
+                if (customEntityDataPacket.getColor() != null)
+                    entity.getDirtyMetadata().put(EntityDataTypes.COLOR, Byte.parseByte(String.valueOf(getColor(customEntityDataPacket.getColor()))));
+                entity.updateBedrockMetadata();
+            }
+        } else if (customPacket instanceof EntityPropertyPacket entityPropertyPacket) {
+            Entity entity = session.getEntityCache().getEntityByJavaId(entityPropertyPacket.getEntityId());
+            if (entity != null) {
+                if (entityPropertyPacket.getIdentifier() == null
+                        || entityPropertyPacket.getValue() == null) return;
+
+                if (entity.getPropertyManager() == null) return;
+                entity.getPropertyManager().add(entityPropertyPacket.getIdentifier(),
+                        (Boolean) entityPropertyPacket.getValue());
+
+                entity.updateBedrockEntityProperties();
+            }
+        } else if (customPacket instanceof EntityPropertyRegisterPacket entityPropertyRegisterPacket) {
+            if (entityPropertyRegisterPacket.getIdentifier() == null
+                    || entityPropertyRegisterPacket.getType() == null) return;
+
+            Entity entity = (session.getEntityCache().getEntityByJavaId(entityPropertyRegisterPacket.getEntityId()));
+            if (entity != null) {
+                String def = CUSTOM_ENTITIES.get(session).getIfPresent(entity.getEntityId());
+                if (def == null) return;
+
+                if (!containsProperty(def, entityPropertyRegisterPacket.getIdentifier())) {
+                    addProperty(def, entityPropertyRegisterPacket.getIdentifier(), entityPropertyRegisterPacket.getType());
+
+                    registerProperties(def);
+                    logger().info("DEF PROPERTIES: " + entityPropertyRegisterPacket.getIdentifier());
+                }
+            }
+
+
+        } else if (customPacket instanceof CustomEntityPacket customEntityPacket) {
+            if (!LOADED_ENTITY_DEFINITIONS.containsKey(customEntityPacket.getIdentifier())) {
+                return;
+            }
+
+            Cache<Integer, String> cache = CUSTOM_ENTITIES.get(session);
+            cache.put(customEntityPacket.getEntityId(), customEntityPacket.getIdentifier());
+        } else if (customPacket instanceof UpdateEntityScorePacket updateEntityScorePacket) {
+            EntityScoreboard scoreboard = scoreboards.computeIfAbsent(session, k -> new EntityScoreboard(session));
+            Entity entity = (session.getEntityCache().getEntityByJavaId(updateEntityScorePacket.getEntityId()));
+            if (entity != null) {
+                scoreboard.updateScore(updateEntityScorePacket.getObjective(), entity.getGeyserId(), updateEntityScorePacket.getScore());
+            }
+        }
+    }
 
     @NotNull
     private static AnimateEntityPacket getAnimateEntityPacket(AnimateEntityCustomPayloadPacket animateEntityCustomPayloadPacket) {
@@ -608,5 +608,30 @@ public class GeyserUtils implements Extension {
         return EMPTY_CAPE;
     }
 
+    private static int getColor(int argb) {
+        TextColor color = TextColor.color(argb);
+        List<TextColor> colors = Arrays.asList(
+                TextColor.color(255, 255, 255),     // 0: White
+                TextColor.color(255, 170, 0),       // 1: Orange -> Gold
+                TextColor.color(255, 85, 255),      // 2: Magenta -> Light Purple
+                TextColor.color(85, 85, 255),       // 3: Light Blue -> Blue
+                TextColor.color(255, 255, 85),      // 4: Yellow
+                TextColor.color(85, 255, 85),       // 5: Lime -> Green
+                TextColor.color(255, 85, 85),       // 6: Pink -> Red
+                TextColor.color(170, 170, 170),     // 7: Gray
+                TextColor.color(85, 85, 85),        // 8: Light Gray -> Dark Gray
+                TextColor.color(85, 255, 255),      // 9: Cyan -> Aqua
+                TextColor.color(0, 170, 0),           // 10: Green > Dark Green
+                TextColor.color(0, 0, 170),         // 11: Blue -> Dark Blue
+                TextColor.color(170, 0, 170),       // 12: Purple -> Dark Purple
+                TextColor.color(0, 170, 0),         // 13: Green -> Dark Green
+                TextColor.color(170, 0, 0),         // 14: Red -> Dark Red
+                TextColor.color(0, 0, 0)            // 15: Black
+
+        );
+
+        return colors.indexOf(TextColor.nearestColorTo(colors, color));
+    }
+
 }
 
diff --git a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/replace/JavaAddEntityTranslatorReplace.java b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/replace/JavaAddEntityTranslatorReplace.java
index 1845da3..91535d0 100644
--- a/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/replace/JavaAddEntityTranslatorReplace.java
+++ b/geyser/src/main/java/me/zimzaza4/geyserutils/geyser/replace/JavaAddEntityTranslatorReplace.java
@@ -25,6 +25,7 @@
 
 package me.zimzaza4.geyserutils.geyser.replace;
 
+import me.zimzaza4.geyserutils.geyser.GeyserUtils;
 import org.geysermc.geyser.entity.properties.GeyserEntityPropertyManager;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.Pose;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
@@ -130,10 +131,7 @@ public class JavaAddEntityTranslatorReplace extends PacketTranslator<Clientbound
 
         String def = CUSTOM_ENTITIES.get(session).getIfPresent(entity.getEntityId());
         if (def != null) {
-            System.out.println("CUSTOM ENTITY :" + entity.getEntityId() + " | " + def);
-
             EntityDefinition newDef = LOADED_ENTITY_DEFINITIONS.getOrDefault(def, entity.getDefinition());
-            System.out.println("CUSTOM DEF : " + newDef);
             entity.setDefinition(newDef);
 
             // reinstantiate the entity object to create the propertymanager.
diff --git a/geyser/src/main/resources/extension.yml b/geyser/src/main/resources/extension.yml
index 19fca22..32a85c1 100644
--- a/geyser/src/main/resources/extension.yml
+++ b/geyser/src/main/resources/extension.yml
@@ -3,4 +3,4 @@ id: geyserutils
 main: me.zimzaza4.geyserutils.geyser.GeyserUtils
 api: 1.0.0
 version: 1.0.0
-authors: [zimzaza4]
\ No newline at end of file
+authors: [zimzaza4, willem.dev]
\ No newline at end of file
diff --git a/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/api/PlayerUtils.java b/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/api/PlayerUtils.java
index 97f0b7e..d82a966 100644
--- a/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/api/PlayerUtils.java
+++ b/spigot/src/main/java/me/zimzaza4/geyserutils/spigot/api/PlayerUtils.java
@@ -12,8 +12,10 @@ import org.bukkit.Location;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class PlayerUtils {
 
@@ -78,6 +80,14 @@ public class PlayerUtils {
 
     }
 
+    public static void sendCustomColor(Player player, Entity entity, Color color) {
+        CustomEntityDataPacket packet = new CustomEntityDataPacket();
+        packet.setEntityId(entity.getEntityId());
+        packet.setColor(color.getRGB());
+        player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
+
+    }
+
     public static void setCustomEntity(Player player, int entityId, String def) {
         CustomEntityPacket packet = new CustomEntityPacket(entityId, def);
         player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
@@ -90,7 +100,7 @@ public class PlayerUtils {
 
     }
 
-    // (yes I'm aware it's "horrible" code, I'm just matching the energy of this plugin), also this aint player packets at all lmao
+    // (yes I'm aware it's "horrible" code), also this aint player packets at all lmao
 
     public static void registerProperty(Player player, Entity entity, String identifier, Class<?> type) {
         EntityPropertyRegisterPacket packet = new EntityPropertyRegisterPacket();
@@ -108,6 +118,19 @@ public class PlayerUtils {
         player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
     }
 
+    public static void sendBoolProperties(Player player, Entity entity, Map<String, Boolean> bundle) {
+        BundlePacket packet = new BundlePacket();
+        bundle.forEach((identifier, value) -> {
+            EntityPropertyPacket<Boolean> propertyPacket = new EntityPropertyPacket<>();
+            propertyPacket.setEntityId(entity.getEntityId());
+            propertyPacket.setIdentifier(identifier);
+            propertyPacket.setValue(value);
+            packet.addPacket(propertyPacket);
+        });
+
+        player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
+    }
+
     public static void sendFloatProperty(Player player, Entity entity, String identifier, Float value) {
         EntityPropertyPacket<Float> packet = new EntityPropertyPacket<>();
         packet.setEntityId(entity.getEntityId());
@@ -116,6 +139,19 @@ public class PlayerUtils {
         player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
     }
 
+    public static void sendFloatProperties(Player player, Entity entity, Map<String, Float> bundle) {
+        BundlePacket packet = new BundlePacket();
+        bundle.forEach((identifier, value) -> {
+            EntityPropertyPacket<Float> propertyPacket = new EntityPropertyPacket<>();
+            propertyPacket.setEntityId(entity.getEntityId());
+            propertyPacket.setIdentifier(identifier);
+            propertyPacket.setValue(value);
+            packet.addPacket(propertyPacket);
+        });
+
+        player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
+    }
+
     public static void sendIntProperty(Player player, Entity entity, String identifier, Integer value) {
         EntityPropertyPacket<Integer> packet = new EntityPropertyPacket<>();
         packet.setEntityId(entity.getEntityId());
@@ -123,4 +159,17 @@ public class PlayerUtils {
         packet.setValue(value);
         player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
     }
+
+    public static void sendIntProperties(Player player, Entity entity, Map<String, Integer> bundle) {
+        BundlePacket packet = new BundlePacket();
+        bundle.forEach((identifier, value) -> {
+            EntityPropertyPacket<Integer> propertyPacket = new EntityPropertyPacket<>();
+            propertyPacket.setEntityId(entity.getEntityId());
+            propertyPacket.setIdentifier(identifier);
+            propertyPacket.setValue(value);
+            packet.addPacket(propertyPacket);
+        });
+
+        player.sendPluginMessage(GeyserUtils.getInstance(), GeyserUtilsChannels.MAIN, GeyserUtils.getPacketManager().encodePacket(packet));
+    }
 }
diff --git a/spigot/src/main/resources/plugin.yml b/spigot/src/main/resources/plugin.yml
index 2e43845..0810ea5 100644
--- a/spigot/src/main/resources/plugin.yml
+++ b/spigot/src/main/resources/plugin.yml
@@ -1,3 +1,6 @@
 name: GeyserUtils
 version: '${project.version}'
 main: me.zimzaza4.geyserutils.spigot.GeyserUtils
+authors:
+  - zimzaza4
+  - willem.dev
\ No newline at end of file