Some states in the root package. here we go!

This commit is contained in:
Vincent Lee committed 2015-11-26 02:18:20 -06:00
1 parent 2dae52a9ff
commit ddf2a94aa1
23 files changed
+347 -129

No files matched your search

@@ -14,6 +14,7 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
@@ -26,6 +27,9 @@ import net.minecraft.world.World;
import thaumcraft.api.crafting.IInfusionStabiliser;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.PlatformVariant;
import vazkii.botania.api.state.enums.PylonVariant;
import vazkii.botania.client.lib.LibRenderIDs;
import vazkii.botania.common.block.tile.TilePylon;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
@@ -46,7 +50,27 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu
float f = 1F / 16F * 2F;
setBlockBounds(f, 0F, f, 1F - f, 1F / 16F * 21F, 1F - f);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.MANA));
}
@Override
public BlockState createBlockState() {
return new BlockState(this, BotaniaStateProps.PYLON_VARIANT);
}
@Override
public int getMetaFromState(IBlockState state) {
return ((PylonVariant) state.getValue(BotaniaStateProps.PYLON_VARIANT)).ordinal();
}
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta > PylonVariant.values().length) {
meta = 0;
}
return getDefaultState().withProperty(BotaniaStateProps.PYLON_VARIANT, PylonVariant.values()[meta]);
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
@@ -65,7 +89,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu
@Override
public void getSubBlocks(Item par1, CreativeTabs par2, List par3) {
for(int i = 0; i < 3; i++)
for(int i = 0; i < PylonVariant.values().length; i++)
par3.add(new ItemStack(par1, 1, i));
}
@@ -86,7 +110,7 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu
@Override
public float getEnchantPowerBonus(World world, BlockPos pos) {
return world.getBlockMetadata(x, y, z) == 0 ? 8 : 15;
return world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT) == PylonVariant.MANA ? 8 : 15;
}
@Override
@@ -96,8 +120,8 @@ public class BlockPylon extends BlockModContainer implements ILexiconable, IInfu
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
int meta = world.getBlockMetadata(x, y, z);
return meta == 0 ? LexiconData.pylon : meta == 1 ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual;
PylonVariant variant = ((PylonVariant) world.getBlockState(pos).getValue(BotaniaStateProps.PYLON_VARIANT));
return variant == PylonVariant.MANA ? LexiconData.pylon : variant == PylonVariant.NATURA ? LexiconData.alfhomancyIntro : LexiconData.gaiaRitual;
}
@Override
public boolean canStabaliseInfusion(World world, BlockPos pos) {