Updated names to the latest Forge/MCP

apis/thaumcraft/api/TileThaumcraft.java

@@ -54,7 +54,7 @@ public class TileThaumcraft extends TileEntity {
 	@Override
 	public void onDataPacket(INetworkManager net, Packet132TileEntityData pkt) {
 		super.onDataPacket(net, pkt);		
-		this.readCustomNBT(pkt.customParam1);
+		this.readCustomNBT(pkt.data);
 	}
 	
 	

common/biomesoplenty/biomes/BiomeDecoratorBOP.java

@@ -416,10 +416,10 @@ public class BiomeDecoratorBOP extends BiomeDecorator
 		stoneInGrassGen = new WorldGenMycelium(Block.stone.blockID, 32);
 		stoneInGrassGen2 = new WorldGenShield(Block.stone.blockID, 48);
 		sandInStoneGen = new WorldGenMinable(Block.sand.blockID, 32);
-		clayInClayGen = new WorldGenBadlands2(Block.field_111039_cA.blockID, 32);
+		clayInClayGen = new WorldGenBadlands2(Block.stainedClay.blockID, 32);
 		clayInClay2Gen = new WorldGenBadlands4(Block.blockClay.blockID, 32);
-		clayInStoneGen = new WorldGenBadlands3(Block.field_111039_cA.blockID, 32);
+		clayInStoneGen = new WorldGenBadlands3(Block.stainedClay.blockID, 32);
-		clayInStone2Gen = new WorldGenBadlands(Block.field_111039_cA.blockID, 32);
+		clayInStone2Gen = new WorldGenBadlands(Block.stainedClay.blockID, 32);
 		quagmireGen = new WorldGenQuagmire(Block.grass.blockID, 48);
 		quicksandGen = new WorldGenQuicksand(Blocks.mud.get().blockID, 24);
 		spongeGen = new WorldGenSponge(Block.sponge.blockID, 24);

common/biomesoplenty/biomes/BiomeGenBadlands.java

@@ -17,8 +17,8 @@ public class BiomeGenBadlands extends BiomeGenBase
 	{
 		super(par1);
 		spawnableCreatureList.clear();
-		topBlock = (byte)Block.field_111032_cD.blockID;
+		topBlock = (byte)Block.hardenedClay.blockID;
-		fillerBlock = (byte)Block.field_111032_cD.blockID;
+		fillerBlock = (byte)Block.hardenedClay.blockID;
 		theBiomeDecorator = new BiomeDecoratorBOP(this);
 		customBiomeDecorator = (BiomeDecoratorBOP)theBiomeDecorator;
 		customBiomeDecorator.treesPerChunk = -999;

common/biomesoplenty/entities/EntityGlob.java

@@ -18,9 +18,9 @@ public class EntityGlob extends EntityLiving implements IMob
 {
 	/** Chances for Globs to spawn in swamps for every moon phase. */
 	private static final float[] spawnChances = new float[] {1.0F, 0.75F, 0.5F, 0.25F, 0.0F, 0.25F, 0.5F, 0.75F};
-	public float field_70813_a;
+	public float squishAmount;
-	public float field_70811_b;
+	public float squishFactor;
-	public float field_70812_c;
+	public float prevSquishFactor;
 
 	/** the time between each jump of the Glob */
 	private int GlobJumpDelay = 0;
@@ -46,8 +46,8 @@ public class EntityGlob extends EntityLiving implements IMob
         this.dataWatcher.updateObject(16, new Byte((byte)par1));
         this.setSize(0.6F * (float)par1, 0.6F * (float)par1);
         this.setPosition(this.posX, this.posY, this.posZ);
-        this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a((double)(par1 * par1));
+        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute((double)(par1 * par1));
-        this.setEntityHealth(this.func_110138_aP());
+        this.setHealth(this.getMaxHealth());
         this.experienceValue = par1;
 	}
 
@@ -86,8 +86,8 @@ public class EntityGlob extends EntityLiving implements IMob
 			 isDead = true;
 		 }
 
-		 field_70811_b += (field_70813_a - field_70811_b) * 0.5F;
+		 squishFactor += (squishAmount - squishFactor) * 0.5F;
-		 field_70812_c = field_70811_b;
+		 prevSquishFactor = squishFactor;
 		 boolean flag = onGround;
 		 super.onUpdate();
 		 int i;
@@ -110,11 +110,11 @@ public class EntityGlob extends EntityLiving implements IMob
 				 this.playSound(this.getJumpSound(), this.getSoundVolume(), ((rand.nextFloat() - rand.nextFloat()) * 0.2F + 1.0F) / 0.8F);
 			 }
 
