Christian
25256b2295
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
9112c63347
Change language loading a bit
2012-08-13 20:28:53 -04:00
Christian
78fa2b8d78
Update spritehelper bitmaps for items and terrain
2012-08-13 20:08:03 -04:00
Christian
6922c369f3
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
ef5349dec2
Add in a simple packet dispatcher for sending packets around
2012-08-12 22:45:18 -04:00
Krapht
42165df29f
Fixed getNextAvailableRenderId() returning ids in use by vanilla
2012-08-12 14:45:03 +02:00
Christian
204f73cb05
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
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
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
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
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
Christian
0e4c716177
Entity spawning - done
2012-08-09 01:58:14 -04: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
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
a3ad32a3e5
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -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
LexManos
43766751a4
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
Christian
4080338c1b
More fixes
2012-08-02 16:50:30 -02:30
Christian
719bea515e
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
Christian
153eafdcb0
More stuff
2012-08-01 21:19:11 -02:30
Christian
3ad3c474b5
Line endings for this branch
2012-08-01 21:18:55 -02:30
Christian
dac3249dc4
XP for smelting
2012-07-30 23:07:53 -04:00
Christian
99eddbfa13
Beginning the 1.3.1 update
2012-07-30 22:31:07 -04:00
Christian
1ea6ba273b
New logging stuff, also the early plugin api for forge
2012-07-29 22:54:59 -04:00
Christian
baec9785a2
More stuff as I roll out the changes
2012-07-23 22:50:37 -02:30
Christian
ae2039c65d
A bunch more fixes for FML mods
2012-07-23 16:33:17 -02:30
Christian
3f803653c4
Merge remote-tracking branch 'mainlap/newkeys' into newfmlmod
...
Conflicts:
client/cpw/mods/fml/client/FMLClientHandler.java
2012-07-22 20:30:42 -02:30
Christian
6ff67693b9
New key handling
2012-07-22 20:25:18 -02:30
Christian
5501d644b9
Check in a lot of recent work
2012-07-22 11:56:38 -02:30
Christian
4153584392
Fixes
2012-07-06 10:42:49 -04:00
Christian
2858731063
Incorporate server patches into client
2012-07-06 10:29:17 -04:00
Christian
bc42a54a51
Lots of client patch fixup
2012-07-05 18:13:47 -04:00
Christian
ead4e5255e
UnexpectedThrowable is now the much more awesome CrashReport!
2012-07-05 15:35:38 -04:00
Christian
5eafb71083
Merge branch 'master' into minecraft1.3
...
Bring some of the ticking fixes in
Conflicts:
client/cpw/mods/fml/client/FMLClientHandler.java
patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
2012-07-05 15:30:21 -04:00
Christian
8ed36f583d
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
Christian
3e311fd4c1
Tweak ticking YET AGAIN. Should fire a solitary GUILOAD tick right as the game screen loads.
...
Hopefully fixes worldload tick issue too
2012-07-04 00:16:30 -04:00
Christian
ba46389a87
Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb.
...
Fix Worldload being filtered from the trigger arming.
Also, improve errors going to an error screen. There should be more information now.
2012-07-03 22:39:35 -04:00
Christian
f7e07ca7d8
Change gui ticking and world load tick. Should close issue #40 and kill it deader
...
than a very very dead thing. *$^*(#% Modloader ticking b#%$hit
2012-07-03 21:37:54 -04:00
Christian
982271e8ec
Update some stuff
2012-07-02 23:49:40 -04:00
Christian
bb7ef791de
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -04:00
Christian
714cd8d8df
Change TickType.WORLD to send the world as arg[0] to match the server.
2012-06-28 14:24:34 -04:00
Christian
b6ae926fd3
Add in a mechanism to get the modcontainer for a mod - so things can be programmatically changed
2012-06-26 16:24:50 -04:00
Christian
725201040e
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -04:00
Christian
05f9861da4
Fix ticking for GUI ticks too!
2012-06-22 09:30:27 -04:00
Christian
be1a80ebbd
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04:00
Christian