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

Update patches for FML fix.

Browse source
This commit is contained in:
Christian Weeks 2012-04-06 12:02:15 -04:00
parent 35750681eb
commit 1ad6fa9a73
4 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
forge/conf/fields.csv
View file

@ -3171,7 +3171,7 @@ field_838_c,lowerChest,0,Inventory object corresponding to double chest lower pa
field_840_a,stackList,0,List of the stacks in the crafting matrix.
field_841_c,eventHandler,0,Class containing the callbacks for the events on_GUIClosed and on_CraftMaxtrixChanged.
field_842_b,armorInventory,0,An array of 4 item stacks containing the currently worn armor pieces.
field_843_a,mainInventory,0,An array of 37 item stacks (but only filled with 36?) indicating the main player inventory (including the visible bar).
field_843_a,mainInventory,0,An array of 36 item stacks indicating the main player inventory (including the visible bar).
field_844_g,player,0,The player whose inventory this is.
field_845_f,inventoryChanged,0,Set true whenever the inventory changes. Nothing sets it false so you will have to write your own code to check it and reset the value.
field_847_d,currentItem,0,The index of the currently held item (0-8).
@ -5279,7 +5279,7 @@ field_492_f,mobID,1,"The string ID of the mobs being spawned from this spawner.
field_493_e,delay,1,The stored delay before a new spawn.
field_494_e,chestContents,1,
field_495_b,armorInventory,1,An array of 4 item stacks containing the currently worn armor pieces.
field_496_a,mainInventory,1,An array of 37 item stacks (but only filled with 36?) indicating the main player inventory (including the visible bar).
field_496_a,mainInventory,1,An array of 36 item stacks indicating the main player inventory (including the visible bar).
field_497_f,player,1,The player whose inventory this is.
field_498_e,inventoryChanged,1,Set true whenever the inventory changes. Nothing sets it false so you will have to write your own code to check it and reset the value.
field_499_d,currentItem,1,The index of the currently held item (0-8).

1 searge name side desc
3171 field_840_a stackList 0 List of the stacks in the crafting matrix.
3172 field_841_c eventHandler 0 Class containing the callbacks for the events on_GUIClosed and on_CraftMaxtrixChanged.
3173 field_842_b armorInventory 0 An array of 4 item stacks containing the currently worn armor pieces.
3174 field_843_a mainInventory 0 An array of 37 item stacks (but only filled with 36?) indicating the main player inventory (including the visible bar). An array of 36 item stacks indicating the main player inventory (including the visible bar).
3175 field_844_g player 0 The player whose inventory this is.
3176 field_845_f inventoryChanged 0 Set true whenever the inventory changes. Nothing sets it false so you will have to write your own code to check it and reset the value.
3177 field_847_d currentItem 0 The index of the currently held item (0-8).
5279 field_493_e delay 1 The stored delay before a new spawn.
5280 field_494_e chestContents 1
5281 field_495_b armorInventory 1 An array of 4 item stacks containing the currently worn armor pieces.
5282 field_496_a mainInventory 1 An array of 37 item stacks (but only filled with 36?) indicating the main player inventory (including the visible bar). An array of 36 item stacks indicating the main player inventory (including the visible bar).
5283 field_497_f player 1 The player whose inventory this is.
5284 field_498_e inventoryChanged 1 Set true whenever the inventory changes. Nothing sets it false so you will have to write your own code to check it and reset the value.
5285 field_499_d currentItem 1 The index of the currently held item (0-8).

13
forge/conf/methods.csv
View file

@ -2337,7 +2337,7 @@ func_516_a,generate,0,
func_517_a,setScale,0,"Rescales the generator settings, only used in WorldGenBigTree"
func_518_b,generateLeaves,0,Generates the leaf portion of the tree as specified by the leafNodes list.
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 version of Minecraft as a string
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_52013_a,updatePlayerMoveState,0,
func_52014_d,stripColorCodes,0,Remove all embedded color codes from a string
@ -3871,7 +3871,7 @@ func_40007_e,logSevere,1,Log severe error message
func_40008_d,handleRConCommand,1,Handle a command received by an RCon instance
func_40009_f,getHostname,1,Returns the server hostname
func_40011_a,getIntProperty,1,"Returns the specified property value as an int, or a default if the property doesn't exist"
func_40012_i,getVersionString,1,Returns the server version string
func_40012_i,getVersion,1,Returns the server version string
func_40013_e,getSettingsFilename,1,Returns the filename where server properties are stored
func_40014_h,getMotd,1,Returns the server message of the day
func_40015_k,getMaxPlayers,1,Returns the maximum number of players allowed on the server
@ -4171,6 +4171,7 @@ func_40641_a,getEnchantmentModifierLiving,1,Return the (magic) extra damage of t
func_40642_a,calcItemStackEnchantability,1,"Returns the enchantability of itemstack, it's uses a singular formula for each index (2nd parameter: 0, 1 and 2), cutting to the max enchantability power of the table (3rd parameter)"
func_40643_c,getUnbreakingModifier,1,Returns the unbreaking enchantment modifier on current equipped item of player.
func_40644_d,getSilkTouchModifier,1,Returns the silk touch status of enchantments on current equipped item of player.
func_40648_a,joinStrings,1,Joins array elements with the delimiter String.
func_4064_a,loadBlockGeneratorData,1,"Returns biomes to use for the blocks and loads the other data like temperature and humidity onto the WorldChunkManager Args: oldBiomeList, x, z, width, depth"
func_40656_c,getPropertiesFile,1,Returns this PropertyManager's file object used for property saving.
func_40657_a,setProperty,1,Saves an Object with the given property name
@ -4573,6 +4574,14 @@ func_516_a,canBlockBePlacedAt,1,"Returns true if the specified block can be plac
func_517_a,getBlockLightValue_do,1,"Gets the light value of a block location. This is the actual function that gets the value and has a bool flag that indicates if its a half step block to get the maximum light value of a direct neighboring block (left, right, forward, back, and up)"
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_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
func_52011_b,getDataMap,1,Returns the data map for the given usage snooper
func_52012_a,sendReport,1,Starts a new thread to send the information to the report server
func_52013_a,getServerURL,1,Returns the server URL for the given usage snooper
func_52014_a,addData,1,Adds information to the report
func_520_e,updateEntity,1,Will update the entity in the world if the chunk the entity is in is currently loaded. Args: entity
func_521_f,markBlockNeedsUpdate,1,"Marks the block as needing an update with the renderer. Args: x, y, z"
func_522_a,checkIfAABBIsClear,1,"Returns true if there are no solid, live entities in the specified AxisAlignedBB"

