Fixed placing of plants.

Fixed texture icons for barley and cattail.
This commit is contained in:
Amnet 2013-04-20 16:42:46 +02:00
parent 42a6f82010
commit 29706fbd03
26 changed files with 146 additions and 16 deletions

View File

@ -91,25 +91,74 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
list.add(new ItemStack(blockID, 1, i));
}
@Override
public boolean canPlaceBlockAt(World world, int x, int y, int z)
{
return super.canPlaceBlockAt(world, x, y, z) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z));
}
// @Override
// public boolean canPlaceBlockAt(World world, int x, int y, int z)
// {
// return true;//super.canPlaceBlockAt(world, x, y, z) && this.canThisPlantGrowOnThisBlockID(world.getBlockId(x, y - 1, z), world.getBlockMetadata(x, y, z));
// }
protected boolean canThisPlantGrowOnThisBlockID(int id, int meta)
{
// TODO
if (meta == 0)
return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID;
else if (meta == 1)
return id == Blocks.redRock.get().blockID;
else if (meta == 2 || meta == 3)
return id == Block.sand.blockID;
else if (meta == 4)
return id == Blocks.holyGrass.get().blockID;
switch (meta)
{
case 0: // Dead Grass
return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID;
case 1: // Desert Grass
return id == Blocks.redRock.get().blockID;
case 2: // Desert Sprouts
case 3: // Dune Grass
return id == Block.sand.blockID;
case 4: // Holy Tall Grass
return id == Blocks.holyGrass.get().blockID;
case 5:
return true;
case 7:
return id == Block.grass.blockID;
default:
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
}
}
@Override
public boolean canPlaceBlockOnSide(World world, int x, int y, int z, int side, ItemStack itemStack)
{
int id = world.getBlockId(x, y - 1, z);
int meta = itemStack.getItemDamage();
if (itemStack.itemID == this.blockID)
switch (meta)
{
case 0: // Dead Grass
return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID;
case 1: // Desert Grass
return id == Blocks.redRock.get().blockID;
case 2: // Desert Sprouts
case 3: // Dune Grass
return id == Block.sand.blockID;
case 4: // Holy Tall Grass
return id == Blocks.holyGrass.get().blockID;
case 5: // Thorns
return true;
case 7: // Cattail
return id != Block.grass.blockID ? false : (world.getBlockMaterial(x - 1, y - 1, z) == Material.water ? true : (world.getBlockMaterial(x + 1, y - 1, z) == Material.water ? true : (world.getBlockMaterial(x, y - 1, z - 1) == Material.water ? true : world.getBlockMaterial(x, y - 1, z + 1) == Material.water)));
default:
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
}
else
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
return this.canPlaceBlockOnSide(world, x, y, z, side);
}
@Override

View File

@ -29,7 +29,7 @@ public class ItemBOPFoliage extends ItemBlock
textures = new Icon[foliageTypes.length - 1];
for (int i = 0; i < foliageTypes.length - 1; ++i)
textures[i] = iconRegister.registerIcon("BiomesOPlenty:item" + foliageTypes[i]);
textures[i] = iconRegister.registerIcon("BiomesOPlenty:item_" + foliageTypes[i]);
}
@Override

View File

@ -1,13 +1,21 @@
package biomesoplenty.items;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Icon;
import net.minecraft.world.World;
public class ItemBOPPlant extends ItemBlock
{
private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail"};
@SideOnly(Side.CLIENT)
private Icon[] textures;
public ItemBOPPlant(int par1)
{
@ -22,6 +30,15 @@ public class ItemBOPPlant extends ItemBlock
return meta & 15;
}
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister iconRegister)
{
textures = new Icon[2];
textures[0] = iconRegister.registerIcon("BiomesOPlenty:item_barley");
textures[1] = iconRegister.registerIcon("BiomesOPlenty:item_cattail");
}
@Override
public String getUnlocalizedName(ItemStack itemStack)
{
@ -31,6 +48,70 @@ public class ItemBOPPlant extends ItemBlock
@Override
public Icon getIconFromDamage(int meta)
{
return Block.blocksList[this.itemID].getIcon(0, meta);
if (meta == 6)
return textures[0];
else if (meta == 7)
return textures[1];
else
return Block.blocksList[this.itemID].getIcon(0, meta);
}
public boolean onItemUse(ItemStack itemStack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ)
{
int id = world.getBlockId(x, y, z);
if (id == Block.snow.blockID && (world.getBlockMetadata(x, y, z) & 7) < 1)
side = 1;
else if (!Block.blocksList[id].isBlockReplaceable(world, x, y, z))
{
if (side == 0)
--y;
if (side == 1)
++y;
if (side == 2)
--z;
if (side == 3)
++z;
if (side == 4)
--x;
if (side == 5)
++x;
}
if (!player.canPlayerEdit(x, y, z, side, itemStack))
{
return false;
}
else if (itemStack.stackSize == 0)
{
return false;
}
else
{
if (world.canPlaceEntityOnSide(this.getBlockID(), x, y, z, false, side, (Entity)null, itemStack))
{
Block block = Block.blocksList[this.getBlockID()];
int j1 = block.onBlockPlaced(world, x, y, z, side, hitX, hitY, hitZ, 0);
if (world.setBlock(x, y, z, this.getBlockID(), itemStack.getItemDamage(), 3))
{
if (world.getBlockId(x, y, z) == this.getBlockID())
{
Block.blocksList[this.getBlockID()].onBlockPlacedBy(world, x, y, z, player, itemStack);
Block.blocksList[this.getBlockID()].onPostBlockPlaced(world, x, y, z, j1);
}
world.playSoundEffect((double)((float)x + 0.5F), (double)((float)y + 0.5F), (double)((float)z + 0.5F), block.stepSound.getPlaceSound(), (block.stepSound.getVolume() + 1.0F) / 2.0F, block.stepSound.getPitch() * 0.8F);
--itemStack.stackSize;
}
}
return true;
}
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 342 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 449 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 473 B

View File

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 359 B

View File

Before

Width:  |  Height:  |  Size: 597 B

After

Width:  |  Height:  |  Size: 597 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

Before

Width:  |  Height:  |  Size: 373 B

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 356 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 532 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 394 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 428 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 391 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 397 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 515 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 376 B