diff --git a/forge/conf/fields.csv b/forge/conf/fields.csv index 0287d27f40..7265997ae3 100644 --- a/forge/conf/fields.csv +++ b/forge/conf/fields.csv @@ -592,7 +592,7 @@ field_1792_b,zoom,0, field_1793_a,currentRender,0, field_185_a,fullscreen,0, field_186_a,mainFrame,0,"Reference to the main frame, in this case, the applet window itself." -field_188_b,chunkZPosition,0,The Z position of this Chunk Coordinate Pair +field_188_b,chunkZPos,0,The Z position of this Chunk Coordinate Pair field_189_a,chunkXPos,0,The X position of this Chunk Coordinate Pair field_191_a,renderManager,0, field_194_c,shadowOpaque,0,Determines the darkness of the object's shadow. Higher value makes a darker shadow. @@ -1346,7 +1346,10 @@ field_28160_d,fontRenderer,0, field_28161_c,gameSettings,0, field_28167_b,dirty,0,Whether this MapDataBase needs saving to disk. field_28168_a,mapName,0,The name of the map data nbt +field_28172_j,playersHashMap,0,Holds a reference to the players who own a copy of the map and a reference to their MapInfo field_28173_i,playersVisibleOnMap,0, +field_28174_h,playersArrayList,0,Holds a reference to the MapInfo of the players who own a copy of the map +field_28175_g,randomEffect,0,"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_28176_f,colors,0,colours field_28177_e,scale,0, field_28178_d,dimension,0, @@ -2496,6 +2499,7 @@ field_432_aP,oreRedstoneGlowing,0, field_433_aO,oreRedstone,0, field_435_aM,doorSteel,0, field_44004_b,sheepTimer,0,Used to control movement as well as wool regrowth. Set to 40 on handleHealthUpdate and counts down with each tick. +field_44006_d,theGameSettings,0,For saving the user's language selection to disk. field_44007_b,updateTimer,0,"Timer used to update texture packs, decreases every tick and is reset to 20 and updates texture packs upon reaching 0." field_44008_c,languageList,0,This GUI's language list. field_44009_a,parentGui,0,This GUI's parent GUI. @@ -2854,11 +2858,20 @@ field_50016_f,sentMessageList,0,A list with all the sent chat messages in it. field_50017_n,historyOffset,0, field_50043_m,isEnabled,0,"If this value is true along isFocused, keyTyped will process the keys." field_50044_j,enableBackgroundDrawing,0, +field_50045_k,canLoseFocus,0,if true the textbox can lose focus by clicking elsewhere on the screen +field_50046_r,disabledColor,0, +field_50047_q,enabledColor,0, +field_50063_c,sentHistoryCursor,0,"keeps position of which chat message you will select when you press up, (does not increase for duplicated messages sent immediately after each other)" field_50064_a,inputField,0,Chat entry field +field_50065_j,clickedURI,0,used to pass around the URI to various dialogues and to the host os +field_50066_k,defaultInputFieldText,0,is the text that appears when you press the chat key and the input box appears pre-filled field_50069_d,isCreativeMode,0,"Used to determine if creative mode is enabled, and therefore if items should be depleted on usage" field_50070_b,isFlying,0,Indicates whether the player is flying or not. field_50071_c,allowFlying,0,Whether or not to allow the player to fly when they double jump. field_50072_a,disableDamage,0,Disables player damage. +field_50095_b,fontR,0, +field_50096_c,line,0, +field_50097_a,pattern,0, field_50099_c,nameinLowerCase,0,Player name in lowercase. field_500_a,entityId,0,Entity ID of the object. field_50115_n,red,0,Used to specify new red value for the current color. @@ -2886,6 +2899,8 @@ field_518_b,username,0,The name of the user attempting to login. field_519_a,protocolVersion,0,The protocol version in use. Current version is 2. field_52007_b,height,0,Button height in pixels field_52008_a,width,0,Button width in pixels +field_52009_d,lastServerName,0,Remembers the last hostname or IP address entered into text field between invocations of the GUI. +field_52010_b,maxChatLength,0,Maximum number of characters allowed in chat string in each packet. field_52015_r,colorCodeRegex,0,Compiled regular expression pattern for matching color codes in a string field_52024_b,serverUrl,0,URL of the server to send the report to field_52025_a,dataMap,0,String map for report data @@ -5302,6 +5317,7 @@ field_514_m,sand,1, field_515_l,fire,1, field_517_j,sponge,1, field_518_i,plants,1, +field_52004_b,maxChatLength,1,Maximum number of characters allowed in chat string in each packet. field_520_g,lava,1, field_521_f,water,1, field_522_e,iron,1, diff --git a/forge/conf/methods.csv b/forge/conf/methods.csv index e47b33cfca..3431da5889 100644 --- a/forge/conf/methods.csv +++ b/forge/conf/methods.csv @@ -364,7 +364,7 @@ func_21014_i,hasContainerItem,0,True if this Item has a container item (a.k.a. c func_21015_a,setHasSubtypes,0, func_21016_h,getContainerItem,0, func_21017_a,setContainerItem,0, -func_21024_a,powerBlock,0, +func_21024_a,receiveClientEvent,0,"Called when the block receives a client event - see World.sendClientEvent. By default, passes it on to the tile entity at this location. Args: world, x, y, z, event number, parameter" func_21025_b,damageDropped,0,Determines the damage on the item the block drops. Used in cloth and wood. func_21027_c_,fertilize,0,Apply bonemeal to the crops. func_21028_c,growTree,0,Attempts to grow a sapling into a tree @@ -410,7 +410,7 @@ func_21110_c,setCurrentChunkOver,0,"This is the chunk that the player is current func_21111_d,canChunkExist,0,"Checks if the chunk coordinate could actually be stored within the chunk cache. Args: chunkX, chunkZ" func_21114_a,setAllowedSpawnTypes,0,Set which types of mobs are allowed to spawn (peaceful vs hostile). func_21115_j,markBlockAsNeedsUpdate,0,calls the 'MarkBlockAsNeedsUpdate' in all block accesses in this world -func_21116_c,playNoteAt,0,"plays a given note at x, y, z. args: x, y, z, instrument, note" +func_21116_c,sendClientEvent,0,"Calls receiveClientEvent of the tile entity at the given location on the server and all nearby clients with the given event number and parameter. Args: X, Y, Z, event number, parameter" func_21117_a,doChunksNearChunkExist,0,Checks if any of the chunks within distance (argument 4) blocks of the given block exist func_21118_q,getChunkProvider,0,gets the IChunkProvider this world uses. func_21119_g,getProviderName,0,"Returns the name of the current chunk provider, by calling chunkprovider.makeString()" @@ -1002,6 +1002,8 @@ func_28163_a,readFromNBT,0,reads in data from the NBTTagCompound into this MapDa func_28164_a,markDirty,0,"Marks this MapDataBase dirty, to be saved to disk when the level next saves." func_28165_a,setDirty,0,"Sets the dirty state of this MapDataBase, whether it needs saving to disk." func_28166_b,isDirty,0,Whether this MapDataBase needs saving to disk. +func_28169_a,updateVisiblePlayers,0,Adds the player passed to the list of visible players and checks to see which players are visible +func_28171_a,updateMPMapData,0,Updates the client's map with information from other players in MP func_28181_a,setGrassBiomeColorizer,0, func_28182_a,setWaterBiomeColorizer,0, func_28184_a,setData,0,"Assigns the given String id to the given MapDataBase, removing any existing ones of the same id." @@ -1194,7 +1196,7 @@ func_35120_i,getTextureByXP,0,Returns a number from 1 to 10 based on how much XP func_35121_b,getXPSplit,0,Get xp split rate (Is called until the xp drop code in EntityLiving.onEntityUpdate is complete) func_35141_y_,closeChest,0, func_35142_x_,openChest,0, -func_35143_b,onTileEntityPowered,0, +func_35143_b,receiveClientEvent,0,"Called when a client event is received with the event number and argument, see World.sendClientEvent" func_35144_b,updateContainingBlockInfo,0,"Causes the TileEntity to reset all it's cached values for it's container block, blockID, metaData and in the case of chests, the adjcacent chest check" func_35147_g,checkForAdjacentChests,0,Performs the check for adjacent chests to determine if this chest is double or not. func_35157_d,hasItem,0,Get if a specifiied item id is inside the inventory. @@ -1634,6 +1636,8 @@ func_40143_a,isWheat,0,Checks if the parameter is an wheat item. func_40144_b,procreate,0,Creates a baby animal according to the animal type of the target at the actual position and spawns 'love' particles. func_40145_a,spawnBabyAnimal,0,This function is used when two same-species animals in 'love mode' breed to generate the new baby animal. func_40147_Y,isValidLightLevel,0,Checks to make sure the light is not too bright where the mob is spawning +func_40148_a,setBesideClimbableBlock,0,"Updates the WatchableObject (Byte) created in entityInit(), setting it to 0x01 if par1 is true or 0x00 if it is false." +func_40149_l_,isBesideClimbableBlock,0,Returns true if the WatchableObject (Byte) is 0x01 otherwise returns false. The WatchableObject is updated using setBesideClimableBlock. func_40155_e,superAttackFrom,0,"Returns a super of attackEntityFrom in EntityDragonBase, because the normal attackEntityFrom is overriden" func_40156_a,attackEntityFromPart,0, func_40158_a,destroyBlocksInAABB,0,Destroys all blocks that aren't associated with 'The End' inside the given bounding box. @@ -1999,6 +2003,7 @@ func_437_a,attackEntity,0,Basic mob attack. Default to touch of death in EntityC func_438_i,findPlayerToAttack,0,"Finds the closest player within 16 blocks to attack, or null if this Entity isn't interested in attacking (Animals, Spiders at day, peaceful PigZombies)." func_439_a,getBlockPathWeight,0,"Takes a coordinate in and returns a weight to determine how likely this creature will try to path to the block. Args: x, y, z" func_44001_ad,isClientWorld,0,Returns whether the entity is in a local (client) world +func_44005_a,Returns,0,the private theGameSettings field. func_44020_i,getName,0, func_44021_d,loadLanguageList,0, func_44022_b,getLanguageList,0, @@ -2034,6 +2039,7 @@ func_46011_aM,getAge,0, func_46014_aS,updateAITasks,0, func_46024_b,setDamage,0, func_46025_l,getDamage,0, +func_46028_b,getDoneButton,0,Returns the private doneButton field. func_46034_a,onUpdateMoveHelper,0, func_46051_a,generate,0, func_46059_i,doesContainerItemLeaveCraftingGrid,0,"If this returns true, after a recipe involving this item is crafted the container item will be added to the player's inventory instead of remaining in the crafting grid." @@ -2125,6 +2131,7 @@ func_48141_af,isSitting,0, func_48143_a,setOwner,0, func_48144_ah,getOwner,0, func_48145_ag,getOwnerName,0, +func_48147_c,setTameSkin,0, func_48151_a,dropPlayerItemWithRandomChoice,0,"Args: itemstack, flag" func_48152_as,dropOneItem,0,Called when player presses the drop item key func_48153_a,dropPlayerItem,0,Args: itemstack - called when player drops an item stack that's not in his inventory (like items still placed in a workbench while the workbench'es GUI gets closed) @@ -2292,20 +2299,27 @@ func_494_a,getCurrentItem,0,Returns the item stack currently held by the player. func_496_a,setCurrentItem,0,Sets a specific itemID as the current item being held (only if it exists on the hotbar) func_498_a,changeCurrentItem,0,Switch the current item to the next one or the previous one func_499_j,getFirstEmptyStack,0,Returns the first item stack that is empty. +func_50006_a,setEditable,0,Sets the sign's isEditable flag to the specified parameter. func_50007_a,isEditable,0, func_50011_a,adjustHistoryOffset,0,increment/decrement history scroll offset +func_50012_a,getChatClickDataFromMouse,0,"gets the click data from mouse position args:( mouse x, mouse y)" func_50013_c,getSentMessageList,0,Returns the list with the sent chat messages in it. func_50015_e,isChatOpen,0,Return true if chat gui is open func_50022_i,getEnableBackgroundDrawing,0,get enable drawing background and outline func_50025_j,getIsFocused,0,getter for the focused field +func_50026_c,setCanLoseFocus,0,if true the textbox can lose focus by clicking elsewhere on the screen func_50027_a,setEnableBackgroundDrawing,0,enable drawing background and outline func_50033_b,setFocused,0,setter for the focused field func_50037_a,textboxKeyTyped,0,Call this method from you GuiScreen to process the keys into textbox. +func_50049_m,isShiftKeyDown,0, func_50050_a,setClipboardString,0,store a string in the system clipboard +func_50051_l,isCtrlKeyDown,0, 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_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. func_50100_a,handlePlayerAbilities,0,Handle a player abilities packet. func_50101_a,renderString,0, @@ -2339,11 +2353,13 @@ func_518_b,generateLeaves,0,Generates the leaf portion of the tree as specified func_519_e,validTreeLocation,0,"Returns a boolean indicating whether or not the current location for the tree, spanning basePos to to the height limit, is valid." func_52003_C,getVersion,0,Returns the client version string func_52004_D,createAndSendReport,0,Creates and sends anonymous system information to Mojang's stats server +func_52005_b,isItemFuel,0,Return true if item is a fuel source (getItemBurnTime() > 0). func_52013_a,updatePlayerMoveState,0, func_52014_d,stripColorCodes,0,Remove all embedded color codes from a string func_52016_a,buildPostString,0,Builds an encoded HTTP POST content string from a string map func_52017_a,sendPost,0,Sends a HTTP POST request to the given URL with data from a string func_52018_a,sendPost,0,Sends a HTTP POST request to the given URL with data from a map +func_52019_a,filerAllowedCharacters,0,Filter string by only keeping those characters for which isAllowedCharacter() returns true. func_52020_b,getDataMap,0,Returns the data map for the given usage snooper func_52021_a,sendReport,0,Starts a new thread to send the information to the report server func_52022_a,addData,0,Adds information to the report @@ -2936,7 +2952,7 @@ func_20055_a,updateCraftingInventorySlot,1,inform the player of a change in a si func_20056_a,updateCraftingInventoryInfo,1,send information about the crafting inventory to the client(currently only for furnace times) func_20058_J,updateHeldItem,1,"updates item held by mouse, This method always returns before doing anything..." func_20059_K,closeCraftingGui,1,close the current crafting gui -func_20060_R,getNextWidowId,1,get the next window id to use +func_20060_R,getNextWindowId,1,get the next window id to use func_20063_a,getTileEntityInfo,1,gets description packets from all TileEntity's that override func_20070 func_20067_a_,isUseableByPlayer,1,Do not make give this method the name canInteractWith because it clashes with Container func_20068_b,getInvName,1,Returns the name of the inventory. @@ -2993,7 +3009,7 @@ func_21001_a,handleEntityAction,1,runs registerPacket on the given Packet19Entit func_21002_a,handleEntityMetadata,1,Packet handler func_21003_a,handleEntityPainting,1,Packet handler func_21004_a,handlePlayNoteBlock,1, -func_21024_a,powerBlock,1, +func_21024_a,receiveClientEvent,1,"Called when the block receives a client event - see World.sendClientEvent. By default, passes it on to the tile entity at this location. Args: world, x, y, z, event number, parameter" func_21025_b,damageDropped,1,Determines the damage on the item the block drops. Used in cloth and wood. func_21027_b,growTree,1,Attempts to grow a sapling into a tree func_21028_c,fertilize,1,Apply bonemeal to the crops. @@ -3044,7 +3060,7 @@ func_21104_b,getMaxNumberOfCreature,1, func_21105_a,getCreatureClass,1, func_21114_a,getRandomWorldGenForTrees,1,Gets a WorldGen appropriate for this biome. func_21116_a,setAllowedSpawnTypes,1,first boolean for hostile mobs and second for peaceful mobs -func_21117_c,playNoteAt,1,"plays a given note at x, y, z. args: x, y, z, instrument, note" +func_21117_c,sendClientEvent,1,"Calls receiveClientEvent of the tile entity at the given location on the server and all nearby clients with the given event number and parameter. Args: X, Y, Z, event number, parameter" func_21118_a,doChunksNearChunkExist,1,Checks if any of the chunks within distance (argument 4) blocks of the given block exist func_21119_h,markBlockAsNeedsUpdate,1,calls the 'MarkBlockAsNeedsUpdate' in all block accesses in this world func_21125_h,getItemDamage,1,gets the damage of an itemstack @@ -3582,7 +3598,7 @@ func_35152_b,getXPSplit,1,Get a fragment of the maximum experience points value func_35153_j_,getXpValue,1,Returns the XP value of this XP orb. func_35161_e,openChest,1, func_35162_t_,closeChest,1, -func_35163_b,onTileEntityPowered,1, +func_35163_b,receiveClientEvent,1,"Called when a client event is received with the event number and argument, see World.sendClientEvent" func_35164_g,updateContainingBlockInfo,1,"Causes the TileEntity to reset all it's cached values for it's container block, blockID, metaData and in the case of chests, the adjcacent chest check" func_35167_h,checkForAdjacentChests,1,Performs the check for adjacent chests to determine if this chest is double or not. func_35177_c,hasItem,1,Get if a specifiied item id is inside the inventory. @@ -3932,6 +3948,8 @@ func_40110_a,displayGUIBrewingStand,1,Displays the GUI for interacting with a br func_40114_y,createInstance,1, func_40120_w,getSlimeParticle,1,Returns the name of a particle effect that may be randomly created by EntitySlime.onUpdate() func_40123_y,isValidLightLevel,1,Checks to make sure the light is not too bright where the mob is spawning +func_40124_p_,isBesideClimbableBlock,1,Returns true if the WatchableObject (Byte) is 0x01 otherwise returns false. The WatchableObject is updated using setBesideClimableBlock. +func_40125_a,setBesideClimbableBlock,1,"Updates the WatchableObject (Byte) created in entityInit(), setting it to 0x01 if par1 is true or 0x00 if it is false." func_40131_b,procreate,1,Creates a baby animal according to the animal type of the target at the actual position and spawns 'love' particles. func_40133_a,spawnBabyAnimal,1,This function is used when two same-species animals in 'love mode' breed to generate the new baby animal. func_40134_a,isWheat,1,Checks if the parameter is an wheat item. @@ -4417,6 +4435,7 @@ func_48369_c,setSitting,1, func_48371_v_,isSitting,1, func_48372_a,setOwner,1, func_48373_u_,isTamed,1, +func_48376_c_,setTameSkin,1, func_48380_l_,getVillage,1, func_48392_a,setTerrainType,1, func_48409_a,isAllowedCharacter,1, @@ -4575,6 +4594,7 @@ func_517_a,getBlockLightValue_do,1,"Gets the light value of a block location. Th func_518_a,tickUpdates,1,Runs through the list of updates to run and ticks them func_519_b,markBlocksDirty,1, func_52003_getServerModName,getServerBrand,1,"Returns the brand name of this server. Usually overridden/changed by server mods, such as Bukkit." +func_52006_b,isItemFuel,1,Return true if item is a fuel source (getItemBurnTime() > 0). func_52008_a,buildPostString,1,Builds an encoded HTTP POST content string from a string map func_52009_a,sendPost,1,Sends a HTTP POST request to the given URL with data from a string func_52010_a,sendPost,1,Sends a HTTP POST request to the given URL with data from a map @@ -4705,6 +4725,7 @@ func_6152_a,onItemRightClick,1,"Called whenever this item is equipped and the ri func_6154_a,itemUsed,1, func_6156_d,updatingLighting,1,Updates lighting. Returns true if there are more lighting updates to update func_6157_a,canMineBlock,1,Called when checking if a certain block can be mined or not. The 'spawn safe zone' check is located here. +func_6158_a,getEntityByID,1,"Returns the Entity with the given ID, or null if it doesn't exist in this World." func_6168_a,useItemRightClick,1,"Called whenever this item stack is equipped and right clicked. Returns the new item stack to put in the position where this item is. Args: world, player" func_616_c,playerLoggedOut,1,Called when a player disconnects from the game. Writes player data to disk and removes them from the world. func_617_d,savePlayerStates,1,Saves all of the player's states diff --git a/forge/patches/minecraft/net/minecraft/src/Block.java.patch b/forge/patches/minecraft/net/minecraft/src/Block.java.patch index 5757a8f11e..bd3e72454f 100644 --- a/forge/patches/minecraft/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/Block.java.patch @@ -80,7 +80,7 @@ { ItemStack var8 = this.createStackedBlock(par6); -@@ -1054,6 +1054,512 @@ +@@ -1058,6 +1058,512 @@ */ public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {} diff --git a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch index 02ef26825d..98ace699fb 100644 --- a/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/BlockContainer.java.patch @@ -9,8 +9,8 @@ } /** -@@ -47,4 +47,14 @@ - var7.onTileEntityPowered(par5, par6); +@@ -51,4 +51,14 @@ + var7.receiveClientEvent(par5, par6); } } + diff --git a/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch b/forge/patches/minecraft/net/minecraft/src/BlockPistonBase.java.patch index 562a294722..0f7b9dae98 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 -@@ -369,7 +369,7 @@ +@@ -373,7 +373,7 @@ return false; } diff --git a/forge/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch b/forge/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch index b68fb99f13..0db9fc7155 100644 --- a/forge/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/NetClientHandler.java.patch @@ -166,7 +166,7 @@ @@ -1012,6 +1104,10 @@ { - ItemMap.getMPMapData(par1Packet131MapData.uniqueID, this.mc.theWorld).func_28171_a(par1Packet131MapData.itemData); + ItemMap.getMPMapData(par1Packet131MapData.uniqueID, this.mc.theWorld).updateMPMapData(par1Packet131MapData.itemData); } + else if (ForgeHooks.onItemDataPacket(netManager, par1Packet131MapData)) + { diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch index eee24c167d..2fb6450f33 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntity.java.patch @@ -1,6 +1,6 @@ --- ../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 -@@ -216,4 +216,24 @@ +@@ -219,4 +219,24 @@ addMapping(TileEntityEnchantmentTable.class, "EnchantTable"); addMapping(TileEntityEndPortal.class, "Airportal"); } diff --git a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch index 7f0ca593db..56bbb28ea4 100644 --- a/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/TileEntityFurnace.java.patch @@ -58,7 +58,7 @@ } } -@@ -351,4 +365,18 @@ +@@ -354,4 +368,18 @@ public void openChest() {} public void closeChest() {} diff --git a/forge/patches/minecraft/net/minecraft/src/World.java.patch b/forge/patches/minecraft/net/minecraft/src/World.java.patch index b951a0799e..4c10fa99a5 100644 --- a/forge/patches/minecraft/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft/net/minecraft/src/World.java.patch @@ -293,7 +293,7 @@ return par1 > 0 && var8 == null && var9.canPlaceBlockOnSide(this, par2, par3, par4, par6); } } -@@ -4443,4 +4446,39 @@ +@@ -4444,4 +4447,39 @@ { return this.worldInfo.getTerrainType() == WorldType.FLAT ? 0.0D : 63.0D; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch index 7db4b6e09a..7747c1b890 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/Block.java.patch @@ -68,7 +68,7 @@ { ItemStack var8 = this.createStackedBlock(par6); -@@ -970,6 +972,512 @@ +@@ -974,6 +976,512 @@ */ public void onFallenUpon(World par1World, int par2, int par3, int par4, Entity par5Entity, float par6) {} diff --git a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch index 4381d5fea9..bfaff5aa6f 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/BlockContainer.java.patch @@ -9,8 +9,8 @@ } /** -@@ -47,4 +47,14 @@ - var7.onTileEntityPowered(par5, par6); +@@ -51,4 +51,14 @@ + var7.receiveClientEvent(par5, par6); } } + 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 ed02217ace..ad01bf7b23 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 -@@ -359,7 +359,7 @@ +@@ -363,7 +363,7 @@ return false; } diff --git a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch index 8d5018db97..3ee8bc54fd 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/EntityPlayerMP.java.patch @@ -3,7 +3,7 @@ @@ -551,6 +551,7 @@ public void displayWorkbenchGUI(int par1, int par2, int par3) { - this.getNextWidowId(); + this.getNextWindowId(); + closeCraftingGui(); //NOTE: This is a bug fix for chests staying open in SMP this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 1, "Crafting", 9)); this.craftingInventory = new ContainerWorkbench(this.inventory, this.worldObj, par1, par2, par3); @@ -11,7 +11,7 @@ @@ -560,6 +561,7 @@ public void displayGUIEnchantment(int par1, int par2, int par3) { - this.getNextWidowId(); + this.getNextWindowId(); + closeCraftingGui(); //NOTE: This is a bug fix for chests staying open in SMP this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 4, "Enchanting", 9)); this.craftingInventory = new ContainerEnchantment(this.inventory, this.worldObj, par1, par2, par3); @@ -19,7 +19,7 @@ @@ -572,6 +574,7 @@ public void displayGUIChest(IInventory par1IInventory) { - this.getNextWidowId(); + this.getNextWindowId(); + closeCraftingGui(); //NOTE: This is a bug fix for chests staying open in SMP this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 0, par1IInventory.getInvName(), par1IInventory.getSizeInventory())); this.craftingInventory = new ContainerChest(this.inventory, par1IInventory); @@ -27,7 +27,7 @@ @@ -584,6 +587,7 @@ public void displayGUIFurnace(TileEntityFurnace par1TileEntityFurnace) { - this.getNextWidowId(); + this.getNextWindowId(); + closeCraftingGui(); //NOTE: This is a bug fix for chests staying open in SMP this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 2, par1TileEntityFurnace.getInvName(), par1TileEntityFurnace.getSizeInventory())); this.craftingInventory = new ContainerFurnace(this.inventory, par1TileEntityFurnace); @@ -35,7 +35,7 @@ @@ -596,6 +600,7 @@ public void displayGUIDispenser(TileEntityDispenser par1TileEntityDispenser) { - this.getNextWidowId(); + this.getNextWindowId(); + closeCraftingGui(); //NOTE: This is a bug fix for chests staying open in SMP this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 3, par1TileEntityDispenser.getInvName(), par1TileEntityDispenser.getSizeInventory())); this.craftingInventory = new ContainerDispenser(this.inventory, par1TileEntityDispenser); @@ -43,7 +43,7 @@ @@ -608,6 +613,7 @@ public void displayGUIBrewingStand(TileEntityBrewingStand par1TileEntityBrewingStand) { - this.getNextWidowId(); + this.getNextWindowId(); + closeCraftingGui(); //NOTE: This is a bug fix for chests staying open in SMP this.playerNetServerHandler.sendPacket(new Packet100OpenWindow(this.currentWindowId, 5, par1TileEntityBrewingStand.getInvName(), par1TileEntityBrewingStand.getSizeInventory())); this.craftingInventory = new ContainerBrewingStand(this.inventory, par1TileEntityBrewingStand); @@ -59,7 +59,7 @@ + */ + public final void realGetNextWidowId() + { -+ getNextWidowId(); ++ getNextWindowId(); + } + + public final int getCurrentWindowIdField() diff --git a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch index 12d958ee2e..9252c13119 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntity.java.patch @@ -1,6 +1,6 @@ --- ../src_base/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 +++ ../src_work/minecraft_server/net/minecraft/src/TileEntity.java 0000-00-00 00:00:00.000000000 -0000 -@@ -204,4 +204,24 @@ +@@ -207,4 +207,24 @@ public static void addNewTileEntityMapping(Class tileEntityClass, String id) { addMapping(tileEntityClass, id); } 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 59d42594c0..98aa3b9eee 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/TileEntityFurnace.java.patch @@ -59,7 +59,7 @@ } } -@@ -316,4 +330,18 @@ +@@ -319,4 +333,18 @@ public void openChest() {} public void closeChest() {} diff --git a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch index 31930bc595..49e9df426e 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/World.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/World.java.patch @@ -272,7 +272,7 @@ return par1 > 0 && var8 == null && var9.canPlaceBlockOnSide(this, par2, par3, par4, par6); } -@@ -3855,4 +3862,38 @@ +@@ -3856,4 +3863,38 @@ { return this.getChunkProvider().findClosestStructure(this, par1Str, par2, par3, par4); }