keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Updated FML:

Browse source 
MinecraftForge/FML@da70cdd35a Update tweaker for new Launcher API
MinecraftForge/FML@352117fd78 Update for new installer and thank you.
MinecraftForge/FML@40a34af431 Merge branch 'master' into newtweak
MinecraftForge/FML@e77d2547ad Update for pre-ninja 1.6.3 update
MinecraftForge/FML@34493b0d99 Update for real 1.6.3 update
MinecraftForge/FML@95afc95b24 Update mcp mod info
MinecraftForge/FML@ff75416a32 Update mc_versions data and commands patch and eclipse workspace
MinecraftForge/FML@8f2e675581 Update the src distro's eclipse workspace.
This commit is contained in:
Lex Manos 2013-09-18 16:10:38 -07:00
parent 60da9094ef
commit 6c5ef9347c
13 changed files with 182 additions and 175 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

223
common/forge_at.cfg
View file

@ -1,165 +1,156 @@
#Main Forge Access Transformer configuration file #Main Forge Access Transformer configuration file
# Tessellator # Tessellator
public-f bfn.a #FD:Tessellator/field_78398_a #instance public-f bfq.a #FD:Tessellator/field_78398_a #instance
public bfn.u #FD:Tessellator/field_78409_u #drawMode public bfq.u #FD:Tessellator/field_78409_u #drawMode
public bfn.v #FD:Tessellator/field_78408_v #xOffset public bfq.v #FD:Tessellator/field_78408_v #xOffset
public bfn.w #FD:Tessellator/field_78407_w #yOffset public bfq.w #FD:Tessellator/field_78407_w #yOffset
public bfn.x #FD:Tessellator/field_78417_x #zOffset public bfq.x #FD:Tessellator/field_78417_x #zOffset
public bfn.z #FD:Tessellator/field_78415_z #isDrawing public bfq.z #FD:Tessellator/field_78415_z #isDrawing
# ItemPickaxe # ItemPickaxe
public ym.<init>(ILyc;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor public yn.<init>(ILyd;)V #MD:ItemPickaxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
public+f ym.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst public+f yn.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst
# ItemAxe # ItemAxe
public xz.<init>(ILyc;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor public ya.<init>(ILyd;)V #MD:ItemAxe/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
public+f xz.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst public+f ya.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst
# ItemSpade # ItemSpade
public yx.<init>(ILyc;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor public yy.<init>(ILyd;)V #MD:ItemSpade/<init>(ILnet/minecraft/src/EnumToolMaterial;) #constructor
public+f yx.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst public+f yy.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst
# ItemTool # ItemTool
public xi.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial public xj.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial
public xi.d #FD:ItemTool/field_77865_bY #damageVsEntity public xj.d #FD:ItemTool/field_77865_bY #damageVsEntity
# EntityEnderman # EntityEnderman
public tf.br #FD:EntityEnderman/field_70827_d #carriableBlocks public tg.br #FD:EntityEnderman/field_70827_d #carriableBlocks
# RenderEngine
# -- MISSING MAPPING public bge.f(Ljava/lang/String;)I #MD:RenderEngine/func_78341_b #getTexture
# -- MISSING MAPPING public bge.i #FD:RenderEngine/field_94154_l #terrainTextureMap
# -- MISSING MAPPING public bge.j #FD:RenderEngine/field_94155_m #itemTextureMap
# RenderGlobal # RenderGlobal
public bfi.k #FD:RenderGlobal/field_72769_h #theWorld public bfl.k #FD:RenderGlobal/field_72769_h #theWorld
public bfi.l #FD:RenderGlobal/field_72770_i #renderEngine public bfl.l #FD:RenderGlobal/field_72770_i #renderEngine
public bfi.t #FD:RenderGlobal/field_72777_q #mc public bfl.t #FD:RenderGlobal/field_72777_q #mc
public bfi.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks public bfl.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks
public bfi.H #FD:RenderGlobal/field_72738_E #damagedBlocks public bfl.H #FD:RenderGlobal/field_72738_E #damagedBlocks
# SoundManager # SoundManager
public blk.b #FD:SoundManager/field_77381_a #sndSystem public blo.b #FD:SoundManager/field_77381_a #sndSystem
public blk.d #FD:SoundManager/field_77379_b #soundPoolSounds public blo.d #FD:SoundManager/field_77379_b #soundPoolSounds
public blk.e #FD:SoundManager/field_77380_c #soundPoolStreaming public blo.e #FD:SoundManager/field_77380_c #soundPoolStreaming
public blk.f #FD:SoundManager/field_77377_d #soundPoolMusic public blo.f #FD:SoundManager/field_77377_d #soundPoolMusic
# EntityMinecart # EntityMinecart
protected ss.* #FD:EntityMinecart/* # All private -> protected protected st.* #FD:EntityMinecart/* # All private -> protected
# -- MISSING MAPPING public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered
# Block # Block
public aqw.<init>(ILajz;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor public aqz.<init>(ILakc;)V #MD:Block/<init>(ILnet/minecraft/src/Material;) #Constructor
public aqw.<init>(IILajz;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor public aqz.<init>(IILakc;)V #MD:Block/<init>(IILnet/minecraft/src/Material;) #Constructor
public aqw.cH #FD:Block/field_72029_cc #blockResistance public aqz.cH #FD:Block/field_72029_cc #blockResistance
public aqw.cG #FD:Block/field_71989_cb #blockHardness public aqz.cG #FD:Block/field_71989_cb #blockHardness
public aqw.d(Ljava/lang/String;)Laqw; #MD:Block/func_111022_d #setIconName public aqz.d(Ljava/lang/String;)Laqz; #MD:Block/func_111022_d #setIconName
# -- MISSING MAPPING public amq.r()Lamq; #MD:Block/func_71912_p #setRequiresSelfNotify public aqz.a(Lard;)Laqz; #MD:Block/func_71884_a #setStepSound
public aqw.a(Lara;)Laqw; #MD:Block/func_71884_a #setStepSound public aqz.b(F)Laqz; #MD:Block/func_71894_b #setResistance
public aqw.b(F)Laqw; #MD:Block/func_71894_b #setResistance public aqz.c(F)Laqz; #MD:Block/func_71848_c #setHardness
public aqw.c(F)Laqw; #MD:Block/func_71848_c #setHardness public aqz.k(I)Laqz; #MD:Block/func_71868_h #setLightOpacity
public aqw.k(I)Laqw; #MD:Block/func_71868_h #setLightOpacity public aqz.a(F)Laqz; #MD:Block/func_71900_a #setLightValue
public aqw.a(F)Laqw; #MD:Block/func_71900_a #setLightValue public aqz.r()Laqz; #MD:Block/func_71875_q #setBlockUnbreakable
public aqw.r()Laqw; #MD:Block/func_71875_q #setBlockUnbreakable public aqz.b(Z)Laqz; #MD:Block/func_71907_b #setTickRandomly
public aqw.b(Z)Laqw; #MD:Block/func_71907_b #setTickRandomly public aqz.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
public aqw.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds
# NetServerHandler # NetServerHandler
public jz.f #FD:NetServerHandler/field_72572_g #playerInAirTime public ka.f #FD:NetServerHandler/field_72572_g #playerInAirTime
# TileEntity # TileEntity
public asm.k #FD:TileEntity/field_70331_k #worldObj public asp.k #FD:TileEntity/field_70331_k #worldObj
# BlockLeavesBase # BlockLeavesBase
public are.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel public arh.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel
# Item # Item
public yb.<init>(I)V #MD:Item/<init>(I) #Constructor public yc.<init>(I)V #MD:Item/<init>(I) #Constructor
public yb.e(I)Lyb; #MD:Item/func_77656_e #setMaxDamage public yc.e(I)Lyc; #MD:Item/func_77656_e #setMaxDamage
public-f yb.h(Lyd;)Lmr; #MD:Item/func_77650_f #getIconIndex public-f yc.h(Lye;)Lms; #MD:Item/func_77650_f #getIconIndex
public yb.c(Ljava/lang/String;)Lyb; #MD:Item/func_77631_c #setPotionEffect public yc.c(Ljava/lang/String;)Lyc; #MD:Item/func_77631_c #setPotionEffect
public yb.d(Ljava/lang/String;)Lyb; #MD:Item/func_111206_d #setIconName public yc.d(Ljava/lang/String;)Lyc; #MD:Item/func_111206_d #setIconName
# RailLogic # RailLogic
public amw #CL:BlockBaseRailLogic public amz #CL:BlockBaseRailLogic
public amw.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles public amz.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles
# EntityPlayer # EntityPlayer
public ue.a(Lsr;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld public uf.a(Lss;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld
public ue.i()V #MD:EntityPlayer/func_71053_j #closeScreen public uf.i()V #MD:EntityPlayer/func_71053_j #closeScreen
public ue.b #FD:EntityPlayer/field_71076_b #sleepTimer public uf.b #FD:EntityPlayer/field_71076_b #sleepTimer
# EntityPlayerMP # EntityPlayerMP
public bdf.a(Lsr;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld public bdi.a(Lss;)V #MD:EntityClientPlayerMP/func_71012_a #joinEntityItemWithWorld
# World Gen Chests Related # World Gen Chests Related
public mj.* #FD:WeightedRandomChestContent/* #all public mk.* #FD:WeightedRandomChestContent/* #all
public jr.T #FD:WorldServer/field_73069_S #bonusChestContent public js.T #FD:WorldServer/field_73069_S #bonusChestContent
public agg.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents public agh.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents
public ahk.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple public ahl.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple
public ahl.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents public ahm.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents
public ahl.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents public ahm.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents
public ahv.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents public ahw.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents
public ahz.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents public aia.a #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents
public aie.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents public aif.b #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents
public ajf.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents public aji.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents
public afo.a #FD:WorldGenDungeons/field_111189_a #chestContents public afp.a #FD:WorldGenDungeons/field_111189_a #chestContents
# AnvilChunkLoader.chunkSaveLocation # AnvilChunkLoader.chunkSaveLocation
public aed.d #FD:AnvilChunkLoader/field_75825_d public aee.d #FD:AnvilChunkLoader/field_75825_d
# ChunkProviderServer.currentChunkLoader # ChunkProviderServer.currentChunkLoader
public jq.e #FD:ChunkProviderServer/field_73247_e public jr.e #FD:ChunkProviderServer/field_73247_e
# PlayerManager # PlayerManager
public jo.a(IIZ)Ljp; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher public jp.a(IIZ)Ljq; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher
# PlayerInstance # PlayerInstance
public jp #CL:PlayerInstance public jq #CL:PlayerInstance
# World # World
public-f abv.A #FD:World/field_72982_D #villageCollectionObj public-f abw.A #FD:World/field_72982_D #villageCollectionObj
public abv.G #FD:World/field_72993_I #activeChunkSet public abw.G #FD:World/field_72993_I #activeChunkSet
# EntityLiving # EntityLiving
public of.b #FD:EntityLiving/field_70728_aV #experienceValue public og.b #FD:EntityLiving/field_70728_aV #experienceValue
# -- MISSING MAPPING public ng.bt #FD:EntityLiving/field_94063_bt #combatTracker public og.d #FD:EntityLiving/field_70715_bh #targetTasks
public of.d #FD:EntityLiving/field_70715_bh #targetTasks
# GuiFlatPresets # GuiFlatPresets
public avw.a(Ljava/lang/String;ILacp;Ljava/util/List;[Lagc;)V #MD:GuiFlatPresets/func_82294_a public avz.a(Ljava/lang/String;ILacq;Ljava/util/List;[Lagd;)V #MD:GuiFlatPresets/func_82294_a
public avw.a(Ljava/lang/String;ILacp;[Lagc;)V #MD:GuiFlatPresets/func_82297_a public avz.a(Ljava/lang/String;ILacq;[Lagd;)V #MD:GuiFlatPresets/func_82297_a
# BiomeGenBase # BiomeGenBase
public acp.*() #MD:BiomeGenBase/* #Everything protected->public public acq.*() #MD:BiomeGenBase/* #Everything protected->public
# MapGenVillage # MapGenVillage
public-f ait.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes public-f aiw.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes
# ShapedRecipes # ShapedRecipes
public+f aah.d #FD:ShapedRecipes/field_77574_d #recipeItems public+f aai.d #FD:ShapedRecipes/field_77574_d #recipeItems
public+f aah.b #FD:ShapedRecipes/field_77576_b #recipeWidth public+f aai.b #FD:ShapedRecipes/field_77576_b #recipeWidth
public+f aah.c #FD:ShapedRecipes/field_77577_c #recipeHeight public+f aai.c #FD:ShapedRecipes/field_77577_c #recipeHeight
# ShapelessRecipes # ShapelessRecipes
public aai.b #FD:ShapelessRecipes/field_77579_b #recipeItems public aaj.b #FD:ShapelessRecipes/field_77579_b #recipeItems
# GuiContainer # GuiContainer
protected awv.a(Lwd;)V #MD:GuiContainer/func_74192_a #drawSlotInventory protected awy.a(Lwe;)V #MD:GuiContainer/func_74192_a #drawSlotInventory
# ContainerPlayer # ContainerPlayer
protected vu.h #FD:ContainerPlayer/field_82862_h #player protected vv.h #FD:ContainerPlayer/field_82862_h #player
# BlockButton # BlockButton
protected anc.n(Labv;III)V #MD:BlockButton/func_82535_o #checkActivation protected anf.n(Labw;III)V #MD:BlockButton/func_82535_o #checkActivation
protected-f anc.a #FD:BlockButton/field_82537_a #sensible protected-f anf.a #FD:BlockButton/field_82537_a #sensible
# BiomeDecorator # BiomeDecorator
public act.* #FD:BiomeDecorator/* # All private -> protected public acu.* #FD:BiomeDecorator/* # All private -> protected
# CreativeTabs # CreativeTabs
public-f wv.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final public-f ww.a #FD:CreativeTabs/field_78032_a # creativeTabArray non-final
# Packet # Packet
public ex.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping public ey.a(IZZLjava/lang/Class;)V #MD:Packet/func_73285_a #addIdClassMapping
# SaveHandler # SaveHandler
public aln.b()Ljava/io/File; #MD:SaveHandler/func_75765_b public alq.b()Ljava/io/File; #MD:SaveHandler/func_75765_b
# World stuff # World stuff
public abv.b(Lnm;)V #MD:World/func_72847_b #releaseEntitySkin public abw.b(Lnn;)V #MD:World/func_72847_b #releaseEntitySkin
public abv.m #FD:World/field_73003_n #prevRainingStrength public abw.m #FD:World/field_73003_n #prevRainingStrength
public abv.n #FD:World/field_73004_o #rainingStrength public abw.n #FD:World/field_73004_o #rainingStrength
public abv.p #FD:World/field_73017_q #thunderingStrength public abw.p #FD:World/field_73017_q #thunderingStrength
public abv.o #FD:World/field_73018_p #prevThunderingStrength public abw.o #FD:World/field_73018_p #prevThunderingStrength
#WorldClient #WorldClient
public bda.b(Lnm;)V #MD:WorldClient/func_72847_b #releaseEntitySkin public bdd.b(Lnn;)V #MD:WorldClient/func_72847_b #releaseEntitySkin
#WorldServer #WorldServer
public jr.b(Lnm;)V #MD:WorldServer/func_72847_b #releaseEntitySkin public js.b(Lnn;)V #MD:WorldServer/func_72847_b #releaseEntitySkin
public jr.N #FD:WorldServer/field_73068_P #allPlayersSleeping public js.N #FD:WorldServer/field_73068_P #allPlayersSleeping
#TextureMap #TextureMap
public bih.g #FD:TextureMap/field_94255_a public bik.g #FD:TextureMap/field_94255_a
# -- MISSING MAPPING public bir.b #FD:TextureMap/field_94253_b public bik.h #FD:TextureMap/field_94254_c
public bih.h #FD:TextureMap/field_94254_c
# -- MISSING MAPPING public bir.d #FD:TextureMap/field_94251_d
#Potion #Potion
public nh.b(II)Lnh; #MD:Potion/func_76399_b #setIconIndex public ni.b(II)Lni; #MD:Potion/func_76399_b #setIconIndex
#PotionHelper #PotionHelper
public zo.m #FD:PotionHelper/field_77927_l #potionRequirements public zp.m #FD:PotionHelper/field_77927_l #potionRequirements
public zo.n #FD:PotionHelper/field_77928_m #potionAmplifiers public zp.n #FD:PotionHelper/field_77928_m #potionAmplifiers
#PotionEffect #PotionEffect
public ni.b #FD:PotionEffect/field_76460_b #duration public nj.b #FD:PotionEffect/field_76460_b #duration
#BlockFluid #BlockFluid
protected aoz.a #FD:BlockFluid/field_94425_a #theIcon protected apc.a #FD:BlockFluid/field_94425_a #theIcon
#GuiIngame #GuiIngame
protected avg.* #FD:GuiIngame/* # All private -> protected protected avj.* #FD:GuiIngame/* # All private -> protected
protected avg.*() #MD:GuiIngame/* # All private -> protected protected avj.*() #MD:GuiIngame/* # All private -> protected
#ItemStack #ItemStack
default yd.f #FD:ItemStack/field_77991_e # make default access for itemDamage default ye.f #FD:ItemStack/field_77991_e # make default access for itemDamage
#GuiSlot #GuiSlot
protected awd.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground protected awg.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground
#EntityPlayer #EntityPlayer
public ue.bu #FD:EntityPlayer/field_71092_bJ #username public uf.bu #FD:EntityPlayer/field_71092_bJ #username

14
patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch
View file

@ -13,7 +13,7 @@
public class EntityPlayerMP extends EntityPlayer implements ICrafting public class EntityPlayerMP extends EntityPlayer implements ICrafting
{ {
private String translator = "en_US"; private String translator = "en_US";
@@ -164,18 +170,10 @@ @@ -165,18 +171,10 @@
par4ItemInWorldManager.thisPlayerMP = this; par4ItemInWorldManager.thisPlayerMP = this;
this.theItemInWorldManager = par4ItemInWorldManager; this.theItemInWorldManager = par4ItemInWorldManager;
this.renderDistance = par1MinecraftServer.getConfigurationManager().getViewDistance(); this.renderDistance = par1MinecraftServer.getConfigurationManager().getViewDistance();
@ -33,7 +33,7 @@
this.mcServer = par1MinecraftServer; this.mcServer = par1MinecraftServer;
this.stepHeight = 0.0F; this.stepHeight = 0.0F;
@@ -239,11 +237,6 @@ @@ -240,11 +238,6 @@
this.yOffset = 0.0F; this.yOffset = 0.0F;
} }
@ -45,7 +45,7 @@
/** /**
* Called to update the entity's position/logic. * Called to update the entity's position/logic.
*/ */
@@ -289,7 +282,10 @@ @@ -290,7 +283,10 @@
if (chunkcoordintpair != null && this.worldObj.blockExists(chunkcoordintpair.chunkXPos << 4, 0, chunkcoordintpair.chunkZPos << 4)) if (chunkcoordintpair != null && this.worldObj.blockExists(chunkcoordintpair.chunkXPos << 4, 0, chunkcoordintpair.chunkZPos << 4))
{ {
arraylist.add(this.worldObj.getChunkFromChunkCoords(chunkcoordintpair.chunkXPos, chunkcoordintpair.chunkZPos)); arraylist.add(this.worldObj.getChunkFromChunkCoords(chunkcoordintpair.chunkXPos, chunkcoordintpair.chunkZPos));
@ -57,7 +57,7 @@
} }
} }
@@ -310,6 +306,7 @@ @@ -311,6 +307,7 @@
{ {
Chunk chunk = (Chunk)iterator2.next(); Chunk chunk = (Chunk)iterator2.next();
this.getServerForPlayer().getEntityTracker().func_85172_a(this, chunk); this.getServerForPlayer().getEntityTracker().func_85172_a(this, chunk);
@ -65,7 +65,7 @@
} }
} }
} }
@@ -377,11 +374,25 @@ @@ -383,11 +380,25 @@
*/ */
public void onDeath(DamageSource par1DamageSource) public void onDeath(DamageSource par1DamageSource)
{ {
@ -91,9 +91,9 @@
} }
Collection collection = this.worldObj.getScoreboard().func_96520_a(ScoreObjectiveCriteria.deathCount); Collection collection = this.worldObj.getScoreboard().func_96520_a(ScoreObjectiveCriteria.deathCount);
@@ -1043,4 +1054,16 @@ @@ -1054,4 +1065,16 @@
{ {
return new ChunkCoordinates(MathHelper.floor_double(this.posX), MathHelper.floor_double(this.posY + 0.5D), MathHelper.floor_double(this.posZ)); this.field_143005_bX = MinecraftServer.getSystemTimeMillis();
} }
+ +
+ /* ===================================== FORGE START =====================================*/ + /* ===================================== FORGE START =====================================*/

10
patches/minecraft/net/minecraft/network/NetServerHandler.java.patch
View file

@ -91,7 +91,7 @@
this.playerEntity.onGround = par1Packet10Flying.onGround; this.playerEntity.onGround = par1Packet10Flying.onGround;
this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity);
this.playerEntity.updateFlyingState(this.playerEntity.posY - d0, par1Packet10Flying.onGround); this.playerEntity.updateFlyingState(this.playerEntity.posY - d0, par1Packet10Flying.onGround);
@@ -442,7 +471,10 @@ @@ -443,7 +472,10 @@
double d2 = this.playerEntity.posZ - ((double)k + 0.5D); double d2 = this.playerEntity.posZ - ((double)k + 0.5D);
double d3 = d0 * d0 + d1 * d1 + d2 * d2; double d3 = d0 * d0 + d1 * d1 + d2 * d2;
@ -103,7 +103,7 @@
{ {
return; return;
} }
@@ -502,7 +534,11 @@ @@ -504,7 +536,11 @@
return; return;
} }
@ -116,7 +116,7 @@
} }
else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit())) else if (par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit() - 1 && (par1Packet15Place.getDirection() == 1 || par1Packet15Place.getYPosition() >= this.mcServer.getBuildLimit()))
{ {
@@ -511,7 +547,9 @@ @@ -513,7 +549,9 @@
} }
else else
{ {
@ -127,7 +127,7 @@
{ {
this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, worldserver, itemstack, i, j, k, l, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset()); this.playerEntity.theItemInWorldManager.activateBlockOrUseItem(this.playerEntity, worldserver, itemstack, i, j, k, l, par1Packet15Place.getXOffset(), par1Packet15Place.getYOffset(), par1Packet15Place.getZOffset());
} }
@@ -691,6 +729,8 @@ @@ -695,6 +733,8 @@
} }
ChatMessageComponent chatmessagecomponent = ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), s}); ChatMessageComponent chatmessagecomponent = ChatMessageComponent.createFromTranslationWithSubstitutions("chat.type.text", new Object[] {this.playerEntity.getTranslatedEntityName(), s});
@ -136,7 +136,7 @@
this.mcServer.getConfigurationManager().func_110459_a(chatmessagecomponent, false); this.mcServer.getConfigurationManager().func_110459_a(chatmessagecomponent, false);
} }
@@ -838,7 +878,7 @@ @@ -849,7 +889,7 @@
return; return;
} }

