diff --git a/forge/conf/fields.csv b/forge/conf/fields.csv index 7265997ae3..7173849bd7 100644 --- a/forge/conf/fields.csv +++ b/forge/conf/fields.csv @@ -1842,7 +1842,7 @@ field_35774_b,foodSaturationLevel,0,The player's food saturation. field_35775_c,foodExhaustionLevel,0,The player's food exhaustion. field_35776_a,foodLevel,0,The player's food level. field_35785_d,currentServerMaxPlayers,0, -field_35786_c,playerNames,0,An ArrayList of all the player names on the current server +field_35786_c,playerInfoList,0,An ArrayList of GuiPlayerInfo (includes all the players' GuiPlayerInfo on the current server) field_35787_k,playerInfoMap,0,A HashMap of all player names and their player information objects field_35790_f,polled,0,True if server was already polled or is in the process of polling field_35791_d,motd,0,Server's Message of the Day @@ -2628,6 +2628,7 @@ field_48107_ar,navigator,0, field_48108_aq,bodyHelper,0, field_48109_aw,maximumHomeDistance,0,If -1 there is no maximum distance field_48110_av,homePosition,0, +field_48111_au,AIMoveSpeed,0, field_48121_a,villageObj,0, field_48130_d,isPlayingFlag,0, field_48131_b,randomTickDivider,0, @@ -2656,7 +2657,11 @@ field_48177_a,xCh,0,"The x-position of the transmitted chunk, in chunk coordinat field_48179_i,temp,0,A temporary storage for the compressed chunk data byte array. field_48193_b,woodMetadata,0,Sets the metadata for the wood blocks used field_48194_c,leavesMetadata,0,Sets the metadata for the leaves used in huge trees +field_48199_d,metaLeaves,0,The metadata value of the leaves to use in tree generation. field_481_e,metadataArray,0,The metadata for each block changed. +field_48200_b,growVines,0,Indicator that the tree generator needs to grown vines on the trees. +field_48201_c,metaWood,0,The metadata value of the wood to use in tree generation. +field_48202_a,minTreeHeight,0,The minimum height of a generated tree. field_48207_bU,isBlockContainer,0,true if the Block contains a Tile Entity field_48208_bT,needsRandomTick,0,Flags whether or not this block is of a type that needs random ticking. Ref-counted by ExtendedBlockStorage in order to broadly cull a chunk from the random chunk update list for efficiency's sake. field_48209_bL,redstoneLampIdle,0, @@ -2750,6 +2755,7 @@ field_48401_b,theGolem,0, field_48403_a,theVillager,0, field_48404_b,theVillager,0, field_48406_a,theGolem,0, +field_48408_b,isSitting,0,If the EntityTameable is sitting. field_48409_a,theEntity,0, field_48416_w,jungle,0,Jungle biome identifier field_48417_x,jungleHills,0, @@ -4047,7 +4053,10 @@ field_28132_b,grass,1,The material used by BlockGrass field_28134_b,world,1,The world itself. field_28151_b,dirty,1,Whether this MapDataBase needs saving to disk. field_28152_a,mapName,1,The name of the map data nbt +field_28156_j,playersHashMap,1,Holds a reference to the players who own a copy of the map and a reference to their MapInfo field_28157_i,playersVisibleOnMap,1, +field_28158_h,playersArrayList,1,Holds a reference to the MapInfo of the players who own a copy of the map +field_28159_g,randomEffect,1,"Incremented each update of the map item, used for the patchy updating map effect and the spinning player icons while in the End and Nether." field_28160_f,colors,1,colours field_28161_e,scale,1, field_28162_d,dimension,1, @@ -5122,6 +5131,7 @@ field_48200_e,targetMate,1, field_48203_a,theWorld,1, field_48206_b,speed,1, field_48209_e,speed,1, +field_48211_b,isSitting,1,If the EntityTameable is sitting. field_48212_a,theEntity,1, field_48214_b,theGolem,1, field_48216_a,theVillager,1, @@ -5177,6 +5187,7 @@ field_48312_a,villageObj,1, field_48337_aM,targetTasks,1, field_48338_d,lastAttackingEntity,1, field_48339_c,revengeTimer,1, +field_48340_n,AIMoveSpeed,1, field_48341_o,homePosition,1, field_48342_l,attackTarget,1,The active target the Task system uses for tracking field_48343_m,senses,1, @@ -5193,7 +5204,11 @@ field_48377_b,aiTempt,1,"The tempt AI task for this mob, used to prevent taming field_48387_a,villageObj,1, field_48388_bD,fireballCharge,1,Fire Charge. When used in a dispenser it fires a fireball similiar to a Ghast's. field_48389_bC,expBottle,1,Bottle o' Enchanting. Drops between 1 and 3 experience orbs when thrown. +field_48399_d,metaLeaves,1,The metadata value of the leaves to use in tree generation. field_483_c,yCoord,1,The y coordinate of the tile entity. +field_48400_b,growVines,1,Indicator that the tree generator needs to grown vines on the trees. +field_48401_c,metaWood,1,The metadata value of the wood to use in tree generation. +field_48402_a,minTreeHeight,1,The minimum height of a generated tree. field_48404_b,woodMetadata,1,Sets the metadata for the wood blocks used field_48405_c,leavesMetadata,1,Sets the metadata for the leaves used in huge trees field_48410_f,isMovementBlockAllowed,1,should the PathFinder disregard BlockMovement type materials in its path diff --git a/forge/conf/methods.csv b/forge/conf/methods.csv index 3431da5889..e874dc5095 100644 --- a/forge/conf/methods.csv +++ b/forge/conf/methods.csv @@ -1606,10 +1606,14 @@ func_40076_a,setThrowableHeading,0,"Similar to setArrowHeading, it's point the t func_40078_a,onImpact,0,Called when this EntityThrowable hits a block or entity. func_4007_a,displayUnexpectedThrowable,0,Displays an unexpected error that has come up during the game. func_40088_g,getPotionDamage,0,Returns the damage value of the thrown potion that this EntityPotion represents. +func_40097_b,setRBGColorF,0, +func_40098_n,getRedColorF,0, func_40099_c,setParticleTextureIndex,0,Public method to set private field particleTextureIndex. func_4009_a,setRenderManager,0,Sets the RenderManager. func_400_c,fall,0,Called when the mob is falling. Calculates and applies fall damage. func_40100_q,getParticleTextureIndex,0, +func_40101_o,getGreenColorF,0, +func_40102_p,getBlueColorF,0, func_40112_aN,clearActivePotions,0, func_40113_j,setPositionAndUpdate,0,"Move the entity to the coordinates informed, but keep yaw/pitch values." func_40114_aH,getHealth,0, @@ -1698,6 +1702,7 @@ func_40349_b,isFlagSet,0,"Returns 1 if the flag is set, 0 if it is not set." func_4034_G,kill,0,sets the dead flag. Used when you fall off the bottom of the world. func_40350_a,brewBitOperations,0,"Does bit operations for brewPotionData, given data, the index of the bit being operated upon, whether the bit will be removed, whether the bit will be toggled (NOT), or whether the data field will be set to 0 if the bit is not present." func_40353_c,isFlagUnset,0,"Returns 0 if the flag is set, 1 if it is not set." +func_40355_a,parsePotionEffects,0, func_40356_a,applyIngredient,0,"Generate a data value for a potion, given its previous data value and the encoded string of new effects it will receive" func_40357_a,checkFlag,0,Is the bit given set to 1? func_4035_j_,getCollisionBorderSize,0, @@ -2111,8 +2116,10 @@ func_48094_aS,getAttackTarget,0,Gets the active target the Task system uses for func_48095_u,eatGrassBonus,0,This function applies the benefits of growing back wool and faster growing up to the acting entity. (This function is used in the AIEatGrass) func_48096_f,isWithinHomeDistance,0, func_48097_s_,updateAITick,0,"main AI tick function, replaces updateEntityActionState" +func_48098_g,setAIMoveSpeed,0,set the movespeed used for the new AI system func_48099_aV,getMaximumHomeDistance,0, func_480_a,getDistanceFrom,0,Returns the square of the distance between this entity and the passed in coordinates. +func_48101_aR,getAIMoveSpeed,0,the movespeed used for the new AI system func_48113_aa,getVillage,0, func_48122_d,setGrowingAge,0,"The age value may be negative or positive or zero. If it's negative, it get's incremented on each tick, if it's positive, it get's decremented each tick. With a negative value the Entity is considered a child." func_48123_at,getGrowingAge,0,"The age value may be negative or positive or zero. If it's negative, it get's incremented on each tick, if it's positive, it get's decremented each tick. Don't confuse this with EntityLiving.getAge. With a negative value the Entity is considered a child." @@ -2154,6 +2161,7 @@ func_48338_a,spawnHeartParticles,0, func_48339_i,giveBirth,0, func_48366_h,doRangedAttack,0,Performs a ranged attack according to the AI's rangedAttackID. func_483_c,updateDelay,0,Sets the delay before a new spawn (base delay of 200 + random number up to 600). +func_48407_a,setIsSitting,0,Sets the sitting flag. func_48411_i,getFloatTemperature,0,Gets a floating point representation of this biome's temperature func_48412_k,getBiomeFoliageColor,0,Provides the basic foliage color based on the biome temperature and rainfall func_48413_d,isHighHumidity,0,Checks to see if the rainfall level of the biome is extremely high @@ -2174,6 +2182,7 @@ func_48485_a,load,0, func_48486_a,convertToAnvilFormat,0, func_48488_a,handleEntityHeadRotation,0, func_48489_a,handleTileEntityData,0, +func_48490_a,getBiomeGenForWorldCoords,0,This method retrieves the biome at a set of coordinates func_48491_o,enqueueRelightChecks,0,"Called once-per-chunk-per-tick, and advances the round-robin relight check index per-storage-block by up to 8 blocks at a time. In a worst-case scenario, can potentially take up to 1.6 seconds, calculated via (4096/(8*16))/20, to re-check all blocks in a chunk, which could explain both lagging light updates in certain cases as well as Nether relight" func_48492_c,getAreLevelsEmpty,0,Returns whether the ExtendedBlockStorages containing levels (in blocks) from arg 1 to arg 2 are fully empty (true) or not (false). func_48493_m,getBiomeArray,0,Returns an array containing a 16x16 mapping on the X/Z of block positions in this Chunk to biome IDs. @@ -2236,13 +2245,15 @@ func_48619_a,setTerrainType,0, func_48625_a,setCanBeCreated,0,"Sets canBeCreated to the provided value, and returns this." func_48627_d,getCanBeCreated,0,Gets whether this WorldType can be used to generate a new world. func_48630_c,getGeneratorVersion,0,Returns generatorVersion. -func_48640_a,getCurrentNodeVec3d,0,returns the current PathEntity target node as Vec3D +func_48639_a,isDestinationSame,0,Returns true if the final PathPoint in the PathEntity is equal to Vec3D coords. +func_48640_a,getPosition,0,returns the current PathEntity target node as Vec3D func_48641_b,setCurrentPathLength,0, func_48642_c,setCurrentPathIndex,0, func_48643_e,getCurrentPathIndex,0, func_48644_d,getCurrentPathLength,0, func_48645_c,getFinalPathPoint,0,returns the last PathPoint of the Array func_48646_a,getVectorFromIndex,0,Gets the vector of the PathPoint associated with the given index. +func_48647_a,isSamePath,0,Returns true if the EntityPath are the same. Non instance related equals. func_48648_a,getPathPointFromIndex,0,"return the PathPoint located at the specified PathIndex, usually the current one" func_48655_c,getDistanceSquared,0,Returns the squared distance between this coordinates and the coordinates given as argument. func_48656_a,set,0, @@ -2256,6 +2267,7 @@ func_48663_c,setEnterDoors,0,Sets if the entity can enter open doors func_48664_a,setAvoidsWater,0, func_48665_b,getCanBreakDoors,0,"Returns true if the entity can break doors, false otherwise" func_48666_a,tryMoveToXYZ,0,Try to find and set a path to XYZ. Returns true if successful. +func_48667_a,tryMoveToEntityLiving,0,Try to find and set a path to EntityLiving. Returns true if successful. func_48668_i,getPathableYPos,0,Gets the safe pathing Y position for the entity depending on if it can path swim or not func_48669_e,setCanSwim,0,Sets if the entity can swim func_48670_c,getPath,0,gets the actively used PathEntity @@ -2267,6 +2279,7 @@ func_48675_a,isSafeToStandAt,0,"Returns true when an entity could stand at a pos func_48676_b,isPositionClear,0,"Returns true if an entity does not collide with any solid blocks at the position. Args: xOffset, yOffset, zOffset, entityXSize, entityYSize, entityZSize, originPosition, vecX, vecZ" func_48677_l,removeSunnyPath,0,Trims path data from the end to the first sun covered block func_48678_a,setPath,0,"sets the active path data if path is 100% unique compared to old path, checks to adjust path for sun avoiding ents and stores end coords" +func_48679_a,getPathToEntityLiving,0,Returns the path to the given EntityLiving func_48680_d,setAvoidSun,0,Sets if the path should avoid sunlight func_48690_b,setExtBlockMetadata,0,Sets the metadata of the Block at the given coordinates in this ExtendedBlockStorage to the given metadata. func_48691_a,setExtBlockID,0,"Sets the extended block ID for a location in a chunk, splitting bits 11..8 into a NibbleArray and bits 7..0 into a byte array. Also performs reference counting to determine whether or not to broadly cull this Chunk from the random-update tick list." @@ -2318,6 +2331,7 @@ func_50057_d,completePlayerName,0,Autocompletes player name func_50058_a,getSentHistory,0,"input is relative and is applied directly to the sentHistoryCursor so -1 is the previous message, 1 is the next message from the current cursor position" func_50073_a,setBlock,0,"Sets the block without metadata in the world, notifying neighbors if enabled." func_50074_q,canSilkHarvest,0,"Return true if a player with SlikTouch can harvest this block directly, and not it's normal drops." +func_50076_f,isSameSapling,0,Determines if the same sapling is present at the given location. func_50086_b,setEnableSnow,0,sets enableSnow to true during biome initialization. returns BiomeGenBase. func_50089_b,getURI,0,computes the URI from the clicked chat data object func_50098_a,nameStartsWith,0,Returns true if the current player name starts with string specified value. @@ -3429,6 +3443,7 @@ func_28147_b,writeToNBT,1,"write data to NBTTagCompound from this MapDataBase, s func_28148_a,readFromNBT,1,reads in data from the NBTTagCompound into this MapDataBase func_28149_a,setDirty,1,"Sets the dirty state of this MapDataBase, whether it needs saving to disk." func_28150_b,isDirty,1,Whether this MapDataBase needs saving to disk. +func_28155_a,updateVisiblePlayers,1,Adds the player passed to the list of visible players and checks to see which players are visible func_28166_b,readPlayerDataFromFile,1,called during player login. reads the player information from disk. func_28167_a,getPlayerManager,1,returns the player manager object for the specified dimension func_28168_f,sendPlayerToOtherDimension,1,moves provided player from overworld to nether or vice versa @@ -4130,6 +4145,7 @@ func_40549_b,isFlagSet,1,"Returns 1 if the flag is set, 0 if it is not set." func_40550_a,getPotionEffects,1,Returns a list of effects for the specified potion damage value. func_40551_a,countSetFlags,1,Returns the number of 1 bits in the given integer. func_40552_c,isFlagUnset,1,"Returns 0 if the flag is set, 1 if it is not set." +func_40554_a,parsePotionEffects,1, func_40555_a,applyIngredient,1,Returns the new potion damage value after the specified ingredient info is applied to the specified potion. func_4055_a,populate,1,Populates chunk with ores etc etc func_4056_a,replaceBlocksForBiome,1,Replaces the stone that was placed in with blocks that match the biome @@ -4392,6 +4408,7 @@ func_48134_e,getFullMetadata,1,Returns the full metadata value created by combin func_48136_c,getDoorOrientation,1,"Returns 0, 1, 2 or 3 depending on where the hinge is." func_48176_f,doRangedAttack,1,Performs a ranged attack according to the AI's rangedAttackID. func_481_a,getCollidingBoundingBoxes,1,"Returns a list of bounding boxes that collide with aabb excluding the passed in entity's collision. Args: entity, aabb" +func_48210_a,setIsSitting,1,Sets the sitting flag. func_48254_f,findPossibleShelter,1, func_48305_f,checkSufficientDoorsPresentForNewVillager,1, func_48306_i,giveBirth,1, @@ -4401,6 +4418,7 @@ func_48315_b,getStackInSlotOnClosing,1,"When some containers are closed they cal func_48317_b,setHomeArea,1, func_48318_al,getEntitySenses,1,returns the EntitySenses Object for the EntityLiving func_48319_z,eatGrassBonus,1,This function applies the benefits of growing back wool and faster growing up to the acting entity. (This function is used in the AIEatGrass) +func_48320_d,setAIMoveSpeed,1,set the movespeed used for the new AI system func_48321_b,dropRareDrop,1, func_48322_aw,detachHome,1, func_48323_au,getHomePosition,1, @@ -4412,6 +4430,7 @@ func_48328_e,isWithinHomeDistance,1, func_48329_ax,hasHome,1, func_48330_av,getMaximumHomeDistance,1, func_48331_as,getAttackTarget,1,Gets the active target the Task system uses for tracking +func_48332_ar,getAIMoveSpeed,1,the movespeed used for the new AI system func_48333_ak,getNavigator,1, func_48334_a,setRevengeTarget,1, func_48335_g,setLastAttackingEntity,1, @@ -4446,6 +4465,8 @@ func_48422_c,setCurrentPathIndex,1, func_48423_e,getCurrentPathIndex,1, func_48424_d,getCurrentPathLength,1, func_48425_c,getFinalPathPoint,1,returns the last PathPoint of the Array +func_48426_a,isDestinationSame,1,Returns true if the final PathPoint in the PathEntity is equal to Vec3D coords. +func_48427_a,isSamePath,1,Returns true if the EntityPath are the same. Non instance related equals. func_48428_a,getVectorFromIndex,1,Gets the vector of the PathPoint associated with the given index. func_48429_a,getPathPointFromIndex,1,"return the PathPoint located at the specified PathIndex, usually the current one" func_48436_b,getSpeed,1, @@ -4501,6 +4522,7 @@ func_48556_c,getAreLevelsEmpty,1,Returns whether the ExtendedBlockStorages conta func_48557_n,enqueueRelightChecks,1,"Called once-per-chunk-per-tick, and advances the round-robin relight check index by up to 8 blocks at a time. In a worst-case scenario, can potentially take up to 25.6 seconds, calculated via (4096/8)/20, to re-check all blocks in a chunk, which may explain lagging light updates on initial world generation." func_48558_a,setStorageArrays,1, func_48559_a,setBiomeArray,1,Accepts a 256-entry array that contains a 16x16 mapping on the X/Z plane of block positions in this Chunk to biome IDs. +func_48560_a,getBiomeGenForWorldCoords,1,This method retrieves the biome at a set of coordinates func_48561_g,getTopFilledSegment,1,Returns the topmost ExtendedBlockStorage instance for this Chunk that actually contains a block. func_48582_a,getIDFromString,1,Finds the ID using stringToIDMapping func_48584_a,onCrafting,1, @@ -4544,6 +4566,7 @@ func_48648_k,isInFluid,1,"Returns true if the entity is in water or lava, false func_48649_a,getAvoidsWater,1, func_48650_a,getPathToXYZ,1,Returns the path to the given coordinates func_48651_j,canNavigate,1,If on ground or swimming and can swim +func_48652_a,tryMoveToEntityLiving,1,Try to find and set a path to EntityLiving. Returns true if successful. func_48653_a,isDirectPathBetweenPoints,1,"Returns true when an entity of specified size could safely walk in a straight line between the two points. Args: pos1, pos2, entityXSize, entityYSize, entityZSize" func_48654_a,setSpeed,1,Sets the speed func_48655_c,setEnterDoors,1,Sets if the entity can enter open doors @@ -4552,6 +4575,7 @@ func_48657_b,getCanBreakDoors,1,"Returns true if the entity can break doors, fal func_48658_a,tryMoveToXYZ,1,Try to find and set a path to XYZ. Returns true if successful. func_48659_i,getPathableYPos,1,Gets the safe pathing Y position for the entity depending on if it can path swim or not func_48660_e,setCanSwim,1,Sets if the entity can swim +func_48661_a,getPathToEntityLiving,1,Returns the path to the given EntityLiving func_48662_f,clearPathEntity,1,sets active PathEntity to null func_48663_b,setBreakDoors,1, func_48664_g,pathFollow,1, diff --git a/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch b/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch index dc53a90bcb..19992db965 100644 --- a/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch +++ b/forge/patches/minecraft/net/minecraft/client/Minecraft.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/client/Minecraft.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/client/Minecraft.java 0000-00-00 00:00:00.000000000 -0000 -@@ -1949,86 +1949,54 @@ +@@ -1956,86 +1956,54 @@ */ public void usePortal(int par1) { @@ -32,24 +32,24 @@ var3 *= var7; var5 *= var7; - World var9; -- ++ World var9 = new World(theWorld, pNew); + - if (this.thePlayer.dimension == -1) -- { ++ if (this.thePlayer.isEntityAlive()) + { - this.thePlayer.setLocationAndAngles(var3, this.thePlayer.posY, var5, this.thePlayer.rotationYaw, this.thePlayer.rotationPitch); - - if (this.thePlayer.isEntityAlive()) - { - this.theWorld.updateEntityWithOptionalForce(this.thePlayer, false); - } -+ World var9 = new World(theWorld, pNew); - +- - var9 = null; - var9 = new World(this.theWorld, WorldProvider.getProviderForDimension(this.thePlayer.dimension)); - this.changeWorld(var9, "Entering the Nether", this.thePlayer); - } - else if (this.thePlayer.dimension == 0) -+ if (this.thePlayer.isEntityAlive()) - { +- { - if (this.thePlayer.isEntityAlive()) - { - this.thePlayer.setLocationAndAngles(var3, this.thePlayer.posY, var5, this.thePlayer.rotationYaw, this.thePlayer.rotationPitch); @@ -111,7 +111,7 @@ } } -@@ -2312,6 +2280,11 @@ +@@ -2320,6 +2288,11 @@ { this.usePortal(0); } @@ -123,7 +123,7 @@ ChunkCoordinates var4 = null; ChunkCoordinates var5 = null; -@@ -2575,6 +2548,7 @@ +@@ -2587,6 +2560,7 @@ var0.addData("java_version", System.getProperty("java.version")); var0.addData("opengl_version", GL11.glGetString(GL11.GL_VERSION)); var0.addData("opengl_vendor", GL11.glGetString(GL11.GL_VENDOR)); diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch index 0f7b9dae98..25faf60be7 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/BlockPistonBase.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/BlockPistonBase.java 0000-00-00 00:00:00.000000000 -0000 -@@ -373,7 +373,7 @@ +@@ -368,7 +368,7 @@ return false; } diff --git a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch index 0db2a9cd23..ca4c9ccde6 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockRail.java.patch @@ -89,7 +89,7 @@ { var8 = true; } -@@ -396,10 +409,120 @@ +@@ -391,10 +404,120 @@ } /** diff --git a/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch index ebc821e3d0..2804799a29 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockVine.java.patch @@ -13,7 +13,7 @@ { public BlockVine(int par1) { -@@ -432,14 +435,26 @@ +@@ -424,14 +427,26 @@ */ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { diff --git a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch index ac6a705e97..1b6cbdb921 100644 --- a/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Chunk.java.patch @@ -350,7 +350,7 @@ } } -@@ -1435,4 +1513,18 @@ +@@ -1438,4 +1516,18 @@ } } } diff --git a/forge/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch b/forge/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch index dd6f162aa3..719674ca36 100644 --- a/forge/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/ChunkProvider.java.patch @@ -1,15 +1,15 @@ --- ../src_base/minecraft/net/minecraft/src/ChunkProvider.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/ChunkProvider.java 0000-00-00 00:00:00.000000000 -0000 -@@ -6,6 +6,8 @@ - import java.util.List; - import java.util.Set; +@@ -8,6 +8,8 @@ + + import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.src.forge.ForgeHooks; + public class ChunkProvider implements IChunkProvider { /** A set of dropped chunks. Currently not used in single player. */ -@@ -51,6 +53,11 @@ +@@ -53,6 +55,11 @@ */ public void dropChunk(int par1, int par2) { diff --git a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch index 89bcda5c87..6da245bf98 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityLiving.java.patch @@ -9,7 +9,7 @@ /** Number of ticks since this EntityLiving last produced its sound */ private int livingSoundTime; -@@ -1333,7 +1333,7 @@ +@@ -1339,7 +1339,7 @@ int var2 = MathHelper.floor_double(this.boundingBox.minY); int var3 = MathHelper.floor_double(this.posZ); int var4 = this.worldObj.getBlockId(var1, var2, var3); diff --git a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch index feaeaf09c4..f961e3aab2 100644 --- a/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/EntityPlayer.java.patch @@ -135,7 +135,7 @@ float var10 = 0.5F; float var7 = 0.5F; -@@ -1329,11 +1379,12 @@ +@@ -1323,11 +1373,12 @@ this.resetHeight(); ChunkCoordinates var4 = this.playerLocation; ChunkCoordinates var5 = this.playerLocation; @@ -151,7 +151,7 @@ if (var5 == null) { -@@ -1370,7 +1421,9 @@ +@@ -1364,7 +1415,9 @@ */ private boolean isInBed() { @@ -162,7 +162,7 @@ } /** -@@ -1385,13 +1438,15 @@ +@@ -1379,13 +1432,15 @@ var2.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); var2.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); @@ -180,7 +180,7 @@ return var3; } } -@@ -1403,8 +1458,11 @@ +@@ -1397,8 +1452,11 @@ { if (this.playerLocation != null) { @@ -194,7 +194,7 @@ switch (var2) { -@@ -1697,6 +1755,7 @@ +@@ -1688,6 +1746,7 @@ return 101; } } @@ -202,7 +202,7 @@ } return var3; -@@ -1869,4 +1928,30 @@ +@@ -1860,4 +1919,30 @@ } public void func_50009_aI() {} diff --git a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch index 2fe3c05b41..00d63342bc 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderBlocks.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/RenderBlocks.java 0000-00-00 00:00:00.000000000 -0000 -@@ -424,9 +424,8 @@ +@@ -456,9 +456,8 @@ public boolean renderBlockBed(Block par1Block, int par2, int par3, int par4) { Tessellator var5 = Tessellator.instance; @@ -12,61 +12,61 @@ float var9 = 0.5F; float var10 = 1.0F; float var11 = 0.8F; -@@ -1375,7 +1374,7 @@ - double var28; +@@ -1386,7 +1385,7 @@ double var30; + double var32; - if (!this.blockAccess.isBlockNormalCube(par2, par3 - 1, par4) && !Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 - 1, par4)) + if (!this.blockAccess.isBlockNormalCube(par2, par3 - 1, par4) && !Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 - 1, par4, 1)) { float var36 = 0.2F; - float var33 = 0.0625F; -@@ -1395,7 +1394,7 @@ - var9 = var18; + float var19 = 0.0625F; +@@ -1406,7 +1405,7 @@ + var9 = var20; } - if (Block.fire.canBlockCatchFire(this.blockAccess, par2 - 1, par3, par4)) + if (Block.fire.canBlockCatchFire(this.blockAccess, par2 - 1, par3, par4, 5)) { - var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var33), (double)(par4 + 1), var11, var13); - var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var33), (double)(par4 + 1), var11, var15); -@@ -1407,7 +1406,7 @@ - var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var33), (double)(par4 + 1), var11, var13); + var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var19), (double)(par4 + 1), var11, var13); + var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 1), var11, var15); +@@ -1418,7 +1417,7 @@ + var5.addVertexWithUV((double)((float)par2 + var36), (double)((float)par3 + var17 + var19), (double)(par4 + 1), var11, var13); } - if (Block.fire.canBlockCatchFire(this.blockAccess, par2 + 1, par3, par4)) + if (Block.fire.canBlockCatchFire(this.blockAccess, par2 + 1, par3, par4, 4)) { - var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var33), (double)(par4 + 0), var9, var13); - var5.addVertexWithUV((double)(par2 + 1 - 0), (double)((float)(par3 + 0) + var33), (double)(par4 + 0), var9, var15); -@@ -1419,7 +1418,7 @@ - var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var33), (double)(par4 + 0), var9, var13); + var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var19), (double)(par4 + 0), var9, var13); + var5.addVertexWithUV((double)(par2 + 1 - 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 0), var9, var15); +@@ -1430,7 +1429,7 @@ + var5.addVertexWithUV((double)((float)(par2 + 1) - var36), (double)((float)par3 + var17 + var19), (double)(par4 + 0), var9, var13); } - if (Block.fire.canBlockCatchFire(this.blockAccess, par2, par3, par4 - 1)) + if (Block.fire.canBlockCatchFire(this.blockAccess, par2, par3, par4 - 1, 3)) { - var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var33), (double)((float)par4 + var36), var11, var13); - var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var33), (double)(par4 + 0), var11, var15); -@@ -1431,7 +1430,7 @@ - var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var33), (double)((float)par4 + var36), var11, var13); + var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var19), (double)((float)par4 + var36), var11, var13); + var5.addVertexWithUV((double)(par2 + 0), (double)((float)(par3 + 0) + var19), (double)(par4 + 0), var11, var15); +@@ -1442,7 +1441,7 @@ + var5.addVertexWithUV((double)(par2 + 0), (double)((float)par3 + var17 + var19), (double)((float)par4 + var36), var11, var13); } - if (Block.fire.canBlockCatchFire(this.blockAccess, par2, par3, par4 + 1)) + if (Block.fire.canBlockCatchFire(this.blockAccess, par2, par3, par4 + 1, 2)) { - var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var33), (double)((float)(par4 + 1) - var36), var9, var13); - var5.addVertexWithUV((double)(par2 + 1), (double)((float)(par3 + 0) + var33), (double)(par4 + 1 - 0), var9, var15); -@@ -1443,7 +1442,7 @@ - var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var33), (double)((float)(par4 + 1) - var36), var9, var13); + var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var19), (double)((float)(par4 + 1) - var36), var9, var13); + var5.addVertexWithUV((double)(par2 + 1), (double)((float)(par3 + 0) + var19), (double)(par4 + 1 - 0), var9, var15); +@@ -1454,7 +1453,7 @@ + var5.addVertexWithUV((double)(par2 + 1), (double)((float)par3 + var17 + var19), (double)((float)(par4 + 1) - var36), var9, var13); } - if (Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 + 1, par4)) + if (Block.fire.canBlockCatchFire(this.blockAccess, par2, par3 + 1, par4, 0)) { - var18 = (double)par2 + 0.5D + 0.5D; - var20 = (double)par2 + 0.5D - 0.5D; -@@ -3601,7 +3600,7 @@ + var20 = (double)par2 + 0.5D + 0.5D; + var22 = (double)par2 + 0.5D - 0.5D; +@@ -3610,7 +3609,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2); this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, var27); @@ -75,7 +75,7 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -3724,7 +3723,7 @@ +@@ -3733,7 +3732,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3); this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3)); @@ -84,7 +84,7 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -3847,7 +3846,7 @@ +@@ -3856,7 +3855,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4); this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, var27); @@ -93,7 +93,7 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -3970,7 +3969,7 @@ +@@ -3979,7 +3978,7 @@ var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5); this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, var27); @@ -102,39 +102,39 @@ { this.colorRedTopLeft *= par5; this.colorRedBottomLeft *= par5; -@@ -4082,7 +4081,7 @@ - var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2); - this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, var27); +@@ -4091,7 +4090,7 @@ + var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 2); + this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, var28); -- if (cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) -+ if (Tessellator.instance.defaultTexture && cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) +- if (cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) ++ if (Tessellator.instance.defaultTexture && cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) { var8.setColorOpaque_F(var18 * par5, var21 * par6, var24 * par7); this.renderEastFace(par1Block, (double)par2, (double)par3, (double)par4, 38); -@@ -4098,7 +4097,7 @@ - var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3); - this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, var27); +@@ -4107,7 +4106,7 @@ + var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 3); + this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, var28); -- if (cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) -+ if (Tessellator.instance.defaultTexture && cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) +- if (cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) ++ if (Tessellator.instance.defaultTexture && cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) { var8.setColorOpaque_F(var18 * par5, var21 * par6, var24 * par7); this.renderWestFace(par1Block, (double)par2, (double)par3, (double)par4, 38); -@@ -4114,7 +4113,7 @@ - var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4); - this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, var27); +@@ -4123,7 +4122,7 @@ + var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 4); + this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, var28); -- if (cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) -+ if (Tessellator.instance.defaultTexture && cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) +- if (cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) ++ if (Tessellator.instance.defaultTexture && cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) { var8.setColorOpaque_F(var19 * par5, var22 * par6, var25 * par7); this.renderNorthFace(par1Block, (double)par2, (double)par3, (double)par4, 38); -@@ -4130,7 +4129,7 @@ - var27 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5); - this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, var27); +@@ -4139,7 +4138,7 @@ + var28 = par1Block.getBlockTexture(this.blockAccess, par2, par3, par4, 5); + this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, var28); -- if (cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) -+ if (Tessellator.instance.defaultTexture && cfgGrassFix && var27 == 3 && this.overrideBlockTexture < 0) +- if (cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) ++ if (Tessellator.instance.defaultTexture && cfgGrassFix && var28 == 3 && this.overrideBlockTexture < 0) { var8.setColorOpaque_F(var19 * par5, var22 * par6, var25 * par7); this.renderSouthFace(par1Block, (double)par2, (double)par3, (double)par4, 38); diff --git a/forge/patches/minecraft/net/minecraft/src/RenderManager.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderManager.java.patch index b3ad76d9cd..8d58215ccf 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderManager.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderManager.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft/net/minecraft/src/RenderManager.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/RenderManager.java 0000-00-00 00:00:00.000000000 -0000 -@@ -125,12 +125,14 @@ +@@ -124,12 +124,14 @@ if (par4EntityLiving.isPlayerSleeping()) { diff --git a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch index 6babaf3161..c68d772417 100644 --- a/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/RenderPlayer.java.patch @@ -1,7 +1,8 @@ --- ../src_base/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/RenderPlayer.java 0000-00-00 00:00:00.000000000 -0000 -@@ -1,7 +1,12 @@ - package net.minecraft.src; +@@ -4,8 +4,13 @@ + import java.util.Arrays; + import java.util.List; +import static net.minecraft.src.forge.IItemRenderer.ItemRenderType.EQUIPPED; +import static net.minecraft.src.forge.IItemRenderer.ItemRendererHelper.BLOCK_3D; @@ -13,7 +14,7 @@ public class RenderPlayer extends RenderLiving { -@@ -32,7 +37,14 @@ +@@ -36,7 +41,14 @@ if (var5 instanceof ItemArmor) { ItemArmor var6 = (ItemArmor)var5; @@ -29,7 +30,7 @@ ModelBiped var7 = par2 == 2 ? this.modelArmor : this.modelArmorChestplate; var7.bipedHead.showModel = par2 == 0; var7.bipedHeadwear.showModel = par2 == 0; -@@ -164,7 +176,10 @@ +@@ -168,7 +180,10 @@ GL11.glPushMatrix(); this.modelBipedMain.bipedHead.postRender(0.0625F); @@ -41,7 +42,7 @@ { float var4 = 0.625F; GL11.glTranslatef(0.0F, -0.25F, 0.0F); -@@ -265,8 +280,11 @@ +@@ -269,8 +284,11 @@ { var20 = var21.getItemUseAction(); } @@ -55,7 +56,7 @@ { var6 = 0.5F; GL11.glTranslatef(0.0F, 0.1875F, -0.3125F); -@@ -319,7 +337,7 @@ +@@ -323,7 +341,7 @@ if (var21.getItem().func_46058_c()) { diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch index 2fb6450f33..b403a1b259 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -1,8 +1,8 @@ --- ../src_base/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -@@ -219,4 +219,24 @@ - addMapping(TileEntityEnchantmentTable.class, "EnchantTable"); - addMapping(TileEntityEndPortal.class, "Airportal"); +@@ -223,4 +223,24 @@ + public static void addNewTileEntityMapping(Class tileEntityClass, String id) { + addMapping(tileEntityClass, id); } + + /** diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch index 56bbb28ea4..2b00a8d606 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -1,7 +1,8 @@ --- ../src_base/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 -@@ -1,6 +1,9 @@ - package net.minecraft.src; +@@ -3,7 +3,10 @@ + import cpw.mods.fml.client.FMLClientHandler; + import cpw.mods.fml.common.FMLCommonHandler; -public class TileEntityFurnace extends TileEntity implements IInventory +import net.minecraft.src.forge.ForgeHooks; @@ -11,7 +12,7 @@ { /** * The ItemStacks that hold the items currently being used in the furnace -@@ -279,8 +282,12 @@ +@@ -275,8 +278,12 @@ } else { @@ -26,7 +27,7 @@ } } -@@ -291,13 +298,13 @@ +@@ -287,13 +294,13 @@ { if (this.canSmelt()) { @@ -40,25 +41,21 @@ - else if (this.furnaceItemStacks[2].itemID == var1.itemID) + else if (this.furnaceItemStacks[2].isItemEqual(var1)) { - this.furnaceItemStacks[2].stackSize += var1.stackSize; + ++this.furnaceItemStacks[2].stackSize; } -@@ -331,7 +338,14 @@ - else - { - int var1 = par1ItemStack.getItem().shiftedIndex; -- return var1 < 256 && Block.blocksList[var1].blockMaterial == Material.wood ? 300 : (var1 == Item.stick.shiftedIndex ? 100 : (var1 == Item.coal.shiftedIndex ? 1600 : (var1 == Item.bucketLava.shiftedIndex ? 20000 : (var1 == Block.sapling.blockID ? 100 : (var1 == Item.blazeRod.shiftedIndex ? 2400 : ModLoader.addAllFuel(par1ItemStack.itemID, par1ItemStack.getItemDamage())))))); -+ if (var1 < 256 && Block.blocksList[var1].blockMaterial == Material.wood) return 300; -+ if (var1 == Item.stick.shiftedIndex) return 100; -+ if (var1 == Item.coal.shiftedIndex) return 1600; -+ if (var1 == Item.bucketLava.shiftedIndex) return 20000; -+ if (var1 == Block.sapling.blockID) return 100; -+ if (var1 == Item.blazeRod.shiftedIndex) return 2400; +@@ -326,6 +333,11 @@ + if (var1 == Item.bucketLava.shiftedIndex) return 20000; + if (var1 == Block.sapling.blockID) return 100; + if (var1 == Item.blazeRod.shiftedIndex) return 2400; + int ret = ForgeHooks.getItemBurnTime(par1ItemStack); -+ return (ret > 0 ? ret : ModLoader.addAllFuel(par1ItemStack.itemID, par1ItemStack.getItemDamage())); ++ if (ret > 0) ++ { ++ return ret; ++ } + return FMLCommonHandler.instance().fuelLookup(var1, par1ItemStack.getItemDamageForDisplay()); } } - -@@ -354,4 +368,18 @@ +@@ -349,4 +361,18 @@ public void openChest() {} public void closeChest() {} diff --git a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch index ed753c0b32..8fa3738a05 100644 --- a/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -90,10 +90,7 @@ AnvilSaveHandler var9 = new AnvilSaveHandler(new File("."), par2Str, true); - - for (int var10 = 0; var10 < this.worldMngr.length; ++var10) -+ -+ WorldServer overWorld = new WorldServer(this, var9, par2Str, 0, var8); -+ for (Integer id : DimensionManager.getIDs()) - { +- { - byte var11 = 0; - - if (var10 == 1) @@ -120,6 +117,10 @@ - this.worldMngr[var10].setAllowedSpawnTypes(this.propertyManagerObj.getBooleanProperty("spawn-monsters", true), this.spawnPeacefulMobs); - this.worldMngr[var10].getWorldInfo().setGameType(var6); - this.configManager.setPlayerManager(this.worldMngr); ++ ++ WorldServer overWorld = new WorldServer(this, var9, par2Str, 0, var8); ++ for (Integer id : DimensionManager.getIDs()) ++ { + WorldServer world = (id == 0 ? overWorld : new WorldServerMulti(this, var9, par2Str, id, var8, overWorld)); + world.addWorldAccess(new WorldManager(this, world)); + world.difficultySetting = propertyManagerObj.getIntProperty("difficulty", 1); @@ -171,7 +172,7 @@ } } } -@@ -439,7 +432,7 @@ +@@ -440,7 +433,7 @@ var3 += var7; var1 = var5; @@ -216,7 +217,7 @@ } for (var9 = 0; var9 < this.playersOnline.size(); ++var9) -@@ -691,7 +684,8 @@ +@@ -689,7 +682,8 @@ */ public WorldServer getWorldManager(int par1) { @@ -226,7 +227,7 @@ } /** -@@ -699,7 +693,7 @@ +@@ -697,7 +691,7 @@ */ public EntityTracker getEntityTracker(int par1) { @@ -235,7 +236,7 @@ } /** -@@ -869,7 +863,7 @@ +@@ -867,7 +861,7 @@ */ public String getServerBrand() { diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch index ad01bf7b23..80dda47954 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockPistonBase.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/BlockPistonBase.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/BlockPistonBase.java 0000-00-00 00:00:00.000000000 -0000 -@@ -363,7 +363,7 @@ +@@ -358,7 +358,7 @@ return false; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch index c9941f72cb..b615ca8b7d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockRail.java.patch @@ -88,7 +88,7 @@ { var8 = true; } -@@ -396,10 +409,120 @@ +@@ -391,10 +404,120 @@ } /** diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch index 97aa993d4a..e12d0d5c20 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockVine.java.patch @@ -13,7 +13,7 @@ { public BlockVine(int par1) { -@@ -410,14 +413,26 @@ +@@ -402,14 +405,26 @@ */ public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { diff --git a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch index ca6ff7e6fa..95722581e9 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Chunk.java.patch @@ -300,7 +300,7 @@ if (var4 < 0) { -@@ -1287,4 +1339,18 @@ +@@ -1290,4 +1342,18 @@ } } } diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch index 64544f0049..fa600e457e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityLiving.java.patch @@ -9,7 +9,7 @@ /** Number of ticks since this EntityLiving last produced its sound */ private int livingSoundTime; -@@ -1301,7 +1301,7 @@ +@@ -1307,7 +1307,7 @@ int var2 = MathHelper.floor_double(this.boundingBox.minY); int var3 = MathHelper.floor_double(this.posZ); int var4 = this.worldObj.getBlockId(var1, var2, var3); diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch index 2764a4b51b..87df56871d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayer.java.patch @@ -148,7 +148,7 @@ float var10 = 0.5F; float var7 = 0.5F; -@@ -1256,11 +1317,12 @@ +@@ -1250,11 +1311,12 @@ this.resetHeight(); ChunkCoordinates var4 = this.playerLocation; ChunkCoordinates var5 = this.playerLocation; @@ -164,7 +164,7 @@ if (var5 == null) { -@@ -1297,7 +1359,9 @@ +@@ -1291,7 +1353,9 @@ */ private boolean isInBed() { @@ -175,7 +175,7 @@ } /** -@@ -1312,13 +1376,15 @@ +@@ -1306,13 +1370,15 @@ var2.loadChunk(par1ChunkCoordinates.posX - 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); var2.loadChunk(par1ChunkCoordinates.posX + 3 >> 4, par1ChunkCoordinates.posZ + 3 >> 4); @@ -193,7 +193,7 @@ return var3; } } -@@ -1725,4 +1791,45 @@ +@@ -1719,4 +1785,45 @@ } public void func_50022_L() {} diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch index 98aa3b9eee..ee0e151f5d 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -2,7 +2,7 @@ +++ ../src_work/minecraft_server/net/minecraft/src/TileEntityFurnace.java 0000-00-00 00:00:00.000000000 -0000 @@ -2,7 +2,10 @@ - import cpw.mods.fml.server.FMLServerHandler; + import cpw.mods.fml.common.FMLCommonHandler; -public class TileEntityFurnace extends TileEntity implements IInventory +import net.minecraft.src.forge.ForgeHooks; @@ -43,23 +43,19 @@ { ++this.furnaceItemStacks[2].stackSize; } -@@ -296,7 +303,14 @@ - else - { - int var1 = par1ItemStack.getItem().shiftedIndex; -- return var1 < 256 && Block.blocksList[var1].blockMaterial == Material.wood ? 300 : (var1 == Item.stick.shiftedIndex ? 100 : (var1 == Item.coal.shiftedIndex ? 1600 : (var1 == Item.bucketLava.shiftedIndex ? 20000 : (var1 == Block.sapling.blockID ? 100 : (var1 == Item.blazeRod.shiftedIndex ? 2400 : FMLServerHandler.instance().fuelLookup(var1, par1ItemStack.getItemDamage())))))); -+ if (var1 < 256 && Block.blocksList[var1].blockMaterial == Material.wood) return 300; -+ if (var1 == Item.stick.shiftedIndex) return 100; -+ if (var1 == Item.coal.shiftedIndex) return 1600; -+ if (var1 == Item.bucketLava.shiftedIndex) return 20000; -+ if (var1 == Block.sapling.blockID) return 100; -+ if (var1 == Item.blazeRod.shiftedIndex) return 2400; +@@ -302,6 +309,11 @@ + if (var1 == Item.bucketLava.shiftedIndex) return 20000; + if (var1 == Block.sapling.blockID) return 100; + if (var1 == Item.blazeRod.shiftedIndex) return 2400; + int ret = ForgeHooks.getItemBurnTime(par1ItemStack); -+ return (ret > 0 ? ret : FMLServerHandler.instance().fuelLookup(var1, par1ItemStack.getItemDamage())); ++ if (ret > 0) ++ { ++ return ret; ++ } + return FMLCommonHandler.instance().fuelLookup(var1, par1ItemStack.getItemDamage()); } } - -@@ -319,4 +333,18 @@ +@@ -325,4 +337,18 @@ public void openChest() {} public void closeChest() {}