Skip to content

Remove humans #2605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove humans #2605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src/main/java/org/spongepowered/api/entity/EntityTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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"));
Expand Down
16 changes: 2 additions & 14 deletions src/main/java/org/spongepowered/api/entity/Mannequin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
}
69 changes: 0 additions & 69 deletions src/main/java/org/spongepowered/api/entity/living/Human.java
View file
Open in desktop

This file was deleted.

16 changes: 13 additions & 3 deletions src/main/java/org/spongepowered/api/entity/living/Humanoid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
13 changes: 2 additions & 11 deletions src/main/java/org/spongepowered/api/entity/living/player/Player.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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.
Expand Down Expand Up @@ -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}
*
Expand Down
Loading