Update for pre-ninja 1.6.3 update

Author: cpw

common/fml_at.cfg

@@ -1,76 +1,78 @@
 #Main FML Access Transformer configuration file
 # TileEntity addMapping
-public asm.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
+public asp.a(Ljava/lang/Class;Ljava/lang/String;)V #MD:TileEntity/func_70306_a
 # EntityList addMappings
-public ns.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
-public ns.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
-public ns.b #FD:EntityList/field_75625_b #nameToClassMap
-public ns.c #FD:EntityList/field_75626_c #classToNameMap
-public ns.d #FD:EntityList/field_75623_d #idToClassMap
+public nt.a(Ljava/lang/Class;Ljava/lang/String;I)V #MD:EntityList/func_75618_a
+public nt.a(Ljava/lang/Class;Ljava/lang/String;III)V #MD:EntityList/func_75614_a
+public nt.b #FD:EntityList/field_75625_b #nameToClassMap
+public nt.c #FD:EntityList/field_75626_c #classToNameMap
+public nt.d #FD:EntityList/field_75623_d #idToClassMap
 # RenderEngine
 #public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
 #public bge.g #FD:RenderEngine/field_78366_k #texturePack # -- MISSING MAPPING
 # RenderManager
-public bgi.q #FD:RenderManager/field_78729_o #renderers
+public bgl.q #FD:RenderManager/field_78729_o #renderers
 # RenderBlocks - everything
-public bfo.* #FD:RenderBlocks/*
-public bfo.*() #MD:RenderBlocks/*
+public bfr.* #FD:RenderBlocks/*
+public bfr.*() #MD:RenderBlocks/*
 #RenderPlayer
 #public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist # -- MISSING MAPPING
 #RenderBiped
-public-f bgr.l #FD:RenderBiped/field_82424_k #armorlist
+public-f bgu.l #FD:RenderBiped/field_82424_k #armorlist
 #StringTranslate
 #public bp.b #FD:StringTranslate/field_74815_b # -- MISSING MAPPING
 #public bp.e #FD:StringTranslate/field_74813_d # -- MISSING MAPPING
 # TileEntityRenderer
-public bja.m #FD:TileEntityRenderer/field_76966_m
+public bjd.m #FD:TileEntityRenderer/field_76966_m
 # CraftingManager - make the add recipe methods public