-			 field_70813_a = -0.5F;
+			 squishAmount = -0.5F;
 		 }
 		 else if (!onGround && flag)
 		 {
-			 field_70813_a = 1.0F;
+			 squishAmount = 1.0F;
 		 }
 
 		 this.func_70808_l();
@@ -169,7 +169,7 @@ public class EntityGlob extends EntityLiving implements IMob
 
 	 protected void func_70808_l()
 	 {
-		 field_70813_a *= 0.6F;
+		 squishAmount *= 0.6F;
 	 }
 
 	 /**
@@ -194,7 +194,7 @@ public class EntityGlob extends EntityLiving implements IMob
 		 int i = this.getGlobSize();
 
 		 //func_110143_aJ() == getHealth
-		 if (!worldObj.isRemote && i > 1 && this.func_110143_aJ() <= 0)
+		 if (!worldObj.isRemote && i > 1 && this.getHealth() <= 0)
 		 {
 			 int j = 2 + rand.nextInt(3);
 

common/biomesoplenty/entities/EntityJungleSpider.java

@@ -17,13 +17,13 @@ public class EntityJungleSpider extends EntitySpider
 	}
 
     @Override
-	protected void func_110147_ax()
+	protected void applyEntityAttributes()
     {
-        super.func_110147_ax();
+        super.applyEntityAttributes();
         //Max health
-        this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(6.0D);
+        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(6.0D);
         //Movement speed
-        this.func_110148_a(SharedMonsterAttributes.field_111263_d).func_111128_a(0.95D);
+        this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setAttribute(0.95D);
     }
 
 	@Override

common/biomesoplenty/entities/EntityPhantom.java

@@ -19,13 +19,12 @@ public class EntityPhantom extends EntityMob
 	}
 
     @Override
-	protected void func_110147_ax()
+	protected void applyEntityAttributes()
     {
-        super.func_110147_ax();
+        super.applyEntityAttributes();
-        //Max health
+
-        this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(20.0D);
+        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(20.0D);
-        //Movement speed
+        this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setAttribute(0.45D);
-        this.func_110148_a(SharedMonsterAttributes.field_111263_d).func_111128_a(0.45D);
     }
     
     @Override

common/biomesoplenty/entities/EntityRosester.java

@@ -26,7 +26,6 @@ public class EntityRosester extends EntityChicken
 	public float field_70888_h;
 	public float field_70889_i = 1.0F;
 
-	/** The time until the next egg is spawned. */
 	public int timeUntilNextEgg;
 
 	public EntityRosester(World par1World)
@@ -45,9 +44,6 @@ public class EntityRosester extends EntityChicken
 		tasks.addTask(7, new EntityAILookIdle(this));
 	}
 
-	/**
-	 * Returns true if the newer Entity AI code should be run
-	 */
 	@Override
 	public boolean isAIEnabled()
 	{
@@ -55,17 +51,13 @@ public class EntityRosester extends EntityChicken
 	}
 
     @Override
-	protected void func_110147_ax()
+	protected void applyEntityAttributes()
     {
-        super.func_110147_ax();
+        super.applyEntityAttributes();
-        //Max health
+
-        this.func_110148_a(SharedMonsterAttributes.field_111267_a).func_111128_a(4.0D);
+        this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(4.0D);
     }
 
