etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More renaming

This commit is contained in:
Adubbz 2013-12-25 21:17:40 +11:00
parent 3c8890200b
commit 4b9cf836ed
38 changed files with 310 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/biomesoplenty/common/blocks/BlockBOPAmethyst.java
View File

@ -21,7 +21,8 @@ public class BlockBOPAmethyst extends Block
public BlockBOPAmethyst()
{
super(Material.rock);
//TODO: Material.rock
super(Material.field_151576_e);
this.setStepSound(Block.soundStoneFootstep);
@ -59,7 +60,8 @@ public class BlockBOPAmethyst extends Block
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list)
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list)
{
for (int i = 0; i < types.length; ++i) {
list.add(new ItemStack(blockID, 1, i));
@ -89,7 +91,8 @@ public class BlockBOPAmethyst extends Block
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
if (meta == 0)
{

12
src/main/java/biomesoplenty/common/blocks/BlockBOPAppleLeaves.java
View File

@ -35,7 +35,8 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
super(blockID, Material.leaves, false);
setBurnProperties(this.blockID, 30, 60);
this.setTickRandomly(true);
setHardness(0.2F);
//TODO: this.setHardness
this.func_149711_c(0.2F);
setLightOpacity(1);
setStepSound(Block.soundGrassFootstep);
@ -82,14 +83,16 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
}
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return Block.leaves.isOpaqueCube();
}
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
list.add(new ItemStack(blockID, 1, 0));
}
@ -283,7 +286,8 @@ public class BlockBOPAppleLeaves extends BlockLeavesBase implements IShearable
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return 0;
}

6
src/main/java/biomesoplenty/common/blocks/BlockBOPColorizedLeaves.java
View File

@ -193,7 +193,8 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
}
@Override
public void breakBlock(World world, int x, int y, int z, int par5, int par6)
//TODO: breakBlock()
public void func_149749_a(World world, int x, int y, int z, Block par5, int par6)
{
byte radius = 1;
int bounds = radius + 1;
@ -394,7 +395,8 @@ public class BlockBOPColorizedLeaves extends BlockLeavesBase implements IShearab
}
@Override
public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
//TODO shouldSideBeRendered
public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side)
{
return true;
}

6
src/main/java/biomesoplenty/common/blocks/BlockBOPCoral.java
View File

@ -63,7 +63,8 @@ public class BlockBOPCoral extends BlockFlower
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < coral.length; ++i)
{
if (i > 2)
@ -153,7 +154,8 @@ public class BlockBOPCoral extends BlockFlower
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
if (meta < 3)
{

9
src/main/java/biomesoplenty/common/blocks/BlockBOPFlower.java
View File

@ -151,7 +151,8 @@ public class BlockBOPFlower extends BlockFlower
* A randomly called display update to be able to add particles or other items for display
*/
@Override
public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random)
//TODO: randomDisplayTick()
public void func_149734_b(World world, int x, int y, int z, Random random)
{
super.randomDisplayTick(par1World, par2, par3, par4, par5Random);
int meta = par1World.getBlockMetadata(par2, par3, par4);
@ -171,7 +172,8 @@ public class BlockBOPFlower extends BlockFlower
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < plants.length; ++i)
{
if (i != 14)
@ -259,7 +261,8 @@ public class BlockBOPFlower extends BlockFlower
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
if (meta == 14)
return 13 & 15;

17
src/main/java/biomesoplenty/common/blocks/BlockBOPFlower2.java
View File

@ -32,12 +32,13 @@ public class BlockBOPFlower2 extends BlockFlower
this.setTickRandomly(true);
float var4 = 0.2F;
this.setBlockBounds(0.5F - var4, 0.0F, 0.5F - var4, 0.5F + var4, var4 * 3.0F, 0.5F + var4);
this.setCreativeTab(BiomesOPlenty.tabBiomesOPlenty);
}
public BlockBOPFlower2(int blockID)
public BlockBOPFlower2()
{
this(blockID, Material.plants);
this(Material.plants);
}
@Override
@ -138,11 +139,9 @@ public class BlockBOPFlower2 extends BlockFlower
}
}
/**
* A randomly called display update to be able to add particles or other items for display
*/
@Override
public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random)
//TODO: randomDisplayTick()
public void func_149734_b(World world, int x, int y, int z, Random random)
{
super.randomDisplayTick(par1World, par2, par3, par4, par5Random);
int meta = par1World.getBlockMetadata(par2, par3, par4);
@ -162,7 +161,8 @@ public class BlockBOPFlower2 extends BlockFlower
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < plants2.length; ++i)
{
list.add(new ItemStack(blockID, 1, i));
@ -224,7 +224,8 @@ public class BlockBOPFlower2 extends BlockFlower
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta & 15;
}

