238dcdd18d
More robust eclipse workspace replacement
2012-12-12 14:31:07 -08:00
1812016e29
Kill decompile if astyle is not found and set execution bits on mcp .sh files and astyle-osx
2012-12-11 21:47:45 -08: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
5e0af1f2cb
Some derp protection in the workspace copy.
2012-12-09 02:20:21 -08:00
00bdb3dc0b
Removed remaining references to src/common
...
Fixed eclipse workspace replacemnt on source dist
Cleanup some outputs
2012-12-09 02:10:28 -08:00
edb4e08b22
Merge branch 'master' into repackage
...
Conflicts:
eclipse/Clean/.classpath
eclipse/Clean/.project
eclipse/FML/.classpath
eclipse/FML/.project
install/fml.py
2012-12-04 01:24:50 -05: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
61a90e9e74
Assume Forge is the parent directory when checking for AT configs.
2012-12-03 16:53:03 -08:00
9cdbadb66c
Merge branch 'master' into repackage
...
Conflicts:
patches/minecraft/net/minecraft/client/EntityFX.java.patch
2012-12-03 17:31:29 -05:00
e334a469fb
Small derp in install.py
2012-12-02 20:26:36 -08: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
7fb23bf89f
More re-packaging, got most classes out of the default package.
2012-11-20 17:22:55 -08:00
73a22bb571
Inital script side commit for MC source repackaging done.
2012-11-20 01:55:41 -08:00
397d36e900
Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config.
2012-11-19 17:45:53 -08:00
950154aa61
Updated to 1.4.5b
2012-11-19 15:35:08 -08:00
5e5919f61c
Fix python error
2012-11-19 15:03:13 -08:00
786b04c57d
Modified decompile so that we do not have to decompile the server, saves time.
2012-11-19 15:01:04 -08:00
f842aa75bb
Change usage of ZipFile, fixes issues with Mac's default instation of python. Also cleaned the python a little bit.
2012-11-19 13:33:22 -08:00
8d26642a84
Cleaned up the AT config updater, should work for any setup of the MCP workspace now.
2012-11-17 19:08:47 -08:00
719f5f2bde
Update FML for MC 1.4.5
2012-11-16 16:31:06 -05:00
5355348181
Fix spelling issue.
2012-11-08 21:01:31 -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
3dbe774ec1
Update to MC 1.4.4
2012-11-08 17:55:20 -05:00
8ec0cf6ab9
Update to 1.4.3
2012-11-01 23:53:13 -04:00
39d6ef64c2
Update for MC 1.4.2
2012-10-24 15:12:06 -04:00
37697d7f44
First update to 1.4.1, patches need updating.
2012-10-23 14:44:04 -07:00
8af47f2bb9
Fix up FML python script for forge
2012-10-21 08:19:36 -04:00
59738c493a
Update with RC2 MCP. Use the joined.exc file directly since MCP now provides it.
2012-10-20 12:27:30 -04:00
c106909d91
Updae build to copy files that may decompile differently but are actually the same, and updated for 1.4 values.
2012-10-20 00:06:55 -07:00
ecf14df030
Fix error in merging of exec's
2012-10-19 21:14:03 -07:00
befe8f5f47
Change download location for FML libraries to files.minecraftforge.net, add an encoding param to the javac command line to force utf 8
2012-08-31 11:18:17 -04:00
fe263206e2
FML will now search '<mcpdir>/forge/accesstransformers' for user defined access transformer config files to be applied during forge setup
2012-08-23 06:31:00 +10:00
8444fa6d3c
Change install.cmd to install.bat, why, cuz people are .... Updated readme to mention needing server and client.
2012-08-16 22:57:11 -07:00
96b78514a8
Cleanup fml.py a little, should fix double printing of 'patching file'
2012-08-15 03:10:45 -07:00
9ad520cb2a
Fix new eclipse workspace to load the project properly from start.
2012-08-15 00:50:16 -07:00
eef3303dfe
Finished update to MCP 7.2, MC 1.3.2 pre.
2012-08-14 19:24:49 -07:00
646a0b4fc4
Fixup included workspace to have single project with client/server launches.
2012-08-14 17:42:40 -07:00
3d0bd2bc7a
Start working on MC 1.3.2
2012-08-14 20:09:24 -04:00
f1a8b2ea72
FML will skip gathering MD5s for classes in the cpw package during the the inital recompile {Make Side/SideOnly reobf properly}
2012-08-13 21:53:52 -07:00
bbcdaa7dfb
Updated FML install to provide better error output, Updated commands.py patch to disable recompile of server project.
2012-08-13 21:02:55 -07:00
f73e4b6169
Fix MCPMerger injecting Side/SideOnly when it already exists.
2012-08-12 04:27:36 -07:00
9777204547
Added patch verification to commands.py patch, and made it so MCP will check the original jars for the server, to prevent it from saying modified when it started out clean.
2012-08-12 02:49:39 -07:00
c4149f7b55
Added missing quotes around compile command.
2012-08-11 16:03:33 -07:00
49385961d9
Updated conf merger script to just merge everything, and normalize the line endings so git doesn't complain.
2012-08-10 18:25:11 -07:00
349da399ff
Added some missing quotes that caused issues if your workspace had a space in it.
2012-08-09 20:01:51 -07:00
dca24fd567
Add lib folder to installed eclipse
2012-08-09 19:02:28 -07:00
859ebae365
Fix ModLoader compilation, and MCPmerger invocation for Forge.
2012-08-09 03:04:25 -07:00
3d26511322
Include conf folder and merge config in source zip
2012-08-08 23:44:32 -07:00
9b81775a2f
Added SideTransformer to strip side only functions/fields out.
2012-08-08 18:53:41 -07:00
ac8945a4f8
Stage 1 of merging the client and server for MCP.
...
Results:
Client: 362
Server: 3 (Only due to issues of FF decompilation inconsistancies)
Common: 910
Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.
2012-08-08 05:48:06 -07:00
7e68b53196
Fix path trimming for copytree
2012-08-04 20:36:27 -07:00
ae79c79447
Patch commands.py to support side '2' as common, as well as fix a few small errors in the update_patches and fml scripts.
2012-08-04 03:34:34 -07:00
fc8c2ac6e4
Merged transformers/ to /common and renamed the asm source download to align better with the asm bin file name.
2012-08-03 23:51:49 -07:00
fbc968e1b4
Change place commands.py backup is stored.
2012-08-03 23:24:58 -07:00
08eb7c5c45
FML finish won't updatemcp automatically, easier integration with forge.
2012-08-03 17:36:16 -07: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
34706d6acf
Moved setting up eclipse to setup_mcp
2012-08-03 16:56:00 -07:00
2fccc04903
setup_fml's decompile will result in proper md5 files now {if there is no compiler issues}
2012-08-03 03:35:38 -07:00
f1717526d8
Download argo/guava source references in install, and updated eclipse workspaces to reference them.
2012-08-02 23:36:00 -07:00
56153c43d6
Cleaned up commands.patch, removed debug print in fml.py
2012-08-02 21:14:06 -07:00
1b20de0ab6
Fix commands patch, WorldType patch and some ML compat stuff
2012-08-02 20:09:18 -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
582a785fb8
Change some stuff around - begin launching the server through the wrapper too.
...
A lot of patches went in - the client and server both launch and start up mods.
2012-08-02 02:08:30 -02:30
5f51e63385
A load of transformer accesses- also a few tweaks to the transformer, and linux support in the fml python
2012-08-01 18:59:45 -02:30
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
d0036dda00
Updated eclipse projects to have src-common linked resources
2012-08-01 03:52:03 -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
2671641b83
Cleaned up the install script for the source distrabution to setup the workspace properly, delete argo, and download all required dependancies.
2012-07-12 18:07:58 -07:00
202933c409
Update credits information
2012-06-02 11:45:47 -04:00
8baf435a4a
Update readme for the client side
2012-06-02 11:44:26 -04:00
2489469aba
Missed a couple of wording tweaks
2012-04-05 00:58:17 -04:00
371d69f89c
Tidy up some of the installation media
2012-04-04 09:48:36 -04:00
620764f315
More build stuff, adding in readme etc copied from forge
2012-03-30 16:40:54 -04:00
LexManos