-	/**
-	 * Called frequently so the entity can update its state every tick as required. For example, zombies and skeletons
-	 * use this to react to sunlight and start to burn.
-	 */
 	@Override
 	public void onLivingUpdate()
 	{
@@ -106,60 +98,39 @@ public class EntityRosester extends EntityChicken
 		}
 	}
 
-	/**
-	 * Called when the mob is falling. Calculates and applies fall damage.
-	 */
 	@Override
 	protected void fall(float par1) {}
 
-	/**
-	 * Returns the sound this mob makes while it's alive.
-	 */
 	@Override
 	protected String getLivingSound()
 	{
 		return "mob.chicken.say";
 	}
 
-	/**
-	 * Returns the sound this mob makes when it is hurt.
-	 */
 	@Override
 	protected String getHurtSound()
 	{
 		return "mob.chicken.hurt";
 	}
 
-	/**
-	 * Returns the sound this mob makes on death.
-	 */
 	@Override
 	protected String getDeathSound()
 	{
 		return "mob.chicken.hurt";
 	}
 
-	/**
-	 * Plays step sound at given x, y, z for the entity
-	 */
 	@Override
 	protected void playStepSound(int par1, int par2, int par3, int par4)
 	{
 		this.playSound("mob.chicken.step", 0.15F, 1.0F);
 	}
 
-	/**
-	 * Returns the item ID for the item the mob drops on death.
-	 */
 	@Override
 	protected int getDropItemId()
 	{
 		return Item.feather.itemID;
 	}
 
-	/**
-	 * Drop 0-2 items of this living's type
-	 */
 	@Override
 	protected void dropFewItems(boolean par1, int par2)
 	{
@@ -180,19 +151,12 @@ public class EntityRosester extends EntityChicken
 		}
 	}
 
-	/**
-	 * This function is used when two same-species animals in 'love mode' breed to generate the new baby animal.
-	 */
 	@Override
 	public EntityRosester spawnBabyAnimal(EntityAgeable par1EntityAgeable)
 	{
 		return new EntityRosester(worldObj);
 	}
 
