[Bleeding] Added swamp trees and small jungle trees to TreeType. Addresses BUKKIT-1162

- Also added in xpansive's tweaks to BlockChangeDelegate for extra methods

By: zml2008 <zach@zachsthings.com>
This commit is contained in:
Bukkit/Spigot 2012-03-11 13:12:19 -07:00
parent 8874c4e872
commit bb9d82a69e
2 changed files with 42 additions and 3 deletions

View File

@ -8,7 +8,8 @@ package org.bukkit;
public interface BlockChangeDelegate {
/**
* Set a block type at the specified coordinates.
* Set a block type at the specified coordinates without doing all world updates and notifications.
* It is safe to have this call World.setTypeId, but it may be slower than World.setRawTypeId.
*
* @param x X coordinate
* @param y Y coordinate
@ -19,7 +20,8 @@ public interface BlockChangeDelegate {
public boolean setRawTypeId(int x, int y, int z, int typeId);
/**
* Set a block type and data at the specified coordinates.
* Set a block type and data at the specified coordinates without doing all world updates and notifications.
* It is safe to have this call World.setTypeId, but it may be slower than World.setRawTypeId.
*
* @param x X coordinate
* @param y Y coordinate
@ -30,6 +32,31 @@ public interface BlockChangeDelegate {
*/
public boolean setRawTypeIdAndData(int x, int y, int z, int typeId, int data);
/**
* Set a block type at the specified coordinates.
* This method cannot call World.setRawTypeId, a full update is needed.
*
* @param x X coordinate
* @param y Y coordinate
* @param z Z coordinate
* @param typeId New block ID
* @return true if the block was set successfully
*/
public boolean setTypeId(int x, int y, int z, int typeId);
/**
* Set a block type and data at the specified coordinates.
* This method cannot call World.setRawTypeId, a full update is needed.
*
* @param x X coordinate
* @param y Y coordinate
* @param z Z coordinate
* @param typeId New block ID
* @param data Block data
* @return true if the block was set successfully
*/
public boolean setTypeIdAndData(int x, int y, int z, int typeId, int data);
/**
* Get the block type at the location.
*

View File

@ -28,6 +28,14 @@ public enum TreeType {
* Standard jungle tree; 4 blocks wide and tall
*/
JUNGLE,
/**
* Smaller jungle tree; 1 block wide
*/
SMALL_JUNGLE,
/**
* Small bush that grows in the jungle
*/
JUNGLE_BUSH,
/**
* Big red mushroom; short and fat
*/
@ -35,5 +43,9 @@ public enum TreeType {
/**
* Big brown mushroom; tall and umbrella-like
*/
BROWN_MUSHROOM
BROWN_MUSHROOM,
/**
* Swamp tree (regular with vines on the side)
*/
SWAMP,
}