From 26a5b316deb468e14d6caca4fadc4ccd7579db9b Mon Sep 17 00:00:00 2001 From: donington Date: Sat, 12 Jan 2013 00:16:03 -0500 Subject: [PATCH 01/11] FMLLogFormatter: dynamic log level name FMLLogFormatter now uses getLocalizedName or getName for log level name Changes to be committed: modified: common/cpw/mods/fml/relauncher/FMLLogFormatter.java --- .../mods/fml/relauncher/FMLLogFormatter.java | 30 +++++-------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/common/cpw/mods/fml/relauncher/FMLLogFormatter.java b/common/cpw/mods/fml/relauncher/FMLLogFormatter.java index 7f81db1b11..7768e738e5 100644 --- a/common/cpw/mods/fml/relauncher/FMLLogFormatter.java +++ b/common/cpw/mods/fml/relauncher/FMLLogFormatter.java @@ -22,33 +22,19 @@ final class FMLLogFormatter extends Formatter msg.append(this.dateFormat.format(Long.valueOf(record.getMillis()))); Level lvl = record.getLevel(); - if (lvl == Level.FINEST) + String name = lvl.getLocalizedName(); + if ( name == null ) { - msg.append(" [FINEST] "); + name = lvl.getName(); } - else if (lvl == Level.FINER) + + if ( ( name != null ) && ( name.length() > 0 ) ) { - msg.append(" [FINER] "); + msg.append(" [" + name + "] "); } - else if (lvl == Level.FINE) + else { - msg.append(" [FINE] "); - } - else if (lvl == Level.INFO) - { - msg.append(" [INFO] "); - } - else if (lvl == Level.WARNING) - { - msg.append(" [WARNING] "); - } - else if (lvl == Level.SEVERE) - { - msg.append(" [SEVERE] "); - } - else if (lvl == Level.SEVERE) - { - msg.append(" [" + lvl.getLocalizedName() + "] "); + msg.append(" "); } if (record.getLoggerName() != null) From a14ab913a906538c89aada9980878801bcd40304 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 15 Jan 2013 16:54:26 -0500 Subject: [PATCH 02/11] Update license text to make clear that FML is not a way to sidestep MCP licensing. --- LICENSE-fml.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/LICENSE-fml.txt b/LICENSE-fml.txt index b1345ced9d..f069614d9a 100644 --- a/LICENSE-fml.txt +++ b/LICENSE-fml.txt @@ -1,5 +1,5 @@ -This minecraft mod, Forge Mod Loader, including all parts herein, is licensed -under the GNU LGPL v2.1 or later. +This minecraft mod, Forge Mod Loader, including all parts herein except as noted below, +is licensed under the GNU LGPL v2.1 or later. Homepage: https://github.com/cpw/FML @@ -9,6 +9,12 @@ included based on guidelines at http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html with notices intact. The only change is a non-functional change of package name. +=== MCP Data === +This software includes data from the Minecraft Coder Pack (MCP), with kind permission +from them. The license to MCP data is not transitive - distribution of this data by +third parties requires independent licensing from the MCP team. This data is not +redistributable without permission from the MCP team. + ======== GNU LESSER GENERAL PUBLIC LICENSE From aa822e32af908c4e2e99564361e4e374246e9afb Mon Sep 17 00:00:00 2001 From: bspkrs Date: Wed, 16 Jan 2013 23:49:09 -0500 Subject: [PATCH 03/11] Fix logical error in comment text --- common/cpw/mods/fml/common/ModContainer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cpw/mods/fml/common/ModContainer.java b/common/cpw/mods/fml/common/ModContainer.java index 26b4181700..21c60942f1 100644 --- a/common/cpw/mods/fml/common/ModContainer.java +++ b/common/cpw/mods/fml/common/ModContainer.java @@ -81,13 +81,13 @@ public interface ModContainer /** * A list of modids that should be loaded prior to this one. The special - * value * indicates to load before any other mod. + * value * indicates to load after any other mod. */ List getDependencies(); /** * A list of modids that should be loaded after this one. The - * special value * indicates to load after any + * special value * indicates to load before any * other mod. */ List getDependants(); From 15534edce43d1ab1a6f31bb0e194bf2fe364edf3 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 18 Jan 2013 21:26:43 -0500 Subject: [PATCH 04/11] Update address of the FML repository to the new location in all the files --- LICENSE-fml.txt | 2 +- common/cpw/mods/fml/common/FMLDummyContainer.java | 4 ++-- install/CREDITS-fml.txt | 12 +++++++++--- install/README.txt | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/LICENSE-fml.txt b/LICENSE-fml.txt index f069614d9a..953d425551 100644 --- a/LICENSE-fml.txt +++ b/LICENSE-fml.txt @@ -1,7 +1,7 @@ This minecraft mod, Forge Mod Loader, including all parts herein except as noted below, is licensed under the GNU LGPL v2.1 or later. -Homepage: https://github.com/cpw/FML +Homepage: https://github.com/MinecraftForge/FML This software includes portions from the Apache Maven project at http://maven.apache.org/ specifically the ComparableVersion.java code. It is diff --git a/common/cpw/mods/fml/common/FMLDummyContainer.java b/common/cpw/mods/fml/common/FMLDummyContainer.java index a0f56a99b0..37edd2ce69 100644 --- a/common/cpw/mods/fml/common/FMLDummyContainer.java +++ b/common/cpw/mods/fml/common/FMLDummyContainer.java @@ -51,8 +51,8 @@ public class FMLDummyContainer extends DummyModContainer implements WorldAccessC "to cooperate and provide a good modding environment. " + "The mod loading system is compatible with ModLoader, all your ModLoader " + "mods should work."; - meta.url="https://github.com/cpw/FML/wiki"; - meta.updateUrl="https://github.com/cpw/FML/wiki"; + meta.url="https://github.com/MinecraftForge/FML/wiki"; + meta.updateUrl="https://github.com/MinecraftForge/FML/wiki"; meta.screenshots=new String[0]; meta.logoFile=""; } diff --git a/install/CREDITS-fml.txt b/install/CREDITS-fml.txt index d2c019dd7a..9298495285 100644 --- a/install/CREDITS-fml.txt +++ b/install/CREDITS-fml.txt @@ -1,6 +1,6 @@ This is Forge Mod Loader. -You can find the source code at all times at https://github.com/cpw/FML +You can find the source code at all times at https://github.com/MinecraftForge/FML This minecraft mod is a clean open source implementation of a mod loader for minecraft servers, minecraft bukkit servers, and minecraft clients. @@ -11,8 +11,14 @@ It implements API defined by the client side ModLoader, authored by Risugami. http://www.minecraftforum.net/topic/75440- It also contains suggestions and hints from LexManos, author of MinecraftForge. -http://www.mod-buildcraft.com/forums/forum/minecraft-forge/ +http://www.minecraftforge.net/ -Finally, it contains an implementation of topological sort based on that +Additionally, it contains an implementation of topological sort based on that published at http://keithschwarz.com/interesting/code/?dir=topological-sort +It also contains code from the Maven project for performing versioned dependency +resolution. http://maven.apache.org/ + +Forge Mod Loader downloads components from the Minecraft Coder Pack +(http://mcp.ocean-labs.de/index.php/Main_Page) with kind permission from the MCP team. + diff --git a/install/README.txt b/install/README.txt index 034a0390c3..34efdc1ea0 100755 --- a/install/README.txt +++ b/install/README.txt @@ -1,6 +1,6 @@ This is Forge Mod Loader, or FML for short, by cpw. -More information can be found at https://github.com/cpw/FML/wiki +More information can be found at https://github.com/MinecraftForge/FML/wiki It is a clean reimplementation of a mod loading system for client, server and bukkit use, incorporating API implementations of client side ModLoader by From 7ad85293903773c3c7ce2c6d03959b2d4c33dc81 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 20 Jan 2013 10:26:14 -0500 Subject: [PATCH 05/11] Update MCP to MCP7.26a and refresh MCP names --- .../modloader/ModLoaderPickupNotifier.java | 2 +- .../fml/common/registry/GameRegistry.java | 4 +- common/mcpmod.info | 2 +- conf/fields.csv | 248 +++++++++++++++++- conf/joined.exc | 33 +-- conf/joined.srg | 112 ++++---- conf/methods.csv | 68 ++++- conf/params.csv | 33 +-- conf/version.cfg | 2 +- mc_versions.cfg | 6 +- 10 files changed, 375 insertions(+), 135 deletions(-) diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java b/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java index f0a2894db8..36a53c4dfb 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java @@ -17,7 +17,7 @@ public class ModLoaderPickupNotifier implements IPickupNotifier @Override public void notifyPickup(EntityItem item, EntityPlayer player) { - mod.onItemPickup(player, item.func_92014_d()); + mod.onItemPickup(player, item.func_92059_d()); } } diff --git a/common/cpw/mods/fml/common/registry/GameRegistry.java b/common/cpw/mods/fml/common/registry/GameRegistry.java index 96b7e4b3a4..f50e3acab6 100644 --- a/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -248,9 +248,9 @@ public class GameRegistry blockRegistry.put(Loader.instance().activeModContainer(), (BlockProxy) block); } - public static void addRecipe(ItemStack output, Object... params) + public static IRecipe addRecipe(ItemStack output, Object... params) { - CraftingManager.func_77594_a().func_92051_a(output, params); + return CraftingManager.func_77594_a().func_92103_a(output, params); } public static void addShapelessRecipe(ItemStack output, Object... params) diff --git a/common/mcpmod.info b/common/mcpmod.info index cfc73a34f0..890fadb2c7 100644 --- a/common/mcpmod.info +++ b/common/mcpmod.info @@ -3,7 +3,7 @@ "modid": "mcp", "name": "Minecraft Coder Pack", "description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.", - "version": "7.26", + "version": "7.26a", "mcversion": "1.4.7", "logoFile": "/mcp.png", "url": "http://mcp.ocean-labs.de/", diff --git a/conf/fields.csv b/conf/fields.csv index 2446f85ba5..d267bec66e 100644 --- a/conf/fields.csv +++ b/conf/fields.csv @@ -238,6 +238,7 @@ field_70482_c,inventoryContents,2, field_70483_a,inventoryTitle,2, field_70484_a,container,2,The brewing stand this slot belongs to. field_70488_a,associatedChest,2, +field_70499_f,isInReverse,2, field_70500_g,matrix,2,Minecart rotational logic matrix field_70501_d,cargoItems,2,Array of item stacks stored in minecart (for storage minecarts). field_70502_e,fuel,2, @@ -686,6 +687,154 @@ field_71585_d,offsetsZForSide,2,gives the offset required for this axis to get t field_71586_b,offsetsXForSide,2,gives the offset required for this axis to get the block at that side. field_71587_c,offsetsYForSide,2,gives the offset required for this axis to get the block at that side. field_71588_a,faceToSide,2,Converts a face to a side. +field_71589_f,bc_pbe_sha512,2, +field_71590_g,bc_pbe_sha224,2, +field_71591_d,bc_pbe_sha256,2, +field_71592_e,bc_pbe_sha384,2, +field_71593_b,bc_pbe,2, +field_71594_c,bc_pbe_sha1,2, +field_71595_a,bc,2, +field_71596_n,bc_pbe_sha1_pkcs12_aes256_cbc,2, +field_71597_o,bc_pbe_sha256_pkcs12_aes128_cbc,2, +field_71598_l,bc_pbe_sha1_pkcs12_aes128_cbc,2, +field_71599_m,bc_pbe_sha1_pkcs12_aes192_cbc,2, +field_71600_j,bc_pbe_sha256_pkcs5,2, +field_71601_k,bc_pbe_sha256_pkcs12,2, +field_71602_h,bc_pbe_sha1_pkcs5,2, +field_71603_i,bc_pbe_sha1_pkcs12,2, +field_71604_q,bc_pbe_sha256_pkcs12_aes256_cbc,2, +field_71605_p,bc_pbe_sha256_pkcs12_aes192_cbc,2, +field_71610_b,cache,2, +field_71611_a,identifier,2, +field_71613_D,digestAlgorithm,2, +field_71614_E,md2,2, +field_71615_F,md4,2, +field_71616_G,md5,2, +field_71617_A,encryptionAlgorithm,2, +field_71618_B,des_EDE3_CBC,2, +field_71619_C,RC2_CBC,2, +field_71620_L,id_hmacWithSHA512,2, +field_71621_M,data,2, +field_71622_N,signedData,2, +field_71623_O,envelopedData,2, +field_71624_H,id_hmacWithSHA1,2, +field_71625_I,id_hmacWithSHA224,2, +field_71626_J,id_hmacWithSHA256,2, +field_71627_K,id_hmacWithSHA384,2, +field_71628_U,pkcs_9_at_unstructuredName,2, +field_71629_T,pkcs_9_at_emailAddress,2, +field_71630_W,pkcs_9_at_messageDigest,2, +field_71631_V,pkcs_9_at_contentType,2, +field_71632_Q,digestedData,2, +field_71633_P,signedAndEnvelopedData,2, +field_71634_S,pkcs_9,2, +field_71635_R,encryptedData,2, +field_71636_Y,pkcs_9_at_counterSignature,2, +field_71637_X,pkcs_9_at_signingTime,2, +field_71638_Z,pkcs_9_at_challengePassword,2, +field_71639_f,sha1WithRSAEncryption,2, +field_71640_g,srsaOAEPEncryptionSET,2, +field_71641_d,md4WithRSAEncryption,2, +field_71642_e,md5WithRSAEncryption,2, +field_71643_b,rsaEncryption,2, +field_71644_c,md2WithRSAEncryption,2, +field_71645_a,pkcs_1,2, +field_71646_n,sha512WithRSAEncryption,2, +field_71647_o,sha224WithRSAEncryption,2, +field_71648_l,sha256WithRSAEncryption,2, +field_71649_m,sha384WithRSAEncryption,2, +field_71650_j,id_pSpecified,2, +field_71651_k,id_RSASSA_PSS,2, +field_71652_h,id_RSAES_OAEP,2, +field_71653_i,id_mgf1,2, +field_71654_w,pbeWithSHA1AndDES_CBC,2, +field_71655_v,pbeWithMD5AndRC2_CBC,2, +field_71656_u,pbeWithMD5AndDES_CBC,2, +field_71657_t,pbeWithMD2AndRC2_CBC,2, +field_71658_s,pbeWithMD2AndDES_CBC,2, +field_71659_r,pkcs_5,2, +field_71660_q,dhKeyAgreement,2, +field_71661_p,pkcs_3,2, +field_71662_z,id_PBKDF2,2, +field_71663_y,id_PBES2,2, +field_71664_x,pbeWithSHA1AndRC2_CBC,2, +field_71665_bw,pbewithSHAAnd40BitRC2_CBC,2, +field_71666_bv,pbeWithSHAAnd40BitRC2_CBC,2, +field_71667_by,id_alg_CMSRC2wrap,2, +field_71668_bx,id_alg_CMS3DESwrap,2, +field_71669_bs,pbeWithSHAAnd3_KeyTripleDES_CBC,2, +field_71670_br,pbeWithSHAAnd40BitRC4,2, +field_71671_bu,pbeWithSHAAnd128BitRC2_CBC,2, +field_71672_bt,pbeWithSHAAnd2_KeyTripleDES_CBC,2, +field_71673_bn,secretBag,2, +field_71674_bo,safeContentsBag,2, +field_71675_bp,pkcs_12PbeIds,2, +field_71676_bq,pbeWithSHAAnd128BitRC4,2, +field_71677_bj,keyBag,2, +field_71678_bk,pkcs8ShroudedKeyBag,2, +field_71679_bl,certBag,2, +field_71680_bm,crlBag,2, +field_71681_bf,id_spq_ets_uri,2, +field_71682_bg,id_spq_ets_unotice,2, +field_71683_bh,pkcs_12,2, +field_71684_bi,bagtypes,2, +field_71685_bb,id_aa_sigPolicyId,2, +field_71686_bc,id_aa_commitmentType,2, +field_71687_bd,id_aa_signerLocation,2, +field_71688_be,id_aa_otherSigCert,2, +field_71689_aZ,id_aa_ets_certCRLTimestamp,2, +field_71690_aY,id_aa_ets_escTimeStamp,2, +field_71691_aR,id_aa_ets_signerAttr,2, +field_71692_aQ,id_aa_ets_signerLocation,2, +field_71693_aT,id_aa_ets_contentTimestamp,2, +field_71694_aS,id_aa_ets_otherSigCert,2, +field_71695_aV,id_aa_ets_revocationRefs,2, +field_71696_aU,id_aa_ets_certificateRefs,2, +field_71697_aX,id_aa_ets_revocationValues,2, +field_71698_aW,id_aa_ets_certValues,2, +field_71699_aI,id_aa_contentReference,2, +field_71700_aJ,id_aa_encrypKeyPref,2, +field_71701_aK,id_aa_signingCertificate,2, +field_71702_aL,id_aa_signingCertificateV2,2, +field_71703_aM,id_aa_contentIdentifier,2, +field_71704_aN,id_aa_signatureTimeStampToken,2, +field_71705_aO,id_aa_ets_sigPolicyId,2, +field_71706_aP,id_aa_ets_commitmentType,2, +field_71707_aA,id_cti_ets_proofOfDelivery,2, +field_71708_aB,id_cti_ets_proofOfSender,2, +field_71709_aC,id_cti_ets_proofOfApproval,2, +field_71710_aD,id_cti_ets_proofOfCreation,2, +field_71711_aE,id_aa,2, +field_71712_aF,id_aa_receiptRequest,2, +field_71713_aG,id_aa_contentHint,2, +field_71714_aH,id_aa_msgSigDigest,2, +field_71715_az,id_cti_ets_proofOfReceipt,2, +field_71716_ay,id_cti_ets_proofOfOrigin,2, +field_71717_ba,id_aa_ets_archiveTimestamp,2, +field_71718_at,id_ct_TSTInfo,2, +field_71719_as,id_ct_authData,2, +field_71720_ar,id_ct,2, +field_71721_aq,sMIMECapabilitiesVersions,2, +field_71722_ax,id_cti,2, +field_71723_aw,id_ct_timestampedData,2, +field_71724_av,id_ct_authEnvelopedData,2, +field_71725_au,id_ct_compressedData,2, +field_71726_ak,sdsiCertificate,2, +field_71727_al,crlTypes,2, +field_71728_ai,certTypes,2, +field_71729_aj,x509Certificate,2, +field_71730_ao,preferSignedData,2, +field_71731_ap,canNotDecryptAny,2, +field_71732_am,x509Crl,2, +field_71733_an,id_alg_PWRI_KEK,2, +field_71734_ac,pkcs_9_at_signingDescription,2, +field_71735_ad,pkcs_9_at_extensionRequest,2, +field_71736_aa,pkcs_9_at_unstructuredAddress,2, +field_71737_ab,pkcs_9_at_extendedCertificateAttributes,2, +field_71738_ag,pkcs_9_at_localKeyId,2, +field_71739_ah,x509certType,2, +field_71740_ae,pkcs_9_at_smimeCapabilities,2, +field_71741_af,pkcs_9_at_friendlyName,2, field_71743_a,theDecitatedServer,2,Reference to the DecitatedServer object. field_71748_d,connections,2, field_71749_b,isListening,2,Whether the network listener object is listening. @@ -708,6 +857,36 @@ field_71782_a,iv,2, field_71784_a,key,2, field_71787_b,strength,2, field_71788_a,random,2, +field_71796_f,pgpCFB,2, +field_71797_d,cipher,2, +field_71798_e,partialBlockOkay,2, +field_71799_b,bufOff,2, +field_71800_c,forEncryption,2, +field_71801_a,buf,2, +field_71809_f,encrypting,2, +field_71810_d,blockSize,2, +field_71811_e,cipher,2, +field_71812_b,cfbV,2, +field_71813_c,cfbOutV,2, +field_71814_a,IV,2, +field_71824_f,T2,2, +field_71825_g,T3,2, +field_71826_d,T0,2, +field_71827_e,T1,2, +field_71828_b,Si,2, +field_71829_c,rcon,2, +field_71830_a,S,2, +field_71831_n,C0,2, +field_71832_o,C1,2, +field_71833_l,ROUNDS,2, +field_71834_m,WorkingKey,2, +field_71835_j,Tinv2,2, +field_71836_k,Tinv3,2, +field_71837_h,Tinv0,2, +field_71838_i,Tinv1,2, +field_71839_r,forEncryption,2, +field_71840_q,C3,2, +field_71841_p,C2,2, field_71844_b,strength,2, field_71845_a,random,2, field_71938_D,lavaStill,2,Stationary lava source block @@ -1637,6 +1816,7 @@ field_73812_e,height,2, field_73813_b,xPos,2, field_73814_c,yPos,2, field_73815_a,fontRenderer,2,Have the font renderer from GuiScreen to render the textbox text into the screen. +field_73816_n,lineScrollOffset,2,The current character index that should be used as start of the rendered text. field_73817_o,cursorPosition,2, field_73818_l,isFocused,2,"If this value is true along isEnabled, keyTyped will process the keys." field_73819_m,isEnabled,2,"If this value is true along isFocused, keyTyped will process the keys." @@ -1886,7 +2066,7 @@ field_74263_b,workingMessage,2, field_74264_c,currentProgress,2, field_74265_a,progressMessage,2, field_74267_a,mcServer,2,Reference to the MinecraftServer object. -field_74268_a,simpleDateFormatLogFormatter,2,Date Formatter of Log/Console. +field_74268_a,dateFormat,2,The date format to use in the console log. field_74270_a,mcServer,2,Reference to the MinecraftServer object. field_74272_a,mcServer,2,Reference to the MinecraftServer object. field_74274_a,mcServer,2,Reference to the MinecraftServer object. @@ -2092,15 +2272,20 @@ field_74756_a,data,2,The byte value for the tag. field_74784_a,tagMap,2,"The key-value pairs for the tag. Each key is a UTF string, each value is a tag." field_74790_a,enumJsonNodeTypeMappingArray,2,A mapping helper array for EnumJsonNodeType's values. field_74791_a,escapedString,2, +field_74801_a,theBouncyCastleProvider,2, field_74813_d,currentLanguage,2, field_74814_e,isUnicode,2, field_74815_b,translateTable,2,Contains all key/value pairs to be translated - is loaded from '/lang/en_US.lang' when the StringTranslate is created. field_74816_c,languageList,2, field_74817_a,instance,2,Is the private singleton instance of StringTranslate. +field_74822_f,ASYMMETRIC_GENERIC,2, +field_74823_g,ASYMMETRIC_CIPHERS,2, field_74824_d,keyInfoConverters,2, +field_74825_e,SYMMETRIC_CIPHERS,2, field_74826_b,CONFIGURATION,2, field_74827_c,info,2, field_74828_a,PROVIDER_NAME,2, +field_74829_h,DIGESTS,2, field_74831_f,dhThreadSpec,2, field_74832_d,BC_DH_PERMISSION,2, field_74833_e,ecThreadSpec,2, @@ -2111,6 +2296,17 @@ field_74839_a,localizedName,2, field_74842_b,permissionMask,2, field_74843_a,actions,2, field_74845_a,errorObjects,2, +field_74846_d,buf,2, +field_74847_b,theStreamCipher,2, +field_74848_c,oneByte,2, +field_74849_a,theBufferedBlockCipher,2, +field_74853_f,maxBuf,2, +field_74854_g,finalized,2, +field_74855_d,inBuf,2, +field_74856_e,bufOff,2, +field_74857_b,theStreamCipher,2, +field_74858_c,buf,2, +field_74859_a,theBufferedBlockCipher,2, field_74885_f,coordBaseMode,2,switches the Coordinate System base off the Bounding Box field_74886_g,componentType,2,The type ID of this component. field_74887_e,boundingBox,2, @@ -2486,6 +2682,7 @@ field_75624_e,classToIDMapping,2,provides a mapping between an Entity Class and field_75625_b,stringToClassMapping,2,Provides a mapping between entity classes and a string field_75626_c,classToStringMapping,2,Provides a mapping between a string and an entity classes field_75627_a,entityEggs,2,This is a HashMap of the Creative Entity Eggs/Spawners. +field_75643_f,update,2, field_75644_d,posZ,2, field_75645_e,speed,2,The speed at which the entity should move field_75646_b,posX,2, @@ -2505,6 +2702,7 @@ field_75675_d,watched,2, field_75676_b,dataValueId,2,id of max 31 field_75677_c,watchedObject,2, field_75678_a,objectType,2, +field_75694_d,lock,2, field_75695_b,watchedObjects,2, field_75696_c,objectChanged,2,true if one or more object was changed field_75697_a,dataTypes,2, @@ -4186,6 +4384,7 @@ field_82134_g,secondaryEffect,2,Secondary potion effect given by this beacon. field_82136_e,levels,2,Level of this beacon's pyramid. field_82139_a,effectsList,2,List of effects that Beacon can apply field_82140_h,payment,2,Item given to this beacon as payment. +field_82153_h,timeInPortal,2, field_82155_f,isAnvil,2, field_82156_g,fallHurtMax,2,Maximum amount of damage dealt to entities hit by falling block field_82157_e,isBreakingAnvil,2, @@ -4257,6 +4456,7 @@ field_82374_e,facings,2, field_82387_b,intListPattern,2,"This matches things like ""-1,,4"", and is used for getting x,y,z,range from the token's argument list." field_82388_c,keyValueListPattern,2,"This matches things like ""rm=4,c=2"" and is used for handling named token arguments." field_82389_a,tokenPattern,2,"This matches the at-tokens introduced for command blocks, including their arguments, if any." +field_82391_c,instance,2, field_82397_a,skullRenderer,2, field_82401_a,skeletonHeadModel,2,The Skeleton's head model. field_82405_a,renderBlocksInstance,2, @@ -4265,9 +4465,17 @@ field_82446_a,renderedBatSize,2,"not actually sure this is size, is not used as field_82453_b,createFlatWorldGui,2, field_82458_b,flatPresetsGui,2, field_82470_g,playingSounds,2,Identifiers of all currently playing sounds. Type: HashSet +field_82471_f,minecartIsMoving,2, +field_82472_g,silent,2, +field_82473_d,playerSPRidingMinecart,2, +field_82474_e,minecartIsDead,2, field_82475_b,theMinecart,2,Minecart which sound is being updated. field_82476_c,thePlayer,2,The player that is getting the minecart sound updates. field_82477_a,theSoundManager,2, +field_82478_j,minecartRideSoundVolume,2, +field_82479_k,minecartSpeed,2, +field_82480_h,minecartSoundPitch,2, +field_82481_i,minecartMoveSoundVolume,2, field_82483_a,itemDispenseBehaviorProvider,2, field_82484_c,defaultItemDispenseBehavior,2,Reference to the BehaviorDefaultDispenseItem object. field_82490_b,mcServer,2, @@ -4311,10 +4519,16 @@ field_82587_b,theNBTTagCompound,2, field_82592_a,vec3dPool,2, field_82596_a,registryObjects,2,Objects registered on this registry. field_82597_b,defaultObject,2,"Default object for this registry, returned when an object is not found." +field_82611_j,frontOffsetY,2, +field_82612_k,frontOffsetZ,2, +field_82614_i,frontOffsetX,2, field_82624_d,zPos,2, field_82625_b,xPos,2, field_82626_c,yPos,2, field_82627_a,worldObj,2, +field_82628_b,y,2, +field_82629_c,z,2, +field_82630_a,x,2, field_82635_f,maxSpeedBoostTime,2,Maximum time the entity's speed should be boosted for. field_82636_d,speedBoosted,2,Whether the entity's speed is boosted. field_82637_e,speedBoostTime,2,"Counter for speed boosting, upon reaching maxSpeedBoostTime the speed boost will be disabled" @@ -4338,6 +4552,9 @@ field_82681_h,cropTypeD,2,Fourth crop type for this field. field_82682_h,hasWitch,2,Whether this swamp hut has a witch. field_82693_j,playerReputation,2,List of player reputations with this village field_82694_i,noBreedTicks,2,Timestamp of tick count when villager last bred +field_82696_f,structureGenerators,2, +field_82701_j,lavaLakeGenerator,2, +field_82703_i,waterLakeGenerator,2, field_82707_i,isAnimal,2,Whether this creature type is an animal. field_82717_g,anvil,2, field_82723_d,isSplashPotion,2,Whether the potion is a splash potion @@ -4390,7 +4607,10 @@ field_82860_h,theWorld,2, field_82862_h,thePlayer,2, field_82864_f,beaconSlot,2,"This beacon's slot where you put in Emerald, Diamond, Gold or Iron Ingot." field_82866_e,theBeacon,2, +field_82871_d,blockPosZ,2, field_82872_e,anvil,2,The anvil this slot belongs to. +field_82873_b,blockPosX,2, +field_82874_c,blockPosY,2, field_82875_a,theWorld,2, field_82876_a,beacon,2,The beacon this slot belongs to. field_82880_z,showCape,2,Whether to show your cape @@ -4418,14 +4638,40 @@ field_83024_j,renderMaxY,2,The maximum Y value for rendering (default 1.0). field_83025_k,renderMinZ,2,The minimum Z value for rendering (default 0.0). field_83026_h,renderMaxX,2,The maximum X value for rendering (default 1.0). field_83027_i,renderMinY,2,The minimum Y value for rendering (default 0.0). +field_85037_d,aiArrowAttack,2, +field_85038_e,aiAttackOnCollide,2, field_85045_v,returningStack,2,Used when touchscreen is enabled field_85046_u,returningStackTime,2, field_85047_t,returningStackDestSlot,2, field_85050_q,draggedStack,2,Used when touchscreen is enabled field_85051_p,clickedSlot,2,Used when touchscreen is enabled field_85053_h,throwerName,2, +field_85075_d,stackTrace,2, +field_85109_a,worldInfoInstance,2, +field_85111_a,worldInfoInstance,2, +field_85113_a,worldInfoInstance,2, +field_85115_a,worldInfoInstance,2, +field_85135_a,worldInfoInstance,2, +field_85137_a,worldInfoInstance,2, +field_85139_a,worldInfoInstance,2, +field_85141_a,worldInfoInstance,2, +field_85143_a,worldInfoInstance,2, field_85180_cf,recordWait,2, field_85185_A,touchscreen,2, +field_85192_a,worldServerInstance,2, field_90017_e,isMacOs,2, field_90018_r,isRightMouseClick,2,Used when touchscreen is enabled field_90044_b,records,2,List of all record items and their names. +field_92009_j,explosionStrength,2,The explosion radius of spawned fireballs. +field_92010_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes. +field_92011_a,fireworkAge,2,The age of the firework in ticks. +field_92014_j,explosionStrength,2,The explosion radius of spawned fireballs. +field_92017_j,spawnedMob,2, +field_92052_bU,firework,2, +field_92053_bW,enchantedBook,2, +field_92054_bV,fireworkCharge,2, +field_92055_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes. +field_92056_a,fireworkAge,2,The age of the firework in ticks. +field_92104_bU,firework,2, +field_92105_bW,enchantedBook,2, +field_92106_bV,fireworkCharge,2, diff --git a/conf/joined.exc b/conf/joined.exc index 929704fa25..39b50424e2 100644 --- a/conf/joined.exc +++ b/conf/joined.exc @@ -1397,7 +1397,6 @@ net/minecraft/src/CallableParticleScreenName.(Lnet/minecraft/client/Minecr net/minecraft/src/CallableScreenName.(Lnet/minecraft/src/EntityRenderer;)V=|p_i7006_1_ net/minecraft/src/CallableScreenSize.(Lnet/minecraft/src/EntityRenderer;Lnet/minecraft/src/ScaledResolution;)V=|p_i7004_1_,p_i7004_2_ net/minecraft/src/CallableServerMemoryStats.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5042_1_ -net/minecraft/src/CallableServerMemoryStats.func_92022_a()Ljava/lang/String;=| net/minecraft/src/CallableServerProfiler.(Lnet/minecraft/server/MinecraftServer;)V=|p_i3373_1_ net/minecraft/src/CallableServerType.(Lnet/minecraft/src/DedicatedServer;)V=|p_i6810_1_ net/minecraft/src/CallableStructureType.(Lnet/minecraft/src/MapGenStructure;)V=|p_i6819_1_ @@ -2002,7 +2001,6 @@ net/minecraft/src/ConvertingProgressUpdate.func_73720_a(Ljava/lang/String;)V=|p_ net/minecraft/src/ConvertingProgressUpdate.func_73721_b(Ljava/lang/String;)V=|p_73721_1_ net/minecraft/src/CraftingManager.func_77596_b(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)V=|p_77596_1_,p_77596_2_ net/minecraft/src/CraftingManager.func_82787_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Lnet/minecraft/src/ItemStack;=|p_82787_1_,p_82787_2_ -net/minecraft/src/CraftingManager.func_92051_a(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/src/ShapedRecipes;=|p_92051_1_,p_92051_2_ net/minecraft/src/CraftingManager.func_92103_a(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/src/ShapedRecipes;=|p_92103_1_,p_92103_2_ net/minecraft/src/CrashReport.(Ljava/lang/String;Ljava/lang/Throwable;)V=|p_i3250_1_,p_i3250_2_ net/minecraft/src/CrashReport.func_71506_a(Ljava/lang/StringBuilder;)V=|p_71506_1_ @@ -2064,7 +2062,6 @@ net/minecraft/src/DamageSource.func_76358_a(Lnet/minecraft/src/EntityLiving;)Lne net/minecraft/src/DamageSource.func_76360_b(Lnet/minecraft/src/EntityPlayer;)Ljava/lang/String;=|p_76360_1_ net/minecraft/src/DamageSource.func_76362_a(Lnet/minecraft/src/EntityFireball;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;=|p_76362_0_,p_76362_1_ net/minecraft/src/DamageSource.func_76365_a(Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/DamageSource;=|p_76365_0_ -net/minecraft/src/DamageSource.func_92036_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;=|p_92036_0_ net/minecraft/src/DamageSource.func_92087_a(Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource;=|p_92087_0_ net/minecraft/src/DataWatcher.func_75679_c(I)I=|p_75679_1_ net/minecraft/src/DataWatcher.func_75680_a(Ljava/util/List;Ljava/io/DataOutputStream;)V=java/io/IOException|p_75680_0_,p_75680_1_ @@ -2081,7 +2078,6 @@ net/minecraft/src/DataWatcher.func_75693_b(I)S=|p_75693_1_ net/minecraft/src/DataWatcher.func_82708_h(I)V=|p_82708_1_ net/minecraft/src/DataWatcher.func_82709_a(II)V=|p_82709_1_,p_82709_2_ net/minecraft/src/DataWatcher.func_82710_f(I)Lnet/minecraft/src/ItemStack;=|p_82710_1_ -net/minecraft/src/DataWatcher.func_92034_d()Z=| net/minecraft/src/DedicatedPlayerList.(Lnet/minecraft/src/DedicatedServer;)V=|p_i3378_1_ net/minecraft/src/DedicatedPlayerList.func_72359_h(Ljava/lang/String;)V=|p_72359_1_ net/minecraft/src/DedicatedPlayerList.func_72360_c(Ljava/lang/String;)V=|p_72360_1_ @@ -2172,7 +2168,6 @@ net/minecraft/src/Enchantment.func_77321_a(I)I=|p_77321_1_ net/minecraft/src/Enchantment.func_77322_b(Ljava/lang/String;)Lnet/minecraft/src/Enchantment;=|p_77322_1_ net/minecraft/src/Enchantment.func_77323_a(ILnet/minecraft/src/EntityLiving;)I=|p_77323_1_,p_77323_2_ net/minecraft/src/Enchantment.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_ -net/minecraft/src/Enchantment.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_ net/minecraft/src/Enchantment.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_ net/minecraft/src/EnchantmentArrowDamage.(II)V=|p_i3702_1_,p_i3702_2_ net/minecraft/src/EnchantmentArrowDamage.func_77317_b(I)I=|p_77317_1_ @@ -2191,20 +2186,16 @@ net/minecraft/src/EnchantmentDamage.func_77317_b(I)I=|p_77317_1_ net/minecraft/src/EnchantmentDamage.func_77321_a(I)I=|p_77321_1_ net/minecraft/src/EnchantmentDamage.func_77323_a(ILnet/minecraft/src/EntityLiving;)I=|p_77323_1_,p_77323_2_ net/minecraft/src/EnchantmentDamage.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_ -net/minecraft/src/EnchantmentDamage.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_ net/minecraft/src/EnchantmentDamage.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_ net/minecraft/src/EnchantmentData.(II)V=|p_i8014_1_,p_i8014_2_ net/minecraft/src/EnchantmentData.(Lnet/minecraft/src/Enchantment;I)V=|p_i3713_1_,p_i3713_2_ net/minecraft/src/EnchantmentDigging.(II)V=|p_i3708_1_,p_i3708_2_ net/minecraft/src/EnchantmentDigging.func_77317_b(I)I=|p_77317_1_ net/minecraft/src/EnchantmentDigging.func_77321_a(I)I=|p_77321_1_ -net/minecraft/src/EnchantmentDigging.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_ net/minecraft/src/EnchantmentDigging.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_ net/minecraft/src/EnchantmentDurability.(II)V=|p_i3707_1_,p_i3707_2_ net/minecraft/src/EnchantmentDurability.func_77317_b(I)I=|p_77317_1_ net/minecraft/src/EnchantmentDurability.func_77321_a(I)I=|p_77321_1_ -net/minecraft/src/EnchantmentDurability.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_ -net/minecraft/src/EnchantmentDurability.func_92045_a(Lnet/minecraft/src/ItemStack;ILjava/util/Random;)Z=|p_92045_0_,p_92045_1_,p_92045_2_ net/minecraft/src/EnchantmentDurability.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_ net/minecraft/src/EnchantmentDurability.func_92097_a(Lnet/minecraft/src/ItemStack;ILjava/util/Random;)Z=|p_92097_0_,p_92097_1_,p_92097_2_ net/minecraft/src/EnchantmentFireAspect.(II)V=|p_i3714_1_,p_i3714_2_ @@ -2230,8 +2221,6 @@ net/minecraft/src/EnchantmentHelper.func_77519_f(Lnet/minecraft/src/EntityLiving net/minecraft/src/EnchantmentHelper.func_82781_a(Lnet/minecraft/src/ItemStack;)Ljava/util/Map;=|p_82781_0_ net/minecraft/src/EnchantmentHelper.func_82782_a(Ljava/util/Map;Lnet/minecraft/src/ItemStack;)V=|p_82782_0_,p_82782_1_ net/minecraft/src/EnchantmentHelper.func_90036_a(Lnet/minecraft/src/EntityLiving;)I=|p_90036_0_ -net/minecraft/src/EnchantmentHelper.func_92046_i(Lnet/minecraft/src/EntityLiving;)I=|p_92046_0_ -net/minecraft/src/EnchantmentHelper.func_92047_a(Lnet/minecraft/src/Enchantment;Lnet/minecraft/src/EntityLiving;)Lnet/minecraft/src/ItemStack;=|p_92047_0_,p_92047_1_ net/minecraft/src/EnchantmentHelper.func_92098_i(Lnet/minecraft/src/EntityLiving;)I=|p_92098_0_ net/minecraft/src/EnchantmentHelper.func_92099_a(Lnet/minecraft/src/Enchantment;Lnet/minecraft/src/EntityLiving;)Lnet/minecraft/src/ItemStack;=|p_92099_0_,p_92099_1_ net/minecraft/src/EnchantmentKnockback.(II)V=|p_i3715_1_,p_i3715_2_ @@ -2254,17 +2243,11 @@ net/minecraft/src/EnchantmentProtection.func_77317_b(I)I=|p_77317_1_ net/minecraft/src/EnchantmentProtection.func_77318_a(ILnet/minecraft/src/DamageSource;)I=|p_77318_1_,p_77318_2_ net/minecraft/src/EnchantmentProtection.func_77321_a(I)I=|p_77321_1_ net/minecraft/src/EnchantmentProtection.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_ -net/minecraft/src/EnchantmentProtection.func_92040_a(Lnet/minecraft/src/Entity;D)D=|p_92040_0_,p_92040_1_ -net/minecraft/src/EnchantmentProtection.func_92041_a(Lnet/minecraft/src/Entity;I)I=|p_92041_0_,p_92041_1_ net/minecraft/src/EnchantmentProtection.func_92092_a(Lnet/minecraft/src/Entity;D)D=|p_92092_0_,p_92092_1_ net/minecraft/src/EnchantmentProtection.func_92093_a(Lnet/minecraft/src/Entity;I)I=|p_92093_0_,p_92093_1_ net/minecraft/src/EnchantmentThorns.(II)V=|p_i8015_1_,p_i8015_2_ net/minecraft/src/EnchantmentThorns.func_77317_b(I)I=|p_77317_1_ net/minecraft/src/EnchantmentThorns.func_77321_a(I)I=|p_77321_1_ -net/minecraft/src/EnchantmentThorns.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_ -net/minecraft/src/EnchantmentThorns.func_92042_a(ILjava/util/Random;)Z=|p_92042_0_,p_92042_1_ -net/minecraft/src/EnchantmentThorns.func_92043_b(ILjava/util/Random;)I=|p_92043_0_,p_92043_1_ -net/minecraft/src/EnchantmentThorns.func_92044_a(Lnet/minecraft/src/Entity;Lnet/minecraft/src/EntityLiving;Ljava/util/Random;)V=|p_92044_0_,p_92044_1_,p_92044_2_ net/minecraft/src/EnchantmentThorns.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_ net/minecraft/src/EnchantmentThorns.func_92094_a(ILjava/util/Random;)Z=|p_92094_0_,p_92094_1_ net/minecraft/src/EnchantmentThorns.func_92095_b(ILjava/util/Random;)I=|p_92095_0_,p_92095_1_ @@ -2273,7 +2256,6 @@ net/minecraft/src/EnchantmentUntouching.(II)V=|p_i3719_1_,p_i3719_2_ net/minecraft/src/EnchantmentUntouching.func_77317_b(I)I=|p_77317_1_ net/minecraft/src/EnchantmentUntouching.func_77321_a(I)I=|p_77321_1_ net/minecraft/src/EnchantmentUntouching.func_77326_a(Lnet/minecraft/src/Enchantment;)Z=|p_77326_1_ -net/minecraft/src/EnchantmentUntouching.func_92037_a(Lnet/minecraft/src/ItemStack;)Z=|p_92037_1_ net/minecraft/src/EnchantmentUntouching.func_92089_a(Lnet/minecraft/src/ItemStack;)Z=|p_92089_1_ net/minecraft/src/EnchantmentWaterWorker.(II)V=|p_i3720_1_,p_i3720_2_ net/minecraft/src/EnchantmentWaterWorker.func_77317_b(I)I=|p_77317_1_ @@ -2714,8 +2696,6 @@ net/minecraft/src/EntityItem.func_70097_a(Lnet/minecraft/src/DamageSource;I)Z=|p net/minecraft/src/EntityItem.func_70100_b_(Lnet/minecraft/src/EntityPlayer;)V=|p_70100_1_ net/minecraft/src/EntityItem.func_70289_a(Lnet/minecraft/src/EntityItem;)Z=|p_70289_1_ net/minecraft/src/EntityItem.func_71027_c(I)V=|p_71027_1_ -net/minecraft/src/EntityItem.func_92013_a(Lnet/minecraft/src/ItemStack;)V=|p_92013_1_ -net/minecraft/src/EntityItem.func_92014_d()Lnet/minecraft/src/ItemStack;=| net/minecraft/src/EntityItem.func_92058_a(Lnet/minecraft/src/ItemStack;)V=|p_92058_1_ net/minecraft/src/EntityItemFrame.(Lnet/minecraft/src/World;)V=|p_i5055_1_ net/minecraft/src/EntityItemFrame.(Lnet/minecraft/src/World;IIII)V=|p_i5056_1_,p_i5056_2_,p_i5056_3_,p_i5056_4_,p_i5056_5_ @@ -4195,12 +4175,6 @@ net/minecraft/src/ItemEnchantedBook.func_77613_e(Lnet/minecraft/src/ItemStack;)L net/minecraft/src/ItemEnchantedBook.func_77616_k(Lnet/minecraft/src/ItemStack;)Z=|p_77616_1_ net/minecraft/src/ItemEnchantedBook.func_77624_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Ljava/util/List;Z)V=|p_77624_1_,p_77624_2_,p_77624_3_,p_77624_4_ net/minecraft/src/ItemEnchantedBook.func_77636_d(Lnet/minecraft/src/ItemStack;)Z=|p_77636_1_ -net/minecraft/src/ItemEnchantedBook.func_92055_a(Ljava/util/Random;)Lnet/minecraft/src/ItemStack;=|p_92055_1_ -net/minecraft/src/ItemEnchantedBook.func_92056_g(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/NBTTagList;=|p_92056_1_ -net/minecraft/src/ItemEnchantedBook.func_92057_a(Lnet/minecraft/src/EnchantmentData;)Lnet/minecraft/src/ItemStack;=|p_92057_1_ -net/minecraft/src/ItemEnchantedBook.func_92058_a(Ljava/util/Random;III)Lnet/minecraft/src/WeightedRandomChestContent;=|p_92058_1_,p_92058_2_,p_92058_3_,p_92058_4_ -net/minecraft/src/ItemEnchantedBook.func_92059_b(Ljava/util/Random;)Lnet/minecraft/src/WeightedRandomChestContent;=|p_92059_1_ -net/minecraft/src/ItemEnchantedBook.func_92060_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EnchantmentData;)V=|p_92060_1_,p_92060_2_ net/minecraft/src/ItemEnchantedBook.func_92109_a(Ljava/util/Random;)Lnet/minecraft/src/ItemStack;=|p_92109_1_ net/minecraft/src/ItemEnchantedBook.func_92110_g(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/NBTTagList;=|p_92110_1_ net/minecraft/src/ItemEnchantedBook.func_92111_a(Lnet/minecraft/src/EnchantmentData;)Lnet/minecraft/src/ItemStack;=|p_92111_1_ @@ -4556,8 +4530,8 @@ net/minecraft/src/MerchantRecipeList.func_77203_a(Lnet/minecraft/src/ItemStack;L net/minecraft/src/MerchantRecipeList.func_77204_a(Ljava/io/DataInputStream;)Lnet/minecraft/src/MerchantRecipeList;=java/io/IOException|p_77204_0_ net/minecraft/src/MerchantRecipeList.func_77205_a(Lnet/minecraft/src/MerchantRecipe;)V=|p_77205_1_ net/minecraft/src/MinecraftAppletImpl.(Lnet/minecraft/client/MinecraftApplet;Ljava/awt/Canvas;Lnet/minecraft/client/MinecraftApplet;IIZ)V=|p_i3013_1_,p_i3013_2_,p_i3013_3_,p_i3013_4_,p_i3013_5_,p_i3013_6_ -net/minecraft/src/MinecraftAppletImpl.func_71406_c(Lnet/minecraft/src/CrashReport;)V=|p_71406_1_ net/minecraft/src/MinecraftAppletImpl.func_71384_a()V=org/lwjgl/LWJGLException| +net/minecraft/src/MinecraftAppletImpl.func_71406_c(Lnet/minecraft/src/CrashReport;)V=|p_71406_1_ net/minecraft/src/MinecraftException.(Ljava/lang/String;)V=|p_i3733_1_ net/minecraft/src/MinecraftFakeLauncher.(Ljava/util/Map;)V=|p_i3001_1_ net/minecraft/src/MinecraftFakeLauncher.appletResize(II)V=|p_appletResize_1_,p_appletResize_2_ @@ -6054,7 +6028,6 @@ net/minecraft/src/ServerConfigurationManager.func_72397_a(Lnet/minecraft/src/Ent net/minecraft/src/ServerConfigurationManager.func_72399_a(Ljava/net/SocketAddress;Ljava/lang/String;)Ljava/lang/String;=|p_72399_1_,p_72399_2_ net/minecraft/src/ServerConfigurationManager.func_82448_a(Lnet/minecraft/src/Entity;ILnet/minecraft/src/WorldServer;Lnet/minecraft/src/WorldServer;)V=|p_82448_1_,p_82448_2_,p_82448_3_,p_82448_4_ net/minecraft/src/ServerConfigurationManager.func_82449_a(Lnet/minecraft/src/ChunkCoordinates;IIIIII)Ljava/util/List;=|p_82449_1_,p_82449_2_,p_82449_3_,p_82449_4_,p_82449_5_,p_82449_6_,p_82449_7_ -net/minecraft/src/ServerConfigurationManager.func_92027_k(Ljava/lang/String;)V=|p_92027_1_ net/minecraft/src/ServerConfigurationManager.func_92062_k(Ljava/lang/String;)V=|p_92062_1_ net/minecraft/src/ServerData.(Ljava/lang/String;Ljava/lang/String;)V=|p_i3107_1_,p_i3107_2_ net/minecraft/src/ServerData.func_78837_a(Lnet/minecraft/src/NBTTagCompound;)Lnet/minecraft/src/ServerData;=|p_78837_0_ @@ -6088,7 +6061,6 @@ net/minecraft/src/ShapedRecipes.(II[Lnet/minecraft/src/ItemStack;Lnet/mine net/minecraft/src/ShapedRecipes.func_77569_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Z=|p_77569_1_,p_77569_2_ net/minecraft/src/ShapedRecipes.func_77572_b(Lnet/minecraft/src/InventoryCrafting;)Lnet/minecraft/src/ItemStack;=|p_77572_1_ net/minecraft/src/ShapedRecipes.func_77573_a(Lnet/minecraft/src/InventoryCrafting;IIZ)Z=|p_77573_1_,p_77573_2_,p_77573_3_,p_77573_4_ -net/minecraft/src/ShapedRecipes.func_92048_c()Lnet/minecraft/src/ShapedRecipes;=| net/minecraft/src/ShapelessRecipes.(Lnet/minecraft/src/ItemStack;Ljava/util/List;)V=|p_i3701_1_,p_i3701_2_ net/minecraft/src/ShapelessRecipes.func_77569_a(Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Z=|p_77569_1_,p_77569_2_ net/minecraft/src/ShapelessRecipes.func_77572_b(Lnet/minecraft/src/InventoryCrafting;)Lnet/minecraft/src/ItemStack;=|p_77572_1_ @@ -6483,12 +6455,10 @@ net/minecraft/src/TileEntityMobSpawner.func_70310_b(Lnet/minecraft/src/NBTTagCom net/minecraft/src/TileEntityMobSpawner.func_70315_b(II)V=|p_70315_1_,p_70315_2_ net/minecraft/src/TileEntityMobSpawner.func_70383_a(Lnet/minecraft/src/Entity;)V=|p_70383_1_ net/minecraft/src/TileEntityMobSpawner.func_70385_a(Ljava/lang/String;)V=|p_70385_1_ -net/minecraft/src/TileEntityMobSpawner.func_92015_a()Ljava/lang/String;=| net/minecraft/src/TileEntityMobSpawnerRenderer.func_76894_a(Lnet/minecraft/src/TileEntity;DDDF)V=|p_76894_1_,p_76894_2_,p_76894_4_,p_76894_6_,p_76894_8_ net/minecraft/src/TileEntityMobSpawnerRenderer.func_76905_a(Lnet/minecraft/src/TileEntityMobSpawner;DDDF)V=|p_76905_1_,p_76905_2_,p_76905_4_,p_76905_6_,p_76905_8_ net/minecraft/src/TileEntityMobSpawnerSpawnData.(Lnet/minecraft/src/TileEntityMobSpawner;Lnet/minecraft/src/NBTTagCompound;)V=|p_i8017_1_,p_i8017_2_ net/minecraft/src/TileEntityMobSpawnerSpawnData.(Lnet/minecraft/src/TileEntityMobSpawner;Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i8018_1_,p_i8018_2_,p_i8018_3_ -net/minecraft/src/TileEntityMobSpawnerSpawnData.func_92030_a()Lnet/minecraft/src/NBTTagCompound;=| net/minecraft/src/TileEntityNote.func_70307_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_70307_1_ net/minecraft/src/TileEntityNote.func_70310_b(Lnet/minecraft/src/NBTTagCompound;)V=|p_70310_1_ net/minecraft/src/TileEntityNote.func_70414_a(Lnet/minecraft/src/World;III)V=|p_70414_1_,p_70414_2_,p_70414_3_,p_70414_4_ @@ -6602,7 +6572,6 @@ net/minecraft/src/WeightedRandomChestContent.(IIIII)V=|p_i3424_1_,p_i3424_ net/minecraft/src/WeightedRandomChestContent.(Lnet/minecraft/src/ItemStack;III)V=|p_i8006_1_,p_i8006_2_,p_i8006_3_,p_i8006_4_ net/minecraft/src/WeightedRandomChestContent.func_76293_a(Ljava/util/Random;[Lnet/minecraft/src/WeightedRandomChestContent;Lnet/minecraft/src/TileEntityChest;I)V=|p_76293_0_,p_76293_1_,p_76293_2_,p_76293_3_ net/minecraft/src/WeightedRandomChestContent.func_76294_a(Ljava/util/Random;[Lnet/minecraft/src/WeightedRandomChestContent;Lnet/minecraft/src/TileEntityDispenser;I)V=|p_76294_0_,p_76294_1_,p_76294_2_,p_76294_3_ -net/minecraft/src/WeightedRandomChestContent.func_92029_a([Lnet/minecraft/src/WeightedRandomChestContent;[Lnet/minecraft/src/WeightedRandomChestContent;)[Lnet/minecraft/src/WeightedRandomChestContent;=|p_92029_0_,p_92029_1_ net/minecraft/src/WeightedRandomChestContent.func_92080_a([Lnet/minecraft/src/WeightedRandomChestContent;[Lnet/minecraft/src/WeightedRandomChestContent;)[Lnet/minecraft/src/WeightedRandomChestContent;=|p_92080_0_,p_92080_1_ net/minecraft/src/WeightedRandomItem.(I)V=|p_i3423_1_ net/minecraft/src/World.(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String;Lnet/minecraft/src/WorldProvider;Lnet/minecraft/src/WorldSettings;Lnet/minecraft/src/Profiler;)V=|p_i3731_1_,p_i3731_2_,p_i3731_3_,p_i3731_4_,p_i3731_5_ diff --git a/conf/joined.srg b/conf/joined.srg index 675f63b13c..18b6da2c3d 100644 --- a/conf/joined.srg +++ b/conf/joined.srg @@ -2248,18 +2248,18 @@ FD: ans/a net/minecraft/src/TileEntityMobSpawner/field_70394_a FD: ans/b net/minecraft/src/TileEntityMobSpawner/field_70392_b FD: ans/c net/minecraft/src/TileEntityMobSpawner/field_70393_c FD: ans/d net/minecraft/src/TileEntityMobSpawner/field_70390_d -FD: ans/e net/minecraft/src/TileEntityMobSpawner/field_92016_e +FD: ans/e net/minecraft/src/TileEntityMobSpawner/field_92060_e FD: ans/f net/minecraft/src/TileEntityMobSpawner/field_70391_e FD: ans/g net/minecraft/src/TileEntityMobSpawner/field_70388_f FD: ans/h net/minecraft/src/TileEntityMobSpawner/field_70389_g FD: ans/i net/minecraft/src/TileEntityMobSpawner/field_70395_h -FD: ans/j net/minecraft/src/TileEntityMobSpawner/field_92017_j +FD: ans/j net/minecraft/src/TileEntityMobSpawner/field_70396_i FD: ans/r net/minecraft/src/TileEntityMobSpawner/field_82350_j FD: ans/s net/minecraft/src/TileEntityMobSpawner/field_82349_r FD: ans/t net/minecraft/src/TileEntityMobSpawner/field_82348_s -FD: ant/b net/minecraft/src/TileEntityMobSpawnerSpawnData/field_92032_b -FD: ant/c net/minecraft/src/TileEntityMobSpawnerSpawnData/field_92033_c -FD: ant/d net/minecraft/src/TileEntityMobSpawnerSpawnData/field_92031_d +FD: ant/b net/minecraft/src/TileEntityMobSpawnerSpawnData/field_92083_b +FD: ant/c net/minecraft/src/TileEntityMobSpawnerSpawnData/field_92084_c +FD: ant/d net/minecraft/src/TileEntityMobSpawnerSpawnData/field_92082_d FD: anu/a net/minecraft/src/TileEntityNote/field_70416_a FD: anu/b net/minecraft/src/TileEntityNote/field_70415_b FD: anv/a net/minecraft/src/TileEntitySign/field_70412_a @@ -4278,8 +4278,8 @@ FD: cl/d net/minecraft/src/Packet23VehicleSpawn/field_73522_d FD: cl/e net/minecraft/src/Packet23VehicleSpawn/field_73523_e FD: cl/f net/minecraft/src/Packet23VehicleSpawn/field_73520_f FD: cl/g net/minecraft/src/Packet23VehicleSpawn/field_73521_g -FD: cl/h net/minecraft/src/Packet23VehicleSpawn/field_92025_h -FD: cl/i net/minecraft/src/Packet23VehicleSpawn/field_92026_i +FD: cl/h net/minecraft/src/Packet23VehicleSpawn/field_92077_h +FD: cl/i net/minecraft/src/Packet23VehicleSpawn/field_92078_i FD: cl/j net/minecraft/src/Packet23VehicleSpawn/field_73527_h FD: cl/k net/minecraft/src/Packet23VehicleSpawn/field_73528_i FD: cm/a net/minecraft/src/Packet26EntityExpOrb/field_73533_a @@ -4419,7 +4419,7 @@ FD: dt/d net/minecraft/src/Packet56MapChunks/field_73586_d FD: dt/e net/minecraft/src/Packet56MapChunks/field_73587_e FD: dt/f net/minecraft/src/Packet56MapChunks/field_73584_f FD: dt/g net/minecraft/src/Packet56MapChunks/field_73585_g -FD: dt/h net/minecraft/src/Packet56MapChunks/field_92024_h +FD: dt/h net/minecraft/src/Packet56MapChunks/field_92076_h FD: dt/i net/minecraft/src/Packet56MapChunks/field_73591_h FD: du/a net/minecraft/src/Packet61DoorChange/field_73567_a FD: du/b net/minecraft/src/Packet61DoorChange/field_73565_b @@ -4591,15 +4591,15 @@ FD: ft/c net/minecraft/src/BehaviorDispenseBoat/field_82495_c FD: fu/b net/minecraft/src/BehaviorBucketFullDispense/field_82496_b FD: fu/c net/minecraft/src/BehaviorBucketFullDispense/field_82497_c FD: fv/b net/minecraft/src/BehaviorBucketEmptyDispense/field_82310_a -FD: fv/c net/minecraft/src/BehaviorBucketEmptyDispense/field_92018_c -FD: fw/a net/minecraft/src/ConvertingProgressUpdate/field_92020_a -FD: fw/b net/minecraft/src/ConvertingProgressUpdate/field_92019_b +FD: fv/c net/minecraft/src/BehaviorBucketEmptyDispense/field_92073_c +FD: fw/a net/minecraft/src/ConvertingProgressUpdate/field_92030_a +FD: fw/b net/minecraft/src/ConvertingProgressUpdate/field_92029_b FD: fx/a net/minecraft/src/ThreadDedicatedServer/field_92021_a FD: fy/a net/minecraft/src/ThreadMinecraftServer/field_82557_a FD: fz/a net/minecraft/src/CallableIsServerModded/field_82555_a FD: g/a net/minecraft/src/CallableJVMFlags/field_71488_a FD: ga/a net/minecraft/src/CallableServerProfiler/field_82552_a -FD: gb/a net/minecraft/src/CallableServerMemoryStats/field_92023_a +FD: gb/a net/minecraft/src/CallableServerMemoryStats/field_92075_a FD: gc/b net/minecraft/src/BehaviorEggDispense/field_82503_b FD: gd/b net/minecraft/src/BehaviorSnowballDispense/field_73716_a FD: ge/b net/minecraft/src/BehaviorExpBottleDispense/field_74274_a @@ -4799,7 +4799,7 @@ FD: it/g net/minecraft/src/NetLoginHandler/field_72535_g FD: it/h net/minecraft/src/NetLoginHandler/field_72543_h FD: it/i net/minecraft/src/NetLoginHandler/field_72544_i FD: it/j net/minecraft/src/NetLoginHandler/field_72541_j -FD: it/k net/minecraft/src/NetLoginHandler/field_92028_k +FD: it/k net/minecraft/src/NetLoginHandler/field_92079_k FD: it/l net/minecraft/src/NetLoginHandler/field_72542_k FD: iu/a net/minecraft/src/ThreadLoginVerifier/field_72590_a FD: iv/a net/minecraft/src/NetServerHandler/field_72577_a @@ -5346,7 +5346,7 @@ FD: mi/a_ net/minecraft/src/EntityCreature/field_70789_a FD: mi/b net/minecraft/src/EntityCreature/field_70787_b FD: mi/c net/minecraft/src/EntityCreature/field_70788_c FD: mi/d net/minecraft/src/EntityCreature/field_70786_d -FD: mj/a net/minecraft/src/DataWatcher/field_92035_a +FD: mj/a net/minecraft/src/DataWatcher/field_92086_a FD: mj/b net/minecraft/src/DataWatcher/field_75697_a FD: mj/c net/minecraft/src/DataWatcher/field_75695_b FD: mj/d net/minecraft/src/DataWatcher/field_75696_c @@ -5899,7 +5899,7 @@ FD: qg/f net/minecraft/src/EntityGhast/field_70794_e FD: qg/g net/minecraft/src/EntityGhast/field_70791_f FD: qg/h net/minecraft/src/EntityGhast/field_70792_g FD: qg/i net/minecraft/src/EntityGhast/field_70798_h -FD: qg/j net/minecraft/src/EntityGhast/field_92009_j +FD: qg/j net/minecraft/src/EntityGhast/field_92014_j FD: qk/d net/minecraft/src/EntityPigZombie/field_70837_d FD: qk/e net/minecraft/src/EntityPigZombie/field_70838_e FD: qm/d net/minecraft/src/EntitySilverfish/field_70843_d @@ -6022,8 +6022,8 @@ FD: rb/g net/minecraft/src/EntityFireball/field_70229_g FD: rb/h net/minecraft/src/EntityFireball/field_70237_h FD: rb/i net/minecraft/src/EntityFireball/field_70238_i FD: rb/j net/minecraft/src/EntityFireball/field_70236_j -FD: rc/a net/minecraft/src/EntityFireworkRocket/field_92011_a -FD: rc/b net/minecraft/src/EntityFireworkRocket/field_92010_b +FD: rc/a net/minecraft/src/EntityFireworkRocket/field_92056_a +FD: rc/b net/minecraft/src/EntityFireworkRocket/field_92055_b FD: rd/a net/minecraft/src/EntityFishHook/field_70206_a FD: rd/aA net/minecraft/src/EntityFishHook/field_70215_au FD: rd/aB net/minecraft/src/EntityFishHook/field_70213_av @@ -6044,7 +6044,7 @@ FD: rd/g net/minecraft/src/EntityFishHook/field_70201_g FD: rd/h net/minecraft/src/EntityFishHook/field_70214_h FD: rd/i net/minecraft/src/EntityFishHook/field_70216_i FD: rd/j net/minecraft/src/EntityFishHook/field_70211_j -FD: re/e net/minecraft/src/EntityLargeFireball/field_92012_e +FD: re/e net/minecraft/src/EntityLargeFireball/field_92057_e FD: ri/a net/minecraft/src/EntityThrowable/field_70193_a FD: ri/b net/minecraft/src/EntityThrowable/field_70191_b FD: ri/c net/minecraft/src/EntityThrowable/field_70189_d @@ -6310,9 +6310,9 @@ FD: up/bQ net/minecraft/src/Item/field_82799_bQ FD: up/bR net/minecraft/src/Item/field_82793_bR FD: up/bS net/minecraft/src/Item/field_82792_bS FD: up/bT net/minecraft/src/Item/field_82791_bT -FD: up/bU net/minecraft/src/Item/field_92052_bU -FD: up/bV net/minecraft/src/Item/field_92054_bV -FD: up/bW net/minecraft/src/Item/field_92053_bW +FD: up/bU net/minecraft/src/Item/field_92104_bU +FD: up/bV net/minecraft/src/Item/field_92106_bV +FD: up/bW net/minecraft/src/Item/field_92105_bW FD: up/bX net/minecraft/src/Item/field_77819_bI FD: up/bY net/minecraft/src/Item/field_77797_bJ FD: up/bZ net/minecraft/src/Item/field_77799_bK @@ -6453,7 +6453,7 @@ FD: vx/p net/minecraft/src/PotionHelper/field_77926_o FD: w/a net/minecraft/src/CommandBase/field_71533_a FD: wf/a net/minecraft/src/RecipesArmor/field_77611_a FD: wf/b net/minecraft/src/RecipesArmor/field_77610_b -FD: wh/a net/minecraft/src/RecipeFireworks/field_92050_a +FD: wh/a net/minecraft/src/RecipeFireworks/field_92102_a FD: wj/a net/minecraft/src/FurnaceRecipes/field_77606_a FD: wj/b net/minecraft/src/FurnaceRecipes/field_77604_b FD: wj/c net/minecraft/src/FurnaceRecipes/field_77605_c @@ -6466,7 +6466,7 @@ FD: wq/b net/minecraft/src/ShapedRecipes/field_77576_b FD: wq/c net/minecraft/src/ShapedRecipes/field_77577_c FD: wq/d net/minecraft/src/ShapedRecipes/field_77574_d FD: wq/e net/minecraft/src/ShapedRecipes/field_77575_e -FD: wq/f net/minecraft/src/ShapedRecipes/field_92049_f +FD: wq/f net/minecraft/src/ShapedRecipes/field_92101_f FD: wr/a net/minecraft/src/ShapelessRecipes/field_77580_a FD: wr/b net/minecraft/src/ShapelessRecipes/field_77579_b FD: wt/a net/minecraft/src/RecipesTools/field_77588_a @@ -6484,7 +6484,7 @@ FD: xc/A net/minecraft/src/Enchantment/field_77351_y FD: xc/B net/minecraft/src/Enchantment/field_77350_z FD: xc/a net/minecraft/src/Enchantment/field_77333_a FD: xc/b net/minecraft/src/Enchantment/field_77331_b -FD: xc/c net/minecraft/src/Enchantment/field_92038_c +FD: xc/c net/minecraft/src/Enchantment/field_92090_c FD: xc/d net/minecraft/src/Enchantment/field_77332_c FD: xc/e net/minecraft/src/Enchantment/field_77329_d FD: xc/f net/minecraft/src/Enchantment/field_77330_e @@ -6492,7 +6492,7 @@ FD: xc/g net/minecraft/src/Enchantment/field_77327_f FD: xc/h net/minecraft/src/Enchantment/field_77328_g FD: xc/i net/minecraft/src/Enchantment/field_77340_h FD: xc/j net/minecraft/src/Enchantment/field_77341_i -FD: xc/k net/minecraft/src/Enchantment/field_92039_k +FD: xc/k net/minecraft/src/Enchantment/field_92091_k FD: xc/l net/minecraft/src/Enchantment/field_77338_j FD: xc/m net/minecraft/src/Enchantment/field_77339_k FD: xc/n net/minecraft/src/Enchantment/field_77336_l @@ -8930,7 +8930,7 @@ MD: anr/k ()V net/minecraft/src/TileEntityFurnace/func_70399_k ()V MD: anr/k_ ()I net/minecraft/src/TileEntityFurnace/func_70302_i_ ()I MD: anr/l_ ()V net/minecraft/src/TileEntityFurnace/func_70295_k_ ()V MD: anr/u ()Z net/minecraft/src/TileEntityFurnace/func_70402_r ()Z -MD: ans/a ()Ljava/lang/String; net/minecraft/src/TileEntityMobSpawner/func_92015_a ()Ljava/lang/String; +MD: ans/a ()Ljava/lang/String; net/minecraft/src/TileEntityMobSpawner/func_70384_a ()Ljava/lang/String; MD: ans/a (Lbq;)V net/minecraft/src/TileEntityMobSpawner/func_70307_a (Lnet/minecraft/src/NBTTagCompound;)V MD: ans/a (Ljava/lang/String;)V net/minecraft/src/TileEntityMobSpawner/func_70385_a (Ljava/lang/String;)V MD: ans/a (Llq;)V net/minecraft/src/TileEntityMobSpawner/func_70383_a (Lnet/minecraft/src/Entity;)V @@ -8941,7 +8941,7 @@ MD: ans/c ()Llq; net/minecraft/src/TileEntityMobSpawner/func_70382_c ()Lnet/mine MD: ans/e ()V net/minecraft/src/TileEntityMobSpawner/func_70387_f ()V MD: ans/g ()V net/minecraft/src/TileEntityMobSpawner/func_70316_g ()V MD: ans/l ()Lef; net/minecraft/src/TileEntityMobSpawner/func_70319_e ()Lnet/minecraft/src/Packet; -MD: ant/a ()Lbq; net/minecraft/src/TileEntityMobSpawnerSpawnData/func_92030_a ()Lnet/minecraft/src/NBTTagCompound; +MD: ant/a ()Lbq; net/minecraft/src/TileEntityMobSpawnerSpawnData/func_92081_a ()Lnet/minecraft/src/NBTTagCompound; MD: anu/a ()V net/minecraft/src/TileEntityNote/func_70413_a ()V MD: anu/a (Lbq;)V net/minecraft/src/TileEntityNote/func_70307_a (Lnet/minecraft/src/NBTTagCompound;)V MD: anu/a (Lyc;III)V net/minecraft/src/TileEntityNote/func_70414_a (Lnet/minecraft/src/World;III)V @@ -12094,7 +12094,7 @@ MD: g/a ()Ljava/lang/String; net/minecraft/src/CallableJVMFlags/func_71487_a ()L MD: g/call ()Ljava/lang/Object; net/minecraft/src/CallableJVMFlags/call ()Ljava/lang/Object; MD: ga/a ()Ljava/lang/String; net/minecraft/src/CallableServerProfiler/func_82551_a ()Ljava/lang/String; MD: ga/call ()Ljava/lang/Object; net/minecraft/src/CallableServerProfiler/call ()Ljava/lang/Object; -MD: gb/a ()Ljava/lang/String; net/minecraft/src/CallableServerMemoryStats/func_92022_a ()Ljava/lang/String; +MD: gb/a ()Ljava/lang/String; net/minecraft/src/CallableServerMemoryStats/func_92074_a ()Ljava/lang/String; MD: gb/call ()Ljava/lang/Object; net/minecraft/src/CallableServerMemoryStats/call ()Ljava/lang/Object; MD: gc/a (Lyc;Lbg;)Lrf; net/minecraft/src/BehaviorEggDispense/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile; MD: gd/a (Lyc;Lbg;)Lrf; net/minecraft/src/BehaviorSnowballDispense/func_82499_a (Lnet/minecraft/src/World;Lnet/minecraft/src/IPosition;)Lnet/minecraft/src/IProjectile; @@ -12157,7 +12157,7 @@ MD: gm/i (Ljava/lang/String;)V net/minecraft/src/ServerConfigurationManager/func MD: gm/j ()V net/minecraft/src/ServerConfigurationManager/func_72362_j ()V MD: gm/j (Ljava/lang/String;)Ljava/util/List; net/minecraft/src/ServerConfigurationManager/func_72382_j (Ljava/lang/String;)Ljava/util/List; MD: gm/k ()I net/minecraft/src/ServerConfigurationManager/func_72394_k ()I -MD: gm/k (Ljava/lang/String;)V net/minecraft/src/ServerConfigurationManager/func_92027_k (Ljava/lang/String;)V +MD: gm/k (Ljava/lang/String;)V net/minecraft/src/ServerConfigurationManager/func_92062_k (Ljava/lang/String;)V MD: gm/l ()I net/minecraft/src/ServerConfigurationManager/func_72352_l ()I MD: gm/m ()[Ljava/lang/String; net/minecraft/src/ServerConfigurationManager/func_72373_m ()[Ljava/lang/String; MD: gm/n ()Z net/minecraft/src/ServerConfigurationManager/func_72383_n ()Z @@ -12869,7 +12869,7 @@ MD: ku/a (Ljava/util/Random;[Lkv;I)Lkv; net/minecraft/src/WeightedRandom/func_76 MD: ku/a ([Lkv;)I net/minecraft/src/WeightedRandom/func_76270_a ([Lnet/minecraft/src/WeightedRandomItem;)I MD: kw/a (Ljava/util/Random;[Lkw;Lanm;I)V net/minecraft/src/WeightedRandomChestContent/func_76293_a (Ljava/util/Random;[Lnet/minecraft/src/WeightedRandomChestContent;Lnet/minecraft/src/TileEntityChest;I)V MD: kw/a (Ljava/util/Random;[Lkw;Lano;I)V net/minecraft/src/WeightedRandomChestContent/func_76294_a (Ljava/util/Random;[Lnet/minecraft/src/WeightedRandomChestContent;Lnet/minecraft/src/TileEntityDispenser;I)V -MD: kw/a ([Lkw;[Lkw;)[Lkw; net/minecraft/src/WeightedRandomChestContent/func_92029_a ([Lnet/minecraft/src/WeightedRandomChestContent;[Lnet/minecraft/src/WeightedRandomChestContent;)[Lnet/minecraft/src/WeightedRandomChestContent; +MD: kw/a ([Lkw;[Lkw;)[Lkw; net/minecraft/src/WeightedRandomChestContent/func_92080_a ([Lnet/minecraft/src/WeightedRandomChestContent;[Lnet/minecraft/src/WeightedRandomChestContent;)[Lnet/minecraft/src/WeightedRandomChestContent; MD: kz/a (I)Lur; net/minecraft/src/InventoryLargeChest/func_70301_a (I)Lnet/minecraft/src/ItemStack; MD: kz/a (II)Lur; net/minecraft/src/InventoryLargeChest/func_70298_a (II)Lnet/minecraft/src/ItemStack; MD: kz/a (ILur;)V net/minecraft/src/InventoryLargeChest/func_70299_a (ILnet/minecraft/src/ItemStack;)V @@ -12934,7 +12934,7 @@ MD: lg/R ()Z net/minecraft/src/IPlayerUsage/func_70002_Q ()Z MD: lg/a (Lle;)V net/minecraft/src/IPlayerUsage/func_70000_a (Lnet/minecraft/src/PlayerUsageSnooper;)V MD: lg/b (Lle;)V net/minecraft/src/IPlayerUsage/func_70001_b (Lnet/minecraft/src/PlayerUsageSnooper;)V MD: lh/a ()Z net/minecraft/src/DamageSource/func_76352_a ()Z -MD: lh/a (Llq;)Llh; net/minecraft/src/DamageSource/func_92036_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource; +MD: lh/a (Llq;)Llh; net/minecraft/src/DamageSource/func_92087_a (Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource; MD: lh/a (Llq;Llq;)Llh; net/minecraft/src/DamageSource/func_76356_a (Lnet/minecraft/src/Entity;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/DamageSource; MD: lh/a (Lmd;)Llh; net/minecraft/src/DamageSource/func_76358_a (Lnet/minecraft/src/EntityLiving;)Lnet/minecraft/src/DamageSource; MD: lh/a (Lqx;)Llh; net/minecraft/src/DamageSource/func_76365_a (Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/DamageSource; @@ -13373,7 +13373,7 @@ MD: mj/b (I)S net/minecraft/src/DataWatcher/func_75693_b (I)S MD: mj/b (ILjava/lang/Object;)V net/minecraft/src/DataWatcher/func_75692_b (ILjava/lang/Object;)V MD: mj/c ()Ljava/util/List; net/minecraft/src/DataWatcher/func_75685_c ()Ljava/util/List; MD: mj/c (I)I net/minecraft/src/DataWatcher/func_75679_c (I)I -MD: mj/d ()Z net/minecraft/src/DataWatcher/func_92034_d ()Z +MD: mj/d ()Z net/minecraft/src/DataWatcher/func_92085_d ()Z MD: mj/e (I)Ljava/lang/String; net/minecraft/src/DataWatcher/func_75681_e (I)Ljava/lang/String; MD: mj/f (I)Lur; net/minecraft/src/DataWatcher/func_82710_f (I)Lnet/minecraft/src/ItemStack; MD: mj/h (I)V net/minecraft/src/DataWatcher/func_82708_h (I)V @@ -14258,14 +14258,14 @@ MD: px/a ()V net/minecraft/src/EntityItem/func_70088_a ()V MD: px/a (Lbq;)V net/minecraft/src/EntityItem/func_70037_a (Lnet/minecraft/src/NBTTagCompound;)V MD: px/a (Llh;I)Z net/minecraft/src/EntityItem/func_70097_a (Lnet/minecraft/src/DamageSource;I)Z MD: px/a (Lpx;)Z net/minecraft/src/EntityItem/func_70289_a (Lnet/minecraft/src/EntityItem;)Z -MD: px/a (Lur;)V net/minecraft/src/EntityItem/func_92013_a (Lnet/minecraft/src/ItemStack;)V +MD: px/a (Lur;)V net/minecraft/src/EntityItem/func_92058_a (Lnet/minecraft/src/ItemStack;)V MD: px/an ()Ljava/lang/String; net/minecraft/src/EntityItem/func_70023_ak ()Ljava/lang/String; MD: px/aq ()Z net/minecraft/src/EntityItem/func_70075_an ()Z MD: px/b (I)V net/minecraft/src/EntityItem/func_71027_c (I)V MD: px/b (Lbq;)V net/minecraft/src/EntityItem/func_70014_b (Lnet/minecraft/src/NBTTagCompound;)V MD: px/c ()V net/minecraft/src/EntityItem/func_70288_d ()V MD: px/c_ (Lqx;)V net/minecraft/src/EntityItem/func_70100_b_ (Lnet/minecraft/src/EntityPlayer;)V -MD: px/d ()Lur; net/minecraft/src/EntityItem/func_92014_d ()Lnet/minecraft/src/ItemStack; +MD: px/d ()Lur; net/minecraft/src/EntityItem/func_92059_d ()Lnet/minecraft/src/ItemStack; MD: px/d (I)V net/minecraft/src/EntityItem/func_70081_e (I)V MD: px/f_ ()Z net/minecraft/src/EntityItem/func_70041_e_ ()Z MD: px/g ()V net/minecraft/src/EntityItem/func_85054_d ()V @@ -15194,17 +15194,17 @@ MD: u/a ()Ljava/lang/String; net/minecraft/src/ChatAllowedCharacters/func_71564_ MD: u/a (C)Z net/minecraft/src/ChatAllowedCharacters/func_71566_a (C)Z MD: u/a (Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/ChatAllowedCharacters/func_71565_a (Ljava/lang/String;)Ljava/lang/String; MD: ua/a (Lur;Lyc;Lqx;)Lur; net/minecraft/src/ItemEmptyMap/func_77659_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack; -MD: ub/a (Ljava/util/Random;)Lur; net/minecraft/src/ItemEnchantedBook/func_92055_a (Ljava/util/Random;)Lnet/minecraft/src/ItemStack; -MD: ub/a (Ljava/util/Random;III)Lkw; net/minecraft/src/ItemEnchantedBook/func_92058_a (Ljava/util/Random;III)Lnet/minecraft/src/WeightedRandomChestContent; +MD: ub/a (Ljava/util/Random;)Lur; net/minecraft/src/ItemEnchantedBook/func_92109_a (Ljava/util/Random;)Lnet/minecraft/src/ItemStack; +MD: ub/a (Ljava/util/Random;III)Lkw; net/minecraft/src/ItemEnchantedBook/func_92112_a (Ljava/util/Random;III)Lnet/minecraft/src/WeightedRandomChestContent; MD: ub/a (Lur;Lqx;Ljava/util/List;Z)V net/minecraft/src/ItemEnchantedBook/func_77624_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Ljava/util/List;Z)V -MD: ub/a (Lur;Lxj;)V net/minecraft/src/ItemEnchantedBook/func_92060_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EnchantmentData;)V +MD: ub/a (Lur;Lxj;)V net/minecraft/src/ItemEnchantedBook/func_92115_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EnchantmentData;)V MD: ub/a (Lxc;Ljava/util/List;)V net/minecraft/src/ItemEnchantedBook/func_92113_a (Lnet/minecraft/src/Enchantment;Ljava/util/List;)V -MD: ub/a (Lxj;)Lur; net/minecraft/src/ItemEnchantedBook/func_92057_a (Lnet/minecraft/src/EnchantmentData;)Lnet/minecraft/src/ItemStack; -MD: ub/b (Ljava/util/Random;)Lkw; net/minecraft/src/ItemEnchantedBook/func_92059_b (Ljava/util/Random;)Lnet/minecraft/src/WeightedRandomChestContent; +MD: ub/a (Lxj;)Lur; net/minecraft/src/ItemEnchantedBook/func_92111_a (Lnet/minecraft/src/EnchantmentData;)Lnet/minecraft/src/ItemStack; +MD: ub/b (Ljava/util/Random;)Lkw; net/minecraft/src/ItemEnchantedBook/func_92114_b (Ljava/util/Random;)Lnet/minecraft/src/WeightedRandomChestContent; MD: ub/d_ (Lur;)Z net/minecraft/src/ItemEnchantedBook/func_77616_k (Lnet/minecraft/src/ItemStack;)Z MD: ub/e (Lur;)Z net/minecraft/src/ItemEnchantedBook/func_77636_d (Lnet/minecraft/src/ItemStack;)Z MD: ub/f (Lur;)Lvb; net/minecraft/src/ItemEnchantedBook/func_77613_e (Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EnumRarity; -MD: ub/g (Lur;)Lby; net/minecraft/src/ItemEnchantedBook/func_92056_g (Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/NBTTagList; +MD: ub/g (Lur;)Lby; net/minecraft/src/ItemEnchantedBook/func_92110_g (Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/NBTTagList; MD: uc/a (Lur;Lqx;Lyc;IIIIFFF)Z net/minecraft/src/ItemEnderEye/func_77648_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/EntityPlayer;Lnet/minecraft/src/World;IIIIFFF)Z MD: uc/a (Lur;Lyc;Lqx;)Lur; net/minecraft/src/ItemEnderEye/func_77659_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack; MD: ud/a (Lur;Lyc;Lqx;)Lur; net/minecraft/src/ItemEnderPearl/func_77659_a (Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;)Lnet/minecraft/src/ItemStack; @@ -15544,7 +15544,7 @@ MD: wl/a (Lry;Lyc;)Z net/minecraft/src/RecipesMapExtending/func_77569_a (Lnet/mi MD: wm/a (Lwn;)V net/minecraft/src/RecipesIngots/func_77590_a (Lnet/minecraft/src/CraftingManager;)V MD: wn/a ()Lwn; net/minecraft/src/CraftingManager/func_77594_a ()Lnet/minecraft/src/CraftingManager; MD: wn/a (Lry;Lyc;)Lur; net/minecraft/src/CraftingManager/func_82787_a (Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Lnet/minecraft/src/ItemStack; -MD: wn/a (Lur;[Ljava/lang/Object;)Lwq; net/minecraft/src/CraftingManager/func_92051_a (Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/src/ShapedRecipes; +MD: wn/a (Lur;[Ljava/lang/Object;)Lwq; net/minecraft/src/CraftingManager/func_92103_a (Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/src/ShapedRecipes; MD: wn/b ()Ljava/util/List; net/minecraft/src/CraftingManager/func_77592_b ()Ljava/util/List; MD: wn/b (Lur;[Ljava/lang/Object;)V net/minecraft/src/CraftingManager/func_77596_b (Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)V MD: wo/a (Lwp;Lwp;)I net/minecraft/src/RecipeSorter/func_77581_a (Lnet/minecraft/src/IRecipe;Lnet/minecraft/src/IRecipe;)I @@ -15558,7 +15558,7 @@ MD: wq/a (Lry;)Lur; net/minecraft/src/ShapedRecipes/func_77572_b (Lnet/minecraft MD: wq/a (Lry;IIZ)Z net/minecraft/src/ShapedRecipes/func_77573_a (Lnet/minecraft/src/InventoryCrafting;IIZ)Z MD: wq/a (Lry;Lyc;)Z net/minecraft/src/ShapedRecipes/func_77569_a (Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Z MD: wq/b ()Lur; net/minecraft/src/ShapedRecipes/func_77571_b ()Lnet/minecraft/src/ItemStack; -MD: wq/c ()Lwq; net/minecraft/src/ShapedRecipes/func_92048_c ()Lnet/minecraft/src/ShapedRecipes; +MD: wq/c ()Lwq; net/minecraft/src/ShapedRecipes/func_92100_c ()Lnet/minecraft/src/ShapedRecipes; MD: wr/a ()I net/minecraft/src/ShapelessRecipes/func_77570_a ()I MD: wr/a (Lry;)Lur; net/minecraft/src/ShapelessRecipes/func_77572_b (Lnet/minecraft/src/InventoryCrafting;)Lnet/minecraft/src/ItemStack; MD: wr/a (Lry;Lyc;)Z net/minecraft/src/ShapelessRecipes/func_77569_a (Lnet/minecraft/src/InventoryCrafting;Lnet/minecraft/src/World;)Z @@ -15581,7 +15581,7 @@ MD: wy/b (I)I net/minecraft/src/EnchantmentArrowKnockback/func_77317_b (I)I MD: wz/a ()Ljava/lang/String; net/minecraft/src/EnchantmentDamage/func_77320_a ()Ljava/lang/String; MD: wz/a (I)I net/minecraft/src/EnchantmentDamage/func_77321_a (I)I MD: wz/a (ILmd;)I net/minecraft/src/EnchantmentDamage/func_77323_a (ILnet/minecraft/src/EntityLiving;)I -MD: wz/a (Lur;)Z net/minecraft/src/EnchantmentDamage/func_92037_a (Lnet/minecraft/src/ItemStack;)Z +MD: wz/a (Lur;)Z net/minecraft/src/EnchantmentDamage/func_92089_a (Lnet/minecraft/src/ItemStack;)Z MD: wz/a (Lxc;)Z net/minecraft/src/EnchantmentDamage/func_77326_a (Lnet/minecraft/src/Enchantment;)Z MD: wz/b ()I net/minecraft/src/EnchantmentDamage/func_77325_b ()I MD: wz/b (I)I net/minecraft/src/EnchantmentDamage/func_77317_b (I)I @@ -15593,19 +15593,19 @@ MD: x/a (Ly;[Ljava/lang/String;)I net/minecraft/src/CommandHandler/func_82370_a MD: x/a ([Ljava/lang/String;)[Ljava/lang/String; net/minecraft/src/CommandHandler/func_71559_a ([Ljava/lang/String;)[Ljava/lang/String; MD: x/b (Laa;Ljava/lang/String;)Ljava/util/List; net/minecraft/src/CommandHandler/func_71558_b (Lnet/minecraft/src/ICommandSender;Ljava/lang/String;)Ljava/util/List; MD: xa/a (I)I net/minecraft/src/EnchantmentDurability/func_77321_a (I)I -MD: xa/a (Lur;)Z net/minecraft/src/EnchantmentDurability/func_92037_a (Lnet/minecraft/src/ItemStack;)Z -MD: xa/a (Lur;ILjava/util/Random;)Z net/minecraft/src/EnchantmentDurability/func_92045_a (Lnet/minecraft/src/ItemStack;ILjava/util/Random;)Z +MD: xa/a (Lur;)Z net/minecraft/src/EnchantmentDurability/func_92089_a (Lnet/minecraft/src/ItemStack;)Z +MD: xa/a (Lur;ILjava/util/Random;)Z net/minecraft/src/EnchantmentDurability/func_92097_a (Lnet/minecraft/src/ItemStack;ILjava/util/Random;)Z MD: xa/b ()I net/minecraft/src/EnchantmentDurability/func_77325_b ()I MD: xa/b (I)I net/minecraft/src/EnchantmentDurability/func_77317_b (I)I MD: xb/a (I)I net/minecraft/src/EnchantmentDigging/func_77321_a (I)I -MD: xb/a (Lur;)Z net/minecraft/src/EnchantmentDigging/func_92037_a (Lnet/minecraft/src/ItemStack;)Z +MD: xb/a (Lur;)Z net/minecraft/src/EnchantmentDigging/func_92089_a (Lnet/minecraft/src/ItemStack;)Z MD: xb/b ()I net/minecraft/src/EnchantmentDigging/func_77325_b ()I MD: xb/b (I)I net/minecraft/src/EnchantmentDigging/func_77317_b (I)I MD: xc/a ()Ljava/lang/String; net/minecraft/src/Enchantment/func_77320_a ()Ljava/lang/String; MD: xc/a (I)I net/minecraft/src/Enchantment/func_77321_a (I)I MD: xc/a (ILlh;)I net/minecraft/src/Enchantment/func_77318_a (ILnet/minecraft/src/DamageSource;)I MD: xc/a (ILmd;)I net/minecraft/src/Enchantment/func_77323_a (ILnet/minecraft/src/EntityLiving;)I -MD: xc/a (Lur;)Z net/minecraft/src/Enchantment/func_92037_a (Lnet/minecraft/src/ItemStack;)Z +MD: xc/a (Lur;)Z net/minecraft/src/Enchantment/func_92089_a (Lnet/minecraft/src/ItemStack;)Z MD: xc/a (Lxc;)Z net/minecraft/src/Enchantment/func_77326_a (Lnet/minecraft/src/Enchantment;)Z MD: xc/b ()I net/minecraft/src/Enchantment/func_77325_b ()I MD: xc/b (I)I net/minecraft/src/Enchantment/func_77317_b (I)I @@ -15624,7 +15624,7 @@ MD: xe/a (Ljava/util/Random;Lur;I)Lur; net/minecraft/src/EnchantmentHelper/func_ MD: xe/a (Lmd;)I net/minecraft/src/EnchantmentHelper/func_90036_a (Lnet/minecraft/src/EntityLiving;)I MD: xe/a (Lmd;Lmd;)I net/minecraft/src/EnchantmentHelper/func_77512_a (Lnet/minecraft/src/EntityLiving;Lnet/minecraft/src/EntityLiving;)I MD: xe/a (Lur;)Ljava/util/Map; net/minecraft/src/EnchantmentHelper/func_82781_a (Lnet/minecraft/src/ItemStack;)Ljava/util/Map; -MD: xe/a (Lxc;Lmd;)Lur; net/minecraft/src/EnchantmentHelper/func_92047_a (Lnet/minecraft/src/Enchantment;Lnet/minecraft/src/EntityLiving;)Lnet/minecraft/src/ItemStack; +MD: xe/a (Lxc;Lmd;)Lur; net/minecraft/src/EnchantmentHelper/func_92099_a (Lnet/minecraft/src/Enchantment;Lnet/minecraft/src/EntityLiving;)Lnet/minecraft/src/ItemStack; MD: xe/a (Lxg;Lur;)V net/minecraft/src/EnchantmentHelper/func_77518_a (Lnet/minecraft/src/IEnchantmentModifier;Lnet/minecraft/src/ItemStack;)V MD: xe/a (Lxg;[Lur;)V net/minecraft/src/EnchantmentHelper/func_77516_a (Lnet/minecraft/src/IEnchantmentModifier;[Lnet/minecraft/src/ItemStack;)V MD: xe/a ([Lur;Llh;)I net/minecraft/src/EnchantmentHelper/func_77508_a ([Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/DamageSource;)I @@ -15637,7 +15637,7 @@ MD: xe/e (Lmd;)Z net/minecraft/src/EnchantmentHelper/func_77502_d (Lnet/minecraf MD: xe/f (Lmd;)I net/minecraft/src/EnchantmentHelper/func_77517_e (Lnet/minecraft/src/EntityLiving;)I MD: xe/g (Lmd;)I net/minecraft/src/EnchantmentHelper/func_77519_f (Lnet/minecraft/src/EntityLiving;)I MD: xe/h (Lmd;)Z net/minecraft/src/EnchantmentHelper/func_77510_g (Lnet/minecraft/src/EntityLiving;)Z -MD: xe/i (Lmd;)I net/minecraft/src/EnchantmentHelper/func_92046_i (Lnet/minecraft/src/EntityLiving;)I +MD: xe/i (Lmd;)I net/minecraft/src/EnchantmentHelper/func_92098_i (Lnet/minecraft/src/EntityLiving;)I MD: xg/a (Lxc;I)V net/minecraft/src/IEnchantmentModifier/func_77493_a (Lnet/minecraft/src/Enchantment;I)V MD: xh/a (Lxc;I)V net/minecraft/src/EnchantmentModifierLiving/func_77493_a (Lnet/minecraft/src/Enchantment;I)V MD: xi/a (Lxc;I)V net/minecraft/src/EnchantmentModifierDamage/func_77493_a (Lnet/minecraft/src/Enchantment;I)V @@ -15657,20 +15657,20 @@ MD: xn/b (I)I net/minecraft/src/EnchantmentOxygen/func_77317_b (I)I MD: xo/a ()Ljava/lang/String; net/minecraft/src/EnchantmentProtection/func_77320_a ()Ljava/lang/String; MD: xo/a (I)I net/minecraft/src/EnchantmentProtection/func_77321_a (I)I MD: xo/a (ILlh;)I net/minecraft/src/EnchantmentProtection/func_77318_a (ILnet/minecraft/src/DamageSource;)I -MD: xo/a (Llq;D)D net/minecraft/src/EnchantmentProtection/func_92040_a (Lnet/minecraft/src/Entity;D)D -MD: xo/a (Llq;I)I net/minecraft/src/EnchantmentProtection/func_92041_a (Lnet/minecraft/src/Entity;I)I +MD: xo/a (Llq;D)D net/minecraft/src/EnchantmentProtection/func_92092_a (Lnet/minecraft/src/Entity;D)D +MD: xo/a (Llq;I)I net/minecraft/src/EnchantmentProtection/func_92093_a (Lnet/minecraft/src/Entity;I)I MD: xo/a (Lxc;)Z net/minecraft/src/EnchantmentProtection/func_77326_a (Lnet/minecraft/src/Enchantment;)Z MD: xo/b ()I net/minecraft/src/EnchantmentProtection/func_77325_b ()I MD: xo/b (I)I net/minecraft/src/EnchantmentProtection/func_77317_b (I)I MD: xp/a (I)I net/minecraft/src/EnchantmentThorns/func_77321_a (I)I -MD: xp/a (ILjava/util/Random;)Z net/minecraft/src/EnchantmentThorns/func_92042_a (ILjava/util/Random;)Z -MD: xp/a (Llq;Lmd;Ljava/util/Random;)V net/minecraft/src/EnchantmentThorns/func_92044_a (Lnet/minecraft/src/Entity;Lnet/minecraft/src/EntityLiving;Ljava/util/Random;)V -MD: xp/a (Lur;)Z net/minecraft/src/EnchantmentThorns/func_92037_a (Lnet/minecraft/src/ItemStack;)Z +MD: xp/a (ILjava/util/Random;)Z net/minecraft/src/EnchantmentThorns/func_92094_a (ILjava/util/Random;)Z +MD: xp/a (Llq;Lmd;Ljava/util/Random;)V net/minecraft/src/EnchantmentThorns/func_92096_a (Lnet/minecraft/src/Entity;Lnet/minecraft/src/EntityLiving;Ljava/util/Random;)V +MD: xp/a (Lur;)Z net/minecraft/src/EnchantmentThorns/func_92089_a (Lnet/minecraft/src/ItemStack;)Z MD: xp/b ()I net/minecraft/src/EnchantmentThorns/func_77325_b ()I MD: xp/b (I)I net/minecraft/src/EnchantmentThorns/func_77317_b (I)I -MD: xp/b (ILjava/util/Random;)I net/minecraft/src/EnchantmentThorns/func_92043_b (ILjava/util/Random;)I +MD: xp/b (ILjava/util/Random;)I net/minecraft/src/EnchantmentThorns/func_92095_b (ILjava/util/Random;)I MD: xq/a (I)I net/minecraft/src/EnchantmentUntouching/func_77321_a (I)I -MD: xq/a (Lur;)Z net/minecraft/src/EnchantmentUntouching/func_92037_a (Lnet/minecraft/src/ItemStack;)Z +MD: xq/a (Lur;)Z net/minecraft/src/EnchantmentUntouching/func_92089_a (Lnet/minecraft/src/ItemStack;)Z MD: xq/a (Lxc;)Z net/minecraft/src/EnchantmentUntouching/func_77326_a (Lnet/minecraft/src/Enchantment;)Z MD: xq/b ()I net/minecraft/src/EnchantmentUntouching/func_77325_b ()I MD: xq/b (I)I net/minecraft/src/EnchantmentUntouching/func_77317_b (I)I diff --git a/conf/methods.csv b/conf/methods.csv index 4dda8d9580..5c51839c5d 100644 --- a/conf/methods.csv +++ b/conf/methods.csv @@ -237,6 +237,10 @@ func_70487_g,saveInventoryToNBT,2, func_70490_h,isMinecartPowered,2,Is this minecart powered (Fuel > 0) func_70491_i,getDamage,2,Gets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over 40. func_70492_c,setDamage,2,Sets the current amount of damage the minecart has taken. Decreases over time. The cart breaks when this is over 40. +func_70493_k,getRollingDirection,2,Gets the rolling direction the cart rolls while being attacked. Can be 1 or -1. +func_70494_i,setRollingDirection,2,Sets the rolling direction the cart rolls while being attacked. Can be 1 or -1. +func_70496_j,getRollingAmplitude,2,Gets the rolling amplitude the cart rolls while being attacked. +func_70497_h,setRollingAmplitude,2,Sets the rolling amplitude the cart rolls while being attacked. func_70498_d,setMinecartPowered,2,Set if this minecart is powered (Fuel > 0) func_70515_d,explode,2, func_70518_d,onValidSurface,2,checks to make sure painting can be placed there @@ -376,9 +380,11 @@ func_70814_o,isValidLightLevel,2,Checks to make sure the light is not too bright func_70816_c,teleportToEntity,2,Teleport the enderman to another entity func_70817_b,setCarryingData,2,Set the metadata of the block an enderman carries func_70818_a,setCarried,2,Set the id of the block an enderman carries +func_70819_e,setScreaming,2, func_70820_n,teleportRandomly,2,Teleport the enderman to a random nearby position func_70821_d,shouldAttackPlayer,2,Checks to see if this enderman should be attacking this player func_70822_p,getCarried,2,Get the id of the block an enderman carries +func_70823_r,isScreaming,2, func_70824_q,getCarryingData,2,Get the metadata of the block an enderman carries func_70825_j,teleportTo,2,Teleport the enderman func_70829_a,setCreeperState,2,"Sets the state of creeper, -1 to idle and 1 to be 'in fuse'" @@ -632,7 +638,7 @@ func_71269_o,setTexturePack,2, func_71270_I,getFolderName,2, func_71272_O,deleteWorldAndStopServer,2,WARNING : directly calls getActiveAnvilConverter().deleteWorldDirectory(theWorldServer[0].getSaveHandler().getSaveDirectoryName()); func_71273_Y,getMOTD,2, -func_71274_v,getServerMOTD,2,minecraftServer.getMOTD is used in 2 places instead (it is a non-virtual function which returns the same thing) +func_71274_v,getServerMOTD,2,Returns the server message of the day func_71275_y,getMaxPlayers,2,Returns the maximum number of players allowed on the server. func_71276_C,getServer,2,Gets mcServer. func_71277_t,getHostname,2,Returns the server's hostname. @@ -779,6 +785,9 @@ func_71571_b,set,2, func_71575_a,getCrashReport,2,Gets the CrashReport wrapped by this exception. func_71606_a,toASN1Primitive,2, func_71607_a,asn1Equals,2, +func_71608_a,isValidIdentifier,2, +func_71609_b,getId,2, +func_71612_a,branch,2, func_71742_a,getType,2, func_71744_a,stopListening,2, func_71745_a,addPlayer,2,adds this connection to the list of currently connected players @@ -795,8 +804,28 @@ func_71770_b,isLocalHost,2, func_71779_a,getIV,2, func_71780_b,getParameters,2, func_71783_a,getKey,2, +func_71789_b,getOutputSize,2, +func_71790_a,doFinal,2, +func_71791_a,processByte,2, +func_71792_a,getBlockSize,2, +func_71793_a,getUpdateOutputSize,2, +func_71794_b,reset,2, func_71802_a,getAlgorithmName,2,Return the name of the algorithm the cipher implements. +func_71803_c,reset,2, func_71804_b,getBlockSize,2,Return the block size for this cipher (in bytes). +func_71805_a,init,2, +func_71806_a,processBlock,2, +func_71807_b,encryptBlock,2, +func_71808_c,decryptBlock,2, +func_71815_c,subWord,2, +func_71816_a,unpackBlock,2, +func_71817_a,FFmulX,2, +func_71818_a,encryptBlock,2, +func_71819_a,shift,2, +func_71820_b,inv_mcol,2, +func_71821_b,packBlock,2, +func_71822_b,decryptBlock,2, +func_71823_a,generateWorkingKey,2, func_71842_b,getStrength,2,Return the bit strength for keys produced by this generator. func_71843_a,getRandom,2,Return the random source associated with this generator. func_71846_a,onBlockHarvested,2,Called when the block is attempted to be harvested @@ -1408,7 +1437,7 @@ func_72896_J,isRaining,2,Returns true if the current rain strength is greater th func_72897_h,joinEntityInSurroundings,2,spwans an entity and loads surrounding chunks func_72898_h,notifyBlocksOfNeighborChange,2,"Notifies neighboring blocks that this specified block changed Args: x, y, z, blockID" func_72899_e,blockExists,2,"Returns whether a block exists at world coordinates x, y, z" -func_72900_e,setEntityDead,2,"Dismounts the entity (and anything riding the entity), sets the dead flag, and removes the player entity from the player entity list. Called by the playerLoggedOut function." +func_72900_e,removeEntity,2,Schedule the entity for removal during the next tick. Marks the entity dead in anticipation. func_72901_a,rayTraceBlocks_do,2, func_72902_n,markBlockForRenderUpdate,2,"On the client, re-renders this block. On the server, does nothing. Used for lighting updates." func_72903_x,setActivePlayerChunksAndCheckLight,2, @@ -1480,7 +1509,7 @@ func_72969_x,updateAllLightTypes,2, func_72970_h,createChunkProvider,2,Creates the chunk provider for this world. Called in the constructor. Retrieves provider from worldProvider? func_72971_b,getSunBrightness,2,"Returns the sun brightness - checks time of day, rain and thunder" func_72972_b,getSavedLightValue,2,Returns saved light value without taking into account the time of day. Either looks in the sky light map or block light map based on the enumSkyBlock arg. -func_72973_f,removeEntity,2,remove dat player from dem servers +func_72973_f,removePlayerEntityDangerously,2,Do NOT use this method to remove normal entities- use normal removeEntity func_72974_f,setSpawnLocation,2,"Sets a new spawn location by finding an uncovered block at a random (x,z) location in the chunk." func_72975_g,markBlocksDirtyVertical,2,marks a vertical line of blocks as dirty func_72976_f,getHeightValue,2,"Returns the y coordinate with a block in it at this x, z coordinate" @@ -1705,7 +1734,7 @@ func_73730_a,drawHorizontalLine,2, func_73731_b,drawString,2,Renders the specified text to the screen. func_73732_a,drawCenteredString,2,"Renders the specified text to the screen, center-aligned." func_73733_a,drawGradientRect,2,Draws a rectangle with a vertical gradient between the specified colors. -func_73734_a,drawRect,2,Draws a solid color rectangle with the specified coordinates and color. +func_73734_a,drawRect,2,"Draws a solid color rectangle with the specified coordinates and color. Args: x1, y1, x2, y2, color" func_73736_c,mousePressed,2,Returns true if the mouse has been pressed on this control. Equivalent of MouseListener.mousePressed(MouseEvent e). func_73737_a,drawButton,2,Draws this button to the screen. func_73738_a,getHoverState,2,"Returns 0 if the button is disabled, 1 if the mouse is NOT hovering over this button and 2 if it IS hovering over this button." @@ -1866,6 +1895,7 @@ func_74191_a,handleMouseClick,2, func_74192_a,drawSlotInventory,2,Draws an inventory slot func_74199_h,getIMerchant,2,Gets the Instance of IMerchant interface. func_74221_h,displayDebuffEffects,2,Displays debuff/potion effects that are currently being applied to the player +func_74223_a,drawPlayerOnGui,2, func_74226_k,needsScrollBars,2,returns (if you are not on the inventoryTab) and (the flag isn't set) and( you have more than 1 page of items) func_74227_b,setCurrentCreativeTab,2, func_74228_j,updateCreativeSearch,2, @@ -2112,13 +2142,19 @@ func_74809_c,translateNamedKey,2,"Translate a key with a extra '.name' at end ad func_74810_a,setLanguage,2, func_74811_c,getCurrentLanguage,2, func_74812_a,loadLanguage,2, +func_74818_a,setup,2, +func_74819_a,loadAlgorithms,2, +func_74820_b,addMacAlgorithms,2, +func_74821_a,doSetup,2, func_74830_a,toLowerCase,2,A locale independent version of toLowerCase that returns a US ASCII lowercase String. func_74837_a,translateToLocalFormatted,2,Translates a Stat name with format args func_74838_a,translateToLocal,2,Translates a Stat name func_74840_a,configure,2, func_74841_a,calculateMask,2, func_74844_a,getErrorOjbects,2, +func_74850_a,processBytes,2, func_74851_a,returnByte,2,"Encrypt/decrypt a single byte, returning the result." +func_74852_a,nextChunk,2, func_74860_a,isLiquidInStructureBoundingBox,2,checks the entire StructureBoundingBox for Liquids func_74861_a,buildComponent,2,"Initiates construction of the Structure Component picked, at the current Location of StructGen" func_74862_a,getYWithOffset,2, @@ -2400,6 +2436,8 @@ func_75620_a,createEntityByName,2,Create a new instance of an entity in the worl func_75621_b,getEntityString,2,Gets the string representation of a specific entity. func_75630_a,multiplyBy32AndRound,2, func_75638_b,getSpeed,2, +func_75639_a,limitAngle,2,Limits the given angle to a upper and lower limit. +func_75640_a,isUpdating,2, func_75641_c,onUpdateMoveHelper,2, func_75642_a,setMoveTo,2,Sets the speed and location to move to func_75649_a,onUpdateLook,2,Updates look @@ -3312,7 +3350,7 @@ func_77642_a,setContainerItem,2, func_77643_m_,isMap,2,false for all Items except sub-classes of ItemMapBase func_77644_a,hitEntity,2,Current implementations of this method in child classes do not use the entry argument beside ev. They just raise the damage on the stack. func_77645_m,isDamageable,2, -func_77646_a,itemInteractionForEntity,2,"dye sheep, place saddles, etc ..." +func_77646_a,itemInteractionForEntity,2,Called when a player right clicks an entity with an item. func_77647_b,getMetadata,2,Returns the metadata of the block which this Item (ItemBlock) can place func_77648_a,onItemUse,2,"Callback for item usage. If the item does something special on right clicking, he will have one of those. Return True if something happen and false if it don't. This is for ITEMS, not BLOCKS" func_77649_a,getDamageVsEntity,2,Returns the damage against a given entity. @@ -3334,6 +3372,7 @@ func_77665_c,setIconIndex,2,Sets the icon index for this item. Returns the item. func_77666_t,getPotionEffect,2,Returns a string representing what this item does to a potion. func_77667_c,getItemNameIS,2, func_77668_q,getContainerItem,2, +func_77825_f,getToolMaterialName,2,Return the name for this tool's material. func_77828_a,validBookTagContents,2, func_77829_a,validBookTagPages,2, func_77831_g,isSplash,2,returns wether or not a potion is a throwable splash potion based on damage value @@ -3535,6 +3574,8 @@ func_78440_a,renderItemInFirstPerson,2,Renders the active item in the player's h func_78441_a,updateEquippedItem,2, func_78442_d,renderFireInFirstPerson,2,Renders the fire on the screen for first person mode. Arg: partialTickTime func_78443_a,renderItem,2,Renders the item stack for being in an entity's hand Args: itemStack +func_78444_b,resetEquippedProgress,2,Resets equippedProgress +func_78445_c,resetEquippedProgress2,2,Resets equippedProgress func_78446_a,renderInsideOfBlock,2,"Renders the texture of the block the player is inside as an overlay. Args: partialTickTime, blockTextureIndex" func_78447_b,renderOverlays,2,Renders all the overlays that are in first person mode. Args: partialTickTime func_78448_c,renderWarpedTextureOverlay,2,Renders a texture that warps around based on the direction the player is looking. Texture needs to be bound before being called. Used for the water overlay. Args: parialTickTime @@ -3736,11 +3777,12 @@ func_79006_b,getStatsComponent,2,Returns a new JPanel with a new GuiStatsCompone func_79007_c,getPlayerListComponent,2,Returns a new JScrollPane with a new PlayerListBox inside. func_79013_a,update,2,Public static accessor to call updateStats. func_79014_a,updateStats,2,Updates the stat values and calls paint to redraw the component. +func_79015_a,calcArrayAverage,2,Calculates the avarage value of the given long array. func_80003_ah,getPlayerUsageSnooper,2, func_80006_f,getUniqueID,2, func_80007_l,getDimensionName,2,"Returns the dimension's name, e.g. ""The End"", ""Nether"", or ""Overworld""." func_82011_an,enableGui,2, -func_82114_b,getPlayerCoordinates,2,Return the coordinates for this player as ChunkCoordinates. +func_82114_b,getPlayerCoordinates,2,Return the position for this command sender. func_82116_a,setSkullRotation,2,Set the skull's rotation func_82117_a,getSkullType,2,Get the entity type for the skull func_82118_a,setSkullType,2,Set the entity type for the skull @@ -3780,6 +3822,7 @@ func_82205_o,isArmored,2,Returns whether the wither is armored with its boss arm func_82227_f,setChild,2,Set whether this zombie is a child. func_82228_a,startConversion,2,Starts converting this zombie into a villager. The zombie converts into a villager after the specified time in ticks. func_82229_g,setVillager,2,Set whether this zombie is a villager. +func_82230_o,isConverting,2,Returns whether this zombie is in the process of converting to a villager func_82231_m,isVillager,2,Return whether this zombie is a villager. func_82232_p,convertToVillager,2,Convert this zombie into a villager. func_82233_q,getConversionTimeBoost,2,Return the amount of time decremented from conversionTime every tick. @@ -3827,6 +3870,7 @@ func_82366_d,getGameRules,2,Return the game rule set this command should be able func_82369_d,getAllOnlineUsernames,2,Return all usernames currently connected to the server. func_82370_a,getUsernameIndex,2,Return a command's first parameter index containing a valid username. func_82371_e,getDistanceSquaredToChunkCoordinates,2,Return the squared distance between this coordinates and the ChunkCoordinates given as argument. +func_82372_a,getMovementDirection,2,Returns the movement direction from a velocity vector. func_82375_f,getDefaultMinimumLevel,2,Gets the default minimum experience level (argument lm) func_82376_e,getDefaultMaximumLevel,2,Gets the default maximum experience level (argument l) func_82377_a,matchesMultiplePlayers,2,Returns whether the given pattern can match more than one player. @@ -3884,6 +3928,9 @@ func_82582_d,hasNoTags,2,Return whether this compound has no tags. func_82591_c,getPoolSize,2, func_82593_b,getPlaceSound,2,Used when a player places a block. func_82595_a,putObject,2,Register an object on this registry. +func_82599_e,getFrontOffsetZ,2,Returns a offset that addresses the block in front of this facing. +func_82600_a,getFront,2,Returns the facing that represents the block in front of it. +func_82601_c,getFrontOffsetX,2,Returns a offset that addresses the block in front of this facing. func_82615_a,getX,2, func_82616_c,getZ,2, func_82617_b,getY,2, @@ -4030,10 +4077,12 @@ func_85104_a,onBlockPlaced,2,"Called when a block is placed using its ItemBlock. func_85105_g,onPostBlockPlaced,2,Called after a block is placed func_85106_a,insertRecord,2,Insert the specified music disc in the jukebox at the given coordinates func_85107_d,updateLadderBounds,2,Update the ladder block bounds based on the given metadata value. +func_85118_a,addToCrashReport,2,Adds this WorldInfo instance to the crash report. func_85128_b,getMapFeaturesEnabled,2,Return the map feautures enabled of a world func_85132_a,getTerrainTypeOfWorld,2,Return the terrain type of a world func_85151_d,getLowerChestInventory,2,Return this chest container's lower chest inventory. func_85173_a,playSoundToNearExcept,2,Plays sound to all near players except the player reference given +func_85175_e,blockGetRenderType,2,Returns the render type of the block at the given coordinate. func_85187_a,drawString,2,"Draws the specified string. Args: string, x, y, color, dropShadow" func_90010_a,isPartOfLargeChest,2,Return whether the given inventory is part of this large chest. func_90011_a,createChild,2, @@ -4046,3 +4095,10 @@ func_90036_a,getFireAspectModifier,2, func_90042_d,getRecord,2,Return the record item corresponding to the given name. func_90043_g,getRecordTitle,2,Return the title for this record. func_90999_ad,canRenderOnFire,2,Return whether this entity should be rendered as on fire. +func_92013_a,setEntityItem,2,Sets the ItemStack corresponding to this Entity (and updates the DataWatcher for it) +func_92014_d,getEntityItem,2,"Returns the ItemStack corresponding to the Entity (Note: if no item exists, will log an error but still return an ItemStack containing Block.stone)" +func_92015_a,getMobID,2, +func_92027_k,sendChatMsg,2,Sends the given string to every player as chat message. +func_92059_d,getEntityItem,2,"Returns the ItemStack corresponding to the Entity (Note: if no item exists, will log an error but still return an ItemStack containing Block.stone)" +func_92062_k,sendChatMsg,2,Sends the given string to every player as chat message. +func_92103_a,addRecipe,2, diff --git a/conf/params.csv b/conf/params.csv index e55135120f..0d355053f3 100644 --- a/conf/params.csv +++ b/conf/params.csv @@ -7175,10 +7175,6 @@ p_90033_1_,par1Str,2 p_90035_0_,par0,2 p_90036_0_,par0EntityLiving,2 p_90042_0_,par0Str,2 -p_92013_1_,par1ItemStack,2 -p_92027_1_,par1Str,2 -p_92029_0_,par0ArrayOfWeightedRandomChestContent,2 -p_92029_1_,par1ArrayOfWeightedRandomChestContent,2 p_92031_1_,par1Slot,2 p_92034_11_,par11,2 p_92034_13_,par13ArrayOfInteger,2 @@ -7196,12 +7192,10 @@ p_92035_4_,par4ArrayOfInteger,2 p_92035_5_,par5ArrayOfInteger,2 p_92035_6_,par6,2 p_92035_7_,par7,2 -p_92036_0_,par0Entity,2 p_92036_1_,par1ArrayOfInteger,2 p_92036_2_,par2ArrayOfInteger,2 p_92036_3_,par3,2 p_92036_4_,par4,2 -p_92037_1_,par1ItemStack,2 p_92038_1_,par1,2 p_92038_3_,par3ArrayOfDouble,2 p_92038_4_,par4ArrayOfInteger,2 @@ -7209,36 +7203,11 @@ p_92038_5_,par5ArrayOfInteger,2 p_92038_6_,par6,2 p_92038_7_,par7,2 p_92038_8_,par8,2 -p_92040_0_,par0Entity,2 -p_92040_1_,par1,2 -p_92041_0_,par0Entity,2 -p_92041_1_,par1,2 -p_92042_0_,par0,2 -p_92042_1_,par1Random,2 -p_92043_0_,par0,2 p_92043_1_,par1,2 -p_92044_0_,par0Entity,2 p_92044_1_,par1,2 -p_92044_2_,par2Random,2 -p_92045_0_,par0ItemStack,2 p_92045_1_,par1,2 -p_92045_2_,par2Random,2 -p_92046_0_,par0EntityLiving,2 p_92046_1_,par1,2 -p_92047_0_,par0Enchantment,2 -p_92047_1_,par1EntityLiving,2 -p_92051_1_,par1ItemStack,2 -p_92051_2_,par2ArrayOfObj,2 -p_92055_1_,par1Random,2 -p_92056_1_,par1ItemStack,2 -p_92057_1_,par1EnchantmentData,2 -p_92058_1_,par1,2 -p_92058_2_,par2,2 -p_92058_3_,par3,2 -p_92058_4_,par4,2 -p_92059_1_,par1Random,2 -p_92060_1_,par1ItemStack,2 -p_92060_2_,par2EnchantmentData,2 +p_92058_1_,par1ItemStack,2 p_92062_1_,par1Str,2 p_92070_1_,par1Str,2 p_92070_2_,par2,2 diff --git a/conf/version.cfg b/conf/version.cfg index ce461dd14a..db79faa44c 100644 --- a/conf/version.cfg +++ b/conf/version.cfg @@ -1,4 +1,4 @@ [VERSION] -MCPVersion = 7.26 +MCPVersion = 7.26a ClientVersion = 1.4.7 ServerVersion = 1.4.7 diff --git a/mc_versions.cfg b/mc_versions.cfg index 20f195cb40..64831fbf06 100644 --- a/mc_versions.cfg +++ b/mc_versions.cfg @@ -36,7 +36,7 @@ client_url = http://assets.minecraft.net/1_4_7/minecraft.jar server_url = http://assets.minecraft.net/1_4_7/minecraft_server.jar client_md5 = 8e80fb01b321c6b3c7efca397a3eea35 server_md5 = f69ac4bfce2dfbce03fe872518f75a05 -mcp_ver = 7.26 -mcp_url = http://mcp.ocean-labs.de/files/archive/mcp726.zip -mcp_md5 = 5320353829c2906bd032649085721d1d +mcp_ver = 7.26a +mcp_url = http://mcp.ocean-labs.de/files/archive/mcp726a.zip +mcp_md5 = 5f11fbccd857b43a0f54117253b3e4dd From 5ce4e3185528d1ec7f78fc5e5e200fc4cba185eb Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 20 Jan 2013 17:54:56 -0500 Subject: [PATCH 06/11] Fix breaking change --- common/cpw/mods/fml/common/registry/GameRegistry.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/cpw/mods/fml/common/registry/GameRegistry.java b/common/cpw/mods/fml/common/registry/GameRegistry.java index f50e3acab6..d92b666a33 100644 --- a/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -248,7 +248,12 @@ public class GameRegistry blockRegistry.put(Loader.instance().activeModContainer(), (BlockProxy) block); } - public static IRecipe addRecipe(ItemStack output, Object... params) + public static void addRecipe(ItemStack output, Object... params) + { + addShapedRecipe(output, params); + } + + public static IRecipe addShapedRecipe(ItemStack output, Object... params) { return CraftingManager.func_77594_a().func_92103_a(output, params); } From e1c663056953cdbede906d67454e95bcd6a737c9 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 21 Jan 2013 21:37:29 -0500 Subject: [PATCH 07/11] Javadoc cleanup --- common/cpw/mods/fml/common/BukkitProxy.java | 2 +- common/cpw/mods/fml/common/Loader.java | 2 +- common/cpw/mods/fml/common/network/NetworkMod.java | 2 +- .../mods/fml/common/network/NetworkModHandler.java | 11 +++++++---- .../cpw/mods/fml/common/network/NetworkRegistry.java | 6 +++--- common/cpw/mods/fml/common/registry/GameRegistry.java | 2 +- common/cpw/mods/fml/common/registry/TickRegistry.java | 4 ++-- .../mods/fml/common/registry/VillagerRegistry.java | 10 +++++----- common/cpw/mods/fml/relauncher/FMLRelauncher.java | 2 +- .../mods/fml/relauncher/RelaunchLibraryManager.java | 8 ++++---- common/cpw/mods/fml/server/FMLServerHandler.java | 2 +- 11 files changed, 27 insertions(+), 24 deletions(-) diff --git a/common/cpw/mods/fml/common/BukkitProxy.java b/common/cpw/mods/fml/common/BukkitProxy.java index d0dcfb382e..19257da522 100644 --- a/common/cpw/mods/fml/common/BukkitProxy.java +++ b/common/cpw/mods/fml/common/BukkitProxy.java @@ -2,7 +2,7 @@ package cpw.mods.fml.common; /** * A marker interface for retrieving a proxy to a bukkit plugin. - * Fields associated with {@link BukkitPluginRef} annotations should be should probably + * Fields associated with {@link BukkitPluginRef} annotations should * declare this type and cast down if the target is available (not null) * @author cpw * diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java index a8a5b670d8..ef325430e0 100644 --- a/common/cpw/mods/fml/common/Loader.java +++ b/common/cpw/mods/fml/common/Loader.java @@ -377,7 +377,7 @@ public class Loader } /** - * @return + * */ private void initializeLoader() { diff --git a/common/cpw/mods/fml/common/network/NetworkMod.java b/common/cpw/mods/fml/common/network/NetworkMod.java index 3f3bc24d07..44f5936546 100644 --- a/common/cpw/mods/fml/common/network/NetworkMod.java +++ b/common/cpw/mods/fml/common/network/NetworkMod.java @@ -35,7 +35,7 @@ public @interface NetworkMod Class packetHandler() default NULL.class; /** - * A tiny packet handler implementation based on {@link Packet131MapData} for "small" + * A tiny packet handler implementation based on {@link net.minecraft.network.packet.Packet131MapData} for "small" * data packet loads. */ Class tinyPacketHandler() default NULL.class; diff --git a/common/cpw/mods/fml/common/network/NetworkModHandler.java b/common/cpw/mods/fml/common/network/NetworkModHandler.java index a3a52b3e19..34d9ed0719 100644 --- a/common/cpw/mods/fml/common/network/NetworkModHandler.java +++ b/common/cpw/mods/fml/common/network/NetworkModHandler.java @@ -193,7 +193,7 @@ public class NetworkModHandler } } /** - * @return + * @return the default {@link NetworkMod#connectionHandler()} annotation value */ private Object getConnectionHandlerDefaultValue() { @@ -211,7 +211,7 @@ public class NetworkModHandler } /** - * @return + * @return the default {@link NetworkMod#packetHandler()} annotation value */ private Object getPacketHandlerDefaultValue() { @@ -228,6 +228,9 @@ public class NetworkModHandler } } + /** + * @return the default {@link NetworkMod#tinyPacketHandler()} annotation value + */ private Object getTinyPacketHandlerDefaultValue() { try { @@ -243,7 +246,7 @@ public class NetworkModHandler } } /** - * @return + * @return the {@link NetworkMod#clientPacketHandlerSpec()} default annotation value */ private Object getClientHandlerSpecDefaultValue() { @@ -260,7 +263,7 @@ public class NetworkModHandler } } /** - * @return + * @return the default {@link NetworkMod#serverPacketHandlerSpec()} annotation value */ private Object getServerHandlerSpecDefaultValue() { diff --git a/common/cpw/mods/fml/common/network/NetworkRegistry.java b/common/cpw/mods/fml/common/network/NetworkRegistry.java index 415f301bdf..60acbe4bea 100644 --- a/common/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/common/cpw/mods/fml/common/network/NetworkRegistry.java @@ -64,7 +64,7 @@ public class NetworkRegistry } /** * Get the packet 250 channel registration string - * @return + * @return the {@link Packet250CustomPayload} channel registration string */ byte[] getPacketRegistry(Side side) { @@ -81,8 +81,8 @@ public class NetworkRegistry } /** * register a channel to a mod - * @param container - * @param channelName + * @param handler the packet handler + * @param channelName the channel name to register it with */ public void registerChannel(IPacketHandler handler, String channelName) { diff --git a/common/cpw/mods/fml/common/registry/GameRegistry.java b/common/cpw/mods/fml/common/registry/GameRegistry.java index d92b666a33..9e79f374a5 100644 --- a/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -145,7 +145,7 @@ public class GameRegistry /** * Private and not yet working properly * - * @return + * @return a block id */ private static int findSpareBlockId() { diff --git a/common/cpw/mods/fml/common/registry/TickRegistry.java b/common/cpw/mods/fml/common/registry/TickRegistry.java index 76714fe4f1..b16f856845 100644 --- a/common/cpw/mods/fml/common/registry/TickRegistry.java +++ b/common/cpw/mods/fml/common/registry/TickRegistry.java @@ -58,8 +58,8 @@ public class TickRegistry } /** - * @param side - * @return + * @param side the side to get the tick queue for + * @return the queue for the effective side */ private static PriorityQueue getQueue(Side side) { diff --git a/common/cpw/mods/fml/common/registry/VillagerRegistry.java b/common/cpw/mods/fml/common/registry/VillagerRegistry.java index e5068ab2d6..bcac65e90e 100644 --- a/common/cpw/mods/fml/common/registry/VillagerRegistry.java +++ b/common/cpw/mods/fml/common/registry/VillagerRegistry.java @@ -37,7 +37,7 @@ public class VillagerRegistry private List newVillagerIds = Lists.newArrayList(); /** - * Allow access to the {@link StructureVillagePieces} array controlling new village + * Allow access to the {@link net.minecraft.world.gen.structure.StructureVillagePieces} array controlling new village * creation so you can insert your own new village pieces * * @author cpw @@ -46,7 +46,7 @@ public class VillagerRegistry public interface IVillageCreationHandler { /** - * Called when {@link MapGenVillage} is creating a new village + * Called when {@link net.minecraft.world.gen.structure.MapGenVillage} is creating a new village * * @param random * @param i @@ -60,7 +60,7 @@ public class VillagerRegistry /** - * Build an instance of the village component {@link StructureVillagePieces} + * Build an instance of the village component {@link net.minecraft.world.gen.structure.StructureVillagePieces} * @param villagePiece * @param startPiece * @param pieces @@ -150,10 +150,10 @@ public class VillagerRegistry } return defaultSkin; } - + /** * Returns a list of all added villager types - * + * * @return newVillagerIds */ public static Collection getRegisteredVillagers() diff --git a/common/cpw/mods/fml/relauncher/FMLRelauncher.java b/common/cpw/mods/fml/relauncher/FMLRelauncher.java index 21592977f1..0fbfae94c5 100644 --- a/common/cpw/mods/fml/relauncher/FMLRelauncher.java +++ b/common/cpw/mods/fml/relauncher/FMLRelauncher.java @@ -177,7 +177,7 @@ public class FMLRelauncher } /** - * @return + * @return the location of the client home */ private File computeExistingClientHome() { diff --git a/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java b/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java index 4d83ca6c06..a5f7d32aac 100644 --- a/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java +++ b/common/cpw/mods/fml/relauncher/RelaunchLibraryManager.java @@ -401,8 +401,8 @@ public class RelaunchLibraryManager } /** - * @param mcDir - * @return + * @param mcDir the minecraft home directory + * @return the lib directory */ private static File setupLibDir(File mcDir) { @@ -427,8 +427,8 @@ public class RelaunchLibraryManager } /** - * @param mcDir - * @return + * @param mcDir the minecraft home directory + * @return the coremod directory */ private static File setupCoreModDir(File mcDir) { diff --git a/common/cpw/mods/fml/server/FMLServerHandler.java b/common/cpw/mods/fml/server/FMLServerHandler.java index be36fd702f..91e29739f9 100644 --- a/common/cpw/mods/fml/server/FMLServerHandler.java +++ b/common/cpw/mods/fml/server/FMLServerHandler.java @@ -42,7 +42,7 @@ import cpw.mods.fml.relauncher.Side; * Handles primary communication from hooked code into the system * * The FML entry point is {@link #beginServerLoading(MinecraftServer)} called from - * {@link net.minecraft.shared.DedicatedServer} + * {@link net.minecraft.server.dedicated.DedicatedServer} * * Obfuscated code should focus on this class and other members of the "server" * (or "client") code From cd67596d574abcc1c9e6d313c2954dce39cdf02c Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 22 Jan 2013 09:11:44 -0500 Subject: [PATCH 08/11] The "ServerStarting" event should now properly crash the server if it fails, so the client will properly exit. Also, added in a "pre-server-start" event that fires before the worlds are loaded for a save, just for you immibis. --- .../cpw/mods/fml/common/FMLCommonHandler.java | 9 ++++-- .../cpw/mods/fml/common/FMLModContainer.java | 2 ++ common/cpw/mods/fml/common/Loader.java | 30 +++++++++++++++++-- common/cpw/mods/fml/common/LoaderState.java | 2 ++ common/cpw/mods/fml/common/Mod.java | 8 +++++ .../event/FMLServerAboutToStartEvent.java | 25 ++++++++++++++++ 6 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 common/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/common/cpw/mods/fml/common/FMLCommonHandler.java index b4627773a8..2fc57b7a58 100644 --- a/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -304,9 +304,14 @@ public class FMLCommonHandler } } - public void handleServerStarting(MinecraftServer server) + public boolean handleServerAboutToStart(MinecraftServer server) { - Loader.instance().serverStarting(server); + return Loader.instance().serverAboutToStart(server); + } + + public boolean handleServerStarting(MinecraftServer server) + { + return Loader.instance().serverStarting(server); } public void handleServerStarted() diff --git a/common/cpw/mods/fml/common/FMLModContainer.java b/common/cpw/mods/fml/common/FMLModContainer.java index 7ab6449bbe..252aea20c5 100644 --- a/common/cpw/mods/fml/common/FMLModContainer.java +++ b/common/cpw/mods/fml/common/FMLModContainer.java @@ -58,6 +58,7 @@ import cpw.mods.fml.common.event.FMLInterModComms.IMCEvent; import cpw.mods.fml.common.event.FMLFingerprintViolationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; @@ -90,6 +91,7 @@ public class FMLModContainer implements ModContainer .put(FMLPreInitializationEvent.class, Mod.PreInit.class) .put(FMLInitializationEvent.class, Mod.Init.class) .put(FMLPostInitializationEvent.class, Mod.PostInit.class) + .put(FMLServerAboutToStartEvent.class, Mod.ServerAboutToStart.class) .put(FMLServerStartingEvent.class, Mod.ServerStarting.class) .put(FMLServerStartedEvent.class, Mod.ServerStarted.class) .put(FMLServerStoppingEvent.class, Mod.ServerStopping.class) diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java index ef325430e0..e212775a07 100644 --- a/common/cpw/mods/fml/common/Loader.java +++ b/common/cpw/mods/fml/common/Loader.java @@ -695,10 +695,19 @@ public class Loader return "Minecraft " + mccversion; } - public void serverStarting(Object server) + public boolean serverStarting(Object server) { - modController.distributeStateMessage(LoaderState.SERVER_STARTING, server); - modController.transition(LoaderState.SERVER_STARTING); + try + { + modController.distributeStateMessage(LoaderState.SERVER_STARTING, server); + modController.transition(LoaderState.SERVER_STARTING); + } + catch (Throwable t) + { + FMLLog.log(Level.SEVERE, t, "A fatal exception occurred during the server starting event"); + return false; + } + return true; } public void serverStarted() @@ -752,4 +761,19 @@ public class Loader modController.transition(LoaderState.SERVER_STOPPED); modController.transition(LoaderState.AVAILABLE); } + + public boolean serverAboutToStart(MinecraftServer server) + { + try + { + modController.distributeStateMessage(LoaderState.SERVER_ABOUT_TO_START, server); + modController.transition(LoaderState.SERVER_ABOUT_TO_START); + } + catch (Throwable t) + { + FMLLog.log(Level.SEVERE, t, "A fatal exception occurred during the server about to start event"); + return false; + } + return true; + } } diff --git a/common/cpw/mods/fml/common/LoaderState.java b/common/cpw/mods/fml/common/LoaderState.java index 0bd780301b..4bdb1223f4 100644 --- a/common/cpw/mods/fml/common/LoaderState.java +++ b/common/cpw/mods/fml/common/LoaderState.java @@ -8,6 +8,7 @@ import cpw.mods.fml.common.event.FMLInitializationEvent; import cpw.mods.fml.common.event.FMLLoadCompleteEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; +import cpw.mods.fml.common.event.FMLServerAboutToStartEvent; import cpw.mods.fml.common.event.FMLServerStartedEvent; import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.event.FMLServerStoppedEvent; @@ -28,6 +29,7 @@ public enum LoaderState INITIALIZATION("Initializing mods", FMLInitializationEvent.class), POSTINITIALIZATION("Post-initializing mods", FMLPostInitializationEvent.class), AVAILABLE("Mod loading complete", FMLLoadCompleteEvent.class), + SERVER_ABOUT_TO_START("Server about to start", FMLServerAboutToStartEvent.class), SERVER_STARTING("Server starting", FMLServerStartingEvent.class), SERVER_STARTED("Server started", FMLServerStartedEvent.class), SERVER_STOPPING("Server stopping", FMLServerStoppingEvent.class), diff --git a/common/cpw/mods/fml/common/Mod.java b/common/cpw/mods/fml/common/Mod.java index 5aa5cd4f22..51d753723c 100644 --- a/common/cpw/mods/fml/common/Mod.java +++ b/common/cpw/mods/fml/common/Mod.java @@ -144,6 +144,14 @@ public @interface Mod @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.METHOD) public @interface PostInit {} + /** + * Mark the designated method as being called at the "server-about-to-start" phase + * @author cpw + * + */ + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.METHOD) + public @interface ServerAboutToStart {} /** * Mark the designated method as being called at the "server-starting" phase * @author cpw diff --git a/common/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java b/common/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java new file mode 100644 index 0000000000..14574c10fd --- /dev/null +++ b/common/cpw/mods/fml/common/event/FMLServerAboutToStartEvent.java @@ -0,0 +1,25 @@ +package cpw.mods.fml.common.event; + +import net.minecraft.server.MinecraftServer; +import cpw.mods.fml.common.LoaderState.ModState; + +public class FMLServerAboutToStartEvent extends FMLStateEvent { + + private MinecraftServer server; + + public FMLServerAboutToStartEvent(Object... data) + { + super(data); + this.server = (MinecraftServer) data[0]; + } + @Override + public ModState getModState() + { + return ModState.AVAILABLE; + } + + public MinecraftServer getServer() + { + return server; + } +} From 8921cfe061f01fb111a5aba84d48196da363a597 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 22 Jan 2013 09:32:53 -0500 Subject: [PATCH 09/11] Remember to add the new patches! --- .../server/dedicated/DedicatedServer.java.patch | 16 ++++++++++++---- .../integrated/IntegratedServer.java.patch | 10 +++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch b/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch index d17617ed16..de704ff6c6 100644 --- a/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ b/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -25,12 +25,20 @@ this.func_71210_a(new DedicatedPlayerList(this)); long var4 = System.nanoTime(); -@@ -187,6 +192,8 @@ +@@ -167,6 +172,7 @@ + this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16); + this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256)); + this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z())); ++ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; } + field_71306_a.info("Preparing level \"" + this.func_71270_I() + "\""); + this.func_71247_a(this.func_71270_I(), this.func_71270_I(), var9, var17, var8); + long var12 = System.nanoTime() - var4; +@@ -187,7 +193,7 @@ this.field_71339_n.func_72602_a(); } -+ FMLCommonHandler.instance().handleServerStarting(this); -+ - return true; +- return true; ++ return FMLCommonHandler.instance().handleServerStarting(this); } + public boolean func_71225_e() diff --git a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch index 09c1e5c3c2..9cce851ea0 100644 --- a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch +++ b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch @@ -7,11 +7,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.File; -@@ -110,6 +111,7 @@ +@@ -108,9 +109,10 @@ + this.func_71245_h(true); + field_71306_a.info("Generating keypair"); this.func_71253_a(CryptManager.func_75891_b()); ++ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; } this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j()); this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j()); -+ FMLCommonHandler.instance().handleServerStarting(this); - return true; +- return true; ++ return FMLCommonHandler.instance().handleServerStarting(this); } + public void func_71217_p() From aebf6eb16836a67990d7283c502450cd1031a43c Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 22 Jan 2013 13:11:32 -0500 Subject: [PATCH 10/11] Add in a registry method to allow for alternative TileEntity names- they will be used to support loading maps containing the older definitions. --- .../fml/common/registry/GameRegistry.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/common/cpw/mods/fml/common/registry/GameRegistry.java b/common/cpw/mods/fml/common/registry/GameRegistry.java index 9e79f374a5..a2b66c188b 100644 --- a/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -45,6 +45,7 @@ import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderException; import cpw.mods.fml.common.LoaderState; +import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.Mod.Block; import cpw.mods.fml.common.ModContainer; @@ -278,6 +279,27 @@ public class GameRegistry TileEntity.func_70306_a(tileEntityClass, id); } + /** + * Register a tile entity, with alternative TileEntity identifiers. Use with caution! + * This method allows for you to "rename" the 'id' of the tile entity. + * + * @param tileEntityClass The tileEntity class to register + * @param id The primary ID, this will be the ID that the tileentity saves as + * @param alternatives A list of alternative IDs that will also map to this class. These will never save, but they will load + */ + public static void registerTileEntityWithAlternatives(Class tileEntityClass, String id, String... alternatives) + { + TileEntity.func_70306_a(tileEntityClass, id); + Map teMappings = ObfuscationReflectionHelper.getPrivateValue(TileEntity.class, null, "field_70326_a", "a"); + for (String s: alternatives) + { + if (!teMappings.containsKey(s)) + { + teMappings.put(s, tileEntityClass); + } + } + } + public static void addBiome(BiomeGenBase biome) { WorldType.field_77137_b.addNewBiome(biome); From 1bd6847bc80f51b06544068011f7df3218f13999 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 22 Jan 2013 14:43:27 -0500 Subject: [PATCH 11/11] Fix up packages.csv ordering for easier diffing --- conf/packages.csv | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/packages.csv b/conf/packages.csv index 56d8eea827..a6df1f043c 100644 --- a/conf/packages.csv +++ b/conf/packages.csv @@ -1,17 +1,4 @@ class,package -EntityFireworkOverlayFX,net/minecraft/client/particle -EntityFireworkSparkFX,net/minecraft/client/particle -EntityFireworkStarterFX,net/minecraft/client/particle -ScheduledSound,net/minecraft/client/audio -BehaviorDispenseFirework,net/minecraft/dispenser -EnchantmentThorns,net/minecraft/enchantment -EntityFireworkRocket,net/minecraft/entity/item -ItemBook,net/minecraft/item -ItemEnchantedBook,net/minecraft/item -ItemFirework,net/minecraft/item -ItemFireworkCharge,net/minecraft/item -RecipeFireworks,net/minecraft/item/crafting -TileEntityMobSpawnerSpawnData,net/minecraft/tileentity Block,net/minecraft/block BlockAnvil,net/minecraft/block BlockBeacon,net/minecraft/block @@ -158,6 +145,7 @@ ThreadClientSleep,net/minecraft/client ThreadShutdown,net/minecraft/client CodecMus,net/minecraft/client/audio MusInputStream,net/minecraft/client/audio +ScheduledSound,net/minecraft/client/audio SoundManager,net/minecraft/client/audio SoundPool,net/minecraft/client/audio SoundPoolEntry,net/minecraft/client/audio @@ -325,6 +313,9 @@ EntityDropParticleFX,net/minecraft/client/particle EntityEnchantmentTableParticleFX,net/minecraft/client/particle EntityExplodeFX,net/minecraft/client/particle EntityFX,net/minecraft/client/particle +EntityFireworkOverlayFX,net/minecraft/client/particle +EntityFireworkSparkFX,net/minecraft/client/particle +EntityFireworkStarterFX,net/minecraft/client/particle EntityFlameFX,net/minecraft/client/particle EntityFootStepFX,net/minecraft/client/particle EntityHeartFX,net/minecraft/client/particle @@ -538,6 +529,7 @@ BehaviorBucketFullDispense,net/minecraft/dispenser BehaviorDefaultDispenseItem,net/minecraft/dispenser BehaviorDispenseBoat,net/minecraft/dispenser BehaviorDispenseFireball,net/minecraft/dispenser +BehaviorDispenseFirework,net/minecraft/dispenser BehaviorDispenseItemProvider,net/minecraft/dispenser BehaviorDispenseMinecart,net/minecraft/dispenser BehaviorEggDispense,net/minecraft/dispenser @@ -574,6 +566,7 @@ EnchantmentModifierDamage,net/minecraft/enchantment EnchantmentModifierLiving,net/minecraft/enchantment EnchantmentOxygen,net/minecraft/enchantment EnchantmentProtection,net/minecraft/enchantment +EnchantmentThorns,net/minecraft/enchantment EnchantmentUntouching,net/minecraft/enchantment EnchantmentWaterWorker,net/minecraft/enchantment EnumEnchantmentType,net/minecraft/enchantment @@ -669,6 +662,7 @@ EntityEnderEye,net/minecraft/entity/item EntityEnderPearl,net/minecraft/entity/item EntityExpBottle,net/minecraft/entity/item EntityFallingSand,net/minecraft/entity/item +EntityFireworkRocket,net/minecraft/entity/item EntityItem,net/minecraft/entity/item EntityItemFrame,net/minecraft/entity/item EntityMinecart,net/minecraft/entity/item @@ -771,6 +765,7 @@ ItemAxe,net/minecraft/item ItemBed,net/minecraft/item ItemBlock,net/minecraft/item ItemBoat,net/minecraft/item +ItemBook,net/minecraft/item ItemBow,net/minecraft/item ItemBucket,net/minecraft/item ItemBucketMilk,net/minecraft/item @@ -783,10 +778,13 @@ ItemDye,net/minecraft/item ItemEditableBook,net/minecraft/item ItemEgg,net/minecraft/item ItemEmptyMap,net/minecraft/item +ItemEnchantedBook,net/minecraft/item ItemEnderEye,net/minecraft/item ItemEnderPearl,net/minecraft/item ItemExpBottle,net/minecraft/item ItemFireball,net/minecraft/item +ItemFirework,net/minecraft/item +ItemFireworkCharge,net/minecraft/item ItemFishingRod,net/minecraft/item ItemFlintAndSteel,net/minecraft/item ItemFood,net/minecraft/item @@ -825,6 +823,7 @@ ItemWritableBook,net/minecraft/item CraftingManager,net/minecraft/item/crafting FurnaceRecipes,net/minecraft/item/crafting IRecipe,net/minecraft/item/crafting +RecipeFireworks,net/minecraft/item/crafting RecipeSorter,net/minecraft/item/crafting RecipesArmor,net/minecraft/item/crafting RecipesArmorDyes,net/minecraft/item/crafting @@ -1034,6 +1033,7 @@ TileEntityEndPortal,net/minecraft/tileentity TileEntityEnderChest,net/minecraft/tileentity TileEntityFurnace,net/minecraft/tileentity TileEntityMobSpawner,net/minecraft/tileentity +TileEntityMobSpawnerSpawnData,net/minecraft/tileentity TileEntityNote,net/minecraft/tileentity TileEntityPiston,net/minecraft/tileentity TileEntitySign,net/minecraft/tileentity