3
src/main/java/biomesoplenty/common/blocks/BlockBOPFoliage.java
View File

@ -47,7 +47,8 @@ public class BlockBOPFoliage extends BlockTallGrass implements IShearable
float f = 0.4F;
setBurnProperties(this.blockID, 60, 100);
setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.8F, 0.5F + f);
setHardness(0.0F);
//TODO: this.setHardness
this.func_149711_c(0.0F);
setStepSound(Block.soundGrassFootstep);
//TODO: this.setCreativeTab()

30
src/main/java/biomesoplenty/common/blocks/BlockBOPGeneric.java
View File

@ -30,39 +30,48 @@ public class BlockBOPGeneric extends Block
switch (type)
{
case ASH_STONE:
setHardness(1.0F).setStepSound(Block.soundStoneFootstep);
//TODO: this.setHardness
this.func_149711_c(1.0F).setStepSound(Block.soundStoneFootstep);
break;
case CRAG_ROCK:
setHardness(1.0F).setStepSound(Block.soundGravelFootstep);
//TODO: this.setHardness
this.func_149711_c(1.0F).setStepSound(Block.soundGravelFootstep);
break;
case DRIED_DIRT:
setHardness(0.1F).setStepSound(Block.soundStoneFootstep);
//TODO: this.setHardness
this.func_149711_c(0.1F).setStepSound(Block.soundStoneFootstep);
break;
case HARD_DIRT:
setHardness(0.9F).setStepSound(Block.soundStoneFootstep);
//TODO: this.setHardness
this.func_149711_c(0.9F).setStepSound(Block.soundStoneFootstep);
break;
case HARD_ICE:
setHardness(0.75F).setStepSound(Block.soundStoneFootstep);
//TODO: this.setHardness
this.func_149711_c(0.75F).setStepSound(Block.soundStoneFootstep);
break;
case HARD_SAND:
setHardness(0.7F).setStepSound(Block.soundSandFootstep);
//TODO: this.setHardness
this.func_149711_c(0.7F).setStepSound(Block.soundSandFootstep);
break;
case MUD_BRICK:
setHardness(1.0F).setResistance(2.0F).setStepSound(Block.soundStoneFootstep);
//TODO: this.setHardness
this.func_149711_c(1.0F).setResistance(2.0F).setStepSound(Block.soundStoneFootstep);
break;
case HOLY_DIRT:
setHardness(0.6F).setStepSound(Block.soundGravelFootstep);
//TODO: this.setHardness
this.func_149711_c(0.6F).setStepSound(Block.soundGravelFootstep);
break;
case CRYSTAL:
setHardness(0.15F).setResistance(5.0F).setLightValue(1.0F).setStepSound(Block.soundGlassFootstep);
//TODO: this.setHardness
this.func_149711_c(0.15F).setResistance(5.0F).setLightValue(1.0F).setStepSound(Block.soundGlassFootstep);
break;
default:
@ -137,7 +146,8 @@ public class BlockBOPGeneric extends Block
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
switch (type)
{

60
src/main/java/biomesoplenty/common/blocks/BlockBOPGrass.java
View File

@ -18,14 +18,16 @@ import biomesoplenty.BiomesOPlenty;
public class BlockBOPGrass extends Block
{
private IIcon[][] blockIcon = new IIcon[2][6];
private IIcon[][] //TODO: blockIcon
this.field_149761_L = new IIcon[2][6];
public BlockBOPGrass()
{
super(Material.grass);
this.setTickRandomly(true);
setStepSound(Block.soundGrassFootstep);
setHardness(0.6F);
//TODO: this.setHardness
this.func_149711_c(0.6F);
//setLightValue(0.25F);
//TODO: this.setCreativeTab()
@ -36,43 +38,60 @@ public class BlockBOPGrass extends Block
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon[0][0] = iconRegister.registerIcon("biomesoplenty:holydirt");
blockIcon[0][1] = iconRegister.registerIcon("biomesoplenty:holygrass_top");
blockIcon[0][2] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
blockIcon[0][3] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
blockIcon[0][4] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
blockIcon[0][5] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
//TODO: blockIcon
this.field_149761_L[0][0] = iconRegister.registerIcon("biomesoplenty:holydirt");
//TODO: blockIcon
this.field_149761_L[0][1] = iconRegister.registerIcon("biomesoplenty:holygrass_top");
//TODO: blockIcon
this.field_149761_L[0][2] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
//TODO: blockIcon
this.field_149761_L[0][3] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
//TODO: blockIcon
this.field_149761_L[0][4] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
//TODO: blockIcon
this.field_149761_L[0][5] = iconRegister.registerIcon("biomesoplenty:holygrass_side");
blockIcon[1][0] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_bottom");
blockIcon[1][1] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_top");
blockIcon[1][2] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
blockIcon[1][3] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
blockIcon[1][4] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
blockIcon[1][5] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
//TODO: blockIcon
this.field_149761_L[1][0] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_bottom");
//TODO: blockIcon
this.field_149761_L[1][1] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_top");
//TODO: blockIcon
this.field_149761_L[1][2] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
//TODO: blockIcon
this.field_149761_L[1][3] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
//TODO: blockIcon
this.field_149761_L[1][4] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
//TODO: blockIcon
this.field_149761_L[1][5] = iconRegister.registerIcon("biomesoplenty:smolderinggrass_side");
}
@Override
//TODO: getIcon()
public IIcon func_149691_a(int side, int meta)
{
if (meta < 0 || meta >= blockIcon.length)
if (meta < 0 || meta >= //TODO: blockIcon
this.field_149761_L.length)
meta = 1;
if (side < 0 || side >= blockIcon[meta].length)
if (side < 0 || side >= //TODO: blockIcon
this.field_149761_L[meta].length)
side = 1;
return blockIcon[meta][side];
return //TODO: blockIcon
this.field_149761_L[meta][side];
}
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < 2; ++i) {
list.add(new ItemStack(blockID, 1, i));
}
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta;
}
@ -164,7 +183,8 @@ public class BlockBOPGrass extends Block
}
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z)
//TODO: getCollisionBoundingBoxFromPool
public AxisAlignedBB func_149668_a(World world, int x, int y, int z)
{
if (world.getBlockMetadata(x, y, z) == 1)
{

9
src/main/java/biomesoplenty/common/blocks/BlockBOPLeaves.java
View File

@ -64,7 +64,8 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
super(Material.leaves, false);
category = cat;
this.setTickRandomly(true);
setHardness(0.2F);
//TODO: this.setHardness
this.func_149711_c(0.2F);
setLightOpacity(1);
setStepSound(Block.soundGrassFootstep);
@ -163,7 +164,8 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
}
@Override
public void breakBlock(World world, int x, int y, int z, int par5, int par6)
//TODO: breakBlock()
public void func_149749_a(World world, int x, int y, int z, Block par5, int par6)
{
byte radius = 1;
int bounds = radius + 1;
@ -412,7 +414,8 @@ public class BlockBOPLeaves extends BlockLeavesBase implements IShearable
}
@Override
public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
//TODO shouldSideBeRendered
public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side)
{
return true;
}

