Cleanup and update

README.md

@@ -22,6 +22,37 @@
 
 
 ## Changelog 
+	  Version 0.6.1 '16-08-13'
+	- Fixed food for the fifty-billionth time
+	- Added fr_CA localisation
+	- Added fr_FR localisation
+	- Added pl_PL localisation
+	- Added a config option for the Spring Water Regeneration Effect
+	- Tweaked some achievements
+	- Made puddles dry up faster
+	- Changed the height of the Grassland
+	- Promised Land Tweaks
+	- Fixed Spring Water Regeneration Effect
+	- Fixed stair hardness
+	- Added the Silkglades biome
+	- Added a config option to generate pumpkins without faces
+	- Added a config option to disable lethal decoration
+	- Tweaked Biome Dictionary definitions
+	- Tweaked Origin Valley sky colour
+	- Added sub biomes for the enhanced vanilla biomes
+	- Tweaked the barley texture
+	- Fixed quicksand deepness
+	- Added the Overgrown Greens biome
+	- Prevented the Nether from being overriden in default worlds unless Add to Default is set to true
+	- Fixed a crash with saplings
+	- Added a config option to disable vanilla's exposed stone feature
+	- Tweaked the Shrubland height
+	- Tweaked the Tundra height
+	- Fixed terrain generator "stripes"
+	- Fixed a crash with disabling structures
+	- Fixed some bugs with sacrificing
+	- Fixed some bugs with pine tree growth requirements and slabs
+
 	  Version 0.6.0 '03-08-13'
 	- Ripped out old integration for BC pumps
 	- Fixed a server crash bug with sacrifical altars

build.properties

@@ -1,4 +1,4 @@
 dir.development=../../
 dir.release=../../Biomes O Plenty Releases
 release.minecraft.version=1.6.2
-release.mod.version=0.6.0
+release.mod.version=0.6.1

src/minecraft/biomesoplenty/BiomesOPlenty.java

@@ -26,7 +26,6 @@ import biomesoplenty.helpers.CreativeTabsBOP;
 import biomesoplenty.helpers.Localizations;
 import biomesoplenty.helpers.Version;
 import biomesoplenty.integration.BOPCrossIntegration;
-import biomesoplenty.world.WorldProviderBOPhell;
 import biomesoplenty.world.WorldProviderPromised;
 import biomesoplenty.world.WorldTypeSize;
 import cpw.mods.fml.common.Mod;

src/minecraft/biomesoplenty/armor/ArmorAmethyst.java

@@ -29,7 +29,7 @@ public class ArmorAmethyst extends ItemArmor
 	}
 
 	@Override
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, int layer) 
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) 
 	{
 		if (stack.itemID == Items.helmetAmethyst.get().itemID || stack.itemID == Items.chestplateAmethyst.get().itemID || stack.itemID == Items.bootsAmethyst.get().itemID)
 			return "biomesoplenty:textures/armor/amethyst_1.png";

src/minecraft/biomesoplenty/armor/ArmorFlowerBand.java

@@ -58,7 +58,7 @@ public class ArmorFlowerBand extends ItemArmor
 	}
 
 	@Override
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, int layer) 
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) 
 	{
 		if (stack.getItemDamage() == 0)
 			return "biomesoplenty:textures/armor/dullflowerband.png";

src/minecraft/biomesoplenty/armor/ArmorMuddy.java

@@ -20,7 +20,7 @@ public class ArmorMuddy extends ItemArmor
 	}
 
 	@Override
