diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java b/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java index 6e1e1252f..8b1670341 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPAppleLeaves.java @@ -1,132 +1,132 @@ -package biomesoplenty.blocks; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; - -import biomesoplenty.mod_BiomesOPlenty; -import biomesoplenty.api.Blocks; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.BlockLeavesBase; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.world.World; -import net.minecraftforge.common.IShearable; - -public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable -{ - private static final String[] leaves = new String[] {"apple"}; - @SideOnly(Side.CLIENT) - private Icon[][] textures; - - public BlockBOPAppleLeaves(int blockID) - { - super(blockID, Material.leaves, false); - setBurnProperties(this.blockID, 30, 60); - this.setTickRandomly(true); - setHardness(0.2F); - setLightOpacity(1); - setStepSound(Block.soundGrassFootstep); - this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) - { - textures = new Icon[2][2]; - - textures[0][0] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves3"); - textures[1][0] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves4"); - textures[0][1] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves1"); - textures[1][1] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves2"); - - } - - @Override - @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) - { - if (meta < 0 || meta >= textures[0].length) - meta = 0; - - return textures[(!isOpaqueCube() ? 0 : 1)][meta]; - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { - list.add(new ItemStack(blockID, 1, 0)); - } - - @Override - public void updateTick (World world, int x, int y, int z, Random random) - { - if (world.isRemote) - return; - -// if (random1.nextInt(20) == 0 && world.getBlockLightValue(x, y, z) >= 8) -// { - int meta = world.getBlockMetadata(x, y, z); - if (meta < 1) - world.setBlock(x, y, z, blockID, meta + 1, 3); -// } - } - - @Override - public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) - { - if (world.isRemote) - return false; - - int meta = world.getBlockMetadata(x, y, z); - if (meta == 1) - { - world.setBlock(x, y, z, blockID, 0, 3); - EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(Item.appleRed, 1, 0)); - world.spawnEntityInWorld(entityitem); - entityitem.onCollideWithPlayer(player); - } - return true; - } - - @Override - public int idDropped(int par1, Random par2Random, int par3) - { - return Blocks.saplings.get().blockID; - } - - @Override - public int damageDropped(int meta) - { - return 0; - } - - @Override - public int quantityDropped(Random random) - { - return random.nextInt(20) == 0 ? 1 : 0; - } - - @Override - public boolean isShearable(ItemStack item, World world, int x, int y, int z) - { - return true; - } - - @Override - public ArrayList onSheared(ItemStack item, World world, int x, int y, int z, int fortune) - { - ArrayList ret = new ArrayList(); - ret.add(new ItemStack(this, 1, 0)); - return ret; - } -} +package biomesoplenty.blocks; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; + +import biomesoplenty.mod_BiomesOPlenty; +import biomesoplenty.api.Blocks; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockLeavesBase; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import net.minecraftforge.common.IShearable; + +public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable +{ + private static final String[] leaves = new String[] {"apple"}; + @SideOnly(Side.CLIENT) + private Icon[][] textures; + + public BlockBOPAppleLeaves(int blockID) + { + super(blockID, Material.leaves, false); + setBurnProperties(this.blockID, 30, 60); + this.setTickRandomly(true); + setHardness(0.2F); + setLightOpacity(1); + setStepSound(Block.soundGrassFootstep); + this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) + { + textures = new Icon[2][2]; + + textures[0][0] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves3"); + textures[1][0] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves4"); + textures[0][1] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves1"); + textures[1][1] = iconRegister.registerIcon("BiomesOPlenty:" + leaves[0] + "leaves2"); + + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int side, int meta) + { + if (meta < 0 || meta >= textures[0].length) + meta = 0; + + return textures[(!isOpaqueCube() ? 0 : 1)][meta]; + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { + list.add(new ItemStack(blockID, 1, 0)); + } + + @Override + public void updateTick (World world, int x, int y, int z, Random random) + { + if (world.isRemote) + return; + +// if (random1.nextInt(20) == 0 && world.getBlockLightValue(x, y, z) >= 8) +// { + int meta = world.getBlockMetadata(x, y, z); + if (meta < 1) + world.setBlock(x, y, z, blockID, meta + 1, 3); +// } + } + + @Override + public boolean onBlockActivated (World world, int x, int y, int z, EntityPlayer player, int par6, float par7, float par8, float par9) + { + if (world.isRemote) + return false; + + int meta = world.getBlockMetadata(x, y, z); + if (meta == 1) + { + world.setBlock(x, y, z, blockID, 0, 3); + EntityItem entityitem = new EntityItem(world, player.posX, player.posY - 1.0D, player.posZ, new ItemStack(Item.appleRed, 1, 0)); + world.spawnEntityInWorld(entityitem); + entityitem.onCollideWithPlayer(player); + } + return true; + } + + @Override + public int idDropped(int par1, Random par2Random, int par3) + { + return Blocks.saplings.get().blockID; + } + + @Override + public int damageDropped(int meta) + { + return 0; + } + + @Override + public int quantityDropped(Random random) + { + return random.nextInt(20) == 0 ? 1 : 0; + } + + @Override + public boolean isShearable(ItemStack item, World world, int x, int y, int z) + { + return true; + } + + @Override + public ArrayList onSheared(ItemStack item, World world, int x, int y, int z, int fortune) + { + ArrayList ret = new ArrayList(); + ret.add(new ItemStack(this, 1, 0)); + return ret; + } +} diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPGeneric.java b/src/minecraft/biomesoplenty/blocks/BlockBOPGeneric.java index 537d97aed..bf7f8c772 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPGeneric.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPGeneric.java @@ -1,185 +1,185 @@ -package biomesoplenty.blocks; - -import java.util.Random; - -import biomesoplenty.mod_BiomesOPlenty; -import biomesoplenty.configuration.BOPItems; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.util.Icon; -import net.minecraft.util.MathHelper; -import net.minecraft.world.World; - -public class BlockBOPGeneric extends Block -{ - public enum BlockType - { - ASH_STONE, HARD_SAND, HARD_DIRT, HARD_ICE, HOLY_STONE, AMETHYST_ORE, AMETHYST_BLOCK, BAMBOO_THATCHING, DRIED_DIRT, CRAG_ROCK, MUD_BRICK; - } - - @SideOnly(Side.CLIENT) - private Icon texture; - private BlockType type; - - public BlockBOPGeneric(int id, Material material, BlockType type) - { - super(id, material); - this.type = type; - this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); - - switch (type) - { - case AMETHYST_BLOCK: - setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("amethystBlock"); - break; - - case AMETHYST_ORE: - setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("amethystOre"); - break; - - case ASH_STONE: - setHardness(1.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("ashStone"); - break; - - case BAMBOO_THATCHING: - setHardness(1.0F).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bambooThatching"); - break; - - case CRAG_ROCK: - setHardness(1.0F).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("cragRock"); - break; - - case DRIED_DIRT: - setHardness(0.1F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("driedDirt"); - break; - - case HARD_DIRT: - setHardness(0.9F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("hardDirt"); - break; - - case HARD_ICE: - setHardness(0.75F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("hardIce"); - break; - - case HARD_SAND: - setHardness(0.7F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("hardSand"); - break; - - case HOLY_STONE: - setHardness(1.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("holyStone"); - break; - - case MUD_BRICK: - setHardness(1.0F).setResistance(2.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("mudBrick"); - break; - - default: - break; - } - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IconRegister iconRegister) - { - switch (type) - { - case AMETHYST_BLOCK: - texture = iconRegister.registerIcon("BiomesOPlenty:amethystblock"); - break; - - case AMETHYST_ORE: - texture = iconRegister.registerIcon("BiomesOPlenty:amethystore"); - break; - - case ASH_STONE: - texture = iconRegister.registerIcon("BiomesOPlenty:ashstone"); - break; - - case BAMBOO_THATCHING: - texture = iconRegister.registerIcon("BiomesOPlenty:bamboothatching"); - break; - - case CRAG_ROCK: - texture = iconRegister.registerIcon("BiomesOPlenty:cragrock"); - break; - - case DRIED_DIRT: - texture = iconRegister.registerIcon("BiomesOPlenty:drieddirt"); - break; - - case HARD_DIRT: - texture = iconRegister.registerIcon("BiomesOPlenty:harddirt"); - break; - - case HARD_ICE: - texture = iconRegister.registerIcon("BiomesOPlenty:hardice"); - break; - - case HARD_SAND: - texture = iconRegister.registerIcon("BiomesOPlenty:hardsand"); - break; - - case HOLY_STONE: - texture = iconRegister.registerIcon("BiomesOPlenty:holystone"); - break; - - case MUD_BRICK: - texture = iconRegister.registerIcon("BiomesOPlenty:mudbrick"); - break; - - default: - break; - } - } - - @Override - @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) - { - return texture; - } - - @Override - public int idDropped(int par1, Random par2Random, int par3) - { - return type == BlockType.AMETHYST_ORE ? BOPItems.amethyst.itemID : this.blockID; - } - - @Override - public int quantityDropped(Random par1Random) - { - return type == BlockType.AMETHYST_ORE ? 1 + par1Random.nextInt(2) : 1; - } - - @Override - public int quantityDroppedWithBonus(int bonus, Random par2Random) - { - if (bonus > 0 && this.blockID != this.idDropped(0, par2Random, bonus)) - { - int rnd = par2Random.nextInt(bonus + 2) - 1; - - if (rnd < 0) - rnd = 0; - - return this.quantityDropped(par2Random) * (rnd + 1); - } - else - return this.quantityDropped(par2Random); - } - - @Override - public void dropBlockAsItemWithChance(World world, int par2, int par3, int par4, int par5, float par6, int par7) - { - super.dropBlockAsItemWithChance(world, par2, par3, par4, par5, par6, par7); - - if (this.idDropped(par5, world.rand, par7) != this.blockID) - { - int var8 = MathHelper.getRandomIntegerInRange(world.rand, 1, 4); - this.dropXpOnBlockBreak(world, par2, par3, par4, var8); - } - } -} +package biomesoplenty.blocks; + +import java.util.Random; + +import biomesoplenty.mod_BiomesOPlenty; +import biomesoplenty.configuration.BOPItems; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.util.Icon; +import net.minecraft.util.MathHelper; +import net.minecraft.world.World; + +public class BlockBOPGeneric extends Block +{ + public enum BlockType + { + ASH_STONE, HARD_SAND, HARD_DIRT, HARD_ICE, HOLY_STONE, AMETHYST_ORE, AMETHYST_BLOCK, BAMBOO_THATCHING, DRIED_DIRT, CRAG_ROCK, MUD_BRICK; + } + + @SideOnly(Side.CLIENT) + private Icon texture; + private BlockType type; + + public BlockBOPGeneric(int id, Material material, BlockType type) + { + super(id, material); + this.type = type; + this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); + + switch (type) + { + case AMETHYST_BLOCK: + setHardness(5.0F).setResistance(10.0F).setStepSound(Block.soundMetalFootstep).setUnlocalizedName("amethystBlock"); + break; + + case AMETHYST_ORE: + setHardness(3.0F).setResistance(5.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("amethystOre"); + break; + + case ASH_STONE: + setHardness(1.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("ashStone"); + break; + + case BAMBOO_THATCHING: + setHardness(1.0F).setResistance(5.0F).setStepSound(Block.soundWoodFootstep).setUnlocalizedName("bambooThatching"); + break; + + case CRAG_ROCK: + setHardness(1.0F).setStepSound(Block.soundGravelFootstep).setUnlocalizedName("cragRock"); + break; + + case DRIED_DIRT: + setHardness(0.1F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("driedDirt"); + break; + + case HARD_DIRT: + setHardness(0.9F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("hardDirt"); + break; + + case HARD_ICE: + setHardness(0.75F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("hardIce"); + break; + + case HARD_SAND: + setHardness(0.7F).setStepSound(Block.soundSandFootstep).setUnlocalizedName("hardSand"); + break; + + case HOLY_STONE: + setHardness(1.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("holyStone"); + break; + + case MUD_BRICK: + setHardness(1.0F).setResistance(2.0F).setStepSound(Block.soundStoneFootstep).setUnlocalizedName("mudBrick"); + break; + + default: + break; + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IconRegister iconRegister) + { + switch (type) + { + case AMETHYST_BLOCK: + texture = iconRegister.registerIcon("BiomesOPlenty:amethystblock"); + break; + + case AMETHYST_ORE: + texture = iconRegister.registerIcon("BiomesOPlenty:amethystore"); + break; + + case ASH_STONE: + texture = iconRegister.registerIcon("BiomesOPlenty:ashstone"); + break; + + case BAMBOO_THATCHING: + texture = iconRegister.registerIcon("BiomesOPlenty:bamboothatching"); + break; + + case CRAG_ROCK: + texture = iconRegister.registerIcon("BiomesOPlenty:cragrock"); + break; + + case DRIED_DIRT: + texture = iconRegister.registerIcon("BiomesOPlenty:drieddirt"); + break; + + case HARD_DIRT: + texture = iconRegister.registerIcon("BiomesOPlenty:harddirt"); + break; + + case HARD_ICE: + texture = iconRegister.registerIcon("BiomesOPlenty:hardice"); + break; + + case HARD_SAND: + texture = iconRegister.registerIcon("BiomesOPlenty:hardsand"); + break; + + case HOLY_STONE: + texture = iconRegister.registerIcon("BiomesOPlenty:holystone"); + break; + + case MUD_BRICK: + texture = iconRegister.registerIcon("BiomesOPlenty:mudbrick"); + break; + + default: + break; + } + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int side, int meta) + { + return texture; + } + + @Override + public int idDropped(int par1, Random par2Random, int par3) + { + return type == BlockType.AMETHYST_ORE ? BOPItems.amethyst.itemID : this.blockID; + } + + @Override + public int quantityDropped(Random par1Random) + { + return type == BlockType.AMETHYST_ORE ? 1 + par1Random.nextInt(2) : 1; + } + + @Override + public int quantityDroppedWithBonus(int bonus, Random par2Random) + { + if (bonus > 0 && this.blockID != this.idDropped(0, par2Random, bonus)) + { + int rnd = par2Random.nextInt(bonus + 2) - 1; + + if (rnd < 0) + rnd = 0; + + return this.quantityDropped(par2Random) * (rnd + 1); + } + else + return this.quantityDropped(par2Random); + } + + @Override + public void dropBlockAsItemWithChance(World world, int par2, int par3, int par4, int par5, float par6, int par7) + { + super.dropBlockAsItemWithChance(world, par2, par3, par4, par5, par6, par7); + + if (this.idDropped(par5, world.rand, par7) != this.blockID) + { + int var8 = MathHelper.getRandomIntegerInRange(world.rand, 1, 4); + this.dropXpOnBlockBreak(world, par2, par3, par4, var8); + } + } +} diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java b/src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java index 99c64adcb..637ce337f 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPRedRock.java @@ -1,105 +1,105 @@ -package biomesoplenty.blocks; - -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Icon; -import net.minecraft.world.World; -import biomesoplenty.mod_BiomesOPlenty; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public class BlockBOPRedRock extends Block -{ - private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"}; - @SideOnly(Side.CLIENT) - private Icon[] textures = {null, null, null}; - - public BlockBOPRedRock(int par1) - { - super(par1, Material.rock); - this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); - setStepSound(Block.soundStoneFootstep); - } - - @Override - public void registerIcons(IconRegister iconRegister) - { - textures = new Icon[types.length]; - - for (int i = 0; i < types.length; ++i) - textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); - } - - @Override - @SideOnly(Side.CLIENT) - public Icon getIcon(int side, int meta) - { - if (meta < 0 || meta >= textures.length) - meta = 0; - - return textures[meta]; - } - - @SideOnly(Side.CLIENT) - @Override - public int getDamageValue(World world, int x, int y, int z) { - return world.getBlockMetadata(x, y, z); - } - - @Override - @SideOnly(Side.CLIENT) - public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { - for (int i = 0; i < types.length; ++i) - list.add(new ItemStack(blockID, 1, i)); - } - - @Override - public float getBlockHardness(World world, int x, int y, int z) - { - int meta = world.getBlockMetadata(x, y, z); - float hardness = this.blockHardness; - - switch (meta) - { - case 0: - hardness = 1.0F; - break; - - case 1: - hardness = 1.6F; - break; - - case 2: - hardness = 1.1F; - break; - } - - return hardness; - } - - @Override - public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) - { - int meta = world.getBlockMetadata(x, y, z); - float resistance = this.blockResistance; - - switch (meta) - { - case 1: - resistance = 7.5F; - break; - - case 2: - resistance = 7.0F; - break; - } - - return resistance / 5.0F; - } -} +package biomesoplenty.blocks; + +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.Entity; +import net.minecraft.item.ItemStack; +import net.minecraft.util.Icon; +import net.minecraft.world.World; +import biomesoplenty.mod_BiomesOPlenty; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class BlockBOPRedRock extends Block +{ + private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"}; + @SideOnly(Side.CLIENT) + private Icon[] textures = {null, null, null}; + + public BlockBOPRedRock(int par1) + { + super(par1, Material.rock); + this.setCreativeTab(mod_BiomesOPlenty.tabBiomesOPlenty); + setStepSound(Block.soundStoneFootstep); + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + textures = new Icon[types.length]; + + for (int i = 0; i < types.length; ++i) + textures[i] = iconRegister.registerIcon("BiomesOPlenty:"+types[i]); + } + + @Override + @SideOnly(Side.CLIENT) + public Icon getIcon(int side, int meta) + { + if (meta < 0 || meta >= textures.length) + meta = 0; + + return textures[meta]; + } + + @SideOnly(Side.CLIENT) + @Override + public int getDamageValue(World world, int x, int y, int z) { + return world.getBlockMetadata(x, y, z); + } + + @Override + @SideOnly(Side.CLIENT) + public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) { + for (int i = 0; i < types.length; ++i) + list.add(new ItemStack(blockID, 1, i)); + } + + @Override + public float getBlockHardness(World world, int x, int y, int z) + { + int meta = world.getBlockMetadata(x, y, z); + float hardness = this.blockHardness; + + switch (meta) + { + case 0: + hardness = 1.0F; + break; + + case 1: + hardness = 1.6F; + break; + + case 2: + hardness = 1.1F; + break; + } + + return hardness; + } + + @Override + public float getExplosionResistance(Entity par1Entity, World world, int x, int y, int z, double explosionX, double explosionY, double explosionZ) + { + int meta = world.getBlockMetadata(x, y, z); + float resistance = this.blockResistance; + + switch (meta) + { + case 1: + resistance = 7.5F; + break; + + case 2: + resistance = 7.0F; + break; + } + + return resistance / 5.0F; + } +} diff --git a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java index 4a1912fa0..415ba7783 100644 --- a/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java +++ b/src/minecraft/biomesoplenty/configuration/BOPConfiguration.java @@ -426,13 +426,13 @@ public class BOPConfiguration { skyColors = true; biomeSize = config.get("Biome Settings", "Biome Size", 4, null).getInt(); - achievements = config.get("Achievement Settings", "Add Biomes O Plenty Achievemnets (Currently Broken)", false).getBoolean(false); + achievements = config.get("Achievement Settings", "Add Biomes O Plenty Achievemnets", true).getBoolean(false); vanillaEnhanced = config.get("Biome Settings", "Enhanced Vanilla Biomes", true).getBoolean(false); promisedLandDimID = config.get("Dimension Settings", "Promised Land Dimension ID", 20, null).getInt(); if (!isClient) { - addToDefault = config.get("Biome Settings", "Add Biomes To Default World", true).getBoolean(true); + addToDefault = config.get("Biome Settings", "Add Biomes To Default World", true).getBoolean(false); } else { diff --git a/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java b/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java index d0106c919..0c1891afa 100644 --- a/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java +++ b/src/minecraft/biomesoplenty/items/ItemBOPRedRock.java @@ -1,19 +1,19 @@ -package biomesoplenty.items; - -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; - -public class ItemBOPRedRock extends ItemBlock -{ - private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"}; - - public ItemBOPRedRock(int par1) - { - super(par1); - } - - @Override - public String getUnlocalizedName(ItemStack itemstack) { - return types[itemstack.getItemDamage() & 15]; - } -} +package biomesoplenty.items; + +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBOPRedRock extends ItemBlock +{ + private static final String[] types = new String[] {"redrock", "redcobble", "redbrick"}; + + public ItemBOPRedRock(int par1) + { + super(par1); + } + + @Override + public String getUnlocalizedName(ItemStack itemstack) { + return types[itemstack.getItemDamage() & 15]; + } +}