Light work on decor

This commit is contained in:
Vincent Lee committed 2015-11-27 22:58:18 -06:00
1 parent 1817e75b5d
commit 4a4763b075
11 files changed
+240 -123

No files matched your search

@@ -51,12 +51,27 @@ public class BotaniaStateProps {
/** Properties for individual blocks **/
// Block18Stone
// Block18Stone,
public static final PropertyEnum FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class);
// Block18StoneWall
public static final PropertyEnum FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate<FutureStoneVariant>() {
@Override
public boolean apply(FutureStoneVariant variant) {
// Just the four kinds (no polished, chiseled, etc.)
return variant.ordinal() >= 0 && variant.ordinal() <= 3;
}
});
// BlockAltGrass
public static final PropertyEnum ALTGRASS_VARIANT = PropertyEnum.create("variant", AltGrassVariant.class);
// BlockBiomeStoneA
public static final PropertyEnum BIOMESTONE_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class);
// BlockBiomeStoneB
public static final PropertyEnum BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class);
// BlockCustomBrick
public static final PropertyEnum CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class);
@@ -0,0 +1,29 @@
package vazkii.botania.api.state.enums;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum BiomeBrickVariant implements IStringSerializable {
FOREST,
PLAINS,
MOUNTAIN,
FUNGAL,
SWAMP,
DESERT,
TAIGA,
MESA,
CHISELED_FOREST,
CHISELED_PLAINS,
CHISELED_MOUNTAIN,
CHISELED_FUNGAL,
CHISELED_SWAMP,
CHISELED_DESERT,
CHISELED_TAIGA,
CHISELED_MESA;
@Override
public String getName() {
return name().toLowerCase(Locale.ROOT);
}
}
@@ -0,0 +1,29 @@
package vazkii.botania.api.state.enums;
import net.minecraft.util.IStringSerializable;
import java.util.Locale;
public enum BiomeStoneVariant implements IStringSerializable {
FOREST,
PLAINS,
MOUNTAIN,
FUNGAL,
SWAMP,
DESERT,
TAIGA,
MESA,
FOREST_COBBLE,
PLAINS_COBBLE,
MOUNTAIN_COBBLE,
FUNGAL_COBBLE,
SWAMP_COBBLE,
DESERT_COBBLE,
TAIGA_COBBLE,
MESA_COBBLE;
@Override
public String getName() {
return name().toLowerCase(Locale.ROOT);
}
}
@@ -14,13 +14,12 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
@@ -33,24 +32,12 @@ import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockBiomeStone extends BlockMod implements ILexiconable {
private static IIcon[] icons = new IIcon[32];
int iconOffset;
public BlockBiomeStone(int iconOffset, String name) {
public BlockBiomeStone(String name) {
super(Material.rock);
setHardness(1.5F);
setResistance(10F);
setStepSound(soundTypeStone);
setBlockName(name);
this.iconOffset = iconOffset;
}
@Override
public void registerBlockIcons(IIconRegister register) {
for(int i = 0; i < 16; i++) {
int index = i + iconOffset;
icons[index] = IconHelper.forName(register, "biomeStone" + index);
}
setUnlocalizedName(name);
}
@Override
@@ -59,31 +46,25 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable {
list.add(new ItemStack(item, 1, i));
}
@Override
public IIcon getIcon(int side, int meta) {
return icons[meta + iconOffset];
}
@Override
protected boolean shouldRegisterInNameSet() {
return false;
}
@Override
public int damageDropped(int par1) {
return par1;
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public Block setBlockName(String par1Str) {
public Block setUnlocalizedName(String par1Str) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
return super.setBlockName(par1Str);
return super.setUnlocalizedName(par1Str);
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
int meta = world.getBlockMetadata(x, y, z);
return new ItemStack(this, 1, meta);
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(this, 1, getMetaFromState(world.getBlockState(pos)));
}
@Override
@@ -10,17 +10,44 @@
*/
package vazkii.botania.common.block.decor.biomestone;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.BiomeStoneVariant;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockBiomeStoneA extends BlockBiomeStone {
public BlockBiomeStoneA() {
super(0, LibBlockNames.BIOME_STONE_A);
super(LibBlockNames.BIOME_STONE_A);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.FOREST));
}
@Override
public int damageDropped(int par1) {
return par1 % 8 + 8;
public BlockState createBlockState() {
return new BlockState(this, BotaniaStateProps.BIOMESTONE_VARIANT);
}
@Override
public int getMetaFromState(IBlockState state) {
return ((BiomeStoneVariant) state.getValue(BotaniaStateProps.BIOMESTONE_VARIANT)).ordinal();
}
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta >= BiomeStoneVariant.values().length) {
meta = 0;
}
return getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, BiomeStoneVariant.values()[meta]);
}
@Override
public int damageDropped(IBlockState state) {
int meta = getMetaFromState(state);
if (meta < 8) {
meta += 8; // Drop cobblestone variant
}
return meta;
}
}
@@ -10,12 +10,35 @@
*/
package vazkii.botania.common.block.decor.biomestone;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.BiomeBrickVariant;
import vazkii.botania.api.state.enums.BiomeStoneVariant;
import vazkii.botania.common.lib.LibBlockNames;
public class BlockBiomeStoneB extends BlockBiomeStone {
public BlockBiomeStoneB() {
super(16, LibBlockNames.BIOME_STONE_B);
super(LibBlockNames.BIOME_STONE_B);
setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.FOREST));
}
@Override
public BlockState createBlockState() {
return new BlockState(this, BotaniaStateProps.BIOMEBRICK_VARIANT);
}
@Override
public int getMetaFromState(IBlockState state) {
return ((BiomeStoneVariant) state.getValue(BotaniaStateProps.BIOMEBRICK_VARIANT)).ordinal();
}
@Override
public IBlockState getStateFromMeta(int meta) {
if (meta >= BiomeBrickVariant.values().length) {
meta = 0;
}
return getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, BiomeBrickVariant.values()[meta]);
}
}
@@ -15,12 +15,12 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.block.BlockSlab;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.IIcon;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -82,30 +82,33 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
}
@Override
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
public ItemStack getPickBlock(MovingObjectPosition target, World world, BlockPos pos, EntityPlayer player) {
return new ItemStack(getSingleBlock());
}
@Override
@SideOnly(Side.CLIENT)
public IIcon getIcon(int par1, int par2) {
return source.getBlockTextureFromSide(par1);
}
@Override
public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
public Item getItemDropped(IBlockState p_149650_1_, Random p_149650_2_, int p_149650_3_) {
return Item.getItemFromBlock(getSingleBlock());
}
@Override
public ItemStack createStackedBlock(int par1) {
public ItemStack createStackedBlock(IBlockState par1) {
return new ItemStack(getSingleBlock());
}
@Override
@SideOnly(Side.CLIENT)
public void registerBlockIcons(IIconRegister par1IconRegister) {
// NO-OP
public boolean isDouble() {
return getFullBlock() == this;
}
@Override
public IProperty getVariantProperty() {
return null;
}
@Override
public Object getVariant(ItemStack stack) {
return null;
}
@Override
@@ -10,15 +10,24 @@
*/
package vazkii.botania.common.block.decor.walls;
import net.minecraft.block.state.BlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.api.state.enums.FutureStoneVariant;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
public class Block18StoneWall extends BlockVariantWall {
import java.util.List;
public class Block18StoneWall extends BlockModWall {
public Block18StoneWall() {
super(ModFluffBlocks.stone, 4);
@@ -26,6 +35,31 @@ public class Block18StoneWall extends BlockVariantWall {
setResistance(10F);
}
@Override
public BlockState createBlockState() {
return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST, BotaniaStateProps.FUTURESTONEWALL_VARIANT);
}
@Override
protected void specifyDefaultState() {
setDefaultState(blockState.getBaseState()
.withProperty(UP, false).withProperty(NORTH, false).withProperty(SOUTH, false)
.withProperty(WEST, false).withProperty(EAST, false)
.withProperty(BotaniaStateProps.FUTURESTONEWALL_VARIANT, FutureStoneVariant.ANDESITE)
);
}
@Override
public void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
}
@Override
public void getSubBlocks(Item item, CreativeTabs tabs, List list) {
for(int i = 0; i < 4; i++)
list.add(new ItemStack(item, 1, i));
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.stoneAlchemy;
@@ -10,22 +10,50 @@
*/
package vazkii.botania.common.block.decor.walls;
import net.minecraft.block.state.BlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.registry.GameRegistry;
import vazkii.botania.api.lexicon.LexiconEntry;
import vazkii.botania.common.block.ModFluffBlocks;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import vazkii.botania.common.lexicon.LexiconData;
public class BlockBiomeStoneWall extends BlockVariantWall {
import java.util.List;
public class BlockBiomeStoneWall extends BlockModWall {
public BlockBiomeStoneWall() {
super(ModFluffBlocks.biomeStoneA, 8, 8);
super(ModFluffBlocks.biomeStoneA, 8);
setHardness(1.5F);
setResistance(10F);
}
@Override
public BlockState createBlockState() {
return new BlockState(this, BotaniaStateProps.BIOME);
}
@Override
protected void specifyDefaultState() {
}
@Override
public void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
}
@Override
public void getSubBlocks(Item item, CreativeTabs tabs, List list) {
for(int i = 0; i < 8; i++)
list.add(new ItemStack(item, 1, i));
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.marimorphosis;
@@ -14,13 +14,14 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockWall;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.block.state.BlockState;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.BlockPos;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import vazkii.botania.api.lexicon.ILexiconable;
import vazkii.botania.api.lexicon.LexiconEntry;
@@ -28,27 +29,38 @@ import vazkii.botania.common.item.block.ItemBlockMod;
import vazkii.botania.common.lexicon.LexiconData;
import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockModWall extends BlockWall implements ILexiconable {
public abstract class BlockModWall extends BlockWall implements ILexiconable {
Block block;
int meta;
public BlockModWall(Block block, int meta) {
super(block);
this.block = block;
this.meta = meta;
setBlockName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall");
setUnlocalizedName(block.getUnlocalizedName().replaceAll("tile.", "") + meta + "Wall");
specifyDefaultState();
}
@Override
public boolean canPlaceTorchOnTop(World world, int x, int y, int z) {
public BlockState createBlockState() {
return new BlockState(this, UP, NORTH, SOUTH, WEST, EAST);
}
protected void specifyDefaultState() {
setDefaultState(blockState.getBaseState()
.withProperty(UP, false).withProperty(NORTH, false).withProperty(SOUTH, false)
.withProperty(WEST, false).withProperty(EAST, false)
);
}
@Override
public boolean canPlaceTorchOnTop(IBlockAccess world, BlockPos pos) {
return true;
}
@Override
public Block setBlockName(String par1Str) {
public Block setUnlocalizedName(String par1Str) {
register(par1Str);
return super.setBlockName(par1Str);
return super.setUnlocalizedName(par1Str);
}
public void register(String name) {
@@ -60,19 +72,9 @@ public class BlockModWall extends BlockWall implements ILexiconable {
list.add(new ItemStack(item));
}
@Override
public IIcon getIcon(int side, int meta) {
return block.getIcon(side, this.meta);
}
@Override
public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) {
return LexiconData.decorativeBlocks;
}
@Override
public void registerBlockIcons(IIconRegister p_149651_1_) {
// NO-OP
}
}
@@ -1,54 +0,0 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the Botania Mod. Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*
* File Created @ [Jul 18, 2015, 8:42:16 PM (GMT)]
*/
package vazkii.botania.common.block.decor.walls;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName;
import net.minecraftforge.fml.common.registry.GameRegistry;
public class BlockVariantWall extends BlockModWall {
int metaStates;
int metaShift;
public BlockVariantWall(Block block, int metaStates, int metaShift) {
super(block, 0);
this.metaStates = metaStates;
this.metaShift = metaShift;
}
public BlockVariantWall(Block block, int metaStates) {
this(block, metaStates, 0);
}
@Override
public void register(String name) {
GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
}
@Override
public void getSubBlocks(Item item, CreativeTabs tabs, List list) {
for(int i = 0; i < metaStates; i++)
list.add(new ItemStack(item, 1, i));
}
@Override
public IIcon getIcon(int side, int meta) {
return block.getIcon(side, meta + metaShift);
}
}