lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrite base blocks to be less weird

Browse source 
Added base ItemBlock classes for each base type (to be used later)
This commit is contained in:
Nicholas Ignoffo 2016-10-15 09:21:30 -07:00
parent ea43fbce7d
commit 3e0f3f5aa1
14 changed files with 265 additions and 209 deletions
src/main/java/WayofTime/bloodmagic/block/base
BlockInteger.java

96
src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
View file

@ -1,24 +1,14 @@
package WayofTime.bloodmagic.block.base;
import WayofTime.bloodmagic.block.property.UnlistedPropertyInteger;
import lombok.Getter;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.block.properties.IProperty;
import net.minecraft.block.properties.PropertyInteger;
import net.minecraft.block.state.BlockStateContainer;
import net.minecraft.block.state.IBlockState;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import net.minecraftforge.common.property.ExtendedBlockState;
import net.minecraftforge.common.property.IExtendedBlockState;
import net.minecraftforge.common.property.IUnlistedProperty;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@ -28,28 +18,22 @@ import java.util.List;
* Creates a block that has multiple meta-based states.
*
* These states will be numbered 0 through {@code maxMeta}.
*
* For {@link net.minecraft.tileentity.TileEntity}'s, use
* {@link BlockIntegerContainer}.
*/
@Getter
public class BlockInteger extends Block
{
private final int maxMeta;
private final PropertyInteger metaProp;
private final IUnlistedProperty unlistedMetaProp;
private final BlockStateContainer realBlockState;
private final PropertyInteger property;
private final BlockStateContainer realStateContainer;
public BlockInteger(Material material, int maxMeta, String propName)
{
super(material);
this.maxMeta = maxMeta;
this.metaProp = PropertyInteger.create(propName, 0, maxMeta);
this.unlistedMetaProp = new UnlistedPropertyInteger(maxMeta, propName);
this.realBlockState = createRealBlockState();
setupStates();
this.property = PropertyInteger.create(propName, 0, maxMeta);
this.realStateContainer = createStateContainer();
setDefaultState(getBlockState().getBaseState());
}
public BlockInteger(Material material, int maxMeta)
@ -58,66 +42,38 @@ public class BlockInteger extends Block
}
@Override
public IBlockState getStateFromMeta(int meta)
{
return getDefaultState().withProperty(metaProp, meta);
protected final BlockStateContainer createBlockState() {
return new BlockStateContainer.Builder(this).build(); // Blank to avoid crashes
}
@Override
public int getMetaFromState(IBlockState state)
{
return (Integer) state.getValue(metaProp);
public final BlockStateContainer getBlockState() {
return realStateContainer;
}
@Override
public int damageDropped(IBlockState state)
{
public IBlockState getStateFromMeta(int meta) {
return getDefaultState().withProperty(property, meta);
}
@Override
public int getMetaFromState(IBlockState state) {
return state.getValue(property);
}
@Override
public int damageDropped(IBlockState state) {
return getMetaFromState(state);
}
@Override
public BlockStateContainer getBlockState()
{
return this.realBlockState;
}
@Override
public BlockStateContainer createBlockState()
{
return Blocks.AIR.getBlockState();
}
@Override
public ItemStack getPickBlock(IBlockState state, RayTraceResult target, World world, BlockPos pos, EntityPlayer player)
{
return new ItemStack(this, 1, this.getMetaFromState(world.getBlockState(pos)));
}
@Override
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item item, CreativeTabs creativeTabs, List<ItemStack> list)
{
for (int i = 0; i < maxMeta + 1; i++)
list.add(new ItemStack(this, 1, i));
@Override
public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> subBlocks) {
for (int i = 0; i < maxMeta; i++)
subBlocks.add(new ItemStack(item, 1, i));
}
private void setupStates()
{
this.setDefaultState(getExtendedBlockState().withProperty(unlistedMetaProp, 0).withProperty(metaProp, 0));
}
public ExtendedBlockState getBaseExtendedState()
{
return (ExtendedBlockState) this.getBlockState();
}
public IExtendedBlockState getExtendedBlockState()
{
return (IExtendedBlockState) this.getBaseExtendedState().getBaseState();
}
private BlockStateContainer createRealBlockState()
{
return new ExtendedBlockState(this, new IProperty[] { metaProp }, new IUnlistedProperty[] { unlistedMetaProp });
protected BlockStateContainer createStateContainer() {
return new BlockStateContainer.Builder(this).add(property).build();
}
}