18
patches/minecraft/net/minecraft/server/MinecraftServer.java.patch
View file

@ -28,7 +28,7 @@
/** The ServerConfigurationManager instance. */ /** The ServerConfigurationManager instance. */
private ServerConfigurationManager serverConfigManager; private ServerConfigurationManager serverConfigManager;
@@ -132,7 +137,8 @@ @@ -133,7 +138,8 @@
public final long[] tickTimeArray; public final long[] tickTimeArray;
/** Stats are [dimension][tick%100] system.nanoTime is stored. */ /** Stats are [dimension][tick%100] system.nanoTime is stored. */
@ -38,7 +38,7 @@
private KeyPair serverKeyPair; private KeyPair serverKeyPair;
/** Username of the server owner (for integrated servers) */ /** Username of the server owner (for integrated servers) */
@@ -216,8 +222,6 @@ @@ -218,8 +224,6 @@
{ {
this.convertMapIfNeeded(par1Str); this.convertMapIfNeeded(par1Str);
this.setUserMessage("menu.loadingLevel"); this.setUserMessage("menu.loadingLevel");
@ -47,7 +47,7 @@
ISaveHandler isavehandler = this.anvilConverterForAnvilFile.getSaveLoader(par1Str, true); ISaveHandler isavehandler = this.anvilConverterForAnvilFile.getSaveLoader(par1Str, true);
WorldInfo worldinfo = isavehandler.loadWorldInfo(); WorldInfo worldinfo = isavehandler.loadWorldInfo();
WorldSettings worldsettings; WorldSettings worldsettings;
@@ -237,46 +241,23 @@ @@ -239,46 +243,23 @@
worldsettings.enableBonusChest(); worldsettings.enableBonusChest();
} }
@ -105,7 +105,7 @@
this.setDifficultyForAllWorlds(this.getDifficulty()); this.setDifficultyForAllWorlds(this.getDifficulty());
this.initialWorldChunkLoad(); this.initialWorldChunkLoad();
} }
@@ -358,6 +339,7 @@ @@ -360,6 +341,7 @@
if (!this.worldIsBeingDeleted) if (!this.worldIsBeingDeleted)
{ {
WorldServer[] aworldserver = this.worldServers; WorldServer[] aworldserver = this.worldServers;
@ -113,7 +113,7 @@
int i = aworldserver.length; int i = aworldserver.length;
for (int j = 0; j < i; ++j) for (int j = 0; j < i; ++j)
@@ -411,7 +393,14 @@ @@ -413,7 +395,14 @@
for (int i = 0; i < this.worldServers.length; ++i) for (int i = 0; i < this.worldServers.length; ++i)
{ {
WorldServer worldserver = this.worldServers[i]; WorldServer worldserver = this.worldServers[i];
@ -128,7 +128,7 @@
} }
if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning()) if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning())
@@ -636,13 +625,15 @@ @@ -638,13 +627,15 @@
this.theProfiler.startSection("levels"); this.theProfiler.startSection("levels");
int i; int i;
@ -149,7 +149,7 @@
this.theProfiler.startSection(worldserver.getWorldInfo().getWorldName()); this.theProfiler.startSection(worldserver.getWorldInfo().getWorldName());
this.theProfiler.startSection("pools"); this.theProfiler.startSection("pools");
worldserver.getWorldVec3Pool().clear(); worldserver.getWorldVec3Pool().clear();
@@ -689,9 +680,11 @@ @@ -691,9 +682,11 @@
this.theProfiler.endSection(); this.theProfiler.endSection();
} }
@ -164,7 +164,7 @@
this.theProfiler.endStartSection("connection"); this.theProfiler.endStartSection("connection");
this.getNetworkThread().networkTick(); this.getNetworkThread().networkTick();
this.theProfiler.endStartSection("players"); this.theProfiler.endStartSection("players");
@@ -745,7 +738,13 @@ @@ -747,7 +740,13 @@
*/ */
public WorldServer worldServerForDimension(int par1) public WorldServer worldServerForDimension(int par1)
{ {
@ -179,7 +179,7 @@
} }
@SideOnly(Side.SERVER) @SideOnly(Side.SERVER)
@@ -1108,6 +1107,7 @@ @@ -1110,6 +1109,7 @@
if (worldserver != null) if (worldserver != null)
{ {

4
patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch
View file

@ -1,6 +1,6 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java
@@ -8,6 +8,9 @@ @@ -9,6 +9,9 @@
import net.minecraft.tileentity.TileEntityMobSpawner; import net.minecraft.tileentity.TileEntityMobSpawner;
import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -10,7 +10,7 @@
public class ComponentMineshaftCorridor extends StructureComponent public class ComponentMineshaftCorridor extends StructureComponent
{ {
@@ -264,14 +267,16 @@ @@ -283,14 +286,16 @@
this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, k - 1, Block.torchWood.blockID, 0); this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, k - 1, Block.torchWood.blockID, 0);
this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, k + 1, Block.torchWood.blockID, 0); this.randomlyPlaceBlock(par1World, par3StructureBoundingBox, par2Random, 0.05F, 1, 2, k + 1, Block.torchWood.blockID, 0);

4
patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch
View file

@ -1,6 +1,6 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java
@@ -6,6 +6,9 @@ @@ -7,6 +7,9 @@
import net.minecraft.util.Direction; import net.minecraft.util.Direction;
import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -10,7 +10,7 @@
public class ComponentScatteredFeatureDesertPyramid extends ComponentScatteredFeature public class ComponentScatteredFeatureDesertPyramid extends ComponentScatteredFeature
{ {
@@ -215,13 +218,14 @@ @@ -236,13 +239,14 @@
this.placeBlockAtCurrentPosition(par1World, Block.sandStone.blockID, 1, 10, -10, 13, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.sandStone.blockID, 1, 10, -10, 13, par3StructureBoundingBox);
this.placeBlockAtCurrentPosition(par1World, Block.sandStone.blockID, 2, 10, -11, 13, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.sandStone.blockID, 2, 10, -11, 13, par3StructureBoundingBox);

12
patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch
View file

@ -1,7 +1,7 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java
@@ -6,6 +6,9 @@ @@ -7,6 +7,9 @@
import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World; import net.minecraft.world.World;
+ +
@ -10,7 +10,7 @@
public class ComponentScatteredFeatureJunglePyramid extends ComponentScatteredFeature public class ComponentScatteredFeatureJunglePyramid extends ComponentScatteredFeature
{ {
@@ -164,9 +167,12 @@ @@ -185,9 +188,12 @@
this.placeBlockAtCurrentPosition(par1World, Block.redstoneWire.blockID, 0, 4, -3, 1, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.redstoneWire.blockID, 0, 4, -3, 1, par3StructureBoundingBox);
this.placeBlockAtCurrentPosition(par1World, Block.cobblestoneMossy.blockID, 0, 3, -3, 1, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.cobblestoneMossy.blockID, 0, 3, -3, 1, par3StructureBoundingBox);
@ -24,7 +24,7 @@
} }
this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 3, -2, 2, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 3, -2, 2, par3StructureBoundingBox);
@@ -183,7 +189,7 @@ @@ -204,7 +210,7 @@
if (!this.field_74946_k) if (!this.field_74946_k)
{ {
@ -33,7 +33,7 @@
} }
this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 8, -1, 3, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 8, -1, 3, par3StructureBoundingBox);
@@ -191,7 +197,7 @@ @@ -212,7 +218,7 @@
if (!this.field_74947_h) if (!this.field_74947_h)
{ {
@ -42,7 +42,7 @@
} }
this.placeBlockAtCurrentPosition(par1World, Block.cobblestoneMossy.blockID, 0, 9, -3, 2, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.cobblestoneMossy.blockID, 0, 9, -3, 2, par3StructureBoundingBox);
@@ -224,7 +230,7 @@ @@ -245,7 +251,7 @@
if (!this.field_74948_i) if (!this.field_74948_i)
{ {

6
patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch
View file

@ -1,7 +1,7 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java
@@ -6,6 +6,9 @@ @@ -7,6 +7,9 @@
import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World; import net.minecraft.world.World;
+ +
@ -10,7 +10,7 @@
public class ComponentStrongholdChestCorridor extends ComponentStronghold public class ComponentStrongholdChestCorridor extends ComponentStronghold
{ {
@@ -72,7 +75,7 @@ @@ -86,7 +89,7 @@
if (par3StructureBoundingBox.isVecInside(j, i, k)) if (par3StructureBoundingBox.isVecInside(j, i, k))
{ {
this.hasMadeChest = true; this.hasMadeChest = true;

6
patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch
View file

@ -1,7 +1,7 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java
@@ -6,6 +6,9 @@ @@ -7,6 +7,9 @@
import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World; import net.minecraft.world.World;
+ +
@ -10,7 +10,7 @@
public class ComponentStrongholdLibrary extends ComponentStronghold public class ComponentStrongholdLibrary extends ComponentStronghold
{ {
@@ -147,12 +150,14 @@ @@ -161,12 +164,14 @@
this.placeBlockAtCurrentPosition(par1World, Block.torchWood.blockID, 0, b1, 8, b2 + 1, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.torchWood.blockID, 0, b1, 8, b2 + 1, par3StructureBoundingBox);
} }

6
patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch
View file

@ -1,7 +1,7 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java
@@ -6,6 +6,9 @@ @@ -7,6 +7,9 @@
import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World; import net.minecraft.world.World;
+ +
@ -10,7 +10,7 @@
public class ComponentStrongholdRoomCrossing extends ComponentStronghold public class ComponentStrongholdRoomCrossing extends ComponentStronghold
{ {
@@ -144,7 +147,7 @@ @@ -158,7 +161,7 @@
this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 1, 3, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 1, 3, par3StructureBoundingBox);
this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 2, 3, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 2, 3, par3StructureBoundingBox);
this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 3, 3, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 3, 3, par3StructureBoundingBox);

38
patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch
View file

@ -1,35 +1,51 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java
@@ -5,6 +5,10 @@ @@ -7,6 +7,10 @@
import net.minecraft.block.Block; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.world.World; import net.minecraft.world.World;
+
+import net.minecraftforge.common.*; +import net.minecraftforge.common.*;
+import net.minecraftforge.event.Event.*; +import net.minecraftforge.event.Event.*;
+import net.minecraftforge.event.terraingen.*; +import net.minecraftforge.event.terraingen.*;
+
public abstract class ComponentVillage extends StructureComponent public abstract class ComponentVillage extends StructureComponent
{ {
@@ -136,6 +140,10 @@ protected int field_143015_k = -1;
@@ -14,6 +18,7 @@
/** The number of villagers that have been spawned in this component. */
private int villagersSpawned;
private boolean field_143014_b;
+ private ComponentVillageStartPiece startPiece;
public ComponentVillage() {}
@@ -24,6 +29,7 @@
if (par1ComponentVillageStartPiece != null)
{
this.field_143014_b = par1ComponentVillageStartPiece.inDesert;
+ startPiece = par1ComponentVillageStartPiece;
}
}
@@ -157,6 +163,10 @@
*/ */
protected int getBiomeSpecificBlock(int par1, int par2) protected int getBiomeSpecificBlock(int par1, int par2)
{ {
+ BiomeEvent.GetVillageBlockID event = new BiomeEvent.GetVillageBlockID(startPiece.biome, par1, par2); + BiomeEvent.GetVillageBlockID event = new BiomeEvent.GetVillageBlockID(startPiece == null ? null : startPiece.biome, par1, par2);
+ MinecraftForge.TERRAIN_GEN_BUS.post(event); + MinecraftForge.TERRAIN_GEN_BUS.post(event);
+ if (event.getResult() == Result.DENY) return event.replacement; + if (event.getResult() == Result.DENY) return event.replacement;
+ +
if (this.startPiece.inDesert) if (this.field_143014_b)
{ {
if (par1 == Block.wood.blockID) if (par1 == Block.wood.blockID)
@@ -177,6 +185,10 @@ @@ -198,6 +208,10 @@
*/ */
protected int getBiomeSpecificBlockMetadata(int par1, int par2) protected int getBiomeSpecificBlockMetadata(int par1, int par2)
{ {
+ BiomeEvent.GetVillageBlockMeta event = new BiomeEvent.GetVillageBlockMeta(startPiece.biome, par1, par2); + BiomeEvent.GetVillageBlockMeta event = new BiomeEvent.GetVillageBlockMeta(startPiece == null ? null : startPiece.biome, par1, par2);
+ MinecraftForge.TERRAIN_GEN_BUS.post(event); + MinecraftForge.TERRAIN_GEN_BUS.post(event);
+ if (event.getResult() == Result.DENY) return event.replacement; + if (event.getResult() == Result.DENY) return event.replacement;
+ +
if (this.startPiece.inDesert) if (this.field_143014_b)
{ {
if (par1 == Block.wood.blockID) if (par1 == Block.wood.blockID)

6
patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch
View file

@ -1,7 +1,7 @@
--- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java
+++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java
@@ -6,6 +6,9 @@ @@ -7,6 +7,9 @@
import net.minecraft.item.Item; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.util.WeightedRandomChestContent;
import net.minecraft.world.World; import net.minecraft.world.World;
+ +
@ -10,7 +10,7 @@
public class ComponentVillageHouse2 extends ComponentVillage public class ComponentVillageHouse2 extends ComponentVillage
{ {
@@ -92,7 +95,7 @@ @@ -106,7 +109,7 @@
if (par3StructureBoundingBox.isVecInside(j, i, k)) if (par3StructureBoundingBox.isVecInside(j, i, k))
{ {
this.hasMadeChest = true; this.hasMadeChest = true;

10
patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch
View file

@ -3,16 +3,16 @@
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
/** Boolean that determines if the village is in a desert or not. */ /** Boolean that determines if the village is in a desert or not. */
public final boolean inDesert; public boolean inDesert;
+ public final BiomeGenBase biome; + public BiomeGenBase biome;
/** World terrain type, 0 for normal, 1 for flap map */ /** World terrain type, 0 for normal, 1 for flap map */
public final int terrainType; public int terrainType;
@@ -33,6 +34,7 @@ @@ -35,6 +36,7 @@
this.terrainType = par7; this.terrainType = par7;
BiomeGenBase biomegenbase = par1WorldChunkManager.getBiomeGenAt(par4, par5); BiomeGenBase biomegenbase = par1WorldChunkManager.getBiomeGenAt(par4, par5);
this.inDesert = biomegenbase == BiomeGenBase.desert || biomegenbase == BiomeGenBase.desertHills; this.inDesert = biomegenbase == BiomeGenBase.desert || biomegenbase == BiomeGenBase.desertHills;
+ this.biome = biomegenbase; + this.biome = biomegenbase;
this.startPiece = this;
} }
public WorldChunkManager getWorldChunkManager()