From 1ad6fa9a7350c2b88f248ea2f68396a9f0c7fd9a Mon Sep 17 00:00:00 2001 From: Christian Weeks Date: Fri, 6 Apr 2012 12:02:15 -0400 Subject: [PATCH] Update patches for FML fix. --- forge/conf/fields.csv | 4 ++-- forge/conf/methods.csv | 13 +++++++++++-- ...-src-1.0.0.45.zip => fml-src-1.0.0.46.zip} | Bin 59373 -> 60808 bytes .../net/minecraft/src/SlotCrafting.java.patch | 13 ++++++------- 4 files changed, 19 insertions(+), 11 deletions(-) rename forge/{fml-src-1.0.0.45.zip => fml-src-1.0.0.46.zip} (79%) diff --git a/forge/conf/fields.csv b/forge/conf/fields.csv index b984657de..0287d27f4 100644 --- a/forge/conf/fields.csv +++ b/forge/conf/fields.csv @@ -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). diff --git a/forge/conf/methods.csv b/forge/conf/methods.csv index 5fc1169d5..e47b33cfc 100644 --- a/forge/conf/methods.csv +++ b/forge/conf/methods.csv @@ -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" diff --git a/forge/fml-src-1.0.0.45.zip b/forge/fml-src-1.0.0.46.zip similarity index 79% rename from forge/fml-src-1.0.0.45.zip rename to forge/fml-src-1.0.0.46.zip index 087df171e8e100d18e3d977cb861627f9c589c6d..5efce6956b19ecc9e5be5be30c39bc9dd449619a 100644 GIT binary patch delta 9184 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 delta 7949 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 E2a;me4*&oF diff --git a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch index 5a2e42a13..b0ffca949 100644 --- a/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch +++ b/forge/patches/minecraft_server/net/minecraft/src/SlotCrafting.java.patch @@ -1,21 +1,20 @@ --- ../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); for (int var2 = 0; var2 < this.craftMatrix.getSizeInventory(); ++var2)