add CorpseBuilder api

Author: denmeh

src/main/java/com/github/unldenis/corpse/api/CorpseAPI.java

@@ -20,7 +20,6 @@
 
 import com.github.unldenis.corpse.corpse.*;
 import com.github.unldenis.corpse.manager.*;
-import io.github.retrooper.packetevents.util.SpigotReflectionUtil;
 import org.apache.commons.lang.*;
 import org.bukkit.*;
 import org.bukkit.entity.*;
@@ -58,7 +57,7 @@ public static synchronized CorpseAPI getInstance() {
    */
   public Corpse spawnCorpse(@NotNull Player player) {
     Validate.notNull(player, "Player cannot be null");
-    return new Corpse(player);
+    return Corpse.fromPlayer(player).spawn();
   }
 
   /**
@@ -71,7 +70,7 @@ public Corpse spawnCorpse(@NotNull Player player) {
   public Corpse spawnCorpse(@NotNull Player player, @NotNull Location location) {
     Validate.notNull(player, "Player cannot be null");
     Validate.notNull(location, "Spawn location cannot be null");
-    return new Corpse(location, player, null);
+    return Corpse.fromPlayer(player).location(location).spawn();
   }
 
   /**
@@ -84,7 +83,7 @@ public Corpse spawnCorpse(@NotNull Player player, @NotNull Location location) {
   public Corpse spawnCorpse(@NotNull OfflinePlayer offlinePlayer, @NotNull Location location) {
     Validate.notNull(offlinePlayer, "OfflinePlayer cannot be null");
     Validate.notNull(location, "Spawn location cannot be null");
-    return new Corpse(location, offlinePlayer, null);
+    return Corpse.fromLocation(location).name(offlinePlayer.getName()).spawn();
   }
 
   /**
@@ -108,8 +107,7 @@ public Corpse spawnCorpse(
   ) {
     Validate.notNull(player, "Player cannot be null");
     Validate.notNull(location, "Spawn location cannot be null");
-    return new Corpse(location, SpigotReflectionUtil.getUserProfile(player),
-        new ItemStack[]{boots, leggings, chestPlate, helmet}, player.getName());
+    return Corpse.fromPlayer(player).location(location).armorContents(new ItemStack[]{boots, leggings, chestPlate, helmet}).spawn();
   }
 
   /**
@@ -133,8 +131,7 @@ public Corpse spawnCorpse(
   ) {
     Validate.notNull(offlinePlayer, "OfflinePlayer cannot be null");
     Validate.notNull(location, "Spawn location cannot be null");
-    return new Corpse(location, offlinePlayer,
-        new ItemStack[]{boots, leggings, chestPlate, helmet});
+    return Corpse.fromLocation(location).name(offlinePlayer.getName()).armorContents(new ItemStack[]{boots, leggings, chestPlate, helmet}).spawn();
   }
 
   /**

src/main/java/com/github/unldenis/corpse/command/RemoveCorpseCommand.java

@@ -25,7 +25,6 @@
 import org.bukkit.entity.*;
 import org.jetbrains.annotations.*;
 
-import java.util.concurrent.atomic.*;
 
 public class RemoveCorpseCommand implements CommandExecutor {
 

src/main/java/com/github/unldenis/corpse/command/SpawnCorpseCommand.java

@@ -35,15 +35,15 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd,
       Player player = (Player) sender;
       if (player.hasPermission("corpses.spawn")) {
         if (args.length == 0) {
-          new Corpse(player);
+          Corpse.fromPlayer(player).spawn();
           player.sendMessage(ChatColor.GREEN + "Corpse created");
           return true;
         } else if (args.length == 1) {
           OfflinePlayer target = Bukkit.getOfflinePlayer(args[0]);
           if (target.isOnline()) {
-            CorpseAPI.getInstance().spawnCorpse((Player) target, player.getLocation());
+            Corpse.fromPlayer((Player) target).location(player.getLocation()).spawn();
           } else {
-            new Corpse(player.getLocation(), target, null);
+            Corpse.fromLocation(player.getLocation()).name(target.getName()).spawn();
           }
           player.sendMessage(ChatColor.GREEN + "Corpse created");
           return true;

src/main/java/com/github/unldenis/corpse/corpse/Corpse.java

@@ -48,8 +48,31 @@
 import java.util.*;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+/**
+ * Corpse class that represents a dead body.
+ * To create a Corpse, use fromPlayer, fromLocation methods.
+ */
 public class Corpse {
 
+
+    /**
+     * Create a CorpseBuilder from a player.
+     * @param player The player to create the CorpseBuilder for.
+     * @return A CorpseBuilder object.
+     */
+    public static CorpseBuilder fromPlayer(@NotNull Player player) {
+        return new CorpseBuilder(player);
+    }
+
+    /**
+     * Create a CorpseBuilder from a location.
+     * @param location The location to create the CorpseBuilder for.
+     * @return A CorpseBuilder object.
+     */
+    public static CorpseBuilder fromLocation(@NotNull Location location) {
+        return new CorpseBuilder(location);
+    }
+
     protected final int id;
     protected final Location location;
     protected final UserProfile profile;
@@ -59,8 +82,7 @@ public class Corpse {
     private final CorpseNPC internalNPC;
     private final boolean hasArmor;
 
-    @ApiStatus.Internal
-    public Corpse(
+    Corpse(
             @NotNull Location location,
             @NotNull List<TextureProperty> textures,
             @Nullable ItemStack[] armorContents,
@@ -104,18 +126,6 @@ public Corpse(
 
     }
 
-    public Corpse(@NotNull Player player) {
-        this(player.getLocation(), SpigotReflectionUtil.getUserProfile(player), player.getInventory().getArmorContents(), player.getName());
-    }
-
-    public Corpse(
-            @NotNull Location location,
-            @NotNull OfflinePlayer offlinePlayer,
-            @Nullable ItemStack[] armorContents
-    ) {
-        this(location, new ArrayList<>(), armorContents, offlinePlayer.getName());
-    }
-
     @ApiStatus.Internal
     public void show(@NotNull Player player) {
         this.seeingPlayers.add(player);

src/main/java/com/github/unldenis/corpse/corpse/CorpseBuilder.java

@@ -0,0 +1,96 @@
+package com.github.unldenis.corpse.corpse;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+
+import com.github.retrooper.packetevents.protocol.player.TextureProperty;
+
+import io.github.retrooper.packetevents.util.SpigotReflectionUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.inventory.ItemStack;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Builder for creating a Corpse object.
+ */
+public class CorpseBuilder {
+    
+
+    private Location location;
+    private List<TextureProperty> textures = new ArrayList<>();
+    private ItemStack[] armorContents = null;
+    private String name = null;
+
+    /**
+     * Constructor for creating a CorpseBuilder with a player.
+     * @param player The player to create the CorpseBuilder for.
+     */
+    CorpseBuilder(@NotNull Player player) {
+        this.location = player.getLocation();
+        this.textures = SpigotReflectionUtil.getUserProfile(player);
+        this.armorContents = player.getInventory().getArmorContents();
+        this.name = player.getName();
+    }
+
+    /**
+     * Constructor for creating a CorpseBuilder with a location.
+     * @param location The location to create the CorpseBuilder for.
+     */
+    CorpseBuilder(@NotNull Location location) {
+        this.location = location;
+    }
+
+    /**
+     * Set the location of the corpse.
+     * @param location The location to set.
+     * @return The CorpseBuilder object.
+     */
+    public CorpseBuilder location(@NotNull Location location) {
+        this.location = location;
+        return this;
+    }
+
+    /**
+     * Set the textures of the corpse.
+     * @param textures The textures to set.
+     * @return The CorpseBuilder object.
+     */
+    public CorpseBuilder textures(@NotNull List<TextureProperty> textures) {
+        this.textures = textures;
+        return this;
+    }
+
+    /**
+     * Set the armor contents of the corpse.
+     * @param armorContents The armor contents to set.
+     * @return The CorpseBuilder object.
+     */
+    public CorpseBuilder armorContents(@NotNull ItemStack[] armorContents) {
+        this.armorContents = armorContents;
+        return this;
+    }
+
+    /**
+     * Set the name of the corpse.
+     * @param name The name to set.
+     * @return The CorpseBuilder object.
+     */
+    public CorpseBuilder name(@NotNull String name) {
+        this.name = name;
+        return this;
+    }
+
+
+    /**
+     * Spawn the corpse.
+     * @return A Corpse object.
+     */
+    public Corpse spawn() {
+        return new Corpse(location, textures, armorContents, name);
+    }
+
+
+}

src/main/java/com/github/unldenis/corpse/manager/CorpsePool.java

@@ -218,7 +218,7 @@ public void handleDeath(PlayerDeathEvent event) {
         new LootableCorpse(player.getLocation(), player, drops);
 
       } else {
-        new Corpse(player);
+        Corpse.fromPlayer(player).spawn();
       }
     }