SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.13-pre7

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
Bukkit/Spigot
2018-07-15 10:00:00 +10:00
parent debc7172fd
commit 767e4f6ccf
199 changed files with 8301 additions and 3637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

282
paper-api/src/main/java/org/bukkit/generator/ChunkGenerator.java
View File

@@ -9,6 +9,7 @@ import org.bukkit.Material;
import org.bukkit.World;
import org.bukkit.block.Biome;
import org.bukkit.block.Block;
import org.bukkit.block.data.BlockData;
import org.bukkit.material.MaterialData;
/**
@@ -45,181 +46,6 @@ public abstract class ChunkGenerator {
*/
void setBiome(int x, int z, Biome bio);
}
@Deprecated
/**
* Shapes the chunk for the given coordinates.
* <p>
* This method should return a byte[32768] in the following format:
* <pre>
* for (int x = 0; x &lt; 16; x++) {
* for (int z = 0; z &lt; 16; z++) {
* for (int y = 0; y &lt; 128; y++) {
* // result[(x * 16 + z) * 128 + y] = ??;
* }
* }
* }
* </pre>
* <p>
* Note that this method should <b>never</b> attempt to get the Chunk at
* the passed coordinates, as doing so may cause an infinite loop
* <p>
* Note this deprecated method will only be called when both
* generateExtBlockSections() and generateBlockSections() are
* unimplemented and return null.
*
* @param world The world this chunk will be used for
* @param random The random generator to use
* @param x The X-coordinate of the chunk
* @param z The Z-coordinate of the chunk
* @return byte[] containing the types for each block created by this
* generator
*/
public byte[] generate(World world, Random random, int x, int z) {
throw new UnsupportedOperationException("Custom generator is missing required methods: generate(), generateBlockSections() and generateExtBlockSections()");
}
/**
* Shapes the chunk for the given coordinates, with extended block IDs
* supported (0-4095).
* <p>
* As of 1.2, chunks are represented by a vertical array of chunk
* sections, each of which is 16 x 16 x 16 blocks. If a section is empty
* (all zero), the section does not need to be supplied, reducing memory
* usage.
* <p>
* This method must return a short[][] array in the following format:
* <pre>
* short[][] result = new short[world-height / 16][];
* </pre>
* Each section {@code (sectionID = (Y>>4))} that has blocks needs to be allocated
* space for the 4096 blocks in that section:
* <pre>
* result[sectionID] = new short[4096];
* </pre>
* while sections that are not populated can be left null.
* <p>
* Setting a block at X, Y, Z within the chunk can be done with the
* following mapping function:
* <pre>
* void setBlock(short[][] result, int x, int y, int z, short blkid) {
* {@code if (result[y >> 4] == null) {}
* {@code result[y >> 4] = new short[4096];}
* }
* {@code result[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = blkid;}
* }
* </pre>
* while reading a block ID can be done with the following mapping
* function:
* <pre>
* short getBlock(short[][] result, int x, int y, int z) {
* {@code if (result[y >> 4] == null) {}
* return (short)0;
* }
* {@code return result[y >> 4][((y & 0xF) << 8) | (z << 4) | x];}
* }
* </pre>
* while sections that are not populated can be left null.
* <p>
* Setting a block at X, Y, Z within the chunk can be done with the
* following mapping function:
* <pre>
* void setBlock(short[][] result, int x, int y, int z, short blkid) {
* {@code if (result[y >> 4) == null) {}
* {@code result[y >> 4] = new short[4096];}
* }
* {@code result[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = blkid;}
* }
* </pre>
* while reading a block ID can be done with the following mapping
* function:
* <pre>
* short getBlock(short[][] result, int x, int y, int z) {
* {@code if (result[y >> 4) == null) {}
* return (short)0;
* }
* {@code return result[y >> 4][((y & 0xF) << 8) | (z << 4) | x];}
* }
* </pre>
* <p>
* Note that this method should <b>never</b> attempt to get the Chunk at
* the passed coordinates, as doing so may cause an infinite loop
* <p>
* Note generators that do not return block IDs above 255 should not
* implement this method, or should have it return null (which will result
* in the generateBlockSections() method being called).
*
* @param world The world this chunk will be used for
* @param random The random generator to use
* @param x The X-coordinate of the chunk
* @param z The Z-coordinate of the chunk
* @param biomes Proposed biome values for chunk - can be updated by
* generator
* @return short[][] containing the types for each block created by this
* generator
* @deprecated Magic value
*/
@Deprecated
public short[][] generateExtBlockSections(World world, Random random, int x, int z, BiomeGrid biomes) {
return null; // Default - returns null, which drives call to generateBlockSections()
}
/**
* Shapes the chunk for the given coordinates.
* <p>
* As of 1.2, chunks are represented by a vertical array of chunk
* sections, each of which is 16 x 16 x 16 blocks. If a section is empty
* (all zero), the section does not need to be supplied, reducing memory
* usage.
* <p>
* This method must return a byte[][] array in the following format:
* <pre>
* byte[][] result = new byte[world-height / 16][];
* </pre>
* Each section {@code (sectionID = (Y>>4))} that has blocks needs to be allocated
* space for the 4096 blocks in that section:
* <pre>
* result[sectionID] = new byte[4096];
* </pre>
* while sections that are not populated can be left null.
* <p>
* Setting a block at X, Y, Z within the chunk can be done with the
* following mapping function:
* <pre>
* void setBlock(byte[][] result, int x, int y, int z, byte blkid) {
* {@code if (result[y >> 4) == null) {}
* {@code result[y >> 4] = new byte[4096];}
* }
* {@code result[y >> 4][((y & 0xF) << 8) | (z << 4) | x] = blkid;}
* }
* </pre>
* while reading a block ID can be done with the following mapping
* function:
* <pre>
* byte getBlock(byte[][] result, int x, int y, int z) {
* {@code if (result[y >> 4) == null) {}
* return (byte)0;
* }
* {@code return result[y >> 4][((y & 0xF) << 8) | (z << 4) | x];}
* }
* </pre>
*
* Note that this method should <b>never</b> attempt to get the Chunk at
* the passed coordinates, as doing so may cause an infinite loop
*
* @param world The world this chunk will be used for
* @param random The random generator to use
* @param x The X-coordinate of the chunk
* @param z The Z-coordinate of the chunk
* @param biomes Proposed biome values for chunk - can be updated by
* generator
* @return short[][] containing the types for each block created by this
* generator
* @deprecated Magic value
*/
@Deprecated
public byte[][] generateBlockSections(World world, Random random, int x, int z, BiomeGrid biomes) {
return null; // Default - returns null, which drives call to generate()
}
/**
* Shapes the chunk for the given coordinates.
@@ -246,7 +72,7 @@ public abstract class ChunkGenerator {
* generator
*/
public ChunkData generateChunkData(World world, Random random, int x, int z, BiomeGrid biome) {
return null; // Default - returns null, which drives call to generateExtBlockSections()
throw new UnsupportedOperationException("Custom generator is missing required method generateChunkData");
}
/**
@@ -342,6 +168,18 @@ public abstract class ChunkGenerator {
*/
public void setBlock(int x, int y, int z, MaterialData material);
/**
* Set the block at x,y,z in the chunk data to material.
*
* Setting blocks outside the chunk's bounds does nothing.
*
* @param x the x location in the chunk from 0-15 inclusive
* @param y the y location in the chunk from 0 (inclusive) - maxHeight (exclusive)
* @param z the z location in the chunk from 0-15 inclusive
* @param blockData the type to set the block to
*/
public void setBlock(int x, int y, int z, BlockData blockData);
/**
* Set a region of this chunk from xMin, yMin, zMin (inclusive)
* to xMax, yMax, zMax (exclusive) to material.
@@ -374,6 +212,22 @@ public abstract class ChunkGenerator {
*/
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, MaterialData material);
/**
* Set a region of this chunk from xMin, yMin, zMin (inclusive) to xMax,
* yMax, zMax (exclusive) to material.
*
* Setting blocks outside the chunk's bounds does nothing.
*
* @param xMin minimum x location (inclusive) in the chunk to set
* @param yMin minimum y location (inclusive) in the chunk to set
* @param zMin minimum z location (inclusive) in the chunk to set
* @param xMax maximum x location (exclusive) in the chunk to set
* @param yMax maximum y location (exclusive) in the chunk to set
* @param zMax maximum z location (exclusive) in the chunk to set
* @param blockData the type to set the blocks to
*/
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, BlockData blockData);
/**
* Get the type of the block at x, y, z.
*
@@ -399,84 +253,16 @@ public abstract class ChunkGenerator {
public MaterialData getTypeAndData(int x, int y, int z);
/**
* Set a region of this chunk from xMin, yMin, zMin (inclusive)
* to xMax, yMax, zMax (exclusive) to block id.
* Get the type and data of the block at x, y ,z.
*
* Setting blocks outside the chunk's bounds does nothing.
*
* @param xMin minimum x location (inclusive) in the chunk to set
* @param yMin minimum y location (inclusive) in the chunk to set
* @param zMin minimum z location (inclusive) in the chunk to set
* @param xMax maximum x location (exclusive) in the chunk to set
* @param yMax maximum y location (exclusive) in the chunk to set
* @param zMax maximum z location (exclusive) in the chunk to set
* @param blockId the block id to set the blocks to
* @deprecated Uses magic values.
*/
@Deprecated
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, int blockId);
/**
* Set a region of this chunk from xMin, yMin, zMin (inclusive)
* to xMax, yMax, zMax (exclusive) to block id and data.
*
* Setting blocks outside the chunk's bounds does nothing.
*
* @param xMin minimum x location (inclusive) in the chunk to set
* @param yMin minimum y location (inclusive) in the chunk to set
* @param zMin minimum z location (inclusive) in the chunk to set
* @param xMax maximum x location (exclusive) in the chunk to set
* @param yMax maximum y location (exclusive) in the chunk to set
* @param zMax maximum z location (exclusive) in the chunk to set
* @param blockId the block id to set the blocks to
* @param data the block data to set the blocks to
* @deprecated Uses magic values.
*/
@Deprecated
public void setRegion(int xMin, int yMin, int zMin, int xMax, int yMax, int zMax, int blockId, int data);
/**
* Set the block at x,y,z in the chunk data to blockId.
*
* Setting blocks outside the chunk's bounds does nothing.
* Getting blocks outside the chunk's bounds returns air.
*
* @param x the x location in the chunk from 0-15 inclusive
* @param y the y location in the chunk from 0 (inclusive) - maxHeight (exclusive)
* @param z the z location in the chunk from 0-15 inclusive
* @param blockId the blockId to set the block to
* @deprecated Uses magic values
* @return the data of the block or the MaterialData for air if x, y or z are outside the chunk's bounds
*/
@Deprecated
public void setBlock(int x, int y, int z, int blockId);
/**
* Set the block at x,y,z in the chunk data to blockId.
*
* Setting blocks outside the chunk's bounds does nothing.
*
* @param x the x location in the chunk from 0-15 inclusive
* @param y the y location in the chunk from 0 (inclusive) - maxHeight (exclusive)
* @param z the z location in the chunk from 0-15 inclusive
* @param blockId the blockId to set the block to
* @param data the block data to set the block to
* @deprecated Uses magic values
*/
@Deprecated
public void setBlock(int x, int y, int z, int blockId, byte data);
/**
* Get the blockId at x,y,z in the chunk data.
*
* Getting blocks outside the chunk's bounds returns 0.
*
* @param x the x location in the chunk from 0-15 inclusive
* @param y the y location in the chunk from 0 (inclusive) - maxHeight (exclusive)
* @param z the z location in the chunk from 0-15 inclusive
* @return the block id or 0 if x, y or z are outside the chunk's bounds
* @deprecated Uses magic values
*/
@Deprecated
public int getTypeId(int x, int y, int z);
public BlockData getBlockData(int x, int y, int z);
/**
* Get the block data at x,y,z in the chunk data.