Remove Human in favor of Mannequin

Author: Yeregorix

src/main/java/org/spongepowered/api/entity/EntityTypes.java

@@ -38,7 +38,6 @@
 import org.spongepowered.api.entity.living.Allay;
 import org.spongepowered.api.entity.living.ArmorStand;
 import org.spongepowered.api.entity.living.Bat;
-import org.spongepowered.api.entity.living.Human;
 import org.spongepowered.api.entity.living.animal.Armadillo;
 import org.spongepowered.api.entity.living.animal.Axolotl;
 import org.spongepowered.api.entity.living.animal.Bee;
@@ -302,8 +301,6 @@ public final class EntityTypes {
 
     public static final DefaultedRegistryReference<EntityType<Horse>> HORSE = EntityTypes.key(ResourceKey.minecraft("horse"));
 
-    public static final DefaultedRegistryReference<EntityType<Human>> HUMAN = EntityTypes.key(ResourceKey.sponge("human"));
-
     public static final DefaultedRegistryReference<EntityType<Husk>> HUSK = EntityTypes.key(ResourceKey.minecraft("husk"));
 
     public static final DefaultedRegistryReference<EntityType<Illusioner>> ILLUSIONER = EntityTypes.key(ResourceKey.minecraft("illusioner"));

src/main/java/org/spongepowered/api/entity/Mannequin.java

@@ -24,19 +24,7 @@
  */
 package org.spongepowered.api.entity;
 
-import org.spongepowered.api.data.Keys;
-import org.spongepowered.api.data.type.HandPreference;
-import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.living.Living;
+import org.spongepowered.api.entity.living.Humanoid;
 
-public interface Mannequin extends Living {
-
-    /**
-     * {@link Keys#DOMINANT_HAND}
-     *
-     * @return The dominant HandPreference of the player
-     */
-    default Value.Mutable<HandPreference> dominantHand() {
-        return this.requireValue(Keys.DOMINANT_HAND).asMutable();
-    }
+public interface Mannequin extends Humanoid {
 }

src/main/java/org/spongepowered/api/entity/living/Human.java

@@ -25,16 +25,26 @@
 package org.spongepowered.api.entity.living;
 
 import org.spongepowered.api.data.Keys;
+import org.spongepowered.api.data.type.HandPreference;
 import org.spongepowered.api.data.value.Value;
-import org.spongepowered.api.entity.Tamer;
+import org.spongepowered.api.entity.Mannequin;
 import org.spongepowered.api.entity.living.player.Player;
 import org.spongepowered.api.item.inventory.ArmorEquipable;
 import org.spongepowered.api.profile.property.ProfileProperty;
 
 /**
- * Represents a human-like entity in game, such as {@link Player} or {@link Human}s.
+ * Represents a human-like entity in game, such as {@link Player} or {@link Mannequin}s.
  */
-public interface Humanoid extends Living, ArmorEquipable, Tamer {
+public interface Humanoid extends Living, ArmorEquipable {
+
+    /**
+     * {@link Keys#DOMINANT_HAND}
+     *
+     * @return The dominant HandPreference of the humanoid
+     */
+    default Value.Mutable<HandPreference> dominantHand() {
+        return this.requireValue(Keys.DOMINANT_HAND).asMutable();
+    }
 
     /**
      * {@link Keys#SKIN_PROFILE_PROPERTY}

src/main/java/org/spongepowered/api/entity/living/Humanoid.java

@@ -28,10 +28,10 @@
 import net.kyori.adventure.identity.Identified;
 import org.spongepowered.api.block.entity.EnderChest;
 import org.spongepowered.api.data.Keys;
-import org.spongepowered.api.data.type.HandPreference;
 import org.spongepowered.api.data.value.Value;
 import org.spongepowered.api.effect.Viewer;
 import org.spongepowered.api.entity.Aerial;
+import org.spongepowered.api.entity.Tamer;
 import org.spongepowered.api.entity.living.Humanoid;
 import org.spongepowered.api.item.inventory.Carrier;
 import org.spongepowered.api.item.inventory.Inventory;
@@ -42,7 +42,7 @@
 /**
  * A Player is the representation of an actual unit playing the game.
  */
-public interface Player extends Humanoid, Identified, LocaleSource, Viewer, BossBarViewer, Carrier, Aerial {
+public interface Player extends Humanoid, Identified, LocaleSource, Viewer, BossBarViewer, Carrier, Tamer, Aerial {
 
     /**
      * Gets the associated {@link GameProfile} of this player.
@@ -85,15 +85,6 @@ default Value.Mutable<Boolean> canFly() {
         return this.requireValue(Keys.CAN_FLY).asMutable();
     }
 
-    /**
-     * {@link Keys#DOMINANT_HAND}
-     *
-     * @return The dominant HandPreference of the player
-     */
-    default Value.Mutable<HandPreference> dominantHand() {
-        return this.requireValue(Keys.DOMINANT_HAND).asMutable();
-    }
-
     /**
      * {@link Keys#EXHAUSTION}
      *