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
20029feb88
Fix NPE with no channels - always register FML
2012-08-12 00:17:07 -04:00
c4149f7b55
Added missing quotes around compile command.
2012-08-11 16:03:33 -07:00
f20ef77a91
Fix up the network mod issue properly. Maintain a real cache of mod objects
2012-08-11 16:21:03 -04:00
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
4f9cc6b398
Fix up command patch to actually work
2012-08-11 14:12:23 -04:00
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
85f665dd1d
Fix build script- put client in first
2012-08-11 13:05:37 -04:00
2d31dbba15
Put the marker on the server ML file too
2012-08-11 13:04:59 -04:00
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
57de5c1b90
Fix up launch when obfuscated *sigh*
2012-08-11 12:24:43 -04:00
35fda10b50
Update netclienthandler patch.
2012-08-11 12:10:22 -04:00
d663884aa5
Fix NPE for server relaunch
2012-08-11 12:05:13 -04:00
ff18294591
Fix up Package.getPackage(), also fix up loadcontroller construction
2012-08-11 11:44:55 -04:00
3918c5e810
Add in Package.getPackage() support for sengir
2012-08-11 11:12:16 -04:00
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
185f8ddbc7
Newlines in diff file
2012-08-11 02:27:19 -07:00
953f99787e
Add special case to add Side/SideOnly to difflist
2012-08-11 02:25:40 -07:00
7e35f13f30
Fix up some network related stuff and optimize mod lookup a bit
2012-08-11 02:43:04 -04:00
2e66429b03
Fix up proxy injector to inject properly
2012-08-11 02:24:29 -04:00
1e4d788cd0
Fix decompile
2012-08-10 20:41:59 -07:00
7440cc89e9
Fix NPE on missing mods - still need to actually handle missing mods properly on client
2012-08-10 23:27:11 -04:00
fde0619e9b
New downloader UI and new downloader backend - should be more robust now
2012-08-10 23:18:52 -04:00
a1c14779d2
Added -no_gen_conf to jenkins build
2012-08-10 20:09:47 -07:00
5a1f84ed5b
Added some extra error prints, hopeully get something useful when installed in the client.
2012-08-10 18:54:06 -07:00
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
dd319a2938
SidedProxy should work again - anywhere. Make sure it's on a static field though
2012-08-10 17:42:43 -04:00
7b2d09844c
More ticking hooks, and some other bits of clean up. Very close to "done" now.
2012-08-10 17:11:01 -04:00
b5dc18ff7e
Fix up modloader and clean up junk method
2012-08-10 16:42:21 -04:00
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
fcd4a8e854
Readded common folder to startclient/server.
2012-08-10 12:38:59 -07:00
1c189ae762
Add in a registration method for gui handlers
2012-08-10 11:12:57 -04:00
a58306abc6
Overwrote lex's command patch
2012-08-10 10:57:18 -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.
2012-08-10 10:03:33 -04:00
ba0cc6ec12
Added common folder support to startclient/startserver
2012-08-09 20:34:16 -07:00
349da399ff
Added some missing quotes that caused issues if your workspace had a space in it.
2012-08-09 20:01:51 -07:00
dca24fd567
Add lib folder to installed eclipse
2012-08-09 19:02:28 -07:00
6eb4bceee3
Add in missing patch - also, launch FML properly from the server
2012-08-09 09:21:16 -04:00
6d0f7ace17
Entity spawn adjustment - tracker
2012-08-09 08:40:32 -04:00
859ebae365
Fix ModLoader compilation, and MCPmerger invocation for Forge.
2012-08-09 03:04:25 -07:00
3d26511322
Include conf folder and merge config in source zip
2012-08-08 23:44:32 -07:00
185babbd85
Entity spawning - done
2012-08-09 01:58:14 -04:00
d970f7a530
Generate a universal binary package since we can now :)
2012-08-09 01:57:42 -04:00
c1bd11e64a
Reorganized all the current patches
2012-08-08 22:57:37 -04:00
c1b3bfd007
Fix up annotation parser to parse arrays and enums
2012-08-08 22:10:56 -04:00
9b81775a2f
Added SideTransformer to strip side only functions/fields out.
2012-08-08 18:53:41 -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
Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.
2012-08-08 05:48:06 -07:00
77f4cc5bea
Gui Handler ported from MC forge
2012-08-08 00:31:24 -04:00
8998d4c5e0
Revert dumb stuff with commands patch - lots of gfx patching
2012-08-07 23:11:37 -04:00
0ddf61cee2
Almost finished basic network stuff now
2012-08-07 20:41:37 -04:00
84efb72e46
Update some patches- more network work
2012-08-07 20:10:36 -04:00
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
12927291a7
Fix location of forge in common handler - also some tweaks to modloader and other stuff
2012-08-06 17:27:21 -04:00
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
8bda53cb77
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -04:00
09098f8a0f
Remove some unneeded fields from the annotations
2012-08-05 02:24:02 -04:00
63d5d42512
Made empty constructor for ModMetadata public
2012-08-04 22:51:57 -07:00
7e68b53196
Fix path trimming for copytree
2012-08-04 20:36:27 -07:00
e92be964fd
Change property name to fml.modStates not fml.disabledMods- it makes more sense that way
2012-08-04 12:35:46 -04:00
969de94d8a
Add in a bit of logging when events get sent to mod containers
2012-08-04 11:45:40 -04:00
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
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
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
fbc968e1b4
Change place commands.py backup is stored.
2012-08-03 23:24:58 -07:00
08eb7c5c45
FML finish won't updatemcp automatically, easier integration with forge.
2012-08-03 17:36:16 -07:00
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
34706d6acf
Moved setting up eclipse to setup_mcp
2012-08-03 16:56:00 -07:00
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
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
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
476dfbc754
Fix MockBlock compile
2012-08-03 01:47:09 -07:00
f1717526d8
Download argo/guava source references in install, and updated eclipse workspaces to reference them.
2012-08-02 23:36:00 -07:00
56153c43d6
Cleaned up commands.patch, removed debug print in fml.py
2012-08-02 21:14:06 -07:00
79ed963c4a
Remove clientdrop, old reference files.
2012-08-02 20:32:51 -07:00
5f848d3d2a
Delete some dead files
2012-08-02 19:42:12 -07:00
1b20de0ab6
Fix commands patch, WorldType patch and some ML compat stuff
2012-08-02 20:09:18 -02:30
6d70a76c95
More fixes
2012-08-02 16:50:30 -02:30
b51c357d50
More build fixes for jenkins
2012-08-02 10:33:29 -02:30
e44515304a
Try and fix the jenkins build
2012-08-02 10:30:52 -02:30
dab4179024
Change some event names, hook up the event code for server events for FML
2012-08-02 09:31:03 -02:30
1e47f3e468
Introduced patching of runtime/commands.py to allow for usage of the src/common folder.
2012-08-02 00:51:51 -07:00
582a785fb8
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
ff152479e6
More stuff
2012-08-01 21:19:11 -02:30
7f8bf56d4f
Fix classpath for Client, maybe?
2012-08-01 21:19:11 -02:30
22fd1652a0
Line endings for this branch
2012-08-01 21:18:55 -02:30
5f51e63385
A load of transformer accesses- also a few tweaks to the transformer, and linux support in the fml python
2012-08-01 18:59:45 -02:30
4fb08f1660
Rewrote patch generation and application to no longer need diff, and attempt to apply common patches on decompiles that don't have one side or the other.
2012-08-01 06:54:57 -07:00
d0036dda00
Updated eclipse projects to have src-common linked resources
2012-08-01 03:52:03 -07:00
4ca63717e5
Modified the decompiler stage to:
...
Compile and run AccessTransformer during the pre-RG stage of decompilation.
Merge resulting sources that are identical to src/common
ToDo:
Finish the common intergration:
-update_patches - Add common folder support
-apply_patches:
--patch each side, also patch all common patches to each side incase they are not merged, only if file exists.
2012-08-01 03:25:45 -07:00
62535863ad
Add temp AccessTransformer config for FML
2012-08-01 03:18:31 -07:00
629b384f0d
Discard old setup script
2012-08-01 03:18:02 -07:00
b9982f18f5
Fixed AccessTransformer issue with trying to load files, instead of resources.
2012-08-01 03:17:36 -07:00
1753b28475
Commit the start of some pluggable transformers
2012-07-31 09:46:45 -04:00
e7a7b3c844
XP for smelting
2012-07-30 23:07:53 -04:00
6f8b39ea09
Beginning the 1.3.1 update
2012-07-30 22:31:07 -04:00
e001103ed8
Add in the ability to create versioned dependencies for mod relationships
...
BaseMod versions are loaded too late so will never work as a versioned
dependency requirement, but can have versioned deps of others
2012-07-30 17:01:27 -04:00
d1d12e4ebd
Fix up coremods with relaunch, add in a sample "coremod"
2012-07-30 11:34:30 -04:00
b79ec382d7
Add in events for the method pre/init/post annotations so we can add in extra data during the event phase
2012-07-30 00:33:21 -04:00
a850ea6bc0
Fix whitespace issue
2012-07-29 23:54:07 -04:00
825f1a8b50
Fix window sticking around - it doesn't anymore
2012-07-29 23:46:52 -04:00
Christian