Christian
b33cff3613
Fix NPE for server relaunch
2012-08-11 12:05:13 -04:00
Christian
afc2a4a75c
Fix up Package.getPackage(), also fix up loadcontroller construction
2012-08-11 11:44:55 -04:00
Christian
7c4583c87a
Add in Package.getPackage() support for sengir
2012-08-11 11:12:16 -04:00
Christian
f563815961
Lost of work to try and complete ML support - probably still bits missing, but mostly there
2012-08-11 11:02:09 -04:00
LexManos
0ce38f747c
Newlines in diff file
2012-08-11 02:27:19 -07:00
LexManos
efce8e916b
Add special case to add Side/SideOnly to difflist
2012-08-11 02:25:40 -07:00
Christian
44728c9f93
Fix up some network related stuff and optimize mod lookup a bit
2012-08-11 02:43:04 -04:00
Christian
d96a81e4f2
Fix up proxy injector to inject properly
2012-08-11 02:24:29 -04:00
LexManos
f11844374e
Fix decompile
2012-08-10 20:41:59 -07:00
Christian
8c63203bb4
Fix NPE on missing mods - still need to actually handle missing mods properly on client
2012-08-10 23:27:11 -04:00
Christian
751299d5f1
New downloader UI and new downloader backend - should be more robust now
2012-08-10 23:18:52 -04:00
LexManos
7d479bf854
Added -no_gen_conf to jenkins build
2012-08-10 20:09:47 -07:00
LexManos
c812a4ede5
Added some extra error prints, hopeully get something useful when installed in the client.
2012-08-10 18:54:06 -07:00
LexManos
a826283111
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
f61f30c1e6
SidedProxy should work again - anywhere. Make sure it's on a static field though
2012-08-10 17:42:43 -04:00
Christian
8f76e8ba8b
More ticking hooks, and some other bits of clean up. Very close to "done" now.
2012-08-10 17:11:01 -04:00
Christian
537d89b9e0
Fix up modloader and clean up junk method
2012-08-10 16:42:21 -04:00
Christian
0927aaa0f1
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
d17aad797d
Readded common folder to startclient/server.
2012-08-10 12:38:59 -07:00
Christian
53e611a03a
Add in a registration method for gui handlers
2012-08-10 11:12:57 -04:00
Christian
7ac1be8a9a
Overwrote lex's command patch
2012-08-10 10:57:18 -04:00
Christian
dd7d70d619
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
b9d1d1e2f4
Added common folder support to startclient/startserver
2012-08-09 20:34:16 -07:00
LexManos
2dc00adec8
Added some missing quotes that caused issues if your workspace had a space in it.
2012-08-09 20:01:51 -07:00
LexManos
b97e937f28
Add lib folder to installed eclipse
2012-08-09 19:02:28 -07:00
Christian
c54c4e73e6
Add in missing patch - also, launch FML properly from the server
2012-08-09 09:21:16 -04:00
Christian
93528597f4
Entity spawn adjustment - tracker
2012-08-09 08:40:32 -04:00
LexManos
a85bb7bfdb
Fix ModLoader compilation, and MCPmerger invocation for Forge.
2012-08-09 03:04:25 -07:00
LexManos
0f2d00abf3
Include conf folder and merge config in source zip
2012-08-08 23:44:32 -07:00
Christian
0e4c716177
Entity spawning - done
2012-08-09 01:58:14 -04:00
Christian
85b77c3d12
Generate a universal binary package since we can now :)
2012-08-09 01:57:42 -04:00
Christian
03884b1aaa
Merge branch 'MergingClientServer'
2012-08-08 22:58:33 -04:00
Christian
dbdc76e6ea
Reorganized all the current patches
2012-08-08 22:57:37 -04:00
Christian
b8aaed368b
Fix up annotation parser to parse arrays and enums
2012-08-08 22:10:56 -04:00
LexManos
6ec3379153
Added SideTransformer to strip side only functions/fields out.
2012-08-08 18:53:41 -07:00
LexManos
b177aad1ee
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
e050c7807d
Gui Handler ported from MC forge
2012-08-08 00:31:24 -04:00
Christian
f3f7398a8b
Revert dumb stuff with commands patch - lots of gfx patching
2012-08-07 23:11:37 -04:00
Christian
da4311dc74
Almost finished basic network stuff now
2012-08-07 20:41:37 -04:00
Christian
59471f6cac
Update some patches- more network work
2012-08-07 20:10:36 -04:00
Christian
d8b92064d7
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
8e96e60179
Fix location of forge in common handler - also some tweaks to modloader and other stuff
2012-08-06 17:27:21 -04:00
Christian
54877176a6
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
a3ad32a3e5
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -04:00
Christian
602a4f219c
Remove some unneeded fields from the annotations
2012-08-05 02:24:02 -04:00
LexManos
f24977dc3d
Made empty constructor for ModMetadata public
2012-08-04 22:51:57 -07:00
LexManos
4607f9ebb0
Fix path trimming for copytree
2012-08-04 20:36:27 -07:00
Christian
672f4a03f2
Change property name to fml.modStates not fml.disabledMods- it makes more sense that way
2012-08-04 12:35:46 -04:00
Christian
f0736ade3d
Add in a bit of logging when events get sent to mod containers
2012-08-04 11:45:40 -04:00
Christian
4da48cea7a
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
Christian