OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 23:38:25 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-7873: Add powered state for skulls

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot 2024-08-24 07:41:52 +10:00
parent 7104b35192
commit baffaf0195
4 changed files with 74 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
paper-api/src/main/java/org/bukkit/Material.java
View file

@ -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}
*/

58
paper-api/src/main/java/org/bukkit/block/BlockType.java
View file

@ -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<Switch> BAMBOO_BUTTON = getBlockType("bamboo_button");
/**
* BlockData: {@link Rotatable}
* BlockData: {@link Skull}
*/
BlockType.Typed<Rotatable> SKELETON_SKULL = getBlockType("skeleton_skull");
BlockType.Typed<Skull> SKELETON_SKULL = getBlockType("skeleton_skull");
/**
* BlockData: {@link Directional}
* BlockData: {@link WallSkull}
*/
BlockType.Typed<Directional> SKELETON_WALL_SKULL = getBlockType("skeleton_wall_skull");
BlockType.Typed<WallSkull> SKELETON_WALL_SKULL = getBlockType("skeleton_wall_skull");
/**
* BlockData: {@link Rotatable}
* BlockData: {@link Skull}
*/
BlockType.Typed<Rotatable> WITHER_SKELETON_SKULL = getBlockType("wither_skeleton_skull");
BlockType.Typed<Skull> WITHER_SKELETON_SKULL = getBlockType("wither_skeleton_skull");
/**
* BlockData: {@link Directional}
* BlockData: {@link WallSkull}
*/
BlockType.Typed<Directional> WITHER_SKELETON_WALL_SKULL = getBlockType("wither_skeleton_wall_skull");
BlockType.Typed<WallSkull> WITHER_SKELETON_WALL_SKULL = getBlockType("wither_skeleton_wall_skull");
/**
* BlockData: {@link Rotatable}
* BlockData: {@link Skull}
*/
BlockType.Typed<Rotatable> ZOMBIE_HEAD = getBlockType("zombie_head");
BlockType.Typed<Skull> ZOMBIE_HEAD = getBlockType("zombie_head");
/**
* BlockData: {@link Directional}
* BlockData: {@link WallSkull}
*/
BlockType.Typed<Directional> ZOMBIE_WALL_HEAD = getBlockType("zombie_wall_head");
BlockType.Typed<WallSkull> ZOMBIE_WALL_HEAD = getBlockType("zombie_wall_head");
/**
* BlockData: {@link Rotatable}
* BlockData: {@link Skull}
*/
BlockType.Typed<Rotatable> PLAYER_HEAD = getBlockType("player_head");
BlockType.Typed<Skull> PLAYER_HEAD = getBlockType("player_head");
/**
* BlockData: {@link Directional}
* BlockData: {@link WallSkull}
*/
BlockType.Typed<Directional> PLAYER_WALL_HEAD = getBlockType("player_wall_head");
BlockType.Typed<WallSkull> PLAYER_WALL_HEAD = getBlockType("player_wall_head");
/**
* BlockData: {@link Rotatable}
* BlockData: {@link Skull}
*/
BlockType.Typed<Rotatable> CREEPER_HEAD = getBlockType("creeper_head");
BlockType.Typed<Skull> CREEPER_HEAD = getBlockType("creeper_head");
/**
* BlockData: {@link Directional}
* BlockData: {@link WallSkull}
*/
BlockType.Typed<Directional> CREEPER_WALL_HEAD = getBlockType("creeper_wall_head");
BlockType.Typed<WallSkull> CREEPER_WALL_HEAD = getBlockType("creeper_wall_head");
/**
* BlockData: {@link Rotatable}
* BlockData: {@link Skull}
*/
BlockType.Typed<Rotatable> DRAGON_HEAD = getBlockType("dragon_head");
BlockType.Typed<Skull> DRAGON_HEAD = getBlockType("dragon_head");
/**
* BlockData: {@link Directional}
* BlockData: {@link WallSkull}
*/
BlockType.Typed<Directional> DRAGON_WALL_HEAD = getBlockType("dragon_wall_head");
BlockType.Typed<WallSkull> DRAGON_WALL_HEAD = getBlockType("dragon_wall_head");
/**
* BlockData: {@link Rotatable}
* BlockData: {@link Skull}
*/
BlockType.Typed<Rotatable> PIGLIN_HEAD = getBlockType("piglin_head");
BlockType.Typed<Skull> PIGLIN_HEAD = getBlockType("piglin_head");
/**
* BlockData: {@link Directional}
* BlockData: {@link WallSkull}
*/
BlockType.Typed<Directional> PIGLIN_WALL_HEAD = getBlockType("piglin_wall_head");
BlockType.Typed<WallSkull> PIGLIN_WALL_HEAD = getBlockType("piglin_wall_head");
/**
* BlockData: {@link Directional}
*/

7
paper-api/src/main/java/org/bukkit/block/data/type/Skull.java Normal file
View file

@ -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 {
}

7
paper-api/src/main/java/org/bukkit/block/data/type/WallSkull.java Normal file
View file

@ -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 {
}