From 846b456b074b2a2a44a72781308645380d37f27e Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Tue, 7 Apr 2015 16:26:39 -0400 Subject: [PATCH] Tweaked the Land of Lakes biome, added wild rice --- .../biome/decoration/OverworldBiomeFeatures.java | 1 + .../biome/overworld/BiomeGenLandOfLakes.java | 3 ++- .../overworld/sub/BiomeGenLandOfLakesMarsh.java | 8 +++----- .../common/blocks/BlockBOPPlant.java | 4 ++-- .../biomesoplenty/common/core/BOPCrafting.java | 4 +--- .../common/itemblocks/ItemBlockPlant.java | 4 ++-- .../biomesoplenty/common/items/ItemBOPFood.java | 15 ++++++++++++--- .../generation/WorldGenFieldAssociation.java | 1 + .../assets/biomesoplenty/lang/en_US.lang | 3 ++- .../biomesoplenty/textures/blocks/barley.png | Bin 780 -> 0 bytes .../textures/blocks/item_barley.png | Bin 359 -> 0 bytes .../textures/blocks/item_wildrice.png | Bin 0 -> 643 bytes .../biomesoplenty/textures/blocks/wildrice.png | Bin 0 -> 699 bytes .../biomesoplenty/textures/items/ricebowl.png | Bin 0 -> 255 bytes 14 files changed, 26 insertions(+), 17 deletions(-) delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/barley.png delete mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/item_barley.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/item_wildrice.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/wildrice.png create mode 100644 src/main/resources/assets/biomesoplenty/textures/items/ricebowl.png diff --git a/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java b/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java index 2bd69843a..909fa2f26 100644 --- a/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java +++ b/src/main/java/biomesoplenty/common/biome/decoration/OverworldBiomeFeatures.java @@ -48,6 +48,7 @@ public class OverworldBiomeFeatures extends BiomeFeaturesBase @BiomeFeature public int berryBushesPerChunk = 0; @BiomeFeature public int portobellosPerChunk = 0; @BiomeFeature public int koruPerChunk = 0; + @BiomeFeature public int wildRicePerChunk = 0; @BiomeFeature public int blueMilksPerChunk = 0; @BiomeFeature public int cattailsPerChunk = 0; @BiomeFeature public int highCattailsPerChunk = 0; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java index 1cd1c365b..2c44558df 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/BiomeGenLandOfLakes.java @@ -19,7 +19,7 @@ import biomesoplenty.common.world.features.trees.WorldGenOriginalTree; public class BiomeGenLandOfLakes extends BOPOverworldBiome { - private static final Height biomeHeight = new Height(0.1F, 0.3F); + private static final Height biomeHeight = new Height(0.1F, 0.2F); public BiomeGenLandOfLakes(int id) { @@ -41,6 +41,7 @@ public class BiomeGenLandOfLakes extends BOPOverworldBiome this.theBiomeDecorator.sandPerChunk = -999; this.theBiomeDecorator.sandPerChunk2 = -999; + this.theBiomeDecorator.bopFeatures.wildRicePerChunk = 2; this.theBiomeDecorator.bopFeatures.gravelPerChunk = 9; this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 30; this.theBiomeDecorator.bopFeatures.seaweedPerChunk = 15; diff --git a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenLandOfLakesMarsh.java b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenLandOfLakesMarsh.java index ef9c61b74..b02a41cca 100644 --- a/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenLandOfLakesMarsh.java +++ b/src/main/java/biomesoplenty/common/biome/overworld/sub/BiomeGenLandOfLakesMarsh.java @@ -6,8 +6,6 @@ import net.minecraft.block.Block; import net.minecraft.entity.monster.EntitySlime; import net.minecraft.init.Blocks; import net.minecraft.world.World; -import net.minecraft.world.biome.BiomeGenBase.Height; -import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry; import net.minecraft.world.gen.feature.WorldGenAbstractTree; import net.minecraft.world.gen.feature.WorldGenTaiga2; import biomesoplenty.api.content.BOPCBlocks; @@ -24,7 +22,7 @@ public class BiomeGenLandOfLakesMarsh extends BOPSubBiome super(id); this.zoom = 0.5D; - this.threshold = 0.5D; + this.threshold = 0.25D; this.setHeight(biomeHeight); this.setColor(6725742); @@ -35,14 +33,14 @@ public class BiomeGenLandOfLakesMarsh extends BOPSubBiome this.spawnableMonsterList.add(new SpawnListEntry(EntitySlime.class, 10, 1, 3)); - this.theBiomeDecorator.treesPerChunk = -999; + this.theBiomeDecorator.treesPerChunk = 1; this.theBiomeDecorator.flowersPerChunk = 3; this.theBiomeDecorator.grassPerChunk = 25; this.theBiomeDecorator.sandPerChunk = 1; this.theBiomeDecorator.sandPerChunk2 = 1; - this.theBiomeDecorator.bopFeatures.gravelPerChunk = 4; + this.theBiomeDecorator.bopFeatures.wildRicePerChunk = 8; this.theBiomeDecorator.bopFeatures.mudPerChunk = 9; this.theBiomeDecorator.bopFeatures.waterLakesPerChunk = 10; this.theBiomeDecorator.bopFeatures.waterReedsPerChunk = 15; diff --git a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java index 7cccca57c..4e2abdb8a 100644 --- a/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java +++ b/src/main/java/biomesoplenty/common/blocks/BlockBOPPlant.java @@ -35,7 +35,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable { - private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "spectralfern", "thorn", "barley", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed", "root"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "spectralfern", "thorn", "wildrice", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed", "root"}; private IIcon[] textures; public IIcon reedbottom; @@ -148,7 +148,7 @@ public class BlockBOPPlant extends BOPBlockWorldDecor implements IShearable case 5: // Thorns return block == Blocks.grass|| block == Blocks.dirt || block == Blocks.soul_sand || block.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this); - case 6: // Barley + case 6: // Wild Rice return block == Blocks.grass || block == Blocks.dirt || block.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this); case 7: // Cattail diff --git a/src/main/java/biomesoplenty/common/core/BOPCrafting.java b/src/main/java/biomesoplenty/common/core/BOPCrafting.java index cb8d865eb..554b99a28 100644 --- a/src/main/java/biomesoplenty/common/core/BOPCrafting.java +++ b/src/main/java/biomesoplenty/common/core/BOPCrafting.java @@ -219,9 +219,6 @@ public class BOPCrafting GameRegistry.addRecipe(new ItemStack(BOPCItems.flowerBand, 1, 2), new Object [] {"CDC", "V V", "CDC", Character.valueOf('C'), new ItemStack(BOPCBlocks.flowers, 1, 0),Character.valueOf('D'), new ItemStack(BOPCBlocks.flowers, 1, 5), Character.valueOf('V'), new ItemStack(BOPCBlocks.flowers, 1, 8)}); GameRegistry.addRecipe(new ItemStack(BOPCItems.flowerBand, 1, 3), new Object [] {"CDT", "V V", "TDC", Character.valueOf('C'), new ItemStack(BOPCBlocks.flowers, 1, 0),Character.valueOf('D'), new ItemStack(BOPCBlocks.flowers, 1, 5), Character.valueOf('V'), new ItemStack(BOPCBlocks.flowers, 1, 8), Character.valueOf('T'), new ItemStack(BOPCBlocks.flowers, 1, 6)}); - //Other - GameRegistry.addRecipe(new ItemStack(Items.wheat, 1), new Object[] {"###", '#', new ItemStack(BOPCBlocks.plants,1,6)}); - /*if (BOPConfigurationMisc.staffCrafting) { GameRegistry.addRecipe(new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 0), new Object[] {"T", "P", "H", 'T', new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 3), 'P', new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 2), 'H', new ItemStack(BOPItemHelper.get("ancientStaff"), 1, 1)}); @@ -271,6 +268,7 @@ public class BOPCrafting //Plants GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 2, 1), new Object[] {new ItemStack(BOPCBlocks.mushrooms,1,0)}); GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.jarFilled, 1, 1), new Object[] {new ItemStack(BOPCBlocks.foliage,1,7), new ItemStack(BOPCItems.jarEmpty,1, 0)}); + GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 13), new Object[] {Items.bowl, new ItemStack(BOPCBlocks.plants, 1, 6)}); GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 4), new Object[] {Items.bowl, new ItemStack(BOPCItems.food, 1, 0), Items.apple, Items.melon}); GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 5), new Object[] {Items.bowl, new ItemStack(BOPCItems.food, 1, 2), Items.carrot, Items.potato}); GameRegistry.addShapelessRecipe(new ItemStack(BOPCItems.food, 1, 6), new Object[] {Items.bowl, new ItemStack(BOPCBlocks.mushrooms, 1, 0), new ItemStack(BOPCBlocks.mushrooms, 1, 1), new ItemStack(BOPCBlocks.mushrooms, 1, 2)}); diff --git a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java index 22fa2adba..23f43ea44 100644 --- a/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java +++ b/src/main/java/biomesoplenty/common/itemblocks/ItemBlockPlant.java @@ -15,7 +15,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockPlant extends ItemBlock { - private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "spectralfern", "thorn", "barley", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed", "root"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "spectralfern", "thorn", "wildrice", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed", "root"}; @SideOnly(Side.CLIENT) private IIcon[] textures; @@ -39,7 +39,7 @@ public class ItemBlockPlant extends ItemBlock { textures = new IIcon[6]; - textures[0] = iconRegister.registerIcon("biomesoplenty:item_barley"); + textures[0] = iconRegister.registerIcon("biomesoplenty:item_wildrice"); textures[1] = iconRegister.registerIcon("biomesoplenty:item_cattail"); textures[2] = iconRegister.registerIcon("biomesoplenty:item_rivercane"); textures[3] = iconRegister.registerIcon("biomesoplenty:item_witherwart"); diff --git a/src/main/java/biomesoplenty/common/items/ItemBOPFood.java b/src/main/java/biomesoplenty/common/items/ItemBOPFood.java index cf73b5b7e..a673b708d 100644 --- a/src/main/java/biomesoplenty/common/items/ItemBOPFood.java +++ b/src/main/java/biomesoplenty/common/items/ItemBOPFood.java @@ -21,9 +21,9 @@ 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", "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.2F, 0.6F, 0.6F, 0.6F, 0.0F, 0.2F, 0.4F, 0.8F, 0.4F, 0.3F}; + private static final String[] foodTypes = new String[] {"berries", "shroompowder", "wildcarrots", "peach", "saladfruit", "saladveggie", "saladshroom", "earth", "persimmon", "filledhoneycomb", "ambrosia", "turnip", "pear", "ricebowl"}; + private static final int[] foodHunger = new int[] {1, 1, 3, 5, 6, 6, 6, 0, 5, 3, 6, 3, 5, 2}; + private static final float[] foodSaturation = new float[] {0.1F, 0.1F, 0.5F, 0.2F, 0.6F, 0.6F, 0.6F, 0.0F, 0.2F, 0.4F, 0.8F, 0.4F, 0.3F, 0.1F}; private IIcon[] textures; public ItemBOPFood(int healAmount) @@ -134,6 +134,11 @@ public class ItemBOPFood extends ItemFood if (!player.inventory.addItemStackToInventory(new ItemStack(Items.glass_bottle))) player.dropPlayerItemWithRandomChoice(new ItemStack(Items.glass_bottle, 1, 0), false); break; + + case 13: + if (!player.inventory.addItemStackToInventory(new ItemStack(Items.bowl))) + player.dropPlayerItemWithRandomChoice(new ItemStack(Items.bowl, 1, 0), false); + break; } return itemstack; @@ -169,6 +174,10 @@ public class ItemBOPFood extends ItemFood { return 1; } + if (itemStack.getItem() == this && itemStack.getItemDamage() == 13) + { + return 1; + } return 64; } diff --git a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java index a36719b04..31ac85391 100644 --- a/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java +++ b/src/main/java/biomesoplenty/common/world/generation/WorldGenFieldAssociation.java @@ -84,6 +84,7 @@ public class WorldGenFieldAssociation associateFeature("wildCarrotsPerChunk", new WorldGenBOPFlora(BOPCBlocks.plants, 11)); associateFeature("poisonIvyPerChunk", new WorldGenBOPFlora(BOPCBlocks.foliage, 7)); associateFeature("berryBushesPerChunk", new WorldGenBOPFlora(BOPCBlocks.foliage, 8)); + associateFeature("wildRicePerChunk", new WorldGenBOPFlora(BOPCBlocks.plants, 6)); associateFeature("portobellosPerChunk", new WorldGenBOPFlora(BOPCBlocks.mushrooms, 1)); associateFeature("koruPerChunk", new WorldGenBOPFlora(BOPCBlocks.foliage, 12)); associateFeature("toadstoolsPerChunk", new WorldGenBOPFlora(BOPCBlocks.mushrooms, 0)); diff --git a/src/main/resources/assets/biomesoplenty/lang/en_US.lang b/src/main/resources/assets/biomesoplenty/lang/en_US.lang index 44fddd46f..93e6806d0 100644 --- a/src/main/resources/assets/biomesoplenty/lang/en_US.lang +++ b/src/main/resources/assets/biomesoplenty/lang/en_US.lang @@ -31,7 +31,7 @@ tile.plants.desertsprouts.name=Desert Sprouts tile.plants.dunegrass.name=Dune Grass tile.plants.spectralfern.name=Spectral Fern tile.plants.thorn.name=Thorns -tile.plants.barley.name=Barley +tile.plants.wildrice.name=Wild Rice tile.plants.cattail.name=Cattail tile.plants.cattailtop.name=Cattail tile.plants.cattailbottom.name=Cattail @@ -330,6 +330,7 @@ item.food.filledhoneycomb.name=Filled Honeycomb item.food.ambrosia.name=Ambrosia item.food.turnip.name=Turnip item.food.pear.name=Pear +item.food.ricebowl.name=Bowl of Rice item.turnipSeeds.name=Turnip Seeds diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/barley.png b/src/main/resources/assets/biomesoplenty/textures/blocks/barley.png deleted file mode 100644 index 4c7f0566fa1543ef31f65398b5a12fb5e40bb796..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 780 zcmV+n1M~ceP)<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^4L^m3s900M|fL_t(IPjylIOOs&~{{D)7$xVRrC5thIYNfB$M9e$JL+taInT zCXQzZ@p(8OeJwt4*z#a*+{7YNnV7&>A!8mjhA@xo_cL3ny_p%qwOctEYTw386U=nw zfhL>kIf1v&gYnf~h>5OHd^8te#1MoJ16o)ccR-qK3B#hJ3`U&{_OTqiej30gOXK&~ z2y-$ao;E}<57qoN!B~^nZJ;^SS+uriId7UYh2hh<27^!h@umM9dhRIT7|esMd6&@7 z*-JQB{8r>N=+tRA9&Hf2-+Uz4tXDEmx9t(y@;ZMkyi4X};d?SJ)`*uV)B7^dkHq0Z zwE}cT`Hw!e;F%O=#^qWcPL`N3*QWxR&rif5y>KHe#wb3kYS_+9mtK1ye!67qI0AL9 zJ2!CQHzwN>ky_x1(z~0vW-&%{!;9(|&QtO|g!V>LFkaS0;?g~DWS59Pd-c8_-ZUw3 zENeALSbW1RGxpLn5iq6;B z5S8S{ab>+fl5*rwrh9Tdvq*tM%9R{TiJ4w3IuPT+2E=5n%y36+${O4%_C`efDmI`d zwN}n6Q4dc*h)i(h+o(D1jE6H;Wy=tL*agvQk&_91R3nWfNzyMEZnfTOEscNx0000< KMNUMnLSTYwN@N58 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/item_barley.png b/src/main/resources/assets/biomesoplenty/textures/blocks/item_barley.png deleted file mode 100644 index 66d2d8542b04d75c1e43792bf8f733529033a8e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0figD*u3fvT=~x;Tbd_$UAP|KHwK;-CVvKPn1kVfre*$2M2ulzqTm*rz(+rf-EY&E-uzsuir z6Og}YAkllZ!Fu=N12PkO&97ViVgERh*ZCV;8>9HO+l`V6(i49g98NIt;9&{ivDly^ zp~G0r*u!tkQ2Mick650-A)G!=nC^8IleDtxNjp5k)ebf0e4^9F4kipZ{&t;ucLK6VdlY;U9 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/item_wildrice.png b/src/main/resources/assets/biomesoplenty/textures/blocks/item_wildrice.png new file mode 100644 index 0000000000000000000000000000000000000000..78d3ebd19018960d1a921f72c63b7228702e9e5f GIT binary patch literal 643 zcmV-}0(||6P)<{97<5HgbW?9;ba!ELWdLwtX>N2bZe?^J zG%heMHD!e|WdHyI0ZBwbR5(v@dw^`bc|DO-;W;O^#L6v%7p~#1>kK##+I}6U zz!#DLO?fS6A(FffD|i`0W2YN5|LZPa5AJ!-gRj8;*$RjG{8O-b22bKw#Zl|4X%9y4 zcN(1q_yTNgd)aC*VDHTQYID5FIr?G%fw^9cxX*$wM8uZ{rIj0wQ{u;EGnI8P6SC5{ z)g`v~9|E!il-j2KX49TV0zE7;+1j5*DB6$Vi4L(*a-i-97epsYrBZ{XW}rcOtl*sL zHqNgzUX!d9vWfQXV{oxpRE0u8bSC5s^nEM%vD#i}@I~we?90Y>WfOHj_8(~n8MU)B d+0&e*{sBsJWY~XX7ia(g002ovPDHLkV1ipf9#8-P literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wildrice.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wildrice.png new file mode 100644 index 0000000000000000000000000000000000000000..6aa38a15d34410e1fe3d222665ec7015cee5c571 GIT binary patch literal 699 zcmV;s0!00ZP)N2bZe?^J zG%heMHD!e|WdHyIIY~r8R5(vfliN;HK^TSSH9W*)Jlz=a5KjS&BBivYNDE#NKpT1n zY9odxP>Dc+vfDxl7e=4J!~{G6#wXCkQ;bj0rn`NC-+X^FJ6_D5nKkQQvu4d~Q?J*} z&rgoDS}oITHodW()BpLru2^CtqWrJh1+i=9*KSF6H*@miBffB#UF`BGTtf4@}a zO(7;r8NW;vgIcsQ9rQLawOY;0$9q%}k?P!ttZd!)2s8v;*EO+HSULM!d9hB7lONO_ zx1E#%?<-k(n7J(2Mtm{dr)zMM)u;+CPX&})*c=uGR%b%GLn3!w7~k?Amba^M;jD`r z5uqTKy&`0Q+nrKco;w3=2Uy|U#atWc>^-18LO5tN8m1?7Oup?bt00>!qw0UYevT1W^PLFSBEBW&ta z088apV=|uX5dY9Axg9v7IgBMPs9ngoB)l%)K@F5SwcamF`oZC|3f>(!t|X2_|Fqb? hKI|h32RE+kntyZtbYe!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPVk-lnPW+>*?Yc zV&R`G!D_-3_A2N9#>5pSc?`i7$@i!H|DFE)|9g*8#>)nFam`O$XC9dJV%7y-u5C~L z@CR{UZDUYylxWLjxOifnV;D1td(f%A&cH3KqbD(rVdKJE0gN6@X&fBQbGmyzX0