Commit graph

431 commits

Author SHA1 Message Date
LexManos
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
Christian
dd319a2938 SidedProxy should work again - anywhere. Make sure it's on a static field though 2012-08-10 17:42:43 -04:00
Christian
7b2d09844c More ticking hooks, and some other bits of clean up. Very close to "done" now. 2012-08-10 17:11:01 -04:00
Christian
b5dc18ff7e Fix up modloader and clean up junk method 2012-08-10 16:42:21 -04:00
Christian
5e7cb9106d A lot of missing patches to code re-added. Almost all functionality should now
be restored.

ModLoader compatibility is not yet assured, there are some wrapper classes that
need re-writing first
2012-08-10 16:39:03 -04:00
LexManos
fcd4a8e854 Readded common folder to startclient/server. 2012-08-10 12:38:59 -07:00
Christian
1c189ae762 Add in a registration method for gui handlers 2012-08-10 11:12:57 -04:00
Christian
a58306abc6 Overwrote lex's command patch 2012-08-10 10:57:18 -04:00
Christian
3c1b234a61 Fix up MCP merger - it definitely works now - the game runs and runs well.
Fix up a couple of small network related issues.
Fix up the server launching fml properly.
2012-08-10 10:03:33 -04:00
LexManos
ba0cc6ec12 Added common folder support to startclient/startserver 2012-08-09 20:34:16 -07:00
LexManos
349da399ff Added some missing quotes that caused issues if your workspace had a space in it. 2012-08-09 20:01:51 -07:00
LexManos
dca24fd567 Add lib folder to installed eclipse 2012-08-09 19:02:28 -07:00
Christian
6eb4bceee3 Add in missing patch - also, launch FML properly from the server 2012-08-09 09:21:16 -04:00
Christian
6d0f7ace17 Entity spawn adjustment - tracker 2012-08-09 08:40:32 -04:00
LexManos
859ebae365 Fix ModLoader compilation, and MCPmerger invocation for Forge. 2012-08-09 03:04:25 -07:00
LexManos
3d26511322 Include conf folder and merge config in source zip 2012-08-08 23:44:32 -07:00
Christian
185babbd85 Entity spawning - done 2012-08-09 01:58:14 -04:00
Christian
d970f7a530 Generate a universal binary package since we can now :) 2012-08-09 01:57:42 -04:00
Christian
83fdb602e2 Merge branch 'MergingClientServer' 2012-08-08 22:58:33 -04:00
Christian
c1bd11e64a Reorganized all the current patches 2012-08-08 22:57:37 -04:00
Christian
c1b3bfd007 Fix up annotation parser to parse arrays and enums 2012-08-08 22:10:56 -04:00
LexManos
9b81775a2f Added SideTransformer to strip side only functions/fields out. 2012-08-08 18:53:41 -07:00
LexManos
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
Christian
77f4cc5bea Gui Handler ported from MC forge 2012-08-08 00:31:24 -04:00
Christian
8998d4c5e0 Revert dumb stuff with commands patch - lots of gfx patching 2012-08-07 23:11:37 -04:00
Christian
0ddf61cee2 Almost finished basic network stuff now 2012-08-07 20:41:37 -04:00
Christian
84efb72e46 Update some patches- more network work 2012-08-07 20:10:36 -04:00
Christian
f4b9055171 Bunch of hooks re-added : network is more complete now, lot of basemod cleanup, moving stuff into
the registry area
2012-08-06 22:30:13 -04:00
Christian
12927291a7 Fix location of forge in common handler - also some tweaks to modloader and other stuff 2012-08-06 17:27:21 -04:00
Christian
73bdd512c5 Network support - there's still some work to do and full id sync isn't done yet, but it has proper registration
semantics and hooks for 250 handling
2012-08-06 16:12:50 -04:00
Christian
8bda53cb77 Add in a lot of network handler stuff - also, expose the asm harvested data 2012-08-06 09:52:42 -04:00
Christian
09098f8a0f Remove some unneeded fields from the annotations 2012-08-05 02:24:02 -04:00
LexManos
63d5d42512 Made empty constructor for ModMetadata public 2012-08-04 22:51:57 -07:00
LexManos
7e68b53196 Fix path trimming for copytree 2012-08-04 20:36:27 -07:00
Christian
e92be964fd Change property name to fml.modStates not fml.disabledMods- it makes more sense that way 2012-08-04 12:35:46 -04:00
Christian
969de94d8a Add in a bit of logging when events get sent to mod containers 2012-08-04 11:45:40 -04:00
Christian
e39092335a Allow coremods to inject a modcontainer and run code
this will mean that FML is deliberately and very obviously incompatible with a modloader installation.

Fix up worldtype so that the server can run.
2012-08-04 11:31:06 -04:00
LexManos
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
LexManos
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
LexManos
fbc968e1b4 Change place commands.py backup is stored. 2012-08-03 23:24:58 -07:00
LexManos
08eb7c5c45 FML finish won't updatemcp automatically, easier integration with forge. 2012-08-03 17:36:16 -07:00
LexManos
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
LexManos
34706d6acf Moved setting up eclipse to setup_mcp 2012-08-03 16:56:00 -07:00
LexManos
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
LexManos
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
LexManos
7949a15226 Removed FMLRegistry, and IMinecraftRegistry.
Updated server side to use the seperated registry classes like the client does.
Updated searge name references on server
Made StatBase.statName public using AccessTransformer
Server should compile now
2012-08-03 01:50:48 -07:00
LexManos
476dfbc754 Fix MockBlock compile 2012-08-03 01:47:09 -07:00
LexManos
f1717526d8 Download argo/guava source references in install, and updated eclipse workspaces to reference them. 2012-08-02 23:36:00 -07:00
LexManos
56153c43d6 Cleaned up commands.patch, removed debug print in fml.py 2012-08-02 21:14:06 -07:00
LexManos
79ed963c4a Remove clientdrop, old reference files. 2012-08-02 20:32:51 -07:00