merged with trunk

forge/conf/fields.csv

@@ -368,7 +368,7 @@
 "field_35484_b","ocean","b","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
 "field_35485_c","plains","c","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
 "field_4249_h","desert","d","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
-"field_35483_e","hills","e","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
+"field_35483_e","extremeHills","e","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
 "field_4253_d","forest","f","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
 "field_4250_g","taiga","g","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
 "field_4255_b","swampland","h","LBiomeGenBase;","Lsr;","BiomeGenBase","sr","net/minecraft/src","0"
@@ -2306,10 +2306,10 @@
 "field_27028_b","lightningState","b","I","I","EntityLightningBolt","su","net/minecraft/src","0"
 "field_27029_a","boltVertex","a","J","J","EntityLightningBolt","su","net/minecraft/src","0"
 "field_27030_c","boltLivingTime","c","I","I","EntityLightningBolt","su","net/minecraft/src","0"
-"field_35596_a","metaId","a","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
-"field_35594_b","minItemStack","b","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
-"field_35595_c","maxItemStack","c","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
-"field_35593_e","itemWeight","e","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
+"field_35596_a","itemID","a","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
+"field_35594_b","itemMetadata","b","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
+"field_35595_c","minItemStack","c","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
+"field_35593_e","maxItemStack","e","I","I","StructurePieceTreasure","agq","net/minecraft/src","0"
 "field_1202_a","posX","a","I","I","WorldBlockPositionType","agf","net/minecraft/src","0"
 "field_1201_b","posY","b","I","I","WorldBlockPositionType","agf","net/minecraft/src","0"
 "field_1207_c","posZ","c","I","I","WorldBlockPositionType","agf","net/minecraft/src","0"
@@ -2346,7 +2346,7 @@
 "field_40666_e","profilingMap","e","Ljava/util/Map;","Ljava/util/Map;","Profiler","pf","net/minecraft/src","0"
 "field_35473_a","heightShift","a","I","I","World","ry","net/minecraft/src","0"
 "field_35471_b","xShift","b","I","I","World","ry","net/minecraft/src","0"
-"field_35472_c","worldYMax","c","I","I","World","ry","net/minecraft/src","0"
+"field_35472_c","worldHeight","c","I","I","World","ry","net/minecraft/src","0"
 "field_35469_d","worldMaxY","d","I","I","World","ry","net/minecraft/src","0"
 "field_35470_e","seaLevel","e","I","I","World","ry","net/minecraft/src","0"
 "field_4214_a","scheduledUpdatesAreImmediate","f","Z","Z","World","ry","net/minecraft/src","0"
@@ -2717,7 +2717,7 @@
 "field_27085_k","distanceStatType","g","LIStatType;","Lun;","StatBase","px","net/minecraft/src","0"
 "field_40073_a","entityDragonObj","a","LEntityDragonBase;","Ladh;","DragonPart","vc","net/minecraft/src","0"
 "field_40072_b","name","b","Ljava/lang/String;","Ljava/lang/String;","DragonPart","vc","net/minecraft/src","0"
-"field_35590_d","field_35590_d","d","I","I","WeightedRandomChoice","abt","net/minecraft/src","0"
+"field_35590_d","itemWeight","d","I","I","WeightedRandomChoice","abt","net/minecraft/src","0"
 "field_1100_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesWeapons","kj","net/minecraft/src","0"
 "field_1099_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesWeapons","kj","net/minecraft/src","0"
 "field_40704_a","sectionPercentage","a","D","D","ProfilerResult","afx","net/minecraft/src","0"
@@ -2843,7 +2843,7 @@
 "field_4176_b","field_4176_b","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderHell","jv","net/minecraft/src","0"
 "field_4164_n","worldObj","o","LWorld;","Lry;","ChunkProviderHell","jv","net/minecraft/src","0"
 "field_4163_o","field_4163_o","p","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
-"field_40378_c","field_40378_c","c","LMapGenNetherBridge;","Led;","ChunkProviderHell","jv","net/minecraft/src","0"
+"field_40378_c","genNetherBridge","c","LMapGenNetherBridge;","Led;","ChunkProviderHell","jv","net/minecraft/src","0"
 "field_4162_p","field_4162_p","q","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
 "field_4161_q","gravelNoise","r","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
 "field_4160_r","field_4160_r","s","[D","[D","ChunkProviderHell","jv","net/minecraft/src","0"
@@ -2982,7 +2982,7 @@
 "field_837_a","name","a","Ljava/lang/String;","Ljava/lang/String;","InventoryLargeChest","adv","net/minecraft/src","0"
 "field_836_b","upperChest","b","LIInventory;","Lde;","InventoryLargeChest","adv","net/minecraft/src","0"
 "field_838_c","lowerChest","c","LIInventory;","Lde;","InventoryLargeChest","adv","net/minecraft/src","0"