6
src/main/java/biomesoplenty/common/blocks/BlockBOPMushroom.java
View File

@ -93,7 +93,8 @@ public class BlockBOPMushroom extends BlockFlower
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list)
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list)
{
for (int i = 0; i < plants.length; ++i) {
list.add(new ItemStack(blockID, 1, i));
@ -157,7 +158,8 @@ public class BlockBOPMushroom extends BlockFlower
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta & 15;
}

12
src/main/java/biomesoplenty/common/blocks/BlockBOPPersimmonLeaves.java
View File

@ -35,7 +35,8 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab
super(Material.leaves, false);
setBurnProperties(this.blockID, 30, 60);
this.setTickRandomly(true);
setHardness(0.2F);
//TODO: this.setHardness
this.func_149711_c(0.2F);
setLightOpacity(1);
setStepSound(Block.soundGrassFootstep);
@ -82,14 +83,16 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab
}
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return Block.leaves.isOpaqueCube();
}
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
list.add(new ItemStack(blockID, 1, 0));
}
@ -283,7 +286,8 @@ public class BlockBOPPersimmonLeaves extends BlockLeavesBase implements IShearab
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return 15;
}

9
src/main/java/biomesoplenty/common/blocks/BlockBOPPetals.java
View File

@ -25,7 +25,8 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
super(Material.leaves, false);
setBurnProperties(this.blockID, 30, 60);
this.setTickRandomly(true);
setHardness(0.2F);
//TODO: this.setHardness
this.func_149711_c(0.2F);
setLightOpacity(1);
setStepSound(Block.soundGrassFootstep);
@ -59,7 +60,8 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < textures.length; ++i) {
list.add(new ItemStack(blockID, 1, i));
}
@ -75,7 +77,8 @@ public class BlockBOPPetals extends BlockLeavesBase implements IShearable
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta & 15;
}

