some minor edit in tiles
This commit is contained in:
@@ -46,7 +46,8 @@ public abstract class EntityModel<D, R extends RectBound> {
|
||||
|
||||
|
||||
/**
|
||||
* Create a data object and populate it with default values.
|
||||
* Create a data object and populate it with default values.<br>
|
||||
* It's allowed to return null for no data.
|
||||
*
|
||||
* @return data object
|
||||
*/
|
||||
|
||||
@@ -14,6 +14,9 @@ public final class Tile extends Entity<TileData, TileModel, TileRenderContext> {
|
||||
|
||||
public static final short ION_MARK = 700;
|
||||
|
||||
/** Whether the tile is occupied by an entity */
|
||||
private transient boolean occupied;
|
||||
|
||||
|
||||
public Tile() {
|
||||
super();
|
||||
@@ -87,4 +90,29 @@ public final class Tile extends Entity<TileData, TileModel, TileRenderContext> {
|
||||
{
|
||||
return model.isWalkable(data);
|
||||
}
|
||||
|
||||
|
||||
public boolean hasItem()
|
||||
{
|
||||
return !data.items.isEmpty();
|
||||
}
|
||||
|
||||
|
||||
public Item removeItem()
|
||||
{
|
||||
if(!hasItem()) return null;
|
||||
return data.items.pop();
|
||||
}
|
||||
|
||||
|
||||
public boolean isOccupied()
|
||||
{
|
||||
return occupied;
|
||||
}
|
||||
|
||||
|
||||
public void setOccupied(boolean occupied)
|
||||
{
|
||||
this.occupied = occupied;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,4 @@ public abstract class TileData {
|
||||
/** Items dropped onto this tile */
|
||||
public final Stack<Item> items = new Stack<>();
|
||||
|
||||
/** Whether the tile is occupied by an entity */
|
||||
public boolean occupied;
|
||||
|
||||
}
|
||||
|
||||
@@ -12,6 +12,12 @@ public abstract class TileModel extends EntityModel<TileData, TileRenderContext>
|
||||
Tiles.register(id, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public TileData createData()
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Test if this tile type is potentially walkable. Used during world
|
||||
|
||||
Reference in New Issue
Block a user