From da8fb7f8a0564224483d0b1cbfcdbcf0c9f7a900 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 28 Jun 2013 20:31:02 -0700 Subject: [PATCH] Update eclipse projects for new libraries dependancies, and update packages for new 1.6 classes. --- fml/conf/packages.csv | 217 ++++++++++++++++------- fml/eclipse-workspace-dev.zip | Bin 20746 -> 23133 bytes fml/install/eclipse/Minecraft/.classpath | 53 +++--- fml/install/eclipse/Minecraft/.project | 28 ++- fml/mc_versions.cfg | 4 +- fml/mcp_merge.cfg | 1 - 6 files changed, 208 insertions(+), 95 deletions(-) diff --git a/fml/conf/packages.csv b/fml/conf/packages.csv index 8646209f41..d28add9b19 100644 --- a/fml/conf/packages.csv +++ b/fml/conf/packages.csv @@ -13,12 +13,13 @@ BlockButtonStone,net/minecraft/block BlockButtonWood,net/minecraft/block BlockCactus,net/minecraft/block BlockCake,net/minecraft/block +BlockCarpet,net/minecraft/block BlockCarrot,net/minecraft/block BlockCauldron,net/minecraft/block BlockChest,net/minecraft/block BlockClay,net/minecraft/block -BlockCloth,net/minecraft/block BlockCocoa,net/minecraft/block +BlockColored,net/minecraft/block BlockCommandBlock,net/minecraft/block BlockComparator,net/minecraft/block BlockContainer,net/minecraft/block @@ -51,6 +52,7 @@ BlockGlowStone,net/minecraft/block BlockGrass,net/minecraft/block BlockGravel,net/minecraft/block BlockHalfSlab,net/minecraft/block +BlockHay,net/minecraft/block BlockHopper,net/minecraft/block BlockIce,net/minecraft/block BlockJukeBox,net/minecraft/block @@ -93,6 +95,7 @@ BlockRedstoneRepeater,net/minecraft/block BlockRedstoneTorch,net/minecraft/block BlockRedstoneWire,net/minecraft/block BlockReed,net/minecraft/block +BlockRotatedPillar,net/minecraft/block BlockSand,net/minecraft/block BlockSandStone,net/minecraft/block BlockSapling,net/minecraft/block @@ -141,28 +144,23 @@ CallableClientMemoryStats,net/minecraft/client CallableClientProfiler,net/minecraft/client CallableGLInfo,net/minecraft/client CallableLWJGLVersion,net/minecraft/client +CallableLaunchedVersion,net/minecraft/client CallableModded,net/minecraft/client +CallableParticleScreenName,net/minecraft/client CallableTexturePack,net/minecraft/client -CallableTickingScreenName,net/minecraft/client CallableType2,net/minecraft/client CallableUpdatingScreenName,net/minecraft/client -CanvasCrashReport,net/minecraft/client -CanvasMinecraftApplet,net/minecraft/client -CanvasMojangLogo,net/minecraft/client -EnumOSHelper,net/minecraft/client -GameWindowListener,net/minecraft/client -MinecraftAppletImpl,net/minecraft/client -MinecraftFakeLauncher,net/minecraft/client -PanelCrashReport,net/minecraft/client +Minecraft,net/minecraft/client StatStringFormatKeyInv,net/minecraft/client ThreadClientSleep,net/minecraft/client -ThreadShutdown,net/minecraft/client -CodecMus,net/minecraft/client/audio -MusInputStream,net/minecraft/client/audio ScheduledSound,net/minecraft/client/audio SoundManager,net/minecraft/client/audio +SoundManagerINNER1,net/minecraft/client/audio SoundPool,net/minecraft/client/audio SoundPoolEntry,net/minecraft/client/audio +SoundPoolProtocolHandler,net/minecraft/client/audio +SoundPoolURLConnection,net/minecraft/client/audio +AbstractClientPlayer,net/minecraft/client/entity EntityClientPlayerMP,net/minecraft/client/entity EntityOtherPlayerMP,net/minecraft/client/entity EntityPlayerSP,net/minecraft/client/entity @@ -201,9 +199,7 @@ GuiMerchant,net/minecraft/client/gui GuiMultiplayer,net/minecraft/client/gui GuiNewChat,net/minecraft/client/gui GuiOptions,net/minecraft/client/gui -GuiParticle,net/minecraft/client/gui GuiPlayerInfo,net/minecraft/client/gui -GuiProgress,net/minecraft/client/gui GuiRenameWorld,net/minecraft/client/gui GuiRepair,net/minecraft/client/gui GuiScreen,net/minecraft/client/gui @@ -211,7 +207,6 @@ GuiScreenAddServer,net/minecraft/client/gui GuiScreenBook,net/minecraft/client/gui GuiScreenConfigureWorld,net/minecraft/client/gui GuiScreenConfirmation,net/minecraft/client/gui -GuiScreenCreateOnlineWorld,net/minecraft/client/gui GuiScreenDemo,net/minecraft/client/gui GuiScreenDisconnectedOnline,net/minecraft/client/gui GuiScreenEditOnlineWorld,net/minecraft/client/gui @@ -219,7 +214,6 @@ GuiScreenInvite,net/minecraft/client/gui GuiScreenLongRunningTask,net/minecraft/client/gui GuiScreenOnlineServers,net/minecraft/client/gui GuiScreenOnlineServersSubscreen,net/minecraft/client/gui -GuiScreenResetWorld,net/minecraft/client/gui GuiScreenSelectLocation,net/minecraft/client/gui GuiScreenServerList,net/minecraft/client/gui GuiScreenSubscription,net/minecraft/client/gui @@ -241,7 +235,6 @@ GuiWorldSlot,net/minecraft/client/gui GuiYesNo,net/minecraft/client/gui LoadingScreenRenderer,net/minecraft/client/gui MapItemRenderer,net/minecraft/client/gui -Particle,net/minecraft/client/gui RunnableTitleScreen,net/minecraft/client/gui ScaledResolution,net/minecraft/client/gui ScreenChatOptions,net/minecraft/client/gui @@ -249,13 +242,10 @@ SelectionListBase,net/minecraft/client/gui SelectionListInvited,net/minecraft/client/gui TaskLongRunning,net/minecraft/client/gui TaskOnlineConnect,net/minecraft/client/gui -TaskResetWorld,net/minecraft/client/gui -TaskWorldCreation,net/minecraft/client/gui ThreadConnectToOnlineServer,net/minecraft/client/gui ThreadOnlineConnect,net/minecraft/client/gui ThreadOnlineScreen,net/minecraft/client/gui ThreadPollServers,net/minecraft/client/gui -ThreadTitleScreen,net/minecraft/client/gui GuiAchievement,net/minecraft/client/gui/achievement GuiAchievements,net/minecraft/client/gui/achievement GuiSlotStats,net/minecraft/client/gui/achievement @@ -281,28 +271,50 @@ GuiDispenser,net/minecraft/client/gui/inventory GuiEditSign,net/minecraft/client/gui/inventory GuiFurnace,net/minecraft/client/gui/inventory GuiInventory,net/minecraft/client/gui/inventory +GuiScreenHorseInventory,net/minecraft/client/gui/inventory SlotCreativeInventory,net/minecraft/client/gui/inventory +GuiScreenBackup,net/minecraft/client/gui/mco +GuiScreenBackupDownloadThread,net/minecraft/client/gui/mco +GuiScreenBackupRestoreTask,net/minecraft/client/gui/mco +GuiScreenBackupSelectionList,net/minecraft/client/gui/mco +GuiScreenCreateOnlineWorld,net/minecraft/client/gui/mco +GuiScreenMcoWorldTemplate,net/minecraft/client/gui/mco +GuiScreenMcoWorldTemplateDownloadThread,net/minecraft/client/gui/mco +GuiScreenMcoWorldTemplateSelectionList,net/minecraft/client/gui/mco +GuiScreenPendingInvitation,net/minecraft/client/gui/mco +GuiScreenPendingInvitationINNER1,net/minecraft/client/gui/mco +GuiScreenPendingInvitationINNER2,net/minecraft/client/gui/mco +GuiScreenPendingInvitationINNER3,net/minecraft/client/gui/mco +GuiScreenPendingInvitationList,net/minecraft/client/gui/mco +GuiScreenResetWorld,net/minecraft/client/gui/mco +ScreenWithCallback,net/minecraft/client/gui/mco +TaskResetWorld,net/minecraft/client/gui/mco +TaskWorldCreation,net/minecraft/client/gui/mco +MainProxyAuthenticator,net/minecraft/client/main +MainShutdownHook,net/minecraft/client/main +Backup,net/minecraft/client/mco +BackupList,net/minecraft/client/mco ExceptionMcoHttp,net/minecraft/client/mco ExceptionMcoService,net/minecraft/client/mco ExceptionRetryCall,net/minecraft/client/mco McoClient,net/minecraft/client/mco -McoOption,net/minecraft/client/mco -McoOptionNone,net/minecraft/client/mco -McoOptionSome,net/minecraft/client/mco -McoPair,net/minecraft/client/mco McoServer,net/minecraft/client/mco McoServerAddress,net/minecraft/client/mco McoServerList,net/minecraft/client/mco -McoServerListINNER1,net/minecraft/client/mco +McoServerListEmptyAnon,net/minecraft/client/mco +McoServerListUpdateThread,net/minecraft/client/mco +McoServerListUpdateThreadComparer,net/minecraft/client/mco +PendingInvite,net/minecraft/client/mco +PendingInvitesList,net/minecraft/client/mco Request,net/minecraft/client/mco RequestDelete,net/minecraft/client/mco RequestGet,net/minecraft/client/mco RequestPost,net/minecraft/client/mco RequestPut,net/minecraft/client/mco -TimerTaskMcoServerListUpdate,net/minecraft/client/mco -TimerTaskMcoServerListUpdateComparator,net/minecraft/client/mco ValueObjectList,net/minecraft/client/mco ValueObjectSubscription,net/minecraft/client/mco +WorldTemplate,net/minecraft/client/mco +WorldTemplateList,net/minecraft/client/mco ModelBase,net/minecraft/client/model ModelBat,net/minecraft/client/model ModelBiped,net/minecraft/client/model @@ -318,8 +330,10 @@ ModelDragon,net/minecraft/client/model ModelEnderCrystal,net/minecraft/client/model ModelEnderman,net/minecraft/client/model ModelGhast,net/minecraft/client/model +ModelHorse,net/minecraft/client/model ModelIronGolem,net/minecraft/client/model ModelLargeChest,net/minecraft/client/model +ModelLeashKnot,net/minecraft/client/model ModelMagmaCube,net/minecraft/client/model ModelMinecart,net/minecraft/client/model ModelOcelot,net/minecraft/client/model @@ -352,7 +366,6 @@ GuiConnecting,net/minecraft/client/multiplayer LanServer,net/minecraft/client/multiplayer LanServerList,net/minecraft/client/multiplayer NetClientHandler,net/minecraft/client/multiplayer -NetClientWebTextures,net/minecraft/client/multiplayer PlayerControllerMP,net/minecraft/client/multiplayer ServerAddress,net/minecraft/client/multiplayer ServerData,net/minecraft/client/multiplayer @@ -392,10 +405,13 @@ EntitySnowShovelFX,net/minecraft/client/particle EntitySpellParticleFX,net/minecraft/client/particle EntitySplashFX,net/minecraft/client/particle EntitySuspendFX,net/minecraft/client/particle +RenderCaveSpider,net/minecraft/client/render/entity +RenderHorse,net/minecraft/client/render/entity +RenderLeashKnot,net/minecraft/client/render/entity +RendererLivingEntity,net/minecraft/client/render/entity ActiveRenderInfo,net/minecraft/client/renderer CallableMouseLocation,net/minecraft/client/renderer CallableParticlePositionInfo,net/minecraft/client/renderer -CallableParticleScreenName,net/minecraft/client/renderer CallableScreenName,net/minecraft/client/renderer CallableScreenSize,net/minecraft/client/renderer ChestItemRenderHelper,net/minecraft/client/renderer @@ -411,15 +427,14 @@ ItemRenderer,net/minecraft/client/renderer OpenGlCapsChecker,net/minecraft/client/renderer OpenGlHelper,net/minecraft/client/renderer RenderBlocks,net/minecraft/client/renderer -RenderEngine,net/minecraft/client/renderer RenderGlobal,net/minecraft/client/renderer RenderHelper,net/minecraft/client/renderer RenderList,net/minecraft/client/renderer RenderSorter,net/minecraft/client/renderer StitcherException,net/minecraft/client/renderer Tessellator,net/minecraft/client/renderer -ThreadDownloadImage,net/minecraft/client/renderer ThreadDownloadImageData,net/minecraft/client/renderer +ThreadDownloadImageDataINNER1,net/minecraft/client/renderer WorldRenderer,net/minecraft/client/renderer ClippingHelper,net/minecraft/client/renderer/culling ClippingHelperImpl,net/minecraft/client/renderer/culling @@ -471,17 +486,24 @@ RenderWither,net/minecraft/client/renderer/entity RenderWolf,net/minecraft/client/renderer/entity RenderXPOrb,net/minecraft/client/renderer/entity RenderZombie,net/minecraft/client/renderer/entity +AbstractTexture,net/minecraft/client/renderer/texture +DynamicTexture,net/minecraft/client/renderer/texture IconRegister,net/minecraft/client/renderer/texture -Rect2i,net/minecraft/client/renderer/texture +LayeredTexture,net/minecraft/client/renderer/texture +SimpleTexture,net/minecraft/client/renderer/texture StitchHolder,net/minecraft/client/renderer/texture StitchSlot,net/minecraft/client/renderer/texture Stitcher,net/minecraft/client/renderer/texture -Texture,net/minecraft/client/renderer/texture +TextureAtlasSprite,net/minecraft/client/renderer/texture TextureClock,net/minecraft/client/renderer/texture TextureCompass,net/minecraft/client/renderer/texture TextureManager,net/minecraft/client/renderer/texture +TextureManagerINNER1,net/minecraft/client/renderer/texture TextureMap,net/minecraft/client/renderer/texture -TextureStitched,net/minecraft/client/renderer/texture +TextureObject,net/minecraft/client/renderer/texture +TextureUtil,net/minecraft/client/renderer/texture +Tickable,net/minecraft/client/renderer/texture +TickableTextureObject,net/minecraft/client/renderer/texture RenderEndPortal,net/minecraft/client/renderer/tileentity RenderEnderCrystal,net/minecraft/client/renderer/tileentity RenderItemFrame,net/minecraft/client/renderer/tileentity @@ -495,20 +517,55 @@ TileEntityRendererPiston,net/minecraft/client/renderer/tileentity TileEntitySignRenderer,net/minecraft/client/renderer/tileentity TileEntitySkullRenderer,net/minecraft/client/renderer/tileentity TileEntitySpecialRenderer,net/minecraft/client/renderer/tileentity +AbstractResourcePack,net/minecraft/client/resources +DefaultResourcePack,net/minecraft/client/resources +FallbackResourceManager,net/minecraft/client/resources +FileResourcePack,net/minecraft/client/resources +FolderResourcePack,net/minecraft/client/resources +FolderResourcePackFilter,net/minecraft/client/resources +FoliageColorReloadListener,net/minecraft/client/resources +GrassColorReloadListener,net/minecraft/client/resources +GuiScreenTemporaryResourcePackSelect,net/minecraft/client/resources +GuiScreenTemporaryResourcePackSelectSelectionList,net/minecraft/client/resources +I18n,net/minecraft/client/resources +Language,net/minecraft/client/resources +LanguageManager,net/minecraft/client/resources +Locale,net/minecraft/client/resources +ReloadableResourceManager,net/minecraft/client/resources +Resource,net/minecraft/client/resources +ResourceLocation,net/minecraft/client/resources +ResourceManager,net/minecraft/client/resources +ResourceManagerReloadListener,net/minecraft/client/resources +ResourcePack,net/minecraft/client/resources +ResourcePackFileNotFoundException,net/minecraft/client/resources +ResourcePackRepository,net/minecraft/client/resources +ResourcePackRepositoryEntry,net/minecraft/client/resources +ResourcePackRepositoryFilter,net/minecraft/client/resources +SimpleReloadableResourceManager,net/minecraft/client/resources +SimpleReloadableResourceManagerINNER1,net/minecraft/client/resources +SimpleResource,net/minecraft/client/resources +AnimationFrame,net/minecraft/client/resources/data +AnimationMetadataSection,net/minecraft/client/resources/data +AnimationMetadataSectionSerializer,net/minecraft/client/resources/data +BaseMetadataSectionSerializer,net/minecraft/client/resources/data +FontMetadataSection,net/minecraft/client/resources/data +FontMetadataSectionSerializer,net/minecraft/client/resources/data +LanguageMetadataSection,net/minecraft/client/resources/data +LanguageMetadataSectionSerializer,net/minecraft/client/resources/data +MetadataSection,net/minecraft/client/resources/data +MetadataSectionSerializer,net/minecraft/client/resources/data +MetadataSerializer,net/minecraft/client/resources/data +MetadataSerializerEmptyAnon,net/minecraft/client/resources/data +MetadataSerializerRegistration,net/minecraft/client/resources/data +PackMetadataSection,net/minecraft/client/resources/data +PackMetadataSectionSerializer,net/minecraft/client/resources/data +TextureMetadataSection,net/minecraft/client/resources/data +TextureMetadataSectionSerializer,net/minecraft/client/resources/data EnumOptions,net/minecraft/client/settings EnumOptionsHelper,net/minecraft/client/settings GameSettings,net/minecraft/client/settings KeyBinding,net/minecraft/client/settings StatPlaceholder,net/minecraft/client/stats -GuiTexturePackSlot,net/minecraft/client/texturepacks -GuiTexturePacks,net/minecraft/client/texturepacks -ITexturePack,net/minecraft/client/texturepacks -TexturePackCustom,net/minecraft/client/texturepacks -TexturePackDefault,net/minecraft/client/texturepacks -TexturePackDownloadSuccess,net/minecraft/client/texturepacks -TexturePackFolder,net/minecraft/client/texturepacks -TexturePackImplementation,net/minecraft/client/texturepacks -TexturePackList,net/minecraft/client/texturepacks CommandBase,net/minecraft/command CommandClearInventory,net/minecraft/command CommandDebug,net/minecraft/command @@ -545,6 +602,8 @@ CommandServerTp,net/minecraft/command CommandServerWhitelist,net/minecraft/command CommandSetSpawnpoint,net/minecraft/command CommandShowSeed,net/minecraft/command +CommandSpreadPlayers,net/minecraft/command +CommandSpreadPlayersPosition,net/minecraft/command CommandTime,net/minecraft/command CommandToggleDownfall,net/minecraft/command CommandWeather,net/minecraft/command @@ -643,12 +702,6 @@ EnchantmentUntouching,net/minecraft/enchantment EnchantmentWaterWorker,net/minecraft/enchantment EnumEnchantmentType,net/minecraft/enchantment IEnchantmentModifier,net/minecraft/enchantment -CallableEffectAmplifier,net/minecraft/entity -CallableEffectDuration,net/minecraft/entity -CallableEffectID,net/minecraft/entity -CallableEffectIsAmbient,net/minecraft/entity -CallableEffectIsSplash,net/minecraft/entity -CallableEffectName,net/minecraft/entity CallableEntityName,net/minecraft/entity CallableEntityTracker,net/minecraft/entity CallableEntityType,net/minecraft/entity @@ -660,8 +713,12 @@ EntityCreature,net/minecraft/entity EntityEggInfo,net/minecraft/entity EntityFlying,net/minecraft/entity EntityHanging,net/minecraft/entity +EntityLeashKnot,net/minecraft/entity EntityList,net/minecraft/entity EntityLiving,net/minecraft/entity +EntityLivingBase,net/minecraft/entity +EntityLivingData,net/minecraft/entity +EntityOwnable,net/minecraft/entity EntitySelectorArmoredMob,net/minecraft/entity EntityTracker,net/minecraft/entity EntityTrackerEntry,net/minecraft/entity @@ -675,6 +732,8 @@ INpc,net/minecraft/entity IProjectile,net/minecraft/entity IRangedAttackMob,net/minecraft/entity NpcMerchant,net/minecraft/entity +SharedMonsterAttributes,net/minecraft/entity +SpiderEffectsGroupData,net/minecraft/entity WatchableObject,net/minecraft/entity EntityAIArrowAttack,net/minecraft/entity/ai EntityAIAttackOnCollide,net/minecraft/entity/ai @@ -703,6 +762,7 @@ EntityAIMoveThroughVillage,net/minecraft/entity/ai EntityAIMoveTowardsTarget,net/minecraft/entity/ai EntityAIMoveTwardsRestriction,net/minecraft/entity/ai EntityAINearestAttackableTarget,net/minecraft/entity/ai +EntityAINearestAttackableTargetSelector,net/minecraft/entity/ai EntityAINearestAttackableTargetSorter,net/minecraft/entity/ai EntityAIOcelotAttack,net/minecraft/entity/ai EntityAIOcelotSit,net/minecraft/entity/ai @@ -713,6 +773,7 @@ EntityAIPanic,net/minecraft/entity/ai EntityAIPlay,net/minecraft/entity/ai EntityAIRestrictOpenDoor,net/minecraft/entity/ai EntityAIRestrictSun,net/minecraft/entity/ai +EntityAIRunAroundLikeCrazy,net/minecraft/entity/ai EntityAISit,net/minecraft/entity/ai EntityAISwimming,net/minecraft/entity/ai EntityAITarget,net/minecraft/entity/ai @@ -732,6 +793,16 @@ EntityMinecartMobSpawnerLogic,net/minecraft/entity/ai EntityMoveHelper,net/minecraft/entity/ai EntitySenses,net/minecraft/entity/ai RandomPositionGenerator,net/minecraft/entity/ai +Attribute,net/minecraft/entity/ai/attributes +AttributeInstance,net/minecraft/entity/ai/attributes +AttributeModifier,net/minecraft/entity/ai/attributes +BaseAttribute,net/minecraft/entity/ai/attributes +BaseAttributeMap,net/minecraft/entity/ai/attributes +ClientsideAttributeMap,net/minecraft/entity/ai/attributes +ModifiableAttributeInstance,net/minecraft/entity/ai/attributes +RangedAttribute,net/minecraft/entity/ai/attributes +ReadonlyAttributeInstance,net/minecraft/entity/ai/attributes +ServersideAttributeMap,net/minecraft/entity/ai/attributes BossStatus,net/minecraft/entity/boss EntityDragon,net/minecraft/entity/boss EntityDragonPart,net/minecraft/entity/boss @@ -786,6 +857,9 @@ EntityAnimal,net/minecraft/entity/passive EntityBat,net/minecraft/entity/passive EntityChicken,net/minecraft/entity/passive EntityCow,net/minecraft/entity/passive +EntityHorse,net/minecraft/entity/passive +EntityHorseBredSelector,net/minecraft/entity/passive +EntityHorseGroupData,net/minecraft/entity/passive EntityMooshroom,net/minecraft/entity/passive EntityOcelot,net/minecraft/entity/passive EntityPig,net/minecraft/entity/passive @@ -823,6 +897,8 @@ ContainerHopper,net/minecraft/inventory ContainerMerchant,net/minecraft/inventory ContainerPlayer,net/minecraft/inventory ContainerRepair,net/minecraft/inventory +ContainerRepairINNER1,net/minecraft/inventory +ContainerRepairINNER2,net/minecraft/inventory ContainerWorkbench,net/minecraft/inventory ICrafting,net/minecraft/inventory IInvBasic,net/minecraft/inventory @@ -834,7 +910,6 @@ InventoryCrafting,net/minecraft/inventory InventoryEnderChest,net/minecraft/inventory InventoryLargeChest,net/minecraft/inventory InventoryMerchant,net/minecraft/inventory -InventoryRepair,net/minecraft/inventory Slot,net/minecraft/inventory SlotArmor,net/minecraft/inventory SlotBeacon,net/minecraft/inventory @@ -845,7 +920,10 @@ SlotEnchantment,net/minecraft/inventory SlotEnchantmentTable,net/minecraft/inventory SlotFurnace,net/minecraft/inventory SlotMerchantResult,net/minecraft/inventory -SlotRepair,net/minecraft/inventory +AnimalChest,net/minecraft/inventroy +ContainerHorseInventory,net/minecraft/inventroy +ContainerHorseInventorySlotArmor,net/minecraft/inventroy +ContainerHorseInventorySlotSaddle,net/minecraft/inventroy BehaviorDispenseArmor,net/minecraft/item BehaviorDispenseMinecart,net/minecraft/item EnumAction,net/minecraft/item @@ -888,6 +966,7 @@ ItemGlassBottle,net/minecraft/item ItemHangingEntity,net/minecraft/item ItemHoe,net/minecraft/item ItemInWorldManager,net/minecraft/item +ItemLeash,net/minecraft/item ItemLeaves,net/minecraft/item ItemLilyPad,net/minecraft/item ItemMap,net/minecraft/item @@ -895,6 +974,7 @@ ItemMapBase,net/minecraft/item ItemMinecart,net/minecraft/item ItemMonsterPlacer,net/minecraft/item ItemMultiTextureTile,net/minecraft/item +ItemNameTag,net/minecraft/item ItemPickaxe,net/minecraft/item ItemPiston,net/minecraft/item ItemPotion,net/minecraft/item @@ -936,7 +1016,7 @@ ShapedRecipes,net/minecraft/item/crafting ShapelessRecipes,net/minecraft/item/crafting ILogAgent,net/minecraft/logging LogAgent,net/minecraft/logging -LogAgentINNER1,net/minecraft/logging +LogAgentEmptyAnon,net/minecraft/logging LogFormatter,net/minecraft/logging CallableTagCompound1,net/minecraft/nbt CallableTagCompound2,net/minecraft/nbt @@ -954,6 +1034,7 @@ NBTTagList,net/minecraft/nbt NBTTagLong,net/minecraft/nbt NBTTagShort,net/minecraft/nbt NBTTagString,net/minecraft/nbt +CallableConnectionName,net/minecraft/network CallablePacketClass,net/minecraft/network CallablePacketID,net/minecraft/network INetworkManager,net/minecraft/network @@ -1014,6 +1095,7 @@ Packet254ServerPing,net/minecraft/network/packet Packet255KickDisconnect,net/minecraft/network/packet Packet25EntityPainting,net/minecraft/network/packet Packet26EntityExpOrb,net/minecraft/network/packet +Packet27PlayerInput,net/minecraft/network/packet Packet28EntityVelocity,net/minecraft/network/packet Packet29DestroyEntity,net/minecraft/network/packet Packet2ClientProtocol,net/minecraft/network/packet @@ -1030,6 +1112,7 @@ Packet40EntityMetadata,net/minecraft/network/packet Packet41EntityEffect,net/minecraft/network/packet Packet42RemoveEntityEffect,net/minecraft/network/packet Packet43Experience,net/minecraft/network/packet +Packet44UpdateAttributes,net/minecraft/network/packet Packet4UpdateTime,net/minecraft/network/packet Packet51MapChunk,net/minecraft/network/packet Packet51MapChunkData,net/minecraft/network/packet @@ -1065,8 +1148,11 @@ PathFinder,net/minecraft/pathfinding PathNavigate,net/minecraft/pathfinding PathPoint,net/minecraft/pathfinding Potion,net/minecraft/potion +PotionAbsoption,net/minecraft/potion +PotionAttackDamage,net/minecraft/potion PotionEffect,net/minecraft/potion PotionHealth,net/minecraft/potion +PotionHealthBoost,net/minecraft/potion PotionHelper,net/minecraft/potion IPlayerUsage,net/minecraft/profiler PlayerUsageSnooper,net/minecraft/profiler @@ -1100,16 +1186,16 @@ DedicatedServerCommandThread,net/minecraft/server/dedicated DedicatedServerListenThread,net/minecraft/server/dedicated DedicatedServerSleepThread,net/minecraft/server/dedicated PropertyManager,net/minecraft/server/dedicated -GuiLogFormatter,net/minecraft/server/gui -GuiLogOutputHandler,net/minecraft/server/gui -GuiStatsComponent,net/minecraft/server/gui -GuiStatsListener,net/minecraft/server/gui IUpdatePlayerListBox,net/minecraft/server/gui -PlayerListBox,net/minecraft/server/gui -ServerGUI,net/minecraft/server/gui -ServerGuiCommandListener,net/minecraft/server/gui -ServerGuiFocusAdapter,net/minecraft/server/gui -ServerWindowAdapter,net/minecraft/server/gui +MinecraftServerGui,net/minecraft/server/gui +MinecraftServerGuiINNER1,net/minecraft/server/gui +MinecraftServerGuiINNER2,net/minecraft/server/gui +MinecraftServerGuiINNER3,net/minecraft/server/gui +PlayerListComponent,net/minecraft/server/gui +StatsComponent,net/minecraft/server/gui +StatsComponentINNER1,net/minecraft/server/gui +TextAreaLogHandler,net/minecraft/server/gui +TextAreaLogHandlerINNER1,net/minecraft/server/gui CallableIsModded,net/minecraft/server/integrated CallableType3,net/minecraft/server/integrated IntegratedPlayerList,net/minecraft/server/integrated @@ -1133,6 +1219,7 @@ StatCrafting,net/minecraft/stats StatFileWriter,net/minecraft/stats StatList,net/minecraft/stats StatTypeDistance,net/minecraft/stats +StatTypeFloat,net/minecraft/stats StatTypeSimple,net/minecraft/stats StatTypeTime,net/minecraft/stats StatsSyncher,net/minecraft/stats @@ -1169,6 +1256,7 @@ AABBLocalPool,net/minecraft/util AABBPool,net/minecraft/util AxisAlignedBB,net/minecraft/util ChatAllowedCharacters,net/minecraft/util +ChatMessageComponent,net/minecraft/util ChunkCoordinates,net/minecraft/util CombatEntry,net/minecraft/util CombatTracker,net/minecraft/util @@ -1186,8 +1274,6 @@ EnumOS,net/minecraft/util Facing,net/minecraft/util FoodStats,net/minecraft/util HttpUtil,net/minecraft/util -HttpUtilRunnable,net/minecraft/util -IDownloadSuccess,net/minecraft/util IProgressUpdate,net/minecraft/util Icon,net/minecraft/util IntHashMap,net/minecraft/util @@ -1196,6 +1282,7 @@ LongHashMap,net/minecraft/util LongHashMapEntry,net/minecraft/util MD5String,net/minecraft/util MathHelper,net/minecraft/util +MessageComponentSerializer,net/minecraft/util MinecraftError,net/minecraft/util MouseFilter,net/minecraft/util MouseHelper,net/minecraft/util @@ -1208,9 +1295,9 @@ Session,net/minecraft/util StatCollector,net/minecraft/util StringTranslate,net/minecraft/util StringUtils,net/minecraft/util -ThreadDownloadResources,net/minecraft/util Timer,net/minecraft/util Tuple,net/minecraft/util +Util,net/minecraft/util ValueObject,net/minecraft/util Vec3,net/minecraft/util Vec3Pool,net/minecraft/util diff --git a/fml/eclipse-workspace-dev.zip b/fml/eclipse-workspace-dev.zip index dd8d91bdd151605f5494dbc265c8c085a84004b5..7fa77305b78adb3035de64bce4027678404172fa 100644 GIT binary patch literal 23133 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 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/fml/install/eclipse/Minecraft/.project b/fml/install/eclipse/Minecraft/.project index 09eaf1ace8..06690cb49c 100644 --- a/fml/install/eclipse/Minecraft/.project +++ b/fml/install/eclipse/Minecraft/.project @@ -33,18 +33,36 @@ - 1307293455427 + 1372126392133 jars 13 org.eclipse.ui.ide.multiFilter - 1.0-name-matches-false-false-bin + 1.0-name-matches-false-false-libraries - 1307293504507 - jars/bin - 5 + 1372126392135 + jars + 13 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-versions + + + + 1372126392137 + jars + 26 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-false-false-natives + + + + 1372126425043 + jars/libraries + 21 org.eclipse.ui.ide.multiFilter 1.0-name-matches-false-false-*.jar diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg index b9df0c229a..3deed1956e 100644 --- a/fml/mc_versions.cfg +++ b/fml/mc_versions.cfg @@ -97,6 +97,6 @@ mcp_md5 = a8c68db8736227c9e26cbcb0995e5b71 [1.6] client_md5 = 6a64a2136e3a3fe4d29b0a0df30b25fc server_md5 = 7c03305c8bf97a8e8f3cdb147fc90607 -mcp_ver = 7.98 +mcp_ver = 8.01 mcp_url = -mcp_md5 = e2ecc18dc6907dcb63bf5506f9d137d9 +mcp_md5 = 39da81bbb4d73b3f5e2d1f8f5682cdb9 diff --git a/fml/mcp_merge.cfg b/fml/mcp_merge.cfg index 3966cae0ed..5324af656a 100644 --- a/fml/mcp_merge.cfg +++ b/fml/mcp_merge.cfg @@ -1,4 +1,3 @@ -!bjy #net/minecraft/src/CodecMus ^org/bouncycastle ^org/apache ^com/google