9
src/main/java/biomesoplenty/common/blocks/BlockBOPPlank.java
View File

@ -19,7 +19,8 @@ public class BlockBOPPlank extends Block
{
super(Material.wood);
setBurnProperties(this.blockID, 5, 20);
setHardness(2.0F);
//TODO: this.setHardness
this.func_149711_c(2.0F);
//TODO: this.setCreativeTab()
this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty);
@ -49,14 +50,16 @@ public class BlockBOPPlank extends Block
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < woodTypes.length; ++i) {
list.add(new ItemStack(blockID, 1, i));
}
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta;
}

6
src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java
View File

@ -43,7 +43,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
setTickRandomly(true);
float var3 = 0.4F;
setBurnProperties(blockID, 60, 100);
setHardness(0.0F);
//TODO: this.setHardness
this.func_149711_c(0.0F);
setStepSound(Block.soundGrassFootstep);
setBlockBounds(0.5F - var3, 0.0F, 0.5F - var3, 0.5F + var3, 0.8F, 0.5F + var3);
@ -355,7 +356,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
if (meta == 9)
{

15
src/main/java/biomesoplenty/common/blocks/BlockBOPRedRock.java
View File

@ -7,6 +7,7 @@ import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
@ -19,7 +20,8 @@ public class BlockBOPRedRock extends Block
public BlockBOPRedRock()
{
super(Material.rock);
//TODO: Material.rock
super(Material.field_151576_e);
setStepSound(Block.soundStoneFootstep);
//TODO: this.setCreativeTab()
@ -50,20 +52,23 @@ public class BlockBOPRedRock extends Block
}
@Override
public int getDamageValue(World world, int x, int y, int z) {
public int getDamageValue(World world, int x, int y, int z)
{
return world.getBlockMetadata(x, y, z);
}
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list)
{
for (int i = 0; i < types.length; ++i) {
list.add(new ItemStack(blockID, 1, i));
}
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta == 0 ? 1 : meta;
}

9
src/main/java/biomesoplenty/common/blocks/BlockBOPSapling.java
View File

@ -23,7 +23,8 @@ public class BlockBOPSapling extends BlockSapling
public BlockBOPSapling()
{
setHardness(0.0F);
//TODO: this.setHardness
this.func_149711_c(0.0F);
setStepSound(Block.soundGrassFootstep);
//TODO: this.setCreativeTab()
@ -55,7 +56,8 @@ public class BlockBOPSapling extends BlockSapling
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < saplings.length; ++i) {
list.add(new ItemStack(blockID, 1, i));
}
@ -213,7 +215,8 @@ public class BlockBOPSapling extends BlockSapling
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta & TYPES;
}

9
src/main/java/biomesoplenty/common/blocks/BlockBOPSkystone.java
View File