-"field_1306_a","field_1306_a","a","I","I","MapGenBase","bz","net/minecraft/src","0"
+"field_1306_a","range","a","I","I","MapGenBase","bz","net/minecraft/src","0"
 "field_1305_b","rand","b","Ljava/util/Random;","Ljava/util/Random;","MapGenBase","bz","net/minecraft/src","0"
 "field_35625_d","worldObj","c","LWorld;","Lry;","MapGenBase","bz","net/minecraft/src","0"
 "field_455_a","signEntityClass","a","Ljava/lang/Class;","Ljava/lang/Class;","BlockSign","mr","net/minecraft/src","0"
@@ -3440,7 +3440,7 @@
 "field_40388_a","field_40388_a","a","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0"
 "field_40386_b","field_40386_b","b","LNoiseGeneratorOctaves;","Leb;","ChunkProviderEnd","a","net/minecraft/src","0"
 "field_40392_m","endWorld","m","LWorld;","Lry;","ChunkProviderEnd","a","net/minecraft/src","0"
-"field_40389_n","field_40389_n","n","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
+"field_40389_n","densities","n","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
 "field_40390_o","field_40390_o","o","[LBiomeGenBase;","[Lsr;","ChunkProviderEnd","a","net/minecraft/src","0"
 "field_40387_c","field_40387_c","c","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
 "field_40384_d","field_40384_d","d","[D","[D","ChunkProviderEnd","a","net/minecraft/src","0"
@@ -3800,17 +3800,17 @@
 "field_35525_s","temperature","y","F","F","BiomeGenBase","kb","net/minecraft/src","1"
 "field_35524_t","rainfall","z","F","F","BiomeGenBase","kb","net/minecraft/src","1"
 "field_40461_A","waterColorMultiplier","A","I","I","BiomeGenBase","kb","net/minecraft/src","1"
-"field_35523_u","decorator","B","LBiomeDecorator;","Lgo;","BiomeGenBase","kb","net/minecraft/src","1"
+"field_35523_u","biomeDecorator","B","LBiomeDecorator;","Lgo;","BiomeGenBase","kb","net/minecraft/src","1"
 "field_25058_r","spawnableMonsterList","C","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1"
 "field_25057_s","spawnableCreatureList","D","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1"
 "field_25056_t","spawnableWaterCreatureList","E","Ljava/util/List;","Ljava/util/List;","BiomeGenBase","kb","net/minecraft/src","1"
 "field_27051_u","enableSnow","K","Z","Z","BiomeGenBase","kb","net/minecraft/src","1"
 "field_27050_v","enableRain","L","Z","Z","BiomeGenBase","kb","net/minecraft/src","1"
 "field_35529_y","biomeID","F","I","I","BiomeGenBase","kb","net/minecraft/src","1"
-"field_35528_z","treeGenerator","G","LWorldGenTrees;","Lxs;","BiomeGenBase","kb","net/minecraft/src","1"
-"field_35515_A","bigTreeGenerator","H","LWorldGenBigTree;","Lim;","BiomeGenBase","kb","net/minecraft/src","1"
-"field_35516_B","forestGenerator","I","LWorldGenForest;","Ll;","BiomeGenBase","kb","net/minecraft/src","1"
-"field_35517_C","swampTreeGenerator","J","LWorldGenSwamp;","Lbk;","BiomeGenBase","kb","net/minecraft/src","1"
+"field_35528_z","worldGenTrees","G","LWorldGenTrees;","Lxs;","BiomeGenBase","kb","net/minecraft/src","1"
+"field_35515_A","worldGenBigTree","H","LWorldGenBigTree;","Lim;","BiomeGenBase","kb","net/minecraft/src","1"
+"field_35516_B","worldGenForest","I","LWorldGenForest;","Ll;","BiomeGenBase","kb","net/minecraft/src","1"
+"field_35517_C","worldGenSwamp","J","LWorldGenSwamp;","Lbk;","BiomeGenBase","kb","net/minecraft/src","1"
 "field_40334_a","tableInventory","a","LIInventory;","Llp;","ContainerEnchantment","iq","net/minecraft/src","1"
 "field_40338_h","worldPointer","h","LWorld;","Lfi;","ContainerEnchantment","iq","net/minecraft/src","1"
 "field_40339_i","field_40339_i","i","I","I","ContainerEnchantment","iq","net/minecraft/src","1"
@@ -4786,7 +4786,7 @@
 "field_482_d","zCoord","n","I","I","TileEntity","oh","net/minecraft/src","1"
 "field_31006_h","tileEntityInvalid","o","Z","Z","TileEntity","oh","net/minecraft/src","1"
 "field_35165_n","blockMetadata","p","I","I","TileEntity","oh","net/minecraft/src","1"
