Update to Minecraft 1.13-pre7

By: md_5 <git@md-5.net>

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

@@ -6,6 +6,7 @@ import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.Location;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.Metadatable;
 
@@ -14,6 +15,11 @@ import org.bukkit.metadata.Metadatable;
  * any given location in a world. The state of the block may change
  * concurrently to your own handling of it; use block.getState() to get a
  * snapshot state of a block which will not be modified.
+ *
+ * <br>
+ * Note that parts of this class which require access to the world at large
+ * (i.e. lighting and power) may not be able to be safely accessed during world
+ * generation when used in cases like BlockPhysicsEvent!!!!
  */
 public interface Block extends Metadatable {
 
@@ -26,6 +32,13 @@ public interface Block extends Metadatable {
     @Deprecated
     byte getData();
 
+    /**
+     * Gets the complete block data for this block
+     *
+     * @return block specific data
+     */
+    BlockData getBlockData();
+
     /**
      * Gets the block at the given offsets
      *
@@ -72,15 +85,6 @@ public interface Block extends Metadatable {
      */
     Material getType();
 
-    /**
-     * Gets the type-id of this block
-     *
-     * @return block type-id
-     * @deprecated Magic value
-     */
-    @Deprecated
-    int getTypeId();
-
     /**
      * Gets the light level between 0-15
      *
@@ -179,6 +183,21 @@ public interface Block extends Metadatable {
     @Deprecated
     void setData(byte data, boolean applyPhysics);
 
+    /**
+     * Sets the complete data for this block
+     *
+     * @param data new block specific data
+     */
+    void setBlockData(BlockData data);
+
+    /**
+     * Sets the complete data for this block
+     *
+     * @param data new block specific data
+     * @param applyPhysics false to cancel physics from the changed block
+     */
+    void setBlockData(BlockData data, boolean applyPhysics);
+
     /**
      * Sets the type of this block
      *
@@ -194,39 +213,6 @@ public interface Block extends Metadatable {
      */
     void setType(Material type, boolean applyPhysics);
 
-    /**
-     * Sets the type-id of this block
-     *
-     * @param type Type-Id to change this block to
-     * @return whether the block was changed
-     * @deprecated Magic value
-     */
-    @Deprecated
-    boolean setTypeId(int type);
-
-    /**
-     * Sets the type-id of this block
-     *
-     * @param type Type-Id to change this block to
-     * @param applyPhysics False to cancel physics on the changed block.
-     * @return whether the block was changed
-     * @deprecated Magic value
-     */
-    @Deprecated
-    boolean setTypeId(int type, boolean applyPhysics);
-
-    /**
-     * Sets the type-id of this block
-     *
-     * @param type Type-Id to change this block to
-     * @param data The data value to change this block to
-     * @param applyPhysics False to cancel physics on the changed block
-     * @return whether the block was changed
-     * @deprecated Magic value
-     */
-    @Deprecated
-    boolean setTypeIdAndData(int type, byte data, boolean applyPhysics);
-
     /**
      * Gets the face relation of this block compared to the given block.
      * <p>
@@ -330,8 +316,7 @@ public interface Block extends Metadatable {
      * Checks if this block is liquid.
      * <p>
      * A block is considered liquid when {@link #getType()} returns {@link
-     * Material#WATER}, {@link Material#STATIONARY_WATER}, {@link
-     * Material#LAVA} or {@link Material#STATIONARY_LAVA}.
+     * Material#WATER} or {@link Material#LAVA}.
      *
      * @return true if this block is liquid
      */