@ -19,7 +19,8 @@ public class BlockBOPSkystone extends Block
public BlockBOPSkystone()
{
super(Material.rock);
//TODO: Material.rock
super(Material.field_151576_e);
setStepSound(Block.soundStoneFootstep);
//TODO: this.setCreativeTab()
@ -55,14 +56,16 @@ public class BlockBOPSkystone extends Block
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < types.length; ++i) {
list.add(new ItemStack(blockID, 1, i));
}
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
if (meta == 0)
{

9
src/main/java/biomesoplenty/common/blocks/BlockBOPSlab.java
View File

@ -35,7 +35,8 @@ public class BlockBOPSlab extends BlockHalfSlab
if (material == Material.wood)
{
setBurnProperties(blockID, 5, 20);
setHardness(2.0F);
//TODO: this.setHardness
this.func_149711_c(2.0F);
setResistance(5.0F);
setStepSound(Block.soundWoodFootstep);
}
@ -86,7 +87,8 @@ public class BlockBOPSlab extends BlockHalfSlab
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
int max = 0;
if (category == SlabCategory.WOOD1) {
@ -112,7 +114,8 @@ public class BlockBOPSlab extends BlockHalfSlab
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta & 7;
}

3
src/main/java/biomesoplenty/common/blocks/BlockBOPStairs.java
View File

@ -37,7 +37,8 @@ public class BlockBOPStairs extends BlockStairs
category = cat;
setBurnProperties(this.blockID, 5, 20);
this.setLightOpacity(0);
this.setHardness(model.blockHardness);
this. //TODO: this.setHardness
this.func_149711_c(model.blockHardness);
this.setResistance(model.blockResistance / 3.0F);
//TODO: this.setCreativeTab()

3
src/main/java/biomesoplenty/common/blocks/BlockBamboo.java
View File

@ -138,7 +138,8 @@ public class BlockBamboo extends Block
}
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

12
src/main/java/biomesoplenty/common/blocks/BlockBones.java
View File

