Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import io.papermc.paper.datacomponent.item.ResolvableProfile;
import io.papermc.paper.world.damagesource.CombatEntry;
import io.papermc.paper.world.damagesource.FallLocationType;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
import net.kyori.adventure.text.Component;
Expand All @@ -14,6 +15,7 @@
import org.bukkit.damage.DamageEffect;
import org.bukkit.damage.DamageSource;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Pose;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.Contract;
import org.jspecify.annotations.NullMarked;
Expand Down Expand Up @@ -100,4 +102,6 @@ class Holder {
Component defaultMannequinDescription();

<MODERN, LEGACY> GameRule<LEGACY> legacyGameRuleBridge(GameRule<MODERN> rule, Function<LEGACY, MODERN> fromLegacyToModern, Function<MODERN, LEGACY> toLegacyFromModern, Class<LEGACY> legacyClass);

Set<Pose> validMannequinPoses();
}
10 changes: 10 additions & 0 deletions paper-api/src/main/java/org/bukkit/entity/Mannequin.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.destroystokyo.paper.SkinParts;
import io.papermc.paper.InternalAPIBridge;
import io.papermc.paper.datacomponent.item.ResolvableProfile;
import java.util.Set;
import net.kyori.adventure.text.Component;
import org.bukkit.inventory.EntityEquipment;
import org.bukkit.inventory.MainHand;
Expand All @@ -12,6 +13,15 @@
@NullMarked
public interface Mannequin extends LivingEntity {

/**
* Returns the valid poses for a mannequin.
*
* @return the valid poses
*/
static Set<Pose> validPoses() {
return InternalAPIBridge.get().validMannequinPoses();
}

/**
* Returns the default mannequin profile.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import io.papermc.paper.world.damagesource.FallLocationType;
import io.papermc.paper.world.damagesource.PaperCombatEntryWrapper;
import io.papermc.paper.world.damagesource.PaperCombatTrackerWrapper;
import java.util.Set;
import java.util.function.Function;
import java.util.function.Predicate;
import net.kyori.adventure.text.Component;
Expand All @@ -24,9 +25,11 @@
import org.bukkit.craftbukkit.damage.CraftDamageEffect;
import org.bukkit.craftbukkit.damage.CraftDamageSource;
import org.bukkit.craftbukkit.entity.CraftLivingEntity;
import org.bukkit.craftbukkit.entity.CraftMannequin;
import org.bukkit.damage.DamageEffect;
import org.bukkit.damage.DamageSource;
import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Pose;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

Expand Down Expand Up @@ -116,4 +119,9 @@ public Component defaultMannequinDescription() {
public <MODERN, LEGACY> GameRule<LEGACY> legacyGameRuleBridge(GameRule<MODERN> rule, Function<LEGACY, MODERN> fromLegacyToModern, Function<MODERN, LEGACY> toLegacyFromModern, Class<LEGACY> legacyClass) {
return CraftGameRule.wrap(rule, fromLegacyToModern, toLegacyFromModern, legacyClass);
}

@Override
public Set<Pose> validMannequinPoses() {
return CraftMannequin.VALID_POSES;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import io.papermc.paper.adventure.PaperAdventure;
import io.papermc.paper.datacomponent.item.PaperResolvableProfile;
import io.papermc.paper.datacomponent.item.ResolvableProfile;
import java.util.Set;
import java.util.stream.Collectors;
import net.kyori.adventure.text.Component;
import net.minecraft.Optionull;
import net.minecraft.world.entity.Avatar;
Expand All @@ -19,6 +21,10 @@

@NullMarked
public class CraftMannequin extends CraftLivingEntity implements Mannequin {

public static final Set<Pose> VALID_POSES = net.minecraft.world.entity.decoration.Mannequin.VALID_POSES.stream()
.map(pose -> Pose.values()[pose.ordinal()]).collect(Collectors.toUnmodifiableSet());

public CraftMannequin(final CraftServer server, final net.minecraft.world.entity.decoration.Mannequin entity) {
super(server, entity);
}
Expand All @@ -31,15 +37,11 @@ public net.minecraft.world.entity.decoration.Mannequin getHandle() {
@Override
public void setPose(Pose pose, boolean fixed) {
Preconditions.checkArgument(pose != null, "pose cannot be null");
net.minecraft.world.entity.Pose internalPose = net.minecraft.world.entity.Pose.values()[pose.ordinal()];
if (!net.minecraft.world.entity.decoration.Mannequin.VALID_POSES.contains(internalPose)) {
throw new IllegalArgumentException("Invalid pose '%s', expected one of: %s".formatted(
pose.name(),
net.minecraft.world.entity.decoration.Mannequin.VALID_POSES.stream().map(p -> Pose.values()[p.ordinal()]).toList() // name doesn't match
));
if (!VALID_POSES.contains(pose)) {
throw new IllegalArgumentException("Invalid pose '%s', expected one of: %s".formatted(pose.name(), VALID_POSES));
}

this.setPose0(internalPose, fixed);
this.setPose0(net.minecraft.world.entity.Pose.values()[pose.ordinal()], fixed);
}

@Override
Expand Down
Loading