Commit f0bba74a authored by Christian's avatar Christian

Update for minecraft 1.5.2

parent cf9b5b44
......@@ -44,7 +44,7 @@
self.cmdstartsrv = self.config.get('COMMANDS', 'CmdStartSrv', raw=1) % self.cmdjava
self.cmdstartclt = self.config.get('COMMANDS', 'CmdStartClt', raw=1) % self.cmdjava
@@ -751,6 +760,36 @@
@@ -753,6 +762,36 @@
self.cmdjavac = '"%s"' % os.path.join(results[0], 'javac')
self.cmdjava = '"%s"' % os.path.join(results[0], 'java')
......@@ -81,7 +81,7 @@
def checkjars(self, side):
jarlk = {CLIENT: self.jarclient, SERVER: self.jarserver}
md5jarlk = {CLIENT: self.md5jarclt, SERVER: self.md5jarsrv}
@@ -796,6 +835,8 @@
@@ -798,6 +837,8 @@
binlk = {CLIENT: self.binclient, SERVER: self.binserver}
testlk = {CLIENT: self.testclient, SERVER: self.testserver}
......@@ -90,7 +90,7 @@
if not os.path.exists(os.path.join(binlk[side], os.path.normpath(testlk[side] + '.class'))):
return False
return True
@@ -1036,6 +1077,9 @@
@@ -1038,6 +1079,9 @@
pathbinlk = {CLIENT: self.binclient, SERVER: self.binserver}
pathsrclk = {CLIENT: self.srcclient, SERVER: self.srcserver}
pathlog = {CLIENT: self.clientrecomplog, SERVER: self.serverrecomplog}
......@@ -100,7 +100,7 @@
if not os.path.exists(pathbinlk[side]):
os.makedirs(pathbinlk[side])
@@ -1049,6 +1093,29 @@
@@ -1051,6 +1095,29 @@
all_files = True
append_pattern = False
pkglist = filterdirs(pathsrclk[side], '*.java', append_pattern=append_pattern, all_files=all_files)
......@@ -130,7 +130,7 @@
dirs = ' '.join(pkglist)
classpath = os.pathsep.join(cplk[side])
forkcmd = self.cmdrecomp.format(classpath=classpath, sourcepath=pathsrclk[side], outpath=pathbinlk[side],
@@ -1057,7 +1124,7 @@
@@ -1059,7 +1126,7 @@
self.runcmd(forkcmd, log_file=pathlog[side])
except CalledProcessError as ex:
self.logger.error('')
......@@ -139,7 +139,7 @@
self.logger.error('')
for line in ex.output.splitlines():
if line.strip():
@@ -1070,7 +1137,7 @@
@@ -1072,7 +1139,7 @@
raise
def startserver(self):
......@@ -148,7 +148,7 @@
classpath = [os.path.join('..', p) for p in classpath]
classpath = os.pathsep.join(classpath)
os.chdir(self.dirjars)
@@ -1078,7 +1145,7 @@
@@ -1080,7 +1147,7 @@
self.runmc(forkcmd)
def startclient(self):
......@@ -157,7 +157,7 @@
classpath = [os.path.join('..', p) for p in classpath]
classpath = os.pathsep.join(classpath)
natives = os.path.join('..', self.dirnatives)
@@ -1205,20 +1272,20 @@
@@ -1207,20 +1274,20 @@
with open(self.csvmethods, 'rb') as fh:
methodsreader = csv.DictReader(fh)
for row in methodsreader:
......@@ -181,7 +181,7 @@
names['params'][row['param']] = row['name']
regexps = {
@@ -1352,13 +1419,13 @@
@@ -1354,13 +1421,13 @@
methods = {}
for row in methodsreader:
#HINT: Only include methods that have a non-empty description
......@@ -197,7 +197,7 @@
fields[row['searge']] = row['desc'].replace('*/', '* /')
regexps = {
@@ -1435,7 +1502,7 @@
@@ -1437,7 +1504,7 @@
self.runcmd(forkcmd)
return True
......@@ -206,7 +206,7 @@
if not reobf:
md5lk = {CLIENT: self.md5client, SERVER: self.md5server}
else:
@@ -1450,6 +1517,9 @@
@@ -1452,6 +1519,9 @@
class_path = ''
else:
class_path += '/'
......@@ -216,7 +216,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))
@@ -1546,6 +1616,8 @@
@@ -1548,6 +1618,8 @@
if not os.path.exists(outpathlk[side]):
os.makedirs(outpathlk[side])
......@@ -225,7 +225,7 @@
# HINT: We extract the modified class files
with closing(zipfile.ZipFile(jarlk[side])) as zipjar:
for in_class in trgclasses:
@@ -1559,6 +1631,23 @@
@@ -1561,6 +1633,23 @@
out_class = out_class.replace(self.nullpkg, '')
if out_class[0] == '/':
out_class = out_class[1:]
......@@ -249,7 +249,7 @@
try:
zipjar.extract(out_class, outpathlk[side])
self.logger.info('> Outputted %s to %s as %s', in_class.ljust(35), outpathlk[side], out_class)
@@ -1605,6 +1694,9 @@
@@ -1607,6 +1696,9 @@
sys.exit(1)
for entry in newfiles:
......@@ -259,7 +259,7 @@
if entry[3] == 'U':
self.logger.info('Retrieving file from server : %s', entry[0])
cur_file = os.path.normpath(entry[0])
@@ -1625,6 +1717,9 @@
@@ -1627,6 +1719,9 @@
md5reoblk = {CLIENT: self.md5reobfclient, SERVER: self.md5reobfserver}
outpathlk = {CLIENT: self.srcmodclient, SERVER: self.srcmodserver}
src = {CLIENT: self.srcclient, SERVER: self.srcserver}
......@@ -268,4 +268,4 @@
+ return
# HINT: We need a table for the old md5 and the new ones
md5table = {}
\ No newline at end of file
md5table = {}
......@@ -9,21 +9,21 @@ public mv.c #FD:EntityList/field_75626_c #classToNameMap
public mv.d #FD:EntityList/field_75623_d #idToClassMap
# RenderEngine
#public bba.h #FD:RenderEngine/field_78367_h #textureList # -- MISSING MAPPING # -- MISSING MAPPING
public bgf.g #FD:RenderEngine/field_78366_k #texturePack
public bge.g #FD:RenderEngine/field_78366_k #texturePack
# RenderManager
public bgz.q #FD:RenderManager/field_78729_o #renderers
public bgy.q #FD:RenderManager/field_78729_o #renderers
# RenderBlocks - everything
public bgg.* #FD:RenderBlocks/*
public bgg.*() #MD:RenderBlocks/*
public bgf.* #FD:RenderBlocks/*
public bgf.*() #MD:RenderBlocks/*
#RenderPlayer
public-f bhu.h #FD:RenderPlayer/field_77110_j #armorlist
public-f bht.h #FD:RenderPlayer/field_77110_j #armorlist
#RenderBiped
public-f bhh.k #FD:RenderBiped/field_82424_k #armorlist
public-f bhg.k #FD:RenderBiped/field_82424_k #armorlist
#StringTranslate
public bp.b #FD:StringTranslate/field_74815_b
public bp.e #FD:StringTranslate/field_74813_d
# TileEntityRenderer
public bje.m #FD:TileEntityRenderer/field_76966_m
public bjd.m #FD:TileEntityRenderer/field_76966_m
# CraftingManager - make the add recipe methods public
public yk.a(Lwm;[Ljava/lang/Object;)Lyn; #MD:CraftingManager/func_92103_a
public yk.b(Lwm;[Ljava/lang/Object;)V #MD:CraftingManager/func_77596_b
......@@ -37,7 +37,7 @@ public ka.a #FD:StatBase/field_75978_a #statName
public jf.a(Ljf;Z)Z #MD:NetLoginHandler/func_72531_a #'complete connection'
public jf.g #FD:NetLoginHandler/field_72543_h #userName
# EntityPlayerMP getNextWindowId
public jc.cr()V #MD:EntityPlayerMP/func_71117_bO
public jc.ct()V #MD:EntityPlayerMP/func_71117_bO
public jc.cu #FD:EntityPlayerMP/field_71139_cq
# EntityAITaskEntry
public oo #CL:EntityAITaskEntry
......
......@@ -263,7 +263,7 @@ field_70546_d,particleAge,2,
field_70547_e,particleMaxAge,2,
field_70548_b,particleTextureJitterX,2,
field_70549_c,particleTextureJitterY,2,
field_70550_a,particleTextureIndex,2,
field_70550_a,particleIcon,2,The icon field from which the given particle pulls its texture.
field_70551_j,particleBlue,2,"The blue amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
field_70552_h,particleRed,2,"The red amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
field_70553_i,particleGreen,2,"The green amount of color. Used as a percentage, 1.0 = 255 and 0.0 = 0."
......@@ -389,8 +389,12 @@ field_70855_f,attackTimer,2,
field_70856_g,holdRoseTick,2,
field_70857_d,villageObj,2,
field_70858_e,homeCheckTimer,2,"deincrements, and a distance-to-home check is done at 0"
field_70859_f,squidYaw,2,
field_70860_g,prevSquidYaw,2,
field_70861_d,squidPitch,2,
field_70862_e,prevSquidPitch,2,
field_70863_bz,randomMotionSpeed,2,
field_70865_by,lastTentacleAngle,2,the last calculated angle of the tentacles in radians
field_70865_by,prevTentacleAngle,2,the last calculated angle of the tentacles in radians
field_70866_j,tentacleAngle,2,angle of the tentacles in radians
field_70869_bD,randomMotionVecY,2,
field_70870_bE,randomMotionVecZ,2,
......@@ -2885,6 +2889,7 @@ field_76168_c,capacity,2,the maximum amount of elements in the hash (probably 3/
field_76169_a,hashArray,2,the array of all elements in the hash
field_76171_a,texturePacks,2,
field_76172_a,parent,2,
field_76173_f,maxFileSize,2,
field_76174_d,destinationFile,2,
field_76175_e,downloadSuccess,2,
field_76176_b,sourceURL,2,
......@@ -4306,6 +4311,7 @@ field_82135_d,isBeaconActive,2,
field_82136_e,levels,2,Level of this beacon's pyramid.
field_82139_a,effectsList,2,List of effects that Beacon can apply
field_82140_h,payment,2,Item given to this beacon as payment.
field_82151_R,distanceWalkedOnStepModified,2,
field_82152_aq,teleportDirection,2,
field_82153_h,timeInPortal,2,
field_82155_f,isAnvil,2,
......@@ -4320,6 +4326,7 @@ field_82176_d,armorProbability,2,Probability to get armor
field_82177_b,enchantmentProbability,2,An array of probabilities that determines whether a random enchantment should be added to the held item. Indexed by difficulty.
field_82178_c,armorEnchantmentProbability,2,Probability to get enchanted armor
field_82179_bU,persistenceRequired,2,Whether this entity should NOT despawn.
field_82180_bT,previousEquipment,2,"The equipment this mob was previously wearing, used for syncing."
field_82181_as,pickUpLootProability,2,Probability to pick up loot
field_82182_bS,equipment,2,Equipment (armor and held item) for this entity.
field_82184_d,aiControlledByPlayer,2,AI task for player control.
......@@ -4611,6 +4618,8 @@ field_90051_a,theMinecraft,2,
field_90053_a,theMinecraft,2,
field_90055_a,theMinecraft,2,
field_92014_j,explosionStrength,2,The explosion radius of spawned fireballs.
field_92016_l,highlightingItemStack,2,The ItemStack that is currently being highlighted
field_92017_k,remainingHighlightTicks,2,Remaining ticks the item highlight should be visible
field_92039_az,fireworkExplosions,2,
field_92055_b,lifetime,2,The lifetime of the firework in ticks. When the age reaches the lifetime the firework explodes.
field_92056_a,fireworkAge,2,The age of the firework in ticks.
......@@ -4626,6 +4635,7 @@ field_92106_bV,fireworkCharge,2,
field_92117_D,heldItemTooltips,2,
field_92118_B,overrideWidth,2,
field_92119_C,overrideHeight,2,
field_94050_c,customName,2,
field_94054_b,particleTextureIndexX,2,
field_94055_c,particleTextureIndexY,2,
field_94084_b,tntPlacedBy,2,
......@@ -4751,6 +4761,8 @@ field_94379_b,cactusBottomIcon,2,
field_94380_a,cactusTopIcon,2,
field_94381_b,cakeBottomIcon,2,
field_94383_a,cakeTopIcon,2,
field_94384_b,workbenchIconFront,2,
field_94385_a,workbenchIconTop,2,
field_94386_b,woodTextureTypes,2,
field_94387_c,iconArray,2,
field_94388_cO,tree_top,2,
......@@ -4776,6 +4788,7 @@ field_94435_b,iconSnowSide,2,
field_94436_c,iconGrassSideOverlay,2,
field_94437_a,iconGrassTop,2,
field_94439_c,iconArray,2,
field_94443_a,isTrapped,2,Determines whether of not the chest is trapped.
field_94445_a,iconArray,2,
field_94447_a,theIcon,2,
field_94449_b,theIcon,2,
......@@ -4783,6 +4796,8 @@ field_94450_a,theIcon,2,
field_94454_cO,hopperInsideIcon,2,
field_94455_b,hopperIcon,2,
field_94456_c,hopperTopIcon,2,
field_94458_cO,furnaceIconTop,2,
field_94459_cP,furnaceIconFront,2,
field_94462_cO,furnaceFrontIcon,2,
field_94463_c,furnaceTopIcon,2,
field_94465_b,doorTypeForIcon,2,Used for pointing at icon names.
......@@ -4792,6 +4807,9 @@ field_94469_b,iconArray,2,
field_94470_a,cocoaIcons,2,
field_94471_cO,bedTopIcons,2,
field_94473_c,bedSideIcons,2,
field_94497_cO,topIcon,2,Top icon of piston depends on (either sticky or normal)
field_94498_b,innerTopIcon,2,Only visible when piston is extended
field_94499_c,bottomIcon,2,Bottom side texture
field_94500_e,useProvidedWindowTitle,2,"If false, the client will look up a string like ""window.minecart"". If true, the client uses what the server provides."
field_94512_f,isStraightRail,2,
field_94513_g,railChunkPosition,2,The chunk position the rail is at.
......@@ -4801,7 +4819,7 @@ field_94516_b,logicWorld,2,
field_94517_c,railX,2,
field_94518_a,theRail,2,
field_94557_a,selectAnything,2,
field_94582_cb,tntMinecart,2,
field_94582_cb,minecartTnt,2,
field_94583_ca,netherQuartz,2,
field_94584_bZ,netherrackBrick,2,
field_94585_bY,comparator,2,
......@@ -4813,6 +4831,8 @@ field_94601_a,bowPullIconNameArray,2,
field_94610_a,theTileEntity,2,
field_94612_a,theTileEntity,2,
field_96093_i,entityUniqueID,2,
field_96105_c,commandSenderName,2,"The name of command sender (usually username, but possibly ""Rcon"")"
field_96106_a,succesCount,2,
field_96113_a,isBlocked,2,Whether this hopper minecart is being blocked by an activator rail.
field_96291_i,pointedEntityLiving,2,
field_96442_D,worldScoreboard,2,
......@@ -4842,16 +4862,19 @@ field_96492_e,playerNames,2,Only if mode = 0 or 3 or 4. Players to be added/remo
field_96493_b,teamDisplayName,2,Only if mode = 0 or 2.
field_96494_c,teamPrefix,2,Only if mode = 0 or 2. Displayed before the players' name that are part of this team.
field_96495_a,teamName,2,A unique name for the team.
field_96540_f,teamMemberships,2,Map of usernames to ScorePlayerTeam objects.
field_96545_a,scoreObjectives,2,Map of objective names to ScoreObjective objects.
field_96564_a,theEntity,2,
field_96566_b,selectInventories,2,
field_96569_b,theEntityTracker,2,
field_96600_cc,hopperMinecart,2,
field_96600_cc,minecartHopper,2,
field_96601_a,theBlock,2,
field_96602_b,dispenserMinecartBehavior,2,
field_96633_b,playerInventory,2,
field_96634_a,theItemStack,2,
field_96656_b,theScoreboard,2,
field_96676_c,membershipSet,2,A set of all team member usernames.
field_96677_a,theScoreboard,2,
field_96683_d,displayName,2,
field_96684_b,name,2,
field_96685_c,objectiveCriteria,2,The ScoreObjectiveCriteria for this objetive
......
This diff is collapsed.
This diff is collapsed.
......@@ -38,8 +38,8 @@ DirNatives = %(DirJars)s/bin/natives
Client = %(DirJars)s/bin/minecraft.jar
Server = %(DirJars)s/minecraft_server.jar
LWJGL = %(DirJars)s/bin/jinput.jar,%(DirJars)s/bin/lwjgl.jar,%(DirJars)s/bin/lwjgl_util.jar
MD5Client = 5c1219d869b87d233de3033688ec7567
MD5Server = 9d31b969c3f197a1d40381d5620717ea
MD5Client = 6897c3287fb971c9f362eb3ab20f5ddd
MD5Server = c4e1bf89e834bd3670c7bf8f13874bc6
[RETROGUARD]
Location = %(DirRuntime)s/bin/retroguard.jar
......@@ -125,8 +125,8 @@ LogFile = %(DirLogs)s/mcp.log
LogFileErr = %(DirLogs)s/mcperr.log
UpdateUrl =
IgnoreUpdate = %(DirBin)s,%(DirLib)s,%(DirLogs)s,%(DirModSrc)s,%(DirReobf)s,%(DirSrc)s,%(DirTemp)s,%(DirEclipse)s/Client/bin,%(DirEclipse)s/Server/bin,%(DirJars)s/world,%(DirJars)s/saves,%(DirJars)s/resources
RGIndex = 102000
ParamIndex = 22000
RGIndex = 104000
ParamIndex = 23000
[ASTYLE]
AstyleConfig = %(DirConf)s/astyle.cfg
......
This diff is collapsed.
class,package
GuiScreenOnlineServersSubscreen,net/minecraft/client/gui
RunnableTitleScreen,net/minecraft/client/gui
Block,net/minecraft/block
BlockAnvil,net/minecraft/block
BlockBasePressurePlate,net/minecraft/block
......@@ -245,13 +247,11 @@ ScaledResolution,net/minecraft/client/gui
ScreenChatOptions,net/minecraft/client/gui
SelectionListBase,net/minecraft/client/gui
SelectionListInvited,net/minecraft/client/gui
SelectionListLocation,net/minecraft/client/gui
TaskLongRunning,net/minecraft/client/gui
TaskOnlineConnect,net/minecraft/client/gui
TaskResetWorld,net/minecraft/client/gui
TaskWorldCreation,net/minecraft/client/gui
ThreadConnectToOnlineServer,net/minecraft/client/gui
ThreadCreateOnlineWorldScreen,net/minecraft/client/gui
ThreadOnlineConnect,net/minecraft/client/gui
ThreadOnlineScreen,net/minecraft/client/gui
ThreadPollServers,net/minecraft/client/gui
......@@ -285,8 +285,6 @@ SlotCreativeInventory,net/minecraft/client/gui/inventory
ExceptionMcoHttp,net/minecraft/client/mco
ExceptionMcoService,net/minecraft/client/mco
ExceptionRetryCall,net/minecraft/client/mco
Location,net/minecraft/client/mco
Locations,net/minecraft/client/mco
McoClient,net/minecraft/client/mco
McoOption,net/minecraft/client/mco
McoOptionNone,net/minecraft/client/mco
......
......@@ -10,15 +10,6 @@ p_101001_1_,par1,2
p_101001_2_,par2,2
p_101001_3_,par3,2
p_101001_4_,par4,2
p_101002_0_,par0GuiScreenOnlineServers,2
p_101002_1_,par1McoServer,2
p_101003_0_,par0GuiScreenOnlineServers,2
p_101003_1_,par1,2
p_101003_2_,par2,2
p_101003_3_,par3,2
p_101003_4_,par4,2
p_101004_0_,par0GuiScreenOnlineServers,2
p_101005_0_,par0GuiScreenOnlineServers,2
p_101006_1_,par1,2
p_101006_2_,par2,2
p_101006_3_,par3,2
......@@ -32,8 +23,6 @@ p_101009_1_,par1,2
p_101009_2_,par2,2
p_101009_3_,par3,2
p_101009_4_,par4,2
p_101011_0_,par0GuiScreenOnlineServers,2
p_101011_1_,par1Str,2
p_101012_0_,par0GuiScreenOnlineServers,2
p_101012_1_,par1,2
p_101012_2_,par2,2
......@@ -78,6 +67,96 @@ p_102027_4_,par4,2
p_102027_5_,par5,2
p_102027_6_,par6,2
p_102027_7_,par7,2
p_104004_0_,par0GuiMainMenu,2
p_104005_0_,par0GuiMainMenu,2
p_104005_1_,par1Str,2
p_104006_0_,par0GuiMainMenu,2
p_104006_1_,par1,2
p_104007_0_,par0GuiMainMenu,2
p_104008_0_,par0GuiMainMenu,2
p_104008_1_,par1,2
p_104009_0_,par0GuiMainMenu,2
p_104009_1_,par1,2
p_104010_0_,par0,2
p_104011_0_,par0GuiMainMenu,2
p_104011_1_,par1,2
p_104012_0_,par0GuiMainMenu,2
p_104012_1_,par1,2
p_104013_0_,par0GuiMainMenu,2
p_104013_1_,par1Str,2
p_104014_0_,par0GuiMainMenu,2
p_104014_1_,par1,2
p_104015_0_,par0GuiMainMenu,2
p_104016_0_,par0GuiMainMenu,2
p_104017_0_,par0GuiMainMenu,2
p_104018_0_,par0GuiMainMenu,2
p_104019_0_,par0GuiMainMenu,2
p_104020_0_,par0GuiMainMenu,2
p_104021_0_,par0GuiMainMenu,2
p_104021_1_,par1StringTranslate,2
p_104021_2_,par2,2
p_104021_3_,par3,2
p_104022_0_,par0GuiMainMenu,2
p_104023_0_,par0GuiMainMenu,2
p_104026_0_,par0GuiScreenOnlineServers,2
p_104026_1_,par1Str,2
p_104027_0_,par0GuiScreenOnlineServers,2
p_104028_0_,par0GuiScreenOnlineServers,2
p_104029_0_,par0GuiScreenOnlineServers,2
p_104030_0_,par0GuiScreenOnlineServers,2
p_104030_1_,par1,2
p_104030_2_,par2,2
p_104030_3_,par3,2
p_104030_4_,par4,2
p_104030_5_,par5,2
p_104031_0_,par0GuiScreenOnlineServers,2
p_104031_1_,par1,2
p_104031_2_,par2,2
p_104031_3_,par3,2
p_104031_4_,par4,2
p_104032_0_,par0GuiScreenOnlineServers,2
p_104033_0_,par0GuiScreenOnlineServers,2
p_104034_0_,par0GuiScreenOnlineServers,2
p_104034_1_,par1McoServer,2
p_104036_0_,par0GuiScreenOnlineServers,2
p_104038_0_,par0GuiScreenOnlineServers,2
p_104039_1_,par1,2
p_104039_2_,par2,2
p_104039_3_,par3,2
p_104039_4_,par4,2
p_104039_5_,par5,2
p_104040_0_,par0GuiScreenOnlineServers,2
p_104043_0_,par0GuiScreenOnlineServers,2
p_104047_0_,par0GuiScreenCreateOnlineWorld,2
p_104048_0_,par0GuiScreenCreateOnlineWorld,2
p_104055_1_,par1,2
p_104062_1_,par1,2
p_104062_2_,par2,2
p_104062_3_,par3Texture,2
p_104064_0_,par0Str,2
p_104064_1_,par1Str,2
p_104064_2_,par2,2
p_104064_3_,par3,2
p_104069_1_,par1GuiButton,2
p_104071_1_,par1GuiScreen,2
p_104071_2_,par2FontRenderer,2
p_104083_1_,par1,2
p_104083_2_,par2,2
p_104083_3_,par3,2
p_104083_4_,par4,2
p_104084_1_,par1,2
p_104084_2_,par2,2
p_104084_3_,par3,2
p_104084_4_,par4,2
p_104086_1_,par1,2
p_104087_1_,par1,2
p_104087_2_,par2,2
p_104088_1_,par1,2
p_104088_2_,par2,2
p_104088_3_,par3Tessellator,2
p_104089_1_,par1,2
p_104089_2_,par2,2
p_104145_0_,par0URL,2
p_70000_1_,par1PlayerUsageSnooper,2
p_70001_1_,par1PlayerUsageSnooper,2
p_70003_1_,par1,2
......@@ -7661,20 +7740,7 @@ p_96174_1_,par1McoServer,2
p_96177_0_,par0GuiScreenOnlineServers,2
p_96209_1_,par1Str,2
p_96210_1_,par1Str,2
p_96230_0_,par0GuiScreenSelectLocation,2
p_96231_0_,par0GuiScreenSelectLocation,2
p_96232_0_,par0GuiScreenSelectLocation,2
p_96233_0_,par0GuiScreenSelectLocation,2
p_96234_0_,par0GuiScreenSelectLocation,2
p_96234_1_,par1Location,2
p_96235_0_,par0GuiScreenSelectLocation,2
p_96236_0_,par0GuiScreenSelectLocation,2
p_96246_0_,par0GuiScreenCreateOnlineWorld,2
p_96247_0_,par0GuiScreenCreateOnlineWorld,2
p_96248_0_,par0GuiScreenCreateOnlineWorld,2
p_96251_1_,par1Location,2
p_96251_2_,par2Str,2
p_96251_3_,par3Str,2
p_96263_0_,par0GuiScreenConfigureWorld,2
p_96264_1_,par1,2
p_96265_0_,par0GuiScreenConfigureWorld,2
......@@ -7763,6 +7829,7 @@ p_96363_0_,par0Str,2
p_96363_1_,par1Str,2
p_96374_1_,par1,2
p_96376_1_,par1,2
p_96376_3_,par3Str,2
p_96377_1_,par1Request,2
p_96378_1_,par1,2
p_96380_1_,par1Str,2
......@@ -7772,9 +7839,12 @@ p_96383_1_,par1,2
p_96384_1_,par1,2
p_96384_3_,par3Str,2
p_96384_4_,par4Str,2
p_96384_5_,par5,2
p_96384_6_,par6,2
p_96386_1_,par1Str,2
p_96386_2_,par2Str,2
p_96386_3_,par3Str,2
p_96386_4_,par4Str,2
p_96387_1_,par1,2
p_96387_3_,par3Str,2
p_96394_0_,par0Field,2
......@@ -7961,43 +8031,25 @@ p_98046_1_,par1,2
p_98053_1_,par1,2
p_98054_1_,par1,2
p_98055_1_,par1,2
p_98058_0_,par0GuiMainMenu,2
p_98059_0_,par0,2
p_98060_1_,par1StringTranslate,2
p_98060_2_,par2,2
p_98060_3_,par3,2
p_98061_0_,par0GuiMainMenu,2
p_98061_1_,par1StringTranslate,2
p_98061_2_,par2,2
p_98061_3_,par3,2
p_98062_1_,par1,2
p_98063_1_,par1,2
p_98072_0_,par0GuiScreenOnlineServers,2
p_98074_0_,par0GuiScreenOnlineServers,2
p_98075_0_,par0GuiScreenOnlineServers,2
p_98076_0_,par0GuiScreenOnlineServers,2
p_98078_0_,par0GuiScreenOnlineServers,2
p_98078_1_,par1,2
p_98079_0_,par0GuiScreenOnlineServers,2
p_98081_0_,par0GuiScreenOnlineServers,2
p_98081_1_,par1,2
p_98084_0_,par0GuiScreenOnlineServers,2
p_98086_1_,par1,2
p_98087_0_,par0GuiScreenOnlineServers,2
p_98089_0_,par0GuiScreenOnlineServers,2
p_98089_1_,par1,2
p_98091_0_,par0GuiScreenOnlineServers,2
p_98092_0_,par0GuiScreenOnlineServers,2
p_98094_0_,par0GuiScreenOnlineServers,2
p_98096_0_,par0GuiConnecting,2
p_98097_0_,par0GuiConnecting,2
p_98099_0_,par0GuiScreenCreateOnlineWorld,2
p_98100_0_,par0GuiScreenCreateOnlineWorld,2
p_98100_1_,par1Location,2
p_98101_0_,par0GuiScreenCreateOnlineWorld,2
p_98102_0_,par0GuiScreenCreateOnlineWorld,2
p_98102_1_,par1List,2
p_98103_0_,par0GuiScreenCreateOnlineWorld,2
p_98137_1_,par1Str,2
p_98137_2_,par2,2
p_98138_1_,par1Str,2
......@@ -8025,12 +8077,8 @@ p_98162_0_,par0Str,2
p_98163_0_,par0JsonNode,2
p_98164_0_,par0List,2
p_98165_0_,par0Str,2
p_98167_0_,par0JsonNode,2
p_98168_0_,par0JsonNode,2
p_98168_1_,par1Str,2
p_98169_0_,par0Str,2
p_98172_0_,par0TaskOnlineConnect,2
p_98174_0_,par0Str,2
p_98176_1_,par1,2
p_98177_1_,par1,2
p_98179_1_,par1,2
......@@ -8125,11 +8173,9 @@ p_i10003_1_,par1,2
p_i10003_2_,par2,2
p_i10004_1_,par1,2
p_i10004_2_,par2,2
p_i10005_1_,par1,2
p_i10005_2_,par2,2
p_i10005_1_,par1ScorePlayerTeam,2
p_i10005_2_,par2Collection,2
p_i10005_3_,par3,2
p_i10005_4_,par4Str,2
p_i10005_5_,par5Str,2
p_i10006_1_,par1,2
p_i10006_2_,par2,2
p_i10007_1_,par1,2
......@@ -8139,8 +8185,6 @@ p_i10008_3_,par3TaskLongRunning,2
p_i10009_1_,par1GuiSlotOnlineServerList,2
p_i10009_2_,par2McoServer,2
p_i10010_1_,par1GuiScreen,2
p_i10011_1_,par1GuiScreenResetWorld,2
p_i10011_2_,par2,2
p_i10012_1_,par1Minecraft,2
p_i10012_2_,par2,2
p_i10012_3_,par3,2
......@@ -8152,10 +8196,6 @@ p_i10013_2_,par2GuiScreen,2
p_i10013_3_,par3McoServer,2
p_i10014_1_,par1GuiScreen,2
p_i10014_2_,par2McoServer,2
p_i10017_1_,par1GuiScreenCreateOnlineWorld,2
p_i10017_2_,par2Str,2
p_i10017_3_,par3Str,2
p_i10017_4_,par4Str,2
p_i10018_1_,par1TaskOnlineConnect,2
p_i10018_2_,par2Str,2
p_i10018_3_,par3,2
......@@ -8257,7 +8297,6 @@ p_i11007_1_,par1GuiScreen,2
p_i11007_2_,par2Str,2
p_i11007_3_,par3Str,2
p_i11007_4_,par4ArrayOfObj,2
p_i11008_1_,par1GuiScreenCreateOnlineWorld,2
p_i11011_1_,par1GuiScreenOnlineServers,2
p_i11012_1_,par1Minecraft,2
p_i11012_2_,par2Str,2
......@@ -8417,6 +8456,29 @@ p_i22009_5_,par5,2
p_i22009_6_,par6,2
p_i22009_7_,par7,2
p_i22009_8_,par8,2
p_i23000_1_,par1,2
p_i23000_2_,par2,2
p_i23000_3_,par3,2
p_i23000_4_,par4,2
p_i23001_1_,par1Minecraft,2
p_i23001_2_,par2,2
p_i23001_3_,par3,2
p_i23001_4_,par4,2
p_i23001_5_,par5,2
p_i23001_6_,par6,2
p_i23002_1_,par1GuiScreenResetWorld,2
p_i23002_2_,par2,2
p_i23002_4_,par4Str,2
p_i23003_1_,par1GuiScreenCreateOnlineWorld,2
p_i23003_2_,par2Str,2
p_i23003_3_,par3Str,2
p_i23003_4_,par4Str,2
p_i23003_5_,par5Str,2
p_i23004_1_,par1GuiScreen,2
p_i23004_2_,par2Str,2
p_i23004_3_,par3,2
p_i23004_4_,par4,2
p_i23005_1_,par1GuiMainMenu,2
p_i3000_1_,par1File,2
p_i3000_2_,par2Minecraft,2
p_i3001_1_,par1Map,2
......@@ -8622,9 +8684,6 @@ p_i3101_1_,par1Minecraft,2
p_i3101_2_,par2World,2
p_i3101_3_,par3Session,2
p_i3101_4_,par4NetClientHandler,2
p_i3102_1_,par1GuiScreen,2
p_i3102_2_,par2Str,2
p_i3102_3_,par3,2
p_i3103_1_,par1Minecraft,2
p_i3103_2_,par2Str,2
p_i3103_3_,par3,2
......
diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net\minecraft\client\Minecraft.java
--- minecraft\net\minecraft\client\Minecraft.java Tue Mar 19 21:24:34 2013
+++ minecraft_patched\net\minecraft\client\Minecraft.java Tue Mar 19 21:26:27 2013
@@ -531,9 +531,8 @@
--- minecraft\net\minecraft\client\Minecraft.java Sat Apr 27 01:53:03 2013
+++ minecraft_patched\net\minecraft\client\Minecraft.java Sat Apr 27 01:55:19 2013
@@ -532,9 +532,8 @@
return;
}
......@@ -12,7 +12,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
if(this.field_71434_R && this.field_71433_S != null) {
this.func_71377_b(this.field_71433_S);
return;
@@ -551,7 +550,6 @@
@@ -552,7 +551,6 @@
this.func_71373_a(new GuiMemoryErrorScreen());
System.gc();
}
......@@ -20,7 +20,7 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
}
} catch (MinecraftError var12) {
;
@@ -569,8 +567,6 @@
@@ -570,8 +568,6 @@
this.func_71405_e();
}
......@@ -30,8 +30,8 @@ diff -r -U 3 minecraft\net\minecraft\client\Minecraft.java minecraft_patched\net
private void func_71411_J() {
diff -r -U 3 minecraft\net\minecraft\src\CallableSuspiciousClasses.java minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java
--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java Tue Mar 19 21:24:35 2013
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java Tue Mar 19 21:26:27 2013
--- minecraft\net\minecraft\src\CallableSuspiciousClasses.java Sat Apr 27 01:53:04 2013
+++ minecraft_patched\net\minecraft\src\CallableSuspiciousClasses.java Sat Apr 27 01:55:19 2013