some fixes and changes

Tofaa2 · Jan 6, 2024 · 1cb1e46 · 1cb1e46
1 parent 2517a5d
commit 1cb1e46
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 215 deletions.
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/src/main/java/me/tofaa/entitylib/meta/EntityMeta.java b/src/main/java/me/tofaa/entitylib/meta/EntityMeta.java
@@ -81,7 +81,7 @@ public Component getCustomName() {
     }
 
     public void setCustomName(Component value) {
-        this.metadata.setIndex(offset(OFFSET, 2), EntityDataTypes.COMPONENT, GsonComponentSerializer.gson().serialize(value));
+        this.metadata.setIndex(offset(OFFSET, 2), EntityDataTypes.ADV_COMPONENT, value);
     }
 
     public boolean isCustomNameVisible() {

diff --git a/test-plugin/src/main/java/me/tofaa/entitylib/TestEntityCommand.java b/test-plugin/src/main/java/me/tofaa/entitylib/TestEntityCommand.java
@@ -1,22 +1,18 @@
 package me.tofaa.entitylib;
 
 import com.github.retrooper.packetevents.protocol.entity.type.EntityTypes;
-import com.github.retrooper.packetevents.protocol.world.Location;
 import io.github.retrooper.packetevents.util.SpigotConversionUtil;
-import me.tofaa.entitylib.entity.WrapperEntity;
+import me.tofaa.entitylib.entity.WrapperEntityEquipment;
 import me.tofaa.entitylib.entity.WrapperLivingEntity;
 import me.tofaa.entitylib.meta.EntityMeta;
-import me.tofaa.entitylib.meta.other.ArmorStandMeta;
 import net.kyori.adventure.text.Component;
-import org.bukkit.Material;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Collections;
 import java.util.UUID;
 
 public class TestEntityCommand implements CommandExecutor {
@@ -36,22 +32,29 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
             entity.addViewer(player.getUniqueId());
             entity.spawn(SpigotConversionUtil.fromBukkitLocation(player.getLocation()));
         }
-        ItemStack held = player.getInventory().getItemInMainHand();
-        if (!held.getType().isAir()) {
-            entity.getEquipment().setBoots(SpigotConversionUtil.fromBukkitItemStack(held));
-        }
+        equipItems(player);
         EntityMeta meta = entity.getMeta();
-        meta.setOnFire(!meta.isOnFire());
-        meta.setHasGlowingEffect(!meta.hasGlowingEffect());
 
         meta.setCustomNameVisible(!meta.isCustomNameVisible());
         meta.setCustomName(Component.text("test"));
 
-        player.sendMessage("on fire: " + meta.isOnFire());
-        player.sendMessage("glowing: " + meta.hasGlowingEffect());
-
         entity.refresh();
         return false;
     }
 
+    private void equipItems(Player player) {
+        ItemStack held = player.getInventory().getItemInMainHand();
+        ItemStack helmet = player.getInventory().getHelmet();
+        ItemStack chestplate = player.getInventory().getChestplate();
+        ItemStack leggings = player.getInventory().getLeggings();
+        ItemStack boots = player.getInventory().getBoots();
+        WrapperEntityEquipment equipment = entity.getEquipment();
+
+        if (helmet != null && !helmet.getType().isAir()) equipment.setHelmet(SpigotConversionUtil.fromBukkitItemStack(helmet));
+        if (chestplate != null && !chestplate.getType().isAir()) equipment.setChestplate(SpigotConversionUtil.fromBukkitItemStack(chestplate));
+        if (leggings != null && !leggings.getType().isAir()) equipment.setLeggings(SpigotConversionUtil.fromBukkitItemStack(leggings));
+        if (boots != null && !boots.getType().isAir()) equipment.setBoots(SpigotConversionUtil.fromBukkitItemStack(boots));
+        if (!held.getType().isAir()) equipment.setMainHand(SpigotConversionUtil.fromBukkitItemStack(held));
+    }
+
 }