-"field_35166_o","field_35166_o","q","LBlock;","Ltl;","TileEntity","oh","net/minecraft/src","1"
+"field_35166_o","blockType","q","LBlock;","Ltl;","TileEntity","oh","net/minecraft/src","1"
 "field_659_a","numAdjacentSources","a","I","I","BlockFlowing","nx","net/minecraft/src","1"
 "field_658_b","isOptimalFlowDirection","b","[Z","[Z","BlockFlowing","nx","net/minecraft/src","1"
 "field_660_c","flowCost","c","[I","[I","BlockFlowing","nx","net/minecraft/src","1"
@@ -4909,7 +4909,7 @@
 "field_748_m","heightLimitLimit","m","I","I","WorldGenBigTree","im","net/minecraft/src","1"
 "field_747_n","leafDistanceLimit","n","I","I","WorldGenBigTree","im","net/minecraft/src","1"
 "field_746_o","leafNodes","o","[[I","[[I","WorldGenBigTree","im","net/minecraft/src","1"
-"field_271_a","cropID","a","I","I","ItemSeeds","ql","net/minecraft/src","1"
+"field_271_a","blockType","a","I","I","ItemSeeds","ql","net/minecraft/src","1"
 "field_40253_bQ","field_40253_bQ","b","I","I","ItemSeeds","ql","net/minecraft/src","1"
 "field_40269_f","field_40269_f","f","LEntityPlayer;","Lgz;","SlotBrewingStandPotion","lj","net/minecraft/src","1"
 "field_40270_a","field_40270_a","a","LContainerBrewingStand;","Lje;","SlotBrewingStandPotion","lj","net/minecraft/src","1"
@@ -5041,7 +5041,7 @@
 "field_35096_j","generic","j","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1"
 "field_35097_k","explosion","k","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1"
 "field_35094_l","magic","l","LDamageSource;","Lpo;","DamageSource","po","net/minecraft/src","1"
-"field_35092_n","isBlockable","n","Z","Z","DamageSource","po","net/minecraft/src","1"
+"field_35092_n","isUnblockable","n","Z","Z","DamageSource","po","net/minecraft/src","1"
 "field_35093_o","isDamageAllowedInCreativeMode","o","Z","Z","DamageSource","po","net/minecraft/src","1"
 "field_35100_p","hungerDamage","p","F","F","DamageSource","po","net/minecraft/src","1"
 "field_40278_q","fireDamage","q","Z","Z","DamageSource","po","net/minecraft/src","1"
@@ -5075,10 +5075,10 @@
 "field_27018_b","lightningState","b","I","I","EntityLightningBolt","d","net/minecraft/src","1"
 "field_27019_a","boltVertex","a","J","J","EntityLightningBolt","d","net/minecraft/src","1"
 "field_27020_c","boltLivingTime","c","I","I","EntityLightningBolt","d","net/minecraft/src","1"
-"field_35489_a","metaId","a","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
-"field_35487_b","minItemStack","b","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
-"field_35488_c","maxItemStack","c","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
-"field_35486_e","itemWeight","e","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
+"field_35489_a","itemID","a","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
+"field_35487_b","itemMetadata","b","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
+"field_35488_c","minItemStack","c","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
+"field_35486_e","maxItemStack","e","I","I","StructurePieceTreasure","ib","net/minecraft/src","1"
 "field_20017_a","windowId","a","I","I","Packet103SetSlot","hx","net/minecraft/src","1"
 "field_20016_b","itemSlot","b","I","I","Packet103SetSlot","hx","net/minecraft/src","1"
 "field_20018_c","myItemStack","c","LItemStack;","Ljb;","Packet103SetSlot","hx","net/minecraft/src","1"
@@ -5402,7 +5402,7 @@
 "field_975_h","playerList","h","Ljava/util/ArrayList;","Ljava/util/ArrayList;","NetworkListenThread","ep","net/minecraft/src","1"
 "field_980_c","mcServer","c","LMinecraftServer;","LMinecraftServer;","NetworkListenThread","ep","net/minecraft/src","1"
 "field_35506_i","field_35506_i","i","Ljava/util/HashMap;","Ljava/util/HashMap;","NetworkListenThread","ep","net/minecraft/src","1"
-"field_35483_d","field_35483_d","d","I","I","WeightedRandomChoice","cp","net/minecraft/src","1"
+"field_35483_d","itemWeight","d","I","I","WeightedRandomChoice","cp","net/minecraft/src","1"
 "field_20114_a","recipePatterns","a","[[Ljava/lang/String;","[[Ljava/lang/String;","RecipesWeapons","wp","net/minecraft/src","1"
 "field_20113_b","recipeItems","b","[[Ljava/lang/Object;","[[Ljava/lang/Object;","RecipesWeapons","wp","net/minecraft/src","1"
 "field_35373_a","field_35373_a","a","I","I","ComponentVillageHouse3","gi","net/minecraft/src","1"