1 searge name side desc
2337 func_517_a setScale 0 Rescales the generator settings, only used in WorldGenBigTree
2338 func_518_b generateLeaves 0 Generates the leaf portion of the tree as specified by the leafNodes list.
2339 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.
2340 func_52003_C getVersion 0 Returns the version of Minecraft as a string Returns the client version string
2341 func_52004_D createAndSendReport 0 Creates and sends anonymous system information to Mojang's stats server
2342 func_52013_a updatePlayerMoveState 0
2343 func_52014_d stripColorCodes 0 Remove all embedded color codes from a string
3871 func_40008_d handleRConCommand 1 Handle a command received by an RCon instance
3872 func_40009_f getHostname 1 Returns the server hostname
3873 func_40011_a getIntProperty 1 Returns the specified property value as an int, or a default if the property doesn't exist
3874 func_40012_i getVersionString getVersion 1 Returns the server version string
3875 func_40013_e getSettingsFilename 1 Returns the filename where server properties are stored
3876 func_40014_h getMotd 1 Returns the server message of the day
3877 func_40015_k getMaxPlayers 1 Returns the maximum number of players allowed on the server
4171 func_40642_a calcItemStackEnchantability 1 Returns the enchantability of itemstack, it's uses a singular formula for each index (2nd parameter: 0, 1 and 2), cutting to the max enchantability power of the table (3rd parameter)
4172 func_40643_c getUnbreakingModifier 1 Returns the unbreaking enchantment modifier on current equipped item of player.
4173 func_40644_d getSilkTouchModifier 1 Returns the silk touch status of enchantments on current equipped item of player.
4174 func_40648_a joinStrings 1 Joins array elements with the delimiter String.
4175 func_4064_a loadBlockGeneratorData 1 Returns biomes to use for the blocks and loads the other data like temperature and humidity onto the WorldChunkManager Args: oldBiomeList, x, z, width, depth
4176 func_40656_c getPropertiesFile 1 Returns this PropertyManager's file object used for property saving.
4177 func_40657_a setProperty 1 Saves an Object with the given property name
4574 func_517_a getBlockLightValue_do 1 Gets the light value of a block location. This is the actual function that gets the value and has a bool flag that indicates if its a half step block to get the maximum light value of a direct neighboring block (left, right, forward, back, and up)
4575 func_518_a tickUpdates 1 Runs through the list of updates to run and ticks them
4576 func_519_b markBlocksDirty 1
4577 func_52003_getServerModName getServerBrand 1 Returns the brand name of this server. Usually overridden/changed by server mods, such as Bukkit.
4578 func_52008_a buildPostString 1 Builds an encoded HTTP POST content string from a string map
4579 func_52009_a sendPost 1 Sends a HTTP POST request to the given URL with data from a string
4580 func_52010_a sendPost 1 Sends a HTTP POST request to the given URL with data from a map
4581 func_52011_b getDataMap 1 Returns the data map for the given usage snooper
4582 func_52012_a sendReport 1 Starts a new thread to send the information to the report server
4583 func_52013_a getServerURL 1 Returns the server URL for the given usage snooper
4584 func_52014_a addData 1 Adds information to the report
4585 func_520_e updateEntity 1 Will update the entity in the world if the chunk the entity is in is currently loaded. Args: entity
4586 func_521_f markBlockNeedsUpdate 1 Marks the block as needing an update with the renderer. Args: x, y, z
4587 func_522_a checkIfAABBIsClear 1 Returns true if there are no solid, live entities in the specified AxisAlignedBB

BIN
forge/fml-src-1.0.0.45.zip → forge/fml-src-1.0.0.46.zip
View file

Binary file not shown.

11
forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch
View file

@ -1,19 +1,18 @@
--- ../src_base/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000
+++ ../src_work/minecraft_server/net/minecraft/src/SlotCrafting.java 0000-00-00 00:00:00.000000000 -0000
@@ -1,5 +1,8 @@
package net.minecraft.src;
@@ -2,6 +2,8 @@
import cpw.mods.fml.server.FMLServerHandler;
+import cpw.mods.fml.server.FMLServerHandler;
+import net.minecraft.src.forge.ForgeHooks;
+
public class SlotCrafting extends Slot
{
/** The craft matrix inventory linked to this result slot. */
@@ -96,6 +99,9 @@
*/
@@ -99,6 +101,8 @@
public void onPickupFromSlot(ItemStack par1ItemStack)
{
+ FMLServerHandler.instance().onItemCrafted(thePlayer, par1ItemStack, craftMatrix);
FMLServerHandler.instance().onItemCrafted(thePlayer, par1ItemStack, inventory);
+ ForgeHooks.onTakenFromCrafting(thePlayer, par1ItemStack, craftMatrix);
+
this.func_48416_b(par1ItemStack);