From ea41348ded7f0056924a64bfaa4d67360abd71d7 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Wed, 6 Feb 2019 16:38:52 -0600 Subject: [PATCH] Begin block flattening. First victims: livingwood and livingrock --- .../botania/api/lexicon/ILexiconable.java | 1 + .../botania/api/state/BotaniaStateProps.java | 4 - .../api/state/enums/LivingRockVariant.java | 27 ----- .../api/state/enums/LivingWoodVariant.java | 28 ----- .../botania/common/block/BlockAltar.java | 36 +++--- .../botania/common/block/BlockLivingrock.java | 95 --------------- .../botania/common/block/BlockLivingwood.java | 111 ------------------ .../common/block/BlockModLexiconable.java | 22 ++++ .../botania/common/block/ModBlocks.java | 79 +++++++++---- .../botania/common/block/ModFluffBlocks.java | 57 ++------- .../block/decor/stairs/BlockLivingStairs.java | 11 -- .../block/decor/stairs/BlockModStairs.java | 8 +- .../stairs/living/BlockLivingwoodStairs.java | 12 -- .../item/block/ItemBlockSpecialQuartz.java | 31 ----- .../botania/common/lib/LibBlockNames.java | 9 ++ 15 files changed, 121 insertions(+), 410 deletions(-) delete mode 100644 src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java delete mode 100644 src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java delete mode 100644 src/main/java/vazkii/botania/common/block/BlockLivingrock.java delete mode 100644 src/main/java/vazkii/botania/common/block/BlockLivingwood.java create mode 100644 src/main/java/vazkii/botania/common/block/BlockModLexiconable.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java delete mode 100644 src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java delete mode 100644 src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java diff --git a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java index a2245505e..3ed8c200f 100644 --- a/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java +++ b/src/main/java/vazkii/botania/api/lexicon/ILexiconable.java @@ -19,6 +19,7 @@ import net.minecraft.world.World; * Any block that implements this can be right clicked with * a Lexica Botania to open a entry page. */ +@FunctionalInterface public interface ILexiconable { /** diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index fd6721879..6473f3d31 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -27,7 +27,6 @@ import vazkii.botania.api.state.enums.AlfPortalState; import vazkii.botania.api.state.enums.BiomeBrickVariant; import vazkii.botania.api.state.enums.BiomeStoneVariant; import vazkii.botania.api.state.enums.CratePattern; -import vazkii.botania.api.state.enums.LivingRockVariant; import vazkii.botania.api.state.enums.LivingWoodVariant; import vazkii.botania.api.state.enums.LuminizerVariant; import vazkii.botania.api.state.enums.QuartzVariant; @@ -108,9 +107,6 @@ public final class BotaniaStateProps { // BlockLightRelay public static final EnumProperty LUMINIZER_VARIANT = EnumProperty.create("variant", LuminizerVariant.class); - // BlockLivingRock - public static final EnumProperty LIVINGROCK_VARIANT = EnumProperty.create("variant", LivingRockVariant.class); - // BlockModDoubleFlower (white to gray) public static final EnumProperty DOUBLEFLOWER_VARIANT_1 = EnumProperty.create("df_variant", EnumDyeColor.class, new Predicate() { @Override diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java deleted file mode 100644 index bd28a9730..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java +++ /dev/null @@ -1,27 +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 - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum LivingRockVariant implements IStringSerializable { - DEFAULT, - BRICK, - MOSSY_BRICK, - CRACKED_BRICK, - CHISELED_BRICK; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java deleted file mode 100644 index e9d27c2f1..000000000 --- a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java +++ /dev/null @@ -1,28 +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 - */ -package vazkii.botania.api.state.enums; - -import net.minecraft.util.IStringSerializable; - -import java.util.Locale; - -public enum LivingWoodVariant implements IStringSerializable { - DEFAULT, - PLANKS, - MOSSY_PLANKS, - FRAMED, - PATTERN_FRAMED, - GLIMMERING; - - @Override - public String getName() { - return name().toLowerCase(Locale.ROOT); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/BlockAltar.java b/src/main/java/vazkii/botania/common/block/BlockAltar.java index 43da0b6d7..f0817502d 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltar.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; @@ -23,9 +24,12 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockRenderLayer; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; +import net.minecraft.util.IItemProvider; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; +import net.minecraft.util.math.shapes.VoxelShape; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorldReader; import net.minecraft.world.World; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -55,7 +59,7 @@ import java.util.Random; public class BlockAltar extends BlockMod implements ILexiconable { - private static final AxisAlignedBB AABB = new AxisAlignedBB(0.125, 0.125, 0.125, 0.875, 20.0/16, 0.875); + private static final VoxelShape AABB = Block.makeCuboidShape(2, 2, 2, 14, 20, 14); public enum Variant { DEFAULT, @@ -72,16 +76,14 @@ public class BlockAltar extends BlockMod implements ILexiconable { public final Variant variant; - protected BlockAltar(Variant v) { - super(Material.ROCK, LibBlockNames.APOTHECARY_PREFIX + v.name().toLowerCase(Locale.ROOT)); - setHardness(3.5F); - setSoundType(SoundType.STONE); + protected BlockAltar(Variant v, Block.Builder builder) { + super(builder); this.variant = v; } @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { + public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { return AABB; } @@ -94,16 +96,16 @@ public class BlockAltar extends BlockMod implements ILexiconable { @Nonnull @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { + public IItemProvider getItemDropped(IBlockState state, World world, BlockPos pos, int fortune) { if(variant == Variant.MOSSY) { - return Item.getItemFromBlock(ModBlocks.defaultAltar); + return ModBlocks.defaultAltar; } else { - return super.getItemDropped(state, rand, fortune); + return super.getItemDropped(state, world, pos, fortune); } } @Override - public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) { + public void onEntityCollision(IBlockState state, World world, BlockPos pos, Entity entity) { if(!world.isRemote && entity instanceof EntityItem) { TileAltar tile = (TileAltar) world.getTileEntity(pos); if(tile.collideEntityItem((EntityItem) entity)) @@ -112,7 +114,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { + public int getLightValue(@Nonnull IBlockState state, IWorldReader world, @Nonnull BlockPos pos) { if(world.getBlockState(pos).getBlock() != this) return world.getBlockState(pos).getLightValue(world, pos); TileAltar tile = (TileAltar) world.getTileEntity(pos); @@ -120,7 +122,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) { + public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) { TileAltar tile = (TileAltar) world.getTileEntity(pos); ItemStack stack = player.getHeldItem(hand); if(player.isSneaking()) { @@ -136,7 +138,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { if(!tile.hasWater) { if(stack.getItem() == ModItems.waterRod) ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true); - else if(!player.capabilities.isCreativeMode) + else if(!player.abilities.isCreativeMode) player.setHeldItem(hand, drain(FluidRegistry.WATER, stack)); tile.setWater(true); @@ -146,7 +148,7 @@ public class BlockAltar extends BlockMod implements ILexiconable { return true; } else if(!stack.isEmpty() && stack.getItem() == Items.LAVA_BUCKET) { - if(!player.capabilities.isCreativeMode) + if(!player.abilities.isCreativeMode) player.setHeldItem(hand, drain(FluidRegistry.LAVA, stack)); tile.setLava(true); @@ -232,12 +234,12 @@ public class BlockAltar extends BlockMod implements ILexiconable { } @Override - public void breakBlock(@Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState state) { + public void onReplaced(@Nonnull IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, @Nonnull IBlockState newState, boolean isMoving) { TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(pos); InventoryHelper.dropInventory(inv, world, state, pos); - super.breakBlock(world, pos, state); + super.onReplaced(state, world, pos, newState, isMoving); } @Override diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java b/src/main/java/vazkii/botania/common/block/BlockLivingrock.java deleted file mode 100644 index 0a0d59d07..000000000 --- a/src/main/java/vazkii/botania/common/block/BlockLivingrock.java +++ /dev/null @@ -1,95 +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 @ [Jan 25, 2014, 10:03:04 PM (GMT)] - */ -package vazkii.botania.common.block; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -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.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.LivingRockVariant; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; - -public class BlockLivingrock extends BlockMod implements ILexiconable { - - public BlockLivingrock() { - super(Material.ROCK, LibBlockNames.LIVING_ROCK); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.DEFAULT)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.LIVINGROCK_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.LIVINGROCK_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= LivingRockVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.LIVINGROCK_VARIANT, LivingRockVariant.values()[meta]); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { - for(int i = 0; i < LivingRockVariant.values().length; i++) - stacks.add(new ItemStack(this, 1, i)); - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(state)); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - boolean isDefaultVariant = world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGROCK_VARIANT) == LivingRockVariant.DEFAULT; - return isDefaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; - } - - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, LivingRockVariant.values().length); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java b/src/main/java/vazkii/botania/common/block/BlockLivingwood.java deleted file mode 100644 index b9be76aaa..000000000 --- a/src/main/java/vazkii/botania/common/block/BlockLivingwood.java +++ /dev/null @@ -1,111 +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 @ [Jan 25, 2014, 10:04:25 PM (GMT)] - */ -package vazkii.botania.common.block; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -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.item.ItemStack; -import net.minecraft.util.NonNullList; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.IBlockAccess; -import net.minecraft.world.World; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.lexicon.ILexiconable; -import vazkii.botania.api.lexicon.LexiconEntry; -import vazkii.botania.api.state.BotaniaStateProps; -import vazkii.botania.api.state.enums.LivingWoodVariant; -import vazkii.botania.client.core.handler.ModelHandler; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -import javax.annotation.Nonnull; - -public class BlockLivingwood extends BlockMod implements ILexiconable { - - public BlockLivingwood() { - this(LibBlockNames.LIVING_WOOD); - } - - public BlockLivingwood(String name) { - super(Material.WOOD, name); - setHardness(2.0F); - setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.DEFAULT)); - } - - @Nonnull - @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.LIVINGWOOD_VARIANT); - } - - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT).ordinal(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= LivingWoodVariant.values().length) { - meta = 0; - } - return getDefaultState().withProperty(BotaniaStateProps.LIVINGWOOD_VARIANT, LivingWoodVariant.values()[meta]); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { - for(int i = 0; i < LivingWoodVariant.values().length; i++) - stacks.add(new ItemStack(this, 1, i)); - } - - @Nonnull - @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(this, 1, getMetaFromState(state)); - } - - @Override - public int getLightValue(@Nonnull IBlockState state, IBlockAccess world, @Nonnull BlockPos pos) { - if(world.getBlockState(pos).getBlock() != this) - return world.getBlockState(pos).getLightValue(world, pos); - return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.GLIMMERING ? 12 : 0; - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - boolean defaultVariant = world.getBlockState(pos).getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; - return defaultVariant ? LexiconData.pureDaisy : LexiconData.decorativeBlocks; - } - - @Override - public boolean canSustainLeaves(IBlockState state, IBlockAccess world, BlockPos pos) { - return state.getValue(BotaniaStateProps.LIVINGWOOD_VARIANT) == LivingWoodVariant.DEFAULT; - } - - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerBlockToState(this, LivingWoodVariant.values().length); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java b/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java new file mode 100644 index 000000000..e56012192 --- /dev/null +++ b/src/main/java/vazkii/botania/common/block/BlockModLexiconable.java @@ -0,0 +1,22 @@ +package vazkii.botania.common.block; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import vazkii.botania.api.lexicon.ILexiconable; +import vazkii.botania.api.lexicon.LexiconEntry; + +public class BlockModLexiconable extends BlockMod implements ILexiconable { + private final ILexiconable delegate; + + public BlockModLexiconable(Builder builder, ILexiconable delegate) { + super(builder); + this.delegate = delegate; + } + + @Override + public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { + return delegate.getEntry(world, pos, player, lexicon); + } +} diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index ae1ee7b44..53aa68919 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -27,7 +27,9 @@ import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.registries.IForgeRegistry; +import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.api.BotaniaAPI; +import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.recipe.RecipeManaInfusion; import vazkii.botania.api.subtile.SubTileEntity; import vazkii.botania.client.lib.LibResources; @@ -112,25 +114,41 @@ import vazkii.botania.common.item.block.ItemBlockPool; import vazkii.botania.common.item.block.ItemBlockSpecialFlower; import vazkii.botania.common.item.block.ItemBlockTinyPotato; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; +import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; import vazkii.botania.common.lib.LibMisc; import vazkii.botania.common.lib.LibOreDict; +import java.util.Locale; + @Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +@ObjectHolder(LibMisc.MOD_ID) public final class ModBlocks { public static final Block flower = new BlockModFlower(); - public static final Block defaultAltar = new BlockAltar(BlockAltar.Variant.DEFAULT); - public static final Block forestAltar = new BlockAltar(BlockAltar.Variant.FOREST); - public static final Block plainsAltar = new BlockAltar(BlockAltar.Variant.PLAINS); - public static final Block mountainAltar = new BlockAltar(BlockAltar.Variant.MOUNTAIN); - public static final Block fungalAltar = new BlockAltar(BlockAltar.Variant.FUNGAL); - public static final Block swampAltar = new BlockAltar(BlockAltar.Variant.SWAMP); - public static final Block desertAltar = new BlockAltar(BlockAltar.Variant.DESERT); - public static final Block taigaAltar = new BlockAltar(BlockAltar.Variant.TAIGA); - public static final Block mesaAltar = new BlockAltar(BlockAltar.Variant.MESA); - public static final Block mossyAltar = new BlockAltar(BlockAltar.Variant.MOSSY); - public static final Block livingrock = new BlockLivingrock(); - public static final Block livingwood = new BlockLivingwood(); + @ObjectHolder("apothecary_default") public static Block defaultAltar; + @ObjectHolder("apothecary_forest") public static Block forestAltar; + @ObjectHolder("apothecary_plains") public static Block plainsAltar; + @ObjectHolder("apothecary_mountain") public static Block mountainAltar; + @ObjectHolder("apothecary_fungal") public static Block fungalAltar; + @ObjectHolder("apothecary_swamp") public static Block swampAltar; + @ObjectHolder("apothecary_desert") public static Block desertAltar; + @ObjectHolder("apothecary_taiga") public static Block taigaAltar; + @ObjectHolder("apothecary_mesa") public static Block mesaAltar; + @ObjectHolder("apothecary_mossy") public static Block mossyAltar; + + @ObjectHolder(LibBlockNames.LIVING_ROCK) public static Block livingrock; + @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK) public static Block livingrockBrick; + @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK_CHISELED) public static Block livingrockBrickChiseled; + @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK_CRACKED) public static Block livingrockBrickCracked; + @ObjectHolder(LibBlockNames.LIVING_ROCK_BRICK_MOSSY) public static Block livingrockBrickMossy; + + @ObjectHolder(LibBlockNames.LIVING_WOOD) public static Block livingwood; + @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS) public static Block livingwoodPlanks; + @ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS_MOSSY) public static Block livingwoodPlanksMossy; + @ObjectHolder(LibBlockNames.LIVING_WOOD_FRAMED) public static Block livingwoodFramed; + @ObjectHolder(LibBlockNames.LIVING_WOOD_PATTERN_FRAMED) public static Block livingwoodPatternFramed; + @ObjectHolder(LibBlockNames.LIVING_WOOD_GLIMMERING) public static Block livingwoodGlimmering; + public static final Block specialFlower = new BlockSpecialFlower(); public static final Block manaSpreader = new BlockSpreader(BlockSpreader.Variant.MANA); public static final Block redstoneSpreader = new BlockSpreader(BlockSpreader.Variant.REDSTONE); @@ -266,19 +284,34 @@ public final class ModBlocks { @SubscribeEvent public static void registerBlocks(RegistryEvent.Register evt) { IForgeRegistry r = evt.getRegistry(); + ILexiconable decorative = (w, po, pl, st) -> LexiconData.decorativeBlocks; r.register(flower); - r.register(defaultAltar); - r.register(forestAltar); - r.register(plainsAltar); - r.register(mountainAltar); - r.register(fungalAltar); - r.register(swampAltar); - r.register(desertAltar); - r.register(taigaAltar); - r.register(mesaAltar); - r.register(mossyAltar); - r.register(livingrock); + + Block.Builder builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(3.5F).sound(SoundType.STONE); + for(BlockAltar.Variant v : BlockAltar.Variant.values()) { + r.register(new BlockAltar(v, builder) + .setRegistryName(LibMisc.MOD_ID, LibBlockNames.APOTHECARY_PREFIX + v.name().toLowerCase(Locale.ROOT))); + } + + // Livingstones + builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); + r.register(new BlockModLexiconable(builder, (w, po, pl, st) -> LexiconData.pureDaisy).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_ROCK)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_ROCK_BRICK)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_ROCK_BRICK_MOSSY)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_ROCK_BRICK_CRACKED)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_ROCK_BRICK_CHISELED)); + + // Livingwoods + builder = Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD); + // todo 1.13: livingwood should support leaves + r.register(new BlockModLexiconable(builder, (w, po, pl, st) -> LexiconData.pureDaisy).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD_PLANKS)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD_PLANKS_MOSSY)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD_FRAMED)); + r.register(new BlockModLexiconable(builder, decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD_PATTERN_FRAMED); + r.register(new BlockModLexiconable(builder.lightValue(12), decorative).setRegistryName(LibMisc.MOD_ID, LibBlockNames.LIVING_WOOD_GLIMMERING)); + r.register(livingwood); r.register(specialFlower); r.register(manaSpreader); diff --git a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java index 415e37ef4..2a56494e2 100644 --- a/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModFluffBlocks.java @@ -41,6 +41,7 @@ import vazkii.botania.common.block.decor.slabs.living.BlockLivingwoodSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerrockSlab; import vazkii.botania.common.block.decor.slabs.living.BlockShimmerwoodPlankSlab; import vazkii.botania.common.block.decor.stairs.BlockBiomeStoneStairs; +import vazkii.botania.common.block.decor.stairs.BlockModStairs; import vazkii.botania.common.block.decor.stairs.BlockPavementStairs; import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodPlankStairs; import vazkii.botania.common.block.decor.stairs.living.BlockDreamwoodStairs; @@ -71,55 +72,43 @@ public final class ModFluffBlocks { public static List slabsToRegister = new ArrayList<>(); - public static final Block livingwoodStairs = new BlockLivingwoodStairs(); + public static final Block livingwoodStairs = new BlockModStairs(ModBlocks.livingwood.getDefaultState(), Block.Builder.from(ModBlocks.livingwood)); public static final Block livingwoodSlab = new BlockLivingwoodSlab(false); - public static final Block livingwoodSlabFull = new BlockLivingwoodSlab(true); public static final Block livingwoodWall = new BlockLivingwoodWall(); public static final Block livingwoodPlankStairs = new BlockLivingwoodPlankStairs(); public static final Block livingwoodPlankSlab = new BlockLivingwoodPlankSlab(false); - public static final Block livingwoodPlankSlabFull = new BlockLivingwoodPlankSlab(true); public static final Block livingrockStairs = new BlockLivingrockStairs(); public static final Block livingrockSlab = new BlockLivingrockSlab(false); public static final Block livingrockSlabFull = new BlockLivingrockSlab(true); public static final Block livingrockWall = new BlockLivingrockWall(); public static final Block livingrockBrickStairs = new BlockLivingrockBrickStairs(); public static final Block livingrockBrickSlab = new BlockLivingrockBrickSlab(false); - public static final Block livingrockBrickSlabFull = new BlockLivingrockBrickSlab(true); public static final Block dreamwoodStairs = new BlockDreamwoodStairs(); public static final Block dreamwoodSlab = new BlockDreamwoodSlab(false); - public static final Block dreamwoodSlabFull = new BlockDreamwoodSlab(true); public static final Block dreamwoodWall = new BlockDreamwoodWall(); public static final Block dreamwoodPlankStairs = new BlockDreamwoodPlankStairs(); public static final Block dreamwoodPlankSlab = new BlockDreamwoodPlankSlab(false); - public static final Block dreamwoodPlankSlabFull = new BlockDreamwoodPlankSlab(true); public static final Block darkQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_DARK); public static final Block darkQuartzSlab = new BlockSpecialQuartzSlab(darkQuartz, false); - public static final Block darkQuartzSlabFull = new BlockSpecialQuartzSlab(darkQuartz, true); public static final Block darkQuartzStairs = new BlockSpecialQuartzStairs(darkQuartz); public static final Block manaQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_MANA); public static final Block manaQuartzSlab = new BlockSpecialQuartzSlab(manaQuartz, false); - public static final Block manaQuartzSlabFull = new BlockSpecialQuartzSlab(manaQuartz, true); public static final Block manaQuartzStairs = new BlockSpecialQuartzStairs(manaQuartz); public static final Block blazeQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_BLAZE); public static final Block blazeQuartzSlab = new BlockSpecialQuartzSlab(blazeQuartz, false); - public static final Block blazeQuartzSlabFull = new BlockSpecialQuartzSlab(blazeQuartz, true); public static final Block blazeQuartzStairs = new BlockSpecialQuartzStairs(blazeQuartz); public static final Block lavenderQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_LAVENDER); public static final Block lavenderQuartzSlab = new BlockSpecialQuartzSlab(lavenderQuartz, false); - public static final Block lavenderQuartzSlabFull = new BlockSpecialQuartzSlab(lavenderQuartz, true); public static final Block lavenderQuartzStairs = new BlockSpecialQuartzStairs(lavenderQuartz); public static final Block redQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_RED); public static final Block redQuartzSlab = new BlockSpecialQuartzSlab(redQuartz, false); - public static final Block redQuartzSlabFull = new BlockSpecialQuartzSlab(redQuartz, true); public static final Block redQuartzStairs = new BlockSpecialQuartzStairs(redQuartz); public static final Block elfQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_ELF); public static final Block elfQuartzSlab = new BlockSpecialQuartzSlab(elfQuartz, false); - public static final Block elfQuartzSlabFull = new BlockSpecialQuartzSlab(elfQuartz, true); public static final Block elfQuartzStairs = new BlockSpecialQuartzStairs(elfQuartz); public static final Block sunnyQuartz = new BlockSpecialQuartz(LibBlockNames.QUARTZ_SUNNY); public static final Block sunnyQuartzSlab = new BlockSpecialQuartzSlab(sunnyQuartz, false); - public static final Block sunnyQuartzSlabFull = new BlockSpecialQuartzSlab(sunnyQuartz, true); public static final Block sunnyQuartzStairs = new BlockSpecialQuartzStairs(sunnyQuartz); public static final Block biomeStoneA = new BlockBiomeStoneA(); @@ -128,18 +117,14 @@ public final class ModFluffBlocks { public static final Block[] biomeStoneStairs = new Block[24]; public static final Block[] biomeStoneSlabs = new Block[24]; - public static final Block[] biomeStoneFullSlabs = new Block[24]; public static final Block biomeStoneWall = new BlockBiomeStoneWall(); public static final Block[] pavementStairs = new Block[BlockPavement.TYPES]; public static final Block[] pavementSlabs = new Block[BlockPavement.TYPES]; - public static final Block[] pavementFullSlabs = new Block[BlockPavement.TYPES]; public static final Block shimmerrockSlab = new BlockShimmerrockSlab(false); - public static final Block shimmerrockSlabFull = new BlockShimmerrockSlab(true); public static final Block shimmerrockStairs = new BlockShimmerrockStairs(); public static final Block shimmerwoodPlankSlab = new BlockShimmerwoodPlankSlab(false); - public static final Block shimmerwoodPlankSlabFull = new BlockShimmerwoodPlankSlab(true); public static final Block shimmerwoodPlankStairs = new BlockShimmerwoodPlankStairs(); public static final Block managlassPane = new BlockManaglassPane(); @@ -151,13 +136,11 @@ public final class ModFluffBlocks { IForgeRegistry r = evt.getRegistry(); r.register(livingwoodStairs); r.register(livingwoodSlab); - r.register(livingwoodSlabFull); r.register(livingwoodWall); r.register(livingwoodPlankStairs); r.register(livingwoodPlankSlab); - r.register(livingwoodPlankSlabFull); - + r.register(livingrockStairs); r.register(livingrockSlab); r.register(livingrockSlabFull); @@ -165,50 +148,40 @@ public final class ModFluffBlocks { r.register(livingrockBrickStairs); r.register(livingrockBrickSlab); - r.register(livingrockBrickSlabFull); - + r.register(dreamwoodStairs); r.register(dreamwoodSlab); - r.register(dreamwoodSlabFull); r.register(dreamwoodWall); r.register(dreamwoodPlankStairs); r.register(dreamwoodPlankSlab); - r.register(dreamwoodPlankSlabFull); r.register(darkQuartz); r.register(darkQuartzSlab); - r.register(darkQuartzSlabFull); r.register(darkQuartzStairs); r.register(manaQuartz); r.register(manaQuartzSlab); - r.register(manaQuartzSlabFull); r.register(manaQuartzStairs); r.register(blazeQuartz); r.register(blazeQuartzSlab); - r.register(blazeQuartzSlabFull); r.register(blazeQuartzStairs); r.register(lavenderQuartz); r.register(lavenderQuartzSlab); - r.register(lavenderQuartzSlabFull); r.register(lavenderQuartzStairs); r.register(redQuartz); r.register(redQuartzSlab); - r.register(redQuartzSlabFull); r.register(redQuartzStairs); r.register(elfQuartz); r.register(elfQuartzSlab); - r.register(elfQuartzSlabFull); r.register(elfQuartzStairs); r.register(sunnyQuartz); r.register(sunnyQuartzSlab); - r.register(sunnyQuartzSlabFull); r.register(sunnyQuartzStairs); r.register(biomeStoneA); @@ -219,10 +192,8 @@ public final class ModFluffBlocks { for (BiomeStoneVariant variant : BiomeStoneVariant.values()) { biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant)); biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count); - biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneA.getDefaultState().withProperty(BotaniaStateProps.BIOMESTONE_VARIANT, variant), count); r.register(biomeStoneStairs[count]); r.register(biomeStoneSlabs[count]); - r.register(biomeStoneFullSlabs[count]); count++; } @@ -233,10 +204,8 @@ public final class ModFluffBlocks { } biomeStoneStairs[count] = new BlockBiomeStoneStairs(biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant)); biomeStoneSlabs[count] = new BlockBiomeStoneSlab(false, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); - biomeStoneFullSlabs[count] = new BlockBiomeStoneSlab(true, biomeStoneB.getDefaultState().withProperty(BotaniaStateProps.BIOMEBRICK_VARIANT, variant), count); r.register(biomeStoneStairs[count]); r.register(biomeStoneSlabs[count]); - r.register(biomeStoneFullSlabs[count]); count++; } @@ -247,19 +216,15 @@ public final class ModFluffBlocks { EnumDyeColor.RED, EnumDyeColor.YELLOW, EnumDyeColor.GREEN)) { pavementStairs[count] = new BlockPavementStairs(color); pavementSlabs[count] = new BlockPavementSlab(false, color, count); - pavementFullSlabs[count] = new BlockPavementSlab(true, color, count); r.register(pavementStairs[count]); r.register(pavementSlabs[count]); - r.register(pavementFullSlabs[count]); count++; } r.register(shimmerrockSlab); - r.register(shimmerrockSlabFull); r.register(shimmerrockStairs); r.register(shimmerwoodPlankSlab); - r.register(shimmerwoodPlankSlabFull); r.register(shimmerwoodPlankStairs); r.register(managlassPane); @@ -291,31 +256,31 @@ public final class ModFluffBlocks { r.register(new ItemBlockMod(dreamwoodPlankStairs).setRegistryName(dreamwoodPlankStairs.getRegistryName())); r.register(new ItemBlockMod(dreamwoodPlankSlab).setRegistryName(dreamwoodPlankSlab.getRegistryName())); - r.register(new ItemBlockSpecialQuartz(darkQuartz).setRegistryName(darkQuartz.getRegistryName())); + r.register(new ItemBlockMod(darkQuartz).setRegistryName(darkQuartz.getRegistryName())); r.register(new ItemBlockMod(darkQuartzSlab).setRegistryName(darkQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(darkQuartzStairs).setRegistryName(darkQuartzStairs.getRegistryName())); - r.register(new ItemBlockSpecialQuartz(manaQuartz).setRegistryName(manaQuartz.getRegistryName())); + r.register(new ItemBlockMod(manaQuartz).setRegistryName(manaQuartz.getRegistryName())); r.register(new ItemBlockMod(manaQuartzSlab).setRegistryName(manaQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(manaQuartzStairs).setRegistryName(manaQuartzStairs.getRegistryName())); - r.register(new ItemBlockSpecialQuartz(blazeQuartz).setRegistryName(blazeQuartz.getRegistryName())); + r.register(new ItemBlockMod(blazeQuartz).setRegistryName(blazeQuartz.getRegistryName())); r.register(new ItemBlockMod(blazeQuartzSlab).setRegistryName(blazeQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(blazeQuartzStairs).setRegistryName(blazeQuartzStairs.getRegistryName())); - r.register(new ItemBlockSpecialQuartz(lavenderQuartz).setRegistryName(lavenderQuartz.getRegistryName())); + r.register(new ItemBlockMod(lavenderQuartz).setRegistryName(lavenderQuartz.getRegistryName())); r.register(new ItemBlockMod(lavenderQuartzSlab).setRegistryName(lavenderQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(lavenderQuartzStairs).setRegistryName(lavenderQuartzStairs.getRegistryName())); - r.register(new ItemBlockSpecialQuartz(redQuartz).setRegistryName(redQuartz.getRegistryName())); + r.register(new ItemBlockMod(redQuartz).setRegistryName(redQuartz.getRegistryName())); r.register(new ItemBlockMod(redQuartzSlab).setRegistryName(redQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(redQuartzStairs).setRegistryName(redQuartzStairs.getRegistryName())); - r.register(new ItemBlockSpecialQuartz(elfQuartz).setRegistryName(elfQuartz.getRegistryName())); + r.register(new ItemBlockMod(elfQuartz).setRegistryName(elfQuartz.getRegistryName())); r.register(new ItemBlockMod(elfQuartzSlab).setRegistryName(elfQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(elfQuartzStairs).setRegistryName(elfQuartzStairs.getRegistryName())); - r.register(new ItemBlockSpecialQuartz(sunnyQuartz).setRegistryName(sunnyQuartz.getRegistryName())); + r.register(new ItemBlockMod(sunnyQuartz).setRegistryName(sunnyQuartz.getRegistryName())); r.register(new ItemBlockMod(sunnyQuartzSlab).setRegistryName(sunnyQuartzSlab.getRegistryName())); r.register(new ItemBlockMod(sunnyQuartzStairs).setRegistryName(sunnyQuartzStairs.getRegistryName())); diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java deleted file mode 100644 index adfadeb23..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockLivingStairs.java +++ /dev/null @@ -1,11 +0,0 @@ -package vazkii.botania.common.block.decor.stairs; - -import net.minecraft.block.state.IBlockState; - -public class BlockLivingStairs extends BlockModStairs { - - public BlockLivingStairs(IBlockState state) { - super(state, state.getBlock().getTranslationKey().replaceAll("tile.", "") + state.getBlock().getMetaFromState(state) + "Stairs"); - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java index 771f4d021..a1aa538a9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java +++ b/src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java @@ -1,5 +1,6 @@ package vazkii.botania.common.block.decor.stairs; +import net.minecraft.block.Block; import net.minecraft.block.BlockStairs; import net.minecraft.block.state.IBlockState; import net.minecraft.client.renderer.block.model.ModelResourceLocation; @@ -21,12 +22,9 @@ import vazkii.botania.common.lib.LibMisc; public class BlockModStairs extends BlockStairs implements ILexiconable, IModelRegister { - public BlockModStairs(IBlockState state, String name) { - super(state); - setRegistryName(new ResourceLocation(LibMisc.MOD_ID, name)); - setTranslationKey(name); + public BlockModStairs(IBlockState state, Block.Builder builder) { + super(state, builder); setCreativeTab(BotaniaCreativeTab.INSTANCE); - useNeighborBrightness = true; } @Override diff --git a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java b/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java deleted file mode 100644 index 40622fdf1..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/stairs/living/BlockLivingwoodStairs.java +++ /dev/null @@ -1,12 +0,0 @@ -package vazkii.botania.common.block.decor.stairs.living; - -import vazkii.botania.common.block.ModBlocks; -import vazkii.botania.common.block.decor.stairs.BlockLivingStairs; - -public class BlockLivingwoodStairs extends BlockLivingStairs { - - public BlockLivingwoodStairs() { - super(ModBlocks.livingwood.getDefaultState()); - } - -} diff --git a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java b/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java deleted file mode 100644 index baa81fdb5..000000000 --- a/src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java +++ /dev/null @@ -1,31 +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 @ [Jun 11, 2014, 1:13:36 AM (GMT)] - */ -package vazkii.botania.common.item.block; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemMultiTexture; -import net.minecraft.item.ItemStack; -import vazkii.botania.common.block.decor.quartz.BlockSpecialQuartz; - -import javax.annotation.Nonnull; - -public class ItemBlockSpecialQuartz extends ItemMultiTexture { - - public ItemBlockSpecialQuartz(Block par1) { - super(par1, par1, new String[]{ "" }); - } - - @Nonnull - @Override - public String getTranslationKey(@Nonnull ItemStack stack) { - return stack.getItemDamage() >= 3 ? "" : ((BlockSpecialQuartz) block).getNames()[stack.getItemDamage()]; - } -} \ No newline at end of file diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 919def5dc..cc6cf4a22 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -19,7 +19,16 @@ public final class LibBlockNames { public static final String APOTHECARY_PREFIX = "apothecary_"; public static final String SPECIAL_FLOWER = "special_flower"; public static final String LIVING_ROCK = "livingrock"; + public static final String LIVING_ROCK_BRICK = "livingrock_brick"; + public static final String LIVING_ROCK_BRICK_MOSSY = "mossy_livingrock_brick"; + public static final String LIVING_ROCK_BRICK_CRACKED = "cracked_livingrock_brick"; + public static final String LIVING_ROCK_BRICK_CHISELED = "chiseled_livingrock_brick"; public static final String LIVING_WOOD = "livingwood"; + public static final String LIVING_WOOD_PLANKS = "livingwood_planks"; + public static final String LIVING_WOOD_PLANKS_MOSSY = "mossy_livingwood_planks"; + public static final String LIVING_WOOD_FRAMED = "framed_livingwood"; + public static final String LIVING_WOOD_PATTERN_FRAMED = "pattern_framed_livingwood"; + public static final String LIVING_WOOD_GLIMMERING = "glimmering_livingwood"; public static final String SPREADER = "spreader"; public static final String SPREADER_SUFFIX = "_" + SPREADER; public static final String POOL = "pool";