-public aae.a(Lyd;[Ljava/lang/Object;)Laah; #MD:CraftingManager/func_92103_a
-public aae.b(Lyd;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
+public aaf.a(Lye;[Ljava/lang/Object;)Laai; #MD:CraftingManager/func_92103_a
+public aaf.b(Lye;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
 # WeightedRandomItem
-public mi.a #FD:WeightedRandomItem/field_76292_a #probability
+public mj.a #FD:WeightedRandomItem/field_76292_a #probability
 # ItemStack
 #public+f tv.c #FD:ItemStack/field_77993_c #itemId
 # StatBase
-public kt.a #FD:StatBase/field_75978_a #statName
+public ku.a #FD:StatBase/field_75978_a #statName
 # NetLoginHandler
-public jx.a(Ljx;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
-public jx.g #FD:NetLoginHandler/field_72543_h #userName
+public jy.a(Ljy;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
+public jy.g #FD:NetLoginHandler/field_72543_h #userName
 # EntityPlayerMP getNextWindowId
-public ju.bM()V #MD:EntityPlayerMP/func_71117_bO
-public ju.bX #FD:EntityPlayerMP/field_71139_cq
+public jv.bN()V #MD:EntityPlayerMP/func_71117_bO
+public jv.bY #FD:EntityPlayerMP/field_71139_cq
 # EntityAITaskEntry
-public pt #CL:EntityAITaskEntry
+public pu #CL:EntityAITaskEntry
 # EntityAITasks
-public ps.a #FD:EntityAITasks/field_75782_a #taskList
+public pt.a #FD:EntityAITasks/field_75782_a #taskList
 # BlockChest
-public anh.m(Labv;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
+public ank.m(Labw;III)Z #MD:BlockChest/func_72292_n #isOcelotBlockingChest
 # EntityLiving
 #public ng.aU #FD:EntityLiving/field_70736_aM #carryoverDamage # -- MISSING MAPPING
-public of.c #FD:EntityLiving/field_70714_bg #tasks
+public og.c #FD:EntityLiving/field_70714_bg #tasks
 #public ng.bG #FD:EntityLiving/field_70703_bu #isJumping # -- MISSING MAPPING
 # EntityAIOcelotSit
-protected qf.a(Labv;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
-protected qf.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
+protected qg.a(Labw;III)Z #MD:EntityAIOcelotSit/func_75398_a #nearestSittableBlock
+protected qg.f()Z #MD:EntityAIOcelotSit/func_75399_f #isblocksittable
 # CallableMinecraftVersion - sanity check the MC version
 public c #CL:CallableMinecraftVersion
 public c.<init>(Lb;)V #MD:CallableMinecraftVersion/<init>(Lnet/minecraft/src/CrashReport;) #constructor
 # EntityAnimal
-public ro.bp #FD:EntityAnimal/field_70881_d #inLove
+public rp.bp #FD:EntityAnimal/field_70881_d #inLove
 # WorldType
-public acf.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
-public acf.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
+public acg.<init>(ILjava/lang/String;)V #MD:WorldType/<init>(ILjava/lang/String;)
+public acg.<init>(ILjava/lang/String;I)V #MD:WorldType/<init>(ILjava/lang/String;I)
 # ComponentVillage
-public ajj #CL:ComponentVillage
+public ajm #CL:ComponentVillage
+# StructureStart
+public aiv.a #FD:StructureStart/field_75075_a
 # EntityVillager - minmax lists
-public ua.a(Labl;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
-public ua.b(Labl;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
-public ua.bB #FD:EntityVillager/field_70958_bB
-public ua.bC #FD:EntityVillager/field_70960_bC
+public ub.a(Labm;ILjava/util/Random;F)V #MD:EntityVillager/func_70948_a #addBuy
+public ub.b(Labm;ILjava/util/Random;F)V #MD:EntityVillager/func_70949_b #addSell
+public ub.bB #FD:EntityVillager/field_70958_bB
+public ub.bC #FD:EntityVillager/field_70960_bC
 # GuiButtonMerchant
-public axu #CL:GuiButtonMerchant
+public axx #CL:GuiButtonMerchant
 
-protected auu.a #FD:GuiYesNo/field_73942_a #guiScreen
+protected aux.a #FD:GuiYesNo/field_73942_a #guiScreen
 # Minecraft
-public ats.D #FD:Minecraft/field_71425_J #running
-public ats.N #FD:Minecraft/field_71446_o # textureManager
+public atv.D #FD:Minecraft/field_71425_J #running
+public atv.N #FD:Minecraft/field_71446_o # textureManager

common/fml_marker.cfg

@@ -2,11 +2,11 @@
 # Only runs at runtime because it's not necessary at compile time
 # has deobf and obf mappings so it runs OK in mcp
 # entityplayer -> network/player
-ue cpw/mods/fml/common/network/Player
+uf cpw/mods/fml/common/network/Player
 net.minecraft.entity.player.EntityPlayer cpw/mods/fml/common/network/Player
 # block -> blockproxy
-aqw cpw/mods/fml/common/registry/BlockProxy
+aqz cpw/mods/fml/common/registry/BlockProxy
 net.minecraft.block.Block cpw/mods/fml/common/registry/BlockProxy
 # item -> itemproxy
-yb cpw/mods/fml/common/registry/ItemProxy
+yc cpw/mods/fml/common/registry/ItemProxy
 net.minecraft.item.Item cpw/mods/fml/common/registry/ItemProxy

conf/fields.csv

@@ -2361,23 +2361,35 @@ field_74885_f,coordBaseMode,2,switches the Coordinate System base off the Boundi
 field_74886_g,componentType,2,The type ID of this component.
 field_74887_e,boundingBox,2,
 field_74896_a,villagersSpawned,2,The number of villagers that have been spawned in this component.
-field_74897_k,startPiece,2,The starting piece of the village.
-field_74899_a,averageGroundLevel,2,
-field_74901_a,averageGroundLevel,2,
-field_74903_a,averageGroundLevel,2,
-field_74905_a,averageGroundLevel,2,
-field_74907_a,averageGroundLevel,2,
+field_74897_k,startPiece,0,The starting piece of the village.
+field_74897_k,startPiece,1,The starting piece of the village.
+field_74899_a,averageGroundLevel,0,
+field_74899_a,averageGroundLevel,1,
+field_74901_a,averageGroundLevel,0,
+field_74901_a,averageGroundLevel,1,
+field_74903_a,averageGroundLevel,0,
+field_74903_a,averageGroundLevel,1,
+field_74905_a,averageGroundLevel,0,
+field_74905_a,averageGroundLevel,1,
+field_74907_a,averageGroundLevel,0,
+field_74907_a,averageGroundLevel,1,
 field_74909_b,isTallHouse,2,
 field_74910_c,tablePosition,2,
-field_74911_a,averageGroundLevel,2,
+field_74911_a,averageGroundLevel,0,
+field_74911_a,averageGroundLevel,1,
 field_74913_b,isRoofAccessible,2,
-field_74914_a,averageGroundLevel,2,
-field_74916_b,averageGroundLevel,2,
+field_74914_a,averageGroundLevel,0,
+field_74914_a,averageGroundLevel,1,
+field_74916_b,averageGroundLevel,0,
+field_74916_b,averageGroundLevel,1,
 field_74917_c,hasMadeChest,2,
 field_74918_a,villageBlacksmithChestContents,2,List of items that Village's Blacksmith chest can contain.
-field_74920_a,averageGroundLevel,2,
-field_74922_a,averageGroundLevel,2,
-field_74923_b,averageGroundLevel,2,
+field_74920_a,averageGroundLevel,0,
+field_74920_a,averageGroundLevel,1,
+field_74922_a,averageGroundLevel,0,
+field_74922_a,averageGroundLevel,1,
+field_74923_b,averageGroundLevel,0,
+field_74923_b,averageGroundLevel,1,
 field_74926_d,structVillagePieceWeight,2,
 field_74927_b,inDesert,2,Boolean that determines if the village is in a desert or not.
 field_74928_c,terrainType,2,"World terrain type, 0 for normal, 1 for flap map"
@@ -2403,26 +2415,35 @@ field_74969_c,secondaryWeights,2,Contains the list of valid piece weights for th
 field_74970_a,theNetherBridgePieceWeight,2,Instance of StructureNetherBridgePieceWeight.
 field_74972_a,fillSeed,2,
 field_74976_a,hasSpawner,2,
-field_74998_a,doorType,2,
-field_75001_b,doorType,2,
+field_74998_a,doorType,0,
+field_74998_a,doorType,1,
+field_75001_b,doorType,0,
+field_75001_b,doorType,1,
 field_75002_c,hasMadeChest,2,
 field_75003_a,strongholdChestContents,2,List of items that Stronghold chests can contain.
 field_75005_a,hasSpawner,2,
 field_75007_b,strongholdLibraryChestContents,2,List of items that Stronghold Library chests can contain.
 field_75008_c,isLargeRoom,2,
-field_75009_a,doorType,2,
-field_75011_a,doorType,2,
+field_75009_a,doorType,0,
+field_75009_a,doorType,1,
+field_75011_a,doorType,0,
+field_75011_a,doorType,1,
 field_75013_b,roomType,2,
 field_75014_c,strongholdRoomCrossingChestContents,2,Items that could generate in the chest that is located in Stronghold Room Crossing.
-field_75015_a,doorType,2,
-field_75017_a,doorType,2,
+field_75015_a,doorType,0,
+field_75015_a,doorType,1,
+field_75017_a,doorType,0,
+field_75017_a,doorType,1,
 field_75019_b,expandsX,2,
 field_75020_c,expandsZ,2,
-field_75021_a,doorType,2,
-field_75023_b,doorType,2,
+field_75021_a,doorType,0,
+field_75021_a,doorType,1,
+field_75023_b,doorType,0,
+field_75023_b,doorType,1,
 field_75025_b,strongholdPortalRoom,2,
 field_75027_a,strongholdPieceWeight,2,
-field_75029_a,doorType,2,
+field_75029_a,doorType,0,
+field_75029_a,doorType,1,
 field_75038_b,rand,2,The RNG used by the MapGen classes.
 field_75039_c,worldObj,2,This world object.
 field_75040_a,range,2,The number of Chunks to gen-check in any given direction.