-	/**
-	 * Checks if the parameter is an item which this animal can be fed to breed it (wheat, carrots or seeds depending on
-	 * the animal type)
-	 */
 	@Override
 	public boolean isBreedingItem(ItemStack par1ItemStack)
 	{

common/biomesoplenty/entities/projectiles/EntityDart.java

@@ -127,7 +127,7 @@ public class EntityDart extends EntityArrow
 		{
 			EntityPlayer entityplayer = (EntityPlayer)movingobjectposition.entityHit;
 
-			if (entityplayer.capabilities.disableDamage || shootingEntity instanceof EntityPlayer && !((EntityPlayer)shootingEntity).func_96122_a(entityplayer))
+			if (entityplayer.capabilities.disableDamage || shootingEntity instanceof EntityPlayer && !((EntityPlayer)shootingEntity).canAttackPlayer(entityplayer))
 			{
 				movingobjectposition = null;
 			}

common/biomesoplenty/entities/projectiles/EntityPoisonDart.java

@@ -152,7 +152,7 @@ public class EntityPoisonDart extends EntityArrow
 			{
 				EntityPlayer entityplayer = (EntityPlayer)movingobjectposition.entityHit;
 
-				if (entityplayer.capabilities.disableDamage || shootingEntity instanceof EntityPlayer && !((EntityPlayer)shootingEntity).func_96122_a(entityplayer))
+				if (entityplayer.capabilities.disableDamage || shootingEntity instanceof EntityPlayer && !((EntityPlayer)shootingEntity).canAttackPlayer(entityplayer))
 				{
 					movingobjectposition = null;
 				}

common/biomesoplenty/entities/render/RenderDart.java

@@ -18,7 +18,7 @@ public class RenderDart extends Render
 {
     public void renderDart(EntityDart par1EntityDart, double par2, double par4, double par6, float par8, float par9)
     {
-        this.func_110777_b(par1EntityDart);
+        this.bindEntityTexture(par1EntityDart);
         GL11.glPushMatrix();
         GL11.glTranslatef((float)par2, (float)par4, (float)par6);
         GL11.glRotatef(par1EntityDart.prevRotationYaw + (par1EntityDart.rotationYaw - par1EntityDart.prevRotationYaw) * par9 - 90.0F, 0.0F, 1.0F, 0.0F);
@@ -84,7 +84,7 @@ public class RenderDart extends Render
     }
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) 
+	protected ResourceLocation getEntityTexture(Entity entity) 
 	{
 		if (((EntityDart)entity).isPoisonous()) 
 		{

common/biomesoplenty/entities/render/RenderGlob.java

@@ -53,7 +53,7 @@ public class RenderGlob extends RenderLiving
 	protected void scaleGlob(EntityGlob par1EntityGlob, float par2)
 	{
 		float f1 = par1EntityGlob.getGlobSize();
-		float f2 = (par1EntityGlob.field_70812_c + (par1EntityGlob.field_70811_b - par1EntityGlob.field_70812_c) * par2) / (f1 * 0.5F + 1.0F);
+		float f2 = (par1EntityGlob.prevSquishFactor + (par1EntityGlob.squishFactor - par1EntityGlob.prevSquishFactor) * par2) / (f1 * 0.5F + 1.0F);
 		float f3 = 1.0F / (f2 + 1.0F);
 		GL11.glScalef(f3 * f1, 1.0F / f3 * f1, f3 * f1);
 	}
@@ -65,7 +65,7 @@ public class RenderGlob extends RenderLiving
     }
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) 
+	protected ResourceLocation getEntityTexture(Entity entity) 
 	{
 		return new ResourceLocation("biomesoplenty:textures/mobs/glob.png");
 	}

common/biomesoplenty/entities/render/RenderJungleSpider.java

@@ -31,7 +31,7 @@ public class RenderJungleSpider extends RenderSpider
     }
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) 
+	protected ResourceLocation getEntityTexture(Entity entity) 
 	{
 		return new ResourceLocation("biomesoplenty:textures/mobs/junglespider.png");
 	}

common/biomesoplenty/entities/render/RenderPhantom.java

@@ -19,7 +19,7 @@ public class RenderPhantom extends RenderLiving
     }
 
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) 
+	protected ResourceLocation getEntityTexture(Entity entity) 
 	{
 		return null;
 	}

common/biomesoplenty/entities/render/RenderRosester.java

@@ -53,7 +53,7 @@ public class RenderRosester extends RenderLiving
     }
     
 	@Override
-	protected ResourceLocation func_110775_a(Entity entity) 
+	protected ResourceLocation getEntityTexture(Entity entity) 
 	{
 		return new ResourceLocation("biomesoplenty:textures/mobs/rosester.png");
 	}

common/biomesoplenty/helpers/AchievementHelper.java

@@ -125,7 +125,7 @@ public class AchievementHelper
 		achBOP = (new Achievement(3080, "achBOP", -10, -6, new ItemStack(Items.food.get(), 1, 7), null)).registerAchievement().setSpecial();
 		achAlps = (new Achievement(3082, "achAlps", -8, -6, new ItemStack(Block.stone, 1, 0), achBOP)).registerAchievement();
 		achArctic = (new Achievement(3083, "achArctic", -6, -6, new ItemStack(Block.blockSnow, 1, 0), achBOP)).registerAchievement();
-		achBadlands = (new Achievement(3084, "achBadlands", -4, -6, new ItemStack(Block.field_111032_cD, 1, 0), achBOP)).registerAchievement();
+		achBadlands = (new Achievement(3084, "achBadlands", -4, -6, new ItemStack(Block.hardenedClay, 1, 0), achBOP)).registerAchievement();
 		achBambooForest = (new Achievement(3085, "achBambooForest", -2, -6, new ItemStack(Blocks.saplings.get(), 1, 2), achBOP)).registerAchievement();
 		achBayou = (new Achievement(3086, "achBayou", 0, -6, new ItemStack(Blocks.willow.get(), 1, 0), achBOP)).registerAchievement();
 		achBirchForest = (new Achievement(3087, "achBirchForest", 2, -6, new ItemStack(Block.sapling, 1, 2), achBOP)).registerAchievement();

