implement block data

Author: Lulu13022002

paper-api/src/main/java/org/bukkit/Material.java

@@ -108,6 +108,7 @@
 import org.bukkit.block.data.type.SculkVein;
 import org.bukkit.block.data.type.SeaPickle;
 import org.bukkit.block.data.type.Shelf;
+import org.bukkit.block.data.type.ShelfMushroom;
 import org.bukkit.block.data.type.Sign;
 import org.bukkit.block.data.type.Skull;
 import org.bukkit.block.data.type.Slab;
@@ -1675,7 +1676,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     SEA_LANTERN(-1),
     SEA_PICKLE(-1, SeaPickle.class),
     SEAGRASS(-1),
-    SHELF_MUSHROOM(-1, Ageable.class),
+    SHELF_MUSHROOM(-1, ShelfMushroom.class),
     SHORT_DRY_GRASS(-1),
     SHORT_GRASS(-1),
     SHROOMLIGHT(-1),
@@ -1741,7 +1742,7 @@ public enum Material implements Keyed, Translatable, net.kyori.adventure.transla
     STONE_SLAB(-1, Slab.class),
     STONE_STAIRS(-1, Stairs.class),
     STONECUTTER(-1, Directional.class),
-    STRAW_BED(-1, Directional.class),
+    STRAW_BED(-1, Bed.class),
     STRIPPED_ACACIA_LOG(-1, Orientable.class),
     STRIPPED_ACACIA_WOOD(-1, Orientable.class),
     STRIPPED_BAMBOO_BLOCK(-1, Orientable.class),

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

@@ -102,6 +102,7 @@
 import org.bukkit.block.data.type.SculkVein;
 import org.bukkit.block.data.type.SeaPickle;
 import org.bukkit.block.data.type.Shelf;
+import org.bukkit.block.data.type.ShelfMushroom;
 import org.bukkit.block.data.type.Sign;
 import org.bukkit.block.data.type.Skull;
 import org.bukkit.block.data.type.Slab;
@@ -2187,7 +2188,7 @@ interface Typed<B extends BlockData> extends BlockType {
 
     BlockType.Typed<BlockData> SEAGRASS = getBlockType("seagrass");
 
-    BlockType.Typed<Ageable> SHELF_MUSHROOM = getBlockType("shelf_mushroom");
+    BlockType.Typed<ShelfMushroom> SHELF_MUSHROOM = getBlockType("shelf_mushroom");
 
     BlockType.Typed<BlockData> SHORT_DRY_GRASS = getBlockType("short_dry_grass");
 
@@ -2319,7 +2320,7 @@ interface Typed<B extends BlockData> extends BlockType {
 
     BlockType.Typed<Directional> STONECUTTER = getBlockType("stonecutter");
 
-    BlockType.Typed<Directional> STRAW_BED = getBlockType("straw_bed");
+    BlockType.Typed<Bed> STRAW_BED = getBlockType("straw_bed");
 
     BlockType.Typed<Orientable> STRIPPED_ACACIA_LOG = getBlockType("stripped_acacia_log");
 

paper-api/src/main/java/org/bukkit/block/data/type/Crafter.java

@@ -64,7 +64,7 @@ public interface Crafter extends BlockData {
      * {@link org.bukkit.block.Orientation} instead. All references
      * to this enum will be redirected to that enum at runtime.
      */
-    @Deprecated
+    @Deprecated(since = "1.21.5", forRemoval = true)
     public enum Orientation {
 
         DOWN_EAST,

paper-api/src/main/java/org/bukkit/block/data/type/Jigsaw.java

@@ -30,7 +30,7 @@ public interface Jigsaw extends BlockData {
      * {@link org.bukkit.block.Orientation} instead. All references
      * to this enum will be redirected to that enum at runtime.
      */
-    @Deprecated
+    @Deprecated(since = "1.21.5", forRemoval = true)
     public enum Orientation {
 
         DOWN_EAST,

paper-api/src/main/java/org/bukkit/block/data/type/MossyCarpet.java

@@ -50,7 +50,7 @@ public interface MossyCarpet extends BlockData {
      * {@link org.bukkit.block.data.type.Wall.Height} instead. All references
      * to this enum will be redirected to that enum at runtime.
      */
-    @Deprecated
+    @Deprecated(since = "1.21.5", forRemoval = true)
     public enum Height {
         /**
          * Not present.

paper-api/src/main/java/org/bukkit/block/data/type/PinkPetals.java

@@ -0,0 +1,7 @@
+package org.bukkit.block.data.type;
+
+import org.bukkit.block.data.Ageable;
+import org.bukkit.block.data.Directional;
+
+public interface ShelfMushroom extends Ageable, Directional {
+}

paper-api/src/main/java/org/bukkit/block/data/type/ShelfMushroom.java

@@ -108,7 +108,6 @@ public static CompletableFuture<Void> bootStrap(boolean withTags) {
             }).thenAccept(resources -> {
                 resources.updateComponentsAndStaticRegistryTags();
                 EXPERIMENTAL_TAGS = ExperimentalCollector.collectTags(resourceManager);
-                System.out.println(EXPERIMENTAL_TAGS);
             });
         } else {
             EXPERIMENTAL_TAGS = Map.of();

paper-generator/src/main/java/io/papermc/generator/Main.java

@@ -136,6 +136,7 @@ public record BlockData(String implName, @Nullable Class<? extends org.bukkit.bl
         .put("UntintedParticleLeaves", "Leaves")
         .put("TintedParticleLeaves", "Leaves")
         .put("StandingSign", "Sign")
+        .put("StrawBed", "Bed")
         .put("FenceGate", "Gate")
         .buildOrThrow();
 

paper-generator/src/main/java/io/papermc/generator/utils/BlockStateMapping.java

@@ -9,13 +9,13 @@
 import net.minecraft.world.level.block.state.properties.EnumProperty;
 import net.minecraft.world.level.block.state.properties.IntegerProperty;
 import org.bukkit.block.BlockFace;
-import org.bukkit.block.data.Ageable;
+import org.bukkit.block.data.type.ShelfMushroom;
 import org.bukkit.craftbukkit.block.data.CraftBlockData;
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 @GeneratedClass
-public class CraftShelfMushroom extends CraftBlockData implements Ageable {
+public class CraftShelfMushroom extends CraftBlockData implements ShelfMushroom {
     private static final IntegerProperty AGE = ShelfMushroomBlock.AGE;
 
     private static final EnumProperty<Direction> FACING = ShelfMushroomBlock.FACING;
@@ -39,16 +39,19 @@ public int getMaximumAge() {
         return AGE.max;
     }
 
+    @Override
     public BlockFace getFacing() {
         return this.get(FACING, BlockFace.class);
     }
 
+    @Override
     public void setFacing(final BlockFace blockFace) {
         Preconditions.checkArgument(blockFace != null, "blockFace cannot be null!");
         Preconditions.checkArgument(blockFace.isCartesian() && blockFace.getModY() == 0, "Invalid face, only cartesian horizontal face are allowed for this property!");
         this.set(FACING, blockFace);
     }
 
+    @Override
     public Set<BlockFace> getFaces() {
         return this.getValues(FACING, BlockFace.class);
     }