diff --git a/common/forge_at.cfg b/common/forge_at.cfg index e38b069327..d2532c2952 100644 --- a/common/forge_at.cfg +++ b/common/forge_at.cfg @@ -1,165 +1,156 @@ #Main Forge Access Transformer configuration file # Tessellator -public-f bfn.a #FD:Tessellator/field_78398_a #instance -public bfn.u #FD:Tessellator/field_78409_u #drawMode -public bfn.v #FD:Tessellator/field_78408_v #xOffset -public bfn.w #FD:Tessellator/field_78407_w #yOffset -public bfn.x #FD:Tessellator/field_78417_x #zOffset -public bfn.z #FD:Tessellator/field_78415_z #isDrawing +public-f bfq.a #FD:Tessellator/field_78398_a #instance +public bfq.u #FD:Tessellator/field_78409_u #drawMode +public bfq.v #FD:Tessellator/field_78408_v #xOffset +public bfq.w #FD:Tessellator/field_78407_w #yOffset +public bfq.x #FD:Tessellator/field_78417_x #zOffset +public bfq.z #FD:Tessellator/field_78415_z #isDrawing # ItemPickaxe -public ym.(ILyc;)V #MD:ItemPickaxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor -public+f ym.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst +public yn.(ILyd;)V #MD:ItemPickaxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor +public+f yn.c #FD:ItemPickaxe/field_77867_c #blocksEffectiveAgainst # ItemAxe -public xz.(ILyc;)V #MD:ItemAxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor -public+f xz.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst +public ya.(ILyd;)V #MD:ItemAxe/(ILnet/minecraft/src/EnumToolMaterial;) #constructor +public+f ya.c #FD:ItemAxe/field_77868_c #blocksEffectiveAgainst # ItemSpade -public yx.(ILyc;)V #MD:ItemSpade/(ILnet/minecraft/src/EnumToolMaterial;) #constructor -public+f yx.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst +public yy.(ILyd;)V #MD:ItemSpade/(ILnet/minecraft/src/EnumToolMaterial;) #constructor +public+f yy.c #FD:ItemSpade/field_77866_c #blocksEffectiveAgainst # ItemTool -public xi.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial -public xi.d #FD:ItemTool/field_77865_bY #damageVsEntity +public xj.a #FD:ItemTool/field_77864_a #efficiencyOnProperMaterial +public xj.d #FD:ItemTool/field_77865_bY #damageVsEntity # EntityEnderman -public tf.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 +public tg.br #FD:EntityEnderman/field_70827_d #carriableBlocks # RenderGlobal -public bfi.k #FD:RenderGlobal/field_72769_h #theWorld -public bfi.l #FD:RenderGlobal/field_72770_i #renderEngine -public bfi.t #FD:RenderGlobal/field_72777_q #mc -public bfi.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks -public bfi.H #FD:RenderGlobal/field_72738_E #damagedBlocks +public bfl.k #FD:RenderGlobal/field_72769_h #theWorld +public bfl.l #FD:RenderGlobal/field_72770_i #renderEngine +public bfl.t #FD:RenderGlobal/field_72777_q #mc +public bfl.u #FD:RenderGlobal/field_72776_r #globalRenderBlocks +public bfl.H #FD:RenderGlobal/field_72738_E #damagedBlocks # SoundManager -public blk.b #FD:SoundManager/field_77381_a #sndSystem -public blk.d #FD:SoundManager/field_77379_b #soundPoolSounds -public blk.e #FD:SoundManager/field_77380_c #soundPoolStreaming -public blk.f #FD:SoundManager/field_77377_d #soundPoolMusic +public blo.b #FD:SoundManager/field_77381_a #sndSystem +public blo.d #FD:SoundManager/field_77379_b #soundPoolSounds +public blo.e #FD:SoundManager/field_77380_c #soundPoolStreaming +public blo.f #FD:SoundManager/field_77377_d #soundPoolMusic # EntityMinecart -protected ss.* #FD:EntityMinecart/* # All private -> protected -# -- MISSING MAPPING public py.h()Z #MD:EntityMinecart/func_70490_h #isMinecartPowered +protected st.* #FD:EntityMinecart/* # All private -> protected # Block -public aqw.(ILajz;)V #MD:Block/(ILnet/minecraft/src/Material;) #Constructor -public aqw.(IILajz;)V #MD:Block/(IILnet/minecraft/src/Material;) #Constructor -public aqw.cH #FD:Block/field_72029_cc #blockResistance -public aqw.cG #FD:Block/field_71989_cb #blockHardness -public aqw.d(Ljava/lang/String;)Laqw; #MD:Block/func_111022_d #setIconName -# -- MISSING MAPPING public amq.r()Lamq; #MD:Block/func_71912_p #setRequiresSelfNotify -public aqw.a(Lara;)Laqw; #MD:Block/func_71884_a #setStepSound -public aqw.b(F)Laqw; #MD:Block/func_71894_b #setResistance -public aqw.c(F)Laqw; #MD:Block/func_71848_c #setHardness -public aqw.k(I)Laqw; #MD:Block/func_71868_h #setLightOpacity -public aqw.a(F)Laqw; #MD:Block/func_71900_a #setLightValue -public aqw.r()Laqw; #MD:Block/func_71875_q #setBlockUnbreakable -public aqw.b(Z)Laqw; #MD:Block/func_71907_b #setTickRandomly -public aqw.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds +public aqz.(ILakc;)V #MD:Block/(ILnet/minecraft/src/Material;) #Constructor +public aqz.(IILakc;)V #MD:Block/(IILnet/minecraft/src/Material;) #Constructor +public aqz.cH #FD:Block/field_72029_cc #blockResistance +public aqz.cG #FD:Block/field_71989_cb #blockHardness +public aqz.d(Ljava/lang/String;)Laqz; #MD:Block/func_111022_d #setIconName +public aqz.a(Lard;)Laqz; #MD:Block/func_71884_a #setStepSound +public aqz.b(F)Laqz; #MD:Block/func_71894_b #setResistance +public aqz.c(F)Laqz; #MD:Block/func_71848_c #setHardness +public aqz.k(I)Laqz; #MD:Block/func_71868_h #setLightOpacity +public aqz.a(F)Laqz; #MD:Block/func_71900_a #setLightValue +public aqz.r()Laqz; #MD:Block/func_71875_q #setBlockUnbreakable +public aqz.b(Z)Laqz; #MD:Block/func_71907_b #setTickRandomly +public aqz.a(FFFFFF)V #MD:Block/func_71905_a #setBlockBounds # NetServerHandler -public jz.f #FD:NetServerHandler/field_72572_g #playerInAirTime +public ka.f #FD:NetServerHandler/field_72572_g #playerInAirTime # TileEntity -public asm.k #FD:TileEntity/field_70331_k #worldObj +public asp.k #FD:TileEntity/field_70331_k #worldObj # BlockLeavesBase -public are.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel +public arh.d #FD:BlockLeavesBase/field_72131_c #graphicsLevel # Item -public yb.(I)V #MD:Item/(I) #Constructor -public yb.e(I)Lyb; #MD:Item/func_77656_e #setMaxDamage -public-f yb.h(Lyd;)Lmr; #MD:Item/func_77650_f #getIconIndex -public yb.c(Ljava/lang/String;)Lyb; #MD:Item/func_77631_c #setPotionEffect -public yb.d(Ljava/lang/String;)Lyb; #MD:Item/func_111206_d #setIconName +public yc.(I)V #MD:Item/(I) #Constructor +public yc.e(I)Lyc; #MD:Item/func_77656_e #setMaxDamage +public-f yc.h(Lye;)Lms; #MD:Item/func_77650_f #getIconIndex +public yc.c(Ljava/lang/String;)Lyc; #MD:Item/func_77631_c #setPotionEffect +public yc.d(Ljava/lang/String;)Lyc; #MD:Item/func_111206_d #setIconName # RailLogic -public amw #CL:BlockBaseRailLogic -public amw.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles +public amz #CL:BlockBaseRailLogic +public amz.a()I #MD:BlockBaseRailLogic/func_94505_a #getNAdjacentTiles # EntityPlayer -public ue.a(Lsr;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld -public ue.i()V #MD:EntityPlayer/func_71053_j #closeScreen -public ue.b #FD:EntityPlayer/field_71076_b #sleepTimer +public uf.a(Lss;)V #MD:EntityPlayer/func_71012_a #joinEntityItemWithWorld +public uf.i()V #MD:EntityPlayer/func_71053_j #closeScreen +public uf.b #FD:EntityPlayer/field_71076_b #sleepTimer # 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 -public mj.* #FD:WeightedRandomChestContent/* #all -public jr.T #FD:WorldServer/field_73069_S #bonusChestContent -public agg.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents -public ahk.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple -public ahl.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents -public ahl.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents -public ahv.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents -public ahz.b #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents -public aie.c #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents -public ajf.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents -public afo.a #FD:WorldGenDungeons/field_111189_a #chestContents +public mk.* #FD:WeightedRandomChestContent/* #all +public js.T #FD:WorldServer/field_73069_S #bonusChestContent +public agh.a #FD:StructureMineshaftPieces/field_78818_a #mineshaftChestContents +public ahl.i #FD:ComponentScatteredFeatureDesertPyramid/field_74941_i #itemsToGenerateInTemple +public ahm.l #FD:ComponentScatteredFeatureJunglePyramid/field_74943_l #junglePyramidsChestContents +public ahm.m #FD:ComponentScatteredFeatureJunglePyramid/field_74944_m #junglePyramidsDispenserContents +public ahw.a #FD:ComponentStrongholdChestCorridor/field_75003_a #strongholdChestContents +public aia.a #FD:ComponentStrongholdLibrary/field_75007_b #strongholdLibraryChestContents +public aif.b #FD:ComponentStrongholdRoomCrossing/field_75014_c #strongholdCorridorChestContents +public aji.a #FD:ComponentVillageHouse2/field_74918_a #villageBlacksmithChestContents +public afp.a #FD:WorldGenDungeons/field_111189_a #chestContents # AnvilChunkLoader.chunkSaveLocation -public aed.d #FD:AnvilChunkLoader/field_75825_d +public aee.d #FD:AnvilChunkLoader/field_75825_d # ChunkProviderServer.currentChunkLoader -public jq.e #FD:ChunkProviderServer/field_73247_e +public jr.e #FD:ChunkProviderServer/field_73247_e # PlayerManager -public jo.a(IIZ)Ljp; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher +public jp.a(IIZ)Ljq; #MD:PlayerManager/func_72690_a #getOrCreateChunkWatcher # PlayerInstance -public jp #CL:PlayerInstance +public jq #CL:PlayerInstance # World -public-f abv.A #FD:World/field_72982_D #villageCollectionObj -public abv.G #FD:World/field_72993_I #activeChunkSet +public-f abw.A #FD:World/field_72982_D #villageCollectionObj +public abw.G #FD:World/field_72993_I #activeChunkSet # EntityLiving -public of.b #FD:EntityLiving/field_70728_aV #experienceValue -# -- MISSING MAPPING public ng.bt #FD:EntityLiving/field_94063_bt #combatTracker -public of.d #FD:EntityLiving/field_70715_bh #targetTasks +public og.b #FD:EntityLiving/field_70728_aV #experienceValue +public og.d #FD:EntityLiving/field_70715_bh #targetTasks # GuiFlatPresets -public avw.a(Ljava/lang/String;ILacp;Ljava/util/List;[Lagc;)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;Ljava/util/List;[Lagd;)V #MD:GuiFlatPresets/func_82294_a +public avz.a(Ljava/lang/String;ILacq;[Lagd;)V #MD:GuiFlatPresets/func_82297_a # BiomeGenBase -public acp.*() #MD:BiomeGenBase/* #Everything protected->public +public acq.*() #MD:BiomeGenBase/* #Everything protected->public # MapGenVillage -public-f ait.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes +public-f aiw.e #FD:MapGenVillage/field_75055_e #villageSpawnBiomes # ShapedRecipes -public+f aah.d #FD:ShapedRecipes/field_77574_d #recipeItems -public+f aah.b #FD:ShapedRecipes/field_77576_b #recipeWidth -public+f aah.c #FD:ShapedRecipes/field_77577_c #recipeHeight +public+f aai.d #FD:ShapedRecipes/field_77574_d #recipeItems +public+f aai.b #FD:ShapedRecipes/field_77576_b #recipeWidth +public+f aai.c #FD:ShapedRecipes/field_77577_c #recipeHeight # ShapelessRecipes -public aai.b #FD:ShapelessRecipes/field_77579_b #recipeItems +public aaj.b #FD:ShapelessRecipes/field_77579_b #recipeItems # GuiContainer -protected awv.a(Lwd;)V #MD:GuiContainer/func_74192_a #drawSlotInventory +protected awy.a(Lwe;)V #MD:GuiContainer/func_74192_a #drawSlotInventory # ContainerPlayer -protected vu.h #FD:ContainerPlayer/field_82862_h #player +protected vv.h #FD:ContainerPlayer/field_82862_h #player # BlockButton -protected anc.n(Labv;III)V #MD:BlockButton/func_82535_o #checkActivation -protected-f anc.a #FD:BlockButton/field_82537_a #sensible +protected anf.n(Labw;III)V #MD:BlockButton/func_82535_o #checkActivation +protected-f anf.a #FD:BlockButton/field_82537_a #sensible # BiomeDecorator -public act.* #FD:BiomeDecorator/* # All private -> protected +public acu.* #FD:BiomeDecorator/* # All private -> protected # 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 -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 -public aln.b()Ljava/io/File; #MD:SaveHandler/func_75765_b +public alq.b()Ljava/io/File; #MD:SaveHandler/func_75765_b # World stuff -public abv.b(Lnm;)V #MD:World/func_72847_b #releaseEntitySkin -public abv.m #FD:World/field_73003_n #prevRainingStrength -public abv.n #FD:World/field_73004_o #rainingStrength -public abv.p #FD:World/field_73017_q #thunderingStrength -public abv.o #FD:World/field_73018_p #prevThunderingStrength +public abw.b(Lnn;)V #MD:World/func_72847_b #releaseEntitySkin +public abw.m #FD:World/field_73003_n #prevRainingStrength +public abw.n #FD:World/field_73004_o #rainingStrength +public abw.p #FD:World/field_73017_q #thunderingStrength +public abw.o #FD:World/field_73018_p #prevThunderingStrength #WorldClient -public bda.b(Lnm;)V #MD:WorldClient/func_72847_b #releaseEntitySkin +public bdd.b(Lnn;)V #MD:WorldClient/func_72847_b #releaseEntitySkin #WorldServer -public jr.b(Lnm;)V #MD:WorldServer/func_72847_b #releaseEntitySkin -public jr.N #FD:WorldServer/field_73068_P #allPlayersSleeping +public js.b(Lnn;)V #MD:WorldServer/func_72847_b #releaseEntitySkin +public js.N #FD:WorldServer/field_73068_P #allPlayersSleeping #TextureMap -public bih.g #FD:TextureMap/field_94255_a -# -- MISSING MAPPING public bir.b #FD:TextureMap/field_94253_b -public bih.h #FD:TextureMap/field_94254_c -# -- MISSING MAPPING public bir.d #FD:TextureMap/field_94251_d +public bik.g #FD:TextureMap/field_94255_a +public bik.h #FD:TextureMap/field_94254_c #Potion -public nh.b(II)Lnh; #MD:Potion/func_76399_b #setIconIndex +public ni.b(II)Lni; #MD:Potion/func_76399_b #setIconIndex #PotionHelper -public zo.m #FD:PotionHelper/field_77927_l #potionRequirements -public zo.n #FD:PotionHelper/field_77928_m #potionAmplifiers +public zp.m #FD:PotionHelper/field_77927_l #potionRequirements +public zp.n #FD:PotionHelper/field_77928_m #potionAmplifiers #PotionEffect -public ni.b #FD:PotionEffect/field_76460_b #duration +public nj.b #FD:PotionEffect/field_76460_b #duration #BlockFluid -protected aoz.a #FD:BlockFluid/field_94425_a #theIcon +protected apc.a #FD:BlockFluid/field_94425_a #theIcon #GuiIngame -protected avg.* #FD:GuiIngame/* # All private -> protected -protected avg.*() #MD:GuiIngame/* # All private -> protected +protected avj.* #FD:GuiIngame/* # All private -> protected +protected avj.*() #MD:GuiIngame/* # All private -> protected #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 -protected awd.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground +protected awg.b(IIII)V #MD:GuiSlot/func_77206_b #overlayBackground #EntityPlayer -public ue.bu #FD:EntityPlayer/field_71092_bJ #username +public uf.bu #FD:EntityPlayer/field_71092_bJ #username diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch index 1e197c8ace..d81404fd49 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.java.patch @@ -13,7 +13,7 @@ public class EntityPlayerMP extends EntityPlayer implements ICrafting { private String translator = "en_US"; -@@ -164,18 +170,10 @@ +@@ -165,18 +171,10 @@ par4ItemInWorldManager.thisPlayerMP = this; this.theItemInWorldManager = par4ItemInWorldManager; this.renderDistance = par1MinecraftServer.getConfigurationManager().getViewDistance(); @@ -33,7 +33,7 @@ this.mcServer = par1MinecraftServer; this.stepHeight = 0.0F; -@@ -239,11 +237,6 @@ +@@ -240,11 +238,6 @@ this.yOffset = 0.0F; } @@ -45,7 +45,7 @@ /** * 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)) { 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(); 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) { @@ -91,9 +91,9 @@ } 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 =====================================*/ diff --git a/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch index c97d26b300..d28a430214 100644 --- a/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch +++ b/patches/minecraft/net/minecraft/network/NetServerHandler.java.patch @@ -91,7 +91,7 @@ this.playerEntity.onGround = par1Packet10Flying.onGround; this.mcServer.getConfigurationManager().serverUpdateMountedMovingPlayer(this.playerEntity); 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 d3 = d0 * d0 + d1 * d1 + d2 * d2; @@ -103,7 +103,7 @@ { return; } -@@ -502,7 +534,11 @@ +@@ -504,7 +536,11 @@ return; } @@ -116,7 +116,7 @@ } 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 { @@ -127,7 +127,7 @@ { 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}); @@ -136,7 +136,7 @@ this.mcServer.getConfigurationManager().func_110459_a(chatmessagecomponent, false); } -@@ -838,7 +878,7 @@ +@@ -849,7 +889,7 @@ return; } diff --git a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 4b7218d2c2..9dfab6b89d 100644 --- a/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -28,7 +28,7 @@ /** The ServerConfigurationManager instance. */ private ServerConfigurationManager serverConfigManager; -@@ -132,7 +137,8 @@ +@@ -133,7 +138,8 @@ public final long[] tickTimeArray; /** Stats are [dimension][tick%100] system.nanoTime is stored. */ @@ -38,7 +38,7 @@ private KeyPair serverKeyPair; /** Username of the server owner (for integrated servers) */ -@@ -216,8 +222,6 @@ +@@ -218,8 +224,6 @@ { this.convertMapIfNeeded(par1Str); this.setUserMessage("menu.loadingLevel"); @@ -47,7 +47,7 @@ ISaveHandler isavehandler = this.anvilConverterForAnvilFile.getSaveLoader(par1Str, true); WorldInfo worldinfo = isavehandler.loadWorldInfo(); WorldSettings worldsettings; -@@ -237,46 +241,23 @@ +@@ -239,46 +243,23 @@ worldsettings.enableBonusChest(); } @@ -105,7 +105,7 @@ this.setDifficultyForAllWorlds(this.getDifficulty()); this.initialWorldChunkLoad(); } -@@ -358,6 +339,7 @@ +@@ -360,6 +341,7 @@ if (!this.worldIsBeingDeleted) { WorldServer[] aworldserver = this.worldServers; @@ -113,7 +113,7 @@ int i = aworldserver.length; for (int j = 0; j < i; ++j) -@@ -411,7 +393,14 @@ +@@ -413,7 +395,14 @@ for (int i = 0; i < this.worldServers.length; ++i) { WorldServer worldserver = this.worldServers[i]; @@ -128,7 +128,7 @@ } if (this.usageSnooper != null && this.usageSnooper.isSnooperRunning()) -@@ -636,13 +625,15 @@ +@@ -638,13 +627,15 @@ this.theProfiler.startSection("levels"); int i; @@ -149,7 +149,7 @@ this.theProfiler.startSection(worldserver.getWorldInfo().getWorldName()); this.theProfiler.startSection("pools"); worldserver.getWorldVec3Pool().clear(); -@@ -689,9 +680,11 @@ +@@ -691,9 +682,11 @@ this.theProfiler.endSection(); } @@ -164,7 +164,7 @@ this.theProfiler.endStartSection("connection"); this.getNetworkThread().networkTick(); this.theProfiler.endStartSection("players"); -@@ -745,7 +738,13 @@ +@@ -747,7 +740,13 @@ */ public WorldServer worldServerForDimension(int par1) { @@ -179,7 +179,7 @@ } @SideOnly(Side.SERVER) -@@ -1108,6 +1107,7 @@ +@@ -1110,6 +1109,7 @@ if (worldserver != null) { diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch index c61ed6ecac..2175afdb7e 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentMineshaftCorridor.java.patch @@ -1,6 +1,6 @@ --- ../src_base/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.util.WeightedRandomChestContent; import net.minecraft.world.World; @@ -10,7 +10,7 @@ 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); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch index 109190ee7f..ec40f1daa9 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureDesertPyramid.java.patch @@ -1,6 +1,6 @@ --- ../src_base/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.WeightedRandomChestContent; import net.minecraft.world.World; @@ -10,7 +10,7 @@ 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, 2, 10, -11, 13, par3StructureBoundingBox); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch index dd7b736cca..079651029e 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeatureJunglePyramid.java -@@ -6,6 +6,9 @@ - import net.minecraft.item.Item; +@@ -7,6 +7,9 @@ + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; + @@ -10,7 +10,7 @@ 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.cobblestoneMossy.blockID, 0, 3, -3, 1, par3StructureBoundingBox); @@ -24,7 +24,7 @@ } this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 3, -2, 2, par3StructureBoundingBox); -@@ -183,7 +189,7 @@ +@@ -204,7 +210,7 @@ if (!this.field_74946_k) { @@ -33,7 +33,7 @@ } this.placeBlockAtCurrentPosition(par1World, Block.vine.blockID, 15, 8, -1, 3, par3StructureBoundingBox); -@@ -191,7 +197,7 @@ +@@ -212,7 +218,7 @@ if (!this.field_74947_h) { @@ -42,7 +42,7 @@ } this.placeBlockAtCurrentPosition(par1World, Block.cobblestoneMossy.blockID, 0, 9, -3, 2, par3StructureBoundingBox); -@@ -224,7 +230,7 @@ +@@ -245,7 +251,7 @@ if (!this.field_74948_i) { diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch index b028e40fb8..8dac29b928 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdChestCorridor.java -@@ -6,6 +6,9 @@ - import net.minecraft.item.Item; +@@ -7,6 +7,9 @@ + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; + @@ -10,7 +10,7 @@ public class ComponentStrongholdChestCorridor extends ComponentStronghold { -@@ -72,7 +75,7 @@ +@@ -86,7 +89,7 @@ if (par3StructureBoundingBox.isVecInside(j, i, k)) { this.hasMadeChest = true; diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch index 8b33acfaf9..57e2af6cfa 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdLibrary.java -@@ -6,6 +6,9 @@ - import net.minecraft.item.Item; +@@ -7,6 +7,9 @@ + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; + @@ -10,7 +10,7 @@ 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); } diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch index c1060b6e12..166867978c 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentStrongholdRoomCrossing.java -@@ -6,6 +6,9 @@ - import net.minecraft.item.Item; +@@ -7,6 +7,9 @@ + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; + @@ -10,7 +10,7 @@ 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, 2, 3, par3StructureBoundingBox); this.placeBlockAtCurrentPosition(par1World, Block.ladder.blockID, this.getMetadataWithOffset(Block.ladder.blockID, 4), 9, 3, 3, par3StructureBoundingBox); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch index abbf02e387..2904b509c7 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java.patch @@ -1,35 +1,51 @@ --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillage.java -@@ -5,6 +5,10 @@ - import net.minecraft.block.Block; - import net.minecraft.entity.passive.EntityVillager; +@@ -7,6 +7,10 @@ + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; -+ + +import net.minecraftforge.common.*; +import net.minecraftforge.event.Event.*; +import net.minecraftforge.event.terraingen.*; - ++ 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) { -+ 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); + if (event.getResult() == Result.DENY) return event.replacement; + - if (this.startPiece.inDesert) + if (this.field_143014_b) { if (par1 == Block.wood.blockID) -@@ -177,6 +185,10 @@ +@@ -198,6 +208,10 @@ */ 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); + if (event.getResult() == Result.DENY) return event.replacement; + - if (this.startPiece.inDesert) + if (this.field_143014_b) { if (par1 == Block.wood.blockID) diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch index 2accf88aab..4f229b4219 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java.patch @@ -1,7 +1,7 @@ --- ../src_base/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java +++ ../src_work/minecraft/net/minecraft/world/gen/structure/ComponentVillageHouse2.java -@@ -6,6 +6,9 @@ - import net.minecraft.item.Item; +@@ -7,6 +7,9 @@ + import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.WeightedRandomChestContent; import net.minecraft.world.World; + @@ -10,7 +10,7 @@ public class ComponentVillageHouse2 extends ComponentVillage { -@@ -92,7 +95,7 @@ +@@ -106,7 +109,7 @@ if (par3StructureBoundingBox.isVecInside(j, i, k)) { this.hasMadeChest = true; diff --git a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch index 62a064c90e..87e5f84933 100644 --- a/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentVillageStartPiece.java.patch @@ -3,16 +3,16 @@ @@ -12,6 +12,7 @@ /** Boolean that determines if the village is in a desert or not. */ - public final boolean inDesert; -+ public final BiomeGenBase biome; + public boolean inDesert; ++ public BiomeGenBase biome; /** World terrain type, 0 for normal, 1 for flap map */ - public final int terrainType; -@@ -33,6 +34,7 @@ + public int terrainType; +@@ -35,6 +36,7 @@ this.terrainType = par7; BiomeGenBase biomegenbase = par1WorldChunkManager.getBiomeGenAt(par4, par5); this.inDesert = biomegenbase == BiomeGenBase.desert || biomegenbase == BiomeGenBase.desertHills; + this.biome = biomegenbase; - this.startPiece = this; } + public WorldChunkManager getWorldChunkManager()