Upstream merge

worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeData.java

@@ -21,7 +21,10 @@ package com.sk89q.worldedit.world.biome;
 
 /**
  * Provides information about a biome.
+ *
+ * @deprecated This no longer returns useful information.
  */
+@Deprecated
 public interface BiomeData {
 
     /**

worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/BiomeName.java

@@ -28,7 +28,10 @@ import javax.annotation.Nullable;
 
 /**
  * Returns the name of a biome using a given {@code BiomeRegistry}.
+ *
+ * @deprecated for removal, appears to be unused
  */
+@Deprecated
 class BiomeName implements Function<BiomeType, String> {
 
     private final BiomeRegistry registry;

worldedit-core/src/main/java/com/sk89q/worldedit/world/biome/Biomes.java

@@ -35,7 +35,10 @@ import javax.annotation.Nullable;
 
 /**
  * Utility methods related to biomes.
+ *
+ * @deprecated Only method is being deprecated for removal.
  */
+@Deprecated
 public final class Biomes {
 
     private Biomes() {
@@ -48,7 +51,9 @@ public final class Biomes {
      * @param name the name to test
      * @param registry a biome registry
      * @return a biome or null
+     * @deprecated This uses the outdated name system. Find names by comparing with their ID instead.
      */
+    @Deprecated
     @Nullable
     public static BiomeType findBiomeByName(Collection<BiomeType> biomes, String name, BiomeRegistry registry) {
         checkNotNull(biomes);

worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java

@@ -21,7 +21,6 @@ package com.sk89q.worldedit.world.block;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
-import com.boydti.fawe.beta.ITileInput;
 import com.sk89q.jnbt.CompoundTag;
 import com.sk89q.jnbt.StringTag;
 import com.sk89q.jnbt.Tag;
@@ -36,6 +35,7 @@ import com.sk89q.worldedit.world.registry.BlockMaterial;
 import com.sk89q.worldedit.world.registry.LegacyMapper;
 import java.util.Map;
 import java.util.Objects;
+
 import javax.annotation.Nullable;
 
 /**
@@ -197,7 +197,7 @@ public class BaseBlock implements BlockStateHolder<BaseBlock>, TileEntityBlock {
 
     /**
      * Checks if the type is the same, and if the matched states are the same.
-     *
+     * 
      * @param o other block
      * @return true if equal
      */

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BiomeRegistry.java

@@ -35,6 +35,7 @@ public interface BiomeRegistry {
      * @param biome the biome
      * @return a data object or null if information is not known
      */
+    @Deprecated
     @Nullable
     BiomeData getData(BiomeType biome);
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/BlockRegistry.java

@@ -40,6 +40,7 @@ public interface BlockRegistry {
      * @param blockType the block
      * @return The name, or null if it's unknown
      */
+    @Deprecated
     @Nullable
     String getName(BlockType blockType);
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/ItemRegistry.java

@@ -33,6 +33,7 @@ public interface ItemRegistry {
      * @param itemType the item
      * @return The name, or null if it's unknown
      */
+    @Deprecated
     @Nullable
     String getName(ItemType itemType);
 

worldedit-core/src/main/java/com/sk89q/worldedit/world/storage/ChunkStore.java

@@ -40,6 +40,22 @@ public abstract class ChunkStore implements Closeable {
      */
     public static final int CHUNK_SHIFTS = 4;
 
+    /**
+     * {@code >>} - to Y of 3D-chunk
+     * {@code <<} - from Y of 3D-chunk
+     */
+    public static final int CHUNK_SHIFTS_Y = 8;
+
+    /**
+     * Convert a position to a 3D-chunk. Y is counted in steps of 256.
+     *
+     * @param position the position
+     * @return chunk coordinates
+     */
+    public static BlockVector3 toChunk3d(BlockVector3 position) {
+        return position.shr(CHUNK_SHIFTS, CHUNK_SHIFTS_Y, CHUNK_SHIFTS);
+    }
+
     /**
      * Convert a position to a chunk.
      *