shoutout to all the pear

This commit is contained in:
Matt Caughey 2015-03-27 08:06:30 -04:00
parent 1543214dcd
commit 933cf07aa0
8 changed files with 26 additions and 14 deletions

View file

@ -35,7 +35,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockBOPFruit extends BOPBlockWorldDecor
{
private static final String[] fruit = new String[] {"apple_block", "persimmon_block", "peach_block"};
private static final String[] fruit = new String[] {"apple_block", "persimmon_block", "peach_block", "pear_block"};
private IIcon[] textures;
public BlockBOPFruit()
@ -83,10 +83,10 @@ public class BlockBOPFruit extends BOPBlockWorldDecor
//TODO: getSubBlocks()
public void getSubBlocks(Item block, CreativeTabs creativeTabs, List list)
{
for (int i = 0; i < fruit.length; ++i)
{
list.add(new ItemStack(block, 1, i));
}
//for (int i = 0; i < fruit.length; ++i)
//{
//list.add(new ItemStack(block, 1, i));
//}
}
@Override
@ -124,6 +124,9 @@ public class BlockBOPFruit extends BOPBlockWorldDecor
case 2:
return new ItemStack(BOPCItems.food, 1, 3);
case 3:
return new ItemStack(BOPCItems.food, 1, 12);
}
return new ItemStack(this, 1, meta);
@ -152,6 +155,10 @@ public class BlockBOPFruit extends BOPBlockWorldDecor
{
return BOPCItems.food;
}
else if (metadata == 3)
{
return BOPCItems.food;
}
else
{
return null;
@ -169,6 +176,10 @@ public class BlockBOPFruit extends BOPBlockWorldDecor
{
return 3;
}
else if (meta == 3)
{
return 12;
}
else
{
return 0;

View file

@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly;
public class ItemBlockFruit extends ItemBlock
{
private static final String[] plants = new String[] {"apple_block", "persimmon_block", "peach_block"};
private static final String[] plants = new String[] {"apple_block", "persimmon_block", "peach_block", "pear_block"};
@SideOnly(Side.CLIENT)
private IIcon[] textures;

View file

@ -21,8 +21,8 @@ import biomesoplenty.api.content.BOPCBlocks;
public class ItemBOPFood extends ItemFood
{
private static final String[] foodTypes = new String[] {"berries", "shroompowder", "wildcarrots", "peach", "saladfruit", "saladveggie", "saladshroom", "earth", "persimmon", "filledhoneycomb", "ambrosia", "turnip"};
private static final int[] foodHunger = new int[] {1, 1, 3, 5, 6, 6, 6, 0, 5, 3, 6, 3};
private static final String[] foodTypes = new String[] {"berries", "shroompowder", "wildcarrots", "peach", "saladfruit", "saladveggie", "saladshroom", "earth", "persimmon", "filledhoneycomb", "ambrosia", "turnip", "pear"};
private static final int[] foodHunger = new int[] {1, 1, 3, 5, 6, 6, 6, 0, 5, 3, 6, 3, 5};
private static final float[] foodSaturation = new float[] {0.1F, 0.1F, 0.5F, 0.5F, 0.6F, 0.6F, 0.6F, 0.0F, 0.2F, 0.4F, 0.8F, 0.4F};
private IIcon[] textures;
@ -179,12 +179,7 @@ public class ItemBOPFood extends ItemFood
if (itemStack.getItem() == this && itemStack.getItemDamage() == 0)
{
return 8;
}
if (itemStack.getItem() == this && itemStack.getItemDamage() == 3)
{
return 12;
}
}
if (itemStack.getItem() == this && itemStack.getItemDamage() == 9)
{

View file

@ -68,6 +68,11 @@ tile.flowers2.minersdelight.name=Miner's Delight
tile.flowers2.icyiris.name=Icy Iris
tile.flowers2.rose.name=Rose
tile.fruitBop.apple_block.name=Apple
tile.fruitBop.persimmon_block.name=Persimmon
tile.fruitBop.peach_block.name=Peach
tile.fruitBop.pear_block.name=Pear
tile.stoneFormations.stalagmite.name=Stalagmite
tile.stoneFormations.stalactite.name=Stalactite
@ -321,6 +326,7 @@ item.food.persimmon.name=Persimmon
item.food.filledhoneycomb.name=Filled Honeycomb
item.food.ambrosia.name=Ambrosia
item.food.turnip.name=Turnip
item.food.pear.name=Pear
item.turnipSeeds.name=Turnip Seeds

Binary file not shown.

Before

Width:  |  Height:  |  Size: 333 B

After

Width:  |  Height:  |  Size: 308 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 317 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 370 B

After

Width:  |  Height:  |  Size: 355 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 364 B