diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index 5f1fb5d42..ac1e86637 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -161,9 +161,10 @@ public class BlockReferences { thorn (Blocks.plants, 5), barley (Blocks.plants, 6), cattail (Blocks.plants, 7), - reed (Blocks.plants, 8), + rivercane (Blocks.plants, 8), tinyCactus (Blocks.plants, 12), witherwart (Blocks.plants, 13), + reed (Blocks.plants, 14), treeMoss (Blocks.treeMoss, 0), moss (Blocks.moss, 0), diff --git a/common/biomesoplenty/blocks/BlockBOPPlant.java b/common/biomesoplenty/blocks/BlockBOPPlant.java index 90f819436..7eab225c6 100644 --- a/common/biomesoplenty/blocks/BlockBOPPlant.java +++ b/common/biomesoplenty/blocks/BlockBOPPlant.java @@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly; 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 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; else if (metadata == 13) return blockID == Block.slowSand.blockID; + else if (metadata == 14) + return blockID == Block.waterStill.blockID; else 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) { 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 @@ -172,7 +174,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable 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))); - case 8: // Reed + case 8: // River Cane return id == blockID || id == Block.grass.blockID; case 10: // High Cattail Bottom @@ -181,9 +183,12 @@ public class BlockBOPPlant extends BlockFlower implements IShearable case 12: // Tiny Cactus 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; + case 14: // Reed + return id == Block.waterStill.blockID; + default: return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; } diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index 44cd2882b..461b01ab6 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -179,7 +179,7 @@ public class ThaumcraftIntegration { //Placer Items 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("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("sproutItem"), getBMeta("sproutItem"), (new AspectList()).add(Aspect.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new AspectList()).add(Aspect.PLANT, 2)); diff --git a/common/biomesoplenty/itemblocks/ItemBlockPlant.java b/common/biomesoplenty/itemblocks/ItemBlockPlant.java index 03055bfc7..51944d99b 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockPlant.java +++ b/common/biomesoplenty/itemblocks/ItemBlockPlant.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; 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) private Icon[] textures; @@ -34,12 +34,13 @@ public class ItemBlockPlant extends ItemBlock @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - textures = new Icon[4]; + textures = new Icon[5]; textures[0] = iconRegister.registerIcon("biomesoplenty:item_barley"); 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[4] = iconRegister.registerIcon("biomesoplenty:item_reed"); } @Override @@ -64,6 +65,8 @@ public class ItemBlockPlant extends ItemBlock return textures[2]; else if (meta == 13) return textures[3]; + else if (meta == 14) + return textures[4]; else return Block.blocksList[itemID].getIcon(0, meta); } diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 21e5e244e..c73c75861 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -33,9 +33,10 @@ Cattail Cattail Cattail - Reed + River Cane Tiny Cactus Wither Wart + Reed Clover Swampflower diff --git a/resources/assets/biomesoplenty/textures/blocks/item_reed.png b/resources/assets/biomesoplenty/textures/blocks/item_reed.png index b46401411..b9b3c790a 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/item_reed.png and b/resources/assets/biomesoplenty/textures/blocks/item_reed.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/item_rivercane.png b/resources/assets/biomesoplenty/textures/blocks/item_rivercane.png new file mode 100644 index 000000000..b46401411 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/item_rivercane.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/reed.png b/resources/assets/biomesoplenty/textures/blocks/reed.png index 884a55386..3019d31f3 100644 Binary files a/resources/assets/biomesoplenty/textures/blocks/reed.png and b/resources/assets/biomesoplenty/textures/blocks/reed.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/reedbottom.png b/resources/assets/biomesoplenty/textures/blocks/reedbottom.png new file mode 100644 index 000000000..084582b97 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/reedbottom.png differ diff --git a/resources/assets/biomesoplenty/textures/blocks/rivercane.png b/resources/assets/biomesoplenty/textures/blocks/rivercane.png new file mode 100644 index 000000000..884a55386 Binary files /dev/null and b/resources/assets/biomesoplenty/textures/blocks/rivercane.png differ