common/biomesoplenty/helpers/Localizations.java

@@ -17,13 +17,13 @@ public class Localizations
 
 	public static boolean isXMLLanguageFile(ResourceLocation fileName) 
 	{
-		return fileName.func_110623_a().endsWith(".xml");
+		return fileName.getResourcePath().endsWith(".xml");
 	}
 
 	public static String getLocaleFromFileName(ResourceLocation fileName) 
 	{
-		FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Localizations loaded for " + fileName.func_110623_a().substring(fileName.func_110623_a().lastIndexOf('/') + 1, fileName.func_110623_a().lastIndexOf('.')));
+		FMLCommonHandler.instance().getFMLLogger().log(Level.INFO, "[BiomesOPlenty] Localizations loaded for " + fileName.getResourcePath().substring(fileName.getResourcePath().lastIndexOf('/') + 1, fileName.getResourcePath().lastIndexOf('.')));
-		return fileName.func_110623_a().substring(fileName.func_110623_a().lastIndexOf('/') + 1, fileName.func_110623_a().lastIndexOf('.'));
+		return fileName.getResourcePath().substring(fileName.getResourcePath().lastIndexOf('/') + 1, fileName.getResourcePath().lastIndexOf('.'));
 	}
 
 	public String getLocalizedString(String key) 
@@ -35,32 +35,7 @@ public class Localizations
 	{	
 		for (ResourceLocation localizationFile : localeFiles) 
 		{
-			LanguageRegistry.instance().loadLocalization(localizationFile.func_110623_a(), getLocaleFromFileName(localizationFile), isXMLLanguageFile(localizationFile));
+			LanguageRegistry.instance().loadLocalization(localizationFile.getResourcePath(), getLocaleFromFileName(localizationFile), isXMLLanguageFile(localizationFile));
 		}
-
-		for (int mat = 0; mat < materialTypes.length; mat++)
-		{
-			for (int type = 0; type < toolMaterialNames.length; type++)
-			{
-				String internalName = new StringBuilder().append("item.bop.tc.").append(materialTypes[mat]).append(".").append(toolMaterialNames[type]).append(".name").toString();
-				String visibleName = new StringBuilder().append(toolMaterialNames[type]).append(materialNames[mat]).toString();
-				LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName);
-			}
-		}
-		
-        for (int i = 0; i < shardNames.length; i++)
-        {
-            String internalName = "item.bop.tc.ToolShard." + toolMaterialNames[i] + ".name";
-            String visibleName = shardNames[i];
-            LanguageRegistry.instance().addStringLocalization(internalName, "en_US", visibleName);
-        }
 	}
-
-    public static final String[] shardNames = new String[] { "Amethyst" };
-	
-	public static final String[] toolMaterialNames = new String[] { "Amethyst" };
-
-	public static final String[] materialTypes = new String[] { "ToolRod", "PickaxeHead", "ShovelHead", "AxeHead", "SwordBlade", "LargeGuard", "MediumGuard", "Crossbar", "Binding", "FrypanHead", "SignHead", "LumberHead", "KnifeBlade", "ChiselHead", "ScytheBlade", "LumberHead", "ThickRod", "ThickBinding", "LargeSwordBlade", "LargePlate", "ExcavatorHead", "HammerHead", "FullGuard" };
-
-	public static final String[] materialNames = new String[] { " Rod", " Pickaxe Head", " Shovel Head", " Axe Head", " Sword Blade", " Wide Guard", " Hand Guard", " Crossbar", " Binding", " Pan", " Board", " Broad Axe Head", " Knife Blade", " Chisel Head", " Scythe Blade", " Broad Axe Head", " Tough Tool Rod", " Tough Binding", " Large Sword Blade", " Large Plate", " Excavator Head", " Hammer Head", " Full Guard"};
 }

