Changed reeds to river cane, started adding proper reeds
|
@ -161,9 +161,10 @@ public class BlockReferences {
|
||||||
thorn (Blocks.plants, 5),
|
thorn (Blocks.plants, 5),
|
||||||
barley (Blocks.plants, 6),
|
barley (Blocks.plants, 6),
|
||||||
cattail (Blocks.plants, 7),
|
cattail (Blocks.plants, 7),
|
||||||
reed (Blocks.plants, 8),
|
rivercane (Blocks.plants, 8),
|
||||||
tinyCactus (Blocks.plants, 12),
|
tinyCactus (Blocks.plants, 12),
|
||||||
witherwart (Blocks.plants, 13),
|
witherwart (Blocks.plants, 13),
|
||||||
|
reed (Blocks.plants, 14),
|
||||||
|
|
||||||
treeMoss (Blocks.treeMoss, 0),
|
treeMoss (Blocks.treeMoss, 0),
|
||||||
moss (Blocks.moss, 0),
|
moss (Blocks.moss, 0),
|
||||||
|
|
|
@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class BlockBOPPlant extends BlockFlower implements IShearable
|
public class BlockBOPPlant extends BlockFlower implements IShearable
|
||||||
{
|
{
|
||||||
private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart"};
|
private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed"};
|
||||||
private Icon[] textures;
|
private Icon[] textures;
|
||||||
|
|
||||||
private static final int CATTAILTOP = 9;
|
private static final int CATTAILTOP = 9;
|
||||||
|
@ -130,6 +130,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
|
||||||
return blockID == Block.sand.blockID || blockID == Blocks.redRock.get().blockID || blockID == Block.slowSand.blockID;
|
return blockID == Block.sand.blockID || blockID == Blocks.redRock.get().blockID || blockID == Block.slowSand.blockID;
|
||||||
else if (metadata == 13)
|
else if (metadata == 13)
|
||||||
return blockID == Block.slowSand.blockID;
|
return blockID == Block.slowSand.blockID;
|
||||||
|
else if (metadata == 14)
|
||||||
|
return blockID == Block.waterStill.blockID;
|
||||||
else
|
else
|
||||||
return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID || blockID == Blocks.longGrass.get().blockID;
|
return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID || blockID == Blocks.longGrass.get().blockID;
|
||||||
}
|
}
|
||||||
|
@ -138,7 +140,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
|
||||||
protected boolean canThisPlantGrowOnThisBlockID(int id)
|
protected boolean canThisPlantGrowOnThisBlockID(int id)
|
||||||
{
|
{
|
||||||
return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID || id == Blocks.redRock.get().blockID || id == Blocks.holyGrass.get().blockID
|
return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID || id == Blocks.redRock.get().blockID || id == Blocks.holyGrass.get().blockID
|
||||||
|| id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
|
|| id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.waterStill.blockID;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -172,7 +174,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
|
||||||
case 7: // Cattail
|
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)));
|
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)));
|
||||||
|
|
||||||
case 8: // Reed
|
case 8: // River Cane
|
||||||
return id == blockID || id == Block.grass.blockID;
|
return id == blockID || id == Block.grass.blockID;
|
||||||
|
|
||||||
case 10: // High Cattail Bottom
|
case 10: // High Cattail Bottom
|
||||||
|
@ -181,9 +183,12 @@ public class BlockBOPPlant extends BlockFlower implements IShearable
|
||||||
case 12: // Tiny Cactus
|
case 12: // Tiny Cactus
|
||||||
return id == Block.sand.blockID || id == Blocks.redRock.get().blockID || id == Block.slowSand.blockID;
|
return id == Block.sand.blockID || id == Blocks.redRock.get().blockID || id == Block.slowSand.blockID;
|
||||||
|
|
||||||
case 13: // Antiwart
|
case 13: // Wither Wart
|
||||||
return id == Block.slowSand.blockID;
|
return id == Block.slowSand.blockID;
|
||||||
|
|
||||||
|
case 14: // Reed
|
||||||
|
return id == Block.waterStill.blockID;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
|
return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID;
|
||||||
}
|
}
|
||||||
|
|
|
@ -179,7 +179,7 @@ public class ThaumcraftIntegration {
|
||||||
//Placer Items
|
//Placer Items
|
||||||
ThaumcraftApi.registerObjectTag(getBID("barley"), getBMeta("barley"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
|
ThaumcraftApi.registerObjectTag(getBID("barley"), getBMeta("barley"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
|
||||||
ThaumcraftApi.registerObjectTag(getBID("cattail"), getBMeta("cattail"), (new AspectList()).add(Aspect.WATER, 1).add(Aspect.PLANT, 1));
|
ThaumcraftApi.registerObjectTag(getBID("cattail"), getBMeta("cattail"), (new AspectList()).add(Aspect.WATER, 1).add(Aspect.PLANT, 1));
|
||||||
ThaumcraftApi.registerObjectTag(getBID("reed"), getBMeta("reed"), (new AspectList()).add(Aspect.TREE, 1).add(Aspect.PLANT, 1));
|
ThaumcraftApi.registerObjectTag(getBID("rivercane"), getBMeta("rivercane"), (new AspectList()).add(Aspect.TREE, 1).add(Aspect.PLANT, 1));
|
||||||
ThaumcraftApi.registerObjectTag(getBID("bamboo"), getBMeta("bamboo"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
|
ThaumcraftApi.registerObjectTag(getBID("bamboo"), getBMeta("bamboo"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1));
|
||||||
ThaumcraftApi.registerObjectTag(getBID("sproutItem"), getBMeta("sproutItem"), (new AspectList()).add(Aspect.PLANT, 2));
|
ThaumcraftApi.registerObjectTag(getBID("sproutItem"), getBMeta("sproutItem"), (new AspectList()).add(Aspect.PLANT, 2));
|
||||||
ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new AspectList()).add(Aspect.PLANT, 2));
|
ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new AspectList()).add(Aspect.PLANT, 2));
|
||||||
|
|
|
@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||||
|
|
||||||
public class ItemBlockPlant extends ItemBlock
|
public class ItemBlockPlant extends ItemBlock
|
||||||
{
|
{
|
||||||
private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart"};
|
private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed"};
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
private Icon[] textures;
|
private Icon[] textures;
|
||||||
|
|
||||||
|
@ -34,12 +34,13 @@ public class ItemBlockPlant extends ItemBlock
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void registerIcons(IconRegister iconRegister)
|
public void registerIcons(IconRegister iconRegister)
|
||||||
{
|
{
|
||||||
textures = new Icon[4];
|
textures = new Icon[5];
|
||||||
|
|
||||||
textures[0] = iconRegister.registerIcon("biomesoplenty:item_barley");
|
textures[0] = iconRegister.registerIcon("biomesoplenty:item_barley");
|
||||||
textures[1] = iconRegister.registerIcon("biomesoplenty:item_cattail");
|
textures[1] = iconRegister.registerIcon("biomesoplenty:item_cattail");
|
||||||
textures[2] = iconRegister.registerIcon("biomesoplenty:item_reed");
|
textures[2] = iconRegister.registerIcon("biomesoplenty:item_rivercane");
|
||||||
textures[3] = iconRegister.registerIcon("biomesoplenty:item_witherwart");
|
textures[3] = iconRegister.registerIcon("biomesoplenty:item_witherwart");
|
||||||
|
textures[4] = iconRegister.registerIcon("biomesoplenty:item_reed");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -64,6 +65,8 @@ public class ItemBlockPlant extends ItemBlock
|
||||||
return textures[2];
|
return textures[2];
|
||||||
else if (meta == 13)
|
else if (meta == 13)
|
||||||
return textures[3];
|
return textures[3];
|
||||||
|
else if (meta == 14)
|
||||||
|
return textures[4];
|
||||||
else
|
else
|
||||||
return Block.blocksList[itemID].getIcon(0, meta);
|
return Block.blocksList[itemID].getIcon(0, meta);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
<entry key="tile.bop.plants.cattail.name">Cattail</entry>
|
<entry key="tile.bop.plants.cattail.name">Cattail</entry>
|
||||||
<entry key="tile.bop.plants.cattailtop.name">Cattail</entry>
|
<entry key="tile.bop.plants.cattailtop.name">Cattail</entry>
|
||||||
<entry key="tile.bop.plants.cattailbottom.name">Cattail</entry>
|
<entry key="tile.bop.plants.cattailbottom.name">Cattail</entry>
|
||||||
<entry key="tile.bop.plants.reed.name">Reed</entry>
|
<entry key="tile.bop.plants.rivercane.name">River Cane</entry>
|
||||||
<entry key="tile.bop.plants.cactus.name">Tiny Cactus</entry>
|
<entry key="tile.bop.plants.cactus.name">Tiny Cactus</entry>
|
||||||
<entry key="tile.bop.plants.witherwart.name">Wither Wart</entry>
|
<entry key="tile.bop.plants.witherwart.name">Wither Wart</entry>
|
||||||
|
<entry key="tile.bop.plants.reed.name">Reed</entry>
|
||||||
|
|
||||||
<entry key="tile.bop.flowers.clover.name">Clover</entry>
|
<entry key="tile.bop.flowers.clover.name">Clover</entry>
|
||||||
<entry key="tile.bop.flowers.swampflower.name">Swampflower</entry>
|
<entry key="tile.bop.flowers.swampflower.name">Swampflower</entry>
|
||||||
|
|
Before Width: | Height: | Size: 283 B After Width: | Height: | Size: 471 B |
After Width: | Height: | Size: 283 B |
Before Width: | Height: | Size: 518 B After Width: | Height: | Size: 720 B |
After Width: | Height: | Size: 688 B |
After Width: | Height: | Size: 518 B |