-	public String getArmorTexture(ItemStack stack, Entity entity, int slot, int layer) 
+	public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) 
 	{
 		if (stack.itemID == Items.helmetMud.get().itemID || stack.itemID == Items.chestplateMud.get().itemID || stack.itemID == Items.bootsMud.get().itemID)
 			return "biomesoplenty:textures/armor/mud_1.png";

src/minecraft/biomesoplenty/biomes/BiomeGenOminousWoods.java

@@ -6,7 +6,6 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.entity.monster.EntityCaveSpider;
 import net.minecraft.entity.monster.EntityEnderman;
-import net.minecraft.entity.monster.EntitySpider;
 import net.minecraft.entity.passive.EntityBat;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.biome.SpawnListEntry;

src/minecraft/biomesoplenty/biomes/BiomeGenOvergrownGreens.java

@@ -3,16 +3,14 @@ package biomesoplenty.biomes;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.entity.passive.EntityHorse;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
-import net.minecraft.world.biome.SpawnListEntry;
 import net.minecraft.world.gen.feature.WorldGenTallGrass;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.worldgen.WorldGenIvy;
-import biomesoplenty.worldgen.WorldGenOvergrownTree;
 import biomesoplenty.worldgen.WorldGenLargeTree;
+import biomesoplenty.worldgen.WorldGenOvergrownTree;
 
 public class BiomeGenOvergrownGreens extends BiomeGenBase
 {

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandForest.java

@@ -8,7 +8,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
-import biomesoplenty.api.Fluids;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenPromisedShrub;
 import biomesoplenty.worldgen.WorldGenPromisedTree;

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandPlains.java

@@ -8,7 +8,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
-import biomesoplenty.api.Fluids;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenPromisedBush;
 import biomesoplenty.worldgen.WorldGenWaterSpring;

src/minecraft/biomesoplenty/biomes/BiomeGenPromisedLandSwamp.java

@@ -8,7 +8,6 @@ import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.feature.WorldGenerator;
 import biomesoplenty.api.Blocks;
-import biomesoplenty.api.Fluids;
 import biomesoplenty.configuration.BOPConfiguration;
 import biomesoplenty.worldgen.WorldGenPromisedTree;
 import biomesoplenty.worldgen.WorldGenPromisedWillowTree;

src/minecraft/biomesoplenty/handlers/BOPCraftHandler.java

@@ -3,9 +3,6 @@ package biomesoplenty.handlers;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import biomesoplenty.api.Items;
-import biomesoplenty.configuration.BOPConfiguration;
-import biomesoplenty.helpers.AchievementHelper;
 import cpw.mods.fml.common.ICraftingHandler;
 
 public class BOPCraftHandler implements ICraftingHandler

src/minecraft/biomesoplenty/helpers/AchievementHelper.java

@@ -6,14 +6,12 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;
-import net.minecraft.stats.AchievementList;
 import net.minecraft.util.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraftforge.common.AchievementPage;
 import net.minecraftforge.event.ForgeSubscribe;
 import net.minecraftforge.event.entity.EntityEvent;
-import net.minecraftforge.event.entity.player.EntityItemPickupEvent;
 import biomesoplenty.api.Biomes;
 import biomesoplenty.api.Blocks;
 import biomesoplenty.api.Fluids;

src/minecraft/biomesoplenty/helpers/Localizations.java

@@ -12,8 +12,8 @@ public class Localizations
 
 	public static ResourceLocation[] localeFiles = { new ResourceLocation(localizationLocation + "en_US.xml"), new ResourceLocation(localizationLocation + "de_DE.xml"), 
 		new ResourceLocation(localizationLocation + "nl_NL.xml"), new ResourceLocation(localizationLocation + "ru_RU.xml"), new ResourceLocation(localizationLocation + "zh_CN.xml"), 
-		new ResourceLocation(localizationLocation + "pl_PL.xml"), new ResourceLocation(localizationLocation + "fr_FR.xml"), new ResourceLocation(localizationLocation + "fr_CA.xml"), 
-		new ResourceLocation(localizationLocation + "ja_JP.xml") };
+		new ResourceLocation(localizationLocation + "pl_PL.xml"), new ResourceLocation(localizationLocation + "fr_FR.xml"), new ResourceLocation(localizationLocation + "fr_CA.xml")//, 
+		/*new ResourceLocation(localizationLocation + "ja_JP.xml")*/ };
 
 	public static boolean isXMLLanguageFile(ResourceLocation fileName) 
 	{

src/minecraft/biomesoplenty/items/ItemBOPFood.java

@@ -1,6 +1,5 @@
 package biomesoplenty.items;
 
-import java.lang.reflect.Field;
 import java.util.List;
 
 import net.minecraft.client.renderer.texture.IconRegister;
@@ -11,7 +10,6 @@ import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.FoodStats;
 import net.minecraft.util.Icon;
 import net.minecraft.world.World;
 import biomesoplenty.BiomesOPlenty;

src/minecraft/biomesoplenty/world/layer/BiomeLayerSub.java

@@ -1,6 +1,5 @@
 package biomesoplenty.world.layer;
 
-import net.minecraft.world.biome.BiomeGenBase;
 import net.minecraft.world.gen.layer.GenLayer;
 import net.minecraft.world.gen.layer.IntCache;
 import biomesoplenty.api.Biomes;

src/minecraft/biomesoplenty/worldgen/WorldGenBOPPumpkin.java

@@ -7,7 +7,8 @@ import net.minecraft.world.gen.feature.WorldGenerator;
 
 public class WorldGenBOPPumpkin extends WorldGenerator
 {
-    public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
+    @Override
+	public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
     {
         for (int l = 0; l < 64; ++l)
         {

src/minecraft/biomesoplenty/worldgen/WorldGenCobwebNest.java

@@ -3,11 +3,9 @@ package biomesoplenty.worldgen;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.entity.EntityLivingData;
 import net.minecraft.entity.monster.EntitySpider;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
-import biomesoplenty.api.Blocks;
 
 public class WorldGenCobwebNest extends WorldGenerator
 {

src/minecraft/biomesoplenty/worldgen/WorldGenCobwebs.java

@@ -2,11 +2,10 @@ package biomesoplenty.worldgen;
 
 import java.util.Random;
 
-import biomesoplenty.api.Blocks;
 import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
+import biomesoplenty.api.Blocks;
 
 public class WorldGenCobwebs extends WorldGenerator
 {

src/minecraft/biomesoplenty/worldgen/WorldGenIvy.java

@@ -1,6 +1,7 @@
 package biomesoplenty.worldgen;
 
 import java.util.Random;
+
 import net.minecraft.block.Block;
 import net.minecraft.util.Direction;
 import net.minecraft.util.Facing;
@@ -10,7 +11,8 @@ import biomesoplenty.api.Blocks;
 
 public class WorldGenIvy extends WorldGenerator
 {
-    public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
+    @Override
+	public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5)
     {
         int l = par3;
 

src/minecraft/biomesoplenty/worldgen/WorldGenOvergrownTree.java

@@ -6,7 +6,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.feature.WorldGenerator;
-import biomesoplenty.api.Blocks;
 
 public class WorldGenOvergrownTree extends WorldGenerator
 {

version.txt

@@ -1,3 +1,3 @@
 1.5.2:BiomesOPlenty:0.5.9.3
 1.6.1:BiomesOPlenty:0.5.6
-1.6.2:BiomesOPlenty:0.6.0
+1.6.2:BiomesOPlenty:0.6.1