diff --git a/fml/commands.patch b/fml/commands.patch index b831599a8..46f314adc 100644 --- a/fml/commands.patch +++ b/fml/commands.patch @@ -9,26 +9,7 @@ if not sys.platform.startswith('win'): if os.path.exists(path): shutil.rmtree(path) -@@ -584,6 +586,9 @@ - self.has_astyle_cfg = False - if os.path.isfile(self.astyleconf): - self.has_astyle_cfg = True -+ -+ #FML Entries -+ self.srcshared = os.path.normpath(os.path.join(self.dirsrc, 'common')) - - def creatergcfg(self, reobf=False, keep_lvt=False, keep_generics=False, rg_update=False): - """Create the files necessary for RetroGuard""" -@@ -781,13 +786,16 @@ - testlk = {CLIENT: self.testclient, SERVER: self.testserver} - - if not os.path.exists(os.path.join(srclk[side], os.path.normpath(testlk[side] + '.java'))): -- return False -+ if not os.path.exists(os.path.join(self.srcshared, os.path.normpath(testlk[side] + '.java'))): -+ return False - return True - - def checkbins(self, side): +@@ -788,6 +790,8 @@ binlk = {CLIENT: self.binclient, SERVER: self.binserver} testlk = {CLIENT: self.testclient, SERVER: self.testserver} @@ -37,7 +18,7 @@ if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))): return False return True -@@ -1029,6 +1037,10 @@ +@@ -1029,6 +1033,10 @@ pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog} @@ -48,33 +29,16 @@ if not os.path.exists(pathbinlk[side]): os.makedirs(pathbinlk[side]) -@@ -1041,6 +1053,7 @@ - all_files = True - append_pattern = False - pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files) -+ pkglist = pkglist + filterdirs(self.srcshared, '*.java', append_pattern=append_pattern, all_files=all_files) #FML, Add Common folder - dirs = ' '.join(pkglist) - classpath = os.pathsep.join(cplk[side]) - forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side], -@@ -1062,7 +1075,7 @@ +@@ -1062,7 +1070,7 @@ raise def startserver(self): - classpath = [self.binserver] + self.cpathserver -+ classpath = [self.binclient, self.srcshared] + self.cpathserver ++ classpath = [self.binclient] + self.cpathserver classpath = [os.path.join('..', p) for p in classpath] classpath = os.pathsep.join(classpath) os.chdir(self.dirjars) -@@ -1070,7 +1083,7 @@ - self.runmc(forkcmd) - - def startclient(self): -- classpath = [self.binclient] + self.cpathclient -+ classpath = [self.binclient, self.srcshared] + self.cpathclient - classpath = [os.path.join('..', p) for p in classpath] - classpath = os.pathsep.join(classpath) - natives = os.path.join('..', self.dirnatives) -@@ -1197,20 +1210,20 @@ +@@ -1197,20 +1205,20 @@ with open(self.csvmethods, 'rb') as fh: methodsreader = csv.DictReader(fh) for row in methodsreader: @@ -98,56 +62,7 @@ names['params'][row['param']] = row['name'] regexps = { -@@ -1240,6 +1253,11 @@ - - # HINT: We pathwalk the sources - for path, _, filelist in os.walk(pathsrclk[side], followlinks=True): -+ for cur_file in fnmatch.filter(filelist, '*.java'): -+ updatefile(os.path.normpath(os.path.join(path, cur_file))) -+ -+ # FML, copy of the above, for the common folder -+ for path, _, filelist in os.walk(self.srcshared, followlinks=True): - for cur_file in fnmatch.filter(filelist, '*.java'): - updatefile(os.path.normpath(os.path.join(path, cur_file))) - return True -@@ -1322,12 +1340,14 @@ - pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} - - strip_comments(pathsrclk[side]) -+ strip_comments(self.srcshared) - - def process_cleanup(self, side): - """Do lots of random cleanups including stripping comments, trailing whitespace and extra blank lines""" - pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver} - - src_cleanup(pathsrclk[side], fix_imports=True, fix_unicode=True, fix_charval=True, fix_pi=True, fix_round=False) -+ src_cleanup(self.srcshared, fix_imports=True, fix_unicode=True, fix_charval=True, fix_pi=True, fix_round=False) - - def process_javadoc(self, side): - """Add CSV descriptions to methods and fields as javadoc""" -@@ -1336,6 +1356,21 @@ - if not self.has_doc_csv: - self.logger.warning('!! javadoc disabled due to no csvs !!') - return False -+ -+ #FML Recall this function on the common folder -+ #Potential bug: If this is called without a subsiquent rename call, will cause double comments -+ if pathsrclk[side] != self.srcshared: -+ if side == CLIENT: -+ tmp = self.srcclient -+ self.srcclient = self.srcshared -+ self.process_javadoc(side) -+ self.srcclient = tmp -+ else: -+ tmp = self.srcserver -+ self.srcserver = self.srcshared -+ self.process_javadoc(side) -+ self.srcserver = tmp -+ - - #HINT: We read the relevant CSVs - methodsreader = csv.DictReader(open(self.csvmethods, 'r')) -@@ -1344,13 +1379,13 @@ +@@ -1344,13 +1352,13 @@ methods = {} for row in methodsreader: #HINT: Only include methods that have a non-empty description @@ -163,13 +78,7 @@ fields[row['searge']] = row['desc'].replace('*/', '* /') regexps = { -@@ -1422,12 +1457,13 @@ - - # HINT: We create the list of source directories based on the list of packages - pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=True) -+ pkglist = pkglist + filterdirs(self.srcshared, '*.java', append_pattern=True) #FML, Add Common folder - dirs = ' '.join(pkglist) - forkcmd = self.cmdastyle.format(classes=dirs, conffile=self.astyleconf) +@@ -1427,7 +1435,7 @@ self.runcmd(forkcmd) return True @@ -178,7 +87,7 @@ if not reobf: md5lk = {CLIENT: self.md5client, SERVER: self.md5server} else: -@@ -1442,6 +1478,9 @@ +@@ -1442,6 +1450,9 @@ class_path = '' else: class_path += '/' @@ -188,7 +97,7 @@ for class_file in fnmatch.filter(filelist, '*.class'): class_name = class_path + os.path.splitext(class_file)[0] bin_file = os.path.normpath(os.path.join(path, class_file)) -@@ -1594,6 +1633,9 @@ +@@ -1594,6 +1605,9 @@ sys.exit(1) for entry in newfiles: @@ -198,7 +107,7 @@ if entry[3] == 'U': self.logger.info('Retrieving file from server : %s', entry[0]) cur_file = os.path.normpath(entry[0]) -@@ -1614,6 +1656,9 @@ +@@ -1614,6 +1628,9 @@ md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver} outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver} src = {CLIENT: self.srcclient, SERVER: self.srcserver} @@ -208,28 +117,10 @@ # HINT: We need a table for the old md5 and the new ones md5table = {} -@@ -1646,6 +1691,7 @@ - # HINT: We extract the source files for the modified class files - for in_class in trgclasses: - src_file = os.path.normpath(os.path.join(src[side], in_class + '.java')) -+ cmn_file = os.path.normpath(os.path.join(self.srcshared, in_class + '.java')) - dest_file = os.path.normpath(os.path.join(outpathlk[side], in_class + '.java')) - if os.path.isfile(src_file): - if not os.path.exists(os.path.dirname(dest_file)): -@@ -1655,4 +1701,15 @@ - self.logger.info('> Outputted %s to %s', in_class.ljust(35), outpathlk[side]) +@@ -1656,3 +1673,6 @@ except IOError: self.logger.error('* File %s copy failed', in_class) -- -+ elif os.path.isfile(cmn_file): -+ if not os.path.exists(os.path.dirname(dest_file)): -+ os.makedirs(os.path.dirname(dest_file)) -+ try: -+ shutil.copyfile(cmn_file, dest_file) -+ self.logger.info('> Outputted %s to %s', in_class.ljust(35), outpathlk[side]) -+ except IOError: -+ self.logger.error('* File %s copy failed', in_class) -+ + +def commands_sanity_check(): + print 'Commands patch applied successfully' + diff --git a/fml/conf/mcp.cfg b/fml/conf/mcp.cfg index 3c2457b1a..ac07ea643 100644 --- a/fml/conf/mcp.cfg +++ b/fml/conf/mcp.cfg @@ -22,8 +22,8 @@ Params = %(DirConf)s/params.csv NewIds = %(DirConf)s/newids.csv [SRGS] -ConfClient = %(DirConf)s/joined.srg -ConfServer = %(DirConf)s/joined.srg +ConfClient = %(DirConf)s/packaged.srg +ConfServer = %(DirConf)s/packaged.srg Client = %(DirTemp)s/client_rg.srg Server = %(DirTemp)s/server_rg.srg DeobfClient = %(DirTemp)s/client_deobf.srg @@ -56,8 +56,8 @@ ServerDeobLog = %(DirLogs)s/server_deob.log NullPkg = net/minecraft/src [EXCEPTOR] -XClientCfg = %(DirConf)s/joined.exc -XServerCfg = %(DirConf)s/joined.exc +XClientCfg = %(DirConf)s/packaged.exc +XServerCfg = %(DirConf)s/packaged.exc XClientOut = %(DirTemp)s/minecraft_exc.jar XServerOut = %(DirTemp)s/minecraft_server_exc.jar XClientLog = %(DirLogs)s/client_exc.log diff --git a/fml/conf/packages.csv b/fml/conf/packages.csv new file mode 100644 index 000000000..63e6ea748 --- /dev/null +++ b/fml/conf/packages.csv @@ -0,0 +1,1327 @@ +class,package +ActiveRenderInfo,net/minecraft/client +BossStatus,net/minecraft/client +CallableClientMemoryStats,net/minecraft/client +CallableClientProfiler,net/minecraft/client +CallableGLInfo,net/minecraft/client +CallableIsModded,net/minecraft/client +CallableLastTickedParticle,net/minecraft/client +CallableLWJGLVersion,net/minecraft/client +CallableModded,net/minecraft/client +CallableMouseLocation,net/minecraft/client +CallableMPL1,net/minecraft/client +CallableMPL2,net/minecraft/client +CallableParticlePositionInfo,net/minecraft/client +CallableParticleScreenName,net/minecraft/client +CallableScreenName,net/minecraft/client +CallableScreenSize,net/minecraft/client +CallableTexturePack,net/minecraft/client +CallableTickingScreenName,net/minecraft/client +CallableType2,net/minecraft/client +CallableType3,net/minecraft/client +CallableUpdatingScreenName,net/minecraft/client +CanvasCrashReport,net/minecraft/client +CanvasMinecraftApplet,net/minecraft/client +CanvasMojangLogo,net/minecraft/client +ChatClickData,net/minecraft/client +ChatLine,net/minecraft/client +ChestItemRenderHelper,net/minecraft/client +ChunkProviderClient,net/minecraft/client +ClippingHelper,net/minecraft/client +ClippingHelperImpl,net/minecraft/client +CodecMus,net/minecraft/client +ColorizerFoliage,net/minecraft/client +ColorizerGrass,net/minecraft/client +ColorizerWater,net/minecraft/client +ContainerCreative,net/minecraft/client +CreativeCrafting,net/minecraft/client +DestroyBlockProgress,net/minecraft/client +EffectRenderer,net/minecraft/client +EnchantmentNameParts,net/minecraft/client +EntityAuraFX,net/minecraft/client +EntityBreakingFX,net/minecraft/client +EntityBubbleFX,net/minecraft/client +EntityClientPlayerMP,net/minecraft/client +EntityCloudFX,net/minecraft/client +EntityCrit2FX,net/minecraft/client +EntityCritFX,net/minecraft/client +EntityDiggingFX,net/minecraft/client +EntityDropParticleFX,net/minecraft/client +EntityEnchantmentTableParticleFX,net/minecraft/client +EntityExplodeFX,net/minecraft/client +EntityFlameFX,net/minecraft/client +EntityFootStepFX,net/minecraft/client +EntityFX,net/minecraft/client +EntityHeartFX,net/minecraft/client +EntityHugeExplodeFX,net/minecraft/client +EntityLargeExplodeFX,net/minecraft/client +EntityLavaFX,net/minecraft/client +EntityNoteFX,net/minecraft/client +EntityOtherPlayerMP,net/minecraft/client +EntityPickupFX,net/minecraft/client +EntityPlayerSP,net/minecraft/client +EntityPortalFX,net/minecraft/client +EntityRainFX,net/minecraft/client +EntityReddustFX,net/minecraft/client +EntityRenderer,net/minecraft/client +EntitySmokeFX,net/minecraft/client +EntitySnowShovelFX,net/minecraft/client +EntitySorter,net/minecraft/client +EntitySpellParticleFX,net/minecraft/client +EntitySplashFX,net/minecraft/client +EntitySuspendFX,net/minecraft/client +EnumOptions,net/minecraft/client +EnumOptionsHelper,net/minecraft/client +EnumOS,net/minecraft/client +EnumOSHelper,net/minecraft/client +EnumRarity,net/minecraft/client +FontRenderer,net/minecraft/client +Frustrum,net/minecraft/client +GameSettings,net/minecraft/client +GameWindowListener,net/minecraft/client +GLAllocation,net/minecraft/client +Gui,net/minecraft/client +GuiAchievement,net/minecraft/client +GuiAchievements,net/minecraft/client +GuiBeacon,net/minecraft/client +GuiBeaconButton,net/minecraft/client +GuiBeaconButtonCancel,net/minecraft/client +GuiBeaconButtonConfirm,net/minecraft/client +GuiBeaconButtonPower,net/minecraft/client +GuiBrewingStand,net/minecraft/client +GuiButton,net/minecraft/client +GuiButtonLanguage,net/minecraft/client +GuiButtonMerchant,net/minecraft/client +GuiButtonNextPage,net/minecraft/client +GuiChat,net/minecraft/client +GuiChatConfirmLink,net/minecraft/client +GuiChest,net/minecraft/client +GuiCommandBlock,net/minecraft/client +GuiConfirmOpenLink,net/minecraft/client +GuiConnecting,net/minecraft/client +GuiContainer,net/minecraft/client +GuiContainerCreative,net/minecraft/client +GuiControls,net/minecraft/client +GuiCrafting,net/minecraft/client +GuiCreateFlatWorld,net/minecraft/client +GuiCreateFlatWorldListSlot,net/minecraft/client +GuiCreateWorld,net/minecraft/client +GuiDisconnected,net/minecraft/client +GuiDispenser,net/minecraft/client +GuiDownloadTerrain,net/minecraft/client +GuiEditSign,net/minecraft/client +GuiEnchantment,net/minecraft/client +GuiErrorScreen,net/minecraft/client +GuiFlatPresets,net/minecraft/client +GuiFlatPresetsItem,net/minecraft/client +GuiFlatPresetsListSlot,net/minecraft/client +GuiFurnace,net/minecraft/client +GuiGameOver,net/minecraft/client +GuiIngame,net/minecraft/client +GuiIngameMenu,net/minecraft/client +GuiInventory,net/minecraft/client +GuiLanguage,net/minecraft/client +GuiMainMenu,net/minecraft/client +GuiMemoryErrorScreen,net/minecraft/client +GuiMerchant,net/minecraft/client +GuiMultiplayer,net/minecraft/client +GuiNewChat,net/minecraft/client +GuiOptions,net/minecraft/client +GuiParticle,net/minecraft/client +GuiPlayerInfo,net/minecraft/client +GuiProgress,net/minecraft/client +GuiRenameWorld,net/minecraft/client +GuiRepair,net/minecraft/client +GuiScreen,net/minecraft/client +GuiScreenAddServer,net/minecraft/client +GuiScreenBook,net/minecraft/client +GuiScreenDemo,net/minecraft/client +GuiScreenServerList,net/minecraft/client +GuiSelectWorld,net/minecraft/client +GuiShareToLan,net/minecraft/client +GuiSleepMP,net/minecraft/client +GuiSlider,net/minecraft/client +GuiSlot,net/minecraft/client +GuiSlotLanguage,net/minecraft/client +GuiSlotServer,net/minecraft/client +GuiSlotStats,net/minecraft/client +GuiSlotStatsBlock,net/minecraft/client +GuiSlotStatsGeneral,net/minecraft/client +GuiSlotStatsItem,net/minecraft/client +GuiSmallButton,net/minecraft/client +GuiSnooper,net/minecraft/client +GuiSnooperList,net/minecraft/client +GuiStats,net/minecraft/client +GuiTextField,net/minecraft/client +GuiTexturePacks,net/minecraft/client +GuiTexturePackSlot,net/minecraft/client +GuiVideoSettings,net/minecraft/client +GuiWinGame,net/minecraft/client +GuiWorldSlot,net/minecraft/client +GuiYesNo,net/minecraft/client +IBossDisplayData,net/minecraft/client +ICamera,net/minecraft/client +IDownloadSuccess,net/minecraft/client +IImageBuffer,net/minecraft/client +ImageBufferDownload,net/minecraft/client +IntegratedPlayerList,net/minecraft/client +IntegratedServer,net/minecraft/client +IntegratedServerListenThread,net/minecraft/client +InventoryEffectRenderer,net/minecraft/client +IStatStringFormat,net/minecraft/client +ItemRenderer,net/minecraft/client +ITexturePack,net/minecraft/client +KeyBinding,net/minecraft/client +LanServer,net/minecraft/client +LanServerList,net/minecraft/client +LoadingScreenRenderer,net/minecraft/client +MapItemRenderer,net/minecraft/client +MD5String,net/minecraft/client +MinecraftAppletImpl,net/minecraft/client +MinecraftError,net/minecraft/client +MinecraftFakeLauncher,net/minecraft/client +ModelBase,net/minecraft/client +ModelBat,net/minecraft/client +ModelBiped,net/minecraft/client +ModelBlaze,net/minecraft/client +ModelBoat,net/minecraft/client +ModelBook,net/minecraft/client +ModelBox,net/minecraft/client +ModelChest,net/minecraft/client +ModelChicken,net/minecraft/client +ModelCow,net/minecraft/client +ModelCreeper,net/minecraft/client +ModelDragon,net/minecraft/client +ModelEnderCrystal,net/minecraft/client +ModelEnderman,net/minecraft/client +ModelGhast,net/minecraft/client +ModelIronGolem,net/minecraft/client +ModelLargeChest,net/minecraft/client +ModelMagmaCube,net/minecraft/client +ModelMinecart,net/minecraft/client +ModelOcelot,net/minecraft/client +ModelPig,net/minecraft/client +ModelQuadruped,net/minecraft/client +ModelRenderer,net/minecraft/client +ModelSheep1,net/minecraft/client +ModelSheep2,net/minecraft/client +ModelSign,net/minecraft/client +ModelSilverfish,net/minecraft/client +ModelSkeleton,net/minecraft/client +ModelSkeletonHead,net/minecraft/client +ModelSlime,net/minecraft/client +ModelSnowMan,net/minecraft/client +ModelSpider,net/minecraft/client +ModelSquid,net/minecraft/client +ModelVillager,net/minecraft/client +ModelWitch,net/minecraft/client +ModelWither,net/minecraft/client +ModelWolf,net/minecraft/client +ModelZombie,net/minecraft/client +ModelZombieVillager,net/minecraft/client +MouseFilter,net/minecraft/client +MouseHelper,net/minecraft/client +MovementInput,net/minecraft/client +MovementInputFromOptions,net/minecraft/client +MusInputStream,net/minecraft/client +NetClientHandler,net/minecraft/client +NetClientWebTextures,net/minecraft/client +NpcMerchant,net/minecraft/client +OpenGlCapsChecker,net/minecraft/client +OpenGlHelper,net/minecraft/client +PanelCrashReport,net/minecraft/client +Particle,net/minecraft/client +PlayerControllerMP,net/minecraft/client +PositionTextureVertex,net/minecraft/client +Render,net/minecraft/client +RenderArrow,net/minecraft/client +RenderBat,net/minecraft/client +RenderBiped,net/minecraft/client +RenderBlaze,net/minecraft/client +RenderBlocks,net/minecraft/client +RenderBoat,net/minecraft/client +RenderChicken,net/minecraft/client +RenderCow,net/minecraft/client +RenderCreeper,net/minecraft/client +RenderDragon,net/minecraft/client +RenderEnchantmentTable,net/minecraft/client +RenderEnderCrystal,net/minecraft/client +RenderEnderman,net/minecraft/client +RenderEndPortal,net/minecraft/client +RenderEngine,net/minecraft/client +RenderEntity,net/minecraft/client +RenderFallingSand,net/minecraft/client +RenderFireball,net/minecraft/client +RenderFish,net/minecraft/client +RenderGhast,net/minecraft/client +RenderGiantZombie,net/minecraft/client +RenderGlobal,net/minecraft/client +RenderHelper,net/minecraft/client +RenderIronGolem,net/minecraft/client +RenderItem,net/minecraft/client +RenderItemFrame,net/minecraft/client +RenderLightningBolt,net/minecraft/client +RenderList,net/minecraft/client +RenderLiving,net/minecraft/client +RenderMagmaCube,net/minecraft/client +RenderManager,net/minecraft/client +RenderMinecart,net/minecraft/client +RenderMooshroom,net/minecraft/client +RenderOcelot,net/minecraft/client +RenderPainting,net/minecraft/client +RenderPig,net/minecraft/client +RenderPlayer,net/minecraft/client +RenderSheep,net/minecraft/client +RenderSilverfish,net/minecraft/client +RenderSkeleton,net/minecraft/client +RenderSlime,net/minecraft/client +RenderSnowball,net/minecraft/client +RenderSnowMan,net/minecraft/client +RenderSorter,net/minecraft/client +RenderSpider,net/minecraft/client +RenderSquid,net/minecraft/client +RenderTNTPrimed,net/minecraft/client +RenderVillager,net/minecraft/client +RenderWitch,net/minecraft/client +RenderWither,net/minecraft/client +RenderWitherSkull,net/minecraft/client +RenderWolf,net/minecraft/client +RenderXPOrb,net/minecraft/client +RenderZombie,net/minecraft/client +SaveFormatComparator,net/minecraft/client +SaveHandlerMP,net/minecraft/client +ScaledResolution,net/minecraft/client +ScreenChatOptions,net/minecraft/client +ScreenShotHelper,net/minecraft/client +ServerAddress,net/minecraft/client +ServerData,net/minecraft/client +ServerList,net/minecraft/client +Session,net/minecraft/client +SlotCreativeInventory,net/minecraft/client +SorterStatsBlock,net/minecraft/client +SorterStatsItem,net/minecraft/client +SoundManager,net/minecraft/client +SoundPool,net/minecraft/client +SoundPoolEntry,net/minecraft/client +SoundUpdaterMinecart,net/minecraft/client +StatFileWriter,net/minecraft/client +StatsSyncher,net/minecraft/client +StatStringFormatKeyInv,net/minecraft/client +Tessellator,net/minecraft/client +TextureCompassFX,net/minecraft/client +TexturedQuad,net/minecraft/client +TextureFlamesFX,net/minecraft/client +TextureFX,net/minecraft/client +TextureLavaFlowFX,net/minecraft/client +TextureLavaFX,net/minecraft/client +TextureOffset,net/minecraft/client +TexturePackCustom,net/minecraft/client +TexturePackDefault,net/minecraft/client +TexturePackDownloadSuccess,net/minecraft/client +TexturePackFolder,net/minecraft/client +TexturePackImplementation,net/minecraft/client +TexturePackList,net/minecraft/client +TexturePortalFX,net/minecraft/client +TextureWatchFX,net/minecraft/client +TextureWaterFlowFX,net/minecraft/client +TextureWaterFX,net/minecraft/client +ThreadClientSleep,net/minecraft/client +ThreadConnectToServer,net/minecraft/client +ThreadDownloadImage,net/minecraft/client +ThreadDownloadImageData,net/minecraft/client +ThreadDownloadResources,net/minecraft/client +ThreadLanServerFind,net/minecraft/client +ThreadLanServerPing,net/minecraft/client +ThreadPollServers,net/minecraft/client +ThreadShutdown,net/minecraft/client +ThreadStatSyncherReceive,net/minecraft/client +ThreadStatSyncherSend,net/minecraft/client +TileEntityBeaconRenderer,net/minecraft/client +TileEntityChestRenderer,net/minecraft/client +TileEntityEnderChestRenderer,net/minecraft/client +TileEntityMobSpawnerRenderer,net/minecraft/client +TileEntityRenderer,net/minecraft/client +TileEntityRendererPiston,net/minecraft/client +TileEntitySignRenderer,net/minecraft/client +TileEntitySkullRenderer,net/minecraft/client +TileEntitySpecialRenderer,net/minecraft/client +Timer,net/minecraft/client +WorldClient,net/minecraft/client +WorldRenderer,net/minecraft/client +GuiLogFormatter,net/minecraft/server +GuiLogOutputHandler,net/minecraft/server +GuiStatsComponent,net/minecraft/server +GuiStatsListener,net/minecraft/server +PlayerListBox,net/minecraft/server +ServerGUI,net/minecraft/server +ServerGuiCommandListener,net/minecraft/server +ServerGuiFocusAdapter,net/minecraft/server +ServerWindowAdapter,net/minecraft/server +ThreadDedicatedServer,net/minecraft/server +AABBLocalPool,net/minecraft/shared +AABBPool,net/minecraft/shared +Achievement,net/minecraft/shared +AchievementList,net/minecraft/shared +AchievementMap,net/minecraft/shared +AnvilChunkLoader,net/minecraft/shared +AnvilChunkLoaderPending,net/minecraft/shared +AnvilConverterData,net/minecraft/shared +AnvilSaveConverter,net/minecraft/shared +AnvilSaveConverterFileFilter,net/minecraft/shared +AnvilSaveHandler,net/minecraft/shared +AxisAlignedBB,net/minecraft/shared +BanEntry,net/minecraft/shared +BanList,net/minecraft/shared +BehaviorArrowDispense,net/minecraft/shared +BehaviorBucketEmptyDispense,net/minecraft/shared +BehaviorBucketFullDispense,net/minecraft/shared +BehaviorDefaultDispenseItem,net/minecraft/shared +BehaviorDispenseBoat,net/minecraft/shared +BehaviorDispenseFireball,net/minecraft/shared +BehaviorDispenseItemProvider,net/minecraft/shared +BehaviorDispenseMinecart,net/minecraft/shared +BehaviorEggDispense,net/minecraft/shared +BehaviorExpBottleDispense,net/minecraft/shared +BehaviorMobEggDispense,net/minecraft/shared +BehaviorPotionDispense,net/minecraft/shared +BehaviorPotionDispenseLogic,net/minecraft/shared +BehaviorProjectileDispense,net/minecraft/shared +BehaviorSnowballDispense,net/minecraft/shared +BiomeCache,net/minecraft/shared +BiomeCacheBlock,net/minecraft/shared +BiomeDecorator,net/minecraft/shared +BiomeEndDecorator,net/minecraft/shared +BiomeGenBase,net/minecraft/shared +BiomeGenBeach,net/minecraft/shared +BiomeGenDesert,net/minecraft/shared +BiomeGenEnd,net/minecraft/shared +BiomeGenForest,net/minecraft/shared +BiomeGenHell,net/minecraft/shared +BiomeGenHills,net/minecraft/shared +BiomeGenJungle,net/minecraft/shared +BiomeGenMushroomIsland,net/minecraft/shared +BiomeGenOcean,net/minecraft/shared +BiomeGenPlains,net/minecraft/shared +BiomeGenRiver,net/minecraft/shared +BiomeGenSnow,net/minecraft/shared +BiomeGenSwamp,net/minecraft/shared +BiomeGenTaiga,net/minecraft/shared +Block,net/minecraft/shared +BlockAnvil,net/minecraft/shared +BlockBeacon,net/minecraft/shared +BlockBed,net/minecraft/shared +BlockBookshelf,net/minecraft/shared +BlockBreakable,net/minecraft/shared +BlockBrewingStand,net/minecraft/shared +BlockButton,net/minecraft/shared +BlockCactus,net/minecraft/shared +BlockCake,net/minecraft/shared +BlockCarrot,net/minecraft/shared +BlockCauldron,net/minecraft/shared +BlockChest,net/minecraft/shared +BlockClay,net/minecraft/shared +BlockCloth,net/minecraft/shared +BlockCocoa,net/minecraft/shared +BlockCommandBlock,net/minecraft/shared +BlockContainer,net/minecraft/shared +BlockCrops,net/minecraft/shared +BlockDeadBush,net/minecraft/shared +BlockDetectorRail,net/minecraft/shared +BlockDirectional,net/minecraft/shared +BlockDirt,net/minecraft/shared +BlockDispenser,net/minecraft/shared +BlockDoor,net/minecraft/shared +BlockDragonEgg,net/minecraft/shared +BlockEnchantmentTable,net/minecraft/shared +BlockEnderChest,net/minecraft/shared +BlockEndPortal,net/minecraft/shared +BlockEndPortalFrame,net/minecraft/shared +BlockEventData,net/minecraft/shared +BlockFarmland,net/minecraft/shared +BlockFence,net/minecraft/shared +BlockFenceGate,net/minecraft/shared +BlockFire,net/minecraft/shared +BlockFlower,net/minecraft/shared +BlockFlowerPot,net/minecraft/shared +BlockFlowing,net/minecraft/shared +BlockFluid,net/minecraft/shared +BlockFurnace,net/minecraft/shared +BlockGlass,net/minecraft/shared +BlockGlowStone,net/minecraft/shared +BlockGrass,net/minecraft/shared +BlockGravel,net/minecraft/shared +BlockHalfSlab,net/minecraft/shared +BlockIce,net/minecraft/shared +BlockJukeBox,net/minecraft/shared +BlockLadder,net/minecraft/shared +BlockLeaves,net/minecraft/shared +BlockLeavesBase,net/minecraft/shared +BlockLever,net/minecraft/shared +BlockLilyPad,net/minecraft/shared +BlockLockedChest,net/minecraft/shared +BlockLog,net/minecraft/shared +BlockMelon,net/minecraft/shared +BlockMobSpawner,net/minecraft/shared +BlockMushroom,net/minecraft/shared +BlockMushroomCap,net/minecraft/shared +BlockMycelium,net/minecraft/shared +BlockNetherrack,net/minecraft/shared +BlockNetherStalk,net/minecraft/shared +BlockNote,net/minecraft/shared +BlockObsidian,net/minecraft/shared +BlockOre,net/minecraft/shared +BlockOreStorage,net/minecraft/shared +BlockPane,net/minecraft/shared +BlockPistonBase,net/minecraft/shared +BlockPistonExtension,net/minecraft/shared +BlockPistonMoving,net/minecraft/shared +BlockPortal,net/minecraft/shared +BlockPotato,net/minecraft/shared +BlockPressurePlate,net/minecraft/shared +BlockPumpkin,net/minecraft/shared +BlockRail,net/minecraft/shared +BlockRedstoneLight,net/minecraft/shared +BlockRedstoneOre,net/minecraft/shared +BlockRedstoneRepeater,net/minecraft/shared +BlockRedstoneTorch,net/minecraft/shared +BlockRedstoneWire,net/minecraft/shared +BlockReed,net/minecraft/shared +BlockSand,net/minecraft/shared +BlockSandStone,net/minecraft/shared +BlockSapling,net/minecraft/shared +BlockSign,net/minecraft/shared +BlockSilverfish,net/minecraft/shared +BlockSkull,net/minecraft/shared +BlockSnow,net/minecraft/shared +BlockSnowBlock,net/minecraft/shared +BlockSoulSand,net/minecraft/shared +BlockSourceImpl,net/minecraft/shared +BlockSponge,net/minecraft/shared +BlockStairs,net/minecraft/shared +BlockStationary,net/minecraft/shared +BlockStem,net/minecraft/shared +BlockStep,net/minecraft/shared +BlockStone,net/minecraft/shared +BlockStoneBrick,net/minecraft/shared +BlockTallGrass,net/minecraft/shared +BlockTNT,net/minecraft/shared +BlockTorch,net/minecraft/shared +BlockTrapDoor,net/minecraft/shared +BlockTripWire,net/minecraft/shared +BlockTripWireSource,net/minecraft/shared +BlockVine,net/minecraft/shared +BlockWall,net/minecraft/shared +BlockWeb,net/minecraft/shared +BlockWood,net/minecraft/shared +BlockWoodSlab,net/minecraft/shared +BlockWorkbench,net/minecraft/shared +CallableBlockDataValue,net/minecraft/shared +CallableBlockLocation,net/minecraft/shared +CallableBlockType,net/minecraft/shared +CallableChunkPosHash,net/minecraft/shared +CallableCrashMemoryReport,net/minecraft/shared +CallableEntityType,net/minecraft/shared +CallableIntCache,net/minecraft/shared +CallableIsFeatureChunk,net/minecraft/shared +CallableIsServerModded,net/minecraft/shared +CallableJavaInfo,net/minecraft/shared +CallableJavaInfo2,net/minecraft/shared +CallableJVMFlags,net/minecraft/shared +CallableLevelDimension,net/minecraft/shared +CallableLevelGamemode,net/minecraft/shared +CallableLevelGenerator,net/minecraft/shared +CallableLevelGeneratorOptions,net/minecraft/shared +CallableLevelSeed,net/minecraft/shared +CallableLevelSpawnLocation,net/minecraft/shared +CallableLevelStorageVersion,net/minecraft/shared +CallableLevelTime,net/minecraft/shared +CallableLevelWeather,net/minecraft/shared +CallableLvl1,net/minecraft/shared +CallableLvl2,net/minecraft/shared +CallableLvl3,net/minecraft/shared +CallableMemoryInfo,net/minecraft/shared +CallableMinecraftVersion,net/minecraft/shared +CallableOSInfo,net/minecraft/shared +CallableServerMemoryStats,net/minecraft/shared +CallableServerProfiler,net/minecraft/shared +CallableServerType,net/minecraft/shared +CallableStructureType,net/minecraft/shared +CallableSuspiciousClasses,net/minecraft/shared +CallableTagCompound1,net/minecraft/shared +CallableTagCompound2,net/minecraft/shared +CallableTileEntityName,net/minecraft/shared +CallableType,net/minecraft/shared +ChatAllowedCharacters,net/minecraft/shared +Chunk,net/minecraft/shared +ChunkCache,net/minecraft/shared +ChunkCoordinates,net/minecraft/shared +ChunkCoordIntPair,net/minecraft/shared +ChunkLoader,net/minecraft/shared +ChunkPosition,net/minecraft/shared +ChunkProviderEnd,net/minecraft/shared +ChunkProviderFlat,net/minecraft/shared +ChunkProviderGenerate,net/minecraft/shared +ChunkProviderHell,net/minecraft/shared +ChunkProviderServer,net/minecraft/shared +CommandBase,net/minecraft/shared +CommandClearInventory,net/minecraft/shared +CommandDebug,net/minecraft/shared +CommandDefaultGameMode,net/minecraft/shared +CommandDifficulty,net/minecraft/shared +CommandEnchant,net/minecraft/shared +CommandException,net/minecraft/shared +CommandGameMode,net/minecraft/shared +CommandGameRule,net/minecraft/shared +CommandGive,net/minecraft/shared +CommandHandler,net/minecraft/shared +CommandHelp,net/minecraft/shared +CommandKill,net/minecraft/shared +CommandNotFoundException,net/minecraft/shared +CommandServerBan,net/minecraft/shared +CommandServerBanIp,net/minecraft/shared +CommandServerBanlist,net/minecraft/shared +CommandServerDeop,net/minecraft/shared +CommandServerEmote,net/minecraft/shared +CommandServerKick,net/minecraft/shared +CommandServerList,net/minecraft/shared +CommandServerMessage,net/minecraft/shared +CommandServerOp,net/minecraft/shared +CommandServerPardon,net/minecraft/shared +CommandServerPardonIp,net/minecraft/shared +CommandServerPublishLocal,net/minecraft/shared +CommandServerSaveAll,net/minecraft/shared +CommandServerSaveOff,net/minecraft/shared +CommandServerSaveOn,net/minecraft/shared +CommandServerSay,net/minecraft/shared +CommandServerStop,net/minecraft/shared +CommandServerTp,net/minecraft/shared +CommandServerWhitelist,net/minecraft/shared +CommandSetSpawnpoint,net/minecraft/shared +CommandShowSeed,net/minecraft/shared +CommandTime,net/minecraft/shared +CommandToggleDownfall,net/minecraft/shared +CommandWeather,net/minecraft/shared +CommandXP,net/minecraft/shared +ComparatorClassSorter,net/minecraft/shared +ComponentMineshaftCorridor,net/minecraft/shared +ComponentMineshaftCross,net/minecraft/shared +ComponentMineshaftRoom,net/minecraft/shared +ComponentMineshaftStairs,net/minecraft/shared +ComponentNetherBridgeCorridor,net/minecraft/shared +ComponentNetherBridgeCorridor2,net/minecraft/shared +ComponentNetherBridgeCorridor3,net/minecraft/shared +ComponentNetherBridgeCorridor4,net/minecraft/shared +ComponentNetherBridgeCorridor5,net/minecraft/shared +ComponentNetherBridgeCrossing,net/minecraft/shared +ComponentNetherBridgeCrossing2,net/minecraft/shared +ComponentNetherBridgeCrossing3,net/minecraft/shared +ComponentNetherBridgeEnd,net/minecraft/shared +ComponentNetherBridgeEntrance,net/minecraft/shared +ComponentNetherBridgeNetherStalkRoom,net/minecraft/shared +ComponentNetherBridgePiece,net/minecraft/shared +ComponentNetherBridgeStairs,net/minecraft/shared +ComponentNetherBridgeStartPiece,net/minecraft/shared +ComponentNetherBridgeStraight,net/minecraft/shared +ComponentNetherBridgeThrone,net/minecraft/shared +ComponentScatteredFeature,net/minecraft/shared +ComponentScatteredFeatureDesertPyramid,net/minecraft/shared +ComponentScatteredFeatureJunglePyramid,net/minecraft/shared +ComponentScatteredFeaturePieces2,net/minecraft/shared +ComponentScatteredFeatureSwampHut,net/minecraft/shared +ComponentStronghold,net/minecraft/shared +ComponentStrongholdChestCorridor,net/minecraft/shared +ComponentStrongholdCorridor,net/minecraft/shared +ComponentStrongholdCrossing,net/minecraft/shared +ComponentStrongholdLeftTurn,net/minecraft/shared +ComponentStrongholdLibrary,net/minecraft/shared +ComponentStrongholdPortalRoom,net/minecraft/shared +ComponentStrongholdPrison,net/minecraft/shared +ComponentStrongholdRightTurn,net/minecraft/shared +ComponentStrongholdRoomCrossing,net/minecraft/shared +ComponentStrongholdStairs,net/minecraft/shared +ComponentStrongholdStairs2,net/minecraft/shared +ComponentStrongholdStairsStraight,net/minecraft/shared +ComponentStrongholdStraight,net/minecraft/shared +ComponentVillage,net/minecraft/shared +ComponentVillageChurch,net/minecraft/shared +ComponentVillageField,net/minecraft/shared +ComponentVillageField2,net/minecraft/shared +ComponentVillageHall,net/minecraft/shared +ComponentVillageHouse1,net/minecraft/shared +ComponentVillageHouse2,net/minecraft/shared +ComponentVillageHouse3,net/minecraft/shared +ComponentVillageHouse4_Garden,net/minecraft/shared +ComponentVillagePathGen,net/minecraft/shared +ComponentVillageRoadPiece,net/minecraft/shared +ComponentVillageStartPiece,net/minecraft/shared +ComponentVillageTorch,net/minecraft/shared +ComponentVillageWell,net/minecraft/shared +ComponentVillageWoodHut,net/minecraft/shared +CompressedStreamTools,net/minecraft/shared +ConsoleLogFormatter,net/minecraft/shared +ConsoleLogManager,net/minecraft/shared +Container,net/minecraft/shared +ContainerBeacon,net/minecraft/shared +ContainerBrewingStand,net/minecraft/shared +ContainerChest,net/minecraft/shared +ContainerDispenser,net/minecraft/shared +ContainerEnchantment,net/minecraft/shared +ContainerFurnace,net/minecraft/shared +ContainerMerchant,net/minecraft/shared +ContainerPlayer,net/minecraft/shared +ContainerRepair,net/minecraft/shared +ContainerSheep,net/minecraft/shared +ContainerWorkbench,net/minecraft/shared +ConvertingProgressUpdate,net/minecraft/shared +CraftingManager,net/minecraft/shared +CrashReport,net/minecraft/shared +CrashReportCategory,net/minecraft/shared +CrashReportCategoryEntry,net/minecraft/shared +CreativeTabBlock,net/minecraft/shared +CreativeTabBrewing,net/minecraft/shared +CreativeTabCombat,net/minecraft/shared +CreativeTabDeco,net/minecraft/shared +CreativeTabFood,net/minecraft/shared +CreativeTabInventory,net/minecraft/shared +CreativeTabMaterial,net/minecraft/shared +CreativeTabMisc,net/minecraft/shared +CreativeTabRedstone,net/minecraft/shared +CreativeTabs,net/minecraft/shared +CreativeTabSearch,net/minecraft/shared +CreativeTabTools,net/minecraft/shared +CreativeTabTransport,net/minecraft/shared +CryptManager,net/minecraft/shared +DamageSource,net/minecraft/shared +DataWatcher,net/minecraft/shared +DedicatedPlayerList,net/minecraft/shared +DedicatedServer,net/minecraft/shared +DedicatedServerCommandThread,net/minecraft/shared +DedicatedServerListenThread,net/minecraft/shared +DedicatedServerSleepThread,net/minecraft/shared +DemoWorldManager,net/minecraft/shared +DemoWorldServer,net/minecraft/shared +DerivedWorldInfo,net/minecraft/shared +Direction,net/minecraft/shared +Empty3,net/minecraft/shared +EmptyChunk,net/minecraft/shared +Enchantment,net/minecraft/shared +EnchantmentArrowDamage,net/minecraft/shared +EnchantmentArrowFire,net/minecraft/shared +EnchantmentArrowInfinite,net/minecraft/shared +EnchantmentArrowKnockback,net/minecraft/shared +EnchantmentDamage,net/minecraft/shared +EnchantmentData,net/minecraft/shared +EnchantmentDigging,net/minecraft/shared +EnchantmentDurability,net/minecraft/shared +EnchantmentFireAspect,net/minecraft/shared +EnchantmentHelper,net/minecraft/shared +EnchantmentKnockback,net/minecraft/shared +EnchantmentLootBonus,net/minecraft/shared +EnchantmentModifierDamage,net/minecraft/shared +EnchantmentModifierLiving,net/minecraft/shared +EnchantmentOxygen,net/minecraft/shared +EnchantmentProtection,net/minecraft/shared +EnchantmentUntouching,net/minecraft/shared +EnchantmentWaterWorker,net/minecraft/shared +Entity,net/minecraft/shared +EntityAgeable,net/minecraft/shared +EntityAIArrowAttack,net/minecraft/shared +EntityAIAttackOnCollide,net/minecraft/shared +EntityAIAvoidEntity,net/minecraft/shared +EntityAIBase,net/minecraft/shared +EntityAIBeg,net/minecraft/shared +EntityAIBreakDoor,net/minecraft/shared +EntityAIControlledByPlayer,net/minecraft/shared +EntityAICreeperSwell,net/minecraft/shared +EntityAIDefendVillage,net/minecraft/shared +EntityAIDoorInteract,net/minecraft/shared +EntityAIEatGrass,net/minecraft/shared +EntityAIFleeSun,net/minecraft/shared +EntityAIFollowGolem,net/minecraft/shared +EntityAIFollowOwner,net/minecraft/shared +EntityAIFollowParent,net/minecraft/shared +EntityAIHurtByTarget,net/minecraft/shared +EntityAILeapAtTarget,net/minecraft/shared +EntityAILookAtTradePlayer,net/minecraft/shared +EntityAILookAtVillager,net/minecraft/shared +EntityAILookIdle,net/minecraft/shared +EntityAIMate,net/minecraft/shared +EntityAIMoveIndoors,net/minecraft/shared +EntityAIMoveThroughVillage,net/minecraft/shared +EntityAIMoveTowardsTarget,net/minecraft/shared +EntityAIMoveTwardsRestriction,net/minecraft/shared +EntityAINearestAttackableTarget,net/minecraft/shared +EntityAINearestAttackableTargetSorter,net/minecraft/shared +EntityAIOcelotAttack,net/minecraft/shared +EntityAIOcelotSit,net/minecraft/shared +EntityAIOpenDoor,net/minecraft/shared +EntityAIOwnerHurtByTarget,net/minecraft/shared +EntityAIOwnerHurtTarget,net/minecraft/shared +EntityAIPanic,net/minecraft/shared +EntityAIPlay,net/minecraft/shared +EntityAIRestrictOpenDoor,net/minecraft/shared +EntityAIRestrictSun,net/minecraft/shared +EntityAISit,net/minecraft/shared +EntityAISwimming,net/minecraft/shared +EntityAITarget,net/minecraft/shared +EntityAITargetNonTamed,net/minecraft/shared +EntityAITaskEntry,net/minecraft/shared +EntityAITasks,net/minecraft/shared +EntityAITempt,net/minecraft/shared +EntityAITradePlayer,net/minecraft/shared +EntityAIVillagerMate,net/minecraft/shared +EntityAIWander,net/minecraft/shared +EntityAIWatchClosest,net/minecraft/shared +EntityAIWatchClosest2,net/minecraft/shared +EntityAmbientCreature,net/minecraft/shared +EntityAnimal,net/minecraft/shared +EntityArrow,net/minecraft/shared +EntityBat,net/minecraft/shared +EntityBlaze,net/minecraft/shared +EntityBoat,net/minecraft/shared +EntityBodyHelper,net/minecraft/shared +EntityCaveSpider,net/minecraft/shared +EntityChicken,net/minecraft/shared +EntityCow,net/minecraft/shared +EntityCreature,net/minecraft/shared +EntityCreeper,net/minecraft/shared +EntityDamageSource,net/minecraft/shared +EntityDamageSourceIndirect,net/minecraft/shared +EntityDragon,net/minecraft/shared +EntityDragonPart,net/minecraft/shared +EntityEgg,net/minecraft/shared +EntityEggInfo,net/minecraft/shared +EntityEnderCrystal,net/minecraft/shared +EntityEnderEye,net/minecraft/shared +EntityEnderman,net/minecraft/shared +EntityEnderPearl,net/minecraft/shared +EntityExpBottle,net/minecraft/shared +EntityFallingSand,net/minecraft/shared +EntityFireball,net/minecraft/shared +EntityFishHook,net/minecraft/shared +EntityFlying,net/minecraft/shared +EntityGhast,net/minecraft/shared +EntityGiantZombie,net/minecraft/shared +EntityGolem,net/minecraft/shared +EntityHanging,net/minecraft/shared +EntityIronGolem,net/minecraft/shared +EntityItem,net/minecraft/shared +EntityItemFrame,net/minecraft/shared +EntityJumpHelper,net/minecraft/shared +EntityLargeFireball,net/minecraft/shared +EntityLightningBolt,net/minecraft/shared +EntityList,net/minecraft/shared +EntityLiving,net/minecraft/shared +EntityLookHelper,net/minecraft/shared +EntityMagmaCube,net/minecraft/shared +EntityMinecart,net/minecraft/shared +EntityMob,net/minecraft/shared +EntityMooshroom,net/minecraft/shared +EntityMoveHelper,net/minecraft/shared +EntityOcelot,net/minecraft/shared +EntityPainting,net/minecraft/shared +EntityPig,net/minecraft/shared +EntityPigZombie,net/minecraft/shared +EntityPlayer,net/minecraft/shared +EntityPlayerMP,net/minecraft/shared +EntityPotion,net/minecraft/shared +EntitySenses,net/minecraft/shared +EntitySheep,net/minecraft/shared +EntitySilverfish,net/minecraft/shared +EntitySkeleton,net/minecraft/shared +EntitySlime,net/minecraft/shared +EntitySmallFireball,net/minecraft/shared +EntitySnowball,net/minecraft/shared +EntitySnowman,net/minecraft/shared +EntitySpider,net/minecraft/shared +EntitySquid,net/minecraft/shared +EntityTameable,net/minecraft/shared +EntityThrowable,net/minecraft/shared +EntityTNTPrimed,net/minecraft/shared +EntityTracker,net/minecraft/shared +EntityTrackerEntry,net/minecraft/shared +EntityVillager,net/minecraft/shared +EntityWaterMob,net/minecraft/shared +EntityWeatherEffect,net/minecraft/shared +EntityWitch,net/minecraft/shared +EntityWither,net/minecraft/shared +EntityWitherAttackFilter,net/minecraft/shared +EntityWitherSkull,net/minecraft/shared +EntityWolf,net/minecraft/shared +EntityXPOrb,net/minecraft/shared +EntityZombie,net/minecraft/shared +EnumAction,net/minecraft/shared +EnumArmorMaterial,net/minecraft/shared +EnumArt,net/minecraft/shared +EnumCreatureAttribute,net/minecraft/shared +EnumCreatureType,net/minecraft/shared +EnumDoor,net/minecraft/shared +EnumDoorHelper,net/minecraft/shared +EnumEnchantmentType,net/minecraft/shared +EnumEntitySize,net/minecraft/shared +EnumEntitySizeHelper,net/minecraft/shared +EnumFacing,net/minecraft/shared +EnumGameType,net/minecraft/shared +EnumMobType,net/minecraft/shared +EnumMovingObjectType,net/minecraft/shared +EnumSkyBlock,net/minecraft/shared +EnumStatus,net/minecraft/shared +EnumToolMaterial,net/minecraft/shared +Explosion,net/minecraft/shared +ExtendedBlockStorage,net/minecraft/shared +Facing,net/minecraft/shared +FilterIMob,net/minecraft/shared +FlatGeneratorInfo,net/minecraft/shared +FlatLayerInfo,net/minecraft/shared +FoodStats,net/minecraft/shared +FurnaceRecipes,net/minecraft/shared +GameRules,net/minecraft/shared +GameRuleValue,net/minecraft/shared +GenLayer,net/minecraft/shared +GenLayerAddIsland,net/minecraft/shared +GenLayerAddMushroomIsland,net/minecraft/shared +GenLayerAddSnow,net/minecraft/shared +GenLayerBiome,net/minecraft/shared +GenLayerFuzzyZoom,net/minecraft/shared +GenLayerHills,net/minecraft/shared +GenLayerIsland,net/minecraft/shared +GenLayerRiver,net/minecraft/shared +GenLayerRiverInit,net/minecraft/shared +GenLayerRiverMix,net/minecraft/shared +GenLayerShore,net/minecraft/shared +GenLayerSmooth,net/minecraft/shared +GenLayerSwampRivers,net/minecraft/shared +GenLayerVoronoiZoom,net/minecraft/shared +GenLayerZoom,net/minecraft/shared +HttpUtil,net/minecraft/shared +HttpUtilRunnable,net/minecraft/shared +IAdminCommand,net/minecraft/shared +IAnimals,net/minecraft/shared +IBehaviorDispenseItem,net/minecraft/shared +IBlockAccess,net/minecraft/shared +IBlockSource,net/minecraft/shared +IChunkLoader,net/minecraft/shared +IChunkProvider,net/minecraft/shared +ICommand,net/minecraft/shared +ICommandManager,net/minecraft/shared +ICommandSender,net/minecraft/shared +ICrafting,net/minecraft/shared +IEnchantmentModifier,net/minecraft/shared +IEntityMultiPart,net/minecraft/shared +IEntitySelector,net/minecraft/shared +IInvBasic,net/minecraft/shared +IInventory,net/minecraft/shared +ILocatableSource,net/minecraft/shared +ILocation,net/minecraft/shared +IMerchant,net/minecraft/shared +IMob,net/minecraft/shared +INetworkManager,net/minecraft/shared +INpc,net/minecraft/shared +IntCache,net/minecraft/shared +IntHashMap,net/minecraft/shared +IntHashMapEntry,net/minecraft/shared +InventoryBasic,net/minecraft/shared +InventoryCrafting,net/minecraft/shared +InventoryCraftResult,net/minecraft/shared +InventoryEnderChest,net/minecraft/shared +InventoryLargeChest,net/minecraft/shared +InventoryMerchant,net/minecraft/shared +InventoryPlayer,net/minecraft/shared +InventoryRepair,net/minecraft/shared +IPlayerFileData,net/minecraft/shared +IPlayerUsage,net/minecraft/shared +IPosition,net/minecraft/shared +IProgressUpdate,net/minecraft/shared +IProjectile,net/minecraft/shared +IRangedAttackMob,net/minecraft/shared +IRecipe,net/minecraft/shared +IRegistry,net/minecraft/shared +ISaveFormat,net/minecraft/shared +ISaveHandler,net/minecraft/shared +IServer,net/minecraft/shared +IStatType,net/minecraft/shared +Item,net/minecraft/shared +ItemAnvilBlock,net/minecraft/shared +ItemAppleGold,net/minecraft/shared +ItemArmor,net/minecraft/shared +ItemAxe,net/minecraft/shared +ItemBed,net/minecraft/shared +ItemBlock,net/minecraft/shared +ItemBoat,net/minecraft/shared +ItemBow,net/minecraft/shared +ItemBucket,net/minecraft/shared +ItemBucketMilk,net/minecraft/shared +ItemCarrotOnAStick,net/minecraft/shared +ItemCloth,net/minecraft/shared +ItemCoal,net/minecraft/shared +ItemColored,net/minecraft/shared +ItemDoor,net/minecraft/shared +ItemDye,net/minecraft/shared +ItemEditableBook,net/minecraft/shared +ItemEgg,net/minecraft/shared +ItemEmptyMap,net/minecraft/shared +ItemEnderEye,net/minecraft/shared +ItemEnderPearl,net/minecraft/shared +ItemExpBottle,net/minecraft/shared +ItemFireball,net/minecraft/shared +ItemFishingRod,net/minecraft/shared +ItemFlintAndSteel,net/minecraft/shared +ItemFood,net/minecraft/shared +ItemGlassBottle,net/minecraft/shared +ItemHangingEntity,net/minecraft/shared +ItemHoe,net/minecraft/shared +ItemInWorldManager,net/minecraft/shared +ItemLeaves,net/minecraft/shared +ItemLilyPad,net/minecraft/shared +ItemMap,net/minecraft/shared +ItemMapBase,net/minecraft/shared +ItemMinecart,net/minecraft/shared +ItemMonsterPlacer,net/minecraft/shared +ItemMultiTextureTile,net/minecraft/shared +ItemPickaxe,net/minecraft/shared +ItemPiston,net/minecraft/shared +ItemPotion,net/minecraft/shared +ItemRecord,net/minecraft/shared +ItemRedstone,net/minecraft/shared +ItemReed,net/minecraft/shared +ItemSaddle,net/minecraft/shared +ItemSeedFood,net/minecraft/shared +ItemSeeds,net/minecraft/shared +ItemShears,net/minecraft/shared +ItemSign,net/minecraft/shared +ItemSimpleFoiled,net/minecraft/shared +ItemSkull,net/minecraft/shared +ItemSlab,net/minecraft/shared +ItemSnowball,net/minecraft/shared +ItemSoup,net/minecraft/shared +ItemSpade,net/minecraft/shared +ItemStack,net/minecraft/shared +ItemSword,net/minecraft/shared +ItemTool,net/minecraft/shared +ItemWritableBook,net/minecraft/shared +IThreadedFileIO,net/minecraft/shared +IUpdatePlayerListBox,net/minecraft/shared +IWorldAccess,net/minecraft/shared +LongHashMap,net/minecraft/shared +LongHashMapEntry,net/minecraft/shared +LowerStringMap,net/minecraft/shared +MapColor,net/minecraft/shared +MapCoord,net/minecraft/shared +MapData,net/minecraft/shared +MapGenBase,net/minecraft/shared +MapGenCaves,net/minecraft/shared +MapGenCavesHell,net/minecraft/shared +MapGenMineshaft,net/minecraft/shared +MapGenNetherBridge,net/minecraft/shared +MapGenRavine,net/minecraft/shared +MapGenScatteredFeature,net/minecraft/shared +MapGenStronghold,net/minecraft/shared +MapGenStructure,net/minecraft/shared +MapGenVillage,net/minecraft/shared +MapInfo,net/minecraft/shared +MapStorage,net/minecraft/shared +Material,net/minecraft/shared +MaterialLiquid,net/minecraft/shared +MaterialLogic,net/minecraft/shared +MaterialPortal,net/minecraft/shared +MaterialTransparent,net/minecraft/shared +MaterialWeb,net/minecraft/shared +MathHelper,net/minecraft/shared +MemoryConnection,net/minecraft/shared +MerchantRecipe,net/minecraft/shared +MerchantRecipeList,net/minecraft/shared +MinecraftException,net/minecraft/shared +MovingObjectPosition,net/minecraft/shared +NBTBase,net/minecraft/shared +NBTTagByte,net/minecraft/shared +NBTTagByteArray,net/minecraft/shared +NBTTagCompound,net/minecraft/shared +NBTTagDouble,net/minecraft/shared +NBTTagEnd,net/minecraft/shared +NBTTagFloat,net/minecraft/shared +NBTTagInt,net/minecraft/shared +NBTTagIntArray,net/minecraft/shared +NBTTagList,net/minecraft/shared +NBTTagLong,net/minecraft/shared +NBTTagShort,net/minecraft/shared +NBTTagString,net/minecraft/shared +NetHandler,net/minecraft/shared +NetLoginHandler,net/minecraft/shared +NetServerHandler,net/minecraft/shared +NetworkListenThread,net/minecraft/shared +NextTickListEntry,net/minecraft/shared +NibbleArray,net/minecraft/shared +NibbleArrayReader,net/minecraft/shared +NoiseGenerator,net/minecraft/shared +NoiseGeneratorOctaves,net/minecraft/shared +NoiseGeneratorPerlin,net/minecraft/shared +NumberInvalidException,net/minecraft/shared +Packet,net/minecraft/shared +Packet0KeepAlive,net/minecraft/shared +Packet100OpenWindow,net/minecraft/shared +Packet101CloseWindow,net/minecraft/shared +Packet102WindowClick,net/minecraft/shared +Packet103SetSlot,net/minecraft/shared +Packet104WindowItems,net/minecraft/shared +Packet105UpdateProgressbar,net/minecraft/shared +Packet106Transaction,net/minecraft/shared +Packet107CreativeSetSlot,net/minecraft/shared +Packet108EnchantItem,net/minecraft/shared +Packet10Flying,net/minecraft/shared +Packet11PlayerPosition,net/minecraft/shared +Packet12PlayerLook,net/minecraft/shared +Packet130UpdateSign,net/minecraft/shared +Packet131MapData,net/minecraft/shared +Packet132TileEntityData,net/minecraft/shared +Packet13PlayerLookMove,net/minecraft/shared +Packet14BlockDig,net/minecraft/shared +Packet15Place,net/minecraft/shared +Packet16BlockItemSwitch,net/minecraft/shared +Packet17Sleep,net/minecraft/shared +Packet18Animation,net/minecraft/shared +Packet19EntityAction,net/minecraft/shared +Packet1Login,net/minecraft/shared +Packet200Statistic,net/minecraft/shared +Packet201PlayerInfo,net/minecraft/shared +Packet202PlayerAbilities,net/minecraft/shared +Packet203AutoComplete,net/minecraft/shared +Packet204ClientInfo,net/minecraft/shared +Packet205ClientCommand,net/minecraft/shared +Packet20NamedEntitySpawn,net/minecraft/shared +Packet21PickupSpawn,net/minecraft/shared +Packet22Collect,net/minecraft/shared +Packet23VehicleSpawn,net/minecraft/shared +Packet24MobSpawn,net/minecraft/shared +Packet250CustomPayload,net/minecraft/shared +Packet252SharedKey,net/minecraft/shared +Packet253ServerAuthData,net/minecraft/shared +Packet254ServerPing,net/minecraft/shared +Packet255KickDisconnect,net/minecraft/shared +Packet25EntityPainting,net/minecraft/shared +Packet26EntityExpOrb,net/minecraft/shared +Packet28EntityVelocity,net/minecraft/shared +Packet29DestroyEntity,net/minecraft/shared +Packet2ClientProtocol,net/minecraft/shared +Packet30Entity,net/minecraft/shared +Packet31RelEntityMove,net/minecraft/shared +Packet32EntityLook,net/minecraft/shared +Packet33RelEntityMoveLook,net/minecraft/shared +Packet34EntityTeleport,net/minecraft/shared +Packet35EntityHeadRotation,net/minecraft/shared +Packet38EntityStatus,net/minecraft/shared +Packet39AttachEntity,net/minecraft/shared +Packet3Chat,net/minecraft/shared +Packet40EntityMetadata,net/minecraft/shared +Packet41EntityEffect,net/minecraft/shared +Packet42RemoveEntityEffect,net/minecraft/shared +Packet43Experience,net/minecraft/shared +Packet4UpdateTime,net/minecraft/shared +Packet51MapChunk,net/minecraft/shared +Packet51MapChunkData,net/minecraft/shared +Packet52MultiBlockChange,net/minecraft/shared +Packet53BlockChange,net/minecraft/shared +Packet54PlayNoteBlock,net/minecraft/shared +Packet55BlockDestroy,net/minecraft/shared +Packet56MapChunks,net/minecraft/shared +Packet5PlayerInventory,net/minecraft/shared +Packet60Explosion,net/minecraft/shared +Packet61DoorChange,net/minecraft/shared +Packet62LevelSound,net/minecraft/shared +Packet6SpawnPosition,net/minecraft/shared +Packet70GameEvent,net/minecraft/shared +Packet71Weather,net/minecraft/shared +Packet7UseEntity,net/minecraft/shared +Packet8UpdateHealth,net/minecraft/shared +Packet9Respawn,net/minecraft/shared +PacketCount,net/minecraft/shared +Path,net/minecraft/shared +PathEntity,net/minecraft/shared +PathFinder,net/minecraft/shared +PathNavigate,net/minecraft/shared +PathPoint,net/minecraft/shared +PlayerCapabilities,net/minecraft/shared +PlayerInstance,net/minecraft/shared +PlayerManager,net/minecraft/shared +PlayerNotFoundException,net/minecraft/shared +PlayerPositionComparator,net/minecraft/shared +PlayerSelector,net/minecraft/shared +PlayerUsageSnooper,net/minecraft/shared +PlayerUsageSnooperThread,net/minecraft/shared +PortalPosition,net/minecraft/shared +PositionImpl,net/minecraft/shared +Potion,net/minecraft/shared +PotionEffect,net/minecraft/shared +PotionHealth,net/minecraft/shared +PotionHelper,net/minecraft/shared +Profiler,net/minecraft/shared +ProfilerResult,net/minecraft/shared +PropertyManager,net/minecraft/shared +RailLogic,net/minecraft/shared +RandomPositionGenerator,net/minecraft/shared +RConConsoleSource,net/minecraft/shared +RConOutputStream,net/minecraft/shared +RConThreadBase,net/minecraft/shared +RConThreadClient,net/minecraft/shared +RConThreadMain,net/minecraft/shared +RConThreadQuery,net/minecraft/shared +RConThreadQueryAuth,net/minecraft/shared +RConUtils,net/minecraft/shared +RecipesArmor,net/minecraft/shared +RecipesArmorDyes,net/minecraft/shared +RecipesCrafting,net/minecraft/shared +RecipesDyes,net/minecraft/shared +RecipesFood,net/minecraft/shared +RecipesIngots,net/minecraft/shared +RecipesMapCloning,net/minecraft/shared +RecipesMapExtending,net/minecraft/shared +RecipeSorter,net/minecraft/shared +RecipesTools,net/minecraft/shared +RecipesWeapons,net/minecraft/shared +RedstoneUpdateInfo,net/minecraft/shared +RegionFile,net/minecraft/shared +RegionFileCache,net/minecraft/shared +RegionFileChunkBuffer,net/minecraft/shared +RegistryDefaulted,net/minecraft/shared +RegistrySimple,net/minecraft/shared +ReportedException,net/minecraft/shared +SaveFormatOld,net/minecraft/shared +SaveHandler,net/minecraft/shared +ServerBlockEvent,net/minecraft/shared +ServerBlockEventList,net/minecraft/shared +ServerCommand,net/minecraft/shared +ServerCommandManager,net/minecraft/shared +ServerConfigurationManager,net/minecraft/shared +ServerListenThread,net/minecraft/shared +ShapedRecipes,net/minecraft/shared +ShapelessRecipes,net/minecraft/shared +Slot,net/minecraft/shared +SlotArmor,net/minecraft/shared +SlotBeacon,net/minecraft/shared +SlotBrewingStandIngredient,net/minecraft/shared +SlotBrewingStandPotion,net/minecraft/shared +SlotCrafting,net/minecraft/shared +SlotEnchantment,net/minecraft/shared +SlotEnchantmentTable,net/minecraft/shared +SlotFurnace,net/minecraft/shared +SlotMerchantResult,net/minecraft/shared +SlotRepair,net/minecraft/shared +SpawnerAnimals,net/minecraft/shared +SpawnListEntry,net/minecraft/shared +StatBase,net/minecraft/shared +StatBasic,net/minecraft/shared +StatCollector,net/minecraft/shared +StatCrafting,net/minecraft/shared +StatList,net/minecraft/shared +StatTypeDistance,net/minecraft/shared +StatTypeSimple,net/minecraft/shared +StatTypeTime,net/minecraft/shared +StepSound,net/minecraft/shared +StepSoundAnvil,net/minecraft/shared +StepSoundSand,net/minecraft/shared +StepSoundStone,net/minecraft/shared +StringTranslate,net/minecraft/shared +StringUtils,net/minecraft/shared +StructureBoundingBox,net/minecraft/shared +StructureComponent,net/minecraft/shared +StructureMineshaftPieces,net/minecraft/shared +StructureMineshaftStart,net/minecraft/shared +StructureNetherBridgePieces,net/minecraft/shared +StructureNetherBridgePieceWeight,net/minecraft/shared +StructureNetherBridgeStart,net/minecraft/shared +StructurePieceBlockSelector,net/minecraft/shared +StructureScatteredFeatureStart,net/minecraft/shared +StructureScatteredFeatureStones,net/minecraft/shared +StructureStart,net/minecraft/shared +StructureStrongholdPieces,net/minecraft/shared +StructureStrongholdPieceWeight,net/minecraft/shared +StructureStrongholdPieceWeight2,net/minecraft/shared +StructureStrongholdPieceWeight3,net/minecraft/shared +StructureStrongholdStart,net/minecraft/shared +StructureStrongholdStones,net/minecraft/shared +StructureVillagePieces,net/minecraft/shared +StructureVillagePieceWeight,net/minecraft/shared +StructureVillageStart,net/minecraft/shared +SyntaxErrorException,net/minecraft/shared +TcpConnection,net/minecraft/shared +TcpMasterThread,net/minecraft/shared +TcpMonitorThread,net/minecraft/shared +TcpReaderThread,net/minecraft/shared +TcpWriterThread,net/minecraft/shared +Teleporter,net/minecraft/shared +ThreadedFileIOBase,net/minecraft/shared +ThreadLoginVerifier,net/minecraft/shared +ThreadMinecraftServer,net/minecraft/shared +TileEntity,net/minecraft/shared +TileEntityBeacon,net/minecraft/shared +TileEntityBrewingStand,net/minecraft/shared +TileEntityChest,net/minecraft/shared +TileEntityCommandBlock,net/minecraft/shared +TileEntityDispenser,net/minecraft/shared +TileEntityEnchantmentTable,net/minecraft/shared +TileEntityEnderChest,net/minecraft/shared +TileEntityEndPortal,net/minecraft/shared +TileEntityFurnace,net/minecraft/shared +TileEntityMobSpawner,net/minecraft/shared +TileEntityNote,net/minecraft/shared +TileEntityPiston,net/minecraft/shared +TileEntityRecordPlayer,net/minecraft/shared +TileEntitySign,net/minecraft/shared +TileEntitySkull,net/minecraft/shared +Tuple,net/minecraft/shared +Vec3,net/minecraft/shared +Vec3Pool,net/minecraft/shared +Village,net/minecraft/shared +VillageAgressor,net/minecraft/shared +VillageCollection,net/minecraft/shared +VillageDoorInfo,net/minecraft/shared +VillageSiege,net/minecraft/shared +WatchableObject,net/minecraft/shared +WeightedRandom,net/minecraft/shared +WeightedRandomChestContent,net/minecraft/shared +WeightedRandomItem,net/minecraft/shared +World,net/minecraft/shared +WorldChunkManager,net/minecraft/shared +WorldChunkManagerHell,net/minecraft/shared +WorldGenBigMushroom,net/minecraft/shared +WorldGenBigTree,net/minecraft/shared +WorldGenCactus,net/minecraft/shared +WorldGenClay,net/minecraft/shared +WorldGenDeadBush,net/minecraft/shared +WorldGenDesertWells,net/minecraft/shared +WorldGenDungeons,net/minecraft/shared +WorldGenerator,net/minecraft/shared +WorldGeneratorBonusChest,net/minecraft/shared +WorldGenFire,net/minecraft/shared +WorldGenFlowers,net/minecraft/shared +WorldGenForest,net/minecraft/shared +WorldGenGlowStone1,net/minecraft/shared +WorldGenGlowStone2,net/minecraft/shared +WorldGenHellLava,net/minecraft/shared +WorldGenHugeTrees,net/minecraft/shared +WorldGenLakes,net/minecraft/shared +WorldGenLiquids,net/minecraft/shared +WorldGenMinable,net/minecraft/shared +WorldGenPumpkin,net/minecraft/shared +WorldGenReed,net/minecraft/shared +WorldGenSand,net/minecraft/shared +WorldGenShrub,net/minecraft/shared +WorldGenSpikes,net/minecraft/shared +WorldGenSwamp,net/minecraft/shared +WorldGenTaiga1,net/minecraft/shared +WorldGenTaiga2,net/minecraft/shared +WorldGenTallGrass,net/minecraft/shared +WorldGenTrees,net/minecraft/shared +WorldGenVines,net/minecraft/shared +WorldGenWaterlily,net/minecraft/shared +WorldInfo,net/minecraft/shared +WorldManager,net/minecraft/shared +WorldProvider,net/minecraft/shared +WorldProviderEnd,net/minecraft/shared +WorldProviderHell,net/minecraft/shared +WorldProviderSurface,net/minecraft/shared +WorldSavedData,net/minecraft/shared +WorldServer,net/minecraft/shared +WorldServerMulti,net/minecraft/shared +WorldSettings,net/minecraft/shared +WorldType,net/minecraft/shared +WrongUsageException,net/minecraft/shared diff --git a/fml/install/fml.py b/fml/install/fml.py index e302467de..558fb1683 100644 --- a/fml/install/fml.py +++ b/fml/install/fml.py @@ -329,8 +329,6 @@ def setup_fml(fml_dir, mcp_dir): #cleanup_source cleanup_source(src_dir) - merge_client_server(mcp_dir) - os.chdir(mcp_dir) commands = Commands(verify=True) updatemd5_side(mcp_dir, commands, CLIENT) @@ -386,48 +384,6 @@ def get_joined_srg(mcp_dir): values[pts[0]][pts[1]] = pts[2] return values - -def merge_client_server(mcp_dir): - client = os.path.join(mcp_dir, 'src', 'minecraft') - shared = os.path.join(mcp_dir, 'src', 'common') - - client_jar = os.path.join(mcp_dir, 'jars', 'bin', 'minecraft.jar') - server_jar = os.path.join(mcp_dir, 'jars', 'minecraft_server.jar') - joined_srg = get_joined_srg(mcp_dir)['CL:'] - - if not os.path.isfile(client_jar) or not os.path.isfile(server_jar): - return - - if not os.path.isdir(shared): - os.makedirs(shared) - - server_classes = [] - - zip = ZipFile(server_jar) - for i in zip.filelist: - if i.filename.endswith('.class'): - server_classes.append(i.filename[:-6]) - - for cls in server_classes: - if cls in joined_srg.keys(): - cls = joined_srg[cls] - cls += '.java' - - f_client = os.path.normpath(os.path.join(client, cls.replace('/', os.path.sep))).replace(os.path.sep, '/') - f_shared = os.path.normpath(os.path.join(shared, cls.replace('/', os.path.sep))).replace(os.path.sep, '/') - - if not os.path.isfile(f_client): - print 'Issue Merging File Not Found: ' + cls - continue - - if not cls.rfind('/') == -1: - new_dir = os.path.join(shared, cls.rsplit('/', 1)[0]) - if not os.path.isdir(new_dir): - os.makedirs(new_dir) - - shutil.move(f_client, f_shared) - - cleanDirs(client) def apply_fml_patches(fml_dir, mcp_dir, src_dir, copy_files=True): #Delete /common/cpw to get rid of the Side/SideOnly classes used in decompilation @@ -687,6 +643,8 @@ def setup_mcp(fml_dir, mcp_dir, dont_gen_conf=True): print 'Copying FML conf' shutil.copytree(fml_conf, mcp_conf) + gen_renamed_conf(mcp_dir, fml_dir) + #update workspace print 'Fixing MCP Workspace' if not os.path.isdir(os.path.join(fml_dir, 'eclipse', 'Clean-Client')): @@ -838,3 +796,106 @@ def gen_merged_csv(common_map, in_file, out_file, main_key='searge'): writer.writeheader() for row in sorted(common, key=lambda row: row[main_key]): writer.writerow(row) + +def repackage_class(pkgs, cls): + if cls.startswith('net/minecraft/src/'): + tmp = cls[18:] + if tmp in pkgs.keys(): + return '%s/%s' % (pkgs[tmp], tmp) + return cls + +typere = re.compile('([\[ZBCSIJFDV]|L([\w\/]+);)') +def repackage_signature(pkgs, sig): + global typere + sig1 = sig + params = sig.rsplit(')', 1)[0][1:] + ret = sig.rsplit(')', 1)[1] + + sig = '(' + for arg in typere.findall(params): + if len(arg[1]) > 0: + sig += 'L%s;' % repackage_class(pkgs, arg[1]) + else: + sig += arg[0] + sig += ')' + for tmp in typere.findall(ret): + if len(tmp[1]) > 0: + sig += 'L%s;' % repackage_class(pkgs, tmp[1]) + else: + sig += tmp[0] + return sig + +def gen_renamed_conf(mcp_dir, fml_dir): + pkg_file = os.path.join(fml_dir, 'conf', 'packages.csv') + srg_in = os.path.join(mcp_dir, 'conf', 'joined.srg') + srg_out = os.path.join(mcp_dir, 'conf', 'packaged.srg') + exc_in = os.path.join(mcp_dir, 'conf', 'joined.exc') + exc_out = os.path.join(mcp_dir, 'conf', 'packaged.exc') + + pkgs = {} + if os.path.isfile(pkg_file): + with open(pkg_file) as fh: + reader = csv.DictReader(fh) + for line in reader: + pkgs[line['class']] = line['package'] + + print 'Creating re-packaged srg' + with open(srg_in, 'r') as inf: + with open(srg_out, 'wb') as outf: + for line in inf: + pts = line.rstrip('\r\n').split(' ') + if pts[0] == 'PK:': + outf.write(' '.join(pts) + '\n') + elif pts[0] == 'CL:': + pts[2] = repackage_class(pkgs, pts[2]) + outf.write('CL: %s %s\n' % (pts[1], pts[2])) + elif pts[0] == 'FD:': + tmp = pts[2].rsplit('/', 1) + tmp[0] = repackage_class(pkgs, tmp[0]) + outf.write('FD: %s %s/%s\n' % (pts[1], tmp[0], tmp[1])) + elif pts[0] == 'MD:': + tmp = pts[3].rsplit('/', 1) + pts[3] = '%s/%s' % (repackage_class(pkgs, tmp[0]), tmp[1]) + pts[4] = repackage_signature(pkgs, pts[4]) + outf.write('MD: %s %s %s %s\n' % (pts[1], pts[2], pts[3], pts[4])) + else: + print 'Line unknown in SRG: ' + line + outf.write(line) + + excre = re.compile('([\[ZBCSIJFDV]|L([\w\/]+);)') + print 'Creating re-packaged exc' + with open(exc_in, 'r') as inf: + with open(exc_out, 'wb') as outf: + for line in inf: + line = line.rstrip('\r\n') + cls = line.split('.')[0] + named = line.rsplit('=', 1)[1] + line = line[len(cls)+1:-1*len(named)-1] + func = line.split('(')[0] + + tmp = named.split('|', 1) + if len(tmp[0]) > 0: + excs = tmp[0].split(',') + for x in range(len(excs)): + excs[x] = repackage_class(pkgs, excs[x]) + named = '%s|%s' % (','.join(excs), tmp[1]) + + sig = repackage_signature(pkgs, line[len(func):]) + cls = repackage_class(pkgs, cls) + outf.write('%s.%s%s=%s\n' % (cls, func, sig, named)) + + print 'Creating re-packaged MCP patch' + patch_in = os.path.join(mcp_dir, 'conf', 'patches', 'minecraft_ff.patch') + patch_tmp = os.path.join(mcp_dir, 'conf', 'patches', 'minecraft_ff.patch.tmp') + + regnms = re.compile(r'net\\minecraft\\src\\(\w+)') + with open(patch_in, 'r') as fh: + buf = fh.read() + def mapname(match): + return repackage_class(pkgs, match.group(0).replace('\\', '/')).replace('/', '\\') + buf = regnms.sub(mapname, buf) + + with open(patch_tmp, 'w') as fh: + fh.write(buf) + + shutil.move(patch_tmp, patch_in) \ No newline at end of file diff --git a/fml/packages.cfg b/fml/packages.cfg new file mode 100644 index 000000000..e927aa4b3 --- /dev/null +++ b/fml/packages.cfg @@ -0,0 +1,1327 @@ +class,package +AchievementList,aet/minecraft/src +AABBLocalPool,bet/minecraft/src +Achievement,cet/minecraft/src +AABBPool,det/minecraft/src +AchievementMap,net/minecraft/src +ActiveRenderInfo,net/minecraft/src +AnvilChunkLoader,net/minecraft/src +AnvilChunkLoaderPending,net/minecraft/src +AnvilConverterData,net/minecraft/src +AnvilSaveConverter,net/minecraft/src +AnvilSaveConverterFileFilter,net/minecraft/src +AnvilSaveHandler,net/minecraft/src +AxisAlignedBB,net/minecraft/src +BanEntry,net/minecraft/src +BanList,net/minecraft/src +BehaviorArrowDispense,net/minecraft/src +BehaviorBucketEmptyDispense,net/minecraft/src +BehaviorBucketFullDispense,net/minecraft/src +BehaviorDefaultDispenseItem,net/minecraft/src +BehaviorDispenseBoat,net/minecraft/src +BehaviorDispenseFireball,net/minecraft/src +BehaviorDispenseItemProvider,net/minecraft/src +BehaviorDispenseMinecart,net/minecraft/src +BehaviorEggDispense,net/minecraft/src +BehaviorExpBottleDispense,net/minecraft/src +BehaviorMobEggDispense,net/minecraft/src +BehaviorPotionDispense,net/minecraft/src +BehaviorPotionDispenseLogic,net/minecraft/src +BehaviorProjectileDispense,net/minecraft/src +BehaviorSnowballDispense,net/minecraft/src +BiomeCache,net/minecraft/src +BiomeCacheBlock,net/minecraft/src +BiomeDecorator,net/minecraft/src +BiomeEndDecorator,net/minecraft/src +BiomeGenBase,net/minecraft/src +BiomeGenBeach,net/minecraft/src +BiomeGenDesert,net/minecraft/src +BiomeGenEnd,net/minecraft/src +BiomeGenForest,net/minecraft/src +BiomeGenHell,net/minecraft/src +BiomeGenHills,net/minecraft/src +BiomeGenJungle,net/minecraft/src +BiomeGenMushroomIsland,net/minecraft/src +BiomeGenOcean,net/minecraft/src +BiomeGenPlains,net/minecraft/src +BiomeGenRiver,net/minecraft/src +BiomeGenSnow,net/minecraft/src +BiomeGenSwamp,net/minecraft/src +BiomeGenTaiga,net/minecraft/src +Block,net/minecraft/src +BlockAnvil,net/minecraft/src +BlockBeacon,net/minecraft/src +BlockBed,net/minecraft/src +BlockBookshelf,net/minecraft/src +BlockBreakable,net/minecraft/src +BlockBrewingStand,net/minecraft/src +BlockButton,net/minecraft/src +BlockCactus,net/minecraft/src +BlockCake,net/minecraft/src +BlockCarrot,net/minecraft/src +BlockCauldron,net/minecraft/src +BlockChest,net/minecraft/src +BlockClay,net/minecraft/src +BlockCloth,net/minecraft/src +BlockCocoa,net/minecraft/src +BlockCommandBlock,net/minecraft/src +BlockContainer,net/minecraft/src +BlockCrops,net/minecraft/src +BlockDeadBush,net/minecraft/src +BlockDetectorRail,net/minecraft/src +BlockDirectional,net/minecraft/src +BlockDirt,net/minecraft/src +BlockDispenser,net/minecraft/src +BlockDoor,net/minecraft/src +BlockDragonEgg,net/minecraft/src +BlockEnchantmentTable,net/minecraft/src +BlockEndPortal,net/minecraft/src +BlockEndPortalFrame,net/minecraft/src +BlockEnderChest,net/minecraft/src +BlockEventData,net/minecraft/src +BlockFarmland,net/minecraft/src +BlockFence,net/minecraft/src +BlockFenceGate,net/minecraft/src +BlockFire,net/minecraft/src +BlockFlower,net/minecraft/src +BlockFlowerPot,net/minecraft/src +BlockFlowing,net/minecraft/src +BlockFluid,net/minecraft/src +BlockFurnace,net/minecraft/src +BlockGlass,net/minecraft/src +BlockGlowStone,net/minecraft/src +BlockGrass,net/minecraft/src +BlockGravel,net/minecraft/src +BlockHalfSlab,net/minecraft/src +BlockIce,net/minecraft/src +BlockJukeBox,net/minecraft/src +BlockLadder,net/minecraft/src +BlockLeaves,net/minecraft/src +BlockLeavesBase,net/minecraft/src +BlockLever,net/minecraft/src +BlockLilyPad,net/minecraft/src +BlockLockedChest,net/minecraft/src +BlockLog,net/minecraft/src +BlockMelon,net/minecraft/src +BlockMobSpawner,net/minecraft/src +BlockMushroom,net/minecraft/src +BlockMushroomCap,net/minecraft/src +BlockMycelium,net/minecraft/src +BlockNetherStalk,net/minecraft/src +BlockNetherrack,net/minecraft/src +BlockNote,net/minecraft/src +BlockObsidian,net/minecraft/src +BlockOre,net/minecraft/src +BlockOreStorage,net/minecraft/src +BlockPane,net/minecraft/src +BlockPistonBase,net/minecraft/src +BlockPistonExtension,net/minecraft/src +BlockPistonMoving,net/minecraft/src +BlockPortal,net/minecraft/src +BlockPotato,net/minecraft/src +BlockPressurePlate,net/minecraft/src +BlockPumpkin,net/minecraft/src +BlockRail,net/minecraft/src +BlockRedstoneLight,net/minecraft/src +BlockRedstoneOre,net/minecraft/src +BlockRedstoneRepeater,net/minecraft/src +BlockRedstoneTorch,net/minecraft/src +BlockRedstoneWire,net/minecraft/src +BlockReed,net/minecraft/src +BlockSand,net/minecraft/src +BlockSandStone,net/minecraft/src +BlockSapling,net/minecraft/src +BlockSign,net/minecraft/src +BlockSilverfish,net/minecraft/src +BlockSkull,net/minecraft/src +BlockSnow,net/minecraft/src +BlockSnowBlock,net/minecraft/src +BlockSoulSand,net/minecraft/src +BlockSourceImpl,net/minecraft/src +BlockSponge,net/minecraft/src +BlockStairs,net/minecraft/src +BlockStationary,net/minecraft/src +BlockStem,net/minecraft/src +BlockStep,net/minecraft/src +BlockStone,net/minecraft/src +BlockStoneBrick,net/minecraft/src +BlockTNT,net/minecraft/src +BlockTallGrass,net/minecraft/src +BlockTorch,net/minecraft/src +BlockTrapDoor,net/minecraft/src +BlockTripWire,net/minecraft/src +BlockTripWireSource,net/minecraft/src +BlockVine,net/minecraft/src +BlockWall,net/minecraft/src +BlockWeb,net/minecraft/src +BlockWood,net/minecraft/src +BlockWoodSlab,net/minecraft/src +BlockWorkbench,net/minecraft/src +BossStatus,net/minecraft/src +CallableBlockDataValue,net/minecraft/src +CallableBlockLocation,net/minecraft/src +CallableBlockType,net/minecraft/src +CallableChunkPosHash,net/minecraft/src +CallableClientMemoryStats,net/minecraft/src +CallableClientProfiler,net/minecraft/src +CallableCrashMemoryReport,net/minecraft/src +CallableEntityType,net/minecraft/src +CallableGLInfo,net/minecraft/src +CallableIntCache,net/minecraft/src +CallableIsFeatureChunk,net/minecraft/src +CallableIsModded,net/minecraft/src +CallableIsServerModded,net/minecraft/src +CallableJVMFlags,net/minecraft/src +CallableJavaInfo,net/minecraft/src +CallableJavaInfo2,net/minecraft/src +CallableLWJGLVersion,net/minecraft/src +CallableLastTickedParticle,net/minecraft/src +CallableLevelDimension,net/minecraft/src +CallableLevelGamemode,net/minecraft/src +CallableLevelGenerator,net/minecraft/src +CallableLevelGeneratorOptions,net/minecraft/src +CallableLevelSeed,net/minecraft/src +CallableLevelSpawnLocation,net/minecraft/src +CallableLevelStorageVersion,net/minecraft/src +CallableLevelTime,net/minecraft/src +CallableLevelWeather,net/minecraft/src +CallableLvl1,net/minecraft/src +CallableLvl2,net/minecraft/src +CallableLvl3,net/minecraft/src +CallableMPL1,net/minecraft/src +CallableMPL2,net/minecraft/src +CallableMemoryInfo,net/minecraft/src +CallableMinecraftVersion,net/minecraft/src +CallableModded,net/minecraft/src +CallableMouseLocation,net/minecraft/src +CallableOSInfo,net/minecraft/src +CallableParticlePositionInfo,net/minecraft/src +CallableParticleScreenName,net/minecraft/src +CallableScreenName,net/minecraft/src +CallableScreenSize,net/minecraft/src +CallableServerMemoryStats,net/minecraft/src +CallableServerProfiler,net/minecraft/src +CallableServerType,net/minecraft/src +CallableStructureType,net/minecraft/src +CallableSuspiciousClasses,net/minecraft/src +CallableTagCompound1,net/minecraft/src +CallableTagCompound2,net/minecraft/src +CallableTexturePack,net/minecraft/src +CallableTickingScreenName,net/minecraft/src +CallableTileEntityName,net/minecraft/src +CallableType,net/minecraft/src +CallableType2,net/minecraft/src +CallableType3,net/minecraft/src +CallableUpdatingScreenName,net/minecraft/src +CanvasCrashReport,net/minecraft/src +CanvasMinecraftApplet,net/minecraft/src +CanvasMojangLogo,net/minecraft/src +ChatAllowedCharacters,net/minecraft/src +ChatClickData,net/minecraft/src +ChatLine,net/minecraft/src +ChestItemRenderHelper,net/minecraft/src +Chunk,net/minecraft/src +ChunkCache,net/minecraft/src +ChunkCoordIntPair,net/minecraft/src +ChunkCoordinates,net/minecraft/src +ChunkLoader,net/minecraft/src +ChunkPosition,net/minecraft/src +ChunkProviderClient,net/minecraft/src +ChunkProviderEnd,net/minecraft/src +ChunkProviderFlat,net/minecraft/src +ChunkProviderGenerate,net/minecraft/src +ChunkProviderHell,net/minecraft/src +ChunkProviderServer,net/minecraft/src +ClippingHelper,net/minecraft/src +ClippingHelperImpl,net/minecraft/src +CodecMus,net/minecraft/src +ColorizerFoliage,net/minecraft/src +ColorizerGrass,net/minecraft/src +ColorizerWater,net/minecraft/src +CommandBase,net/minecraft/src +CommandClearInventory,net/minecraft/src +CommandDebug,net/minecraft/src +CommandDefaultGameMode,net/minecraft/src +CommandDifficulty,net/minecraft/src +CommandEnchant,net/minecraft/src +CommandException,net/minecraft/src +CommandGameMode,net/minecraft/src +CommandGameRule,net/minecraft/src +CommandGive,net/minecraft/src +CommandHandler,net/minecraft/src +CommandHelp,net/minecraft/src +CommandKill,net/minecraft/src +CommandNotFoundException,net/minecraft/src +CommandServerBan,net/minecraft/src +CommandServerBanIp,net/minecraft/src +CommandServerBanlist,net/minecraft/src +CommandServerDeop,net/minecraft/src +CommandServerEmote,net/minecraft/src +CommandServerKick,net/minecraft/src +CommandServerList,net/minecraft/src +CommandServerMessage,net/minecraft/src +CommandServerOp,net/minecraft/src +CommandServerPardon,net/minecraft/src +CommandServerPardonIp,net/minecraft/src +CommandServerPublishLocal,net/minecraft/src +CommandServerSaveAll,net/minecraft/src +CommandServerSaveOff,net/minecraft/src +CommandServerSaveOn,net/minecraft/src +CommandServerSay,net/minecraft/src +CommandServerStop,net/minecraft/src +CommandServerTp,net/minecraft/src +CommandServerWhitelist,net/minecraft/src +CommandSetSpawnpoint,net/minecraft/src +CommandShowSeed,net/minecraft/src +CommandTime,net/minecraft/src +CommandToggleDownfall,net/minecraft/src +CommandWeather,net/minecraft/src +CommandXP,net/minecraft/src +ComparatorClassSorter,net/minecraft/src +ComponentMineshaftCorridor,net/minecraft/src +ComponentMineshaftCross,net/minecraft/src +ComponentMineshaftRoom,net/minecraft/src +ComponentMineshaftStairs,net/minecraft/src +ComponentNetherBridgeCorridor,net/minecraft/src +ComponentNetherBridgeCorridor2,net/minecraft/src +ComponentNetherBridgeCorridor3,net/minecraft/src +ComponentNetherBridgeCorridor4,net/minecraft/src +ComponentNetherBridgeCorridor5,net/minecraft/src +ComponentNetherBridgeCrossing,net/minecraft/src +ComponentNetherBridgeCrossing2,net/minecraft/src +ComponentNetherBridgeCrossing3,net/minecraft/src +ComponentNetherBridgeEnd,net/minecraft/src +ComponentNetherBridgeEntrance,net/minecraft/src +ComponentNetherBridgeNetherStalkRoom,net/minecraft/src +ComponentNetherBridgePiece,net/minecraft/src +ComponentNetherBridgeStairs,net/minecraft/src +ComponentNetherBridgeStartPiece,net/minecraft/src +ComponentNetherBridgeStraight,net/minecraft/src +ComponentNetherBridgeThrone,net/minecraft/src +ComponentScatteredFeature,net/minecraft/src +ComponentScatteredFeatureDesertPyramid,net/minecraft/src +ComponentScatteredFeatureJunglePyramid,net/minecraft/src +ComponentScatteredFeaturePieces2,net/minecraft/src +ComponentScatteredFeatureSwampHut,net/minecraft/src +ComponentStronghold,net/minecraft/src +ComponentStrongholdChestCorridor,net/minecraft/src +ComponentStrongholdCorridor,net/minecraft/src +ComponentStrongholdCrossing,net/minecraft/src +ComponentStrongholdLeftTurn,net/minecraft/src +ComponentStrongholdLibrary,net/minecraft/src +ComponentStrongholdPortalRoom,net/minecraft/src +ComponentStrongholdPrison,net/minecraft/src +ComponentStrongholdRightTurn,net/minecraft/src +ComponentStrongholdRoomCrossing,net/minecraft/src +ComponentStrongholdStairs,net/minecraft/src +ComponentStrongholdStairs2,net/minecraft/src +ComponentStrongholdStairsStraight,net/minecraft/src +ComponentStrongholdStraight,net/minecraft/src +ComponentVillage,net/minecraft/src +ComponentVillageChurch,net/minecraft/src +ComponentVillageField,net/minecraft/src +ComponentVillageField2,net/minecraft/src +ComponentVillageHall,net/minecraft/src +ComponentVillageHouse1,net/minecraft/src +ComponentVillageHouse2,net/minecraft/src +ComponentVillageHouse3,net/minecraft/src +ComponentVillageHouse4_Garden,net/minecraft/src +ComponentVillagePathGen,net/minecraft/src +ComponentVillageRoadPiece,net/minecraft/src +ComponentVillageStartPiece,net/minecraft/src +ComponentVillageTorch,net/minecraft/src +ComponentVillageWell,net/minecraft/src +ComponentVillageWoodHut,net/minecraft/src +CompressedStreamTools,net/minecraft/src +ConsoleLogFormatter,net/minecraft/src +ConsoleLogManager,net/minecraft/src +Container,net/minecraft/src +ContainerBeacon,net/minecraft/src +ContainerBrewingStand,net/minecraft/src +ContainerChest,net/minecraft/src +ContainerCreative,net/minecraft/src +ContainerDispenser,net/minecraft/src +ContainerEnchantment,net/minecraft/src +ContainerFurnace,net/minecraft/src +ContainerMerchant,net/minecraft/src +ContainerPlayer,net/minecraft/src +ContainerRepair,net/minecraft/src +ContainerSheep,net/minecraft/src +ContainerWorkbench,net/minecraft/src +ConvertingProgressUpdate,net/minecraft/src +CraftingManager,net/minecraft/src +CrashReport,net/minecraft/src +CrashReportCategory,net/minecraft/src +CrashReportCategoryEntry,net/minecraft/src +CreativeCrafting,net/minecraft/src +CreativeTabBlock,net/minecraft/src +CreativeTabBrewing,net/minecraft/src +CreativeTabCombat,net/minecraft/src +CreativeTabDeco,net/minecraft/src +CreativeTabFood,net/minecraft/src +CreativeTabInventory,net/minecraft/src +CreativeTabMaterial,net/minecraft/src +CreativeTabMisc,net/minecraft/src +CreativeTabRedstone,net/minecraft/src +CreativeTabSearch,net/minecraft/src +CreativeTabTools,net/minecraft/src +CreativeTabTransport,net/minecraft/src +CreativeTabs,net/minecraft/src +CryptManager,net/minecraft/src +DamageSource,net/minecraft/src +DataWatcher,net/minecraft/src +DedicatedPlayerList,net/minecraft/src +DedicatedServer,net/minecraft/src +DedicatedServerCommandThread,net/minecraft/src +DedicatedServerListenThread,net/minecraft/src +DedicatedServerSleepThread,net/minecraft/src +DemoWorldManager,net/minecraft/src +DemoWorldServer,net/minecraft/src +DerivedWorldInfo,net/minecraft/src +DestroyBlockProgress,net/minecraft/src +Direction,net/minecraft/src +EffectRenderer,net/minecraft/src +Empty3,net/minecraft/src +EmptyChunk,net/minecraft/src +Enchantment,net/minecraft/src +EnchantmentArrowDamage,net/minecraft/src +EnchantmentArrowFire,net/minecraft/src +EnchantmentArrowInfinite,net/minecraft/src +EnchantmentArrowKnockback,net/minecraft/src +EnchantmentDamage,net/minecraft/src +EnchantmentData,net/minecraft/src +EnchantmentDigging,net/minecraft/src +EnchantmentDurability,net/minecraft/src +EnchantmentFireAspect,net/minecraft/src +EnchantmentHelper,net/minecraft/src +EnchantmentKnockback,net/minecraft/src +EnchantmentLootBonus,net/minecraft/src +EnchantmentModifierDamage,net/minecraft/src +EnchantmentModifierLiving,net/minecraft/src +EnchantmentNameParts,net/minecraft/src +EnchantmentOxygen,net/minecraft/src +EnchantmentProtection,net/minecraft/src +EnchantmentUntouching,net/minecraft/src +EnchantmentWaterWorker,net/minecraft/src +Entity,net/minecraft/src +EntityAIArrowAttack,net/minecraft/src +EntityAIAttackOnCollide,net/minecraft/src +EntityAIAvoidEntity,net/minecraft/src +EntityAIBase,net/minecraft/src +EntityAIBeg,net/minecraft/src +EntityAIBreakDoor,net/minecraft/src +EntityAIControlledByPlayer,net/minecraft/src +EntityAICreeperSwell,net/minecraft/src +EntityAIDefendVillage,net/minecraft/src +EntityAIDoorInteract,net/minecraft/src +EntityAIEatGrass,net/minecraft/src +EntityAIFleeSun,net/minecraft/src +EntityAIFollowGolem,net/minecraft/src +EntityAIFollowOwner,net/minecraft/src +EntityAIFollowParent,net/minecraft/src +EntityAIHurtByTarget,net/minecraft/src +EntityAILeapAtTarget,net/minecraft/src +EntityAILookAtTradePlayer,net/minecraft/src +EntityAILookAtVillager,net/minecraft/src +EntityAILookIdle,net/minecraft/src +EntityAIMate,net/minecraft/src +EntityAIMoveIndoors,net/minecraft/src +EntityAIMoveThroughVillage,net/minecraft/src +EntityAIMoveTowardsTarget,net/minecraft/src +EntityAIMoveTwardsRestriction,net/minecraft/src +EntityAINearestAttackableTarget,net/minecraft/src +EntityAINearestAttackableTargetSorter,net/minecraft/src +EntityAIOcelotAttack,net/minecraft/src +EntityAIOcelotSit,net/minecraft/src +EntityAIOpenDoor,net/minecraft/src +EntityAIOwnerHurtByTarget,net/minecraft/src +EntityAIOwnerHurtTarget,net/minecraft/src +EntityAIPanic,net/minecraft/src +EntityAIPlay,net/minecraft/src +EntityAIRestrictOpenDoor,net/minecraft/src +EntityAIRestrictSun,net/minecraft/src +EntityAISit,net/minecraft/src +EntityAISwimming,net/minecraft/src +EntityAITarget,net/minecraft/src +EntityAITargetNonTamed,net/minecraft/src +EntityAITaskEntry,net/minecraft/src +EntityAITasks,net/minecraft/src +EntityAITempt,net/minecraft/src +EntityAITradePlayer,net/minecraft/src +EntityAIVillagerMate,net/minecraft/src +EntityAIWander,net/minecraft/src +EntityAIWatchClosest,net/minecraft/src +EntityAIWatchClosest2,net/minecraft/src +EntityAgeable,net/minecraft/src +EntityAmbientCreature,net/minecraft/src +EntityAnimal,net/minecraft/src +EntityArrow,net/minecraft/src +EntityAuraFX,net/minecraft/src +EntityBat,net/minecraft/src +EntityBlaze,net/minecraft/src +EntityBoat,net/minecraft/src +EntityBodyHelper,net/minecraft/src +EntityBreakingFX,net/minecraft/src +EntityBubbleFX,net/minecraft/src +EntityCaveSpider,net/minecraft/src +EntityChicken,net/minecraft/src +EntityClientPlayerMP,net/minecraft/src +EntityCloudFX,net/minecraft/src +EntityCow,net/minecraft/src +EntityCreature,net/minecraft/src +EntityCreeper,net/minecraft/src +EntityCrit2FX,net/minecraft/src +EntityCritFX,net/minecraft/src +EntityDamageSource,net/minecraft/src +EntityDamageSourceIndirect,net/minecraft/src +EntityDiggingFX,net/minecraft/src +EntityDragon,net/minecraft/src +EntityDragonPart,net/minecraft/src +EntityDropParticleFX,net/minecraft/src +EntityEgg,net/minecraft/src +EntityEggInfo,net/minecraft/src +EntityEnchantmentTableParticleFX,net/minecraft/src +EntityEnderCrystal,net/minecraft/src +EntityEnderEye,net/minecraft/src +EntityEnderPearl,net/minecraft/src +EntityEnderman,net/minecraft/src +EntityExpBottle,net/minecraft/src +EntityExplodeFX,net/minecraft/src +EntityFX,net/minecraft/src +EntityFallingSand,net/minecraft/src +EntityFireball,net/minecraft/src +EntityFishHook,net/minecraft/src +EntityFlameFX,net/minecraft/src +EntityFlying,net/minecraft/src +EntityFootStepFX,net/minecraft/src +EntityGhast,net/minecraft/src +EntityGiantZombie,net/minecraft/src +EntityGolem,net/minecraft/src +EntityHanging,net/minecraft/src +EntityHeartFX,net/minecraft/src +EntityHugeExplodeFX,net/minecraft/src +EntityIronGolem,net/minecraft/src +EntityItem,net/minecraft/src +EntityItemFrame,net/minecraft/src +EntityJumpHelper,net/minecraft/src +EntityLargeExplodeFX,net/minecraft/src +EntityLargeFireball,net/minecraft/src +EntityLavaFX,net/minecraft/src +EntityLightningBolt,net/minecraft/src +EntityList,net/minecraft/src +EntityLiving,net/minecraft/src +EntityLookHelper,net/minecraft/src +EntityMagmaCube,net/minecraft/src +EntityMinecart,net/minecraft/src +EntityMob,net/minecraft/src +EntityMooshroom,net/minecraft/src +EntityMoveHelper,net/minecraft/src +EntityNoteFX,net/minecraft/src +EntityOcelot,net/minecraft/src +EntityOtherPlayerMP,net/minecraft/src +EntityPainting,net/minecraft/src +EntityPickupFX,net/minecraft/src +EntityPig,net/minecraft/src +EntityPigZombie,net/minecraft/src +EntityPlayer,net/minecraft/src +EntityPlayerMP,net/minecraft/src +EntityPlayerSP,net/minecraft/src +EntityPortalFX,net/minecraft/src +EntityPotion,net/minecraft/src +EntityRainFX,net/minecraft/src +EntityReddustFX,net/minecraft/src +EntityRenderer,net/minecraft/src +EntitySenses,net/minecraft/src +EntitySheep,net/minecraft/src +EntitySilverfish,net/minecraft/src +EntitySkeleton,net/minecraft/src +EntitySlime,net/minecraft/src +EntitySmallFireball,net/minecraft/src +EntitySmokeFX,net/minecraft/src +EntitySnowShovelFX,net/minecraft/src +EntitySnowball,net/minecraft/src +EntitySnowman,net/minecraft/src +EntitySorter,net/minecraft/src +EntitySpellParticleFX,net/minecraft/src +EntitySpider,net/minecraft/src +EntitySplashFX,net/minecraft/src +EntitySquid,net/minecraft/src +EntitySuspendFX,net/minecraft/src +EntityTNTPrimed,net/minecraft/src +EntityTameable,net/minecraft/src +EntityThrowable,net/minecraft/src +EntityTracker,net/minecraft/src +EntityTrackerEntry,net/minecraft/src +EntityVillager,net/minecraft/src +EntityWaterMob,net/minecraft/src +EntityWeatherEffect,net/minecraft/src +EntityWitch,net/minecraft/src +EntityWither,net/minecraft/src +EntityWitherAttackFilter,net/minecraft/src +EntityWitherSkull,net/minecraft/src +EntityWolf,net/minecraft/src +EntityXPOrb,net/minecraft/src +EntityZombie,net/minecraft/src +EnumAction,net/minecraft/src +EnumArmorMaterial,net/minecraft/src +EnumArt,net/minecraft/src +EnumCreatureAttribute,net/minecraft/src +EnumCreatureType,net/minecraft/src +EnumDoor,net/minecraft/src +EnumDoorHelper,net/minecraft/src +EnumEnchantmentType,net/minecraft/src +EnumEntitySize,net/minecraft/src +EnumEntitySizeHelper,net/minecraft/src +EnumFacing,net/minecraft/src +EnumGameType,net/minecraft/src +EnumMobType,net/minecraft/src +EnumMovingObjectType,net/minecraft/src +EnumOS,net/minecraft/src +EnumOSHelper,net/minecraft/src +EnumOptions,net/minecraft/src +EnumOptionsHelper,net/minecraft/src +EnumRarity,net/minecraft/src +EnumSkyBlock,net/minecraft/src +EnumStatus,net/minecraft/src +EnumToolMaterial,net/minecraft/src +Explosion,net/minecraft/src +ExtendedBlockStorage,net/minecraft/src +Facing,net/minecraft/src +FilterIMob,net/minecraft/src +FlatGeneratorInfo,net/minecraft/src +FlatLayerInfo,net/minecraft/src +FontRenderer,net/minecraft/src +FoodStats,net/minecraft/src +Frustrum,net/minecraft/src +FurnaceRecipes,net/minecraft/src +GLAllocation,net/minecraft/src +GameRuleValue,net/minecraft/src +GameRules,net/minecraft/src +GameSettings,net/minecraft/src +GameWindowListener,net/minecraft/src +GenLayer,net/minecraft/src +GenLayerAddIsland,net/minecraft/src +GenLayerAddMushroomIsland,net/minecraft/src +GenLayerAddSnow,net/minecraft/src +GenLayerBiome,net/minecraft/src +GenLayerFuzzyZoom,net/minecraft/src +GenLayerHills,net/minecraft/src +GenLayerIsland,net/minecraft/src +GenLayerRiver,net/minecraft/src +GenLayerRiverInit,net/minecraft/src +GenLayerRiverMix,net/minecraft/src +GenLayerShore,net/minecraft/src +GenLayerSmooth,net/minecraft/src +GenLayerSwampRivers,net/minecraft/src +GenLayerVoronoiZoom,net/minecraft/src +GenLayerZoom,net/minecraft/src +Gui,net/minecraft/src +GuiAchievement,net/minecraft/src +GuiAchievements,net/minecraft/src +GuiBeacon,net/minecraft/src +GuiBeaconButton,net/minecraft/src +GuiBeaconButtonCancel,net/minecraft/src +GuiBeaconButtonConfirm,net/minecraft/src +GuiBeaconButtonPower,net/minecraft/src +GuiBrewingStand,net/minecraft/src +GuiButton,net/minecraft/src +GuiButtonLanguage,net/minecraft/src +GuiButtonMerchant,net/minecraft/src +GuiButtonNextPage,net/minecraft/src +GuiChat,net/minecraft/src +GuiChatConfirmLink,net/minecraft/src +GuiChest,net/minecraft/src +GuiCommandBlock,net/minecraft/src +GuiConfirmOpenLink,net/minecraft/src +GuiConnecting,net/minecraft/src +GuiContainer,net/minecraft/src +GuiContainerCreative,net/minecraft/src +GuiControls,net/minecraft/src +GuiCrafting,net/minecraft/src +GuiCreateFlatWorld,net/minecraft/src +GuiCreateFlatWorldListSlot,net/minecraft/src +GuiCreateWorld,net/minecraft/src +GuiDisconnected,net/minecraft/src +GuiDispenser,net/minecraft/src +GuiDownloadTerrain,net/minecraft/src +GuiEditSign,net/minecraft/src +GuiEnchantment,net/minecraft/src +GuiErrorScreen,net/minecraft/src +GuiFlatPresets,net/minecraft/src +GuiFlatPresetsItem,net/minecraft/src +GuiFlatPresetsListSlot,net/minecraft/src +GuiFurnace,net/minecraft/src +GuiGameOver,net/minecraft/src +GuiIngame,net/minecraft/src +GuiIngameMenu,net/minecraft/src +GuiInventory,net/minecraft/src +GuiLanguage,net/minecraft/src +GuiLogFormatter,net/minecraft/src +GuiLogOutputHandler,net/minecraft/src +GuiMainMenu,net/minecraft/src +GuiMemoryErrorScreen,net/minecraft/src +GuiMerchant,net/minecraft/src +GuiMultiplayer,net/minecraft/src +GuiNewChat,net/minecraft/src +GuiOptions,net/minecraft/src +GuiParticle,net/minecraft/src +GuiPlayerInfo,net/minecraft/src +GuiProgress,net/minecraft/src +GuiRenameWorld,net/minecraft/src +GuiRepair,net/minecraft/src +GuiScreen,net/minecraft/src +GuiScreenAddServer,net/minecraft/src +GuiScreenBook,net/minecraft/src +GuiScreenDemo,net/minecraft/src +GuiScreenServerList,net/minecraft/src +GuiSelectWorld,net/minecraft/src +GuiShareToLan,net/minecraft/src +GuiSleepMP,net/minecraft/src +GuiSlider,net/minecraft/src +GuiSlot,net/minecraft/src +GuiSlotLanguage,net/minecraft/src +GuiSlotServer,net/minecraft/src +GuiSlotStats,net/minecraft/src +GuiSlotStatsBlock,net/minecraft/src +GuiSlotStatsGeneral,net/minecraft/src +GuiSlotStatsItem,net/minecraft/src +GuiSmallButton,net/minecraft/src +GuiSnooper,net/minecraft/src +GuiSnooperList,net/minecraft/src +GuiStats,net/minecraft/src +GuiStatsComponent,net/minecraft/src +GuiStatsListener,net/minecraft/src +GuiTextField,net/minecraft/src +GuiTexturePackSlot,net/minecraft/src +GuiTexturePacks,net/minecraft/src +GuiVideoSettings,net/minecraft/src +GuiWinGame,net/minecraft/src +GuiWorldSlot,net/minecraft/src +GuiYesNo,net/minecraft/src +HttpUtil,net/minecraft/src +HttpUtilRunnable,net/minecraft/src +IAdminCommand,net/minecraft/src +IAnimals,net/minecraft/src +IBehaviorDispenseItem,net/minecraft/src +IBlockAccess,net/minecraft/src +IBlockSource,net/minecraft/src +IBossDisplayData,net/minecraft/src +ICamera,net/minecraft/src +IChunkLoader,net/minecraft/src +IChunkProvider,net/minecraft/src +ICommand,net/minecraft/src +ICommandManager,net/minecraft/src +ICommandSender,net/minecraft/src +ICrafting,net/minecraft/src +IDownloadSuccess,net/minecraft/src +IEnchantmentModifier,net/minecraft/src +IEntityMultiPart,net/minecraft/src +IEntitySelector,net/minecraft/src +IImageBuffer,net/minecraft/src +IInvBasic,net/minecraft/src +IInventory,net/minecraft/src +ILocatableSource,net/minecraft/src +ILocation,net/minecraft/src +IMerchant,net/minecraft/src +IMob,net/minecraft/src +INetworkManager,net/minecraft/src +INpc,net/minecraft/src +IPlayerFileData,net/minecraft/src +IPlayerUsage,net/minecraft/src +IPosition,net/minecraft/src +IProgressUpdate,net/minecraft/src +IProjectile,net/minecraft/src +IRangedAttackMob,net/minecraft/src +IRecipe,net/minecraft/src +IRegistry,net/minecraft/src +ISaveFormat,net/minecraft/src +ISaveHandler,net/minecraft/src +IServer,net/minecraft/src +IStatStringFormat,net/minecraft/src +IStatType,net/minecraft/src +ITexturePack,net/minecraft/src +IThreadedFileIO,net/minecraft/src +IUpdatePlayerListBox,net/minecraft/src +IWorldAccess,net/minecraft/src +ImageBufferDownload,net/minecraft/src +IntCache,net/minecraft/src +IntHashMap,net/minecraft/src +IntHashMapEntry,net/minecraft/src +IntegratedPlayerList,net/minecraft/src +IntegratedServer,net/minecraft/src +IntegratedServerListenThread,net/minecraft/src +InventoryBasic,net/minecraft/src +InventoryCraftResult,net/minecraft/src +InventoryCrafting,net/minecraft/src +InventoryEffectRenderer,net/minecraft/src +InventoryEnderChest,net/minecraft/src +InventoryLargeChest,net/minecraft/src +InventoryMerchant,net/minecraft/src +InventoryPlayer,net/minecraft/src +InventoryRepair,net/minecraft/src +Item,net/minecraft/src +ItemAnvilBlock,net/minecraft/src +ItemAppleGold,net/minecraft/src +ItemArmor,net/minecraft/src +ItemAxe,net/minecraft/src +ItemBed,net/minecraft/src +ItemBlock,net/minecraft/src +ItemBoat,net/minecraft/src +ItemBow,net/minecraft/src +ItemBucket,net/minecraft/src +ItemBucketMilk,net/minecraft/src +ItemCarrotOnAStick,net/minecraft/src +ItemCloth,net/minecraft/src +ItemCoal,net/minecraft/src +ItemColored,net/minecraft/src +ItemDoor,net/minecraft/src +ItemDye,net/minecraft/src +ItemEditableBook,net/minecraft/src +ItemEgg,net/minecraft/src +ItemEmptyMap,net/minecraft/src +ItemEnderEye,net/minecraft/src +ItemEnderPearl,net/minecraft/src +ItemExpBottle,net/minecraft/src +ItemFireball,net/minecraft/src +ItemFishingRod,net/minecraft/src +ItemFlintAndSteel,net/minecraft/src +ItemFood,net/minecraft/src +ItemGlassBottle,net/minecraft/src +ItemHangingEntity,net/minecraft/src +ItemHoe,net/minecraft/src +ItemInWorldManager,net/minecraft/src +ItemLeaves,net/minecraft/src +ItemLilyPad,net/minecraft/src +ItemMap,net/minecraft/src +ItemMapBase,net/minecraft/src +ItemMinecart,net/minecraft/src +ItemMonsterPlacer,net/minecraft/src +ItemMultiTextureTile,net/minecraft/src +ItemPickaxe,net/minecraft/src +ItemPiston,net/minecraft/src +ItemPotion,net/minecraft/src +ItemRecord,net/minecraft/src +ItemRedstone,net/minecraft/src +ItemReed,net/minecraft/src +ItemRenderer,net/minecraft/src +ItemSaddle,net/minecraft/src +ItemSeedFood,net/minecraft/src +ItemSeeds,net/minecraft/src +ItemShears,net/minecraft/src +ItemSign,net/minecraft/src +ItemSimpleFoiled,net/minecraft/src +ItemSkull,net/minecraft/src +ItemSlab,net/minecraft/src +ItemSnowball,net/minecraft/src +ItemSoup,net/minecraft/src +ItemSpade,net/minecraft/src +ItemStack,net/minecraft/src +ItemSword,net/minecraft/src +ItemTool,net/minecraft/src +ItemWritableBook,net/minecraft/src +KeyBinding,net/minecraft/src +LanServer,net/minecraft/src +LanServerList,net/minecraft/src +LoadingScreenRenderer,net/minecraft/src +LongHashMap,net/minecraft/src +LongHashMapEntry,net/minecraft/src +LowerStringMap,net/minecraft/src +MD5String,net/minecraft/src +MapColor,net/minecraft/src +MapCoord,net/minecraft/src +MapData,net/minecraft/src +MapGenBase,net/minecraft/src +MapGenCaves,net/minecraft/src +MapGenCavesHell,net/minecraft/src +MapGenMineshaft,net/minecraft/src +MapGenNetherBridge,net/minecraft/src +MapGenRavine,net/minecraft/src +MapGenScatteredFeature,net/minecraft/src +MapGenStronghold,net/minecraft/src +MapGenStructure,net/minecraft/src +MapGenVillage,net/minecraft/src +MapInfo,net/minecraft/src +MapItemRenderer,net/minecraft/src +MapStorage,net/minecraft/src +Material,net/minecraft/src +MaterialLiquid,net/minecraft/src +MaterialLogic,net/minecraft/src +MaterialPortal,net/minecraft/src +MaterialTransparent,net/minecraft/src +MaterialWeb,net/minecraft/src +MathHelper,net/minecraft/src +MemoryConnection,net/minecraft/src +MerchantRecipe,net/minecraft/src +MerchantRecipeList,net/minecraft/src +MinecraftAppletImpl,net/minecraft/src +MinecraftError,net/minecraft/src +MinecraftException,net/minecraft/src +MinecraftFakeLauncher,net/minecraft/src +ModelBase,net/minecraft/src +ModelBat,net/minecraft/src +ModelBiped,net/minecraft/src +ModelBlaze,net/minecraft/src +ModelBoat,net/minecraft/src +ModelBook,net/minecraft/src +ModelBox,net/minecraft/src +ModelChest,net/minecraft/src +ModelChicken,net/minecraft/src +ModelCow,net/minecraft/src +ModelCreeper,net/minecraft/src +ModelDragon,net/minecraft/src +ModelEnderCrystal,net/minecraft/src +ModelEnderman,net/minecraft/src +ModelGhast,net/minecraft/src +ModelIronGolem,net/minecraft/src +ModelLargeChest,net/minecraft/src +ModelMagmaCube,net/minecraft/src +ModelMinecart,net/minecraft/src +ModelOcelot,net/minecraft/src +ModelPig,net/minecraft/src +ModelQuadruped,net/minecraft/src +ModelRenderer,net/minecraft/src +ModelSheep1,net/minecraft/src +ModelSheep2,net/minecraft/src +ModelSign,net/minecraft/src +ModelSilverfish,net/minecraft/src +ModelSkeleton,net/minecraft/src +ModelSkeletonHead,net/minecraft/src +ModelSlime,net/minecraft/src +ModelSnowMan,net/minecraft/src +ModelSpider,net/minecraft/src +ModelSquid,net/minecraft/src +ModelVillager,net/minecraft/src +ModelWitch,net/minecraft/src +ModelWither,net/minecraft/src +ModelWolf,net/minecraft/src +ModelZombie,net/minecraft/src +ModelZombieVillager,net/minecraft/src +MouseFilter,net/minecraft/src +MouseHelper,net/minecraft/src +MovementInput,net/minecraft/src +MovementInputFromOptions,net/minecraft/src +MovingObjectPosition,net/minecraft/src +MusInputStream,net/minecraft/src +NBTBase,net/minecraft/src +NBTTagByte,net/minecraft/src +NBTTagByteArray,net/minecraft/src +NBTTagCompound,net/minecraft/src +NBTTagDouble,net/minecraft/src +NBTTagEnd,net/minecraft/src +NBTTagFloat,net/minecraft/src +NBTTagInt,net/minecraft/src +NBTTagIntArray,net/minecraft/src +NBTTagList,net/minecraft/src +NBTTagLong,net/minecraft/src +NBTTagShort,net/minecraft/src +NBTTagString,net/minecraft/src +NetClientHandler,net/minecraft/src +NetClientWebTextures,net/minecraft/src +NetHandler,net/minecraft/src +NetLoginHandler,net/minecraft/src +NetServerHandler,net/minecraft/src +NetworkListenThread,net/minecraft/src +NextTickListEntry,net/minecraft/src +NibbleArray,net/minecraft/src +NibbleArrayReader,net/minecraft/src +NoiseGenerator,net/minecraft/src +NoiseGeneratorOctaves,net/minecraft/src +NoiseGeneratorPerlin,net/minecraft/src +NpcMerchant,net/minecraft/src +NumberInvalidException,net/minecraft/src +OpenGlCapsChecker,net/minecraft/src +OpenGlHelper,net/minecraft/src +Packet,net/minecraft/src +Packet0KeepAlive,net/minecraft/src +Packet100OpenWindow,net/minecraft/src +Packet101CloseWindow,net/minecraft/src +Packet102WindowClick,net/minecraft/src +Packet103SetSlot,net/minecraft/src +Packet104WindowItems,net/minecraft/src +Packet105UpdateProgressbar,net/minecraft/src +Packet106Transaction,net/minecraft/src +Packet107CreativeSetSlot,net/minecraft/src +Packet108EnchantItem,net/minecraft/src +Packet10Flying,net/minecraft/src +Packet11PlayerPosition,net/minecraft/src +Packet12PlayerLook,net/minecraft/src +Packet130UpdateSign,net/minecraft/src +Packet131MapData,net/minecraft/src +Packet132TileEntityData,net/minecraft/src +Packet13PlayerLookMove,net/minecraft/src +Packet14BlockDig,net/minecraft/src +Packet15Place,net/minecraft/src +Packet16BlockItemSwitch,net/minecraft/src +Packet17Sleep,net/minecraft/src +Packet18Animation,net/minecraft/src +Packet19EntityAction,net/minecraft/src +Packet1Login,net/minecraft/src +Packet200Statistic,net/minecraft/src +Packet201PlayerInfo,net/minecraft/src +Packet202PlayerAbilities,net/minecraft/src +Packet203AutoComplete,net/minecraft/src +Packet204ClientInfo,net/minecraft/src +Packet205ClientCommand,net/minecraft/src +Packet20NamedEntitySpawn,net/minecraft/src +Packet21PickupSpawn,net/minecraft/src +Packet22Collect,net/minecraft/src +Packet23VehicleSpawn,net/minecraft/src +Packet24MobSpawn,net/minecraft/src +Packet250CustomPayload,net/minecraft/src +Packet252SharedKey,net/minecraft/src +Packet253ServerAuthData,net/minecraft/src +Packet254ServerPing,net/minecraft/src +Packet255KickDisconnect,net/minecraft/src +Packet25EntityPainting,net/minecraft/src +Packet26EntityExpOrb,net/minecraft/src +Packet28EntityVelocity,net/minecraft/src +Packet29DestroyEntity,net/minecraft/src +Packet2ClientProtocol,net/minecraft/src +Packet30Entity,net/minecraft/src +Packet31RelEntityMove,net/minecraft/src +Packet32EntityLook,net/minecraft/src +Packet33RelEntityMoveLook,net/minecraft/src +Packet34EntityTeleport,net/minecraft/src +Packet35EntityHeadRotation,net/minecraft/src +Packet38EntityStatus,net/minecraft/src +Packet39AttachEntity,net/minecraft/src +Packet3Chat,net/minecraft/src +Packet40EntityMetadata,net/minecraft/src +Packet41EntityEffect,net/minecraft/src +Packet42RemoveEntityEffect,net/minecraft/src +Packet43Experience,net/minecraft/src +Packet4UpdateTime,net/minecraft/src +Packet51MapChunk,net/minecraft/src +Packet51MapChunkData,net/minecraft/src +Packet52MultiBlockChange,net/minecraft/src +Packet53BlockChange,net/minecraft/src +Packet54PlayNoteBlock,net/minecraft/src +Packet55BlockDestroy,net/minecraft/src +Packet56MapChunks,net/minecraft/src +Packet5PlayerInventory,net/minecraft/src +Packet60Explosion,net/minecraft/src +Packet61DoorChange,net/minecraft/src +Packet62LevelSound,net/minecraft/src +Packet6SpawnPosition,net/minecraft/src +Packet70GameEvent,net/minecraft/src +Packet71Weather,net/minecraft/src +Packet7UseEntity,net/minecraft/src +Packet8UpdateHealth,net/minecraft/src +Packet9Respawn,net/minecraft/src +PacketCount,net/minecraft/src +PanelCrashReport,net/minecraft/src +Particle,net/minecraft/src +Path,net/minecraft/src +PathEntity,net/minecraft/src +PathFinder,net/minecraft/src +PathNavigate,net/minecraft/src +PathPoint,net/minecraft/src +PlayerCapabilities,net/minecraft/src +PlayerControllerMP,net/minecraft/src +PlayerInstance,net/minecraft/src +PlayerListBox,net/minecraft/src +PlayerManager,net/minecraft/src +PlayerNotFoundException,net/minecraft/src +PlayerPositionComparator,net/minecraft/src +PlayerSelector,net/minecraft/src +PlayerUsageSnooper,net/minecraft/src +PlayerUsageSnooperThread,net/minecraft/src +PortalPosition,net/minecraft/src +PositionImpl,net/minecraft/src +PositionTextureVertex,net/minecraft/src +Potion,net/minecraft/src +PotionEffect,net/minecraft/src +PotionHealth,net/minecraft/src +PotionHelper,net/minecraft/src +Profiler,net/minecraft/src +ProfilerResult,net/minecraft/src +PropertyManager,net/minecraft/src +RConConsoleSource,net/minecraft/src +RConOutputStream,net/minecraft/src +RConThreadBase,net/minecraft/src +RConThreadClient,net/minecraft/src +RConThreadMain,net/minecraft/src +RConThreadQuery,net/minecraft/src +RConThreadQueryAuth,net/minecraft/src +RConUtils,net/minecraft/src +RailLogic,net/minecraft/src +RandomPositionGenerator,net/minecraft/src +RecipeSorter,net/minecraft/src +RecipesArmor,net/minecraft/src +RecipesArmorDyes,net/minecraft/src +RecipesCrafting,net/minecraft/src +RecipesDyes,net/minecraft/src +RecipesFood,net/minecraft/src +RecipesIngots,net/minecraft/src +RecipesMapCloning,net/minecraft/src +RecipesMapExtending,net/minecraft/src +RecipesTools,net/minecraft/src +RecipesWeapons,net/minecraft/src +RedstoneUpdateInfo,net/minecraft/src +RegionFile,net/minecraft/src +RegionFileCache,net/minecraft/src +RegionFileChunkBuffer,net/minecraft/src +RegistryDefaulted,net/minecraft/src +RegistrySimple,net/minecraft/src +Render,net/minecraft/src +RenderArrow,net/minecraft/src +RenderBat,net/minecraft/src +RenderBiped,net/minecraft/src +RenderBlaze,net/minecraft/src +RenderBlocks,net/minecraft/src +RenderBoat,net/minecraft/src +RenderChicken,net/minecraft/src +RenderCow,net/minecraft/src +RenderCreeper,net/minecraft/src +RenderDragon,net/minecraft/src +RenderEnchantmentTable,net/minecraft/src +RenderEndPortal,net/minecraft/src +RenderEnderCrystal,net/minecraft/src +RenderEnderman,net/minecraft/src +RenderEngine,net/minecraft/src +RenderEntity,net/minecraft/src +RenderFallingSand,net/minecraft/src +RenderFireball,net/minecraft/src +RenderFish,net/minecraft/src +RenderGhast,net/minecraft/src +RenderGiantZombie,net/minecraft/src +RenderGlobal,net/minecraft/src +RenderHelper,net/minecraft/src +RenderIronGolem,net/minecraft/src +RenderItem,net/minecraft/src +RenderItemFrame,net/minecraft/src +RenderLightningBolt,net/minecraft/src +RenderList,net/minecraft/src +RenderLiving,net/minecraft/src +RenderMagmaCube,net/minecraft/src +RenderManager,net/minecraft/src +RenderMinecart,net/minecraft/src +RenderMooshroom,net/minecraft/src +RenderOcelot,net/minecraft/src +RenderPainting,net/minecraft/src +RenderPig,net/minecraft/src +RenderPlayer,net/minecraft/src +RenderSheep,net/minecraft/src +RenderSilverfish,net/minecraft/src +RenderSkeleton,net/minecraft/src +RenderSlime,net/minecraft/src +RenderSnowMan,net/minecraft/src +RenderSnowball,net/minecraft/src +RenderSorter,net/minecraft/src +RenderSpider,net/minecraft/src +RenderSquid,net/minecraft/src +RenderTNTPrimed,net/minecraft/src +RenderVillager,net/minecraft/src +RenderWitch,net/minecraft/src +RenderWither,net/minecraft/src +RenderWitherSkull,net/minecraft/src +RenderWolf,net/minecraft/src +RenderXPOrb,net/minecraft/src +RenderZombie,net/minecraft/src +ReportedException,net/minecraft/src +SaveFormatComparator,net/minecraft/src +SaveFormatOld,net/minecraft/src +SaveHandler,net/minecraft/src +SaveHandlerMP,net/minecraft/src +ScaledResolution,net/minecraft/src +ScreenChatOptions,net/minecraft/src +ScreenShotHelper,net/minecraft/src +ServerAddress,net/minecraft/src +ServerBlockEvent,net/minecraft/src +ServerBlockEventList,net/minecraft/src +ServerCommand,net/minecraft/src +ServerCommandManager,net/minecraft/src +ServerConfigurationManager,net/minecraft/src +ServerData,net/minecraft/src +ServerGUI,net/minecraft/src +ServerGuiCommandListener,net/minecraft/src +ServerGuiFocusAdapter,net/minecraft/src +ServerList,net/minecraft/src +ServerListenThread,net/minecraft/src +ServerWindowAdapter,net/minecraft/src +Session,net/minecraft/src +ShapedRecipes,net/minecraft/src +ShapelessRecipes,net/minecraft/src +Slot,net/minecraft/src +SlotArmor,net/minecraft/src +SlotBeacon,net/minecraft/src +SlotBrewingStandIngredient,net/minecraft/src +SlotBrewingStandPotion,net/minecraft/src +SlotCrafting,net/minecraft/src +SlotCreativeInventory,net/minecraft/src +SlotEnchantment,net/minecraft/src +SlotEnchantmentTable,net/minecraft/src +SlotFurnace,net/minecraft/src +SlotMerchantResult,net/minecraft/src +SlotRepair,net/minecraft/src +SorterStatsBlock,net/minecraft/src +SorterStatsItem,net/minecraft/src +SoundManager,net/minecraft/src +SoundPool,net/minecraft/src +SoundPoolEntry,net/minecraft/src +SoundUpdaterMinecart,net/minecraft/src +SpawnListEntry,net/minecraft/src +SpawnerAnimals,net/minecraft/src +StatBase,net/minecraft/src +StatBasic,net/minecraft/src +StatCollector,net/minecraft/src +StatCrafting,net/minecraft/src +StatFileWriter,net/minecraft/src +StatList,net/minecraft/src +StatStringFormatKeyInv,net/minecraft/src +StatTypeDistance,net/minecraft/src +StatTypeSimple,net/minecraft/src +StatTypeTime,net/minecraft/src +StatsSyncher,net/minecraft/src +StepSound,net/minecraft/src +StepSoundAnvil,net/minecraft/src +StepSoundSand,net/minecraft/src +StepSoundStone,net/minecraft/src +StringTranslate,net/minecraft/src +StringUtils,net/minecraft/src +StructureBoundingBox,net/minecraft/src +StructureComponent,net/minecraft/src +StructureMineshaftPieces,net/minecraft/src +StructureMineshaftStart,net/minecraft/src +StructureNetherBridgePieceWeight,net/minecraft/src +StructureNetherBridgePieces,net/minecraft/src +StructureNetherBridgeStart,net/minecraft/src +StructurePieceBlockSelector,net/minecraft/src +StructureScatteredFeatureStart,net/minecraft/src +StructureScatteredFeatureStones,net/minecraft/src +StructureStart,net/minecraft/src +StructureStrongholdPieceWeight,net/minecraft/src +StructureStrongholdPieceWeight2,net/minecraft/src +StructureStrongholdPieceWeight3,net/minecraft/src +StructureStrongholdPieces,net/minecraft/src +StructureStrongholdStart,net/minecraft/src +StructureStrongholdStones,net/minecraft/src +StructureVillagePieceWeight,net/minecraft/src +StructureVillagePieces,net/minecraft/src +StructureVillageStart,net/minecraft/src +SyntaxErrorException,net/minecraft/src +TcpConnection,net/minecraft/src +TcpMasterThread,net/minecraft/src +TcpMonitorThread,net/minecraft/src +TcpReaderThread,net/minecraft/src +TcpWriterThread,net/minecraft/src +Teleporter,net/minecraft/src +Tessellator,net/minecraft/src +TextureCompassFX,net/minecraft/src +TextureFX,net/minecraft/src +TextureFlamesFX,net/minecraft/src +TextureLavaFX,net/minecraft/src +TextureLavaFlowFX,net/minecraft/src +TextureOffset,net/minecraft/src +TexturePackCustom,net/minecraft/src +TexturePackDefault,net/minecraft/src +TexturePackDownloadSuccess,net/minecraft/src +TexturePackFolder,net/minecraft/src +TexturePackImplementation,net/minecraft/src +TexturePackList,net/minecraft/src +TexturePortalFX,net/minecraft/src +TextureWatchFX,net/minecraft/src +TextureWaterFX,net/minecraft/src +TextureWaterFlowFX,net/minecraft/src +TexturedQuad,net/minecraft/src +ThreadClientSleep,net/minecraft/src +ThreadConnectToServer,net/minecraft/src +ThreadDedicatedServer,net/minecraft/src +ThreadDownloadImage,net/minecraft/src +ThreadDownloadImageData,net/minecraft/src +ThreadDownloadResources,net/minecraft/src +ThreadLanServerFind,net/minecraft/src +ThreadLanServerPing,net/minecraft/src +ThreadLoginVerifier,net/minecraft/src +ThreadMinecraftServer,net/minecraft/src +ThreadPollServers,net/minecraft/src +ThreadShutdown,net/minecraft/src +ThreadStatSyncherReceive,net/minecraft/src +ThreadStatSyncherSend,net/minecraft/src +ThreadedFileIOBase,net/minecraft/src +TileEntity,net/minecraft/src +TileEntityBeacon,net/minecraft/src +TileEntityBeaconRenderer,net/minecraft/src +TileEntityBrewingStand,net/minecraft/src +TileEntityChest,net/minecraft/src +TileEntityChestRenderer,net/minecraft/src +TileEntityCommandBlock,net/minecraft/src +TileEntityDispenser,net/minecraft/src +TileEntityEnchantmentTable,net/minecraft/src +TileEntityEndPortal,net/minecraft/src +TileEntityEnderChest,net/minecraft/src +TileEntityEnderChestRenderer,net/minecraft/src +TileEntityFurnace,net/minecraft/src +TileEntityMobSpawner,net/minecraft/src +TileEntityMobSpawnerRenderer,net/minecraft/src +TileEntityNote,net/minecraft/src +TileEntityPiston,net/minecraft/src +TileEntityRecordPlayer,net/minecraft/src +TileEntityRenderer,net/minecraft/src +TileEntityRendererPiston,net/minecraft/src +TileEntitySign,net/minecraft/src +TileEntitySignRenderer,net/minecraft/src +TileEntitySkull,net/minecraft/src +TileEntitySkullRenderer,net/minecraft/src +TileEntitySpecialRenderer,net/minecraft/src +Timer,net/minecraft/src +Tuple,net/minecraft/src +Vec3,net/minecraft/src +Vec3Pool,net/minecraft/src +Village,net/minecraft/src +VillageAgressor,net/minecraft/src +VillageCollection,net/minecraft/src +VillageDoorInfo,net/minecraft/src +VillageSiege,net/minecraft/src +WatchableObject,net/minecraft/src +WeightedRandom,net/minecraft/src +WeightedRandomChestContent,net/minecraft/src +WeightedRandomItem,net/minecraft/src +World,net/minecraft/src +WorldChunkManager,net/minecraft/src +WorldChunkManagerHell,net/minecraft/src +WorldClient,net/minecraft/src +WorldGenBigMushroom,net/minecraft/src +WorldGenBigTree,net/minecraft/src +WorldGenCactus,net/minecraft/src +WorldGenClay,net/minecraft/src +WorldGenDeadBush,net/minecraft/src +WorldGenDesertWells,net/minecraft/src +WorldGenDungeons,net/minecraft/src +WorldGenFire,net/minecraft/src +WorldGenFlowers,net/minecraft/src +WorldGenForest,net/minecraft/src +WorldGenGlowStone1,net/minecraft/src +WorldGenGlowStone2,net/minecraft/src +WorldGenHellLava,net/minecraft/src +WorldGenHugeTrees,net/minecraft/src +WorldGenLakes,net/minecraft/src +WorldGenLiquids,net/minecraft/src +WorldGenMinable,net/minecraft/src +WorldGenPumpkin,net/minecraft/src +WorldGenReed,net/minecraft/src +WorldGenSand,net/minecraft/src +WorldGenShrub,net/minecraft/src +WorldGenSpikes,net/minecraft/src +WorldGenSwamp,net/minecraft/src +WorldGenTaiga1,net/minecraft/src +WorldGenTaiga2,net/minecraft/src +WorldGenTallGrass,net/minecraft/src +WorldGenTrees,net/minecraft/src +WorldGenVines,net/minecraft/src +WorldGenWaterlily,net/minecraft/src +WorldGenerator,net/minecraft/src +WorldGeneratorBonusChest,net/minecraft/src +WorldInfo,net/minecraft/src +WorldManager,net/minecraft/src +WorldProvider,net/minecraft/src +WorldProviderEnd,net/minecraft/src +WorldProviderHell,net/minecraft/src +WorldProviderSurface,net/minecraft/src +WorldRenderer,net/minecraft/src +WorldSavedData,net/minecraft/src +WorldServer,net/minecraft/src +WorldServerMulti,net/minecraft/src +WorldSettings,net/minecraft/src +WorldType,net/minecraft/src +WrongUsageException,net/minecraft/src diff --git a/fml/update_packages.py b/fml/update_packages.py new file mode 100644 index 000000000..ab0178365 --- /dev/null +++ b/fml/update_packages.py @@ -0,0 +1,97 @@ +import os, os.path, sys +import shutil, glob, fnmatch +import csv, re +from pprint import pprint +from zipfile import ZipFile + +def get_merged_info(): + mcp_dir = os.path.join(os.getcwd(), '..') + joined = os.path.join(mcp_dir, 'conf', 'joined.srg') + values = {'PK:': {}, 'CL:': {}, 'FD:': {}, 'MD:': {}} + + if not os.path.isfile(joined): + sys.path.append('install') + from fml import gen_merged_srg + values = gen_merged_srg(mcp_dir, None) + else: + with open(joined, 'r') as fh: + for line in fh: + pts = line.rstrip('\r\n').split(' ') + if pts[0] == 'MD:': + values[pts[0]][pts[1] + ' ' + pts[2]] = pts[3] + ' ' + pts[4] + else: + values[pts[0]][pts[1]] = pts[2] + return {t:{v.split(' ')[0]:k for k, v in m.items()} for t,m in values.items()} + +def main(): + client_jar = os.path.join('..', 'jars', 'bin', 'minecraft.jar.backup') + server_jar = os.path.join('..', 'jars', 'minecraft_server.jar.backup') + + server_classes = [] + client_classes = [] + + zip = ZipFile(client_jar) + for i in zip.filelist: + if i.filename.endswith('.class') and i.filename.find('/') == -1: + client_classes.append(i.filename[:-6]) + zip.close() + + zip = ZipFile(server_jar) + for i in zip.filelist: + if i.filename.endswith('.class') and i.filename.find('/') == -1: + server_classes.append(i.filename[:-6]) + zip.close() + + srg = get_merged_info() + pkgs = {} + pkg_file = os.path.join('conf', 'packages.csv') + + if os.path.isfile(pkg_file): + with open(pkg_file) as fh: + reader = csv.DictReader(fh) + for line in reader: + pkgs[line['class']] = line['package'] + + classes = [] + for cls in srg['CL:'].keys(): + if cls.startswith('net/minecraft/src/'): + obf = srg['CL:'][cls] + cls = cls[18:] + classes.append(cls) + if obf in server_classes: + server_classes.remove(obf) + server_classes.append(cls) + if obf in client_classes: + client_classes.remove(obf) + client_classes.append(cls) + + for cls in pkgs.keys(): + if not cls in classes: + print 'Removed Class: %s/%s' % (key, pkgs[key]) + + for cls in classes: + if not cls in pkgs.keys(): + print 'New Class: %s' % cls + if cls.find('/') == -1: + if cls in server_classes and cls in client_classes: + pkgs[cls] = 'net/minecraft/shared' + elif cls in server_classes: + pkgs[cls] = 'net/minecraft/server' + elif cls in client_classes: + pkgs[cls] = 'net/minecraft/client' + else: + pkgs[cls] = 'net/minecraft/src' + + tmp=[] + for cls,pkg in pkgs.items(): + tmp.append({'class': cls, 'package': pkg}) + + with open(pkg_file, 'wb') as fh: + writer = csv.DictWriter(fh, fieldnames=['class', 'package'], lineterminator='\n') + writer.writeheader() + for row in sorted(tmp, key=lambda x: (x['package'], x['class'])): + writer.writerow(row) + +if __name__ == '__main__': + main() +