Remove pickDefaultState hack from 1.9 since it's unneeded now

This commit is contained in:
Vincent Lee committed 2017-07-22 17:14:46 -05:00
1 parent 73b440732a
commit 2b2f48f085
47 files changed
+54 -248

No files matched your search

@@ -42,6 +42,7 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable
super(Material.WOOD, LibBlockNames.ALF_PORTAL);
setHardness(10F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF));
}
@Nonnull
@@ -64,11 +65,6 @@ public class BlockAlfPortal extends BlockMod implements IWandable, ILexiconable
return state.getValue(BotaniaStateProps.ALFPORTAL_STATE).ordinal();
}
@Override
public IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.ALFPORTAL_STATE, AlfPortalState.OFF);
}
@Override
public boolean hasTileEntity(IBlockState state) {
return true;
@@ -50,6 +50,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
setHardness(0.6F);
setSoundType(SoundType.PLANT);
setTickRandomly(true);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY));
}
@Nonnull
@@ -58,11 +59,6 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.ALTGRASS_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.ALTGRASS_VARIANT, AltGrassVariant.DRY);
}
@Override
public boolean isToolEffective(String type, @Nonnull IBlockState state) {
return type.equals("shovel");
@@ -66,6 +66,8 @@ public class BlockAltar extends BlockMod implements ILexiconable {
super(Material.ROCK, LibBlockNames.ALTAR);
setHardness(3.5F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT));
}
@Nonnull
@@ -80,12 +82,6 @@ public class BlockAltar extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.ALTAR_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState()
.withProperty(BotaniaStateProps.ALTAR_VARIANT, AltarVariant.DEFAULT);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.ALTAR_VARIANT).ordinal();
@@ -54,6 +54,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable {
super(Material.WOOD, LibBlockNames.AVATAR);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH));
}
@Nonnull
@@ -70,11 +71,6 @@ public class BlockAvatar extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.CARDINALS);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CARDINALS).getIndex();
@@ -35,6 +35,7 @@ public class BlockCacophonium extends BlockMod {
protected BlockCacophonium() {
super(Material.WOOD, LibBlockNames.CACOPHONIUM);
setHardness(0.8F);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -43,11 +44,6 @@ public class BlockCacophonium extends BlockMod {
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0;
@@ -37,6 +37,7 @@ public class BlockEnderEye extends BlockMod implements ILexiconable {
setHardness(3F);
setResistance(10F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -45,11 +46,6 @@ public class BlockEnderEye extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Nonnull
@Override
public IBlockState getStateFromMeta(int meta) {
@@ -48,6 +48,7 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
super(Material.GOURD, LibBlockNames.FEL_PUMPKIN);
setHardness(1F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@Nonnull
@@ -56,11 +57,6 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.CARDINALS);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CARDINALS).getHorizontalIndex();
@@ -60,6 +60,7 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
super(Material.IRON, LibBlockNames.HOURGLASS);
setHardness(2.0F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -74,11 +75,6 @@ public class BlockHourglass extends BlockMod implements IManaTrigger, IWandable,
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0;
@@ -45,6 +45,7 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable {
super(Material.WOOD, LibBlockNames.INCENSE_PLATE);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@Nonnull
@@ -53,11 +54,6 @@ public class BlockIncensePlate extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.CARDINALS);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CARDINALS).getIndex();
@@ -45,6 +45,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
super(Material.WOOD, LibBlockNames.LIGHT_LAUNCHER);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -59,11 +60,6 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0;
@@ -47,6 +47,7 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
protected BlockLightRelay() {
super(Material.GLASS, LibBlockNames.LIGHT_RELAY);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -61,11 +62,6 @@ public class BlockLightRelay extends BlockMod implements IWandable, ILexiconable
return new BlockStateContainer(this, BotaniaStateProps.LUMINIZER_VARIANT, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.LUMINIZER_VARIANT, LuminizerVariant.DEFAULT).withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
int meta = state.getValue(BotaniaStateProps.LUMINIZER_VARIANT).ordinal();
@@ -40,6 +40,7 @@ public class BlockLivingrock extends BlockMod implements ILexiconable {
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT));
}
@Nonnull
@@ -48,11 +49,6 @@ public class BlockLivingrock extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.LIVINGROCK_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT).ordinal();
@@ -44,6 +44,7 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
super(Material.WOOD, name);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT));
}
@Nonnull
@@ -52,11 +53,6 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.LIVINGWOOD_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT).ordinal();
@@ -31,16 +31,11 @@ public abstract class BlockMod extends Block implements IModelRegister {
public BlockMod(Material par2Material, String name) {
super(par2Material);
setUnlocalizedName(name);
setDefaultState(pickDefaultState()); // This MUST happen before registering the block
setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name));
if(registerInCreative())
setCreativeTab(BotaniaCreativeTab.INSTANCE);
}
protected IBlockState pickDefaultState() {
return blockState.getBaseState();
}
protected boolean registerInCreative() {
return true;
}
@@ -54,6 +54,9 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
super(Material.WOOD, LibBlockNames.OPEN_CRATE);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN)
.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE));
}
@Nonnull
@@ -62,13 +65,6 @@ public class BlockOpenCrate extends BlockMod implements ILexiconable, IWandable,
return new BlockStateContainer(this, BotaniaStateProps.CRATE_VARIANT, BotaniaStateProps.CRATE_PATTERN);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState()
.withProperty(BotaniaStateProps.CRATE_VARIANT, CrateVariant.OPEN)
.withProperty(BotaniaStateProps.CRATE_PATTERN, CratePattern.NONE);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CRATE_VARIANT).ordinal();
@@ -59,6 +59,7 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE));
}
@Nonnull
@@ -68,11 +69,6 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable,
new IUnlistedProperty[] { BotaniaStateProps.HELD_STATE, BotaniaStateProps.HELD_WORLD, BotaniaStateProps.HELD_POS });
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.PLATFORM_VARIANT, PlatformVariant.ABSTRUSE);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.PLATFORM_VARIANT).ordinal();
@@ -50,6 +50,7 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
setHardness(5.5F);
setSoundType(SoundType.METAL);
setLightLevel(0.5F);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA));
}
@Nonnull
@@ -64,11 +65,6 @@ public class BlockPylon extends BlockMod implements ILexiconable, IInfusionStabi
return new BlockStateContainer(this, BotaniaStateProps.PYLON_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.PYLON_VARIANT).ordinal();
@@ -46,6 +46,7 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true));
}
@Nonnull
@@ -60,11 +61,6 @@ public class BlockSparkChanger extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, true);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0;
@@ -40,6 +40,7 @@ public class BlockStorage extends BlockMod implements ILexiconable {
setHardness(3F);
setResistance(10F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL));
}
@Nonnull
@@ -48,11 +49,6 @@ public class BlockStorage extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.STORAGE_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.STORAGE_VARIANT, StorageVariant.MANASTEEL);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.STORAGE_VARIANT).ordinal();
@@ -48,6 +48,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi
super(Material.IRON, LibBlockNames.CORPOREA_CRYSTAL_CUBE);
setHardness(5.5F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true));
}
@Nonnull
@@ -56,11 +57,6 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi
return new ExtendedBlockState(this, new IProperty[] { Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty } );
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(Properties.StaticProperty, true);
}
@Override
public int getMetaFromState(IBlockState state) {
return 0;
@@ -35,6 +35,7 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab
super(Material.IRON, LibBlockNames.CORPOREA_FUNNEL);
setHardness(5.5F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -43,11 +44,6 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0;
@@ -37,6 +37,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi
super(Material.IRON, LibBlockNames.CORPOREA_INTERCEPTOR);
setHardness(5.5F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -45,11 +46,6 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0;
@@ -36,6 +36,7 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable {
super(Material.IRON, LibBlockNames.CORPOREA_RETAINER);
setHardness(5.5F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -44,11 +45,6 @@ public class BlockCorporeaRetainer extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 8 : 0;
@@ -41,6 +41,7 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable {
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK));
}
@Nonnull
@@ -49,11 +50,6 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.CUSTOMBRICK_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.CUSTOMBRICK_VARIANT, CustomBrickVariant.HELLISH_BRICK);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CUSTOMBRICK_VARIANT).ordinal();
@@ -75,6 +75,7 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu
setHardness(0.5F);
setSoundType(SoundType.GROUND);
setLightLevel(1F);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
}
@Nonnull
@@ -101,11 +102,6 @@ public class BlockFloatingFlower extends BlockMod implements ILexiconable, IInfu
return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.COLOR }, new IUnlistedProperty[] { BotaniaStateProps.ISLAND_TYPE });
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.COLOR).getMetadata();
@@ -40,6 +40,7 @@ public class BlockPavement extends BlockMod {
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE));
}
@Nonnull
@@ -48,11 +49,6 @@ public class BlockPavement extends BlockMod {
return new BlockStateContainer(this, BotaniaStateProps.PAVEMENT_COLOR);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.PAVEMENT_COLOR, EnumDyeColor.WHITE);
}
@Override
public int getMetaFromState(IBlockState state) {
switch (state.getValue(BotaniaStateProps.PAVEMENT_COLOR)) {
@@ -41,6 +41,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable {
super(Material.PLANTS, LibBlockNames.PETAL_BLOCK);
setHardness(0.4F);
setSoundType(SoundType.PLANT);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
}
@Nonnull
@@ -49,11 +50,6 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.COLOR);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.COLOR).getMetadata();
@@ -43,6 +43,7 @@ public class BlockStarfield extends BlockMod implements ILexiconable {
setHardness(5F);
setResistance(2000F);
setSoundType(SoundType.METAL);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -64,11 +65,6 @@ public class BlockStarfield extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0;
@@ -47,6 +47,8 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
public BlockTinyPotato() {
super(Material.CLOTH, LibBlockNames.TINY_POTATO);
setHardness(0.25F);
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@Nonnull
@@ -55,12 +57,6 @@ public class BlockTinyPotato extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.CARDINALS);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState()
.withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH);
}
@Override
public int getMetaFromState(IBlockState state) {
switch (state.getValue(BotaniaStateProps.CARDINALS)) {
@@ -25,6 +25,7 @@ public class BlockBiomeStoneA extends BlockBiomeStone {
public BlockBiomeStoneA() {
super(LibBlockNames.BIOME_STONE_A);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST));
}
@Nonnull
@@ -33,11 +34,6 @@ public class BlockBiomeStoneA extends BlockBiomeStone {
return new BlockStateContainer(this, BotaniaStateProps.BIOMESTONE_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT).ordinal();
@@ -25,6 +25,7 @@ public class BlockBiomeStoneB extends BlockBiomeStone {
public BlockBiomeStoneB() {
super(LibBlockNames.BIOME_STONE_B);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST));
}
@Nonnull
@@ -33,11 +34,6 @@ public class BlockBiomeStoneB extends BlockBiomeStone {
return new BlockStateContainer(this, BotaniaStateProps.BIOMEBRICK_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT).ordinal();
@@ -43,6 +43,7 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
this.type = type;
setHardness(0.8F);
setResistance(10F);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL));
}
@Nonnull
@@ -51,11 +52,6 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.QUARTZ_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.QUARTZ_VARIANT, QuartzVariant.NORMAL);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.QUARTZ_VARIANT).ordinal();
@@ -51,6 +51,7 @@ public class BlockBellows extends BlockMod implements ILexiconable {
super(Material.WOOD, LibBlockNames.BELLOWS);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@Nonnull
@@ -59,11 +60,6 @@ public class BlockBellows extends BlockMod implements ILexiconable {
return new BlockStateContainer(this, BotaniaStateProps.CARDINALS);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CARDINALS).getIndex();
@@ -55,6 +55,7 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD {
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -63,11 +64,6 @@ public class BlockBrewery extends BlockMod implements ILexiconable, IWandHUD {
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0;
@@ -47,14 +47,13 @@ import java.util.Random;
public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable, IWandHUD {
private final Random random = new Random();
public BlockEnchanter() {
super(Material.ROCK, LibBlockNames.ENCHANTER);
setHardness(3.0F);
setResistance(5.0F);
setLightLevel(1.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X));
}
@Nonnull
@@ -63,11 +62,6 @@ public class BlockEnchanter extends BlockMod implements IWandable, ILexiconable,
return new BlockStateContainer(this, BotaniaStateProps.ENCHANTER_DIRECTION);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.ENCHANTER_DIRECTION, EnumFacing.Axis.X);
}
@Override
public int getMetaFromState(IBlockState state) {
switch (state.getValue(BotaniaStateProps.ENCHANTER_DIRECTION)) {
@@ -57,6 +57,7 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
super(Material.WOOD, LibBlockNames.FOREST_DRUM);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD));
}
@Nonnull
@@ -71,11 +72,6 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
return new BlockStateContainer(this, BotaniaStateProps.DRUM_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.DRUM_VARIANT, DrumVariant.WILD);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.DRUM_VARIANT).ordinal();
@@ -43,6 +43,7 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -51,11 +52,6 @@ public class BlockManaDetector extends BlockMod implements ILexiconable, IManaCo
return new BlockStateContainer(this, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POWERED) ? 1 : 0;
@@ -66,6 +66,9 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
setResistance(10.0F);
setSoundType(SoundType.STONE);
BotaniaAPI.blacklistBlockFromMagnet(this, Short.MAX_VALUE);
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)
.withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE));
}
@Nonnull
@@ -74,13 +77,6 @@ public class BlockPool extends BlockMod implements IWandHUD, IWandable, ILexicon
return new BlockStateContainer(this, BotaniaStateProps.POOL_VARIANT, BotaniaStateProps.COLOR);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState()
.withProperty(BotaniaStateProps.POOL_VARIANT, PoolVariant.DEFAULT)
.withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.POOL_VARIANT).ordinal();
@@ -46,16 +46,16 @@ import javax.annotation.Nonnull;
import java.util.Random;
public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable, IManaCollisionGhost {
private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0, 0.25, 0.75, 1, 0.75);
private final Random random = new Random();
public BlockPrism() {
super(Material.GLASS, LibBlockNames.PRISM);
setHardness(0.3F);
setSoundType(SoundType.GLASS);
setLightLevel(1.0F);
setDefaultState(blockState.getBaseState()
.withProperty(BotaniaStateProps.POWERED, false)
.withProperty(BotaniaStateProps.HAS_LENS, false));
}
@Nonnull
@@ -70,13 +70,6 @@ public class BlockPrism extends BlockMod implements IManaTrigger, ILexiconable,
return new BlockStateContainer(this, BotaniaStateProps.POWERED, BotaniaStateProps.HAS_LENS);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState()
.withProperty(BotaniaStateProps.POWERED, false)
.withProperty(BotaniaStateProps.HAS_LENS, false);
}
@Override
public int getMetaFromState(IBlockState state) {
return (state.getValue(BotaniaStateProps.POWERED) ? 8 : 0)
@@ -50,6 +50,7 @@ public class BlockPump extends BlockMod implements ILexiconable {
setHardness(2.0F);
setResistance(10.0F);
setSoundType(SoundType.STONE);
setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH));
}
@Nonnull
@@ -58,11 +59,6 @@ public class BlockPump extends BlockMod implements ILexiconable {
return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty });
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.CARDINALS).getIndex();
@@ -57,6 +57,7 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
super(Material.WOOD, LibBlockNames.SPREADER);
setHardness(2.0F);
setSoundType(SoundType.WOOD);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA));
}
@Nonnull
@@ -65,11 +66,6 @@ public class BlockSpreader extends BlockMod implements IWandable, IWandHUD, ILex
return new BlockStateContainer(this, BotaniaStateProps.SPREADER_VARIANT);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.SPREADER_VARIANT, SpreaderVariant.MANA);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(BotaniaStateProps.SPREADER_VARIANT).ordinal();
@@ -25,11 +25,7 @@ public class BlockRedStringComparator extends BlockRedString {
public BlockRedStringComparator() {
super(LibBlockNames.RED_STRING_COMPARATOR);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN));
}
@Override
@@ -24,11 +24,7 @@ public class BlockRedStringContainer extends BlockRedString {
public BlockRedStringContainer() {
super(LibBlockNames.RED_STRING_CONTAINER);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN));
}
@Nonnull
@@ -31,6 +31,7 @@ public class BlockRedStringDispenser extends BlockRedString {
public BlockRedStringDispenser() {
super(LibBlockNames.RED_STRING_DISPENSER);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -39,11 +40,6 @@ public class BlockRedStringDispenser extends BlockRedString {
return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
int meta = state.getValue(BotaniaStateProps.FACING).getIndex();
@@ -27,11 +27,7 @@ public class BlockRedStringFertilizer extends BlockRedString implements IGrowabl
public BlockRedStringFertilizer() {
super(LibBlockNames.RED_STRING_FERTILIZER);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN));
}
@Override
@@ -37,6 +37,7 @@ public class BlockRedStringInterceptor extends BlockRedString {
public BlockRedStringInterceptor() {
super(LibBlockNames.RED_STRING_INTERCEPTOR);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false));
}
@Nonnull
@@ -45,11 +46,6 @@ public class BlockRedStringInterceptor extends BlockRedString {
return new BlockStateContainer(this, BotaniaStateProps.FACING, BotaniaStateProps.POWERED);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN).withProperty(BotaniaStateProps.POWERED, false);
}
@Override
public int getMetaFromState(IBlockState state) {
int meta = state.getValue(BotaniaStateProps.FACING).getIndex();
@@ -24,11 +24,7 @@ public class BlockRedStringRelay extends BlockRedString {
public BlockRedStringRelay() {
super(LibBlockNames.RED_STRING_RELAY);
}
@Override
protected IBlockState pickDefaultState() {
return blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.FACING, EnumFacing.DOWN));
}
@Nonnull