From 4a4763b075a0f94f31639a50a3d264911eb3df52 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Fri, 27 Nov 2015 22:58:18 -0600 Subject: [PATCH] Light work on decor --- .../botania/api/state/BotaniaStateProps.java | 17 +++++- .../api/state/enums/BiomeBrickVariant.java | 29 ++++++++++ .../api/state/enums/BiomeStoneVariant.java | 29 ++++++++++ .../decor/biomestone/BlockBiomeStone.java | 37 ++++--------- .../decor/biomestone/BlockBiomeStoneA.java | 33 ++++++++++-- .../decor/biomestone/BlockBiomeStoneB.java | 25 ++++++++- .../decor/quartz/BlockSpecialQuartzSlab.java | 31 ++++++----- .../block/decor/walls/Block18StoneWall.java | 36 ++++++++++++- .../decor/walls/BlockBiomeStoneWall.java | 32 ++++++++++- .../block/decor/walls/BlockModWall.java | 40 +++++++------- .../block/decor/walls/BlockVariantWall.java | 54 ------------------- 11 files changed, 240 insertions(+), 123 deletions(-) create mode 100644 src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java create mode 100644 src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index 628e80965..b204fd119 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -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() { + @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); diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java new file mode 100644 index 000000000..7962ab47c --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java @@ -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); + } +} diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java new file mode 100644 index 000000000..844667aa8 --- /dev/null +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java @@ -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); + } +} diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java index ca1add61b..1bda5d990 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java index 2a9928204..c8d653c31 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java @@ -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; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java index 405432fc5..a0638efe9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java +++ b/src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneB.java @@ -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]); + } } diff --git a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java index 2456f25fe..f5c839e15 100644 --- a/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java +++ b/src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java @@ -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 diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java index 832d3cca4..d81cd3f3e 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/Block18StoneWall.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java index eea518179..9f0b22008 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockBiomeStoneWall.java @@ -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; diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java index 7f9a34abc..c169206e9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java +++ b/src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java @@ -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 - } - } diff --git a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java b/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java deleted file mode 100644 index 47467abab..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java +++ /dev/null @@ -1,54 +0,0 @@ -/** - * This class was created by . 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); - } - - -}