diff --git a/src/main/java/techreborn/blocks/BlockRubberLeaves.java b/src/main/java/techreborn/blocks/BlockRubberLeaves.java index 4c254465a..956f36194 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLeaves.java +++ b/src/main/java/techreborn/blocks/BlockRubberLeaves.java @@ -42,7 +42,7 @@ import techreborn.init.TRContent; public class BlockRubberLeaves extends BlockLeaves { public BlockRubberLeaves() { - super(Block.Properties.create(Material.LEAVES).hardnessAndResistance(0.2F).needsRandomTick().sound(SoundType.PLANT)); + super(Block.Properties.create(Material.LEAVES).hardnessAndResistance(0.2F).tickRandomly().sound(SoundType.PLANT)); ((BlockFire) Blocks.FIRE).setFireInfo(this, 30, 60); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, DISTANCE, PERSISTENT)); } diff --git a/src/main/java/techreborn/blocks/BlockRubberLog.java b/src/main/java/techreborn/blocks/BlockRubberLog.java index dc502b0a5..054a9fefd 100644 --- a/src/main/java/techreborn/blocks/BlockRubberLog.java +++ b/src/main/java/techreborn/blocks/BlockRubberLog.java @@ -67,7 +67,7 @@ public class BlockRubberLog extends Block { public static BooleanProperty HAS_SAP = BooleanProperty.create("hassap"); public BlockRubberLog() { - super(Block.Properties.create(Material.WOOD).hardnessAndResistance(2f).sound(SoundType.WOOD).needsRandomTick()); + super(Block.Properties.create(Material.WOOD).hardnessAndResistance(2f).sound(SoundType.WOOD).tickRandomly()); this.setDefaultState(this.getDefaultState().with(SAP_SIDE, EnumFacing.NORTH).with(HAS_SAP, false)); ((BlockFire) Blocks.FIRE).setFireInfo(this, 5, 5); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java index 50fdf302e..921b8de49 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankSlab.java @@ -28,131 +28,17 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockSlab; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; -import net.minecraft.block.properties.PropertyEnum; -import net.minecraft.block.state.BlockStateContainer; -import net.minecraft.block.state.IBlockState; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.IStringSerializable; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; +import net.minecraft.block.material.MaterialColor; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; -import java.util.Random; -//Thanks @Prospector you saved me me some time :) -public abstract class BlockRubberPlankSlab extends BlockSlab { - public static final PropertyEnum VARIANT = PropertyEnum.create("variant", BlockRubberPlankSlab.Variant.class); +public class BlockRubberPlankSlab extends BlockSlab { public final String name; - public Block halfslab; public BlockRubberPlankSlab(String name) { - super(Material.WOOD, Material.WOOD.getMaterialMapColor()); + super(Block.Properties.create(Material.WOOD, MaterialColor.OBSIDIAN).hardnessAndResistance(2.0F, 15.0F).sound(SoundType.WOOD)); this.name = name; - IBlockState iblockstate = this.blockState.getBaseState(); - if (!this.isDouble()) { - iblockstate = iblockstate.with(HALF, EnumBlockHalf.BOTTOM); - halfslab = this; - } - setHarvestLevel("axe", 0); - setHardness(2.0F); - setResistance(15); - setSoundType(SoundType.WOOD); - this.setDefaultState(iblockstate.with(VARIANT, BlockRubberPlankSlab.Variant.DEFAULT)); - useNeighborBrightness = true; RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } - - @Override - public boolean isFlammable(IBlockAccess world, BlockPos pos, EnumFacing face) { - return true; - } - - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Item.getItemFromBlock(halfslab); - } - - @Override - public ItemStack getItem(World worldIn, BlockPos pos, IBlockState state) { - return new ItemStack(halfslab); - } - - @Override - public IBlockState getStateFromMeta(int meta) { - IBlockState iblockstate = this.getDefaultState().with(VARIANT, BlockRubberPlankSlab.Variant.DEFAULT); - - if (!this.isDouble()) { - iblockstate = iblockstate.with(HALF, (meta & 8) == 0 ? EnumBlockHalf.BOTTOM : EnumBlockHalf.TOP); - } - - return iblockstate; - } - - @Override - public int getMetaFromState(IBlockState state) { - int i = 0; - - if (!this.isDouble() && state.getValue(HALF) == EnumBlockHalf.TOP) { - i |= 8; - } - - return i; - } - - @Override - protected BlockStateContainer createBlockState() { - return this.isDouble() ? new BlockStateContainer(this, new IProperty[] { VARIANT }) : new BlockStateContainer(this, new IProperty[] { HALF, VARIANT }); - } - - @Override - public String getTranslationKey(int meta) { - return super.getTranslationKey(); - } - - @Override - public IProperty getVariantProperty() { - return VARIANT; - } - - @Override - public Comparable getTypeForItem(ItemStack stack) { - return BlockRubberPlankSlab.Variant.DEFAULT; - } - - public static enum Variant implements IStringSerializable { - DEFAULT; - - @Override - public String getName() { - return "default"; - } - } - - public static class BlockDouble extends BlockRubberPlankSlab { - public BlockDouble(String name, Block half) { - super(name); - this.halfslab = half; - } - - @Override - public boolean isDouble() { - return true; - } - } - - public static class BlockHalf extends BlockRubberPlankSlab { - public BlockHalf(String name) { - super(name); - } - - @Override - public boolean isDouble() { - return false; - } - } } diff --git a/src/main/java/techreborn/blocks/BlockRubberPlankStair.java b/src/main/java/techreborn/blocks/BlockRubberPlankStair.java index 049d30180..3ca58e9c2 100644 --- a/src/main/java/techreborn/blocks/BlockRubberPlankStair.java +++ b/src/main/java/techreborn/blocks/BlockRubberPlankStair.java @@ -24,17 +24,18 @@ package techreborn.blocks; +import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; import reborncore.client.models.ModelCompound; import reborncore.client.models.RebornModelRegistry; import techreborn.TechReborn; +import techreborn.init.TRContent; public class BlockRubberPlankStair extends BlockStairs { public BlockRubberPlankStair(IBlockState modelState, String name) { - super(modelState); - useNeighborBrightness = true; + super(modelState, Block.Properties.from(TRContent.RUBBER_PLANKS)); RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this)); } } \ No newline at end of file