From baffaf019549624cb8710797b6f2c019575a1796 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Sat, 24 Aug 2024 07:41:52 +1000 Subject: [PATCH] SPIGOT-7873: Add powered state for skulls By: md_5 --- .../src/main/java/org/bukkit/Material.java | 58 ++++++++++--------- .../main/java/org/bukkit/block/BlockType.java | 58 ++++++++++--------- .../org/bukkit/block/data/type/Skull.java | 7 +++ .../org/bukkit/block/data/type/WallSkull.java | 7 +++ 4 files changed, 74 insertions(+), 56 deletions(-) create mode 100644 paper-api/src/main/java/org/bukkit/block/data/type/Skull.java create mode 100644 paper-api/src/main/java/org/bukkit/block/data/type/WallSkull.java diff --git a/paper-api/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java index 019cc6baf8..111c9a6be1 100644 --- a/paper-api/src/main/java/org/bukkit/Material.java +++ b/paper-api/src/main/java/org/bukkit/Material.java @@ -97,6 +97,7 @@ import org.bukkit.block.data.type.SculkShrieker; import org.bukkit.block.data.type.SculkVein; import org.bukkit.block.data.type.SeaPickle; import org.bukkit.block.data.type.Sign; +import org.bukkit.block.data.type.Skull; import org.bukkit.block.data.type.Slab; import org.bukkit.block.data.type.SmallDripleaf; import org.bukkit.block.data.type.Snow; @@ -114,6 +115,7 @@ import org.bukkit.block.data.type.Vault; import org.bukkit.block.data.type.Wall; import org.bukkit.block.data.type.WallHangingSign; import org.bukkit.block.data.type.WallSign; +import org.bukkit.block.data.type.WallSkull; import org.bukkit.inventory.CreativeCategory; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; @@ -2730,33 +2732,33 @@ public enum Material implements Keyed, Translatable { MAP(21655), GOLDEN_CARROT(5300), /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - SKELETON_SKULL(13270, Rotatable.class), + SKELETON_SKULL(13270, Skull.class), /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - WITHER_SKELETON_SKULL(31487, Rotatable.class), + WITHER_SKELETON_SKULL(31487, Skull.class), /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - PLAYER_HEAD(21174, Rotatable.class), + PLAYER_HEAD(21174, Skull.class), /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - ZOMBIE_HEAD(9304, Rotatable.class), + ZOMBIE_HEAD(9304, Skull.class), /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - CREEPER_HEAD(29146, Rotatable.class), + CREEPER_HEAD(29146, Skull.class), /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - DRAGON_HEAD(20084, Rotatable.class), + DRAGON_HEAD(20084, Skull.class), /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - PIGLIN_HEAD(5512, Rotatable.class), + PIGLIN_HEAD(5512, Skull.class), NETHER_STAR(12469), PUMPKIN_PIE(28725), FIREWORK_ROCKET(23841), @@ -3415,33 +3417,33 @@ public enum Material implements Keyed, Translatable { */ POTATOES(10879, Ageable.class), /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - SKELETON_WALL_SKULL(31650, Directional.class), + SKELETON_WALL_SKULL(31650, WallSkull.class), /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - WITHER_SKELETON_WALL_SKULL(9326, Directional.class), + WITHER_SKELETON_WALL_SKULL(9326, WallSkull.class), /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - ZOMBIE_WALL_HEAD(16296, Directional.class), + ZOMBIE_WALL_HEAD(16296, WallSkull.class), /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - PLAYER_WALL_HEAD(13164, Directional.class), + PLAYER_WALL_HEAD(13164, WallSkull.class), /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - CREEPER_WALL_HEAD(30123, Directional.class), + CREEPER_WALL_HEAD(30123, WallSkull.class), /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - DRAGON_WALL_HEAD(19818, Directional.class), + DRAGON_WALL_HEAD(19818, WallSkull.class), /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - PIGLIN_WALL_HEAD(4446, Directional.class), + PIGLIN_WALL_HEAD(4446, WallSkull.class), /** * BlockData: {@link Directional} */ diff --git a/paper-api/src/main/java/org/bukkit/block/BlockType.java b/paper-api/src/main/java/org/bukkit/block/BlockType.java index 4288bebf69..dfd8187ef9 100644 --- a/paper-api/src/main/java/org/bukkit/block/BlockType.java +++ b/paper-api/src/main/java/org/bukkit/block/BlockType.java @@ -94,6 +94,7 @@ import org.bukkit.block.data.type.SculkShrieker; import org.bukkit.block.data.type.SculkVein; import org.bukkit.block.data.type.SeaPickle; import org.bukkit.block.data.type.Sign; +import org.bukkit.block.data.type.Skull; import org.bukkit.block.data.type.Slab; import org.bukkit.block.data.type.SmallDripleaf; import org.bukkit.block.data.type.Snow; @@ -110,6 +111,7 @@ import org.bukkit.block.data.type.TurtleEgg; import org.bukkit.block.data.type.Wall; import org.bukkit.block.data.type.WallHangingSign; import org.bukkit.block.data.type.WallSign; +import org.bukkit.block.data.type.WallSkull; import org.bukkit.inventory.ItemType; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -1247,61 +1249,61 @@ public interface BlockType extends Keyed, Translatable { */ BlockType.Typed BAMBOO_BUTTON = getBlockType("bamboo_button"); /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - BlockType.Typed SKELETON_SKULL = getBlockType("skeleton_skull"); + BlockType.Typed SKELETON_SKULL = getBlockType("skeleton_skull"); /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - BlockType.Typed SKELETON_WALL_SKULL = getBlockType("skeleton_wall_skull"); + BlockType.Typed SKELETON_WALL_SKULL = getBlockType("skeleton_wall_skull"); /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - BlockType.Typed WITHER_SKELETON_SKULL = getBlockType("wither_skeleton_skull"); + BlockType.Typed WITHER_SKELETON_SKULL = getBlockType("wither_skeleton_skull"); /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - BlockType.Typed WITHER_SKELETON_WALL_SKULL = getBlockType("wither_skeleton_wall_skull"); + BlockType.Typed WITHER_SKELETON_WALL_SKULL = getBlockType("wither_skeleton_wall_skull"); /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - BlockType.Typed ZOMBIE_HEAD = getBlockType("zombie_head"); + BlockType.Typed ZOMBIE_HEAD = getBlockType("zombie_head"); /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - BlockType.Typed ZOMBIE_WALL_HEAD = getBlockType("zombie_wall_head"); + BlockType.Typed ZOMBIE_WALL_HEAD = getBlockType("zombie_wall_head"); /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - BlockType.Typed PLAYER_HEAD = getBlockType("player_head"); + BlockType.Typed PLAYER_HEAD = getBlockType("player_head"); /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - BlockType.Typed PLAYER_WALL_HEAD = getBlockType("player_wall_head"); + BlockType.Typed PLAYER_WALL_HEAD = getBlockType("player_wall_head"); /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - BlockType.Typed CREEPER_HEAD = getBlockType("creeper_head"); + BlockType.Typed CREEPER_HEAD = getBlockType("creeper_head"); /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - BlockType.Typed CREEPER_WALL_HEAD = getBlockType("creeper_wall_head"); + BlockType.Typed CREEPER_WALL_HEAD = getBlockType("creeper_wall_head"); /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - BlockType.Typed DRAGON_HEAD = getBlockType("dragon_head"); + BlockType.Typed DRAGON_HEAD = getBlockType("dragon_head"); /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - BlockType.Typed DRAGON_WALL_HEAD = getBlockType("dragon_wall_head"); + BlockType.Typed DRAGON_WALL_HEAD = getBlockType("dragon_wall_head"); /** - * BlockData: {@link Rotatable} + * BlockData: {@link Skull} */ - BlockType.Typed PIGLIN_HEAD = getBlockType("piglin_head"); + BlockType.Typed PIGLIN_HEAD = getBlockType("piglin_head"); /** - * BlockData: {@link Directional} + * BlockData: {@link WallSkull} */ - BlockType.Typed PIGLIN_WALL_HEAD = getBlockType("piglin_wall_head"); + BlockType.Typed PIGLIN_WALL_HEAD = getBlockType("piglin_wall_head"); /** * BlockData: {@link Directional} */ diff --git a/paper-api/src/main/java/org/bukkit/block/data/type/Skull.java b/paper-api/src/main/java/org/bukkit/block/data/type/Skull.java new file mode 100644 index 0000000000..249f98a335 --- /dev/null +++ b/paper-api/src/main/java/org/bukkit/block/data/type/Skull.java @@ -0,0 +1,7 @@ +package org.bukkit.block.data.type; + +import org.bukkit.block.data.Powerable; +import org.bukkit.block.data.Rotatable; + +public interface Skull extends Powerable, Rotatable { +} diff --git a/paper-api/src/main/java/org/bukkit/block/data/type/WallSkull.java b/paper-api/src/main/java/org/bukkit/block/data/type/WallSkull.java new file mode 100644 index 0000000000..97d9a60ae6 --- /dev/null +++ b/paper-api/src/main/java/org/bukkit/block/data/type/WallSkull.java @@ -0,0 +1,7 @@ +package org.bukkit.block.data.type; + +import org.bukkit.block.data.Directional; +import org.bukkit.block.data.Powerable; + +public interface WallSkull extends Directional, Powerable { +}