From b843eeb1d22369308ed394073a145cbfec157e1d Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Fri, 6 Sep 2013 19:27:44 -0400 Subject: [PATCH] Added Antiwart --- .../assets/biomesoplenty/lang/en_US.xml | 1 + .../textures/blocks/antiwart.png | Bin 0 -> 400 bytes .../textures/blocks/item_antiwart.png | Bin 0 -> 311 bytes .../biomesoplenty/api/BlockReferences.java | 1 + .../biomes/BiomeGenNetherGarden.java | 2 +- .../biomesoplenty/blocks/BlockBOPPlant.java | 20 ++++++++++++++- .../blocks/renderers/PlantsRenderer.java | 2 ++ .../itemblocks/ItemBlockPlant.java | 7 +++-- .../worldgen/WorldGenNetherWart.java | 24 +++++++++++++++++- 9 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 src/minecraft/assets/biomesoplenty/textures/blocks/antiwart.png create mode 100644 src/minecraft/assets/biomesoplenty/textures/blocks/item_antiwart.png diff --git a/src/minecraft/assets/biomesoplenty/lang/en_US.xml b/src/minecraft/assets/biomesoplenty/lang/en_US.xml index a74b8e8f2..ac3c7f2af 100644 --- a/src/minecraft/assets/biomesoplenty/lang/en_US.xml +++ b/src/minecraft/assets/biomesoplenty/lang/en_US.xml @@ -35,6 +35,7 @@ Cattail Reed Tiny Cactus + Antiwart Clover Swampflower diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/antiwart.png b/src/minecraft/assets/biomesoplenty/textures/blocks/antiwart.png new file mode 100644 index 0000000000000000000000000000000000000000..cadd8c7cdb676d4e5c42385ff9d5133cb20fd4c8 GIT binary patch literal 400 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DkxL735kHCP2GC{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KZ#fq{|7 z)5S5w!hflsulL~qfio*7WXx)D@o6$-Tauyg6tY5IL2k?2wI&zhE;&2YcmCDyy>%5;@}iMwp#haf9&Bku=Uk9xi_`T-dab1fI%J#D?;;i;R~ZDZMp zLrrpdO*8EJo8lQiy!h}D>(aA534;I6Z}X3Tx|*?yXR9s8vxe=DnvS{_eNtZVk^5Ic(z}DJ?p^P2z*po0>t&mz(fKEs%jdb5)_GQ3 lJlxE^<#}C#_PtH}7_WG9bI;@PR{(|{gQu&X%Q~loCIHU^oYMdR literal 0 HcmV?d00001 diff --git a/src/minecraft/assets/biomesoplenty/textures/blocks/item_antiwart.png b/src/minecraft/assets/biomesoplenty/textures/blocks/item_antiwart.png new file mode 100644 index 0000000000000000000000000000000000000000..7125da894ac28b9579d9149c1ccd2b27807f8d16 GIT binary patch literal 311 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{^MbQ4*Y=R#Ki=l*$m0n3-3i=jR%tP-d)Ws%L2E{@KYKsA{vP zi(`m||J{j(d`%7luHO~dlAET=@=k5NsU0!lg{IDq)^xdw$v+c?6E$^w{+vv^`Sh>7 z@q~XN>k~JmpEHXqPI`aqTHf;FJ!><}70=Gs)j#-Qerct_LaPCE{?8&3My z#AUH(X;I#xQ!`7SKbZDK@bQb-w_$(Ro_W)qn#uH8bIaZOmve1_&S&s+^>bP0l+XkK DDo=In literal 0 HcmV?d00001 diff --git a/src/minecraft/biomesoplenty/api/BlockReferences.java b/src/minecraft/biomesoplenty/api/BlockReferences.java index cf9b7c830..61a550457 100644 --- a/src/minecraft/biomesoplenty/api/BlockReferences.java +++ b/src/minecraft/biomesoplenty/api/BlockReferences.java @@ -156,6 +156,7 @@ public class BlockReferences { cattail (Blocks.plants, 7), reed (Blocks.plants, 8), tinyCactus (Blocks.plants, 12), + antiwart (Blocks.plants, 13), treeMoss (Blocks.treeMoss, 0), moss (Blocks.moss, 0), diff --git a/src/minecraft/biomesoplenty/biomes/BiomeGenNetherGarden.java b/src/minecraft/biomesoplenty/biomes/BiomeGenNetherGarden.java index 35eff0454..fabb40cdb 100644 --- a/src/minecraft/biomesoplenty/biomes/BiomeGenNetherGarden.java +++ b/src/minecraft/biomesoplenty/biomes/BiomeGenNetherGarden.java @@ -26,7 +26,7 @@ public class BiomeGenNetherGarden extends BiomeGenBase customBiomeDecorator.netherVinesPerChunk = 60; customBiomeDecorator.mushroomsPerChunk = 30; customBiomeDecorator.bigMushroomsPerChunk = 30; - customBiomeDecorator.netherWartPerChunk = 3; + customBiomeDecorator.netherWartPerChunk = 8; customBiomeDecorator.netherGrassPerChunk = 10; customBiomeDecorator.glowshroomsPerChunk = 3; customBiomeDecorator.toadstoolsPerChunk = 5; diff --git a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java index 87f4b1030..981d1f729 100644 --- a/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java +++ b/src/minecraft/biomesoplenty/blocks/BlockBOPPlant.java @@ -10,7 +10,10 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPickaxe; import net.minecraft.item.ItemStack; import net.minecraft.util.DamageSource; import net.minecraft.util.Icon; @@ -24,7 +27,7 @@ import biomesoplenty.blocks.renderers.RenderUtils; 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"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "antiwart"}; private Icon[] textures; private static final int CATTAILTOP = 9; @@ -122,6 +125,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable return blockID == this.blockID; else if (metadata == 12) return blockID == Block.sand.blockID || blockID == Blocks.redRock.get().blockID || blockID == Block.slowSand.blockID; + else if (metadata == 13) + return blockID == Block.slowSand.blockID; else return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID || blockID == Blocks.longGrass.get().blockID; } @@ -173,6 +178,9 @@ 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 + return id == Block.slowSand.blockID; + default: return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; } @@ -321,6 +329,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable return 1; else if (meta == 11) return random.nextInt(7) == 0 ? 2 : 1; + else if (meta == 13) + return 1; else return 0; } @@ -329,6 +339,14 @@ public class BlockBOPPlant extends BlockFlower implements IShearable public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) { super.harvestBlock(world, player, x, y, z, meta); + + if (meta == 13) + { + for (int i = 0; i < 10; i++) + { + world.spawnParticle("smoke", x + 0.5, y + 0.5F, z + 0.5, 0.0D, 0.0D, 0.0D); + } + } } @Override diff --git a/src/minecraft/biomesoplenty/blocks/renderers/PlantsRenderer.java b/src/minecraft/biomesoplenty/blocks/renderers/PlantsRenderer.java index b778f0851..035ff763e 100644 --- a/src/minecraft/biomesoplenty/blocks/renderers/PlantsRenderer.java +++ b/src/minecraft/biomesoplenty/blocks/renderers/PlantsRenderer.java @@ -39,6 +39,8 @@ public class PlantsRenderer implements ISimpleBlockRenderingHandler return renderer.renderBlockCrops(block, x, y, z); if (meta == 12) return renderer.renderCrossedSquares(block, x, y, z); + if (meta == 13) + return renderer.renderBlockCrops(block, x, y, z); } return true; } diff --git a/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java b/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java index ec1bd0126..76b99bb75 100644 --- a/src/minecraft/biomesoplenty/itemblocks/ItemBlockPlant.java +++ b/src/minecraft/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"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "antiwart"}; @SideOnly(Side.CLIENT) private Icon[] textures; @@ -34,11 +34,12 @@ public class ItemBlockPlant extends ItemBlock @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - textures = new Icon[3]; + textures = new Icon[4]; textures[0] = iconRegister.registerIcon("biomesoplenty:item_barley"); textures[1] = iconRegister.registerIcon("biomesoplenty:item_cattail"); textures[2] = iconRegister.registerIcon("biomesoplenty:item_reed"); + textures[3] = iconRegister.registerIcon("biomesoplenty:item_antiwart"); } @Override @@ -61,6 +62,8 @@ public class ItemBlockPlant extends ItemBlock return textures[1]; else if (meta == 8) return textures[2]; + else if (meta == 13) + return textures[3]; else return Block.blocksList[itemID].getIcon(0, meta); } diff --git a/src/minecraft/biomesoplenty/worldgen/WorldGenNetherWart.java b/src/minecraft/biomesoplenty/worldgen/WorldGenNetherWart.java index 2c07d2188..d9d469717 100644 --- a/src/minecraft/biomesoplenty/worldgen/WorldGenNetherWart.java +++ b/src/minecraft/biomesoplenty/worldgen/WorldGenNetherWart.java @@ -5,6 +5,7 @@ import java.util.Random; import net.minecraft.block.Block; import net.minecraft.world.World; import net.minecraft.world.gen.feature.WorldGenerator; +import biomesoplenty.api.Blocks; public class WorldGenNetherWart extends WorldGenerator { @@ -33,11 +34,32 @@ public class WorldGenNetherWart extends WorldGenerator int var8 = par3 + par2Random.nextInt(8) - par2Random.nextInt(8); int var9 = par4 + par2Random.nextInt(4) - par2Random.nextInt(4); int var10 = par5 + par2Random.nextInt(8) - par2Random.nextInt(8); + int var999 = par2Random.nextInt(12); if (par1World.isAirBlock(var8, var9, var10) && par1World.getBlockId(var8, var9 - 1, var10) == Block.netherrack.blockID) { par1World.setBlock(var8, var9 - 1, var10, Block.slowSand.blockID, 0, 2); - par1World.setBlock(var8, var9, var10, Block.netherStalk.blockID, 0, 2); + + if (var999 == 0 || var999 == 1) + { + par1World.setBlock(var8, var9, var10, Block.netherStalk.blockID, 0, 2); + } + else if (var999 == 2) + { + par1World.setBlock(var8, var9, var10, Block.netherStalk.blockID, 1, 2); + } + else if (var999 == 3) + { + par1World.setBlock(var8, var9, var10, Block.netherStalk.blockID, 2, 2); + } + else if (var999 == 4 || var999 == 5) + { + par1World.setBlock(var8, var9, var10, Block.netherStalk.blockID, 3, 2); + } + else + { + par1World.setBlock(var8, var9, var10, Blocks.plants.get().blockID, 13, 2); + } } }