common/biomesoplenty/particles/EntityDandelionFX.java

@@ -39,7 +39,7 @@ public class EntityDandelionFX extends EntityFX
 		GL11.glDepthMask(false);
 		GL11.glEnable(3042);
 
-		FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(texture));
+		FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(texture));
 
 		float sizeFactor = 0.1F * particleScale;
 		float var13 = (float)(prevPosX + (posX - prevPosX) * par2 - EntityFX.interpPosX);
@@ -62,7 +62,7 @@ public class EntityDandelionFX extends EntityFX
 
 		GL11.glPopMatrix();
 
-		FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("/particles.png"));
+		FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("/particles.png"));
 		tessellator.startDrawingQuads();
 	}
 

common/biomesoplenty/particles/EntitySteamFX.java

@@ -62,7 +62,7 @@ public class EntitySteamFX extends EntityFX
 		GL11.glEnable(3042);
 		GL11.glBlendFunc(770, 1);
 
-		FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation(texture));
+		FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation(texture));
 		
         float f6 = (float)this.particleTextureIndexX / 16.0F;
         float f7 = f6 + 0.0624375F;
@@ -99,7 +99,7 @@ public class EntitySteamFX extends EntityFX
 
 		GL11.glPopMatrix();
 
-		FMLClientHandler.instance().getClient().renderEngine.func_110577_a(new ResourceLocation("textures/particle/particles.png"));
+		FMLClientHandler.instance().getClient().renderEngine.bindTexture(new ResourceLocation("textures/particle/particles.png"));
 		tessellator.startDrawingQuads();
 	}
 

common/biomesoplenty/potions/PotionParalysis.java

@@ -18,7 +18,7 @@ public class PotionParalysis extends Potion
 	@SideOnly(Side.CLIENT)
 	public int getStatusIconIndex()
 	{
-		Minecraft.getMinecraft().renderEngine.func_110577_a(new ResourceLocation("biomesoplenty:textures/potions/BOPPotionFX.png"));
+		Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation("biomesoplenty:textures/potions/BOPPotionFX.png"));
 		return 1;
 	}
 

common/biomesoplenty/potions/PotionPossession.java

@@ -18,7 +18,7 @@ public class PotionPossession extends Potion
 	@SideOnly(Side.CLIENT)
 	public int getStatusIconIndex()
 	{
-		Minecraft.getMinecraft().renderEngine.func_110577_a(new ResourceLocation("biomesoplenty:textures/potions/BOPPotionFX.png"));
+		Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation("biomesoplenty:textures/potions/BOPPotionFX.png"));
 		return 2;
 	}
 

common/biomesoplenty/tileentities/TileEntityAltar.java

@@ -61,12 +61,12 @@ public class TileEntityAltar extends TileEntity
         //{
             if (packet.actionType == 0)
             {
-                this.apatitePresent = packet.customParam1.getBoolean("apatitePresent");
+                this.apatitePresent = packet.data.getBoolean("apatitePresent");
-                this.peridotPresent = packet.customParam1.getBoolean("peridotPresent");
+                this.peridotPresent = packet.data.getBoolean("peridotPresent");
-                this.rubyPresent = packet.customParam1.getBoolean("rubyPresent");
+                this.rubyPresent = packet.data.getBoolean("rubyPresent");
-                this.sapphirePresent = packet.customParam1.getBoolean("sapphirePresent");
+                this.sapphirePresent = packet.data.getBoolean("sapphirePresent");
-                this.tanzanitePresent = packet.customParam1.getBoolean("tanzanitePresent");
+                this.tanzanitePresent = packet.data.getBoolean("tanzanitePresent");
-                this.topazPresent = packet.customParam1.getBoolean("topazPresent");
+                this.topazPresent = packet.data.getBoolean("topazPresent");
             }
         //}
         

