diff --git a/fml/conf/joined.srg b/fml/conf/joined.srg index fb4ac461b..cd6777594 100644 --- a/fml/conf/joined.srg +++ b/fml/conf/joined.srg @@ -3762,8 +3762,9 @@ FD: azp/c net/minecraft/src/GuiScreenInvite/field_96224_c FD: azp/d net/minecraft/src/GuiScreenInvite/field_96222_d FD: azp/n net/minecraft/src/GuiScreenInvite/field_96228_n FD: azp/o net/minecraft/src/GuiScreenInvite/field_96229_o -FD: azp/p net/minecraft/src/GuiScreenInvite/field_96226_p -FD: azp/q net/minecraft/src/GuiScreenInvite/field_96225_q +FD: azp/p net/minecraft/src/GuiScreenInvite/field_101016_p +FD: azp/q net/minecraft/src/GuiScreenInvite/field_96226_p +FD: azp/r net/minecraft/src/GuiScreenInvite/field_96225_q FD: azq/a net/minecraft/src/GuiScreenSelectLocation/field_96242_a FD: azq/b net/minecraft/src/GuiScreenSelectLocation/field_96238_b FD: azq/c net/minecraft/src/GuiScreenSelectLocation/field_96239_c @@ -11536,9 +11537,9 @@ MD: azp/a (CI)V net/minecraft/src/GuiScreenInvite/func_73869_a (CI)V MD: azp/a (IIF)V net/minecraft/src/GuiScreenInvite/func_73863_a (IIF)V MD: azp/a (III)V net/minecraft/src/GuiScreenInvite/func_73864_a (III)V MD: azp/a (Lawa;)V net/minecraft/src/GuiScreenInvite/func_73875_a (Lnet/minecraft/src/GuiButton;)V +MD: azp/a (Ljava/lang/String;)V net/minecraft/src/GuiScreenInvite/func_101015_a (Ljava/lang/String;)V MD: azp/b ()V net/minecraft/src/GuiScreenInvite/func_73874_b ()V MD: azp/c ()V net/minecraft/src/GuiScreenInvite/func_73876_c ()V -MD: azp/g ()V net/minecraft/src/GuiScreenInvite/func_96221_a ()V MD: azq/A_ ()V net/minecraft/src/GuiScreenSelectLocation/func_73866_w_ ()V MD: azq/a (IIF)V net/minecraft/src/GuiScreenSelectLocation/func_73863_a (IIF)V MD: azq/a (Lawa;)V net/minecraft/src/GuiScreenSelectLocation/func_73875_a (Lnet/minecraft/src/GuiButton;)V @@ -11585,6 +11586,7 @@ MD: azv/b (Lazv;)Z net/minecraft/src/McoServerList/func_98249_b (Lnet/minecraft/ MD: azv/c ()Ljava/util/List; net/minecraft/src/McoServerList/func_98252_c ()Ljava/util/List; MD: azv/d ()V net/minecraft/src/McoServerList/func_98248_d ()V MD: azx/a ()V net/minecraft/src/TimerTaskMcoServerListUpdate/func_98260_a ()V +MD: azx/a (Ljava/util/List;)V net/minecraft/src/TimerTaskMcoServerListUpdate/func_101018_a (Ljava/util/List;)V MD: azx/run ()V net/minecraft/src/TimerTaskMcoServerListUpdate/run ()V MD: azy/a ()I net/minecraft/src/SelectionListBase/func_96608_a ()I MD: azy/a (I)Z net/minecraft/src/SelectionListBase/func_96609_a (I)Z @@ -11635,38 +11637,39 @@ MD: bab/a (J)Lbay; net/minecraft/src/GuiScreenOnlineServers/func_98086_a (J)Lnet MD: bab/a (Lawa;)V net/minecraft/src/GuiScreenOnlineServers/func_73875_a (Lnet/minecraft/src/GuiButton;)V MD: bab/a (Lbab;)Lnet/minecraft/client/Minecraft; net/minecraft/src/GuiScreenOnlineServers/func_96177_a (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft; MD: bab/a (Lbab;I)I net/minecraft/src/GuiScreenOnlineServers/func_98081_a (Lnet/minecraft/src/GuiScreenOnlineServers;I)I -MD: bab/a (Lbab;II)V net/minecraft/src/GuiScreenOnlineServers/func_98070_a (Lnet/minecraft/src/GuiScreenOnlineServers;II)V -MD: bab/a (Lbab;Lbay;)V net/minecraft/src/GuiScreenOnlineServers/func_96179_a (Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V -MD: bab/a (Lbab;Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/GuiScreenOnlineServers/func_98085_a (Lnet/minecraft/src/GuiScreenOnlineServers;Ljava/lang/String;)Ljava/lang/String; +MD: bab/a (Lbab;IIII)V net/minecraft/src/GuiScreenOnlineServers/func_101003_a (Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V +MD: bab/a (Lbab;Lbay;)V net/minecraft/src/GuiScreenOnlineServers/func_101002_a (Lnet/minecraft/src/GuiScreenOnlineServers;Lnet/minecraft/src/McoServer;)V +MD: bab/a (Lbab;Ljava/lang/String;)Ljava/lang/String; net/minecraft/src/GuiScreenOnlineServers/func_101011_a (Lnet/minecraft/src/GuiScreenOnlineServers;Ljava/lang/String;)Ljava/lang/String; MD: bab/a (Lbay;)V net/minecraft/src/GuiScreenOnlineServers/func_96174_a (Lnet/minecraft/src/McoServer;)V MD: bab/a (Ljava/lang/String;II)V net/minecraft/src/GuiScreenOnlineServers/func_96165_a (Ljava/lang/String;II)V MD: bab/b ()V net/minecraft/src/GuiScreenOnlineServers/func_73874_b ()V -MD: bab/b (II)V net/minecraft/src/GuiScreenOnlineServers/func_98088_b (II)V MD: bab/b (Lbab;)Lnet/minecraft/client/Minecraft; net/minecraft/src/GuiScreenOnlineServers/func_98075_b (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft; MD: bab/b (Lbab;I)I net/minecraft/src/GuiScreenOnlineServers/func_98089_b (Lnet/minecraft/src/GuiScreenOnlineServers;I)I -MD: bab/b (Lbab;II)V net/minecraft/src/GuiScreenOnlineServers/func_98083_b (Lnet/minecraft/src/GuiScreenOnlineServers;II)V +MD: bab/b (Lbab;IIII)V net/minecraft/src/GuiScreenOnlineServers/func_101012_b (Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V MD: bab/c ()V net/minecraft/src/GuiScreenOnlineServers/func_73876_c ()V -MD: bab/c (II)V net/minecraft/src/GuiScreenOnlineServers/func_96175_b (II)V +MD: bab/c (IIII)V net/minecraft/src/GuiScreenOnlineServers/func_101008_c (IIII)V MD: bab/c (Lbab;)Ljava/util/List; net/minecraft/src/GuiScreenOnlineServers/func_98094_c (Lnet/minecraft/src/GuiScreenOnlineServers;)Ljava/util/List; MD: bab/c (Lbab;I)V net/minecraft/src/GuiScreenOnlineServers/func_98078_c (Lnet/minecraft/src/GuiScreenOnlineServers;I)V -MD: bab/c (Lbab;II)V net/minecraft/src/GuiScreenOnlineServers/func_98077_c (Lnet/minecraft/src/GuiScreenOnlineServers;II)V -MD: bab/d (II)V net/minecraft/src/GuiScreenOnlineServers/func_96168_c (II)V +MD: bab/c (Lbab;IIII)V net/minecraft/src/GuiScreenOnlineServers/func_101009_c (Lnet/minecraft/src/GuiScreenOnlineServers;IIII)V +MD: bab/d (IIII)V net/minecraft/src/GuiScreenOnlineServers/func_101006_d (IIII)V MD: bab/d (Lbab;)I net/minecraft/src/GuiScreenOnlineServers/func_98072_d (Lnet/minecraft/src/GuiScreenOnlineServers;)I +MD: bab/e (IIII)V net/minecraft/src/GuiScreenOnlineServers/func_101001_e (IIII)V MD: bab/e (Lbab;)Lawa; net/minecraft/src/GuiScreenOnlineServers/func_96161_f (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/GuiButton; MD: bab/f (Lbab;)Lnet/minecraft/client/Minecraft; net/minecraft/src/GuiScreenOnlineServers/func_98076_f (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft; MD: bab/g ()V net/minecraft/src/GuiScreenOnlineServers/func_96178_g ()V MD: bab/g (Lbab;)Lawa; net/minecraft/src/GuiScreenOnlineServers/func_98092_g (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/GuiButton; -MD: bab/h ()Ljava/lang/Object; net/minecraft/src/GuiScreenOnlineServers/func_96170_h ()Ljava/lang/Object; +MD: bab/h ()Ljava/lang/Object; net/minecraft/src/GuiScreenOnlineServers/func_101007_h ()Ljava/lang/Object; MD: bab/h (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_98091_h (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; -MD: bab/i ()I net/minecraft/src/GuiScreenOnlineServers/func_98082_i ()I +MD: bab/i ()I net/minecraft/src/GuiScreenOnlineServers/func_101010_i ()I MD: bab/i (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_98084_i (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; -MD: bab/j ()I net/minecraft/src/GuiScreenOnlineServers/func_98093_j ()I -MD: bab/j (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_96182_l (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; -MD: bab/k ()I net/minecraft/src/GuiScreenOnlineServers/func_96181_k ()I +MD: bab/j ()I net/minecraft/src/GuiScreenOnlineServers/func_101014_j ()I +MD: bab/j (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_101005_j (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; +MD: bab/k ()I net/minecraft/src/GuiScreenOnlineServers/func_101013_k ()I MD: bab/k (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_98079_k (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; MD: bab/l (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_98087_l (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; MD: bab/m (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_98074_m (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; -MD: bab/n (Lbab;)Lnet/minecraft/client/Minecraft; net/minecraft/src/GuiScreenOnlineServers/func_98071_n (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft; +MD: bab/n (Lbab;)Lawp; net/minecraft/src/GuiScreenOnlineServers/func_101000_n (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/src/FontRenderer; +MD: bab/o (Lbab;)Lnet/minecraft/client/Minecraft; net/minecraft/src/GuiScreenOnlineServers/func_101004_o (Lnet/minecraft/src/GuiScreenOnlineServers;)Lnet/minecraft/client/Minecraft; MD: bac/run ()V net/minecraft/src/ThreadOnlineScreen/run ()V MD: bad/a ()I net/minecraft/src/GuiSlotOnlineServerList/func_77217_a ()I MD: bad/a (I)Z net/minecraft/src/GuiSlotOnlineServerList/func_77218_a (I)Z @@ -11754,8 +11757,10 @@ MD: bay/a (Lbay;)V net/minecraft/src/McoServer/func_96401_a (Lnet/minecraft/src/ MD: bay/a (Ljava/lang/String;)V net/minecraft/src/McoServer/func_96399_a (Ljava/lang/String;)V MD: bay/a (Ljava/util/List;)Ljava/util/List; net/minecraft/src/McoServer/func_98164_a (Ljava/util/List;)Ljava/util/List; MD: bay/b ()Ljava/lang/String; net/minecraft/src/McoServer/func_96398_b ()Ljava/lang/String; +MD: bay/b (Lbay;)I net/minecraft/src/McoServer/func_101017_b (Lnet/minecraft/src/McoServer;)I MD: bay/b (Ljava/lang/String;)V net/minecraft/src/McoServer/func_96400_b (Ljava/lang/String;)V MD: bay/c (Ljava/lang/String;)Lbay; net/minecraft/src/McoServer/func_98165_c (Ljava/lang/String;)Lnet/minecraft/src/McoServer; +MD: bay/compareTo (Ljava/lang/Object;)I net/minecraft/src/McoServer/compareTo (Ljava/lang/Object;)I MD: baz/a (Ljava/lang/String;)Lbaz; net/minecraft/src/McoServerAddress/func_98162_a (Ljava/lang/String;)Lnet/minecraft/src/McoServerAddress; MD: bb/a (Laz;)V net/minecraft/src/BehaviorDefaultDispenseItem/func_82485_a (Lnet/minecraft/src/IBlockSource;)V MD: bb/a (Laz;Lbf;)V net/minecraft/src/BehaviorDefaultDispenseItem/func_82489_a (Lnet/minecraft/src/IBlockSource;Lnet/minecraft/src/EnumFacing;)V diff --git a/fml/conf/mcp.cfg b/fml/conf/mcp.cfg index 47a747f4f..d0bb4408b 100644 --- a/fml/conf/mcp.cfg +++ b/fml/conf/mcp.cfg @@ -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 = d39baadeeb124a29b2542d778713493f -MD5Server = 22223b1d00b72cc51fdb8b7cdd45f9c1 +MD5Client = fd11cbc5b01aae1d62cff0145171f3d9 +MD5Server = 00035b7842554bdbff95a48169420525 [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 = 100000 -ParamIndex = 20000 +RGIndex = 101000 +ParamIndex = 21000 [ASTYLE] AstyleConfig = %(DirConf)s/astyle.cfg diff --git a/fml/conf/params.csv b/fml/conf/params.csv index a134b84eb..56b115520 100644 --- a/fml/conf/params.csv +++ b/fml/conf/params.csv @@ -1,12 +1,47 @@ param,name,side -p_100001_0_,par0,2 -p_100003_1_,par1,2 p_100006_1_,par1Str,2 p_100006_2_,par2Str,2 p_100009_0_,par0,2 p_100012_1_,par1,2 p_100014_0_,par0McoServerList,2 p_100015_0_,par0KeyBinding,2 +p_101000_0_,par0GuiScreenOnlineServers,2 +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 +p_101006_4_,par4,2 +p_101008_1_,par1,2 +p_101008_2_,par2,2 +p_101008_3_,par3,2 +p_101008_4_,par4,2 +p_101009_0_,par0GuiScreenOnlineServers,2 +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 +p_101012_3_,par3,2 +p_101012_4_,par4,2 +p_101015_1_,par1Str,2 +p_101017_1_,par1McoServer,2 +p_101018_1_,par1List,2 p_70000_1_,par1PlayerUsageSnooper,2 p_70001_1_,par1PlayerUsageSnooper,2 p_70003_1_,par1,2 @@ -7590,15 +7625,8 @@ p_96161_0_,par0GuiScreenOnlineServers,2 p_96165_1_,par1Str,2 p_96165_2_,par2,2 p_96165_3_,par3,2 -p_96168_1_,par1,2 -p_96168_2_,par2,2 p_96174_1_,par1McoServer,2 -p_96175_1_,par1,2 -p_96175_2_,par2,2 p_96177_0_,par0GuiScreenOnlineServers,2 -p_96179_0_,par0GuiScreenOnlineServers,2 -p_96179_1_,par1McoServer,2 -p_96182_0_,par0GuiScreenOnlineServers,2 p_96209_1_,par1Str,2 p_96210_1_,par1Str,2 p_96230_0_,par0GuiScreenSelectLocation,2 @@ -7912,32 +7940,18 @@ p_98061_2_,par2,2 p_98061_3_,par3,2 p_98062_1_,par1,2 p_98063_1_,par1,2 -p_98070_0_,par0GuiScreenOnlineServers,2 -p_98070_1_,par1,2 -p_98070_2_,par2,2 -p_98071_0_,par0GuiScreenOnlineServers,2 p_98072_0_,par0GuiScreenOnlineServers,2 p_98074_0_,par0GuiScreenOnlineServers,2 p_98075_0_,par0GuiScreenOnlineServers,2 p_98076_0_,par0GuiScreenOnlineServers,2 -p_98077_0_,par0GuiScreenOnlineServers,2 -p_98077_1_,par1,2 -p_98077_2_,par2,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_98083_0_,par0GuiScreenOnlineServers,2 -p_98083_1_,par1,2 -p_98083_2_,par2,2 p_98084_0_,par0GuiScreenOnlineServers,2 -p_98085_0_,par0GuiScreenOnlineServers,2 -p_98085_1_,par1Str,2 p_98086_1_,par1,2 p_98087_0_,par0GuiScreenOnlineServers,2 -p_98088_1_,par1,2 -p_98088_2_,par2,2 p_98089_0_,par0GuiScreenOnlineServers,2 p_98089_1_,par1,2 p_98091_0_,par0GuiScreenOnlineServers,2 diff --git a/fml/mc_versions.cfg b/fml/mc_versions.cfg index dbb965cc6..19a514a5f 100644 --- a/fml/mc_versions.cfg +++ b/fml/mc_versions.cfg @@ -70,9 +70,9 @@ mcp_md5 = cd4f6f5e6dd7032301aa98a9046201dd [1.5] client_url = http://assets.minecraft.net/1_5/minecraft.jar server_url = http://assets.minecraft.net/1_5/minecraft_server.jar -client_md5 = d39baadeeb124a29b2542d778713493f -server_md5 = 22223b1d00b72cc51fdb8b7cdd45f9c1 +client_md5 = fd11cbc5b01aae1d62cff0145171f3d9 +server_md5 = 00035b7842554bdbff95a48169420525 mcp_ver = 7.42 mcp_url = http://mcp.ocean-labs.de/files/archive/mcp742.zip -mcp_md5 = b8f1c8fd735439b9c94f0eb6f5499b09 +mcp_md5 = ad1a2b86916dd5f71e832181e01bd91a