keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Updated to 1.4.5b

Browse source
This commit is contained in:
LexManos 2012-11-19 15:35:08 -08:00
parent 5e5919f61c
commit 950154aa61
7 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fml/.gitattributes vendored
View file

@ -1,7 +1,9 @@
* text eol=lf * text eol=lf
*.bat text eol=crlf *.bat text eol=crlf
*.patch text *.patch text eol=lf
*.png binary *.png binary
*.exe binary *.exe binary
*.dll binary *.dll binary
*.zip binary *.zip binary
*.cfg text eol=lf
*.py text eol=lf

6
fml/conf/joined.srg
View file

@ -3506,9 +3506,8 @@ FD: aze/i net/minecraft/src/EntityFX/field_70553_i
FD: aze/j net/minecraft/src/EntityFX/field_70551_j FD: aze/j net/minecraft/src/EntityFX/field_70551_j
FD: azf/a net/minecraft/src/EffectRenderer/field_78878_a FD: azf/a net/minecraft/src/EffectRenderer/field_78878_a
FD: azf/b net/minecraft/src/EffectRenderer/field_78876_b FD: azf/b net/minecraft/src/EffectRenderer/field_78876_b
FD: azf/c net/minecraft/src/EffectRenderer/field_90038_c FD: azf/c net/minecraft/src/EffectRenderer/field_78877_c
FD: azf/d net/minecraft/src/EffectRenderer/field_78877_c FD: azf/d net/minecraft/src/EffectRenderer/field_78875_d
FD: azf/e net/minecraft/src/EffectRenderer/field_78875_d
FD: azg/a net/minecraft/src/CallableLastTickedParticle/field_90041_a FD: azg/a net/minecraft/src/CallableLastTickedParticle/field_90041_a
FD: azg/b net/minecraft/src/CallableLastTickedParticle/field_90040_b FD: azg/b net/minecraft/src/CallableLastTickedParticle/field_90040_b
FD: azh/a net/minecraft/src/EntityCloudFX/field_70569_a FD: azh/a net/minecraft/src/EntityCloudFX/field_70569_a
@ -10404,7 +10403,6 @@ MD: azf/a (Laze;)V net/minecraft/src/EffectRenderer/func_78873_a (Lnet/minecraft
MD: azf/a (Llq;F)V net/minecraft/src/EffectRenderer/func_78874_a (Lnet/minecraft/src/Entity;F)V MD: azf/a (Llq;F)V net/minecraft/src/EffectRenderer/func_78874_a (Lnet/minecraft/src/Entity;F)V
MD: azf/a (Lxv;)V net/minecraft/src/EffectRenderer/func_78870_a (Lnet/minecraft/src/World;)V MD: azf/a (Lxv;)V net/minecraft/src/EffectRenderer/func_78870_a (Lnet/minecraft/src/World;)V
MD: azf/b ()Ljava/lang/String; net/minecraft/src/EffectRenderer/func_78869_b ()Ljava/lang/String; MD: azf/b ()Ljava/lang/String; net/minecraft/src/EffectRenderer/func_78869_b ()Ljava/lang/String;
MD: azf/b (Laze;)V net/minecraft/src/EffectRenderer/func_90037_b (Lnet/minecraft/src/EntityFX;)V
MD: azf/b (Llq;F)V net/minecraft/src/EffectRenderer/func_78872_b (Lnet/minecraft/src/Entity;F)V MD: azf/b (Llq;F)V net/minecraft/src/EffectRenderer/func_78872_b (Lnet/minecraft/src/Entity;F)V
MD: azg/a ()Ljava/lang/String; net/minecraft/src/CallableLastTickedParticle/func_90039_a ()Ljava/lang/String; MD: azg/a ()Ljava/lang/String; net/minecraft/src/CallableLastTickedParticle/func_90039_a ()Ljava/lang/String;
MD: azg/call ()Ljava/lang/Object; net/minecraft/src/CallableLastTickedParticle/call ()Ljava/lang/Object; MD: azg/call ()Ljava/lang/Object; net/minecraft/src/CallableLastTickedParticle/call ()Ljava/lang/Object;

1
fml/conf/params.csv
View file

@ -7170,7 +7170,6 @@ p_90030_0_,par0EntityRenderer,2
p_90033_1_,par1Str,2 p_90033_1_,par1Str,2
p_90035_0_,par0,2 p_90035_0_,par0,2
p_90036_0_,par0EntityLiving,2 p_90036_0_,par0EntityLiving,2
p_90037_1_,par1EntityFX,2
p_90042_0_,par0Str,2 p_90042_0_,par0Str,2
p_accept_1_,par1File,2 p_accept_1_,par1File,2
p_accept_2_,par2Str,2 p_accept_2_,par2Str,2

1 param name side
7170 p_90033_1_ par1Str 2
7171 p_90035_0_ par0 2
7172 p_90036_0_ par0EntityLiving 2
p_90037_1_ par1EntityFX 2
7173 p_90042_0_ par0Str 2
7174 p_accept_1_ par1File 2
7175 p_accept_2_ par2Str 2

2
fml/conf/version.cfg
View file

@ -1,4 +1,4 @@
[VERSION] [VERSION]
MCPVersion = 7.22 MCPVersion = 7.23
ClientVersion = 1.4.5 ClientVersion = 1.4.5
ServerVersion = 1.4.5 ServerVersion = 1.4.5

2
fml/install/fml.py
View file

@ -8,7 +8,7 @@ from pprint import pprint
from zipfile import ZipFile from zipfile import ZipFile
from pprint import pprint from pprint import pprint
mcp_version = '7.22' mcp_version = '7.23'
def download_deps(mcp_path): def download_deps(mcp_path):
ret = True ret = True

6
fml/mc_versions.cfg
View file

@ -14,6 +14,6 @@ mcp_ver = 7.21
[1.4.5] [1.4.5]
client_url = http://assets.minecraft.net/1_4_5/minecraft.jar client_url = http://assets.minecraft.net/1_4_5/minecraft.jar
server_url = http://assets.minecraft.net/1_4_5/minecraft_server.jar server_url = http://assets.minecraft.net/1_4_5/minecraft_server.jar
client_md5 = 469c9743ba88b7aa498769db75e31b1c client_md5 = b15e2b2b6b4629f0d99a95b6b44412a0
server_md5 = c6f1b976385db8bb502902c57458be00 server_md5 = 250654ceae7a26ba955a30095d90a475
mcp_ver = 7.22 mcp_ver = 7.23

2
fml/updateasmdata.py
View file

@ -38,7 +38,7 @@ def process_file(file, srg):
newpart = '%s%s #%s\n' % (parts[0][0], srg['CL:'][target], target) newpart = '%s%s #%s\n' % (parts[0][0], srg['CL:'][target], target)
nf.write(newpart) nf.write(newpart)
else: else:
with open(file + '-new', 'w') as nf: with open(file + '-new', 'wb') as nf:
with open(file) as f: with open(file) as f:
for line in f: for line in f:
parts = line.split('#') parts = line.split('#')