From ed3b05630594b63558bf6b8df4657eb522bb3fb5 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 8 Mar 2013 20:36:05 -0500 Subject: [PATCH] Update to MCP 1.5 and minecraft 1.5. --- .../mods/fml/common/registry/GameData.java | 9 +- fml/conf/fields.csv | 50 +++--- fml/conf/joined.exc | 115 +++++++------- fml/conf/joined.srg | 147 ++++++++++-------- fml/conf/mcp.cfg | 8 +- fml/conf/methods.csv | 55 +++---- fml/conf/params.csv | 18 ++- fml/conf/patches/minecraft_ff.patch | 106 +++++++++---- fml/conf/patches/minecraft_server_ff.patch | 70 +++++++-- fml/conf/version.cfg | 6 +- fml/mc_versions.cfg | 11 +- .../multiplayer/NetClientHandler.java.patch | 4 +- .../client/settings/GameSettings.java.patch | 2 +- .../entity/EntityTrackerEntry.java.patch | 4 +- .../entity/monster/EntitySlime.java.patch | 2 +- .../net/minecraft/world/World.java.patch | 4 +- .../minecraft/world/WorldProvider.java.patch | 2 +- 17 files changed, 369 insertions(+), 244 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/registry/GameData.java b/fml/common/cpw/mods/fml/common/registry/GameData.java index 3bdd862d7..9393cb143 100644 --- a/fml/common/cpw/mods/fml/common/registry/GameData.java +++ b/fml/common/cpw/mods/fml/common/registry/GameData.java @@ -257,6 +257,10 @@ public class GameData { Map> map = Maps.transformValues(idMap, new Function>() { public Cell apply(ItemData data) { + if ("Minecraft".equals(data.getModId()) || !data.isOveridden()) + { + return null; + } return Tables.immutableCell(data.getModId(), data.getItemType(), data.getItemId()); } }); @@ -264,7 +268,10 @@ public class GameData { Builder tBuilder = ImmutableTable.builder(); for (Cell c : map.values()) { - tBuilder.put(c); + if (c!=null) + { + tBuilder.put(c); + } } modObjectTable = tBuilder.build(); } diff --git a/fml/conf/fields.csv b/fml/conf/fields.csv index bbb59dcff..fcca8e20a 100644 --- a/fml/conf/fields.csv +++ b/fml/conf/fields.csv @@ -1,5 +1,5 @@ searge,name,side,desc -field_70009_b,buffer,2,RCon string buffer for log +field_70009_b,chatBuffer,2, field_70010_a,consoleBuffer,2,only ever used by MinecraftServer.executeCommand field_70116_cv,serverPosZ,2, field_70117_cu,serverPosY,2, @@ -329,7 +329,7 @@ field_70717_bb,attackingPlayer,2,The most recent player that has attacked this e field_70718_bc,recentlyHit,2,"Set to 60 when hit by the player or the player's wolf, then decrements. Used to determine whether the entity should drop items on death." field_70720_be,arrowHitTimer,2, field_70721_aZ,limbYaw,2, -field_70722_aY,prevLegYaw,2, +field_70722_aY,prevLimbYaw,2, field_70723_bA,senses,2, field_70724_aR,attackTime,2, field_70725_aQ,deathTime,2,"The amount of time remaining this entity should act 'dead', i.e. have a corpse in the world." @@ -572,7 +572,7 @@ field_71324_y,canSpawnAnimals,2,True if the server has animals turned on. field_71325_x,onlineMode,2,True if the server is in online mode. field_71335_s,guiIsEnabled,2, field_71336_r,networkThread,2, -field_71337_q,theGameType,2,The Game Type. +field_71337_q,gameType,2, field_71338_p,canSpawnStructures,2, field_71339_n,theRConThreadMain,2, field_71340_o,settings,2, @@ -1162,11 +1162,11 @@ field_72449_c,zCoord,2,Z coordinate of Vec3D field_72450_a,xCoord,2,X coordinate of Vec3D field_72451_a,theDecitatedServer,2,Instance of the DecitatedServer. field_72534_f,mcServer,2,Reference to the MinecraftServer object. -field_72535_g,loginTimer,2,"While waiting to login, if this field ++'s to 600 it will kick you." +field_72535_g,connectionTimer,2, field_72536_d,verifyToken,2,The 4 byte verify token read from a Packet252SharedKey field_72537_e,rand,2,The Random object used to generate serverId hex strings. field_72538_b,myTCPConnection,2, -field_72539_c,finishedProcessing,2,Returns if the login handler is finished and can be removed. It is set to true on either error or successful login. +field_72539_c,connectionComplete,2, field_72540_a,logger,2,The Minecraft logger. field_72541_j,loginServerId,2,server ID that is randomly generated by this login handler. field_72542_k,sharedKey,2,Secret AES key obtained from the client's Packet252SharedKey @@ -1193,7 +1193,7 @@ field_72579_o,lastPosX,2,The last known x position for this connection. field_72580_l,ticksOfLastKeepAlive,2, field_72581_m,chatSpamThresholdCount,2, field_72582_j,keepAliveTimeSent,2, -field_72583_k,rndmObj,2,The Java Random object. +field_72583_k,randomGenerator,2, field_72585_i,keepAliveRandomID,2, field_72587_r,hasMoved,2,is true when the player has moved since his last movement packet field_72588_q,lastPosZ,2,The last known z position for this connection. @@ -1295,8 +1295,8 @@ field_72781_x,glSkyList2,2,OpenGL sky list 2 field_72782_b,theWorldServer,2,The WorldServer object. field_72783_a,mcServer,2,Reference to the MinecraftServer object. field_72792_d,entityViewDistance,2, -field_72793_b,trackedEntitySet,2,"List of tracked entities, used for iteration operations on tracked entities." -field_72794_c,trackedEntityHashTable,2,Used for identity lookup of tracked entities. +field_72793_b,trackedEntities,2, +field_72794_c,trackedEntityIDs,2, field_72795_a,theWorld,2, field_72814_d,hasExtendedLevels,2,set by !chunk.getAreLevelsEmpty field_72815_e,worldObj,2,Reference to the World object. @@ -1382,20 +1382,20 @@ field_73112_e,partialBlockProgress,2,damage ranges from 1 to 10. -1 causes the c field_73113_b,partialBlockX,2, field_73114_c,partialBlockY,2, field_73115_a,miningPlayerEntId,2,"entity ID of the player associated with this partially destroyed Block. Used to identify the Blocks in the client Renderer, max 1 per player on a server" -field_73126_f,encodedPosZ,2,The encoded entity Z position. -field_73127_g,encodedRotationYaw,2,The encoded entity yaw rotation. -field_73128_d,encodedPosX,2,The encoded entity X position. -field_73129_e,encodedPosY,2,The encoded entity Y position. +field_73126_f,lastScaledZPosition,2, +field_73127_g,lastYaw,2, +field_73128_d,lastScaledXPosition,2, +field_73129_e,lastScaledYPosition,2, field_73130_b,blocksDistanceThreshold,2, field_73131_c,updateFrequency,2,check for sync when ticks % updateFrequency==0 -field_73132_a,trackedEntity,2,The entity that this EntityTrackerEntry tracks. +field_73132_a,myEntity,2, field_73133_n,playerEntitiesUpdated,2, field_73134_o,trackingPlayers,2,Holds references to all the players that are currently receiving position updates for this entity. field_73135_l,motionZ,2, field_73136_m,ticks,2, field_73137_j,motionX,2, field_73138_k,motionY,2, -field_73139_h,encodedRotationPitch,2,The encoded entity pitch rotation. +field_73139_h,lastPitch,2, field_73140_i,lastHeadMotion,2, field_73141_v,ridingEntity,2, field_73142_u,ticksSinceLastForcedTeleport,2,"every 400 ticks a full teleport packet is sent, rather than just a ""move me +x"" command, so that position remains fully synced." @@ -1469,17 +1469,17 @@ field_73235_d,worldObj,2,Reference to the World object. field_73236_b,chunkMapping,2,The mapping between ChunkCoordinates and Chunks that ChunkProviderClient maintains. field_73237_c,chunkListing,2,"This may have been intended to be an iterable version of all currently loaded chunks (MultiplayerChunkCache), with identical contents to chunkMapping's values. However it is never actually added to." field_73238_a,blankChunk,2,The completely empty chunk used by ChunkProviderClient when field_73236_b doesn't contain the requested coordinates. -field_73244_f,id2ChunkMap,2,map of chunk Id's to Chunk instances +field_73244_f,loadedChunkHashMap,2, field_73245_g,loadedChunks,2, -field_73246_d,serverChunkGenerator,2,chunk generator object. Calls to load nonexistent chunks are forwarded to this object. +field_73246_d,currentChunkProvider,2, field_73247_e,currentChunkLoader,2, field_73248_b,chunksToUnload,2,"used by unload100OldestChunks to iterate the loadedChunkHashMap for unload (underlying assumption, first in, first out)" -field_73249_c,dummyChunk,2,"a dummy chunk, returned in place of an actual chunk." +field_73249_c,defaultEmptyChunk,2, field_73250_a,loadChunkOnProvideRequest,2,"if this is false, the defaultEmptyChunk will be returned by the provider" field_73251_h,worldObj,2, -field_73261_d,blocksToUpdate,2,array of blocks to update this tick -field_73262_e,numBlocksToUpdate,2,the number of blocks that need to be updated next tick -field_73263_b,players,2,the list of all players in this instance (chunk) +field_73261_d,locationOfBlockChange,2, +field_73262_e,numberOfTilesToUpdate,2, +field_73263_b,playersInChunk,2, field_73264_c,chunkLocation,2,note: this is final field_73265_a,myManager,2, field_73286_b,clientPacketIdList,2,List of the client's packet IDs. @@ -1771,8 +1771,8 @@ field_73661_d,updateTime,2, field_73662_b,y,2, field_73663_c,z,2, field_73664_a,x,2, -field_73672_b,serverProperties,2,The server properties object. -field_73673_c,serverPropertiesFile,2,The server properties file. +field_73672_b,properties,2, +field_73673_c,associatedFile,2, field_73674_a,logger,2,Reference to the logger. field_73692_f,banEndDate,2, field_73693_g,reason,2, @@ -3690,7 +3690,7 @@ field_77781_bS,record11,2, field_77782_ar,porkCooked,2, field_77783_bR,recordWard,2, field_77784_aq,porkRaw,2, -field_77785_bY,potionEffect,2,The string representing this item's effect on a potion when used as an ingredient. +field_77785_bY,potionEffect,2, field_77786_ax,bucketWater,2, field_77787_bX,hasSubtypes,2,"Some items (like dyes) have multiple subtypes on same item, this is field define this behavior" field_77788_aw,bucketEmpty,2, @@ -4571,7 +4571,7 @@ field_82724_e,isAmbient,2,Whether the potion effect came from a beacon field_82727_n,wither,2, field_82728_o,anvil,2, field_82729_p,fallingBlock,2, -field_82730_x,magicDamage,2,Whether the damage is magic based. +field_82730_x,magicDamage,2, field_82731_v,wither,2,The wither Potion object. field_82741_K,vecPool,2,The world-local pool of vectors field_82745_f,createdAtCloudUpdateTick,2,keeps track of how many ticks this PartiallyDestroyedBlock already exists @@ -4633,6 +4633,7 @@ field_82893_b,batBody,2,The body box of the bat model. field_82894_c,batRightWing,2,The inner right wing box of the bat model. field_82895_a,batHead,2, field_82896_a,skeletonHead,2, +field_82902_i,witchHat,2, field_82909_b,presetName,2,Name for this preset. field_82910_c,presetData,2,Data for this preset. field_82911_a,iconId,2,ID for the item used as icon for this preset. @@ -4678,6 +4679,7 @@ 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_92039_az,fireworkExplosions,2, +field_92039_k,thorns,2, field_92052_bU,firework,2, field_92053_bW,enchantedBook,2, field_92054_bV,fireworkCharge,2, diff --git a/fml/conf/joined.exc b/fml/conf/joined.exc index 7407f5868..c51e8b47f 100644 --- a/fml/conf/joined.exc +++ b/fml/conf/joined.exc @@ -13,7 +13,7 @@ argo/jdom/JsonArray.func_74618_a(Ljava/lang/Iterable;)Ljava/util/List;=|p_74618_ argo/jdom/JsonArrayNodeBuilder.func_74603_a(Largo/jdom/JsonNodeBuilder;)Largo/jdom/JsonArrayNodeBuilder;=|p_74603_1_ argo/jdom/JsonArray_NodeList.(Ljava/lang/Iterable;)V=|p_i3222_1_ argo/jdom/JsonConstants.(Largo/jdom/JsonNodeType;)V=|p_i3224_1_ -argo/jdom/JsonFieldBuilder.func_74723_b(Largo/j96265_dom/JsonNodeBuilder;)Largo/jdom/JsonFieldBuilder;=|p_74723_1_ +argo/jdom/JsonFieldBuilder.func_74723_b(Largo/jdom/JsonNodeBuilder;)Largo/jdom/JsonFieldBuilder;=|p_74723_1_ argo/jdom/JsonFieldBuilder.func_74726_a(Largo/jdom/JsonNodeBuilder;)Largo/jdom/JsonFieldBuilder;=|p_74726_1_ argo/jdom/JsonListenerToJdomAdapter.func_74647_c(Ljava/lang/String;)V=|p_74647_1_ argo/jdom/JsonListenerToJdomAdapter.func_74648_a(Ljava/lang/String;)V=|p_74648_1_ @@ -30,11 +30,11 @@ argo/jdom/JsonListenerToJdomAdapter_Object.(Largo/jdom/JsonListenerToJdomA argo/jdom/JsonListenerToJdomAdapter_Object.func_74715_a(Largo/jdom/JsonNodeBuilder;)V=|p_74715_1_ argo/jdom/JsonListenerToJdomAdapter_Object.func_74716_a(Largo/jdom/JsonFieldBuilder;)V=|p_74716_1_ argo/jdom/JsonNode.func_74613_a(Largo/jdom/JsonNodeSelector;Largo/jdom/JsonNode;[Ljava/lang/Object;)Ljava/lang/Object;=argo/jdom/JsonNodeDoesNotMatchPathElementsException|p_74613_1_,p_74613_2_,p_74613_3_ -argo/jdom/JsonNode.func_98308_d([Ljava/lang/Object;)Z=|p_98308_1_ -argo/jdom/JsonNode.func_98309_a([Ljava/lang/Object;)Ljava/lang/Boolean;=|p_98309_1_ -argo/jdom/JsonNode.func_98310_c([Ljava/lang/Object;)Ljava/lang/String;=|p_98310_1_ argo/jdom/JsonNode.getArrayNode([Ljava/lang/Object;)Ljava/util/List;=|p_getArrayNode_1_ +argo/jdom/JsonNode.getBooleanValue([Ljava/lang/Object;)Ljava/lang/Boolean;=|p_getBooleanValue_1_ +argo/jdom/JsonNode.getNumberValue([Ljava/lang/Object;)Ljava/lang/String;=|p_getNumberValue_1_ argo/jdom/JsonNode.getStringValue([Ljava/lang/Object;)Ljava/lang/String;=|p_getStringValue_1_ +argo/jdom/JsonNode.isArrayNode([Ljava/lang/Object;)Z=|p_isArrayNode_1_ argo/jdom/JsonNodeBuilders.func_74710_b(Ljava/lang/String;)Largo/jdom/JsonStringNodeBuilder;=|p_74710_0_ argo/jdom/JsonNodeBuilders.func_74712_a(Ljava/lang/String;)Largo/jdom/JsonNodeBuilder;=|p_74712_0_ argo/jdom/JsonNodeDoesNotMatchChainedJsonNodeSelectorException.(Largo/jdom/Functor;Ljava/util/List;)V=|p_i3228_1_,p_i3228_2_ @@ -234,6 +234,7 @@ net/minecraft/src/AnvilChunkLoaderPending.(Lnet/minecraft/src/ChunkCoordIn net/minecraft/src/AnvilConverterData.(II)V=|p_i3775_1_,p_i3775_2_ net/minecraft/src/AnvilConverterException.(Ljava/lang/String;)V=|p_i11045_1_ net/minecraft/src/AnvilSaveConverter.(Ljava/io/File;)V=|p_i3910_1_ +net/minecraft/src/AnvilSaveConverter.func_75799_b()Ljava/util/List;=net/minecraft/src/AnvilConverterException| net/minecraft/src/AnvilSaveConverter.func_75801_b(Ljava/lang/String;)Z=|p_75801_1_ net/minecraft/src/AnvilSaveConverter.func_75804_a(Ljava/lang/String;Z)Lnet/minecraft/src/ISaveHandler;=|p_75804_1_,p_75804_2_ net/minecraft/src/AnvilSaveConverter.func_75805_a(Ljava/lang/String;Lnet/minecraft/src/IProgressUpdate;)Z=|p_75805_1_,p_75805_2_ @@ -276,11 +277,6 @@ net/minecraft/src/BanList.func_73704_a(Ljava/lang/String;)Z=|p_73704_1_ net/minecraft/src/BanList.func_73706_a(Lnet/minecraft/src/BanEntry;)V=|p_73706_1_ net/minecraft/src/BanList.func_73708_a(Z)V=|p_73708_1_ net/minecraft/src/BanList.func_73709_b(Ljava/lang/String;)V=|p_73709_1_ -net/minecraft/src/ConvertingProgressUpdate.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5002_1_ -net/minecraft/src/ConvertingProgressUpdate.func_73718_a(I)V=|p_73718_1_ -net/minecraft/src/ConvertingProgressUpdate.func_73719_c(Ljava/lang/String;)V=|p_73719_1_ -net/minecraft/src/ConvertingProgressUpdate.func_73720_a(Ljava/lang/String;)V=|p_73720_1_ -net/minecraft/src/ConvertingProgressUpdate.func_73721_b(Ljava/lang/String;)V=|p_73721_1_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorDefaultDispenseItem.func_82486_a(Lnet/minecraft/src/World;Lnet/minecraft/src/ItemStack;ILnet/minecraft/src/EnumFacing;Lnet/minecraft/src/IPosition;)V=|p_82486_0_,p_82486_1_,p_82486_2_,p_82486_3_,p_82486_4_ @@ -291,14 +287,8 @@ net/minecraft/src/BehaviorDispenseArmor.func_82487_b(Lnet/minecraft/src/IBlockSo net/minecraft/src/BehaviorDispenseItemProvider.func_82482_a(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82482_1_,p_82482_2_ net/minecraft/src/BehaviorDispenseMinecart.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorDispenseMinecart.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/BehaviorEggDispense.(Lnet/minecraft/src/DedicatedServer;)V=|p_i10010_1_ -net/minecraft/src/BehaviorEggDispense.run()V=| -net/minecraft/src/CallableIsServerModded.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5006_1_ -net/minecraft/src/CallableServerMemoryStats.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5009_1_ -net/minecraft/src/CallableServerProfiler.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5008_1_ net/minecraft/src/BehaviorProjectileDispense.func_82485_a(Lnet/minecraft/src/IBlockSource;)V=|p_82485_1_ net/minecraft/src/BehaviorProjectileDispense.func_82487_b(Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/ItemStack;=|p_82487_1_,p_82487_2_ -net/minecraft/src/ThreadMinecraftServer.(Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)V=|p_i10043_1_,p_i10043_2_ net/minecraft/src/BiomeCache.(Lnet/minecraft/src/WorldChunkManager;)V=|p_i3749_1_ net/minecraft/src/BiomeCache.func_76836_a(Lnet/minecraft/src/BiomeCache;)Lnet/minecraft/src/WorldChunkManager;=|p_76836_0_ net/minecraft/src/BiomeCache.func_76837_b(II)Lnet/minecraft/src/BiomeGenBase;=|p_76837_1_,p_76837_2_ @@ -632,6 +622,10 @@ net/minecraft/src/BlockComparator.func_94491_m(Lnet/minecraft/src/World;IIII)I=| net/minecraft/src/BlockComparator.func_96470_c(I)Z=|p_96470_1_ net/minecraft/src/BlockComparator.func_96475_a_(Lnet/minecraft/src/IBlockAccess;III)Lnet/minecraft/src/TileEntityComparator;=|p_96475_1_,p_96475_2_,p_96475_3_,p_96475_4_ net/minecraft/src/BlockComparator.func_96476_c(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_96476_1_,p_96476_2_,p_96476_3_,p_96476_4_,p_96476_5_ +net/minecraft/src/BlockContainer.(ILnet/minecraft/src/Material;)V=|p_i10059_1_,p_i10059_2_ +net/minecraft/src/BlockContainer.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_ +net/minecraft/src/BlockContainer.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_ +net/minecraft/src/BlockContainer.func_71883_b(Lnet/minecraft/src/World;IIIII)Z=|p_71883_1_,p_71883_2_,p_71883_3_,p_71883_4_,p_71883_5_,p_71883_6_ net/minecraft/src/BlockCrops.(I)V=|p_i9048_1_ net/minecraft/src/BlockCrops.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_ net/minecraft/src/BlockCrops.func_71858_a(II)Lnet/minecraft/src/Icon;=|p_71858_1_,p_71858_2_ @@ -660,15 +654,20 @@ net/minecraft/src/BlockDeadBush.func_72263_d_(I)Z=|p_72263_1_ net/minecraft/src/BlockDetectorRail.(I)V=|p_i9051_1_ net/minecraft/src/BlockDetectorRail.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_ net/minecraft/src/BlockDetectorRail.func_71855_c(Lnet/minecraft/src/IBlockAccess;IIII)I=|p_71855_1_,p_71855_2_,p_71855_3_,p_71855_4_,p_71855_5_ +net/minecraft/src/BlockDetectorRail.func_71858_a(II)Lnet/minecraft/src/Icon;=|p_71858_1_,p_71858_2_ net/minecraft/src/BlockDetectorRail.func_71859_p_(Lnet/minecraft/src/World;)I=|p_71859_1_ +net/minecraft/src/BlockDetectorRail.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_ net/minecraft/src/BlockDetectorRail.func_71865_a(Lnet/minecraft/src/IBlockAccess;IIII)I=|p_71865_1_,p_71865_2_,p_71865_3_,p_71865_4_,p_71865_5_ net/minecraft/src/BlockDetectorRail.func_71869_a(Lnet/minecraft/src/World;IIILnet/minecraft/src/Entity;)V=|p_71869_1_,p_71869_2_,p_71869_3_,p_71869_4_,p_71869_5_ net/minecraft/src/BlockDetectorRail.func_72187_e(Lnet/minecraft/src/World;IIII)V=|p_72187_1_,p_72187_2_,p_72187_3_,p_72187_4_,p_72187_5_ net/minecraft/src/BlockDetectorRail.func_94328_b_(Lnet/minecraft/src/World;IIII)I=|p_94328_1_,p_94328_2_,p_94328_3_,p_94328_4_,p_94328_5_ +net/minecraft/src/BlockDetectorRail.func_94332_a(Lnet/minecraft/src/IconRegister;)V=|p_94332_1_ net/minecraft/src/BlockDirectional.(ILnet/minecraft/src/Material;)V=|p_i3936_1_,p_i3936_2_ net/minecraft/src/BlockDirectional.func_72217_d(I)I=|p_72217_0_ net/minecraft/src/BlockDirt.(I)V=|p_i9052_1_ net/minecraft/src/BlockDispenser.(I)V=|p_i3938_1_ +net/minecraft/src/BlockDispenser.func_100001_j_(I)Lnet/minecraft/src/EnumFacing;=|p_100001_0_ +net/minecraft/src/BlockDispenser.func_100009_j_(I)Lnet/minecraft/src/EnumFacing;=|p_100009_0_ net/minecraft/src/BlockDispenser.func_71847_b(Lnet/minecraft/src/World;IIILjava/util/Random;)V=|p_71847_1_,p_71847_2_,p_71847_3_,p_71847_4_,p_71847_5_ net/minecraft/src/BlockDispenser.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_ net/minecraft/src/BlockDispenser.func_71858_a(II)Lnet/minecraft/src/Icon;=|p_71858_1_,p_71858_2_ @@ -1567,6 +1566,7 @@ net/minecraft/src/CallableGLInfo.(Lnet/minecraft/client/Minecraft;)V=|p_i3 net/minecraft/src/CallableIntCache.(Lnet/minecraft/src/CrashReport;)V=|p_i6804_1_ net/minecraft/src/CallableIsFeatureChunk.(Lnet/minecraft/src/MapGenStructure;II)V=|p_i6817_1_,p_i6817_2_,p_i6817_3_ net/minecraft/src/CallableIsModded.(Lnet/minecraft/src/IntegratedServer;)V=|p_i3123_1_ +net/minecraft/src/CallableIsServerModded.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5006_1_ net/minecraft/src/CallableItemName.(Lnet/minecraft/src/InventoryPlayer;Lnet/minecraft/src/ItemStack;)V=|p_i10055_1_,p_i10055_2_ net/minecraft/src/CallableJVMFlags.(Lnet/minecraft/src/CrashReport;)V=|p_i3249_1_ net/minecraft/src/CallableJavaInfo.(Lnet/minecraft/src/CrashReport;)V=|p_i3246_1_ @@ -1597,6 +1597,8 @@ net/minecraft/src/CallableParticlePositionInfo.(Lnet/minecraft/src/RenderG net/minecraft/src/CallableParticleScreenName.(Lnet/minecraft/client/Minecraft;)V=|p_i7001_1_ 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_i5009_1_ +net/minecraft/src/CallableServerProfiler.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5008_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_ net/minecraft/src/CallableSuspiciousClasses.(Lnet/minecraft/src/CrashReport;)V=|p_i6803_1_ @@ -2220,6 +2222,11 @@ net/minecraft/src/ContainerWorkbench.func_75134_a(Lnet/minecraft/src/EntityPlaye net/minecraft/src/ContainerWorkbench.func_75145_c(Lnet/minecraft/src/EntityPlayer;)Z=|p_75145_1_ net/minecraft/src/ContainerWorkbench.func_82846_b(Lnet/minecraft/src/EntityPlayer;I)Lnet/minecraft/src/ItemStack;=|p_82846_1_,p_82846_2_ net/minecraft/src/ContainerWorkbench.func_94530_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/Slot;)Z=|p_94530_1_,p_94530_2_ +net/minecraft/src/ConvertingProgressUpdate.(Lnet/minecraft/server/MinecraftServer;)V=|p_i5002_1_ +net/minecraft/src/ConvertingProgressUpdate.func_73718_a(I)V=|p_73718_1_ +net/minecraft/src/ConvertingProgressUpdate.func_73719_c(Ljava/lang/String;)V=|p_73719_1_ +net/minecraft/src/ConvertingProgressUpdate.func_73720_a(Ljava/lang/String;)V=|p_73720_1_ +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_92103_a(Lnet/minecraft/src/ItemStack;[Ljava/lang/Object;)Lnet/minecraft/src/ShapedRecipes;=|p_92103_1_,p_92103_2_ @@ -3743,6 +3750,7 @@ net/minecraft/src/GameRules.func_82767_a(Ljava/lang/String;)Ljava/lang/String;=| net/minecraft/src/GameRules.func_82768_a(Lnet/minecraft/src/NBTTagCompound;)V=|p_82768_1_ net/minecraft/src/GameRules.func_82769_a(Ljava/lang/String;Ljava/lang/String;)V=|p_82769_1_,p_82769_2_ net/minecraft/src/GameSettings.(Lnet/minecraft/client/Minecraft;Ljava/io/File;)V=|p_i3009_1_,p_i3009_2_ +net/minecraft/src/GameSettings.func_100015_a(Lnet/minecraft/src/KeyBinding;)Z=|p_100015_0_ net/minecraft/src/GameSettings.func_74296_a(Lnet/minecraft/src/EnumOptions;)F=|p_74296_1_ net/minecraft/src/GameSettings.func_74297_c(Lnet/minecraft/src/EnumOptions;)Ljava/lang/String;=|p_74297_1_ net/minecraft/src/GameSettings.func_74298_c(I)Ljava/lang/String;=|p_74298_0_ @@ -4122,16 +4130,16 @@ net/minecraft/src/GuiScreenConfigureWorld.func_73864_a(III)V=|p_73864_1_,p_73864 net/minecraft/src/GuiScreenConfigureWorld.func_73869_a(CI)V=|p_73869_1_,p_73869_2_ net/minecraft/src/GuiScreenConfigureWorld.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_ net/minecraft/src/GuiScreenConfigureWorld.func_73878_a(ZI)V=|p_73878_1_,p_73878_2_ +net/minecraft/src/GuiScreenConfigureWorld.func_96263_e(Lnet/minecraft/src/GuiScreenConfigureWorld;)I=|p_96263_0_ net/minecraft/src/GuiScreenConfigureWorld.func_96264_a(I)I=|p_96264_1_ -net/minecraft/src/GuiScreenConfigureWorld.func_96267_d(I)V=|p_96267_1_ net/minecraft/src/GuiScreenConfigureWorld.func_96265_a(Lnet/minecraft/src/GuiScreenConfigureWorld;)Lnet/minecraft/client/Minecraft;=|p_96265_0_ -net/minecraft/src/GuiScreenConfigureWorld.func_96273_f(Lnet/minecraft/src/GuiScreenConfigureWorld;)Lnet/minecraft/src/FontRenderer;=|p_96273_0_ +net/minecraft/src/GuiScreenConfigureWorld.func_96266_d(Lnet/minecraft/src/GuiScreenConfigureWorld;)Lnet/minecraft/src/McoServer;=|p_96266_0_ +net/minecraft/src/GuiScreenConfigureWorld.func_96267_d(I)V=|p_96267_1_ +net/minecraft/src/GuiScreenConfigureWorld.func_96269_c(Lnet/minecraft/src/GuiScreenConfigureWorld;)I=|p_96269_0_ net/minecraft/src/GuiScreenConfigureWorld.func_96270_b(Lnet/minecraft/src/GuiScreenConfigureWorld;I)I=|p_96270_0_,p_96270_1_ net/minecraft/src/GuiScreenConfigureWorld.func_96271_b(Lnet/minecraft/src/GuiScreenConfigureWorld;)I=|p_96271_0_ +net/minecraft/src/GuiScreenConfigureWorld.func_96273_f(Lnet/minecraft/src/GuiScreenConfigureWorld;)Lnet/minecraft/src/FontRenderer;=|p_96273_0_ net/minecraft/src/GuiScreenConfigureWorld.func_96274_a(Lnet/minecraft/src/GuiScreenConfigureWorld;I)I=|p_96274_0_,p_96274_1_ -net/minecraft/src/GuiScreenConfigureWorld.func_96263_e(Lnet/minecraft/src/GuiScreenConfigureWorld;)I=|p_96263_0_ -net/minecraft/src/GuiScreenConfigureWorld.func_96266_d(Lnet/minecraft/src/GuiScreenConfigureWorld;)Lnet/minecraft/src/McoServer;=|p_96266_0_ -net/minecraft/src/GuiScreenConfigureWorld.func_96269_c(Lnet/minecraft/src/GuiScreenConfigureWorld;)I=|p_96269_0_ net/minecraft/src/GuiScreenConfirmation.(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;I)V=|p_i10019_1_,p_i10019_2_,p_i10019_3_,p_i10019_4_,p_i10019_5_ net/minecraft/src/GuiScreenConfirmation.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_ net/minecraft/src/GuiScreenCreateOnlineWorld.(Lnet/minecraft/src/GuiScreen;)V=|p_i10010_1_ @@ -4139,6 +4147,8 @@ net/minecraft/src/GuiScreenCreateOnlineWorld.func_73863_a(IIF)V=|p_73863_1_,p_73 net/minecraft/src/GuiScreenCreateOnlineWorld.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_ net/minecraft/src/GuiScreenCreateOnlineWorld.func_73869_a(CI)V=|p_73869_1_,p_73869_2_ net/minecraft/src/GuiScreenCreateOnlineWorld.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_ +net/minecraft/src/GuiScreenCreateOnlineWorld.func_96246_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96246_0_ +net/minecraft/src/GuiScreenCreateOnlineWorld.func_96247_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/GuiScreen;=|p_96247_0_ net/minecraft/src/GuiScreenCreateOnlineWorld.func_96248_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96248_0_ net/minecraft/src/GuiScreenCreateOnlineWorld.func_96251_a(Lnet/minecraft/src/Location;Ljava/lang/String;Ljava/lang/String;)V=|p_96251_1_,p_96251_2_,p_96251_3_ net/minecraft/src/GuiScreenCreateOnlineWorld.func_98099_d(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_98099_0_ @@ -4146,8 +4156,6 @@ net/minecraft/src/GuiScreenCreateOnlineWorld.func_98100_a(Lnet/minecraft/src/Gui net/minecraft/src/GuiScreenCreateOnlineWorld.func_98101_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/Location;=|p_98101_0_ net/minecraft/src/GuiScreenCreateOnlineWorld.func_98102_a(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;Ljava/util/List;)Ljava/util/List;=|p_98102_0_,p_98102_1_ net/minecraft/src/GuiScreenCreateOnlineWorld.func_98103_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Ljava/util/List;=|p_98103_0_ -net/minecraft/src/GuiScreenCreateOnlineWorld.func_96247_b(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/src/GuiScreen;=|p_96247_0_ -net/minecraft/src/GuiScreenCreateOnlineWorld.func_96246_c(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)Lnet/minecraft/client/Minecraft;=|p_96246_0_ net/minecraft/src/GuiScreenDemo.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_ net/minecraft/src/GuiScreenDemo.func_73875_a(Lnet/minecraft/src/GuiButton;)V=|p_73875_1_ net/minecraft/src/GuiScreenDisconnectedOnline.(Lnet/minecraft/src/GuiScreen;Ljava/lang/String;Ljava/lang/String;[Ljava/lang/Object;)V=|p_i11007_1_,p_i11007_2_,p_i11007_3_,p_i11007_4_ @@ -4181,11 +4189,11 @@ net/minecraft/src/GuiScreenOnlineServers.func_96168_c(II)V=|p_96168_1_,p_96168_2 net/minecraft/src/GuiScreenOnlineServers.func_96174_a(Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_96174_1_ net/minecraft/src/GuiScreenOnlineServers.func_96175_b(II)V=|p_96175_1_,p_96175_2_ net/minecraft/src/GuiScreenOnlineServers.func_96177_a(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_96177_0_ +net/minecraft/src/GuiScreenOnlineServers.func_96179_a(Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_96179_0_,p_96179_1_ net/minecraft/src/GuiScreenOnlineServers.func_96182_l(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_96182_0_ net/minecraft/src/GuiScreenOnlineServers.func_98070_a(Lnet/minecraft/src/GuiScreenOnlineServers;II)V=|p_98070_0_,p_98070_1_,p_98070_2_ net/minecraft/src/GuiScreenOnlineServers.func_98071_n(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98071_0_ net/minecraft/src/GuiScreenOnlineServers.func_98072_d(Lnet/minecraft/src/GuiScreenOnlineServers;)I=|p_98072_0_ -net/minecraft/src/GuiScreenOnlineServers.func_96179_a(Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V=java/io/IOException|p_96179_0_,p_96179_1_ net/minecraft/src/GuiScreenOnlineServers.func_98074_m(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer;=|p_98074_0_ net/minecraft/src/GuiScreenOnlineServers.func_98075_b(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98075_0_ net/minecraft/src/GuiScreenOnlineServers.func_98076_f(Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft;=|p_98076_0_ @@ -4216,10 +4224,10 @@ net/minecraft/src/GuiScreenSelectLocation.func_73875_a(Lnet/minecraft/src/GuiBut net/minecraft/src/GuiScreenSelectLocation.func_96230_c(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/GuiSmallButton;=|p_96230_0_ net/minecraft/src/GuiScreenSelectLocation.func_96231_e(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/FontRenderer;=|p_96231_0_ net/minecraft/src/GuiScreenSelectLocation.func_96232_a(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/client/Minecraft;=|p_96232_0_ -net/minecraft/src/GuiScreenSelectLocation.func_96235_f(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/FontRenderer;=|p_96235_0_ -net/minecraft/src/GuiScreenSelectLocation.func_96236_b(Lnet/minecraft/src/GuiScreenSelectLocation;)Ljava/util/List;=|p_96236_0_ net/minecraft/src/GuiScreenSelectLocation.func_96233_d(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/Location;=|p_96233_0_ net/minecraft/src/GuiScreenSelectLocation.func_96234_a(Lnet/minecraft/src/GuiScreenSelectLocation;Lnet/minecraft/src/Location;)Lnet/minecraft/src/Location;=|p_96234_0_,p_96234_1_ +net/minecraft/src/GuiScreenSelectLocation.func_96235_f(Lnet/minecraft/src/GuiScreenSelectLocation;)Lnet/minecraft/src/FontRenderer;=|p_96235_0_ +net/minecraft/src/GuiScreenSelectLocation.func_96236_b(Lnet/minecraft/src/GuiScreenSelectLocation;)Ljava/util/List;=|p_96236_0_ net/minecraft/src/GuiScreenServerList.(Lnet/minecraft/src/GuiScreen;Lnet/minecraft/src/ServerData;)V=|p_i3066_1_,p_i3066_2_ net/minecraft/src/GuiScreenServerList.func_73863_a(IIF)V=|p_73863_1_,p_73863_2_,p_73863_3_ net/minecraft/src/GuiScreenServerList.func_73864_a(III)V=|p_73864_1_,p_73864_2_,p_73864_3_ @@ -4243,10 +4251,10 @@ net/minecraft/src/GuiSelectWorld.func_74063_d(I)Ljava/lang/String;=|p_74063_1_ net/minecraft/src/GuiSelectWorld.func_74064_e(I)V=|p_74064_1_ net/minecraft/src/GuiSelectWorld.func_74068_a(Lnet/minecraft/src/GuiSelectWorld;)Ljava/util/List;=|p_74068_0_ net/minecraft/src/GuiSelectWorld.func_74069_a(I)Ljava/lang/String;=|p_74069_1_ -net/minecraft/src/GuiSelectWorld.func_74073_h()V=net/minecraft/src/AnvilConverterException| net/minecraft/src/GuiSelectWorld.func_74070_c(Lnet/minecraft/src/GuiSelectWorld;)Lnet/minecraft/src/GuiButton;=|p_74070_0_ net/minecraft/src/GuiSelectWorld.func_74071_e(Lnet/minecraft/src/GuiSelectWorld;)Lnet/minecraft/src/GuiButton;=|p_74071_0_ net/minecraft/src/GuiSelectWorld.func_74072_a(Lnet/minecraft/src/GuiSelectWorld;I)I=|p_74072_0_,p_74072_1_ +net/minecraft/src/GuiSelectWorld.func_74073_h()V=net/minecraft/src/AnvilConverterException| net/minecraft/src/GuiSelectWorld.func_82311_i(Lnet/minecraft/src/GuiSelectWorld;)Ljava/lang/String;=|p_82311_0_ net/minecraft/src/GuiSelectWorld.func_82312_f(Lnet/minecraft/src/GuiSelectWorld;)Lnet/minecraft/src/GuiButton;=|p_82312_0_ net/minecraft/src/GuiSelectWorld.func_82313_g(Lnet/minecraft/src/GuiSelectWorld;)Ljava/lang/String;=|p_82313_0_ @@ -4429,10 +4437,10 @@ net/minecraft/src/HttpUtilRunnable.(Lnet/minecraft/src/IProgressUpdate;Lja net/minecraft/src/IChunkLoader.func_75815_a(Lnet/minecraft/src/World;II)Lnet/minecraft/src/Chunk;=java/io/IOException| net/minecraft/src/IChunkLoader.func_75816_a(Lnet/minecraft/src/World;Lnet/minecraft/src/Chunk;)V=net/minecraft/src/MinecraftException,java/io/IOException| net/minecraft/src/ILogAgent.func_98076_a()Ljava/util/logging/Logger;=| -net/minecraft/src/ISaveHandler.func_75762_c()V=net/minecraft/src/MinecraftException| net/minecraft/src/ISaveFormat.func_75799_b()Ljava/util/List;=net/minecraft/src/AnvilConverterException| -net/minecraft/src/SaveFormatOld.func_75799_b()Ljava/util/List;=net/minecraft/src/AnvilConverterException| -net/minecraft/src/AnvilSaveConverter.func_75799_b()Ljava/util/List;=net/minecraft/src/AnvilConverterException| +net/minecraft/src/ISaveHandler.func_75762_c()V=net/minecraft/src/MinecraftException| +net/minecraft/src/ITexturePack.func_77532_a(Ljava/lang/String;)Ljava/io/InputStream;=java/io/IOException| +net/minecraft/src/ITexturePack.func_98137_a(Ljava/lang/String;Z)Ljava/io/InputStream;=java/io/IOException| net/minecraft/src/IconFlipped.(Lnet/minecraft/src/Icon;ZZ)V=|p_i10047_1_,p_i10047_2_,p_i10047_3_ net/minecraft/src/IconFlipped.func_94207_b(D)F=|p_94207_1_ net/minecraft/src/IconFlipped.func_94214_a(D)F=|p_94214_1_ @@ -4543,11 +4551,6 @@ net/minecraft/src/InventoryPlayer.func_82347_b(II)I=|p_82347_1_,p_82347_2_ net/minecraft/src/InventoryPlayer.func_94041_b(ILnet/minecraft/src/ItemStack;)Z=|p_94041_1_,p_94041_2_ net/minecraft/src/InventoryRepair.(Lnet/minecraft/src/ContainerRepair;Ljava/lang/String;ZI)V=|p_i9033_1_,p_i9033_2_,p_i9033_3_,p_i9033_4_ net/minecraft/src/InventoryRepair.func_94041_b(ILnet/minecraft/src/ItemStack;)Z=|p_94041_1_,p_94041_2_ -net/minecraft/src/SelectionListInvited.(Lnet/minecraft/src/GuiScreenConfigureWorld;)V=|p_i11005_1_ -net/minecraft/src/SelectionListInvited.func_96609_a(I)Z=|p_96609_1_ -net/minecraft/src/SelectionListInvited.func_96610_a(IIIILnet/minecraft/src/Tessellator;)V=|p_96610_1_,p_96610_2_,p_96610_3_,p_96610_4_,p_96610_5_ -net/minecraft/src/SelectionListInvited.func_96615_a(IZ)V=|p_96615_1_,p_96615_2_ -net/minecraft/src/SelectionListInvited.func_98263_b(IIIILnet/minecraft/src/Tessellator;)V=|p_98263_1_,p_98263_2_,p_98263_3_,p_98263_4_,p_98263_5_ net/minecraft/src/Item.(I)V=|p_i3659_1_ net/minecraft/src/Item.func_77613_e(Lnet/minecraft/src/ItemStack;)Lnet/minecraft/src/EnumRarity;=|p_77613_1_ net/minecraft/src/Item.func_77615_a(Lnet/minecraft/src/ItemStack;Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;I)V=|p_77615_1_,p_77615_2_,p_77615_3_,p_77615_4_ @@ -5044,7 +5047,7 @@ net/minecraft/src/MathHelper.func_82713_a(Ljava/lang/String;DD)D=|p_82713_0_,p_8 net/minecraft/src/MathHelper.func_82714_a(Ljava/lang/String;II)I=|p_82714_0_,p_82714_1_,p_82714_2_ net/minecraft/src/MathHelper.func_82715_a(Ljava/lang/String;I)I=|p_82715_0_,p_82715_1_ net/minecraft/src/MathHelper.func_82716_a(Ljava/util/Random;DD)D=|p_82716_0_,p_82716_1_,p_82716_3_ -net/minecraft/src/McoClient.(Ljava/lang/String;)V=|p_i10033_1_ +net/minecraft/src/McoClient.(Lnet/minecraft/src/Session;)V=|p_i20001_1_ net/minecraft/src/McoClient.func_96374_a(J)Lnet/minecraft/src/McoServerAddress;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96374_1_ net/minecraft/src/McoClient.func_96375_b()Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException| net/minecraft/src/McoClient.func_96376_d(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96376_1_ @@ -5053,19 +5056,18 @@ net/minecraft/src/McoClient.func_96378_c(J)Ljava/lang/Boolean;=net/minecraft/src net/minecraft/src/McoClient.func_96379_c()I=net/minecraft/src/ExceptionMcoService| net/minecraft/src/McoClient.func_96380_a(Ljava/lang/String;)Ljava/lang/String;=java/io/UnsupportedEncodingException|p_96380_1_ net/minecraft/src/McoClient.func_96381_a(JLjava/lang/String;)V=net/minecraft/src/ExceptionMcoService|p_96381_1_,p_96381_3_ +net/minecraft/src/McoClient.func_96382_a()Lnet/minecraft/src/ValueObjectList;=net/minecraft/src/ExceptionMcoService| net/minecraft/src/McoClient.func_96383_b(J)Ljava/lang/Boolean;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96383_1_ net/minecraft/src/McoClient.func_96384_a(JLjava/lang/String;Ljava/lang/String;)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96384_1_,p_96384_3_,p_96384_4_ net/minecraft/src/McoClient.func_96385_d()Lnet/minecraft/src/Locations;=net/minecraft/src/ExceptionMcoService,java/io/IOException| -net/minecraft/src/McoClient.func_96386_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96386_1_,p_96386_2_,p_96386_3_ +net/minecraft/src/McoClient.func_96386_a(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V=java/io/IOException,net/minecraft/src/ExceptionMcoService,java/io/UnsupportedEncodingException|p_96386_1_,p_96386_2_,p_96386_3_ net/minecraft/src/McoClient.func_96387_b(JLjava/lang/String;)Lnet/minecraft/src/McoServer;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_96387_1_,p_96387_3_ net/minecraft/src/McoClient.func_98176_a(J)Lnet/minecraft/src/McoServer;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_98176_1_ -net/minecraft/src/McoClient.func_96382_a()Lnet/minecraft/src/ValueObjectList;=net/minecraft/src/ExceptionMcoService| net/minecraft/src/McoClient.func_98177_f(J)Lnet/minecraft/src/ValueObjectSubscription;=net/minecraft/src/ExceptionMcoService,java/io/IOException|p_98177_1_ net/minecraft/src/McoOption.func_98153_a(Ljava/lang/Object;)Lnet/minecraft/src/McoOptionSome;=|p_98153_0_ net/minecraft/src/McoOptionSome.(Ljava/lang/Object;)V=|p_i11017_1_ net/minecraft/src/McoPair.(Ljava/lang/Object;Ljava/lang/Object;)V=|p_i11018_1_,p_i11018_2_ net/minecraft/src/McoPair.func_98157_a(Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/src/McoPair;=|p_98157_0_,p_98157_1_ -net/minecraft/src/McoPair.func_98158_a(Ljava/lang/String;)Ljava/lang/String;=|p_98158_1_ net/minecraft/src/McoServer.func_96399_a(Ljava/lang/String;)V=|p_96399_1_ net/minecraft/src/McoServer.func_96400_b(Ljava/lang/String;)V=|p_96400_1_ net/minecraft/src/McoServer.func_96401_a(Lnet/minecraft/src/McoServer;)V=|p_96401_1_ @@ -5073,12 +5075,11 @@ net/minecraft/src/McoServer.func_98163_a(Largo/jdom/JsonNode;)Lnet/minecraft/src net/minecraft/src/McoServer.func_98164_a(Ljava/util/List;)Ljava/util/List;=|p_98164_0_ net/minecraft/src/McoServer.func_98165_c(Ljava/lang/String;)Lnet/minecraft/src/McoServer;=|p_98165_0_ net/minecraft/src/McoServerAddress.func_98162_a(Ljava/lang/String;)Lnet/minecraft/src/McoServerAddress;=|p_98162_0_ -net/minecraft/src/McoServerList.(Ljava/lang/String;)V=|p_i11006_1_ +net/minecraft/src/McoServerList.(Lnet/minecraft/src/Session;)V=|p_i20000_1_ +net/minecraft/src/McoServerList.func_100014_a(Lnet/minecraft/src/McoServerList;)Lnet/minecraft/src/Session;=|p_100014_0_ net/minecraft/src/McoServerList.func_96426_a(Ljava/util/List;)V=|p_96426_1_ net/minecraft/src/McoServerList.func_98247_a(Lnet/minecraft/src/McoServerList;Ljava/util/List;)V=java/io/IOException|p_98247_0_,p_98247_1_ net/minecraft/src/McoServerList.func_98249_b(Lnet/minecraft/src/McoServerList;)Z=|p_98249_0_ -net/minecraft/src/McoServerList.func_98253_a(Lnet/minecraft/src/McoServerList;)Ljava/lang/String;=|p_98253_0_ -net/minecraft/src/ValueObjectList.func_98161_a(Ljava/lang/String;)Lnet/minecraft/src/ValueObjectList;=|p_98161_0_ net/minecraft/src/MemoryConnection.(Lnet/minecraft/src/ILogAgent;Lnet/minecraft/src/NetHandler;)V=|p_i11025_1_,p_i11025_2_ net/minecraft/src/MemoryConnection.func_74424_a(Ljava/lang/String;[Ljava/lang/Object;)V=|p_74424_1_,p_74424_2_ net/minecraft/src/MemoryConnection.func_74425_a(Lnet/minecraft/src/NetHandler;)V=|p_74425_1_ @@ -6037,6 +6038,7 @@ net/minecraft/src/PotionEffect.(III)V=|p_i3434_1_,p_i3434_2_,p_i3434_3_ net/minecraft/src/PotionEffect.(IIIZ)V=|p_i5052_1_,p_i5052_2_,p_i5052_3_,p_i5052_4_ net/minecraft/src/PotionEffect.(Lnet/minecraft/src/PotionEffect;)V=|p_i3435_1_ net/minecraft/src/PotionEffect.equals(Ljava/lang/Object;)Z=|p_equals_1_ +net/minecraft/src/PotionEffect.func_100012_b(Z)V=|p_100012_1_ net/minecraft/src/PotionEffect.func_76452_a(Lnet/minecraft/src/PotionEffect;)V=|p_76452_1_ net/minecraft/src/PotionEffect.func_76455_a(Lnet/minecraft/src/EntityLiving;)Z=|p_76455_1_ net/minecraft/src/PotionEffect.func_76457_b(Lnet/minecraft/src/EntityLiving;)V=|p_76457_1_ @@ -6581,10 +6583,10 @@ net/minecraft/src/RenderZombie.func_82429_a(Lnet/minecraft/src/EntityZombie;IF)I net/minecraft/src/RenderZombie.func_82430_a(Lnet/minecraft/src/EntityZombie;FFF)V=|p_82430_1_,p_82430_2_,p_82430_3_,p_82430_4_ net/minecraft/src/ReportedException.(Lnet/minecraft/src/CrashReport;)V=|p_i3253_1_ net/minecraft/src/Request.(Ljava/lang/String;II)V=|p_i10026_1_,p_i10026_2_,p_i10026_3_ +net/minecraft/src/Request.func_100006_a(Ljava/lang/String;Ljava/lang/String;)V=|p_100006_1_,p_100006_2_ net/minecraft/src/Request.func_96352_a(Ljava/io/InputStream;)Ljava/lang/String;=java/io/IOException|p_96352_1_ net/minecraft/src/Request.func_96353_a(Ljava/lang/String;Ljava/lang/String;II)Lnet/minecraft/src/Request;=|p_96353_0_,p_96353_1_,p_96353_2_,p_96353_3_ net/minecraft/src/Request.func_96355_b(Ljava/lang/String;)Lnet/minecraft/src/Request;=|p_96355_0_ -net/minecraft/src/Request.func_96356_a(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request;=|p_96356_1_,p_96356_2_ net/minecraft/src/Request.func_96358_a(Ljava/lang/String;)Lnet/minecraft/src/Request;=|p_96358_0_ net/minecraft/src/Request.func_96361_b(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request;=|p_96361_0_,p_96361_1_ net/minecraft/src/Request.func_96363_c(Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request;=|p_96363_0_,p_96363_1_ @@ -6596,6 +6598,7 @@ net/minecraft/src/SaveFormatComparator.(Ljava/lang/String;Ljava/lang/Strin net/minecraft/src/SaveFormatComparator.compareTo(Ljava/lang/Object;)I=|p_compareTo_1_ net/minecraft/src/SaveFormatComparator.func_75787_a(Lnet/minecraft/src/SaveFormatComparator;)I=|p_75787_1_ net/minecraft/src/SaveFormatOld.(Ljava/io/File;)V=|p_i3913_1_ +net/minecraft/src/SaveFormatOld.func_75799_b()Ljava/util/List;=net/minecraft/src/AnvilConverterException| net/minecraft/src/SaveFormatOld.func_75801_b(Ljava/lang/String;)Z=|p_75801_1_ net/minecraft/src/SaveFormatOld.func_75802_e(Ljava/lang/String;)Z=|p_75802_1_ net/minecraft/src/SaveFormatOld.func_75803_c(Ljava/lang/String;)Lnet/minecraft/src/WorldInfo;=|p_75803_1_ @@ -6687,6 +6690,11 @@ net/minecraft/src/ScreenShotHelper.func_74291_a(Ljava/io/File;II)Ljava/lang/Stri net/minecraft/src/ScreenShotHelper.func_74292_a(Ljava/io/File;Ljava/lang/String;II)Ljava/lang/String;=|p_74292_0_,p_74292_1_,p_74292_2_,p_74292_3_ net/minecraft/src/SelectionListBase.(Lnet/minecraft/client/Minecraft;IIIII)V=|p_i10012_1_,p_i10012_2_,p_i10012_3_,p_i10012_4_,p_i10012_5_,p_i10012_6_ net/minecraft/src/SelectionListBase.func_96612_a(IIF)V=|p_96612_1_,p_96612_2_,p_96612_3_ +net/minecraft/src/SelectionListInvited.(Lnet/minecraft/src/GuiScreenConfigureWorld;)V=|p_i11005_1_ +net/minecraft/src/SelectionListInvited.func_96609_a(I)Z=|p_96609_1_ +net/minecraft/src/SelectionListInvited.func_96610_a(IIIILnet/minecraft/src/Tessellator;)V=|p_96610_1_,p_96610_2_,p_96610_3_,p_96610_4_,p_96610_5_ +net/minecraft/src/SelectionListInvited.func_96615_a(IZ)V=|p_96615_1_,p_96615_2_ +net/minecraft/src/SelectionListInvited.func_98263_b(IIIILnet/minecraft/src/Tessellator;)V=|p_98263_1_,p_98263_2_,p_98263_3_,p_98263_4_,p_98263_5_ net/minecraft/src/SelectionListLocation.(Lnet/minecraft/src/GuiScreenSelectLocation;)V=|p_i10002_1_ net/minecraft/src/SelectionListLocation.func_77213_a(IZ)V=|p_77213_1_,p_77213_2_ net/minecraft/src/SelectionListLocation.func_77214_a(IIIILnet/minecraft/src/Tessellator;)V=|p_77214_1_,p_77214_2_,p_77214_3_,p_77214_4_,p_77214_5_ @@ -7124,9 +7132,9 @@ net/minecraft/src/TextureMap.func_94245_a(Ljava/lang/String;)Lnet/minecraft/src/ net/minecraft/src/TextureOffset.(II)V=|p_i3146_1_,p_i3146_2_ net/minecraft/src/TexturePackCustom.(Ljava/lang/String;Ljava/io/File;Lnet/minecraft/src/ITexturePack;)V=|p_i11002_1_,p_i11002_2_,p_i11002_3_ net/minecraft/src/TexturePackCustom.func_77533_a(Lnet/minecraft/src/RenderEngine;)V=|p_77533_1_ +net/minecraft/src/TexturePackCustom.func_77549_g()V=java/io/IOException,java/util/zip/ZipException| net/minecraft/src/TexturePackCustom.func_98139_b(Ljava/lang/String;)Ljava/io/InputStream;=java/io/IOException|p_98139_1_ net/minecraft/src/TexturePackCustom.func_98140_c(Ljava/lang/String;)Z=|p_98140_1_ -net/minecraft/src/TexturePackCustom.func_77549_g()V=java/io/IOException,java/util/zip/ZipException| net/minecraft/src/TexturePackDefault.func_98139_b(Ljava/lang/String;)Ljava/io/InputStream;=java/io/IOException|p_98139_1_ net/minecraft/src/TexturePackDefault.func_98140_c(Ljava/lang/String;)Z=|p_98140_1_ net/minecraft/src/TexturePackDownloadSuccess.(Lnet/minecraft/src/TexturePackList;)V=|p_i3024_1_ @@ -7136,14 +7144,12 @@ net/minecraft/src/TexturePackFolder.func_98139_b(Ljava/lang/String;)Ljava/io/Inp net/minecraft/src/TexturePackFolder.func_98140_c(Ljava/lang/String;)Z=|p_98140_1_ net/minecraft/src/TexturePackImplementation.(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;Lnet/minecraft/src/ITexturePack;)V=|p_i11000_1_,p_i11000_2_,p_i11000_3_,p_i11000_4_ net/minecraft/src/TexturePackImplementation.func_77532_a(Ljava/lang/String;)Ljava/io/InputStream;=java/io/IOException|p_77532_1_ -net/minecraft/src/ITexturePack.func_77532_a(Ljava/lang/String;)Ljava/io/InputStream;=java/io/IOException|p_77532_1_ -net/minecraft/src/TexturePackImplementation.func_98139_b(Ljava/lang/String;)Ljava/io/InputStream;=java/io/IOException|p_98139_1_ net/minecraft/src/TexturePackImplementation.func_77533_a(Lnet/minecraft/src/RenderEngine;)V=|p_77533_1_ net/minecraft/src/TexturePackImplementation.func_77535_b(Lnet/minecraft/src/RenderEngine;)V=|p_77535_1_ net/minecraft/src/TexturePackImplementation.func_77541_b(Ljava/lang/String;)Ljava/lang/String;=|p_77541_0_ net/minecraft/src/TexturePackImplementation.func_98137_a(Ljava/lang/String;Z)Ljava/io/InputStream;=java/io/IOException|p_98137_1_,p_98137_2_ -net/minecraft/src/ITexturePack.func_98137_a(Ljava/lang/String;Z)Ljava/io/InputStream;=java/io/IOException|p_98137_1_,p_98137_2_ net/minecraft/src/TexturePackImplementation.func_98138_b(Ljava/lang/String;Z)Z=|p_98138_1_,p_98138_2_ +net/minecraft/src/TexturePackImplementation.func_98139_b(Ljava/lang/String;)Ljava/io/InputStream;=java/io/IOException| net/minecraft/src/TexturePackList.(Ljava/io/File;Lnet/minecraft/client/Minecraft;)V=|p_i3025_1_,p_i3025_2_ net/minecraft/src/TexturePackList.func_77291_a(Lnet/minecraft/src/TexturePackList;Ljava/io/File;)Ljava/lang/String;=|p_77291_0_,p_77291_1_ net/minecraft/src/TexturePackList.func_77294_a(Lnet/minecraft/src/ITexturePack;)Z=|p_77294_1_ @@ -7167,6 +7173,8 @@ net/minecraft/src/ThreadClientSleep.(Lnet/minecraft/client/Minecraft;Ljava net/minecraft/src/ThreadConnectToOnlineServer.(Lnet/minecraft/src/GuiSlotOnlineServerList;Lnet/minecraft/src/McoServer;)V=|p_i10009_1_,p_i10009_2_ net/minecraft/src/ThreadConnectToServer.(Lnet/minecraft/src/GuiConnecting;Ljava/lang/String;I)V=|p_i3110_1_,p_i3110_2_,p_i3110_3_ net/minecraft/src/ThreadCreateOnlineWorldScreen.(Lnet/minecraft/src/GuiScreenCreateOnlineWorld;)V=|p_i11008_1_ +net/minecraft/src/ThreadDedicatedServer.(Lnet/minecraft/src/DedicatedServer;)V=|p_i11000_1_ +net/minecraft/src/ThreadDedicatedServer.run()V=| net/minecraft/src/ThreadDownloadImage.(Lnet/minecraft/src/ThreadDownloadImageData;Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)V=|p_i5000_1_,p_i5000_2_,p_i5000_3_ net/minecraft/src/ThreadDownloadImageData.(Ljava/lang/String;Lnet/minecraft/src/IImageBuffer;)V=|p_i5001_1_,p_i5001_2_ net/minecraft/src/ThreadDownloadResources.(Ljava/io/File;Lnet/minecraft/client/Minecraft;)V=|p_i3000_1_,p_i3000_2_ @@ -7179,6 +7187,7 @@ net/minecraft/src/ThreadLanServerPing.func_77523_b(Ljava/lang/String;)Ljava/lang net/minecraft/src/ThreadLanServerPing.func_77524_a(Ljava/lang/String;)Ljava/lang/String;=|p_77524_0_ net/minecraft/src/ThreadLanServerPing.func_77525_a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;=|p_77525_0_,p_77525_1_ net/minecraft/src/ThreadLoginVerifier.(Lnet/minecraft/src/NetLoginHandler;)V=|p_i3399_1_ +net/minecraft/src/ThreadMinecraftServer.(Lnet/minecraft/server/MinecraftServer;Ljava/lang/String;)V=|p_i10043_1_,p_i10043_2_ net/minecraft/src/ThreadOnlineConnect.(Lnet/minecraft/src/TaskOnlineConnect;Ljava/lang/String;I)V=|p_i10018_1_,p_i10018_2_,p_i10018_3_ net/minecraft/src/ThreadOnlineScreen.(Lnet/minecraft/src/GuiScreenOnlineServers;)V=|p_i11011_1_ net/minecraft/src/ThreadPollServers.(Lnet/minecraft/src/GuiSlotServer;Lnet/minecraft/src/ServerData;)V=|p_i3040_1_,p_i3040_2_ @@ -7195,10 +7204,6 @@ net/minecraft/src/TileEntity.func_70315_b(II)Z=|p_70315_1_,p_70315_2_ net/minecraft/src/TileEntity.func_70317_c(Lnet/minecraft/src/NBTTagCompound;)Lnet/minecraft/src/TileEntity;=|p_70317_0_ net/minecraft/src/TileEntity.func_70318_a(DDD)D=|p_70318_1_,p_70318_3_,p_70318_5_ net/minecraft/src/TileEntity.func_85027_a(Lnet/minecraft/src/CrashReportCategory;)V=|p_85027_1_ -net/minecraft/src/BlockContainer.(ILnet/minecraft/src/Material;)V=|p_i10059_1_,p_i10059_2_ -net/minecraft/src/BlockContainer.func_71852_a(Lnet/minecraft/src/World;IIIII)V=|p_71852_1_,p_71852_2_,p_71852_3_,p_71852_4_,p_71852_5_,p_71852_6_ -net/minecraft/src/BlockContainer.func_71861_g(Lnet/minecraft/src/World;III)V=|p_71861_1_,p_71861_2_,p_71861_3_,p_71861_4_ -net/minecraft/src/BlockContainer.func_71883_b(Lnet/minecraft/src/World;IIIII)Z=|p_71883_1_,p_71883_2_,p_71883_3_,p_71883_4_,p_71883_5_,p_71883_6_ net/minecraft/src/TileEntityBeacon.func_70298_a(II)Lnet/minecraft/src/ItemStack;=|p_70298_1_,p_70298_2_ net/minecraft/src/TileEntityBeacon.func_70299_a(ILnet/minecraft/src/ItemStack;)V=|p_70299_1_,p_70299_2_ net/minecraft/src/TileEntityBeacon.func_70300_a(Lnet/minecraft/src/EntityPlayer;)Z=|p_70300_1_ @@ -7353,10 +7358,11 @@ net/minecraft/src/TileEntitySpecialRenderer.func_76896_a(Lnet/minecraft/src/Worl net/minecraft/src/TileEntitySpecialRenderer.func_76897_a(Ljava/lang/String;)V=|p_76897_1_ net/minecraft/src/TileEntitySpecialRenderer.func_82392_a(Ljava/lang/String;Ljava/lang/String;)V=|p_82392_1_,p_82392_2_ net/minecraft/src/Timer.(F)V=|p_i3005_1_ -net/minecraft/src/TimerTaskValueObjectListUpdate.(Lnet/minecraft/src/McoServerList;)V=|p_i11009_1_ -net/minecraft/src/TimerTaskValueObjectListUpdate.(Lnet/minecraft/src/McoServerList;Lnet/minecraft/src/McoServerListINNER1;)V=|p_i11010_1_,p_i11010_2_ +net/minecraft/src/TimerTaskMcoServerListUpdate.(Lnet/minecraft/src/McoServerList;)V=|p_i11000_1_ +net/minecraft/src/TimerTaskMcoServerListUpdate.(Lnet/minecraft/src/McoServerList;Lnet/minecraft/src/McoServerListINNER1;)V=|p_i11001_1_,p_i11001_2_ net/minecraft/src/Tuple.(Ljava/lang/Object;Ljava/lang/Object;)V=|p_i3422_1_,p_i3422_2_ net/minecraft/src/ValueObject.func_96394_a(Ljava/lang/reflect/Field;)Z=|p_96394_0_ +net/minecraft/src/ValueObjectList.func_98161_a(Ljava/lang/String;)Lnet/minecraft/src/ValueObjectList;=|p_98161_0_ net/minecraft/src/ValueObjectSubscription.func_98169_a(Ljava/lang/String;)Lnet/minecraft/src/ValueObjectSubscription;=|p_98169_0_ net/minecraft/src/Vec3.(Lnet/minecraft/src/Vec3Pool;DDD)V=|p_i5109_1_,p_i5109_2_,p_i5109_4_,p_i5109_6_ net/minecraft/src/Vec3.func_72429_b(Lnet/minecraft/src/Vec3;D)Lnet/minecraft/src/Vec3;=|p_72429_1_,p_72429_2_ @@ -7435,6 +7441,7 @@ net/minecraft/src/WeightedRandomMinecart.(Lnet/minecraft/src/MobSpawnerBas net/minecraft/src/WeightedRandomMinecart.(Lnet/minecraft/src/MobSpawnerBaseLogic;Lnet/minecraft/src/NBTTagCompound;Ljava/lang/String;)V=|p_i11042_1_,p_i11042_2_,p_i11042_3_ net/minecraft/src/World.(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String;Lnet/minecraft/src/WorldProvider;Lnet/minecraft/src/WorldSettings;Lnet/minecraft/src/Profiler;Lnet/minecraft/src/ILogAgent;)V=|p_i11043_1_,p_i11043_2_,p_i11043_3_,p_i11043_4_,p_i11043_5_,p_i11043_6_ net/minecraft/src/World.(Lnet/minecraft/src/ISaveHandler;Ljava/lang/String;Lnet/minecraft/src/WorldSettings;Lnet/minecraft/src/WorldProvider;Lnet/minecraft/src/Profiler;Lnet/minecraft/src/ILogAgent;)V=|p_i11044_1_,p_i11044_2_,p_i11044_3_,p_i11044_4_,p_i11044_5_,p_i11044_6_ +net/minecraft/src/World.func_100002_v()I=| net/minecraft/src/World.func_72796_p(III)Lnet/minecraft/src/TileEntity;=|p_72796_1_,p_72796_2_,p_72796_3_ net/minecraft/src/World.func_72797_t(III)Z=|p_72797_1_,p_72797_2_,p_72797_3_ net/minecraft/src/World.func_72798_a(III)I=|p_72798_1_,p_72798_2_,p_72798_3_ @@ -7477,7 +7484,6 @@ net/minecraft/src/World.func_72849_a(IIIZ)I=|p_72849_1_,p_72849_2_,p_72849_3_,p_ net/minecraft/src/World.func_72850_v(III)Z=|p_72850_1_,p_72850_2_,p_72850_3_ net/minecraft/src/World.func_72851_f(IIII)V=|p_72851_1_,p_72851_2_,p_72851_3_,p_72851_4_ net/minecraft/src/World.func_72852_a(Ljava/util/Collection;)V=|p_72852_1_ -net/minecraft/src/World.func_72853_d(F)I=|p_72853_1_ net/minecraft/src/World.func_72855_b(Lnet/minecraft/src/AxisAlignedBB;)Z=|p_72855_1_ net/minecraft/src/World.func_72856_b(Lnet/minecraft/src/Entity;D)Lnet/minecraft/src/EntityPlayer;=|p_72856_1_,p_72856_2_ net/minecraft/src/World.func_72857_a(Ljava/lang/Class;Lnet/minecraft/src/AxisAlignedBB;Lnet/minecraft/src/Entity;)Lnet/minecraft/src/Entity;=|p_72857_1_,p_72857_2_,p_72857_3_ @@ -7750,8 +7756,9 @@ net/minecraft/src/WorldManager.func_72710_a(III)V=|p_72710_1_,p_72710_2_,p_72710 net/minecraft/src/WorldManager.func_72711_b(III)V=|p_72711_1_,p_72711_2_,p_72711_3_ net/minecraft/src/WorldManager.func_82746_a(IIIII)V=|p_82746_1_,p_82746_2_,p_82746_3_,p_82746_4_,p_82746_5_ net/minecraft/src/WorldManager.func_85102_a(Lnet/minecraft/src/EntityPlayer;Ljava/lang/String;DDDFF)V=|p_85102_1_,p_85102_2_,p_85102_3_,p_85102_5_,p_85102_7_,p_85102_9_,p_85102_10_ +net/minecraft/src/WorldProvider.func_100003_a(J)I=|p_100003_1_ net/minecraft/src/WorldProvider.func_76558_a(Lnet/minecraft/src/World;)V=|p_76558_1_ -net/minecraft/src/WorldProvider.func_76559_b(JF)I=|p_76559_1_,p_76559_3_ +net/minecraft/src/WorldProvider.func_76559_b(J)I=|p_76559_1_ net/minecraft/src/WorldProvider.func_76560_a(FF)[F=|p_76560_1_,p_76560_2_ net/minecraft/src/WorldProvider.func_76562_b(FF)Lnet/minecraft/src/Vec3;=|p_76562_1_,p_76562_2_ net/minecraft/src/WorldProvider.func_76563_a(JF)F=|p_76563_1_,p_76563_3_ diff --git a/fml/conf/joined.srg b/fml/conf/joined.srg index eef78b6a9..fdd147424 100644 --- a/fml/conf/joined.srg +++ b/fml/conf/joined.srg @@ -2318,6 +2318,7 @@ FD: alk/a net/minecraft/src/BlockCocoa/field_94470_a FD: alk/b net/minecraft/src/BlockCocoa/field_94469_b FD: alo/a net/minecraft/src/BlockCrops/field_94363_a FD: alp/a net/minecraft/src/BlockDaylightDetector/field_94445_a +FD: alr/b net/minecraft/src/BlockDetectorRail/field_100010_b FD: als/a net/minecraft/src/BlockRedstoneLogic/field_72222_c FD: alv/a net/minecraft/src/BlockDispenser/field_82527_a FD: alv/b net/minecraft/src/BlockDispenser/field_72284_a @@ -3342,10 +3343,9 @@ FD: awi/x net/minecraft/src/GuiCreateWorld/field_73929_v FD: awi/y net/minecraft/src/GuiCreateWorld/field_73928_w FD: awi/z net/minecraft/src/GuiCreateWorld/field_73938_x FD: awj/a net/minecraft/src/GuiGameOver/field_73995_a -FD: awl/a net/minecraft/src/GuiScreenServerList/field_73994_a -FD: awl/b net/minecraft/src/GuiScreenServerList/field_73992_b -FD: awl/c net/minecraft/src/GuiScreenServerList/field_73993_c -FD: awl/d net/minecraft/src/GuiScreenServerList/field_73991_d +FD: awl/a net/minecraft/src/GuiScreenServerList/field_73992_b +FD: awl/b net/minecraft/src/GuiScreenServerList/field_73993_c +FD: awl/c net/minecraft/src/GuiScreenServerList/field_73991_d FD: awm/a net/minecraft/src/GuiTextField/field_73815_a FD: awm/b net/minecraft/src/GuiTextField/field_73813_b FD: awm/c net/minecraft/src/GuiTextField/field_73814_c @@ -3656,6 +3656,8 @@ FD: aym/k net/minecraft/src/GuiButtonNextPage/field_73755_j FD: ayn/r net/minecraft/src/GuiBrewingStand/field_74217_o FD: ayo/a net/minecraft/src/GuiCommandBlock/field_82318_a FD: ayo/b net/minecraft/src/GuiCommandBlock/field_82317_b +FD: ayo/c net/minecraft/src/GuiCommandBlock/field_100003_c +FD: ayo/d net/minecraft/src/GuiCommandBlock/field_100002_d FD: ayp/r net/minecraft/src/GuiChest/field_74220_o FD: ayp/s net/minecraft/src/GuiChest/field_74219_p FD: ayp/t net/minecraft/src/GuiChest/field_74218_q @@ -3708,6 +3710,7 @@ FD: aze/b net/minecraft/src/GuiEditSign/field_73981_b FD: aze/c net/minecraft/src/GuiEditSign/field_73982_c FD: aze/d net/minecraft/src/GuiEditSign/field_73980_d FD: aze/n net/minecraft/src/GuiEditSign/field_73984_m +FD: aze/o net/minecraft/src/GuiEditSign/field_100001_o FD: azf/r net/minecraft/src/GuiDispenser/field_94078_r FD: azg/a net/minecraft/src/GuiScreenConfigureWorld/field_96285_a FD: azg/b net/minecraft/src/GuiScreenConfigureWorld/field_96280_b @@ -3880,7 +3883,8 @@ FD: bak/c net/minecraft/src/GuiWinGame/field_73989_c FD: bak/d net/minecraft/src/GuiWinGame/field_73987_d FD: bap/a net/minecraft/src/McoClient/field_98178_a FD: bap/b net/minecraft/src/McoClient/field_96390_a -FD: bap/c net/minecraft/src/McoClient/field_96388_b +FD: bap/c net/minecraft/src/McoClient/field_100007_c +FD: bap/d net/minecraft/src/McoClient/field_96388_b FD: bar/a net/minecraft/src/Request/field_96367_a FD: bar/b net/minecraft/src/Request/field_96365_b FD: bar/c net/minecraft/src/Request/field_96366_c @@ -5894,6 +5898,7 @@ FD: ml/b net/minecraft/src/PotionEffect/field_76460_b FD: ml/c net/minecraft/src/PotionEffect/field_76461_c FD: ml/d net/minecraft/src/PotionEffect/field_82723_d FD: ml/e net/minecraft/src/PotionEffect/field_82724_e +FD: ml/f net/minecraft/src/PotionEffect/field_100013_f FD: mm/d net/minecraft/src/EntityAgeable/field_98056_d FD: mm/e net/minecraft/src/EntityAgeable/field_98057_e FD: mp/A net/minecraft/src/Entity/field_70177_z @@ -6728,7 +6733,8 @@ FD: s/e net/minecraft/src/Facing/field_82374_e FD: sa/b net/minecraft/src/EntitySlime/field_70813_a FD: sa/c net/minecraft/src/EntitySlime/field_70811_b FD: sa/d net/minecraft/src/EntitySlime/field_70812_c -FD: sa/e net/minecraft/src/EntitySlime/field_70810_d +FD: sa/e net/minecraft/src/EntitySlime/field_100000_e +FD: sa/f net/minecraft/src/EntitySlime/field_70810_d FD: sc/d net/minecraft/src/EntityWitch/field_82199_d FD: sc/e net/minecraft/src/EntityWitch/field_82200_e FD: sd/d net/minecraft/src/EntityZombie/field_82234_d @@ -7509,9 +7515,9 @@ MD: aad/c ()Z net/minecraft/src/EnumGameType/func_82752_c ()Z MD: aad/d ()Z net/minecraft/src/EnumGameType/func_77145_d ()Z MD: aad/e ()Z net/minecraft/src/EnumGameType/func_77144_e ()Z MD: aad/values ()[Laad; net/minecraft/src/EnumGameType/values ()[Lnet/minecraft/src/EnumGameType; -MD: aae/O ()I net/minecraft/src/IBlockAccess/func_72800_K ()I -MD: aae/Q ()Z net/minecraft/src/IBlockAccess/func_72806_N ()Z -MD: aae/S ()Laqx; net/minecraft/src/IBlockAccess/func_82732_R ()Lnet/minecraft/src/Vec3Pool; +MD: aae/P ()I net/minecraft/src/IBlockAccess/func_72800_K ()I +MD: aae/R ()Z net/minecraft/src/IBlockAccess/func_72806_N ()Z +MD: aae/T ()Laqx; net/minecraft/src/IBlockAccess/func_82732_R ()Lnet/minecraft/src/Vec3Pool; MD: aae/a (II)Laap; net/minecraft/src/IBlockAccess/func_72807_a (II)Lnet/minecraft/src/BiomeGenBase; MD: aae/a (III)I net/minecraft/src/IBlockAccess/func_72798_a (III)I MD: aae/c (III)Z net/minecraft/src/IBlockAccess/func_72799_c (III)Z @@ -7546,9 +7552,9 @@ MD: aai/a (J)V net/minecraft/src/Teleporter/func_85189_a (J)V MD: aai/a (Lmp;)Z net/minecraft/src/Teleporter/func_85188_a (Lnet/minecraft/src/Entity;)Z MD: aai/a (Lmp;DDDF)V net/minecraft/src/Teleporter/func_77185_a (Lnet/minecraft/src/Entity;DDDF)V MD: aai/b (Lmp;DDDF)Z net/minecraft/src/Teleporter/func_77184_b (Lnet/minecraft/src/Entity;DDDF)Z -MD: aak/O ()I net/minecraft/src/ChunkCache/func_72800_K ()I -MD: aak/Q ()Z net/minecraft/src/ChunkCache/func_72806_N ()Z -MD: aak/S ()Laqx; net/minecraft/src/ChunkCache/func_82732_R ()Lnet/minecraft/src/Vec3Pool; +MD: aak/P ()I net/minecraft/src/ChunkCache/func_72800_K ()I +MD: aak/R ()Z net/minecraft/src/ChunkCache/func_72806_N ()Z +MD: aak/T ()Laqx; net/minecraft/src/ChunkCache/func_82732_R ()Lnet/minecraft/src/Vec3Pool; MD: aak/a (II)Laap; net/minecraft/src/ChunkCache/func_72807_a (II)Lnet/minecraft/src/BiomeGenBase; MD: aak/a (III)I net/minecraft/src/ChunkCache/func_72798_a (III)I MD: aak/a (IIIZ)I net/minecraft/src/ChunkCache/func_72813_a (IIIZ)I @@ -7819,12 +7825,12 @@ MD: ach/a ()V net/minecraft/src/WorldProvider/func_76556_a ()V MD: ach/a (FF)[F net/minecraft/src/WorldProvider/func_76560_a (FF)[F MD: ach/a (I)Lach; net/minecraft/src/WorldProvider/func_76570_a (I)Lnet/minecraft/src/WorldProvider; MD: ach/a (II)Z net/minecraft/src/WorldProvider/func_76566_a (II)Z +MD: ach/a (J)I net/minecraft/src/WorldProvider/func_76559_b (J)I MD: ach/a (JF)F net/minecraft/src/WorldProvider/func_76563_a (JF)F MD: ach/a (Lzv;)V net/minecraft/src/WorldProvider/func_76558_a (Lnet/minecraft/src/World;)V MD: ach/b ()V net/minecraft/src/WorldProvider/func_76572_b ()V MD: ach/b (FF)Laqw; net/minecraft/src/WorldProvider/func_76562_b (FF)Lnet/minecraft/src/Vec3; MD: ach/b (II)Z net/minecraft/src/WorldProvider/func_76568_b (II)Z -MD: ach/b (JF)I net/minecraft/src/WorldProvider/func_76559_b (JF)I MD: ach/c ()Labn; net/minecraft/src/WorldProvider/func_76555_c ()Lnet/minecraft/src/IChunkProvider; MD: ach/d ()Z net/minecraft/src/WorldProvider/func_76569_d ()Z MD: ach/e ()Z net/minecraft/src/WorldProvider/func_76567_e ()Z @@ -8930,7 +8936,10 @@ MD: alp/i_ (Lzv;III)V net/minecraft/src/BlockDaylightDetector/func_94444_j_ (Lne MD: alq/a (ILjava/util/Random;I)I net/minecraft/src/BlockDeadBush/func_71885_a (ILjava/util/Random;I)I MD: alq/a (Lzv;Lsk;IIII)V net/minecraft/src/BlockDeadBush/func_71893_a (Lnet/minecraft/src/World;Lnet/minecraft/src/EntityPlayer;IIII)V MD: alq/f_ (I)Z net/minecraft/src/BlockDeadBush/func_72263_d_ (I)Z +MD: alr/a (II)Llx; net/minecraft/src/BlockDetectorRail/func_71858_a (II)Lnet/minecraft/src/Icon; +MD: alr/a (Lly;)V net/minecraft/src/BlockDetectorRail/func_94332_a (Lnet/minecraft/src/IconRegister;)V MD: alr/a (Lzv;)I net/minecraft/src/BlockDetectorRail/func_71859_p_ (Lnet/minecraft/src/World;)I +MD: alr/a (Lzv;III)V net/minecraft/src/BlockDetectorRail/func_71861_g (Lnet/minecraft/src/World;III)V MD: alr/a (Lzv;IIILjava/util/Random;)V net/minecraft/src/BlockDetectorRail/func_71847_b (Lnet/minecraft/src/World;IIILjava/util/Random;)V MD: alr/a (Lzv;IIILmp;)V net/minecraft/src/BlockDetectorRail/func_71869_a (Lnet/minecraft/src/World;IIILnet/minecraft/src/Entity;)V MD: alr/b (Laae;IIII)I net/minecraft/src/BlockDetectorRail/func_71865_a (Lnet/minecraft/src/IBlockAccess;IIII)I @@ -8987,6 +8996,7 @@ MD: alv/a (Lzv;IIILng;Lwg;)V net/minecraft/src/BlockDispenser/func_71860_a (Lnet MD: alv/a (Lzv;IIILsk;IFFF)Z net/minecraft/src/BlockDispenser/func_71903_a (Lnet/minecraft/src/World;IIILnet/minecraft/src/EntityPlayer;IFFF)Z MD: alv/b (Lzv;)Laqj; net/minecraft/src/BlockDispenser/func_72274_a (Lnet/minecraft/src/World;)Lnet/minecraft/src/TileEntity; MD: alv/b_ (Lzv;IIII)I net/minecraft/src/BlockDispenser/func_94328_b_ (Lnet/minecraft/src/World;IIII)I +MD: alv/j_ (I)Lbf; net/minecraft/src/BlockDispenser/func_100009_j_ (I)Lnet/minecraft/src/EnumFacing; MD: alv/j_ (Lzv;III)V net/minecraft/src/BlockDispenser/func_82526_n (Lnet/minecraft/src/World;III)V MD: alv/k (Lzv;III)V net/minecraft/src/BlockDispenser/func_72280_l (Lnet/minecraft/src/World;III)V MD: alv/q_ ()Z net/minecraft/src/BlockDispenser/func_96468_q_ ()Z @@ -9079,7 +9089,7 @@ MD: amd/b (Lzv;III)Laqr; net/minecraft/src/BlockFenceGate/func_71872_e (Lnet/min MD: amd/c ()Z net/minecraft/src/BlockFenceGate/func_71926_d ()Z MD: amd/c (Lzv;III)Z net/minecraft/src/BlockFenceGate/func_71930_b (Lnet/minecraft/src/World;III)Z MD: amd/d ()I net/minecraft/src/BlockFenceGate/func_71857_b ()I -MD: amd/j_ (I)Z net/minecraft/src/BlockFenceGate/func_72224_c (I)Z +MD: amd/k_ (I)Z net/minecraft/src/BlockFenceGate/func_72224_c (I)Z MD: ame/a (Laae;III)V net/minecraft/src/BlockFence/func_71902_a (Lnet/minecraft/src/IBlockAccess;III)V MD: ame/a (Laae;IIII)Z net/minecraft/src/BlockFence/func_71877_c (Lnet/minecraft/src/IBlockAccess;IIII)Z MD: ame/a (Lly;)V net/minecraft/src/BlockFence/func_94332_a (Lnet/minecraft/src/IconRegister;)V @@ -9089,7 +9099,7 @@ MD: ame/b (Laae;III)Z net/minecraft/src/BlockFence/func_71918_c (Lnet/minecraft/ MD: ame/c ()Z net/minecraft/src/BlockFence/func_71926_d ()Z MD: ame/d ()I net/minecraft/src/BlockFence/func_71857_b ()I MD: ame/d (Laae;III)Z net/minecraft/src/BlockFence/func_72250_d (Lnet/minecraft/src/IBlockAccess;III)Z -MD: ame/k_ (I)Z net/minecraft/src/BlockFence/func_72249_c (I)Z +MD: ame/l_ (I)Z net/minecraft/src/BlockFence/func_72249_c (I)Z MD: amf/a (II)Llx; net/minecraft/src/BlockFire/func_71858_a (II)Lnet/minecraft/src/Icon; MD: amf/a (III)V net/minecraft/src/BlockFire/func_72253_a (III)V MD: amf/a (Ljava/util/Random;)I net/minecraft/src/BlockFire/func_71925_a (Ljava/util/Random;)I @@ -9125,7 +9135,7 @@ MD: amg/d ()I net/minecraft/src/BlockFlowerPot/func_71857_b ()I MD: amg/d (Lzv;III)I net/minecraft/src/BlockFlowerPot/func_71922_a (Lnet/minecraft/src/World;III)I MD: amg/g ()V net/minecraft/src/BlockFlowerPot/func_71919_f ()V MD: amg/h (Lzv;III)I net/minecraft/src/BlockFlowerPot/func_71873_h (Lnet/minecraft/src/World;III)I -MD: amg/m_ (I)Lwg; net/minecraft/src/BlockFlowerPot/func_82531_c (I)Lnet/minecraft/src/ItemStack; +MD: amg/n_ (I)Lwg; net/minecraft/src/BlockFlowerPot/func_82531_c (I)Lnet/minecraft/src/ItemStack; MD: amg/t_ ()Z net/minecraft/src/BlockFlowerPot/func_82505_u_ ()Z MD: amh/a (II)Llx; net/minecraft/src/BlockFurnace/func_71858_a (II)Lnet/minecraft/src/Icon; MD: amh/a (ILjava/util/Random;I)I net/minecraft/src/BlockFurnace/func_71885_a (ILjava/util/Random;I)I @@ -10803,6 +10813,7 @@ MD: avr/a ()Z net/minecraft/src/OpenGlCapsChecker/func_74371_a ()Z MD: avs/a ()V net/minecraft/src/GameSettings/func_74300_a ()V MD: avs/a (I)Ljava/lang/String; net/minecraft/src/GameSettings/func_74302_a (I)Ljava/lang/String; MD: avs/a (II)V net/minecraft/src/GameSettings/func_74307_a (II)V +MD: avs/a (Lauu;)Z net/minecraft/src/GameSettings/func_100015_a (Lnet/minecraft/src/KeyBinding;)Z MD: avs/a (Lavu;)F net/minecraft/src/GameSettings/func_74296_a (Lnet/minecraft/src/EnumOptions;)F MD: avs/a (Lavu;F)V net/minecraft/src/GameSettings/func_74304_a (Lnet/minecraft/src/EnumOptions;F)V MD: avs/a (Lavu;I)V net/minecraft/src/GameSettings/func_74306_a (Lnet/minecraft/src/EnumOptions;I)V @@ -11566,7 +11577,7 @@ MD: azu/b (Ljava/lang/String;)V net/minecraft/src/TaskLongRunning/func_96576_b ( MD: azu/c ()Z net/minecraft/src/TaskLongRunning/func_96577_c ()Z MD: azu/d ()V net/minecraft/src/TaskLongRunning/func_96571_d ()V MD: azv/a ()Z net/minecraft/src/McoServerList/func_98251_a ()Z -MD: azv/a (Lazv;)Ljava/lang/String; net/minecraft/src/McoServerList/func_98253_a (Lnet/minecraft/src/McoServerList;)Ljava/lang/String; +MD: azv/a (Lazv;)Lavz; net/minecraft/src/McoServerList/func_100014_a (Lnet/minecraft/src/McoServerList;)Lnet/minecraft/src/Session; MD: azv/a (Lazv;Ljava/util/List;)V net/minecraft/src/McoServerList/func_98247_a (Lnet/minecraft/src/McoServerList;Ljava/util/List;)V MD: azv/a (Ljava/util/List;)V net/minecraft/src/McoServerList/func_96426_a (Ljava/util/List;)V MD: azv/b ()V net/minecraft/src/McoServerList/func_98250_b ()V @@ -11716,13 +11727,13 @@ MD: bap/f (J)Lbbd; net/minecraft/src/McoClient/func_98177_f (J)Lnet/minecraft/sr MD: bar/a ()I net/minecraft/src/Request/func_96362_a ()I MD: bar/a (Ljava/io/InputStream;)Ljava/lang/String; net/minecraft/src/Request/func_96352_a (Ljava/io/InputStream;)Ljava/lang/String; MD: bar/a (Ljava/lang/String;)Lbar; net/minecraft/src/Request/func_96358_a (Ljava/lang/String;)Lnet/minecraft/src/Request; -MD: bar/a (Ljava/lang/String;Ljava/lang/String;)Lbar; net/minecraft/src/Request/func_96356_a (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request; +MD: bar/a (Ljava/lang/String;Ljava/lang/String;)V net/minecraft/src/Request/func_100006_a (Ljava/lang/String;Ljava/lang/String;)V MD: bar/a (Ljava/lang/String;Ljava/lang/String;II)Lbar; net/minecraft/src/Request/func_96353_a (Ljava/lang/String;Ljava/lang/String;II)Lnet/minecraft/src/Request; MD: bar/b ()Lbbf; net/minecraft/src/Request/func_98175_b ()Lnet/minecraft/src/McoOption; MD: bar/b (Ljava/lang/String;)Lbar; net/minecraft/src/Request/func_96355_b (Ljava/lang/String;)Lnet/minecraft/src/Request; -MD: bar/b (Ljava/lang/String;Ljava/lang/String;)Lbar; net/minecraft/src/Request/func_96361_b (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request; -MD: bar/c (Ljava/lang/String;Ljava/lang/String;)Lbar; net/minecraft/src/Request/func_96363_c (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request; +MD: bar/c (Ljava/lang/String;Ljava/lang/String;)Lbar; net/minecraft/src/Request/func_96361_b (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request; MD: bar/d ()Ljava/lang/String; net/minecraft/src/Request/func_96364_c ()Ljava/lang/String; +MD: bar/d (Ljava/lang/String;Ljava/lang/String;)Lbar; net/minecraft/src/Request/func_96363_c (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/src/Request; MD: bar/e ()Lbar; net/minecraft/src/Request/func_96354_d ()Lnet/minecraft/src/Request; MD: bar/f ()Lbar; net/minecraft/src/Request/func_96359_e ()Lnet/minecraft/src/Request; MD: bar/g ()V net/minecraft/src/Request/func_96360_f ()V @@ -11761,8 +11772,9 @@ MD: bbf/a (Ljava/lang/Object;)Lbbh; net/minecraft/src/McoOption/func_98153_a (Lj MD: bbf/b ()Lbbg; net/minecraft/src/McoOption/func_98154_b ()Lnet/minecraft/src/McoOptionNone; MD: bbg/a ()Ljava/lang/Object; net/minecraft/src/McoOptionNone/func_98155_a ()Ljava/lang/Object; MD: bbh/a ()Ljava/lang/Object; net/minecraft/src/McoOptionSome/func_98155_a ()Ljava/lang/Object; +MD: bbi/a ()Ljava/lang/Object; net/minecraft/src/McoPair/func_100005_a ()Ljava/lang/Object; MD: bbi/a (Ljava/lang/Object;Ljava/lang/Object;)Lbbi; net/minecraft/src/McoPair/func_98157_a (Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/src/McoPair; -MD: bbi/a (Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/McoPair/func_98158_a (Ljava/lang/String;)Ljava/lang/String; +MD: bbi/b ()Ljava/lang/Object; net/minecraft/src/McoPair/func_100004_b ()Ljava/lang/Object; MD: bbj/a ()I net/minecraft/src/ModelBat/func_82889_a ()I MD: bbj/a (Lmp;FFFFFF)V net/minecraft/src/ModelBat/func_78088_a (Lnet/minecraft/src/Entity;FFFFFF)V MD: bbk/a ()I net/minecraft/src/ModelBlaze/func_78104_a ()I @@ -11997,7 +12009,7 @@ MD: bdl/g ()Z net/minecraft/src/PlayerControllerMP/func_78762_g ()Z MD: bdl/h ()Z net/minecraft/src/PlayerControllerMP/func_78758_h ()Z MD: bdl/i ()Z net/minecraft/src/PlayerControllerMP/func_78749_i ()Z MD: bdl/j ()V net/minecraft/src/PlayerControllerMP/func_78750_j ()V -MD: bdm/C ()V net/minecraft/src/WorldClient/func_72882_A ()V +MD: bdm/D ()V net/minecraft/src/WorldClient/func_72882_A ()V MD: bdm/I (III)V net/minecraft/src/WorldClient/func_73029_E (III)V MD: bdm/a ()V net/minecraft/src/WorldClient/func_73022_a ()V MD: bdm/a (DDDDDDLbs;)V net/minecraft/src/WorldClient/func_92088_a (DDDDDDLnet/minecraft/src/NBTTagCompound;)V @@ -12928,20 +12940,19 @@ MD: bjj/c (Ljava/lang/String;)Z net/minecraft/src/TexturePackImplementation/func MD: bjj/d ()Ljava/lang/String; net/minecraft/src/TexturePackImplementation/func_77531_d ()Ljava/lang/String; MD: bjj/d (Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/TexturePackImplementation/func_77541_b (Ljava/lang/String;)Ljava/lang/String; MD: bjj/e ()Ljava/lang/String; net/minecraft/src/TexturePackImplementation/func_77537_e ()Ljava/lang/String; -MD: bjj/f ()I net/minecraft/src/TexturePackImplementation/func_77534_f ()I -MD: bjj/h ()V net/minecraft/src/TexturePackImplementation/func_77539_g ()V +MD: bjj/g ()V net/minecraft/src/TexturePackImplementation/func_77539_g ()V MD: bjk/a ()V net/minecraft/src/TexturePackDefault/func_77540_a ()V MD: bjk/b (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackDefault/func_98139_b (Ljava/lang/String;)Ljava/io/InputStream; MD: bjk/c (Ljava/lang/String;)Z net/minecraft/src/TexturePackDefault/func_98140_c (Ljava/lang/String;)Z -MD: bjk/g ()Z net/minecraft/src/TexturePackDefault/func_94180_h ()Z +MD: bjk/f ()Z net/minecraft/src/TexturePackDefault/func_94180_h ()Z MD: bjl/a (Lbfy;)V net/minecraft/src/TexturePackCustom/func_77533_a (Lnet/minecraft/src/RenderEngine;)V MD: bjl/b (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackCustom/func_98139_b (Ljava/lang/String;)Ljava/io/InputStream; MD: bjl/c (Ljava/lang/String;)Z net/minecraft/src/TexturePackCustom/func_98140_c (Ljava/lang/String;)Z -MD: bjl/g ()Z net/minecraft/src/TexturePackCustom/func_94180_h ()Z -MD: bjl/h ()V net/minecraft/src/TexturePackCustom/func_77549_g ()V +MD: bjl/f ()Z net/minecraft/src/TexturePackCustom/func_94180_h ()Z +MD: bjl/g ()V net/minecraft/src/TexturePackCustom/func_77549_g ()V MD: bjm/b (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/TexturePackFolder/func_98139_b (Ljava/lang/String;)Ljava/io/InputStream; MD: bjm/c (Ljava/lang/String;)Z net/minecraft/src/TexturePackFolder/func_98140_c (Ljava/lang/String;)Z -MD: bjm/g ()Z net/minecraft/src/TexturePackFolder/func_94180_h ()Z +MD: bjm/f ()Z net/minecraft/src/TexturePackFolder/func_94180_h ()Z MD: bjn/a (Lbfy;)V net/minecraft/src/ITexturePack/func_77533_a (Lnet/minecraft/src/RenderEngine;)V MD: bjn/a (Ljava/lang/String;)Ljava/io/InputStream; net/minecraft/src/ITexturePack/func_77532_a (Ljava/lang/String;)Ljava/io/InputStream; MD: bjn/a (Ljava/lang/String;Z)Ljava/io/InputStream; net/minecraft/src/ITexturePack/func_98137_a (Ljava/lang/String;Z)Ljava/io/InputStream; @@ -12951,8 +12962,7 @@ MD: bjn/b (Ljava/lang/String;Z)Z net/minecraft/src/ITexturePack/func_98138_b (Lj MD: bjn/c ()Ljava/lang/String; net/minecraft/src/ITexturePack/func_77538_c ()Ljava/lang/String; MD: bjn/d ()Ljava/lang/String; net/minecraft/src/ITexturePack/func_77531_d ()Ljava/lang/String; MD: bjn/e ()Ljava/lang/String; net/minecraft/src/ITexturePack/func_77537_e ()Ljava/lang/String; -MD: bjn/f ()I net/minecraft/src/ITexturePack/func_77534_f ()I -MD: bjn/g ()Z net/minecraft/src/ITexturePack/func_94179_g ()Z +MD: bjn/f ()Z net/minecraft/src/ITexturePack/func_94179_g ()Z MD: bjo/a ()Z net/minecraft/src/TexturePackList/func_77295_a ()Z MD: bjo/a (Lbjn;)Z net/minecraft/src/TexturePackList/func_77294_a (Lnet/minecraft/src/ITexturePack;)Z MD: bjo/a (Lbjo;)Z net/minecraft/src/TexturePackList/func_77301_a (Lnet/minecraft/src/TexturePackList;)Z @@ -13823,6 +13833,7 @@ MD: fq/a (Lei;)Z net/minecraft/src/Packet41EntityEffect/func_73268_a (Lnet/minec MD: fq/a (Lej;)V net/minecraft/src/Packet41EntityEffect/func_73279_a (Lnet/minecraft/src/NetHandler;)V MD: fq/a (Ljava/io/DataInputStream;)V net/minecraft/src/Packet41EntityEffect/func_73267_a (Ljava/io/DataInputStream;)V MD: fq/a (Ljava/io/DataOutputStream;)V net/minecraft/src/Packet41EntityEffect/func_73273_a (Ljava/io/DataOutputStream;)V +MD: fq/d ()Z net/minecraft/src/Packet41EntityEffect/func_100008_d ()Z MD: fq/e ()Z net/minecraft/src/Packet41EntityEffect/func_73278_e ()Z MD: fr/a ()I net/minecraft/src/Packet15Place/func_73284_a ()I MD: fr/a (Lej;)V net/minecraft/src/Packet15Place/func_73279_a (Lnet/minecraft/src/NetHandler;)V @@ -14309,8 +14320,8 @@ MD: iy/d (II)Labq; net/minecraft/src/ChunkProviderServer/func_73154_d (II)Lnet/m MD: iy/e ()I net/minecraft/src/ChunkProviderServer/func_73152_e ()I MD: iy/e (II)V net/minecraft/src/ChunkProviderServer/func_82695_e (II)V MD: iy/f (II)Labq; net/minecraft/src/ChunkProviderServer/func_73239_e (II)Lnet/minecraft/src/Chunk; -MD: iz/W ()V net/minecraft/src/WorldServer/func_73051_P ()V -MD: iz/X ()V net/minecraft/src/WorldServer/func_73055_Q ()V +MD: iz/X ()V net/minecraft/src/WorldServer/func_73051_P ()V +MD: iz/Y ()V net/minecraft/src/WorldServer/func_73055_Q ()V MD: iz/a ()V net/minecraft/src/WorldServer/func_73042_a ()V MD: iz/a (I)Lmp; net/minecraft/src/WorldServer/func_73045_a (I)Lnet/minecraft/src/Entity; MD: iz/a (IIII)Z net/minecraft/src/WorldServer/func_94573_a (IIII)Z @@ -14909,11 +14920,13 @@ MD: ml/a (Z)V net/minecraft/src/PotionEffect/func_82721_a (Z)V MD: ml/b ()I net/minecraft/src/PotionEffect/func_76459_b ()I MD: ml/b (Lbs;)Lml; net/minecraft/src/PotionEffect/func_82722_b (Lnet/minecraft/src/NBTTagCompound;)Lnet/minecraft/src/PotionEffect; MD: ml/b (Lng;)V net/minecraft/src/PotionEffect/func_76457_b (Lnet/minecraft/src/EntityLiving;)V +MD: ml/b (Z)V net/minecraft/src/PotionEffect/func_100012_b (Z)V MD: ml/c ()I net/minecraft/src/PotionEffect/func_76458_c ()I MD: ml/e ()Z net/minecraft/src/PotionEffect/func_82720_e ()Z MD: ml/equals (Ljava/lang/Object;)Z net/minecraft/src/PotionEffect/equals (Ljava/lang/Object;)Z MD: ml/f ()Ljava/lang/String; net/minecraft/src/PotionEffect/func_76453_d ()Ljava/lang/String; -MD: ml/g ()I net/minecraft/src/PotionEffect/func_76454_e ()I +MD: ml/g ()Z net/minecraft/src/PotionEffect/func_100011_g ()Z +MD: ml/h ()I net/minecraft/src/PotionEffect/func_76454_e ()I MD: ml/hashCode ()I net/minecraft/src/PotionEffect/hashCode ()I MD: ml/toString ()Ljava/lang/String; net/minecraft/src/PotionEffect/toString ()Ljava/lang/String; MD: mm/a ()V net/minecraft/src/EntityAgeable/func_70088_a ()V @@ -17869,35 +17882,36 @@ MD: zt/a (Ljava/lang/String;)V net/minecraft/src/GameRuleValue/func_82757_a (Lja MD: zt/b ()Z net/minecraft/src/GameRuleValue/func_82758_b ()Z MD: zu/a (DD)I net/minecraft/src/ColorizerGrass/func_77480_a (DD)I MD: zu/a ([I)V net/minecraft/src/ColorizerGrass/func_77479_a ([I)V -MD: zv/A ()Ljava/util/List; net/minecraft/src/World/func_72910_y ()Ljava/util/List; +MD: zv/A ()V net/minecraft/src/World/func_72903_x ()V MD: zv/A (III)V net/minecraft/src/World/func_72969_x (III)V +MD: zv/B ()Ljava/util/List; net/minecraft/src/World/func_72910_y ()Ljava/util/List; MD: zv/B (III)I net/minecraft/src/World/func_94577_B (III)I -MD: zv/C ()V net/minecraft/src/World/func_72882_A ()V MD: zv/C (III)Z net/minecraft/src/World/func_72864_z (III)Z -MD: zv/D ()V net/minecraft/src/World/func_72906_B ()V +MD: zv/D ()V net/minecraft/src/World/func_72882_A ()V MD: zv/D (III)I net/minecraft/src/World/func_94572_D (III)I -MD: zv/E ()J net/minecraft/src/World/func_72905_C ()J +MD: zv/E ()V net/minecraft/src/World/func_72906_B ()V MD: zv/E (III)V net/minecraft/src/World/func_72950_A (III)V -MD: zv/F ()J net/minecraft/src/World/func_82737_E ()J +MD: zv/F ()J net/minecraft/src/World/func_72905_C ()J MD: zv/F (III)Z net/minecraft/src/World/func_72951_B (III)Z -MD: zv/G ()J net/minecraft/src/World/func_72820_D ()J +MD: zv/G ()J net/minecraft/src/World/func_82737_E ()J MD: zv/G (III)Z net/minecraft/src/World/func_72958_C (III)Z -MD: zv/H ()Lt; net/minecraft/src/World/func_72861_E ()Lnet/minecraft/src/ChunkCoordinates; +MD: zv/H ()J net/minecraft/src/World/func_72820_D ()J MD: zv/H (III)Ljava/util/Random; net/minecraft/src/World/func_72843_D (III)Ljava/util/Random; -MD: zv/I ()Labn; net/minecraft/src/World/func_72863_F ()Lnet/minecraft/src/IChunkProvider; -MD: zv/J ()Lajz; net/minecraft/src/World/func_72860_G ()Lnet/minecraft/src/ISaveHandler; -MD: zv/K ()Lajp; net/minecraft/src/World/func_72912_H ()Lnet/minecraft/src/WorldInfo; -MD: zv/L ()Lzs; net/minecraft/src/World/func_82736_K ()Lnet/minecraft/src/GameRules; -MD: zv/M ()Z net/minecraft/src/World/func_72911_I ()Z -MD: zv/N ()Z net/minecraft/src/World/func_72896_J ()Z -MD: zv/O ()I net/minecraft/src/World/func_72800_K ()I -MD: zv/P ()I net/minecraft/src/World/func_72940_L ()I -MD: zv/Q ()Z net/minecraft/src/World/func_72806_N ()Z -MD: zv/R ()D net/minecraft/src/World/func_72919_O ()D -MD: zv/S ()Laqx; net/minecraft/src/World/func_82732_R ()Lnet/minecraft/src/Vec3Pool; -MD: zv/T ()Ljava/util/Calendar; net/minecraft/src/World/func_83015_S ()Ljava/util/Calendar; -MD: zv/U ()Lard; net/minecraft/src/World/func_96441_U ()Lnet/minecraft/src/Scoreboard; -MD: zv/V ()Lku; net/minecraft/src/World/func_98180_V ()Lnet/minecraft/src/ILogAgent; +MD: zv/I ()Lt; net/minecraft/src/World/func_72861_E ()Lnet/minecraft/src/ChunkCoordinates; +MD: zv/J ()Labn; net/minecraft/src/World/func_72863_F ()Lnet/minecraft/src/IChunkProvider; +MD: zv/K ()Lajz; net/minecraft/src/World/func_72860_G ()Lnet/minecraft/src/ISaveHandler; +MD: zv/L ()Lajp; net/minecraft/src/World/func_72912_H ()Lnet/minecraft/src/WorldInfo; +MD: zv/M ()Lzs; net/minecraft/src/World/func_82736_K ()Lnet/minecraft/src/GameRules; +MD: zv/N ()Z net/minecraft/src/World/func_72911_I ()Z +MD: zv/O ()Z net/minecraft/src/World/func_72896_J ()Z +MD: zv/P ()I net/minecraft/src/World/func_72800_K ()I +MD: zv/Q ()I net/minecraft/src/World/func_72940_L ()I +MD: zv/R ()Z net/minecraft/src/World/func_72806_N ()Z +MD: zv/S ()D net/minecraft/src/World/func_72919_O ()D +MD: zv/T ()Laqx; net/minecraft/src/World/func_82732_R ()Lnet/minecraft/src/Vec3Pool; +MD: zv/U ()Ljava/util/Calendar; net/minecraft/src/World/func_83015_S ()Ljava/util/Calendar; +MD: zv/V ()Lard; net/minecraft/src/World/func_96441_U ()Lnet/minecraft/src/Scoreboard; +MD: zv/W ()Lku; net/minecraft/src/World/func_98180_V ()Lnet/minecraft/src/ILogAgent; MD: zv/a ()V net/minecraft/src/World/func_72947_a ()V MD: zv/a (DDDD)Lsk; net/minecraft/src/World/func_72977_a (DDDD)Lnet/minecraft/src/EntityPlayer; MD: zv/a (DDDDDDLbs;)V net/minecraft/src/World/func_92088_a (DDDDDDLnet/minecraft/src/NBTTagCompound;)V @@ -17991,7 +18005,7 @@ MD: zv/c (IIIZ)Z net/minecraft/src/World/func_72887_b (IIIZ)Z MD: zv/c (Laag;III)V net/minecraft/src/World/func_72936_c (Lnet/minecraft/src/EnumSkyBlock;III)V MD: zv/c (Laqr;)Z net/minecraft/src/World/func_72829_c (Lnet/minecraft/src/AxisAlignedBB;)Z MD: zv/c (Lmp;)Z net/minecraft/src/World/func_72942_c (Lnet/minecraft/src/Entity;)Z -MD: zv/d (F)I net/minecraft/src/World/func_72853_d (F)I +MD: zv/d (F)F net/minecraft/src/World/func_72929_e (F)F MD: zv/d (II)Labq; net/minecraft/src/World/func_72938_d (II)Lnet/minecraft/src/Chunk; MD: zv/d (III)Z net/minecraft/src/World/func_72927_d (III)Z MD: zv/d (IIII)V net/minecraft/src/World/func_72851_f (IIII)V @@ -18000,7 +18014,7 @@ MD: zv/d (IIIIII)V net/minecraft/src/World/func_72965_b (IIIIII)V MD: zv/d (IIIZ)Z net/minecraft/src/World/func_72834_c (IIIZ)Z MD: zv/d (Laqr;)Z net/minecraft/src/World/func_72953_d (Lnet/minecraft/src/AxisAlignedBB;)Z MD: zv/d (Lmp;)Z net/minecraft/src/World/func_72838_d (Lnet/minecraft/src/Entity;)Z -MD: zv/e (F)F net/minecraft/src/World/func_72929_e (F)F +MD: zv/e (F)Laqw; net/minecraft/src/World/func_72824_f (F)Lnet/minecraft/src/Vec3; MD: zv/e (II)Labq; net/minecraft/src/World/func_72964_e (II)Lnet/minecraft/src/Chunk; MD: zv/e (III)I net/minecraft/src/World/func_85175_e (III)I MD: zv/e (IIII)V net/minecraft/src/World/func_72975_g (IIII)V @@ -18009,7 +18023,7 @@ MD: zv/e (IIIIII)Z net/minecraft/src/World/func_72904_c (IIIIII)Z MD: zv/e (Laqr;)Z net/minecraft/src/World/func_72978_e (Lnet/minecraft/src/AxisAlignedBB;)Z MD: zv/e (Lmp;)V net/minecraft/src/World/func_72900_e (Lnet/minecraft/src/Entity;)V MD: zv/f ()V net/minecraft/src/World/func_72974_f ()V -MD: zv/f (F)Laqw; net/minecraft/src/World/func_72824_f (F)Lnet/minecraft/src/Vec3; +MD: zv/f (F)Laqw; net/minecraft/src/World/func_72948_g (F)Lnet/minecraft/src/Vec3; MD: zv/f (II)I net/minecraft/src/World/func_72976_f (II)I MD: zv/f (III)Z net/minecraft/src/World/func_72899_e (III)Z MD: zv/f (IIII)V net/minecraft/src/World/func_72898_h (IIII)V @@ -18017,27 +18031,26 @@ MD: zv/f (IIIII)V net/minecraft/src/World/func_72888_f (IIIII)V MD: zv/f (IIIIII)Z net/minecraft/src/World/func_72832_d (IIIIII)Z MD: zv/f (Lmp;)V net/minecraft/src/World/func_72973_f (Lnet/minecraft/src/Entity;)V MD: zv/g ()V net/minecraft/src/World/func_72893_g ()V -MD: zv/g (F)Laqw; net/minecraft/src/World/func_72948_g (F)Lnet/minecraft/src/Vec3; +MD: zv/g (F)F net/minecraft/src/World/func_72880_h (F)F MD: zv/g (II)I net/minecraft/src/World/func_82734_g (II)I MD: zv/g (III)Lahz; net/minecraft/src/World/func_72803_f (III)Lnet/minecraft/src/Material; MD: zv/g (IIII)V net/minecraft/src/World/func_72821_m (IIII)V MD: zv/g (IIIIII)V net/minecraft/src/World/func_72909_d (IIIIII)V MD: zv/g (Lmp;)V net/minecraft/src/World/func_72870_g (Lnet/minecraft/src/Entity;)V MD: zv/h ()V net/minecraft/src/World/func_72939_s ()V -MD: zv/h (F)F net/minecraft/src/World/func_72880_h (F)F +MD: zv/h (F)F net/minecraft/src/World/func_72819_i (F)F MD: zv/h (II)I net/minecraft/src/World/func_72874_g (II)I MD: zv/h (III)I net/minecraft/src/World/func_72805_g (III)I MD: zv/h (IIII)I net/minecraft/src/World/func_72802_i (IIII)I MD: zv/h (Lmp;)V net/minecraft/src/World/func_72897_h (Lnet/minecraft/src/Entity;)V -MD: zv/i (F)F net/minecraft/src/World/func_72819_i (F)F +MD: zv/i (F)F net/minecraft/src/World/func_72867_j (F)F MD: zv/i (II)I net/minecraft/src/World/func_72825_h (II)I MD: zv/i (III)Z net/minecraft/src/World/func_94571_i (III)Z MD: zv/i (IIII)F net/minecraft/src/World/func_72808_j (IIII)F MD: zv/j ()Labn; net/minecraft/src/World/func_72970_h ()Lnet/minecraft/src/IChunkProvider; -MD: zv/j (F)F net/minecraft/src/World/func_72867_j (F)F +MD: zv/j (F)V net/minecraft/src/World/func_72894_k (F)V MD: zv/j (III)V net/minecraft/src/World/func_72845_h (III)V MD: zv/j (IIII)I net/minecraft/src/World/func_72879_k (IIII)I -MD: zv/k (F)V net/minecraft/src/World/func_72894_k (F)V MD: zv/k (IIII)Z net/minecraft/src/World/func_94574_k (IIII)Z MD: zv/l (III)Z net/minecraft/src/World/func_72937_j (III)Z MD: zv/l (IIII)I net/minecraft/src/World/func_72878_l (IIII)I @@ -18053,15 +18066,15 @@ MD: zv/t ()Laau; net/minecraft/src/World/func_72959_q ()Lnet/minecraft/src/World MD: zv/t (III)Z net/minecraft/src/World/func_72804_r (III)Z MD: zv/u ()Z net/minecraft/src/World/func_72935_r ()Z MD: zv/u (III)Z net/minecraft/src/World/func_72809_s (III)Z -MD: zv/v ()Ljava/lang/String; net/minecraft/src/World/func_72981_t ()Ljava/lang/String; +MD: zv/v ()I net/minecraft/src/World/func_72853_d ()I MD: zv/v (III)Z net/minecraft/src/World/func_85174_u (III)Z -MD: zv/w ()Ljava/lang/String; net/minecraft/src/World/func_72827_u ()Ljava/lang/String; +MD: zv/w ()Ljava/lang/String; net/minecraft/src/World/func_72981_t ()Ljava/lang/String; MD: zv/w (III)Z net/minecraft/src/World/func_72797_t (III)Z -MD: zv/x ()V net/minecraft/src/World/func_72966_v ()V +MD: zv/x ()Ljava/lang/String; net/minecraft/src/World/func_72827_u ()Ljava/lang/String; MD: zv/x (III)Z net/minecraft/src/World/func_72884_u (III)Z -MD: zv/y ()V net/minecraft/src/World/func_72913_w ()V +MD: zv/y ()V net/minecraft/src/World/func_72966_v ()V MD: zv/y (III)Z net/minecraft/src/World/func_72850_v (III)Z -MD: zv/z ()V net/minecraft/src/World/func_72903_x ()V +MD: zv/z ()V net/minecraft/src/World/func_72913_w ()V MD: zv/z (III)Z net/minecraft/src/World/func_72858_w (III)Z MD: zw/a ()Ljava/lang/String; net/minecraft/src/CallableLvl1/func_77484_a ()Ljava/lang/String; MD: zw/call ()Ljava/lang/Object; net/minecraft/src/CallableLvl1/call ()Ljava/lang/Object; diff --git a/fml/conf/mcp.cfg b/fml/conf/mcp.cfg index ff488e358..39713416f 100644 --- a/fml/conf/mcp.cfg +++ b/fml/conf/mcp.cfg @@ -36,8 +36,8 @@ DirNatives = %(DirJars)s/bin/natives Client = %(DirJars)s/bin/minecraft.jar Server = %(DirJars)s/minecraft_server.jar LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar -MD5Client = d2534381656da5069b96cc89e28158ef -MD5Server = 92f4fd715191c596745c7bbfad9c1aad +MD5Client = d39baadeeb124a29b2542d778713493f +MD5Server = 22223b1d00b72cc51fdb8b7cdd45f9c1 [RETROGUARD] Location = %(DirRuntime)s/bin/retroguard.jar @@ -123,8 +123,8 @@ LogFile = %(DirLogs)s/mcp.log LogFileErr = %(DirLogs)s/mcperr.log UpdateUrl = IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources -RGIndex = 98000 -ParamIndex = 11000 +RGIndex = 100000 +ParamIndex = 20000 [ASTYLE] AstyleConfig = %(DirConf)s/astyle.cfg diff --git a/fml/conf/methods.csv b/fml/conf/methods.csv index 2c9a16833..381f4d2bb 100644 --- a/fml/conf/methods.csv +++ b/fml/conf/methods.csv @@ -7,7 +7,7 @@ func_70004_a,translateString,2,Translates and formats the given string key with func_70005_c_,getCommandSenderName,2,"Gets the name of this command sender (usually username, but possibly ""Rcon"")" func_70006_a,sendChatToPlayer,2, func_70007_b,resetLog,2,Clears the RCon log -func_70008_c,getLogContents,2,Gets the contents of the RCon log +func_70008_c,getChatBuffer,2, func_70011_f,getDistance,2,"Gets the distance to the position. Args: x, y, z" func_70012_b,setLocationAndAngles,2,Sets the location and Yaw/Pitch of an entity in the world func_70013_c,getBrightness,2,Gets how bright this entity is. @@ -32,7 +32,7 @@ func_70031_b,setSprinting,2,Set sprinting switch for Entity. func_70032_d,getDistanceToEntity,2,Returns the distance to the entity. Args: entity func_70033_W,getYOffset,2,Returns the Y Offset of this entity. func_70034_d,setRotationYawHead,2,Sets the head's yaw rotation of the entity. -func_70035_c,getInventory,2,returns the inventory of this entity (only used in EntityPlayerMP it seems) +func_70035_c,getLastActiveItems,2, func_70036_a,playStepSound,2,"Plays step sound at given x, y, z for the entity" func_70037_a,readEntityFromNBT,2,(abstract) Protected helper method to read subclass entity data from NBT. func_70038_c,isOffsetPositionInLiquid,2,"Checks if the offset position from the entity's current position is inside of liquid. Args: x, y, z" @@ -528,14 +528,14 @@ func_71062_b,canHarvestBlock,2,Checks if the player has the ability to harvest a func_71063_a,setSpawnChunk,2,Defines a spawn coordinate to player spawn. Used by bed after the player sleep on it. func_71064_a,addStat,2,Adds a value to a statistic field. func_71065_l,isInBed,2,Checks if the player is currently in a bed -func_71110_a,updateCraftingInventory,2,update the crafting window inventory with the items in the list +func_71110_a,sendContainerAndContentsToPlayer,2, func_71111_a,sendSlotContents,2,"Sends the contents of an inventory slot to the client-side Container. This doesn't have to match the actual contents of that slot. Args: Container, slot number, slot contents" func_71112_a,sendProgressBarUpdate,2,"Sends two ints to the client-side Container. Used for furnace burning time, smelting progress, brewing progress, and enchanting level. Normally the first int identifies which variable to update, and the second contains the new value. Both are truncated to shorts in non-local SMP." func_71113_k,updateHeldItem,2,updates item held by mouse func_71114_r,getPlayerIP,2,Gets the player's IP address. Used in /banip. func_71115_a,requestTexturePackLoad,2,on recieving this message the client (if permission is given) will download the requested textures func_71116_b,addSelfToInternalCraftingInventory,2, -func_71117_bO,getNextWindowId,2,get the next window id to use +func_71117_bO,incrementWindowID,2, func_71118_n,setPlayerHealthUpdated,2,"this function is called when a players inventory is sent to him, lastHealth is updated on any dimension transitions, then reset." func_71119_a,sendTileEntityToPlayer,2,called from onUpdate for all tileEntity in specific chunks func_71120_a,sendContainerToPlayer,2, @@ -546,7 +546,7 @@ func_71124_b,getCurrentItemOrArmor,2,"0 = item, 1-n is armor" func_71125_a,updateClientInfo,2, func_71126_v,getChatVisibility,2, func_71127_g,onUpdateEntity,2, -func_71128_l,closeCraftingGui,2,close the current crafting gui +func_71128_l,closeInventory,2, func_71150_b,setHealth,2,Updates health locally. func_71151_f,getFOVMultiplier,2,Gets the player's field of view multiplier. (ex. when flying) func_71152_a,setXPStats,2,"Sets the current XP, total XP, and level number." @@ -619,7 +619,7 @@ func_71248_a,getPossibleCompletions,2,"If par2Str begins with /, then it searche func_71249_w,getMinecraftVersion,2,Returns the server's Minecraft version as string. func_71250_E,getKeyPair,2,Gets KeyPair instanced in MinecraftServer. func_71251_e,setCanSpawnAnimals,2, -func_71252_i,handleRConCommand,2,Handle a command received by an RCon instance +func_71252_i,executeCommand,2, func_71253_a,setKeyPair,2, func_71254_M,getActiveAnvilConverter,2, func_71255_r,getAllowNether,2, @@ -748,7 +748,7 @@ func_71521_c,getCommandSenderAsPlayer,2,Returns the given ICommandSender as a En func_71522_a,notifyAdmins,2, func_71523_a,doesStringStartWith,2,Returns true if the given substring is exactly equal to the start of the given string (case insensitive). func_71524_a,notifyAdmins,2, -func_71525_a,compareNameTo,2,Compares the name of this command to the name of the given command. +func_71525_a,compareTo,2,Compares the name of this command to the name of the given command. func_71526_a,parseInt,2,Parses an int from the given string. func_71527_a,joinNiceString,2,"Joins the given string array into a ""x, y, and z"" seperated string." func_71528_a,parseIntWithMin,2,Parses an int from the given sring with a specified minimum. @@ -796,7 +796,7 @@ func_71745_a,addPlayer,2,adds this connection to the list of currently connected func_71746_d,getServer,2, func_71747_b,networkTick,2,processes packets and pending connections func_71752_f,isGamePaused,2, -func_71753_e,getMinecraftServer,2,Gets MinecraftServer instance. +func_71753_e,getIntegratedServer,2,Gets MinecraftServer instance. func_71762_c,getDedicatedServer,2, func_71764_a,addPendingConnection,2, func_71765_d,getMyPort,2, @@ -855,7 +855,7 @@ func_71867_k,onBlockDestroyedByExplosion,2,Called upon the block being destroyed func_71868_h,setLightOpacity,2,Sets how much light is blocked going through this block. Returns the object for convenience in constructing. func_71869_a,onEntityCollidedWithBlock,2,"Triggered whenever an entity collides with this block (enters into the block). Args: world, x, y, z, entity" func_71870_f,getBlockBrightness,2,"How bright to render this block based on the light its receiving. Args: iBlockAccess, x, y, z" -func_71871_a,getCollisionBoxes,2,"Adds all intersecting collision boxes to a list. Parameters: World, X, Y, Z, mask, list, colliding entity. Be sure to only add blocks to the list if they intersect the mask." +func_71871_a,addCollisionBoxesToList,2,"Adds all intersecting collision boxes to a list. (Be sure to only add boxes to the list if they intersect the mask.) Parameters: World, X, Y, Z, mask, list, colliding entity" func_71872_e,getCollisionBoundingBoxFromPool,2,Returns a bounding box from the pool of bounding boxes (this means this box can change after the pool has been cleared to be reused) func_71873_h,getDamageValue,2,Get the block's damage value (for use with pick block). func_71874_e,getMixedBrightnessForBlock,2,"Goes straight to getLightBrightnessForSkyBlocks for Blocks, does some fancy computing for Fluids" @@ -1077,12 +1077,12 @@ func_72352_l,getMaxPlayers,2,Returns the maximum number of players allowed on th func_72353_e,areCommandsAllowed,2,Returns true if the specific player is allowed to use commands. func_72354_b,updateTimeAndWeatherForPlayer,2,Updates the time and weather for the given player to those of the given world func_72355_a,initializeConnectionToPlayer,2, -func_72356_a,transferPlayerToDimension,2,moves provided player from overworld to nether or vice versa +func_72356_a,transferPlayerToDimension,2, func_72357_a,setGameType,2, func_72358_d,serverUpdateMountedMovingPlayer,2,"using player's dimension, update their movement when in a vehicle (e.g. cart, boat)" func_72359_h,addToWhiteList,2,Add the specified player to the white list. func_72360_c,removeOp,2,"This removes a username from the ops list, then saves the op list" -func_72361_f,getPlayerEntity,2,gets the player entity for the player with the name specified +func_72361_f,getPlayerForUsername,2, func_72362_j,loadWhiteList,2,"Either does nothing, or calls readWhiteList." func_72363_f,getBannedIPs,2, func_72364_a,setPlayerManager,2,Sets the NBT manager to the one for the WorldServer given. @@ -1216,7 +1216,7 @@ func_72523_a,handleWindowClick,2, func_72524_a,handleAnimation,2, func_72525_c,getSharedKey,2,Return the secret AES sharedKey func_72526_a,getServerId,2,Returns the server Id randomly generated by this login handler. -func_72527_a,kickUser,2,Disconnects the user with the given reason. +func_72527_a,raiseErrorAndDisconnect,2, func_72528_e,getUsernameAndAddress,2, func_72529_d,initializePlayerConnection,2,"on success the specified username is connected to the minecraftInstance, otherwise they are packet255'd" func_72530_b,getLoginMinecraftServer,2,Returns the reference to Minecraft Server. @@ -1231,7 +1231,7 @@ func_72550_a,sendSessionRequest,2,Send request to http://session.minecraft.net w func_72551_d,processReadPackets,2,Processes the packets that have been read since the last call to this function. func_72552_c,addToSendQueue,2,Adds the packet to the send queue func_72553_e,disconnect,2,Disconnects the network connection. -func_72565_c,kickPlayer,2,Kick the offending player and give a reason why +func_72565_c,kickPlayerFromServer,2, func_72566_d,handleSlashCommand,2,Processes a / command func_72567_b,sendPacketToPlayer,2,"addToSendQueue. if it is a chat packet, check before sending it" func_72568_e,packetSize,2,returns 0 for memoryMapped connections @@ -1289,9 +1289,9 @@ func_72683_a,addPlayer,2,Adds an EntityPlayerMP to the PlayerManager. func_72685_d,updateMountedMovingPlayer,2,"update chunks around a player being moved by server logic (e.g. cart, boat)" func_72686_a,getFurthestViewableBlock,2,Get the furthest viewable block given player's view distance func_72687_a,flagChunkForUpdate,2,"the ""PlayerInstance""/ chunkWatcher will send this chunk to all players who are in line of sight" -func_72688_a,getMinecraftServer,2,Returns the MinecraftServer associated with the PlayerManager. +func_72688_a,getWorldServer,2, func_72689_b,getChunkWatchers,2, -func_72690_a,getPlayerInstance,2,passi n the chunk x and y and a flag as to whether or not the instance should be made if it doesnt exist +func_72690_a,getOrCreateChunkWatcher,2, func_72691_b,filterChunkLoadQueue,2,Removes all chunks from the given player's chunk load queue that are not in viewing range of the player. func_72692_a,getWorldServer,2, func_72693_b,updatePlayerInstances,2,updates all the player instances that need to be updated @@ -1452,7 +1452,7 @@ func_72909_d,markBlockRangeForRenderUpdate,2,"On the client, re-renders all bloc func_72910_y,getLoadedEntityList,2,Accessor for world Loaded Entity List func_72911_I,isThundering,2,Returns true if the current thunder strength (weighted with the rain strength) is greater than 0.9 func_72912_H,getWorldInfo,2,Gets the World's WorldInfo instance -func_72913_w,commandToggleDownfall,2,start precipitation in this world (2 ticks after command posted) +func_72913_w,toggleRain,2, func_72914_a,addWorldInfoToCrashReport,2,Adds some basic stats of the world to the given crash report. func_72915_b,setLightValue,2,"Sets the light value either into the sky map or block map depending on if enumSkyBlock is set to sky or block. Args: enumSkyBlock, x, y, z, lightValue" func_72916_c,chunkExists,2,"Returns whether a chunk exists at chunk coordinates x, y" @@ -1572,7 +1572,7 @@ func_73119_a,informAllAssociatedPlayersOfItemDestruction,2, func_73120_a,sendPacketToAllTrackingPlayers,2,"if this is a player, then it is not informed" func_73121_d,isPlayerWatchingThisChunk,2, func_73122_a,sendLocationToAllClients,2,"also sends velocity, rotation, and riding info." -func_73123_c,removeTrackedPlayerSymmetric,2,Remove a tracked player from our list and tell the tracked player to destroy us from their world. +func_73123_c,removePlayerFromTracker,2, func_73124_b,getPacketForThisEntity,2, func_73125_b,sendEventsToPlayers,2, func_73148_d,makeString,2,Converts the instance data to a readable string. @@ -1601,14 +1601,14 @@ func_73240_a,unloadAllChunks,2,"marks all chunks for unload, ignoring those near func_73241_b,unloadChunksIfNotNearSpawn,2,"marks chunk for unload by ""unload100OldestChunks"" if there is no spawn point, or if the center of the chunk is outside 200 blocks (x or z) of the spawn" func_73242_b,safeSaveChunk,2,"used by saveChunks, but catches any exceptions if the save fails." func_73243_a,safeSaveExtraChunkData,2,"used by saveChunks, but catches any exceptions if the save fails." -func_73252_b,removePlayer,2,remove player from this instance +func_73252_b,sendThisChunkToPlayer,2, func_73253_a,getChunkLocation,2, func_73254_a,sendChunkUpdate,2, func_73255_a,addPlayerToChunkWatchingList,2,called for all chunks within the visible radius of the player -func_73256_a,sendPacketToPlayersInInstance,2,sends the packet to all players in the current instance -func_73257_a,updateTileEntity,2,sends players update packet about the given entity +func_73256_a,sendToAllPlayersWatchingChunk,2, +func_73257_a,sendTileToAllPlayersWatchingChunk,2, func_73258_b,getPlayersInChunk,2, -func_73259_a,markBlockNeedsUpdate,2,mark the block as changed so that it will update clients who need to know about it +func_73259_a,flagChunkForUpdate,2, func_73266_a,writePacket,2,"Writes a packet, prefixed by its ID, to the data stream." func_73267_a,readPacketData,2,Abstract. Reads the raw packet data from the data stream. func_73268_a,containsSameEntityIDAs,2,eg return packet30entity.entityId == entityId; WARNING : will throw if you compare a packet to a different packet class @@ -2466,7 +2466,7 @@ func_75680_a,writeObjectsInListToStream,2,"writes every object in passed list to func_75681_e,getWatchableObjectString,2,gets a watchable object and returns it as a String func_75682_a,addObject,2,"adds a new object to dataWatcher to watch, to update an already existing object see updateObject. Arguments: data Value Id, Object to add" func_75683_a,getWatchableObjectByte,2,gets the bytevalue of a watchable object -func_75684_a,hasObjectChanged,2,true if one or more object was changed +func_75684_a,hasChanges,2, func_75685_c,getAllWatched,2, func_75686_a,readWatchableObjects,2, func_75687_a,updateWatchedObjectsFromList,2, @@ -2575,7 +2575,7 @@ func_75887_a,decryptSharedKey,2,Decrypt shared secret AES key using RSA private func_75888_a,decryptInputStream,2, func_75889_b,decryptData,2,Decrypt byte[] data with RSA private key func_75890_a,createNewSharedKey,2,Generate a new shared secret AES key from a secure random source -func_75891_b,generateKeyPair,2,Generates RSA KeyPair +func_75891_b,createNewKeyPair,2, func_75892_a,createBufferedBlockCipher,2,Create a new BufferedBlockCipher instance func_75893_a,digestOperation,2,Compute a message digest on arbitrary byte[] data func_75894_a,encryptData,2,Encrypt byte[] data with RSA public key @@ -2680,7 +2680,7 @@ func_76126_a,sin,2,sin looked up in a table func_76127_a,average,2, func_76128_c,floor_double,2,Returns the greatest integer less than or equal to the double argument func_76129_c,sqrt_float,2, -func_76130_a,abs,2,Returns the unsigned value of an int. +func_76130_a,abs_int,2, func_76131_a,clamp_float,2,"Returns the value of the first parameter, clamped to be within the lower and upper limits given by the second and third parameters" func_76132_a,abs_max,2,Maximum of the absolute value of two numbers. func_76133_a,sqrt_double,2, @@ -3370,7 +3370,7 @@ func_77649_a,getDamageVsEntity,2,Returns the damage against a given entity. func_77650_f,getIconIndex,2,Returns the icon index of the stack given as argument. func_77651_p,getShareTag,2,"If this function returns true (or the item is damageable), the ItemStack's NBT tag will be sent to the client." func_77652_b,setIconCoord,2, -func_77654_b,onFoodEaten1,2, +func_77654_b,onEaten,2, func_77655_b,setUnlocalizedName,2,"Sets the unlocalized name of this item to the string passed as the parameter, prefixed by ""item.""" func_77656_e,setMaxDamage,2,set max damage of an Item func_77657_g,getLocalizedName,2,Gets the localized name of the given item stack. @@ -3398,7 +3398,7 @@ func_77845_h,isWolfsFavoriteMeat,2,Whether wolves like this food (true for raw a func_77846_g,getSaturationModifier,2,gets the saturationModifier of the ItemFood func_77847_f,getHealAmount,2, func_77848_i,setAlwaysEdible,2,"Set the field 'alwaysEdible' to true, and make the food edible even if the player don't need to eat." -func_77849_c,onFoodEaten2,2, +func_77849_c,onFoodEaten,2, func_77861_e,getToolMaterialName,2,Return the name for this tool's material. func_77869_a,placeDoorBlock,2, func_77871_c,createMapDataPacket,2,returns null if no update is to be sent @@ -3428,7 +3428,7 @@ func_77946_l,copy,2,Returns a new stack with the same properties. func_77947_a,interactWith,2, func_77948_v,isItemEnchanted,2,True if the item has enchantment data func_77949_a,loadItemStackFromNBT,2, -func_77950_b,onFoodEaten3,2, +func_77950_b,onFoodEaten,2, func_77951_h,isItemDamaged,2,returns true when a damageable item is damaged func_77952_i,getItemDamageForDisplay,2,"gets the damage of an itemstack, for displaying purposes" func_77953_t,getRarity,2, @@ -4119,6 +4119,7 @@ func_85175_e,blockGetRenderType,2,Returns the render type of the block at the gi func_85176_s,getDefaultTeleporter,2, func_85181_a,getRandomModelBox,2, func_85187_a,drawString,2,"Draws the specified string. Args: string, x, y, color, dropShadow" +func_85188_a,makePortal,2, func_90010_a,isPartOfLargeChest,2,Return whether the given inventory is part of this large chest. func_90011_a,createChild,2, func_90019_g,applyRenderColor,2,Creates a new EntityDiggingFX with the block render color applied to the base particle color diff --git a/fml/conf/params.csv b/fml/conf/params.csv index 275c805a0..a134b84eb 100644 --- a/fml/conf/params.csv +++ b/fml/conf/params.csv @@ -1,4 +1,12 @@ param,name,side +p_100001_0_,par0,2 +p_100003_1_,par1,2 +p_100006_1_,par1Str,2 +p_100006_2_,par2Str,2 +p_100009_0_,par0,2 +p_100012_1_,par1,2 +p_100014_0_,par0McoServerList,2 +p_100015_0_,par0KeyBinding,2 p_70000_1_,par1PlayerUsageSnooper,2 p_70001_1_,par1PlayerUsageSnooper,2 p_70003_1_,par1,2 @@ -1923,7 +1931,6 @@ p_72851_2_,par2,2 p_72851_3_,par3,2 p_72851_4_,par4,2 p_72852_1_,par1Collection,2 -p_72853_1_,par1,2 p_72855_1_,par1AxisAlignedBB,2 p_72856_1_,par1Entity,2 p_72856_2_,par2,2 @@ -4408,7 +4415,6 @@ p_76552_1_,par1,2 p_76552_2_,par2,2 p_76558_1_,par1World,2 p_76559_1_,par1,2 -p_76559_3_,par3,2 p_76560_1_,par1,2 p_76560_2_,par2,2 p_76562_1_,par1,2 @@ -7690,8 +7696,6 @@ p_96353_1_,par1Str,2 p_96353_2_,par2,2 p_96353_3_,par3,2 p_96355_0_,par0Str,2 -p_96356_1_,par1Str,2 -p_96356_2_,par2Str,2 p_96358_0_,par0Str,2 p_96361_0_,par0Str,2 p_96361_1_,par1Str,2 @@ -7970,7 +7974,6 @@ p_98147_2_,par2ITexturePack,2 p_98153_0_,par0Obj,2 p_98157_0_,par0Obj,2 p_98157_1_,par1Obj,2 -p_98158_1_,par1Str,2 p_98161_0_,par0Str,2 p_98162_0_,par0Str,2 p_98163_0_,par0JsonNode,2 @@ -8021,7 +8024,6 @@ p_98237_0_,par0LogAgent,2 p_98247_0_,par0McoServerList,2 p_98247_1_,par1List,2 p_98249_0_,par0McoServerList,2 -p_98253_0_,par0McoServerList,2 p_98263_1_,par1,2 p_98263_2_,par2,2 p_98263_3_,par3,2 @@ -8143,7 +8145,6 @@ p_i10031_2_,par2,2 p_i10031_3_,par3,2 p_i10032_1_,par1Str,2 p_i10032_2_,par2Exception,2 -p_i10033_1_,par1Str,2 p_i10042_1_,par1DispenserBehaviorPotion,2 p_i10042_2_,par2ItemStack,2 p_i10043_1_,par1MinecraftServer,2 @@ -8209,7 +8210,6 @@ p_i11003_2_,par2Str,2 p_i11004_1_,par1GuiScreen,2 p_i11004_2_,par2McoServer,2 p_i11005_1_,par1GuiScreenConfigureWorld,2 -p_i11006_1_,par1Str,2 p_i11007_1_,par1GuiScreen,2 p_i11007_2_,par2Str,2 p_i11007_3_,par3Str,2 @@ -8344,6 +8344,8 @@ p_i11044_5_,par5Profiler,2 p_i11044_6_,par6ILogAgent,2 p_i11045_1_,par1Str,2 p_i11046_1_,par1TileEntityMobSpawner,2 +p_i20000_1_,par1Session,2 +p_i20001_1_,par1Session,2 p_i3000_1_,par1File,2 p_i3000_2_,par2Minecraft,2 p_i3001_1_,par1Map,2 diff --git a/fml/conf/patches/minecraft_ff.patch b/fml/conf/patches/minecraft_ff.patch index 0cbbafbae..d6e6a4e3a 100644 --- a/fml/conf/patches/minecraft_ff.patch +++ b/fml/conf/patches/minecraft_ff.patch @@ -1,6 +1,6 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java ---- minecraft\net\minecraft\client\Minecraft.java Sat Mar 02 03:07:02 2013 -+++ minecraft_patched\net\minecraft\client\Minecraft.java Sat Mar 02 03:08:47 2013 +--- minecraft\net\minecraft\client\Minecraft.java Fri Mar 08 22:39:55 2013 ++++ minecraft_patched\net\minecraft\client\Minecraft.java Fri Mar 08 22:41:28 2013 @@ -531,9 +531,8 @@ return; } @@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net private void func_71411_J() { diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java ---- minecraft\net\minecraft\src\CallableSuspiciousClasses.java Sat Mar 02 03:07:03 2013 -+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java Sat Mar 02 03:08:47 2013 +--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java Fri Mar 08 22:39:56 2013 ++++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java Fri Mar 08 22:41:28 2013 @@ -21,9 +21,14 @@ public String func_85085_a() { @@ -51,8 +51,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraf boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport"); HashMap var6 = new HashMap(); diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\minecraft\src\CodecMus.java ---- minecraft\net\minecraft\src\CodecMus.java Sat Mar 02 03:07:03 2013 -+++ minecraft_patched\net\minecraft\src\CodecMus.java Sat Mar 02 03:08:47 2013 +--- minecraft\net\minecraft\src\CodecMus.java Fri Mar 08 22:39:56 2013 ++++ minecraft_patched\net\minecraft\src\CodecMus.java Fri Mar 08 22:41:28 2013 @@ -1,5 +1,6 @@ package net.minecraft.src; @@ -73,8 +73,8 @@ diff -r -U 3 minecraft\net\minecraft\src\CodecMus.java minecraft_patched\net\min } } diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java ---- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Mar 02 03:07:03 2013 -+++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Mar 02 03:08:47 2013 +--- minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java Fri Mar 08 22:39:56 2013 ++++ minecraft_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Fri Mar 08 22:41:28 2013 @@ -11,6 +11,10 @@ public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn { @@ -87,8 +87,8 @@ diff -r -U 3 minecraft\net\minecraft\src\ComponentStrongholdRightTurn.java minec if(this.field_74885_f != 2 && this.field_74885_f != 3) { this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1); diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\net\minecraft\src\DedicatedServer.java ---- minecraft\net\minecraft\src\DedicatedServer.java Sat Mar 02 03:07:03 2013 -+++ minecraft_patched\net\minecraft\src\DedicatedServer.java Sat Mar 02 03:08:47 2013 +--- minecraft\net\minecraft\src\DedicatedServer.java Fri Mar 08 22:39:56 2013 ++++ minecraft_patched\net\minecraft\src\DedicatedServer.java Fri Mar 08 22:41:28 2013 @@ -206,7 +206,7 @@ System.exit(0); } @@ -99,8 +99,8 @@ diff -r -U 3 minecraft\net\minecraft\src\DedicatedServer.java minecraft_patched\ this.func_71333_ah(); } diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patched\net\minecraft\src\EnumChatFormatting.java ---- minecraft\net\minecraft\src\EnumChatFormatting.java Sat Mar 02 03:07:04 2013 -+++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java Sat Mar 02 03:08:47 2013 +--- minecraft\net\minecraft\src\EnumChatFormatting.java Fri Mar 08 22:39:57 2013 ++++ minecraft_patched\net\minecraft\src\EnumChatFormatting.java Fri Mar 08 22:41:28 2013 @@ -38,7 +38,7 @@ private final String field_96304_B; @@ -111,9 +111,9 @@ diff -r -U 3 minecraft\net\minecraft\src\EnumChatFormatting.java minecraft_patch private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) { diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net\minecraft\src\FontRenderer.java ---- minecraft\net\minecraft\src\FontRenderer.java Sat Mar 02 03:07:04 2013 -+++ minecraft_patched\net\minecraft\src\FontRenderer.java Sat Mar 02 03:08:47 2013 -@@ -599,8 +599,6 @@ +--- minecraft\net\minecraft\src\FontRenderer.java Fri Mar 08 22:39:57 2013 ++++ minecraft_patched\net\minecraft\src\FontRenderer.java Fri Mar 08 22:41:28 2013 +@@ -621,8 +621,6 @@ case 10: --var5; break; @@ -122,7 +122,7 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net case 167: if(var5 < var3 - 1) { ++var5; -@@ -614,6 +612,8 @@ +@@ -636,6 +634,8 @@ } } break; @@ -132,8 +132,8 @@ diff -r -U 3 minecraft\net\minecraft\src\FontRenderer.java minecraft_patched\net var4 += this.func_78263_a(var8); if(var7) { diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched\net\minecraft\src\IntegratedServer.java ---- minecraft\net\minecraft\src\IntegratedServer.java Sat Mar 02 03:07:05 2013 -+++ minecraft_patched\net\minecraft\src\IntegratedServer.java Sat Mar 02 03:08:47 2013 +--- minecraft\net\minecraft\src\IntegratedServer.java Fri Mar 08 22:39:58 2013 ++++ minecraft_patched\net\minecraft\src\IntegratedServer.java Fri Mar 08 22:41:28 2013 @@ -101,7 +101,7 @@ return true; } @@ -143,9 +143,51 @@ diff -r -U 3 minecraft\net\minecraft\src\IntegratedServer.java minecraft_patched boolean var1 = this.field_71348_o; this.field_71348_o = this.field_71347_n.func_71752_f(); if(!var1 && this.field_71348_o) { +diff -r -U 3 minecraft\net\minecraft\src\RConThreadClient.java minecraft_patched\net\minecraft\src\RConThreadClient.java +--- minecraft\net\minecraft\src\RConThreadClient.java Fri Mar 08 22:39:59 2013 ++++ minecraft_patched\net\minecraft\src\RConThreadClient.java Fri Mar 08 22:44:06 2013 +@@ -32,8 +32,8 @@ + } + + public void run() { +- while(true) { +- try { ++ try { ++ while(true) { + if(!this.field_72619_a) { + break; + } +@@ -84,20 +84,14 @@ + continue; + } + } +- } catch (SocketTimeoutException var17) { +- break; +- } catch (IOException var18) { +- break; +- } catch (Exception var19) { +- System.out.println(var19); +- break; +- } finally { +- this.func_72653_g(); + } +- +- return; +- } +- ++ } catch (SocketTimeoutException var17) { ++ } catch (IOException var18) { ++ } catch (Exception var19) { ++ System.out.println(var19); ++ } finally { ++ this.func_72653_g(); ++ } + } + + private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException { diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net\minecraft\src\RenderBlocks.java ---- minecraft\net\minecraft\src\RenderBlocks.java Sat Mar 02 03:07:06 2013 -+++ minecraft_patched\net\minecraft\src\RenderBlocks.java Sat Mar 02 03:08:49 2013 +--- minecraft\net\minecraft\src\RenderBlocks.java Fri Mar 08 22:39:59 2013 ++++ minecraft_patched\net\minecraft\src\RenderBlocks.java Fri Mar 08 22:41:28 2013 @@ -1967,16 +1967,16 @@ float var25 = (float)(p_78589_2_ + 1); float var26 = (float)(p_78589_4_ + 0); @@ -177,8 +219,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderBlocks.java minecraft_patched\net var5.func_78374_a((double)var25, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94212_f(), (double)var8.func_94206_g()); var5.func_78374_a((double)var24, (double)p_78589_3_ + 0.015625D, (double)var26, (double)var8.func_94209_e(), (double)var8.func_94206_g()); diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net\minecraft\src\RenderGlobal.java ---- minecraft\net\minecraft\src\RenderGlobal.java Sat Mar 02 03:07:06 2013 -+++ minecraft_patched\net\minecraft\src\RenderGlobal.java Sat Mar 02 03:08:49 2013 +--- minecraft\net\minecraft\src\RenderGlobal.java Fri Mar 08 22:39:59 2013 ++++ minecraft_patched\net\minecraft\src\RenderGlobal.java Fri Mar 08 22:41:28 2013 @@ -1449,7 +1449,7 @@ double var15 = this.field_72777_q.field_71451_h.field_70165_t - p_72726_2_; double var17 = this.field_72777_q.field_71451_h.field_70163_u - p_72726_4_; @@ -189,8 +231,8 @@ diff -r -U 3 minecraft\net\minecraft\src\RenderGlobal.java minecraft_patched\net this.field_72777_q.field_71452_i.func_78873_a(var21 = new EntityHugeExplodeFX(this.field_72769_h, p_72726_2_, p_72726_4_, p_72726_6_, p_72726_8_, p_72726_10_, p_72726_12_)); } else if(p_72726_1_.equals("largeexplode")) { diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\net\minecraft\src\TcpMasterThread.java ---- minecraft\net\minecraft\src\TcpMasterThread.java Sat Mar 02 03:07:06 2013 -+++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Sat Mar 02 03:08:49 2013 +--- minecraft\net\minecraft\src\TcpMasterThread.java Fri Mar 08 22:39:59 2013 ++++ minecraft_patched\net\minecraft\src\TcpMasterThread.java Fri Mar 08 22:41:28 2013 @@ -11,6 +11,7 @@ this.field_74504_a = p_i3285_1_; } @@ -200,8 +242,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TcpMasterThread.java minecraft_patched\ try { Thread.sleep(5000L); diff -r -U 3 minecraft\net\minecraft\src\TexturePackCustom.java minecraft_patched\net\minecraft\src\TexturePackCustom.java ---- minecraft\net\minecraft\src\TexturePackCustom.java Sat Mar 02 03:07:07 2013 -+++ minecraft_patched\net\minecraft\src\TexturePackCustom.java Sat Mar 02 03:11:52 2013 +--- minecraft\net\minecraft\src\TexturePackCustom.java Fri Mar 08 22:40:00 2013 ++++ minecraft_patched\net\minecraft\src\TexturePackCustom.java Fri Mar 08 22:41:28 2013 @@ -77,4 +77,9 @@ boolean var4 = this.func_98140_c("terrain.png") || this.func_98140_c("gui/items.png"); return !var4; @@ -213,8 +255,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TexturePackCustom.java minecraft_patche + } } diff -r -U 3 minecraft\net\minecraft\src\TexturePackDefault.java minecraft_patched\net\minecraft\src\TexturePackDefault.java ---- minecraft\net\minecraft\src\TexturePackDefault.java Sat Mar 02 03:07:07 2013 -+++ minecraft_patched\net\minecraft\src\TexturePackDefault.java Sat Mar 02 03:11:52 2013 +--- minecraft\net\minecraft\src\TexturePackDefault.java Fri Mar 08 22:40:00 2013 ++++ minecraft_patched\net\minecraft\src\TexturePackDefault.java Fri Mar 08 22:41:28 2013 @@ -33,4 +33,9 @@ return var2; } @@ -226,8 +268,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TexturePackDefault.java minecraft_patch + } } diff -r -U 3 minecraft\net\minecraft\src\TexturePackFolder.java minecraft_patched\net\minecraft\src\TexturePackFolder.java ---- minecraft\net\minecraft\src\TexturePackFolder.java Sat Mar 02 03:07:07 2013 -+++ minecraft_patched\net\minecraft\src\TexturePackFolder.java Sat Mar 02 03:11:52 2013 +--- minecraft\net\minecraft\src\TexturePackFolder.java Fri Mar 08 22:40:00 2013 ++++ minecraft_patched\net\minecraft\src\TexturePackFolder.java Fri Mar 08 22:41:28 2013 @@ -35,4 +35,9 @@ boolean var3 = this.func_98140_c("terrain.png") || this.func_98140_c("gui/items.png"); return var2 || !var3; @@ -239,8 +281,8 @@ diff -r -U 3 minecraft\net\minecraft\src\TexturePackFolder.java minecraft_patche + } } diff -r -U 3 minecraft\net\minecraft\src\ThreadedFileIOBase.java minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java ---- minecraft\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 02 03:07:07 2013 -+++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 02 03:08:49 2013 +--- minecraft\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 08 22:40:00 2013 ++++ minecraft_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 08 22:41:28 2013 @@ -20,7 +20,8 @@ } diff --git a/fml/conf/patches/minecraft_server_ff.patch b/fml/conf/patches/minecraft_server_ff.patch index 971ac6122..9e61f0cba 100644 --- a/fml/conf/patches/minecraft_server_ff.patch +++ b/fml/conf/patches/minecraft_server_ff.patch @@ -1,6 +1,6 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java ---- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java Sat Mar 02 03:08:22 2013 -+++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java Sat Mar 02 03:08:52 2013 +--- minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java Fri Mar 08 22:41:11 2013 ++++ minecraft_server_patched\net\minecraft\src\CallableSuspiciousClasses.java Fri Mar 08 22:41:30 2013 @@ -21,9 +21,14 @@ public String func_85085_a() { @@ -20,8 +20,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\CallableSuspiciousClasses.java m boolean var5 = !CrashReport.class.getCanonicalName().equals("net.minecraft.CrashReport"); HashMap var6 = new HashMap(); diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java ---- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Mar 02 03:08:22 2013 -+++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Sat Mar 02 03:08:52 2013 +--- minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.java Fri Mar 08 22:41:11 2013 ++++ minecraft_server_patched\net\minecraft\src\ComponentStrongholdRightTurn.java Fri Mar 08 22:41:30 2013 @@ -11,6 +11,10 @@ public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn { @@ -34,8 +34,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\ComponentStrongholdRightTurn.jav if(this.field_74885_f != 2 && this.field_74885_f != 3) { this.func_74989_b((ComponentStrongholdStairs2)p_74861_1_, p_74861_2_, p_74861_3_, 1, 1); diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_server_patched\net\minecraft\src\DedicatedServer.java ---- minecraft_server\net\minecraft\src\DedicatedServer.java Sat Mar 02 03:08:22 2013 -+++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Sat Mar 02 03:08:52 2013 +--- minecraft_server\net\minecraft\src\DedicatedServer.java Fri Mar 08 22:41:11 2013 ++++ minecraft_server_patched\net\minecraft\src\DedicatedServer.java Fri Mar 08 22:41:30 2013 @@ -207,7 +207,7 @@ System.exit(0); } @@ -46,8 +46,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\DedicatedServer.java minecraft_s this.func_71333_ah(); } diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java ---- minecraft_server\net\minecraft\src\EnumChatFormatting.java Sat Mar 02 03:08:23 2013 -+++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java Sat Mar 02 03:08:52 2013 +--- minecraft_server\net\minecraft\src\EnumChatFormatting.java Fri Mar 08 22:41:12 2013 ++++ minecraft_server_patched\net\minecraft\src\EnumChatFormatting.java Fri Mar 08 22:41:30 2013 @@ -38,7 +38,7 @@ private final String field_96304_B; @@ -58,8 +58,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\EnumChatFormatting.java minecraf private EnumChatFormatting(char p_i10001_3_, boolean p_i10001_4_) { diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_server_patched\net\minecraft\src\MemoryConnection.java ---- minecraft_server\net\minecraft\src\MemoryConnection.java Sat Mar 02 03:08:23 2013 -+++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java Sat Mar 02 03:11:02 2013 +--- minecraft_server\net\minecraft\src\MemoryConnection.java Fri Mar 08 22:41:12 2013 ++++ minecraft_server_patched\net\minecraft\src\MemoryConnection.java Fri Mar 08 22:41:30 2013 @@ -2,6 +2,8 @@ import java.net.InetSocketAddress; @@ -90,9 +90,51 @@ diff -r -U 3 minecraft_server\net\minecraft\src\MemoryConnection.java minecraft_ public void func_74425_a(NetHandler p_74425_1_) { this.field_74440_d = p_74425_1_; } +diff -r -U 3 minecraft_server\net\minecraft\src\RConThreadClient.java minecraft_server_patched\net\minecraft\src\RConThreadClient.java +--- minecraft_server\net\minecraft\src\RConThreadClient.java Fri Mar 08 22:41:13 2013 ++++ minecraft_server_patched\net\minecraft\src\RConThreadClient.java Fri Mar 08 22:44:07 2013 +@@ -32,8 +32,8 @@ + } + + public void run() { +- while(true) { +- try { ++ try { ++ while(true) { + if(!this.field_72619_a) { + break; + } +@@ -84,20 +84,14 @@ + continue; + } + } +- } catch (SocketTimeoutException var17) { +- break; +- } catch (IOException var18) { +- break; +- } catch (Exception var19) { +- System.out.println(var19); +- break; +- } finally { +- this.func_72653_g(); + } +- +- return; +- } +- ++ } catch (SocketTimeoutException var17) { ++ } catch (IOException var18) { ++ } catch (Exception var19) { ++ System.out.println(var19); ++ } finally { ++ this.func_72653_g(); ++ } + } + + private void func_72654_a(int p_72654_1_, int p_72654_2_, String p_72654_3_) throws IOException { diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_server_patched\net\minecraft\src\TcpMasterThread.java ---- minecraft_server\net\minecraft\src\TcpMasterThread.java Sat Mar 02 03:08:24 2013 -+++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Sat Mar 02 03:08:52 2013 +--- minecraft_server\net\minecraft\src\TcpMasterThread.java Fri Mar 08 22:41:13 2013 ++++ minecraft_server_patched\net\minecraft\src\TcpMasterThread.java Fri Mar 08 22:41:30 2013 @@ -11,6 +11,7 @@ this.field_74504_a = p_i3285_1_; } @@ -102,8 +144,8 @@ diff -r -U 3 minecraft_server\net\minecraft\src\TcpMasterThread.java minecraft_s try { Thread.sleep(5000L); diff -r -U 3 minecraft_server\net\minecraft\src\ThreadedFileIOBase.java minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java ---- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 02 03:08:24 2013 -+++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Sat Mar 02 03:08:52 2013 +--- minecraft_server\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 08 22:41:13 2013 ++++ minecraft_server_patched\net\minecraft\src\ThreadedFileIOBase.java Fri Mar 08 22:41:30 2013 @@ -20,7 +20,8 @@ } diff --git a/fml/conf/version.cfg b/fml/conf/version.cfg index 04c82c82b..ef3d107d5 100644 --- a/fml/conf/version.cfg +++ b/fml/conf/version.cfg @@ -1,4 +1,4 @@ [VERSION] -MCPVersion = 7.39 -ClientVersion = 13w09c -ServerVersion = 13w09c +MCPVersion = 7.42 +ClientVersion = 1.5 +ServerVersion = 1.5 diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg index 5d0970ceb..3bcb6f710 100644 --- a/fml/mc_versions.cfg +++ b/fml/mc_versions.cfg @@ -1,5 +1,5 @@ [default] -current_ver = s13w09c +current_ver = 1.5 base_url = http://s3.amazonaws.com/MinecraftDownload/ libraries = lwjgl.jar lwjgl_util.jar jinput.jar natives = windows_natives.jar macosx_natives.jar linux_natives.jar @@ -67,3 +67,12 @@ mcp_ver = 7.39 mcp_url = http://mcp.ocean-labs.de/files/archive/mcp739.zip mcp_md5 = cd4f6f5e6dd7032301aa98a9046201dd +[1.5] +client_url = http://assets.minecraft.net/1_5/minecraft.jar +server_url = http://assets.minecraft.net/1_5/minecraft_server.jar +client_md5 = d39baadeeb124a29b2542d778713493f +server_md5 = 22223b1d00b72cc51fdb8b7cdd45f9c1 +mcp_ver = 7.42 +mcp_url = http://mcp.ocean-labs.de/files/archive/mcp742.zip +mcp_md5 = f2ebdaa1540176507fd5448285cca324 + diff --git a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch index 17fc41116..c9f68e26c 100644 --- a/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch @@ -82,7 +82,7 @@ if (p_72494_1_.field_73438_a == Item.field_77744_bd.field_77779_bT) { ItemMap.func_77874_a(p_72494_1_.field_73436_b, this.field_72563_h.field_71441_e).func_76192_a(p_72494_1_.field_73437_c); -@@ -1437,6 +1452,11 @@ +@@ -1439,6 +1454,11 @@ public void func_72501_a(Packet250CustomPayload p_72501_1_) { @@ -94,7 +94,7 @@ if ("MC|TPack".equals(p_72501_1_.field_73630_a)) { String[] astring = (new String(p_72501_1_.field_73629_c)).split("\u0000"); -@@ -1604,4 +1624,20 @@ +@@ -1606,4 +1626,20 @@ { return this.field_72555_g; } diff --git a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch b/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch index 63fa79fb1..46678f44b 100644 --- a/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch +++ b/fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch @@ -7,7 +7,7 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.BufferedReader; -@@ -685,6 +686,7 @@ +@@ -691,6 +692,7 @@ public void func_74303_b() { diff --git a/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch b/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch index b4dcec10d..26940c731 100644 --- a/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch @@ -9,7 +9,7 @@ import net.minecraft.entity.boss.EntityDragon; import net.minecraft.entity.item.EntityBoat; import net.minecraft.entity.item.EntityEnderCrystal; -@@ -352,6 +354,14 @@ +@@ -354,6 +356,14 @@ this.field_73138_k = this.field_73132_a.field_70181_x; this.field_73135_l = this.field_73132_a.field_70179_y; @@ -24,7 +24,7 @@ if (this.field_73143_t && !(packet instanceof Packet24MobSpawn)) { p_73117_1_.field_71135_a.func_72567_b(new Packet28EntityVelocity(this.field_73132_a.field_70157_k, this.field_73132_a.field_70159_w, this.field_73132_a.field_70181_x, this.field_73132_a.field_70179_y)); -@@ -424,6 +434,13 @@ +@@ -426,6 +436,13 @@ if (this.field_73132_a.field_70128_L) { this.field_73132_a.field_70170_p.func_98180_V().func_98236_b("Fetching addPacket for removed entity"); diff --git a/fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch b/fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch index 95a134cb1..97b55a30a 100644 --- a/fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch +++ b/fml/patches/minecraft/net/minecraft/entity/monster/EntitySlime.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/entity/monster/EntitySlime.java +++ ../src-work/minecraft/net/minecraft/entity/monster/EntitySlime.java -@@ -242,7 +242,7 @@ +@@ -243,7 +243,7 @@ { Chunk chunk = this.field_70170_p.func_72938_d(MathHelper.func_76128_c(this.field_70165_t), MathHelper.func_76128_c(this.field_70161_v)); diff --git a/fml/patches/minecraft/net/minecraft/world/World.java.patch b/fml/patches/minecraft/net/minecraft/world/World.java.patch index 5670c2e4f..19398aa1a 100644 --- a/fml/patches/minecraft/net/minecraft/world/World.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/World.java.patch @@ -1,6 +1,6 @@ --- ../src-base/minecraft/net/minecraft/world/World.java +++ ../src-work/minecraft/net/minecraft/world/World.java -@@ -1806,13 +1806,14 @@ +@@ -1805,13 +1805,14 @@ } } @@ -16,7 +16,7 @@ this.field_72984_F.func_76318_c("pendingTileEntities"); -@@ -3605,7 +3606,7 @@ +@@ -3634,7 +3635,7 @@ @SideOnly(Side.CLIENT) public double func_72919_O() { diff --git a/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch b/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch index 01bbbf652..e8b2ab021 100644 --- a/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch +++ b/fml/patches/minecraft/net/minecraft/world/WorldProvider.java.patch @@ -23,7 +23,7 @@ } public boolean func_76566_a(int p_76566_1_, int p_76566_2_) -@@ -179,19 +171,19 @@ +@@ -178,19 +170,19 @@ public int func_76557_i() {