diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index 6b0398e18..d2df0a22a 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -123,6 +123,7 @@ public class BlockReferences { cragRock (Blocks.cragRock, 0), quicksand (Blocks.mud, 1), cloud (Blocks.cloud, 0), + hive (Blocks.hive, 0), smolderingGrass (Blocks.holyGrass, 1), redRockCobble (Blocks.redRock, 1), giantFlowerRed (Blocks.petals, 0), diff --git a/common/biomesoplenty/api/Blocks.java b/common/biomesoplenty/api/Blocks.java index 705f8d3a8..1dcb82f40 100644 --- a/common/biomesoplenty/api/Blocks.java +++ b/common/biomesoplenty/api/Blocks.java @@ -85,6 +85,7 @@ public class Blocks public static Optional petals = Optional.absent(); public static Optional bamboo = Optional.absent(); public static Optional cloud = Optional.absent(); + public static Optional hive = Optional.absent(); //Nether public static Optional bones = Optional.absent(); diff --git a/common/biomesoplenty/blocks/BlockHive.java b/common/biomesoplenty/blocks/BlockHive.java new file mode 100644 index 000000000..0559879d1 --- /dev/null +++ b/common/biomesoplenty/blocks/BlockHive.java @@ -0,0 +1,30 @@ +package biomesoplenty.blocks; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import biomesoplenty.BiomesOPlenty; +import biomesoplenty.api.Items; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockHive extends Block +{ + public BlockHive(int par1) + { + super(par1, Material.wood); + this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + } + + @Override + public void registerIcons(IconRegister par1IconRegister) + { + blockIcon = par1IconRegister.registerIcon("biomesoplenty:hive"); + } +} \ No newline at end of file diff --git a/common/biomesoplenty/configuration/BOPBlocks.java b/common/biomesoplenty/configuration/BOPBlocks.java index f9c29cd9e..98ba9453a 100644 --- a/common/biomesoplenty/configuration/BOPBlocks.java +++ b/common/biomesoplenty/configuration/BOPBlocks.java @@ -40,6 +40,7 @@ import biomesoplenty.blocks.BlockBones; import biomesoplenty.blocks.BlockCloud; import biomesoplenty.blocks.BlockFlesh; import biomesoplenty.blocks.BlockGrave; +import biomesoplenty.blocks.BlockHive; import biomesoplenty.blocks.BlockIvy; import biomesoplenty.blocks.BlockLongGrass; import biomesoplenty.blocks.BlockMoss; @@ -178,6 +179,8 @@ public class BOPBlocks Blocks.cragRock = Optional.of(new BlockBOPGeneric(BOPConfigurationIDs.cragRockID, Material.rock, BlockType.CRAG_ROCK)); Blocks.cloud = Optional.of((new BlockCloud(BOPConfigurationIDs.cloudID)).setHardness(0.1F).setLightOpacity(3).setStepSound(Block.soundClothFootstep).setUnlocalizedName("bop.cloud")); + + Blocks.hive = Optional.of((new BlockHive(BOPConfigurationIDs.hiveID)).setHardness(0.5F).setStepSound(Block.soundGrassFootstep).setUnlocalizedName("bop.hive")); Blocks.bones = Optional.of((new BlockBones(BOPConfigurationIDs.bonesID)).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("bop.bones")); @@ -261,6 +264,7 @@ public class BOPBlocks GameRegistry.registerBlock(Blocks.moss.get(), ItemBlockMoss.class, "bop.moss"); GameRegistry.registerBlock(Blocks.cragRock.get(), "bop.cragRock"); GameRegistry.registerBlock(Blocks.cloud.get(), "bop.cloud"); + GameRegistry.registerBlock(Blocks.hive.get(), "bop.hive"); GameRegistry.registerBlock(Blocks.bones.get(), ItemBlockBones.class, "bop.bones"); GameRegistry.registerBlock(Blocks.glass.get(), ItemBlockGlass.class, "bop.glass"); diff --git a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java index 09ce1b638..8225f04dd 100644 --- a/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java +++ b/common/biomesoplenty/configuration/configfile/BOPConfigurationIDs.java @@ -96,6 +96,7 @@ public class BOPConfigurationIDs public static int crystalID; public static int cloudID; + public static int hiveID; public static int bonesID; public static int glassID; @@ -404,6 +405,8 @@ public class BOPConfigurationIDs leavesFruit2ID = config.getBlock("Fruit Leaf Block 2 ID", 1982, null).getInt(); flowers2ID = config.getBlock("Flower 2 ID", 1983, null).getInt(); + + hiveID = config.getBlock("Hive ID", 1984, null).getInt(); // Get Item ID's foodID = config.getItem("Food ID", 21003, null).getInt(); diff --git a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java index bc32f63bc..efac359fd 100644 --- a/common/biomesoplenty/world/layer/BiomeLayerBiomes.java +++ b/common/biomesoplenty/world/layer/BiomeLayerBiomes.java @@ -83,6 +83,13 @@ public class BiomeLayerBiomes extends BiomeLayer netherBiomes.add(Biomes.netherBone.get()); } } + if (Biomes.netherBlood.isPresent()) + { + if (BOPConfigurationBiomeGen.bloodyHeapGen) + { + netherBiomes.add(Biomes.netherBlood.get()); + } + } if (Biomes.netherBiomes.size() > 0) { netherBiomes.addAll(Biomes.netherBiomes); diff --git a/resources/assets/biomesoplenty/lang/en_US.lang b/resources/assets/biomesoplenty/lang/en_US.lang index 711fddc96..0fa5dbd62 100644 --- a/resources/assets/biomesoplenty/lang/en_US.lang +++ b/resources/assets/biomesoplenty/lang/en_US.lang @@ -157,6 +157,8 @@ tile.bop.moss.name=Moss tile.bop.cloud.name=Cloud Block +tile.bop.hive.name=Hive + tile.bop.bones.bones_small.name=Small Bone Segment tile.bop.bones.bones_medium.name=Medium Bone Segment tile.bop.bones.bones_large.name=Large Bone Segment diff --git a/resources/assets/biomesoplenty/textures/blocks/hive.png b/resources/assets/biomesoplenty/textures/blocks/hive.png new file mode 100644 index 000000000..07ddc537e Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/hive.png differ