Christian
7988323073
Actually add in the system property for the minecraft home, should fix multimc too
2012-08-15 19:16:36 -04:00
Christian
ba902537ca
Add in support for setting the home dir via the applet launch, also a system property for forcing the home dir
2012-08-15 17:18:11 -04:00
LexManos
96b78514a8
Cleanup fml.py a little, should fix double printing of 'patching file'
2012-08-15 03:10:45 -07:00
LexManos
e0cb8cd503
Wrap mod description rendering in BLEND calls https://github.com/MinecraftForge/MinecraftForge/issues/96
2012-08-15 02:52:29 -07:00
LexManos
022b3e57dc
Made getmodifiedsrc noop for server.
2012-08-15 00:50:40 -07:00
LexManos
9ad520cb2a
Fix new eclipse workspace to load the project properly from start.
2012-08-15 00:50:16 -07:00
Christian
071caee228
KeyBinding handler change: a handler now takes an array of keys and calls back with the
...
activated key. Sorry for the inconvenience but this improves the usability of this
API a lot
2012-08-14 22:32:19 -04:00
Christian
352df9cc30
Fix renderer's not getting the rendermanager set on them at registration time
2012-08-14 22:32:19 -04:00
LexManos
eef3303dfe
Finished update to MCP 7.2, MC 1.3.2 pre.
2012-08-14 19:24:49 -07:00
LexManos
646a0b4fc4
Fixup included workspace to have single project with client/server launches.
2012-08-14 17:42:40 -07:00
Christian
3d0bd2bc7a
Start working on MC 1.3.2
2012-08-14 20:09:24 -04:00
Christian
b69364e168
Add in a helper for code migrating from ML renderer stuff
2012-08-14 19:09:22 -04:00
calclavia
4c5dcb543f
Shortcut function for addNameForObject()
...
Having that long line of code makes the code a bit ugly... Please make this shortcut function like ModLoader.addName() so I don't need to use ModLoader.addName(). :)
2012-08-15 04:45:32 +08:00
Christian
a234fdf00b
Handle mod duplicate detection much better. Default the name of a mod to it's id.
...
Fix up the block registry problem. Fix the packetsend from c->s actually being
"disconnect" :)
2012-08-14 13:36:29 -04:00
Christian
5f4423119a
Fix entity spawn packets
2012-08-14 08:20:28 -04:00
LexManos
d7dcbe7007
Force a Jenkins build
2012-08-14 01:21:56 -07:00
remuladgryta
438c8eca35
fixed java.lang.NoSuchMethodException
...
getServerHandlerSpecDefaultValue() and
getClientHandlerSpecDefaultValue() should no longer give derp exeption
2012-08-14 09:50:22 +03:00
LexManos
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
LexManos
908227ce0c
Merge remote-tracking branch 'origin/master'
2012-08-13 21:05:14 -07:00
LexManos
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
Christian
6f10295936
Hopefully let build continue if server reobf fails, and fix derp in FMLNetworkHandler for entities
2012-08-13 23:25:08 -04:00
Christian
a8f69529fd
Fix up concurrent modification exception - ticks for players now occur on both sides
2012-08-13 22:55:23 -04:00
Christian
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
Christian
416cac675b
Actually fix the applet launch - it now launches properly *and* closes the window
2012-08-13 22:12:36 -04:00
Christian
17bf8dc363
Fix up relaunch of the applet
2012-08-13 21:44:43 -04:00
Christian
466022b402
Change language loading a bit
2012-08-13 20:28:53 -04:00
Christian
df9ec4bf3f
Update spritehelper bitmaps for items and terrain
2012-08-13 20:08:03 -04:00
Christian
fa38c1a6b3
Tidy up some APIs, expose the addOverride mechanism. This should be pluggable by forge
...
but may need work to allow for each mod to have it's own override set
2012-08-13 19:57:40 -04:00
Christian
6a273dd98f
Fix derp in LanguageRegistry
2012-08-13 16:45:47 -04:00
Christian
f41391b13c
FMLModcontainer should not complain about annotations it has no idea about. so stfu fmlmodcontainer
2012-08-13 16:15:11 -04:00
Christian
179ed74456
Fix derp with EntityRegistry- bimap is not the right type for the name->container list
2012-08-13 15:55:24 -04:00
Christian
deab31fb03
Add in a sided variant of the packethandlers in the annotation - also, a bit more
...
explicit warning on when to register blocks - if you do it after pre-init, you'll
reset the achievements
2012-08-13 15:26:29 -04:00
Christian
c393299a91
Generate channel registration for client, also, do it before the login events so you can send packets
2012-08-13 11:58:44 -04:00
Christian
80b3f0fd97
Capture server packet handling errors into the FML log file for diagnostics
2012-08-13 11:52:30 -04:00
Christian
519d2365ca
one more change for the road :)
2012-08-13 01:24:02 -04:00
Christian
71642f02f8
Don't spit debug all over the floor
2012-08-13 00:24:15 -04:00
Christian
0c3535ff26
updated conf, commands patch (missing newline?) and capturing the actual running
...
MC version and validating it at relaunch time is the correct MC version.
2012-08-13 00:17:34 -04:00
Christian
6f4dbd5376
Add in callableminecraftversion
2012-08-12 23:54:41 -04:00
Christian
9b74df5e62
Entity AI accessibility, also AccessTransformer can make certain classes public now
2012-08-12 23:50:27 -04:00
Christian
8d8f36bac0
Add in a simple packet dispatcher for sending packets around
2012-08-12 22:45:18 -04:00
Christian
8a0cfed5c6
Add in a sided packet registry so that client vs server can vary
2012-08-12 22:23:03 -04:00
Christian
e229b6f6eb
Fix double forge init on server
2012-08-12 20:34:23 -04:00
Krapht
c1dccae4b8
Fixed getNextAvailableRenderId() returning ids in use by vanilla
2012-08-12 14:45:03 +02:00
LexManos
f73e4b6169
Fix MCPMerger injecting Side/SideOnly when it already exists.
2012-08-12 04:27:36 -07:00
LexManos
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
LexManos
0b343c1a49
Add DEBUG constant to Access/Side Transformers to remove spam when not needed. Also AccessTransformer and MCPMerger should return a error code when it can not process causing MCP to stop decompile.
2012-08-12 01:23:10 -07:00
Christian
4f7996e361
Fix EntityRegistry - mods can specify update frequency, range and velocity data, and also
...
patch EntityTracker to actually track FML entities
2012-08-12 00:18:04 -04:00
Christian
20029feb88
Fix NPE with no channels - always register FML
2012-08-12 00:17:07 -04:00
LexManos
c4149f7b55
Added missing quotes around compile command.
2012-08-11 16:03:33 -07:00
Christian
f20ef77a91
Fix up the network mod issue properly. Maintain a real cache of mod objects
2012-08-11 16:21:03 -04:00
Christian
6d79241652
Remove profiler stuff - it's been deeply reorged. I'll look at re-adding it later
2012-08-11 14:12:39 -04:00
Christian
4f9cc6b398
Fix up command patch to actually work
2012-08-11 14:12:23 -04:00
Christian
5a0d08b892
Fix commands.py to always include the two side classes so the fml jars are valid.
2012-08-11 14:01:27 -04:00
Christian
85f665dd1d
Fix build script- put client in first
2012-08-11 13:05:37 -04:00
Christian
2d31dbba15
Put the marker on the server ML file too
2012-08-11 13:04:59 -04:00
Christian
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
Christian
57de5c1b90
Fix up launch when obfuscated *sigh*
2012-08-11 12:24:43 -04:00
Christian
35fda10b50
Update netclienthandler patch.
2012-08-11 12:10:22 -04:00
Christian
d663884aa5
Fix NPE for server relaunch
2012-08-11 12:05:13 -04:00
Christian
ff18294591
Fix up Package.getPackage(), also fix up loadcontroller construction
2012-08-11 11:44:55 -04:00
Christian
3918c5e810
Add in Package.getPackage() support for sengir
2012-08-11 11:12:16 -04:00
Christian
92b7ed1182
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
185f8ddbc7
Newlines in diff file
2012-08-11 02:27:19 -07:00
LexManos
953f99787e
Add special case to add Side/SideOnly to difflist
2012-08-11 02:25:40 -07:00
Christian
7e35f13f30
Fix up some network related stuff and optimize mod lookup a bit
2012-08-11 02:43:04 -04:00
Christian
2e66429b03
Fix up proxy injector to inject properly
2012-08-11 02:24:29 -04:00
LexManos
1e4d788cd0
Fix decompile
2012-08-10 20:41:59 -07:00
Christian
7440cc89e9
Fix NPE on missing mods - still need to actually handle missing mods properly on client
2012-08-10 23:27:11 -04:00
Christian
fde0619e9b
New downloader UI and new downloader backend - should be more robust now
2012-08-10 23:18:52 -04:00
LexManos
a1c14779d2
Added -no_gen_conf to jenkins build
2012-08-10 20:09:47 -07:00
LexManos
5a1f84ed5b
Added some extra error prints, hopeully get something useful when installed in the client.
2012-08-10 18:54:06 -07:00
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
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