common/biomesoplenty/world/ChunkProviderBOP.java

@@ -726,6 +726,8 @@ public class ChunkProviderBOP implements IChunkProvider
 		 }
 	 }
 
-	 @Override
+	@Override
-	 public void func_104112_b() {}
+	public void saveExtraData() 
+	{
+	}
 }

common/biomesoplenty/world/ChunkProviderBOPNaturaHell.java

@@ -629,9 +629,6 @@ public class ChunkProviderBOPNaturaHell implements IChunkProvider
 		 return true;
 	 }
 
-	 @Override
-	 public void func_104112_b() {}
-
 	 /**
 	  * Unloads chunks that are marked to be unloaded. This is not guaranteed to unload every such chunk.
 	  */
@@ -694,4 +691,9 @@ public class ChunkProviderBOPNaturaHell implements IChunkProvider
 	 {
 		 genNetherBridge.generate(this, worldObj, par1, par2, (byte[])null);
 	 }
+
+	@Override
+	public void saveExtraData() 
+	{
+	}
 }

common/biomesoplenty/world/ChunkProviderBOPhell.java

@@ -581,9 +581,6 @@ public class ChunkProviderBOPhell implements IChunkProvider
 		 return true;
 	 }
 
-	 @Override
-	 public void func_104112_b() {}
-
 	 /**
 	  * Unloads chunks that are marked to be unloaded. This is not guaranteed to unload every such chunk.
 	  */
@@ -646,4 +643,9 @@ public class ChunkProviderBOPhell implements IChunkProvider
 	 {
 		 genNetherBridge.generate(this, worldObj, par1, par2, (byte[])null);
 	 }
+
+	@Override
+	public void saveExtraData() 
+	{
+	}
 }

common/biomesoplenty/world/ChunkProviderPromised.java

@@ -595,6 +595,8 @@ public class ChunkProviderPromised implements IChunkProvider
 	 @Override
 	 public void recreateStructures(int par1, int par2) {}
 
-	 @Override
+	@Override
-	 public void func_104112_b() {}
+	public void saveExtraData() 
+	{
+	}
 }

common/biomesoplenty/worldgen/WorldGenBadlands.java

@@ -64,7 +64,7 @@ public class WorldGenBadlands extends WorldGenerator
 							{
 								double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D);
 
-								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.field_111032_cD.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
+								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.hardenedClay.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
 								{
 									par1World.setBlock(var38, var41, var44, minableBlockId, 14, 2);
 								}

common/biomesoplenty/worldgen/WorldGenBadlands2.java

@@ -64,7 +64,7 @@ public class WorldGenBadlands2 extends WorldGenerator
 							{
 								double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D);
 
-								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.field_111032_cD.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
+								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.hardenedClay.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
 								{
 									par1World.setBlock(var38, var41, var44, minableBlockId, 1, 2);
 								}

common/biomesoplenty/worldgen/WorldGenBadlands3.java

@@ -64,7 +64,7 @@ public class WorldGenBadlands3 extends WorldGenerator
 							{
 								double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D);
 
-								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.field_111032_cD.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
+								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.hardenedClay.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
 								{
 									par1World.setBlock(var38, var41, var44, minableBlockId, 14, 2);
 								}

common/biomesoplenty/worldgen/WorldGenBadlands4.java

@@ -64,7 +64,7 @@ public class WorldGenBadlands4 extends WorldGenerator
 							{
 								double var45 = (var44 + 0.5D - var24) / (var28 / 2.0D);
 
-								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.field_111032_cD.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
+								if (var39 * var39 + var42 * var42 + var45 * var45 < 1.0D && par1World.getBlockId(var38, var41, var44) == Block.hardenedClay.blockID || par1World.getBlockId(var38, var41, var44) == Blocks.holyGrass.get().blockID)
 								{
 									par1World.setBlock(var38, var41, var44, minableBlockId, 0, 2);
 								}