diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 72365b087..460463af8 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -10,28 +10,27 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.BlockDirt; 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.init.Blocks; +import net.minecraft.init.Particles; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.util.EnumParticleTypes; +import net.minecraft.util.IItemProvider; import net.minecraft.util.IStringSerializable; 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.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.common.EnumPlantType; import net.minecraftforge.common.IPlantable; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.common.ToolType; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.state.BotaniaStateProps; @@ -57,28 +56,25 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { private final Variant variant; - public BlockAltGrass(Variant v) { - super(Material.GRASS, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX); - setHardness(0.6F); - setSoundType(SoundType.PLANT); - setTickRandomly(true); + public BlockAltGrass(Variant v, Builder builder) { + super(builder); this.variant = v; } @Override - public boolean isToolEffective(String type, @Nonnull IBlockState state) { - return type.equals("shovel"); + public boolean isToolEffective(IBlockState state, ToolType tool) { + return tool.equals(ToolType.SHOVEL); } @Override - public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + public void tick(IBlockState state, World world, BlockPos pos, Random rand) { if(!world.isRemote && state.getBlock() == this && world.getLight(pos.up()) >= 9) { for(int l = 0; l < 4; ++l) { BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1); world.getBlockState(pos1.up()).getBlock(); - if(world.getBlockState(pos1).getBlock() == Blocks.DIRT && world.getBlockState(pos1).getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2) + if(world.getBlockState(pos1).getBlock() == Blocks.DIRT && world.getLight(pos1.up()) >= 4 && world.getBlockLightOpacity(pos1.up()) <= 2) world.setBlockState(pos1, getDefaultState(), 1 | 2); } } @@ -86,21 +82,19 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { @Nonnull @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return Blocks.DIRT.getItemDropped(state, rand, fortune); + public IItemProvider getItemDropped(IBlockState state, World world, BlockPos pos, int fortune) { + return Blocks.DIRT.getItemDropped(state, world, pos, fortune); } @Override - public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockAccess world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { + public boolean canSustainPlant(@Nonnull IBlockState state, @Nonnull IBlockReader world, BlockPos pos, @Nonnull EnumFacing direction, IPlantable plantable) { EnumPlantType type = plantable.getPlantType(world, pos.down()); return type == EnumPlantType.Plains || type == EnumPlantType.Beach; } @OnlyIn(Dist.CLIENT) @Override - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random r) { - if (state.getBlock() != this) - return; + public void animateTick(IBlockState state, World world, BlockPos pos, Random r) { switch(variant) { case DRY: break; @@ -110,7 +104,7 @@ public class BlockAltGrass extends BlockMod implements ILexiconable { break; case SCORCHED: if(r.nextInt(80) == 0) - world.spawnParticle(EnumParticleTypes.FLAME, pos.getX() + r.nextFloat(), pos.getY() + 1.1, pos.getZ() + r.nextFloat(), 0, 0, 0); + world.spawnParticle(Particles.FLAME, pos.getX() + r.nextFloat(), pos.getY() + 1.1, pos.getZ() + r.nextFloat(), 0, 0, 0); break; case INFUSED: if(r.nextInt(100) == 0) diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index fb455b4b5..e9aad6fc7 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -10,11 +10,9 @@ */ package vazkii.botania.common.block; -import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.ScaledResolution; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -24,7 +22,9 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; 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.IWorld; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -35,24 +35,21 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; -import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileAnimatedTorch; import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrigger, IHourglassTrigger, IWandHUD, ILexiconable { - private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 1, 0.25, 1); + private static final VoxelShape SHAPE = makeCuboidShape(0, 0, 0, 16, 4, 16); - public BlockAnimatedTorch() { - super(Material.CIRCUITS, LibBlockNames.ANIMATED_TORCH); - setLightLevel(0.5F); + public BlockAnimatedTorch(Builder builder) { + super(builder); } @Override - public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { + public boolean onBlockActivated(IBlockState state, World worldIn, BlockPos pos, EntityPlayer playerIn, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) { if(hand == EnumHand.MAIN_HAND && playerIn.isSneaking() && playerIn.getHeldItem(hand).isEmpty()) { ((TileAnimatedTorch) worldIn.getTileEntity(pos)).handRotate(); return true; @@ -85,8 +82,8 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig @Override @OnlyIn(Dist.CLIENT) - public void renderHUD(Minecraft mc, ScaledResolution res, World world, BlockPos pos) { - ((TileAnimatedTorch) world.getTileEntity(pos)).renderHUD(mc, res); + public void renderHUD(Minecraft mc, World world, BlockPos pos) { + ((TileAnimatedTorch) world.getTileEntity(pos)).renderHUD(mc); } @Override @@ -95,12 +92,12 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig } @Override - public int getStrongPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + public int getStrongPower(IBlockState blockState, IBlockReader blockAccess, BlockPos pos, EnumFacing side) { return getWeakPower(blockState, blockAccess, pos, side); } @Override - public int getWeakPower(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { + public int getWeakPower(IBlockState blockState, IBlockReader blockAccess, BlockPos pos, EnumFacing side) { TileAnimatedTorch tile = (TileAnimatedTorch) blockAccess.getTileEntity(pos); if(tile.rotating) @@ -118,11 +115,6 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return EnumBlockRenderType.ENTITYBLOCK_ANIMATED; } - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - @Override public boolean isFullCube(IBlockState state) { return false; @@ -130,12 +122,12 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - return AABB; + public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { + return SHAPE; } @Override - public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { + public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { return new TileAnimatedTorch(); } @@ -146,16 +138,14 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig @Nonnull @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing side) { return BlockFaceShape.UNDEFINED; } @Override - public void onPlayerDestroy(World world, BlockPos pos, IBlockState state) { + public void onPlayerDestroy(IWorld world, BlockPos pos, IBlockState state) { // TE is already gone so best we can do is just notify everyone - for(EnumFacing side : EnumFacing.VALUES) { - world.notifyNeighborsOfStateChange(pos.offset(side), this, false); - } + world.notifyNeighbors(pos, this); super.onPlayerDestroy(world, pos, state); } @@ -164,11 +154,4 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return LexiconData.animatedTorch; } - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - super.registerModels(); - ModelHandler.registerCustomItemblock(this, "animatedtorch"); - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockAvatar.java b/src/main/java/vazkii/botania/common/block/BlockAvatar.java index 257055a5b..1a4833732 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAvatar.java +++ b/src/main/java/vazkii/botania/common/block/BlockAvatar.java @@ -10,23 +10,24 @@ */ 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.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.state.StateContainer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; 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.World; import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.model.ModelLoader; @@ -48,46 +49,29 @@ import javax.annotation.Nonnull; public class BlockAvatar extends BlockMod implements ILexiconable { - private static final AxisAlignedBB X_AABB = new AxisAlignedBB(.3125, 0, .21875, 1-.3125, 17/16.0, 1-.21875); - private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(.21875, 0, .3125, 1-.21875, 17/16.0, 1-.3125); + private static final VoxelShape X_AABB = makeCuboidShape(5, 0, 3.5, 11, 17, 12.5); + private static final VoxelShape Z_AABB = makeCuboidShape(3.5, 0, 5, 12.5, 17, 11); - protected BlockAvatar() { - super(Material.WOOD, LibBlockNames.AVATAR); - setHardness(2.0F); - setSoundType(SoundType.WOOD); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); + protected BlockAvatar(Builder builder) { + super(builder); + setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.CARDINALS, EnumFacing.NORTH)); } @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) + public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { + if(state.get(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) return X_AABB; else return Z_AABB; } - @Nonnull @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.CARDINALS); + protected void fillStateContainer(StateContainer.Builder builder) { + builder.add(BotaniaStateProps.CARDINALS); } @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); - } - - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta < 2 || meta > 5) { - meta = 2; - } - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.byIndex(meta)); - } - - @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { TileAvatar avatar = (TileAvatar) world.getTileEntity(pos); ItemStack stackOnAvatar = avatar.getItemHandler().getStackInSlot(0); ItemStack stackOnPlayer = player.getHeldItem(hand); @@ -96,7 +80,7 @@ public class BlockAvatar extends BlockMod implements ILexiconable { ItemHandlerHelper.giveItemToPlayer(player, stackOnAvatar); return true; } else if(!stackOnPlayer.isEmpty() && stackOnPlayer.getItem() instanceof IAvatarWieldable) { - avatar.getItemHandler().setStackInSlot(0, stackOnPlayer.splitStack(1)); + avatar.getItemHandler().setStackInSlot(0, stackOnPlayer.split(1)); return true; } @@ -104,22 +88,18 @@ public class BlockAvatar 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 public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; + // todo 1.13 getstateforplacement + world.setBlockState(pos, state.with(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite())); } @Override @@ -140,13 +120,13 @@ public class BlockAvatar extends BlockMod implements ILexiconable { @Nonnull @Override - public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { + public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { return new TileAvatar(); } @Nonnull @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing side) { return BlockFaceShape.UNDEFINED; } @@ -155,12 +135,4 @@ public class BlockAvatar extends BlockMod implements ILexiconable { return LexiconData.avatar; } - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(BotaniaStateProps.CARDINALS).build()); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileAvatar.class); - ModelHandler.registerCustomItemblock(this, "avatar"); - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockCell.java b/src/main/java/vazkii/botania/common/block/BlockCell.java index 62caf1f43..9eec58206 100644 --- a/src/main/java/vazkii/botania/common/block/BlockCell.java +++ b/src/main/java/vazkii/botania/common/block/BlockCell.java @@ -18,7 +18,9 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IItemProvider; import net.minecraft.util.math.BlockPos; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; @@ -31,14 +33,13 @@ import java.util.Random; public class BlockCell extends BlockMod implements ILexiconable { - public BlockCell() { - super(Material.GOURD, LibBlockNames.CELL_BLOCK); - setSoundType(SoundType.CLOTH); + public BlockCell(Builder builder) { + super(builder); } @Nonnull @Override - public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { + public IItemProvider getItemDropped(IBlockState state, World world, BlockPos pos, int fortune) { return Items.AIR; } @@ -49,7 +50,7 @@ public class BlockCell extends BlockMod implements ILexiconable { @Nonnull @Override - public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { + public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { return new TileCell(); } diff --git a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java index 48b6d87ab..bcbe4b19b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockFakeAir.java +++ b/src/main/java/vazkii/botania/common/block/BlockFakeAir.java @@ -11,6 +11,7 @@ package vazkii.botania.common.block; import net.minecraft.block.Block; +import net.minecraft.block.BlockAir; import net.minecraft.block.material.Material; import net.minecraft.block.state.BlockFaceShape; import net.minecraft.block.state.IBlockState; @@ -24,7 +25,8 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.Explosion; -import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; +import net.minecraft.world.IWorldReaderBase; import net.minecraft.world.World; import vazkii.botania.common.block.tile.TileFakeAir; import vazkii.botania.common.lib.LibBlockNames; @@ -32,31 +34,18 @@ import vazkii.botania.common.lib.LibBlockNames; import javax.annotation.Nonnull; import java.util.Random; -public class BlockFakeAir extends BlockMod { +public class BlockFakeAir extends BlockAir { private static final AxisAlignedBB AABB = new AxisAlignedBB(0, 0, 0, 0, 0, 0); - public BlockFakeAir() { - super(Material.STRUCTURE_VOID, LibBlockNames.FAKE_AIR); - setTickRandomly(true); - } - - @Nonnull - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - return AABB; - } - - @Nonnull - @Override - public EnumBlockRenderType getRenderType(IBlockState state) { - return EnumBlockRenderType.INVISIBLE; + public BlockFakeAir(Builder builder) { + super(builder); } @Override public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) { if(shouldRemove(world, pos)) - world.scheduleUpdate(pos, this, tickRate(world)); + world.getPendingBlockTicks().scheduleTick(pos, this, tickRate(world)); } private boolean shouldRemove(World world, BlockPos pos) { @@ -64,67 +53,16 @@ public class BlockFakeAir extends BlockMod { } @Override - public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) { + public void tick(IBlockState state, World world, BlockPos pos, Random rand) { if(shouldRemove(world, pos)) world.setBlockState(pos, rand.nextInt(10) == 0 ? Blocks.WATER.getDefaultState() : Blocks.AIR.getDefaultState()); } @Override - public int tickRate(World world) { + public int tickRate(IWorldReaderBase world) { return 4; } - @Override - public boolean registerInCreative() { - return false; - } - - @Override - public boolean isBlockNormalCube(IBlockState state) { - return false; - } - - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - - @Override - public boolean canEntityDestroy(IBlockState state, IBlockAccess world, BlockPos pos, Entity e) { - return false; - } - - @Override - public boolean canCollideCheck(IBlockState state, boolean hitIfLiquid) { - return false; - } - - @Override - public boolean canBeReplacedByLeaves(@Nonnull IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { - return true; - } - - @Override - public boolean canDropFromExplosion(Explosion par1Explosion) { - return false; - } - - @Nonnull - @Override - public Item getItemDropped(IBlockState state, @Nonnull Random rand, int fortune) { - return Items.AIR; - } - - @Override - public AxisAlignedBB getCollisionBoundingBox(IBlockState state, @Nonnull IBlockAccess world, @Nonnull BlockPos pos) { - return NULL_AABB; - } - - @Override - public boolean isAir(IBlockState state, IBlockAccess world, BlockPos pos) { - return true; - } - @Override public boolean hasTileEntity(IBlockState state) { return true; @@ -132,14 +70,7 @@ public class BlockFakeAir extends BlockMod { @Nonnull @Override - public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { + public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { return new TileFakeAir(); } - - @Nonnull - @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { - return BlockFaceShape.UNDEFINED; - } - } diff --git a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java index ba848d97d..4e25e920b 100644 --- a/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java +++ b/src/main/java/vazkii/botania/common/block/BlockGaiaHead.java @@ -10,9 +10,9 @@ */ package vazkii.botania.common.block; +import net.minecraft.block.BlockAbstractSkull; import net.minecraft.block.BlockSkull; import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -22,7 +22,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; -import net.minecraft.world.IBlockAccess; +import net.minecraft.world.IBlockReader; import net.minecraft.world.World; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.api.distmarker.Dist; @@ -38,51 +38,16 @@ import java.util.ArrayList; import java.util.List; import java.util.Random; -public class BlockGaiaHead extends BlockSkull implements IModelRegister { +public class BlockGaiaHead extends BlockAbstractSkull { + public static final BlockSkull.ISkullType GAIA_TYPE = new BlockSkull.ISkullType() {}; - public BlockGaiaHead() { - setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.GAIA_HEAD)); - setTranslationKey(LibBlockNames.GAIA_HEAD); - setHardness(1.0F); + public BlockGaiaHead(Builder builder) { + super(GAIA_TYPE, builder); } @Nonnull @Override - public ItemStack getPickBlock(@Nonnull IBlockState state, RayTraceResult target, @Nonnull World world, @Nonnull BlockPos pos, EntityPlayer player) { - return new ItemStack(ModItems.gaiaHead); - } - - @Override - public void getDrops(NonNullList ret, @Nonnull IBlockAccess world, @Nonnull BlockPos pos, IBlockState state, int fortune) { - if(!state.getValue(NODROP)) { - ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1); - TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(pos); - - if(tileentityskull != null) - ret.add(itemstack); - } - } - - @Nonnull - @Override - public Item getItemDropped(IBlockState state, Random rand, int fortune) { - return ModItems.gaiaHead; - } - - @Override - public int damageDropped(IBlockState state) { - return 0; - } - - @Nonnull - @Override - public TileEntity createNewTileEntity(World world, int meta) { + public TileEntity createNewTileEntity(IBlockReader world) { return new TileGaiaHead(); } - - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelLoader.setCustomStateMapper(this, new StateMap.Builder().ignore(FACING, NODROP).build()); - } } diff --git a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java index d4b45aeea..246207b9e 100644 --- a/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java +++ b/src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java @@ -17,7 +17,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -25,14 +24,11 @@ import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumHand; 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.World; -import net.minecraftforge.client.ForgeHooksClient; -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.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileTeruTeruBozu; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -41,20 +37,20 @@ import javax.annotation.Nonnull; public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { - private static final AxisAlignedBB AABB = new AxisAlignedBB(0.25, 0.01, 0.25, 0.75, 0.99, 0.75); + private static final VoxelShape SHAPE = makeCuboidShape(4, 0.16, 4, 12, 15.84, 12); - public BlockTeruTeruBozu() { - super(Material.CLOTH, LibBlockNames.TERU_TERU_BOZU); + public BlockTeruTeruBozu(Builder builder) { + super(builder); } @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - return AABB; + public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { + return SHAPE; } @Override - public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity e) { + public void onEntityCollision(IBlockState state, World world, BlockPos pos, Entity e) { if(!world.isRemote && e instanceof EntityItem) { EntityItem item = (EntityItem) e; ItemStack stack = item.getItem(); @@ -65,10 +61,10 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } @Override - public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { + public boolean onBlockActivated(IBlockState state, World world, BlockPos pos, EntityPlayer player, EnumHand hand, EnumFacing s, float xs, float ys, float zs) { ItemStack stack = player.getHeldItem(hand); if(!stack.isEmpty() && (isSunflower(stack) && removeRain(world) || isBlueOrchid(stack) && startRain(world))) { - if(!player.capabilities.isCreativeMode) + if(!player.abilities.isCreativeMode) stack.shrink(1); return true; } @@ -76,11 +72,11 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { } private boolean isSunflower(ItemStack stack) { - return stack.getItem() == Item.getItemFromBlock(Blocks.DOUBLE_PLANT) && stack.getItemDamage() == 0; + return stack.getItem() == Blocks.SUNFLOWER.asItem(); } private boolean isBlueOrchid(ItemStack stack) { - return stack.getItem() == Item.getItemFromBlock(Blocks.RED_FLOWER) && stack.getItemDamage() == 1; + return stack.getItem() == Blocks.BLUE_ORCHID.asItem(); } private boolean removeRain(World world) { @@ -113,11 +109,6 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { return world.isRaining() ? 15 : 0; } - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - @Override public boolean isFullCube(IBlockState state) { return false; @@ -136,7 +127,7 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { @Nonnull @Override - public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { + public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { return new TileTeruTeruBozu(); } @@ -147,15 +138,8 @@ public class BlockTeruTeruBozu extends BlockMod implements ILexiconable { @Nonnull @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing side) { return BlockFaceShape.UNDEFINED; } - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerCustomItemblock(this, "teru_teru_bozu"); - ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(this), 0, TileTeruTeruBozu.class); - } - } diff --git a/src/main/java/vazkii/botania/common/block/ModBlocks.java b/src/main/java/vazkii/botania/common/block/ModBlocks.java index d33db12a4..019795cca 100644 --- a/src/main/java/vazkii/botania/common/block/ModBlocks.java +++ b/src/main/java/vazkii/botania/common/block/ModBlocks.java @@ -292,14 +292,29 @@ public final class ModBlocks { @ObjectHolder("green" + LibBlockNames.PETAL_BLOCK_SUFFIX) public static Block petalBlockGreen; @ObjectHolder("red" + LibBlockNames.PETAL_BLOCK_SUFFIX) public static Block petalBlockRed; @ObjectHolder("black" + LibBlockNames.PETAL_BLOCK_SUFFIX) public static Block petalBlockBlack; - public static final Block corporeaIndex = new BlockCorporeaIndex(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX); - public static final Block corporeaFunnel = new BlockCorporeaFunnel(); - public static final Block mushroom = new BlockModMushroom(); - public static final Block pump = new BlockPump(); + @ObjectHolder(LibBlockNames.CORPOREA_INDEX) public static Block corporeaIndex; + @ObjectHolder(LibBlockNames.CORPOREA_FUNNEL) public static Block corporeaFunnel; + @ObjectHolder("white" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomWhite; + @ObjectHolder("orange" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomOrange; + @ObjectHolder("magenta" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomMagenta; + @ObjectHolder("light_blue" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomLightBlue; + @ObjectHolder("yellow" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomYellow; + @ObjectHolder("lime" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomLime; + @ObjectHolder("pink" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomPink; + @ObjectHolder("gray" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomGray; + @ObjectHolder("light_gray" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomSilver; + @ObjectHolder("cyan" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomCyan; + @ObjectHolder("purple" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomPurple; + @ObjectHolder("blue" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomBlue; + @ObjectHolder("brown" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomBrown; + @ObjectHolder("green" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomGreen; + @ObjectHolder("red" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomRed; + @ObjectHolder("black" + LibBlockNames.MUSHROOM_SUFFIX) public static Block mushroomBlack; + @ObjectHolder(LibBlockNames.PUMP) public static Block pump; public static final Block doubleFlower1 = new BlockModDoubleFlower1(); public static final Block doubleFlower2 = new BlockModDoubleFlower2(); - public static final Block fakeAir = new BlockFakeAir(); - public static final Block blazeBlock = new BlockBlaze(); + @ObjectHolder(LibBlockNames.FAKE_AIR) public static Block fakeAir; + @ObjectHolder(LibBlockNames.BLAZE_BLOCK) public static Block blazeBlock; public static final Block corporeaInterceptor = new BlockCorporeaInterceptor(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INTERCEPTOR); public static final Block corporeaCrystalCube = new BlockCorporeaCrystalCube(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_CRYSTAL_CUBE); public static final Block incensePlate = new BlockIncensePlate(); @@ -315,21 +330,21 @@ public final class ModBlocks { public static final Block cacophonium = new BlockCacophonium(); public static final Block bellows = new BlockBellows(); @ObjectHolder(LibBlockNames.BIFROST_PERM) public static Block bifrostPerm; - public static final Block cellBlock = new BlockCell(); - public static final Block redStringInterceptor = new BlockRedStringInterceptor(); - public static final Block gaiaHead = new BlockGaiaHead(); - public static final Block corporeaRetainer = new BlockCorporeaRetainer(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_RETAINER); - public static final Block teruTeruBozu = new BlockTeruTeruBozu(); - public static final Block shimmerrock = new BlockShimmerrock(); - public static final Block shimmerwoodPlanks = new BlockShimmerwoodPlanks(); - public static final Block avatar = new BlockAvatar(); - public static final Block dryGrass = new BlockAltGrass(BlockAltGrass.Variant.DRY); - public static final Block goldenGrass = new BlockAltGrass(BlockAltGrass.Variant.GOLDEN); - public static final Block vividGrass = new BlockAltGrass(BlockAltGrass.Variant.VIVID); - public static final Block scorchedGrass = new BlockAltGrass(BlockAltGrass.Variant.SCORCHED); - public static final Block infusedGrass = new BlockAltGrass(BlockAltGrass.Variant.INFUSED); - public static final Block mutatedGrass = new BlockAltGrass(BlockAltGrass.Variant.MUTATED); - public static final Block animatedTorch = new BlockAnimatedTorch(); + @ObjectHolder(LibBlockNames.CELL_BLOCK) public static Block cellBlock; + @ObjectHolder(LibBlockNames.RED_STRING_INTERCEPTOR) public static Block redStringInterceptor; + @ObjectHolder(LibBlockNames.GAIA_HEAD) public static Block gaiaHead; + @ObjectHolder(LibBlockNames.CORPOREA_RETAINER) public static Block corporeaRetainer; + @ObjectHolder(LibBlockNames.TERU_TERU_BOZU) public static Block teruTeruBozu; + @ObjectHolder(LibBlockNames.SHIMMERROCK) public static Block shimmerrock; + @ObjectHolder(LibBlockNames.SHIMMERWOOD_PLANKS) public static Block shimmerwoodPlanks; + @ObjectHolder(LibBlockNames.AVATAR) public static Block avatar; + @ObjectHolder("dry" + LibBlockNames.ALT_GRASS_SUFFIX) public static Block dryGrass; + @ObjectHolder("golden" + LibBlockNames.ALT_GRASS_SUFFIX) public static Block goldenGrass; + @ObjectHolder("vivid" + LibBlockNames.ALT_GRASS_SUFFIX) public static Block vividGrass; + @ObjectHolder("scorched" + LibBlockNames.ALT_GRASS_SUFFIX) public static Block scorchedGrass; + @ObjectHolder("infused" + LibBlockNames.ALT_GRASS_SUFFIX) public static Block infusedGrass; + @ObjectHolder("mutated" + LibBlockNames.ALT_GRASS_SUFFIX) public static Block mutatedGrass; + @ObjectHolder(LibBlockNames.ANIMATED_TORCH) public static Block animatedTorch; @SubscribeEvent public static void registerBlocks(RegistryEvent.Register evt) { @@ -361,7 +376,7 @@ public final class ModBlocks { 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, 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(specialFlower); @@ -381,7 +396,7 @@ public final class ModBlocks { builder = Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE); r.register(new BlockRuneAltar(builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RUNE_ALTAR)); - builder = Block.Builder.create(Material.IRON).hardnessAndResistance(5.5).sound(SoundType.METAL).lightValue(7); + builder = Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).lightValue(7); r.register(new BlockPylon(BlockPylon.Variant.MANA, builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PYLON)); r.register(new BlockPylon(BlockPylon.Variant.NATURA, builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PYLON_NATURA)); r.register(new BlockPylon(BlockPylon.Variant.GAIA, builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PYLON_GAIA)); @@ -399,7 +414,7 @@ public final class ModBlocks { r.register(new BlockDistributor(builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_DETECTOR)); r.register(new BlockEnchanter(Block.Builder.create(Material.ROCK).hardnessAndResistance(3, 5).lightValue(15).sound(SoundType.STONE)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ENCHANTER)); - r.register(new BlockTurntable(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TURNTABLE))); + r.register(new BlockTurntable(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TURNTABLE)); r.register(new BlockTinyPlanet(Block.Builder.create(Material.ROCK).hardnessAndResistance(20, 100).sound(SoundType.STONE)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TINY_PLANET)); r.register(new BlockAlchemyCatalyst(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ALCHEMY_CATALYST)); @@ -438,7 +453,7 @@ public final class ModBlocks { r.register(new BlockModLexiconable(builder, elvenResource).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD_PLANKS)); r.register(new BlockModLexiconable(builder, elvenResource).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD_PLANKS_MOSSY)); r.register(new BlockModLexiconable(builder, elvenResource).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD_FRAMED)); - r.register(new BlockModLexiconable(builder, elvenResource).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD_PATTERN_FRAMED); + r.register(new BlockModLexiconable(builder, elvenResource).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD_PATTERN_FRAMED)); r.register(new BlockModLexiconable(builder.lightValue(12), elvenResource).setRegistryName(LibMisc.MOD_ID, LibBlockNames.DREAM_WOOD_GLIMMERING)); r.register(new BlockConjurationCatalyst(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CONJURATION_CATALYST)); @@ -474,6 +489,7 @@ public final class ModBlocks { r.register(new BlockRedStringFertilizer(builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_FERTILIZER)); r.register(new BlockRedStringComparator(builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_COMPARATOR)); r.register(new BlockRedStringRelay(builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_RELAY)); + r.register(new BlockRedStringInterceptor(builder).setRegistryName(LibMisc.MOD_ID, LibBlockNames.RED_STRING_INTERCEPTOR)); r.register(floatingSpecialFlower); r.register(new BlockManaFlame(Block.Builder.create(Material.CLOTH).sound(SoundType.CLOTH).lightValue(15).doesNotBlockMovement()).setRegistryName(LibMisc.MOD_ID, LibBlockNames.MANA_FLAME)); r.register(new BlockPrism(Block.Builder.create(Material.GLASS).hardnessAndResistance(0.3F).sound(SoundType.GLASS).lightValue(15).doesNotBlockMovement()).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PRISM)); @@ -484,14 +500,20 @@ public final class ModBlocks { r.register(new BlockPetalBlock(color, builder).setRegistryName(LibMisc.MOD_ID, color.getName() + LibBlockNames.PETAL_BLOCK_SUFFIX)); } - r.register(corporeaIndex); - r.register(corporeaFunnel); - r.register(mushroom); - r.register(pump); + r.register(new BlockCorporeaIndex(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_INDEX)); + r.register(new BlockCorporeaFunnel(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_FUNNEL)); + + builder = Block.Builder.create(Material.PLANTS).doesNotBlockMovement().needsRandomTick().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(3); + for(EnumDyeColor color : EnumDyeColor.values()) { + r.register(new BlockModMushroom(color, builder).setRegistryName(LibMisc.MOD_ID, color.getName() + LibBlockNames.MUSHROOM_SUFFIX)); + } + + r.register(new BlockPump(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.PUMP)); r.register(doubleFlower1); r.register(doubleFlower2); - r.register(fakeAir); - r.register(blazeBlock); + r.register(new BlockFakeAir(Block.Builder.create(Material.STRUCTURE_VOID).needsRandomTick()).setRegistryName(LibMisc.MOD_ID, LibBlockNames.FAKE_AIR)); + r.register(new BlockModLexiconable(Block.Builder.create(Material.IRON).hardnessAndResistance(3, 10).sound(SoundType.METAL).lightValue(15), (w, po, pl, st) -> LexiconData.blazeBlock) + .setRegistryName(LibMisc.MOD_ID, LibBlockNames.BLAZE_BLOCK)); r.register(corporeaInterceptor); r.register(corporeaCrystalCube); r.register(incensePlate); @@ -506,22 +528,22 @@ public final class ModBlocks { r.register(manaBomb); r.register(cacophonium); r.register(bellows); - r.register(new BlockBifrostPerm(Block.Builder.create(Material.GLASS).hardnessAndResistance(0.3).lightValue(15).sound(SoundType.GLASS)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BIFROST_PERM)); - r.register(cellBlock); - r.register(redStringInterceptor); - r.register(gaiaHead); - r.register(corporeaRetainer); - r.register(teruTeruBozu); - r.register(shimmerrock); - r.register(shimmerwoodPlanks); - r.register(avatar); - r.register(dryGrass); - r.register(goldenGrass); - r.register(vividGrass); - r.register(scorchedGrass); - r.register(infusedGrass); - r.register(mutatedGrass); - r.register(animatedTorch); + r.register(new BlockBifrostPerm(Block.Builder.create(Material.GLASS).hardnessAndResistance(0.3F).lightValue(15).sound(SoundType.GLASS)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.BIFROST_PERM)); + r.register(new BlockCell(Block.Builder.create(Material.GOURD).sound(SoundType.CLOTH)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CELL_BLOCK)); + r.register(new BlockGaiaHead(Block.Builder.create(Material.CIRCUITS).hardnessAndResistance(1))); + r.register(new BlockCorporeaRetainer(Block.Builder.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.CORPOREA_RETAINER)); + r.register(new BlockTeruTeruBozu(Block.Builder.create(Material.CLOTH)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.TERU_TERU_BOZU)); + ILexiconable rainbowRod = (w, po, pl, st) -> LexiconData.rainbowRod; + r.register(new BlockModLexiconable(Block.Builder.create(Material.ROCK).hardnessAndResistance(2, 10).sound(SoundType.STONE), rainbowRod).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SHIMMERROCK)); + r.register(new BlockModLexiconable(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD), rainbowRod).setRegistryName(LibMisc.MOD_ID, LibBlockNames.SHIMMERWOOD_PLANKS)); + r.register(new BlockAvatar(Block.Builder.create(Material.WOOD).hardnessAndResistance(2).sound(SoundType.WOOD)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.AVATAR)); + + builder = Block.Builder.create(Material.GRASS).hardnessAndResistance(0.6F).needsRandomTick().sound(SoundType.PLANT); + for(BlockAltGrass.Variant v : BlockAltGrass.Variant.values()) { + r.register(new BlockAltGrass(v, builder).setRegistryName(LibMisc.MOD_ID, v.name().toLowerCase(Locale.ROOT) + LibBlockNames.ALT_GRASS_SUFFIX)); + } + + r.register(new BlockAnimatedTorch(Block.Builder.create(Material.CIRCUITS).lightValue(7)).setRegistryName(LibMisc.MOD_ID, LibBlockNames.ANIMATED_TORCH)); RecipeManaInfusion.alchemyState = alchemyCatalyst.getDefaultState(); RecipeManaInfusion.conjurationState = conjurationCatalyst.getDefaultState(); diff --git a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java index 03634e61d..8f49bacdf 100644 --- a/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java +++ b/src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java @@ -32,11 +32,9 @@ import javax.annotation.Nonnull; public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconable { - public BlockCorporeaFunnel() { - super(Material.IRON, LibBlockNames.CORPOREA_FUNNEL); - setHardness(5.5F); - setSoundType(SoundType.METAL); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.POWERED, false)); + public BlockCorporeaFunnel(Builder builder) { + super(builder); + setDefaultState(stateContainer.getBaseState().with(BotaniaStateProps.POWERED, false)); } @Nonnull diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockAzulejo.java b/src/main/java/vazkii/botania/common/block/decor/BlockAzulejo.java deleted file mode 100644 index 338bf22bb..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockAzulejo.java +++ /dev/null @@ -1,36 +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 28, 2014, 9:51:48 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -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; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockAzulejo extends BlockMod implements ILexiconable { - - public BlockAzulejo(int variant) { - super(Material.ROCK, LibBlockNames.AZULEJO_PREFIX + variant); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.azulejo; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java b/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java deleted file mode 100644 index c9299759a..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockBlaze.java +++ /dev/null @@ -1,39 +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 @ [Apr 17, 2015, 7:55:33 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -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; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockBlaze extends BlockMod implements ILexiconable { - - public BlockBlaze() { - super(Material.IRON, LibBlockNames.BLAZE_BLOCK); - setHardness(3F); - setResistance(10F); - setSoundType(SoundType.METAL); - setLightLevel(1F); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.blazeBlock; - } -} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java index cb20db679..ab9f73018 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java @@ -10,12 +10,11 @@ */ package vazkii.botania.common.block.decor; -import net.minecraft.block.BlockDirt; +import net.minecraft.block.Block; import net.minecraft.block.BlockMushroom; import net.minecraft.block.SoundType; -import net.minecraft.block.state.BlockStateContainer; +import net.minecraft.block.material.Material; 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.EnumDyeColor; @@ -24,14 +23,14 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.ResourceLocation; 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.IWorldReaderBase; import net.minecraft.world.World; -import net.minecraftforge.fml.common.Optional; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import thaumcraft.api.crafting.IInfusionStabiliser; import vazkii.botania.api.item.IHornHarvestable; -import vazkii.botania.api.item.IPetalApothecary; import vazkii.botania.api.lexicon.ILexiconable; import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.recipe.IFlowerComponent; @@ -51,80 +50,40 @@ import java.util.Random; @Optional.Interface(modid = "thaumcraft", iface = "thaumcraft.api.crafting.IInfusionStabiliser", striprefs = true) public class BlockModMushroom extends BlockMushroom implements IInfusionStabiliser, IHornHarvestable, ILexiconable, IModelRegister, IFlowerComponent { - private static final AxisAlignedBB AABB = new AxisAlignedBB(0.3, 0, 0.3, 0.8, 1, 0.8); + private static final VoxelShape SHAPE = makeCuboidShape(4.8, 0, 4.8, 12.8, 16, 12.8); + private final EnumDyeColor color; - public BlockModMushroom() { - setRegistryName(new ResourceLocation(LibMisc.MOD_ID, LibBlockNames.MUSHROOM)); - setTranslationKey(LibBlockNames.MUSHROOM); - setLightLevel(0.2F); - setHardness(0F); - setSoundType(SoundType.PLANT); - setTickRandomly(false); - setCreativeTab(BotaniaCreativeTab.INSTANCE); - setDefaultState(blockState.getBaseState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.WHITE)); + public BlockModMushroom(EnumDyeColor color, Builder builder) { + super(builder); + this.color = color; } @Nonnull @Override - public BlockStateContainer createBlockState() { - return new BlockStateContainer(this, BotaniaStateProps.COLOR); + public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { + return SHAPE; } @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.COLOR).getMetadata(); - } + public void tick(@Nonnull IBlockState state, @Nonnull World world, @Nonnull BlockPos pos, Random rand) {} // Prevent spreading - @Nonnull + // [VanillaCopy] super, without light level requirement @Override - public IBlockState getStateFromMeta(int meta) { - if (meta >= EnumDyeColor.values().length) { - meta = 0; + public boolean isValidPosition(IBlockState state, IWorldReaderBase worldIn, BlockPos pos) { + BlockPos blockpos = pos.down(); + IBlockState iblockstate = worldIn.getBlockState(blockpos); + Block block = iblockstate.getBlock(); + if (block != Blocks.MYCELIUM && block != Blocks.PODZOL) { + return iblockstate.canSustainPlant(worldIn, blockpos, net.minecraft.util.EnumFacing.UP, this); + } else { + return true; } - return getDefaultState().withProperty(BotaniaStateProps.COLOR, EnumDyeColor.byMetadata(meta)); - } - - @Nonnull - @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - return AABB; - } - - @Override - public void updateTick(@Nonnull World world, @Nonnull BlockPos pos, IBlockState state, Random rand) {} // Prevent spreading - - // [VanillaCopy] super, cleaned up and without light level requirement - @Override - public boolean canBlockStay(@Nonnull World worldIn, BlockPos pos, IBlockState state) - { - if (pos.getY() >= 0 && pos.getY() < 256) - { - IBlockState iblockstate = worldIn.getBlockState(pos.down()); - return iblockstate.getBlock() == Blocks.MYCELIUM - || (iblockstate.getBlock() == Blocks.DIRT && iblockstate.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.PODZOL - || iblockstate.getBlock().canSustainPlant(iblockstate, worldIn, pos.down(), net.minecraft.util.EnumFacing.UP, this)); - } - else - { - return false; - } - } - - @Override - public void getSubBlocks(CreativeTabs tab, NonNullList stacks) { - for(int i = 0; i < 16; i++) - stacks.add(new ItemStack(this, 1, i)); - } - - @Override - public int damageDropped(IBlockState state) { - return getMetaFromState(state); } @OnlyIn(Dist.CLIENT) @Override - public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) { - int hex = state.getValue(BotaniaStateProps.COLOR).getColorValue(); + public void animateTick(IBlockState state, World world, BlockPos pos, Random rand) { + int hex = color.getColorValue(); int r = (hex & 0xFF0000) >> 16; int g = (hex & 0xFF00) >> 8; int b = hex & 0xFF; @@ -156,14 +115,8 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis @Override public void harvestByHorn(World world, BlockPos pos, ItemStack stack, EnumHornType hornType) {} - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerCustomItemblock(this, EnumDyeColor.values().length, i -> "mushroom_" + EnumDyeColor.byMetadata(i).getName()); - } - @Override public int getParticleColor(ItemStack stack) { - return EnumDyeColor.byMetadata(stack.getItemDamage()).colorValue; + return color.colorValue; } } diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java deleted file mode 100644 index 100bfc33e..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java +++ /dev/null @@ -1,39 +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 @ [Oct 10, 2015, 10:29:22 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -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; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockShimmerrock extends BlockMod implements ILexiconable { - - public BlockShimmerrock() { - super(Material.ROCK, LibBlockNames.SHIMMERROCK); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.rainbowRod; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java b/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java deleted file mode 100644 index 9b7d31eaa..000000000 --- a/src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java +++ /dev/null @@ -1,38 +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 @ [Oct 11, 2015, 3:08:09 PM (GMT)] - */ -package vazkii.botania.common.block.decor; - -import net.minecraft.block.SoundType; -import net.minecraft.block.material.Material; -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; -import vazkii.botania.common.block.BlockMod; -import vazkii.botania.common.lexicon.LexiconData; -import vazkii.botania.common.lib.LibBlockNames; - -public class BlockShimmerwoodPlanks extends BlockMod implements ILexiconable { - - public BlockShimmerwoodPlanks() { - super(Material.WOOD, LibBlockNames.SHIMMERWOOD_PLANKS); - setHardness(2.0F); - setSoundType(SoundType.WOOD); - } - - @Override - public LexiconEntry getEntry(World world, BlockPos pos, EntityPlayer player, ItemStack lexicon) { - return LexiconData.rainbowRod; - } - -} diff --git a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java index 1f0c6d04a..a9f2700d0 100644 --- a/src/main/java/vazkii/botania/common/block/mana/BlockPump.java +++ b/src/main/java/vazkii/botania/common/block/mana/BlockPump.java @@ -12,9 +12,7 @@ package vazkii.botania.common.block.mana; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; -import net.minecraft.block.properties.IProperty; import net.minecraft.block.state.BlockFaceShape; -import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; @@ -23,9 +21,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumFacing; 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.World; -import net.minecraftforge.common.property.ExtendedBlockState; import net.minecraftforge.common.property.IUnlistedProperty; import net.minecraftforge.common.property.Properties; import net.minecraftforge.api.distmarker.Dist; @@ -46,11 +44,8 @@ public class BlockPump extends BlockMod implements ILexiconable { private static final AxisAlignedBB X_AABB = new AxisAlignedBB(0, 0, 0.25, 1, 0.5, 0.75); private static final AxisAlignedBB Z_AABB = new AxisAlignedBB(0.25, 0, 0, 0.75, 0.5, 1); - public BlockPump() { - super(Material.ROCK, LibBlockNames.PUMP); - setHardness(2.0F); - setResistance(10.0F); - setSoundType(SoundType.STONE); + public BlockPump(Builder builder) { + super(builder); setDefaultState(blockState.getBaseState().withProperty(Properties.StaticProperty, true).withProperty(BotaniaStateProps.CARDINALS, EnumFacing.SOUTH)); } @@ -60,46 +55,28 @@ public class BlockPump extends BlockMod implements ILexiconable { return new ExtendedBlockState(this, new IProperty[] { BotaniaStateProps.CARDINALS, Properties.StaticProperty }, new IUnlistedProperty[] { Properties.AnimationProperty }); } - @Override - public int getMetaFromState(IBlockState state) { - return state.getValue(BotaniaStateProps.CARDINALS).getIndex(); - } - @Nonnull @Override public IBlockState getActualState(@Nonnull IBlockState state, IBlockAccess world, BlockPos pos) { return state.withProperty(Properties.StaticProperty, true); } - @Nonnull - @Override - public IBlockState getStateFromMeta(int meta) { - if (meta < 2 || meta > 5) { - meta = 2; - } - return getDefaultState().withProperty(BotaniaStateProps.CARDINALS, EnumFacing.byIndex(meta)); - } - @Override public void onBlockPlacedBy(World world, BlockPos pos, IBlockState state, EntityLivingBase placer, ItemStack stack) { - world.setBlockState(pos, state.withProperty(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite()), 2); + // todo getplacementstate + world.setBlockState(pos, state.with(BotaniaStateProps.CARDINALS, placer.getHorizontalFacing().getOpposite()), 2); } @Nonnull @Override - public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) { - if(state.getValue(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { + public VoxelShape getShape(IBlockState state, IBlockReader world, BlockPos pos) { + if(state.get(BotaniaStateProps.CARDINALS).getAxis() == EnumFacing.Axis.X) { return X_AABB; } else { return Z_AABB; } } - @Override - public boolean isOpaqueCube(IBlockState state) { - return false; - } - @Override public boolean isFullCube(IBlockState state) { return false; @@ -128,19 +105,13 @@ public class BlockPump extends BlockMod implements ILexiconable { @Nonnull @Override - public TileEntity createTileEntity(@Nonnull World world, @Nonnull IBlockState state) { + public TileEntity createTileEntity(@Nonnull IBlockState state, @Nonnull IBlockReader world) { return new TilePump(); } - @OnlyIn(Dist.CLIENT) - @Override - public void registerModels() { - ModelHandler.registerInventoryVariant(this); - } - @Nonnull @Override - public BlockFaceShape getBlockFaceShape(IBlockAccess world, IBlockState state, BlockPos pos, EnumFacing side) { + public BlockFaceShape getBlockFaceShape(IBlockReader world, IBlockState state, BlockPos pos, EnumFacing side) { return BlockFaceShape.UNDEFINED; } } diff --git a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java index 36a51f907..90fd581de 100644 --- a/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/tile/TileAnimatedTorch.java @@ -122,11 +122,11 @@ public class TileAnimatedTorch extends TileMod implements ITickable { } @OnlyIn(Dist.CLIENT) - public void renderHUD(Minecraft mc, ScaledResolution res) { - int x = res.getScaledWidth() / 2 + 10; - int y = res.getScaledHeight() / 2 - 8; + public void renderHUD(Minecraft mc) { + int x = mc.mainWindow.getScaledWidth() / 2 + 10; + int y = mc.mainWindow.getScaledHeight() / 2 - 8; - mc.getRenderItem().renderItemAndEffectIntoGUI(new ItemStack(Blocks.REDSTONE_TORCH), x, y); + mc.getItemRenderer().renderItemAndEffectIntoGUI(new ItemStack(Blocks.REDSTONE_TORCH), x, y); mc.fontRenderer.drawStringWithShadow(I18n.translateToLocal("botania.animatedTorch." + torchMode.name().toLowerCase()), x + 18, y + 6, 0xFF4444); } diff --git a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java index 4a88aeca7..df836dc74 100644 --- a/src/main/java/vazkii/botania/common/lib/LibBlockNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibBlockNames.java @@ -102,7 +102,7 @@ public final class LibBlockNames { public static final String PETAL_BLOCK_SUFFIX = "_petal_block"; public static final String CORPOREA_INDEX = "corporea_index"; public static final String CORPOREA_FUNNEL = "corporea_funnel"; - public static final String MUSHROOM = "mushroom"; + public static final String MUSHROOM_SUFFIX = "_mushroom"; public static final String PUMP = "pump"; public static final String DOUBLE_FLOWER = "double_flower"; public static final String STONE = "stone";