property cleanup
This commit is contained in:
parent
734279ad95
commit
a836d7a2a5
99 changed files with 564 additions and 731 deletions
|
@ -3,7 +3,7 @@ package common.block.foliage;
|
|||
import java.util.List;
|
||||
|
||||
import common.block.Block;
|
||||
import common.block.BlockDirectional;
|
||||
import common.block.Rotatable;
|
||||
import common.block.Material;
|
||||
import common.block.SoundType;
|
||||
import common.color.Colorizer;
|
||||
|
@ -18,7 +18,7 @@ import common.item.ItemShears;
|
|||
import common.item.ItemStack;
|
||||
import common.model.Model;
|
||||
import common.model.ModelProvider;
|
||||
import common.properties.IProperty;
|
||||
import common.properties.Property;
|
||||
import common.properties.PropertyEnum;
|
||||
import common.rng.Random;
|
||||
import common.tileentity.TileEntity;
|
||||
|
@ -32,10 +32,9 @@ import common.world.State;
|
|||
import common.world.World;
|
||||
import common.world.AWorldServer;
|
||||
|
||||
public class BlockDoublePlant extends BlockBush implements IGrowable
|
||||
public class BlockDoublePlant extends BlockBush implements Rotatable, IGrowable
|
||||
{
|
||||
public static final PropertyEnum<BlockDoublePlant.EnumBlockHalf> HALF = PropertyEnum.<BlockDoublePlant.EnumBlockHalf>create("half", BlockDoublePlant.EnumBlockHalf.class);
|
||||
public static final PropertyEnum<Facing> FACING = BlockDirectional.FACING;
|
||||
|
||||
private final EnumPlantType type;
|
||||
|
||||
|
@ -271,9 +270,9 @@ public class BlockDoublePlant extends BlockBush implements IGrowable
|
|||
return state.getValue(HALF) == BlockDoublePlant.EnumBlockHalf.UPPER ? 8 | ((Facing)state.getValue(FACING)).getHorizontalIndex() : 0;
|
||||
}
|
||||
|
||||
protected IProperty[] getProperties()
|
||||
protected Property[] getProperties()
|
||||
{
|
||||
return new IProperty[] {HALF, FACING};
|
||||
return new Property[] {HALF, FACING};
|
||||
}
|
||||
|
||||
public Model getModel(ModelProvider provider, String name, State state) {
|
||||
|
@ -293,8 +292,8 @@ public class BlockDoublePlant extends BlockBush implements IGrowable
|
|||
? "top" : "bottom")).cross();
|
||||
}
|
||||
|
||||
public IProperty<?>[] getIgnoredProperties() {
|
||||
return new IProperty[] {FACING};
|
||||
public Property<?>[] getIgnoredProperties() {
|
||||
return new Property[] {FACING};
|
||||
}
|
||||
|
||||
public static enum EnumBlockHalf implements Identifyable
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue