Commit Graph

  • 6d79241652 Remove profiler stuff - it's been deeply reorged. I'll look at re-adding it later Christian 2012-08-11 14:12:39 -04:00
  • 28096abea5 Fix up command patch to actually work Christian 2012-08-11 14:12:23 -04:00
  • 4f9cc6b398 Fix up command patch to actually work Christian 2012-08-11 14:12:23 -04:00
  • 2d7eb5cb7f Fix commands.py to always include the two side classes so the fml jars are valid. Christian 2012-08-11 14:01:27 -04:00
  • 5a0d08b892 Fix commands.py to always include the two side classes so the fml jars are valid. Christian 2012-08-11 14:01:27 -04:00
  • e6d6932e21 Fix build script- put client in first Christian 2012-08-11 13:05:37 -04:00
  • 85f665dd1d Fix build script- put client in first Christian 2012-08-11 13:05:37 -04:00
  • 406e5d64c0 Put the marker on the server ML file too Christian 2012-08-11 13:04:59 -04:00
  • 2d31dbba15 Put the marker on the server ML file too Christian 2012-08-11 13:04:59 -04:00
  • 13756aad9f Fix universal not to dupe entries in the jar, also add in the fml mod as "untransformable" Christian 2012-08-11 12:34:25 -04:00
  • 938cecbdf7 Fix universal not to dupe entries in the jar, also add in the fml mod as "untransformable" Christian 2012-08-11 12:34:25 -04:00
  • c1a8b16f30 Fix up launch when obfuscated *sigh* Christian 2012-08-11 12:24:43 -04:00
  • 57de5c1b90 Fix up launch when obfuscated *sigh* Christian 2012-08-11 12:24:43 -04:00
  • e3671285c3 Update netclienthandler patch. Christian 2012-08-11 12:10:22 -04:00
  • 35fda10b50 Update netclienthandler patch. Christian 2012-08-11 12:10:22 -04:00
  • b33cff3613 Fix NPE for server relaunch v3.0 Christian 2012-08-11 12:05:13 -04:00
  • d663884aa5 Fix NPE for server relaunch Christian 2012-08-11 12:05:13 -04:00
  • afc2a4a75c Fix up Package.getPackage(), also fix up loadcontroller construction Christian 2012-08-11 11:44:55 -04:00
  • ff18294591 Fix up Package.getPackage(), also fix up loadcontroller construction Christian 2012-08-11 11:44:55 -04:00
  • 7c4583c87a Add in Package.getPackage() support for sengir Christian 2012-08-11 11:12:16 -04:00
  • 3918c5e810 Add in Package.getPackage() support for sengir Christian 2012-08-11 11:12:16 -04:00
  • f563815961 Lost of work to try and complete ML support - probably still bits missing, but mostly there Christian 2012-08-11 11:01:18 -04:00
  • 92b7ed1182 Lost of work to try and complete ML support - probably still bits missing, but mostly there Christian 2012-08-11 11:01:18 -04:00
  • ba55320462 Fixed Diemsnion API related NPEs, and updated FML to 231. LexManos 2012-08-11 03:08:09 -07:00
  • 0ce38f747c Newlines in diff file LexManos 2012-08-11 02:27:19 -07:00
  • 185f8ddbc7 Newlines in diff file LexManos 2012-08-11 02:27:19 -07:00
  • efce8e916b Add special case to add Side/SideOnly to difflist LexManos 2012-08-11 02:25:40 -07:00
  • 953f99787e Add special case to add Side/SideOnly to difflist LexManos 2012-08-11 02:25:40 -07:00
  • 44728c9f93 Fix up some network related stuff and optimize mod lookup a bit Christian 2012-08-11 02:43:04 -04:00
  • 7e35f13f30 Fix up some network related stuff and optimize mod lookup a bit Christian 2012-08-11 02:43:04 -04:00
  • d96a81e4f2 Fix up proxy injector to inject properly Christian 2012-08-11 02:24:29 -04:00
  • 2e66429b03 Fix up proxy injector to inject properly Christian 2012-08-11 02:24:29 -04:00
  • f11844374e Fix decompile LexManos 2012-08-10 20:41:59 -07:00
  • 1e4d788cd0 Fix decompile LexManos 2012-08-10 20:41:59 -07:00
  • 55636eabab Updated FML, updated patches LexManos 2012-08-10 20:30:59 -07:00
  • 8c63203bb4 Fix NPE on missing mods - still need to actually handle missing mods properly on client Christian 2012-08-10 23:27:11 -04:00
  • 7440cc89e9 Fix NPE on missing mods - still need to actually handle missing mods properly on client Christian 2012-08-10 23:27:11 -04:00
  • 751299d5f1 New downloader UI and new downloader backend - should be more robust now Christian 2012-08-10 23:17:31 -04:00
  • fde0619e9b New downloader UI and new downloader backend - should be more robust now Christian 2012-08-10 23:17:31 -04:00
  • 7d479bf854 Added -no_gen_conf to jenkins build LexManos 2012-08-10 20:09:47 -07:00
  • a1c14779d2 Added -no_gen_conf to jenkins build LexManos 2012-08-10 20:09:47 -07:00
  • c812a4ede5 Added some extra error prints, hopeully get something useful when installed in the client. LexManos 2012-08-10 18:54:06 -07:00
  • 5a1f84ed5b Added some extra error prints, hopeully get something useful when installed in the client. LexManos 2012-08-10 18:54:06 -07:00
  • a826283111 Updated conf merger script to just merge everything, and normalize the line endings so git doesn't complain. LexManos 2012-08-10 18:25:11 -07:00
  • 49385961d9 Updated conf merger script to just merge everything, and normalize the line endings so git doesn't complain. LexManos 2012-08-10 18:25:11 -07:00
  • f374723610 Update fml, impelemnted Diemsnion API stuff. LexManos 2012-08-10 18:15:10 -07:00
  • f61f30c1e6 SidedProxy should work again - anywhere. Make sure it's on a static field though Christian 2012-08-10 17:42:43 -04:00
  • dd319a2938 SidedProxy should work again - anywhere. Make sure it's on a static field though Christian 2012-08-10 17:42:43 -04:00
  • 8f76e8ba8b More ticking hooks, and some other bits of clean up. Very close to "done" now. Christian 2012-08-10 17:11:01 -04:00
  • 7b2d09844c More ticking hooks, and some other bits of clean up. Very close to "done" now. Christian 2012-08-10 17:11:01 -04:00
  • 537d89b9e0 Fix up modloader and clean up junk method Christian 2012-08-10 16:42:21 -04:00
  • b5dc18ff7e Fix up modloader and clean up junk method Christian 2012-08-10 16:42:21 -04:00
  • 0927aaa0f1 A lot of missing patches to code re-added. Almost all functionality should now be restored. Christian 2012-08-10 16:37:06 -04:00
  • 5e7cb9106d A lot of missing patches to code re-added. Almost all functionality should now be restored. Christian 2012-08-10 16:37:06 -04:00
  • d17aad797d Readded common folder to startclient/server. LexManos 2012-08-10 12:38:59 -07:00
  • fcd4a8e854 Readded common folder to startclient/server. LexManos 2012-08-10 12:38:59 -07:00
  • 53e611a03a Add in a registration method for gui handlers Christian 2012-08-10 11:12:57 -04:00
  • 1c189ae762 Add in a registration method for gui handlers Christian 2012-08-10 11:12:57 -04:00
  • 7ac1be8a9a Overwrote lex's command patch Christian 2012-08-10 10:57:18 -04:00
  • a58306abc6 Overwrote lex's command patch Christian 2012-08-10 10:57:18 -04:00
  • 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. Christian 2012-08-10 10:03:33 -04:00
  • 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. Christian 2012-08-10 10:03:33 -04:00
  • 3aa13d8640 Include Forge's AT config into redist zips. LexManos 2012-08-10 02:25:48 -07:00
  • acdcfd0a56 Added new pick block hook for blocks and entites to allow for better grained control of the result. LexManos 2012-08-10 02:09:11 -07:00
  • d14b1b4e1f Fix oreientation bug causing levers not being able to place. LexManos 2012-08-10 02:08:26 -07:00
  • 44e6fd90c9 Moved over Configuration LexManos 2012-08-10 00:31:39 -07:00
  • b9d1d1e2f4 Added common folder support to startclient/startserver LexManos 2012-08-09 20:34:16 -07:00
  • ba0cc6ec12 Added common folder support to startclient/startserver LexManos 2012-08-09 20:34:16 -07:00
  • 2dc00adec8 Added some missing quotes that caused issues if your workspace had a space in it. LexManos 2012-08-09 20:01:51 -07:00
  • 349da399ff Added some missing quotes that caused issues if your workspace had a space in it. LexManos 2012-08-09 20:01:51 -07:00
  • f36d410cc4 Update fml LexManos 2012-08-09 19:13:12 -07:00
  • b97e937f28 Add lib folder to installed eclipse LexManos 2012-08-09 19:02:28 -07:00
  • dca24fd567 Add lib folder to installed eclipse LexManos 2012-08-09 19:02:28 -07:00
  • 69e9c31aef Copy forge files over in install. LexManos 2012-08-09 18:48:20 -07:00
  • a759939e13 Delete conf, server compile, update fml, and fix install script. LexManos 2012-08-09 18:37:52 -07:00
  • f31b8a98a9 Cleaned up some more, fixed infinite loop with cancelable annotation, Client now compiles and enters world just fine. LexManos 2012-08-09 16:47:35 -07:00
  • c54c4e73e6 Add in missing patch - also, launch FML properly from the server Christian 2012-08-09 09:21:16 -04:00
  • 6eb4bceee3 Add in missing patch - also, launch FML properly from the server Christian 2012-08-09 09:21:16 -04:00
  • 93528597f4 Entity spawn adjustment - tracker Christian 2012-08-09 08:40:32 -04:00
  • 6d0f7ace17 Entity spawn adjustment - tracker Christian 2012-08-09 08:40:32 -04:00
  • ba9e3a251c Nope, unneeded patch LexManos 2012-08-09 03:11:40 -07:00
  • dae4a07c60 Updated Client side patches for the new Merged MCP workspace. LexManos 2012-08-09 03:06:41 -07:00
  • a85bb7bfdb Fix ModLoader compilation, and MCPmerger invocation for Forge. LexManos 2012-08-09 03:04:25 -07:00
  • 859ebae365 Fix ModLoader compilation, and MCPmerger invocation for Forge. LexManos 2012-08-09 03:04:25 -07:00
  • 0f2d00abf3 Include conf folder and merge config in source zip LexManos 2012-08-08 23:44:32 -07:00
  • 3d26511322 Include conf folder and merge config in source zip LexManos 2012-08-08 23:44:32 -07:00
  • 0e4c716177 Entity spawning - done Christian 2012-08-09 01:58:14 -04:00
  • 185babbd85 Entity spawning - done Christian 2012-08-09 01:58:14 -04:00
  • 85b77c3d12 Generate a universal binary package since we can now :) Christian 2012-08-09 01:57:42 -04:00
  • d970f7a530 Generate a universal binary package since we can now :) Christian 2012-08-09 01:57:42 -04:00
  • 03884b1aaa Merge branch 'MergingClientServer' Christian 2012-08-08 22:58:33 -04:00
  • 83fdb602e2 Merge branch 'MergingClientServer' Christian 2012-08-08 22:58:33 -04:00
  • dbdc76e6ea Reorganized all the current patches Christian 2012-08-08 22:57:37 -04:00
  • c1bd11e64a Reorganized all the current patches Christian 2012-08-08 22:57:37 -04:00
  • b8aaed368b Fix up annotation parser to parse arrays and enums Christian 2012-08-08 22:10:56 -04:00
  • c1b3bfd007 Fix up annotation parser to parse arrays and enums Christian 2012-08-08 22:10:56 -04:00
  • 6ec3379153 Added SideTransformer to strip side only functions/fields out. LexManos 2012-08-08 18:53:41 -07:00
  • 9b81775a2f Added SideTransformer to strip side only functions/fields out. LexManos 2012-08-08 18:53:41 -07:00
  • 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 LexManos 2012-08-08 05:48:06 -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 LexManos 2012-08-08 05:48:06 -07:00