572c9acc59
More fixes, binpatching works
2013-06-29 15:16:18 -04:00
5b5f05859c
First draft of 1.6 update
2013-06-29 13:33:14 -04:00
58ce9b33b3
Base GenDiff off deobf data's class list instead of the merged jar. Add option to delete target files that generate patches.
2013-06-29 01:40:01 -07:00
cf448bb934
Add missing argument
2013-06-27 22:29:10 -07:00
90c643183e
Re-wrote/orginized a lot of fml.py. Almost everything is re-written/moved.
...
This is done in preperation for MCP to roll out SpecialSource support and the new 1.6 structure.
Also done for my sanity while reading through the code.
Intruduced a new function. If there is a 'mcp_data' folder in the FML folder, it will be copied to the MCP work directory after MCP is extracted.
It DOES overwrite anything that already exists.
This is intended for places like BuildServer to place libraries/assets to prevent them from needing to be downloaded every version.
Introduced a dev-env json. Need to write the eclipse workspace references to the new libraries.
Out custom json includes asm and legacylauncher.
Added proper OptionParsing to decompile.py
2013-06-27 20:48:52 -07:00
14ddd2be05
Fix build script. Add a sample JSON file. You'll need the newest Launcher code to run this.
2013-06-14 21:00:15 -04:00
30d836fa36
More fixups for new launcher model
2013-06-14 20:45:52 -04:00
07a5efe612
Merge in binpatch and use launcher
2013-06-14 17:21:49 -04:00
21240df8bc
More tweaks
2013-06-14 09:32:51 -04:00
95497900c3
Force file name encoding to UTF-8, caused different zips on different systems.
2013-03-04 18:19:06 -08:00
c8a403fa24
Force the joined.srg timestamp to zero- avoids annoying sha1 differences
2013-03-02 15:06:13 -05:00
3a2d167885
Fix up runtime deobfuscation. Working well now.
2013-03-02 10:46:32 -05:00
429dfc3d3d
Build, and use, MC versioned deobfuscation data
2013-03-02 10:30:45 -05:00
8b8b150aa9
Add in build for deobf data zip file, update for official mcp 7.39
2013-03-02 10:02:02 -05:00
251cb92b12
Fix build script
2012-12-17 17:56:00 -05:00
0b36189547
more 1.4.6 tweaks
2012-12-17 17:00:54 -05:00
55dc3467de
Change to download bouncy castle as well. We also finally properly use the downloaded libs
...
even in vanilla code!
2012-12-11 22:37:07 -05:00
3537fb7f21
Updated build script to not use the mcp common directory as it doesn't exist anymore.
2012-12-08 21:41:51 -08:00
3e1efdf05b
Remerged branch, and updated dev eclipse workspace.
2012-12-08 17:08:51 -08:00
57fe3c475a
Fix build eclipse extractor task
2012-12-08 16:46:46 -08:00
e8ff9f25d9
Remove old eclipse workspace and ship/extract as a zip file (use ant setupenvironment)
...
Fix up install.py for forge multibranch changes
2012-12-03 19:55:37 -05:00
6fdf5960ef
Name both zips the same format
2012-12-03 08:38:20 -05:00
16418dd7ad
Clean up build.xml script- support outputting a branched jar file
2012-12-03 08:13:20 -05:00
c584d4e3db
FML will now attempt to download MCP as part of the install process
...
Now shipping a py2exe version of python for windows.
Linux/Macs should come with python pre-installed so they do not have a distrabution here.
2012-12-02 19:59:22 -08:00
72938c9133
Cleaned up some tabs
2012-11-19 15:00:11 -08:00
4e2f04c48a
FML setup should now download and verify all the minecraft files needed to run MCP.
2012-11-08 17:54:05 -08:00
f7403a509f
Update build - include MCP information in the source pack
2012-10-25 10:00:34 -04:00
c2f4738c8c
MCP deserves lots of credit. So here it is.
2012-10-25 09:02:49 -04:00
9b1375f536
Update build.xml - add a classpath to the manifest. This means the universal jar is now a server side launcher.
2012-10-18 21:07:33 -04:00
09fe35d43c
Update build to not bother building client jar. Universal is everything
...
now.
2012-08-22 11:12:26 -04:00
d7dcbe7007
Force a Jenkins build
2012-08-14 01:21:56 -07:00
6f10295936
Hopefully let build continue if server reobf fails, and fix derp in FMLNetworkHandler for entities
2012-08-13 23:25:08 -04:00
7de5191848
Merge the last bits of the server code into the common directory, and annotate ModLoader/BaseMod for sided use
...
This means the FML-Server project is now defunct as all code is either common, client or bukkit.
2012-08-13 22:51:53 -04:00
85f665dd1d
Fix build script- put client in first
2012-08-11 13:05:37 -04:00
938cecbdf7
Fix universal not to dupe entries in the jar, also add in the fml mod as "untransformable"
2012-08-11 12:34:25 -04:00
a1c14779d2
Added -no_gen_conf to jenkins build
2012-08-10 20:09:47 -07:00
3d26511322
Include conf folder and merge config in source zip
2012-08-08 23:44:32 -07:00
d970f7a530
Generate a universal binary package since we can now :)
2012-08-09 01:57:42 -04:00
18aec5b257
Fix packaging and install to not have the src/ folder, making it align better with the dev env.
2012-08-03 17:32:23 -07:00
b572c6a038
Fixed ant script to support common folder building and add the new files to the dist archives.
2012-08-03 03:37:45 -07:00
b51c357d50
More build fixes for jenkins
2012-08-02 10:33:29 -02:30
e44515304a
Try and fix the jenkins build
2012-08-02 10:30:52 -02:30
1e47f3e468
Introduced patching of runtime/commands.py to allow for usage of the src/common folder.
2012-08-02 00:51:51 -07:00
4fb08f1660
Rewrote patch generation and application to no longer need diff, and attempt to apply common patches on decompiles that don't have one side or the other.
2012-08-01 06:54:57 -07:00
4ca63717e5
Modified the decompiler stage to:
...
Compile and run AccessTransformer during the pre-RG stage of decompilation.
Merge resulting sources that are identical to src/common
ToDo:
Finish the common intergration:
-update_patches - Add common folder support
-apply_patches:
--patch each side, also patch all common patches to each side incase they are not merged, only if file exists.
2012-08-01 03:25:45 -07:00
50ed44359d
Merge branch 'minecraft1.3' into newfmlmod
2012-07-23 23:02:25 -02:30
3115f92ee4
Check in new fml mod work so far. Lots still to do.
2012-07-14 13:58:46 -04:00
0a9ee584bf
Added call to clean_source to build script to fix patch fuzz on windows.
2012-07-12 18:06:39 -07:00
59949849f0
Add a "checkpatches" target and check if your patches are up to date before running a repatch operation
2012-07-06 09:19:58 -04:00
e8b09f4692
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
Christian