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 4c7f0566f..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/barley.png and /dev/null differ 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 66d2d8542..000000000 Binary files a/src/main/resources/assets/biomesoplenty/textures/blocks/item_barley.png and /dev/null differ 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 000000000..78d3ebd19 Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/item_wildrice.png differ 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 000000000..6aa38a15d Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/blocks/wildrice.png differ diff --git a/src/main/resources/assets/biomesoplenty/textures/items/ricebowl.png b/src/main/resources/assets/biomesoplenty/textures/items/ricebowl.png new file mode 100644 index 000000000..d093226bc Binary files /dev/null and b/src/main/resources/assets/biomesoplenty/textures/items/ricebowl.png differ