@ -21,7 +21,8 @@ public class BlockBones extends Block {
public BlockBones(int blockID)
{
super(blockID, Material.rock);
setHardness(3.0F);
//TODO: this.setHardness
this.func_149711_c(3.0F);
setResistance(5.0F);
//TODO: this.setCreativeTab()
@ -55,7 +56,8 @@ public class BlockBones extends Block {
}
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z)
//TODO: getCollisionBoundingBoxFromPool
public AxisAlignedBB func_149668_a(World world, int x, int y, int z)
{
int meta = world.getBlockMetadata(x, y, z);
@ -203,7 +205,8 @@ public class BlockBones extends Block {
}
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}
@ -227,7 +230,8 @@ public class BlockBones extends Block {
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
if (meta == 3 || meta == 4) {
meta = 0;

27
src/main/java/biomesoplenty/common/blocks/BlockFlesh.java
View File

@ -25,15 +25,13 @@ public class BlockFlesh extends Block
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = par1IconRegister.registerIcon("biomesoplenty:flesh");
//TODO: blockIcon
this.field_149761_L = iconRegister.registerIcon("biomesoplenty:flesh");
}
/**
* Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been
* cleared to be reused)
*/
@Override
public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4)
{
@ -41,13 +39,11 @@ public class BlockFlesh extends Block
return AxisAlignedBB.getAABBPool().getAABB(par2, par3, par4, par2 + 1, par3 + 1 - var5, par4 + 1);
}
/**
* A randomly called display update to be able to add particles or other items for display
*/
@Override
public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random)
//TODO: randomDisplayTick()
public void func_149734_b(World world, int x, int y, int z, Random random)
{
super.randomDisplayTick(par1World, par2, par3, par4, par5Random);
super.func_149734_b(par1World, par2, par3, par4, par5Random);
if (par5Random.nextInt(4) == 0)
{
@ -77,9 +73,6 @@ public class BlockFlesh extends Block
entity.motionZ *= 0.9D;
}
/**
* Returns the ID of the items to drop on destruction.
*/
@Override
public int idDropped(int par1, Random par2Random, int par3)
{
@ -87,14 +80,12 @@ public class BlockFlesh extends Block
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return 3;
}
/**
* Returns the quantity of items to drop on block destruction.
*/
@Override
public int quantityDropped(Random par1Random)
{

12
src/main/java/biomesoplenty/common/blocks/BlockGrave.java
View File

@ -15,9 +15,11 @@ public class BlockGrave extends Block
{
public BlockGrave()
{
super(Material.rock);
//TODO: Material.rock
super(Material.field_151576_e);
setHardness(5f);
//TODO: this.setHardness
this.func_149711_c(5f);
//TODO: this.setCreativeTab()
this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty);
@ -27,7 +29,8 @@ public class BlockGrave extends Block
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = iconRegister.registerIcon("biomesoplenty:grave");
//TODO: blockIcon
this.field_149761_L = iconRegister.registerIcon("biomesoplenty:grave");
}
@Override
@ -95,7 +98,8 @@ public class BlockGrave extends Block
}
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

6
src/main/java/biomesoplenty/common/blocks/BlockHive.java
View File

@ -27,7 +27,8 @@ public class BlockHive extends Block
}
@Override
public void breakBlock(World world, int x, int y, int z, int par5, int par6)
//TODO: breakBlock()
public void func_149749_a(World world, int x, int y, int z, Block par5, int par6)
{
if (world.getBlockMetadata(x, y, z) == 2)
{
@ -83,7 +84,8 @@ public class BlockHive extends Block
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
if (meta == 0)
{

21
src/main/java/biomesoplenty/common/blocks/BlockHoney.java
View File

@ -12,33 +12,38 @@ public class BlockHoney extends Block
{
public BlockHoney()
{
super(Material.glass);
//TODO: Material.glass
super(Material.field_151592_s);
//TODO: this.setCreativeTab()
this.func_149647_a(BiomesOPlenty.tabBiomesOPlenty);
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = par1IconRegister.registerIcon("biomesoplenty:honeyblock");
//TODO: blockIcon
this.field_149761_L = iconRegister.registerIcon("biomesoplenty:honeyblock");
}
@Override
@SideOnly(Side.CLIENT)
public int getRenderBlockPass()
//TODO: getRenderBlockPass()
public int func_149701_w()
{
return 1;
}
@Override
public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5)
//TODO shouldSideBeRendered
public boolean func_149646_a(IBlockAccess world, int x, int y, int z, int side)
{
return super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, 1 - par5);
return super.func_149646_a(world, x, y, z, 1 - side);
}
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

9
src/main/java/biomesoplenty/common/blocks/BlockIvy.java
View File

@ -29,9 +29,11 @@ public class BlockIvy extends Block implements IShearable
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = par1IconRegister.registerIcon("biomesoplenty:ivy");
//TODO: blockIcon
this.field_149761_L = par1IconRegister.registerIcon("biomesoplenty:ivy");
}
/**
@ -57,7 +59,8 @@ public class BlockIvy extends Block implements IShearable
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

30
src/main/java/biomesoplenty/common/blocks/BlockLongGrass.java
View File

@ -15,7 +15,8 @@ import biomesoplenty.BiomesOPlenty;
public class BlockLongGrass extends Block
{
private IIcon[] blockIcon = new IIcon[6];
private IIcon[] //TODO: blockIcon
this.field_149761_L = new IIcon[6];
public BlockLongGrass()
{
@ -27,14 +28,21 @@ public class BlockLongGrass extends Block
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon[0] = par1IconRegister.registerIcon("biomesoplenty:longgrass3");
blockIcon[1] = par1IconRegister.registerIcon("biomesoplenty:longgrass1");
blockIcon[2] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
blockIcon[3] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
blockIcon[4] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
blockIcon[5] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
//TODO: blockIcon
this.field_149761_L[0] = par1IconRegister.registerIcon("biomesoplenty:longgrass3");
//TODO: blockIcon
this.field_149761_L[1] = par1IconRegister.registerIcon("biomesoplenty:longgrass1");
//TODO: blockIcon
this.field_149761_L[2] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
//TODO: blockIcon
this.field_149761_L[3] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
//TODO: blockIcon
this.field_149761_L[4] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
//TODO: blockIcon
this.field_149761_L[5] = par1IconRegister.registerIcon("biomesoplenty:longgrass2");
}
/**
@ -43,10 +51,12 @@ public class BlockLongGrass extends Block
@Override
public IIcon getIcon(int par1, int par2)
{
if (par1 < 0 || par1 >= blockIcon.length)
if (par1 < 0 || par1 >= //TODO: blockIcon
this.field_149761_L.length)
par1 = 1;
return blockIcon[par1];
return //TODO: blockIcon
this.field_149761_L[par1];
}
/**

9
src/main/java/biomesoplenty/common/blocks/BlockMoss.java
View File

@ -26,9 +26,11 @@ public class BlockMoss extends Block
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = par1IconRegister.registerIcon("biomesoplenty:moss");
//TODO: blockIcon
this.field_149761_L = par1IconRegister.registerIcon("biomesoplenty:moss");
}
/**
@ -54,7 +56,8 @@ public class BlockMoss extends Block
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

30
src/main/java/biomesoplenty/common/blocks/BlockOriginGrass.java
View File

@ -15,7 +15,8 @@ import biomesoplenty.BiomesOPlenty;
public class BlockOriginGrass extends Block
{
private IIcon[] blockIcon = new IIcon[6];
private IIcon[] //TODO: blockIcon
this.field_149761_L = new IIcon[6];
public BlockOriginGrass()
{
@ -27,14 +28,21 @@ public class BlockOriginGrass extends Block
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon[0] = par1IconRegister.registerIcon("biomesoplenty:origingrass3");
blockIcon[1] = par1IconRegister.registerIcon("biomesoplenty:origingrass1");
blockIcon[2] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
blockIcon[3] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
blockIcon[4] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
blockIcon[5] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
//TODO: blockIcon
this.field_149761_L[0] = par1IconRegister.registerIcon("biomesoplenty:origingrass3");
//TODO: blockIcon
this.field_149761_L[1] = par1IconRegister.registerIcon("biomesoplenty:origingrass1");
//TODO: blockIcon
this.field_149761_L[2] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
//TODO: blockIcon
this.field_149761_L[3] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
//TODO: blockIcon
this.field_149761_L[4] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
//TODO: blockIcon
this.field_149761_L[5] = par1IconRegister.registerIcon("biomesoplenty:origingrass2");
}
/**
@ -43,10 +51,12 @@ public class BlockOriginGrass extends Block
@Override
public IIcon getIcon(int par1, int par2)
{
if (par1 < 0 || par1 >= blockIcon.length)
if (par1 < 0 || par1 >= //TODO: blockIcon
this.field_149761_L.length)
par1 = 1;
return blockIcon[par1];
return //TODO: blockIcon
this.field_149761_L[par1];
}
/**

33
src/main/java/biomesoplenty/common/blocks/BlockOvergrownNetherrack.java
View File

@ -13,11 +13,13 @@ import biomesoplenty.BiomesOPlenty;
public class BlockOvergrownNetherrack extends Block
{
private IIcon[] blockIcon = new IIcon[6];
private IIcon[] //TODO: blockIcon
this.field_149761_L = new IIcon[6];
public BlockOvergrownNetherrack()
{
super(Material.rock);
//TODO: Material.rock
super(Material.field_151576_e);
this.setTickRandomly(true);
//TODO: this.setCreativeTab()
@ -25,14 +27,21 @@ public class BlockOvergrownNetherrack extends Block
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon[0] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack3");
blockIcon[1] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack1");
blockIcon[2] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
blockIcon[3] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
blockIcon[4] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
blockIcon[5] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
//TODO: blockIcon
this.field_149761_L[0] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack3");
//TODO: blockIcon
this.field_149761_L[1] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack1");
//TODO: blockIcon
this.field_149761_L[2] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
//TODO: blockIcon
this.field_149761_L[3] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
//TODO: blockIcon
this.field_149761_L[4] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
//TODO: blockIcon
this.field_149761_L[5] = par1IconRegister.registerIcon("biomesoplenty:overgrownnetherrack2");
}
/**
@ -41,10 +50,12 @@ public class BlockOvergrownNetherrack extends Block
@Override
public IIcon getIcon(int par1, int par2)
{
if (par1 < 0 || par1 >= blockIcon.length)
if (par1 < 0 || par1 >= //TODO: blockIcon
this.field_149761_L.length)
par1 = 1;
return blockIcon[par1];
return //TODO: blockIcon
this.field_149761_L[par1];
}
/**

9
src/main/java/biomesoplenty/common/blocks/BlockPromisedPortal.java
View File

@ -20,9 +20,11 @@ public class BlockPromisedPortal extends Block
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = par1IconRegister.registerIcon("biomesoplenty:portal");
//TODO: blockIcon
this.field_149761_L = par1IconRegister.registerIcon("biomesoplenty:portal");
}
@Override
@ -63,7 +65,8 @@ public class BlockPromisedPortal extends Block
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

3
src/main/java/biomesoplenty/common/blocks/BlockPuddle.java
View File

@ -61,7 +61,8 @@ public class BlockPuddle extends Block
}
@Override
public int getRenderBlockPass()
//TODO: getRenderBlockPass()
public int func_149701_w()
{
return 1;
}

6
src/main/java/biomesoplenty/common/blocks/BlockStoneFormations.java
View File

@ -81,7 +81,8 @@ public class BlockStoneFormations extends BlockFlower
@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
public void getSubBlocks(int blockID, CreativeTabs creativeTabs, List list) {
//TODO: getSubBlocks()
public void func_149666_a(Item block, CreativeTabs creativeTabs, List list) {
for (int i = 0; i < forms.length; ++i)
{
list.add(new ItemStack(blockID, 1, i));
@ -139,7 +140,8 @@ public class BlockStoneFormations extends BlockFlower
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta & 15;
}

9
src/main/java/biomesoplenty/common/blocks/BlockTreeMoss.java
View File

@ -28,9 +28,11 @@ public class BlockTreeMoss extends Block implements IShearable
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = par1IconRegister.registerIcon("biomesoplenty:treemoss");
//TODO: blockIcon
this.field_149761_L = par1IconRegister.registerIcon("biomesoplenty:treemoss");
}
/**
@ -56,7 +58,8 @@ public class BlockTreeMoss extends Block implements IShearable
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

3
src/main/java/biomesoplenty/common/blocks/BlockTurnip.java
View File

@ -59,7 +59,8 @@ public class BlockTurnip extends BlockCrops
}
@Override
public int damageDropped(int meta)
//TODO damageDropped()
public int func_149692_a(int meta)
{
return meta == 7 ? 11 : 0;
}

9
src/main/java/biomesoplenty/common/blocks/BlockWillow.java
View File

@ -29,9 +29,11 @@ public class BlockWillow extends Block implements IShearable
}
@Override
public void registerIcons(IIconRegister par1IconRegister)
//TODO: registerIcons()
public void func_149651_a(IIconRegister iconRegister)
{
blockIcon = par1IconRegister.registerIcon("biomesoplenty:willow");
//TODO: blockIcon
this.field_149761_L = par1IconRegister.registerIcon("biomesoplenty:willow");
}
/**
@ -57,7 +59,8 @@ public class BlockWillow extends Block implements IShearable
* adjacent blocks and also whether the player can attach torches, redstone wire, etc to this block.
*/
@Override
public boolean isOpaqueCube()
//TODO: isOpaqueCube()
public boolean func_149662_c()
{
return false;
}

3
src/main/java/biomesoplenty/common/core/BOPBlocks.java
View File

@ -7,6 +7,7 @@ import biomesoplenty.common.blocks.BlockBOPColorizedSapling;
import biomesoplenty.common.blocks.BlockBOPLog;
import biomesoplenty.common.blocks.BlockBOPLog.LogCategory;
import biomesoplenty.common.blocks.BlockCloud;
import biomesoplenty.common.blocks.BlockHoney;
import biomesoplenty.common.blocks.BlockMud;
import biomesoplenty.common.itemblocks.ItemBlockColorizedSapling;
import biomesoplenty.common.itemblocks.ItemBlockLog;
@ -31,6 +32,8 @@ public class BOPBlocks
registerBlock(new BlockCloud().func_149663_c("cloud"));
registerBlock(new BlockHoney().func_149663_c("honeyBlock"));
registerBlock(new BlockBOPLog(LogCategory.CAT1).func_149663_c("logs1"), ItemBlockLog.class);
registerBlock(new BlockBOPLog(LogCategory.CAT2).func_149663_c("logs2"), ItemBlockLog.class);
registerBlock(new BlockBOPLog(LogCategory.CAT3).func_149663_c("logs3"), ItemBlockLog.class);