73bf3a8985
Fix up ML GUI ticking. Thanks sharose!
2012-08-17 16:09:46 -04:00
5ea0932e24
Organize ALL the imports
2012-08-17 09:25:04 -04:00
290f2d6781
Expose the server in serverstart event
2012-08-17 09:25:04 -04:00
94f834d5d7
Fix up directory injection of log file locations
2012-08-17 09:25:04 -04:00
30d6970e77
Refer to FMLLog, not FMLRelaunchLog
2012-08-17 09:25:04 -04:00
8408f58fb1
Tidy up server launch - reflection not required anymore
2012-08-17 09:25:04 -04:00
0fab4eca7b
Also, log what the directory discoverer finds for mcmod.info
2012-08-17 09:25:04 -04:00
549969ade6
And log the exception if it has a problem reading the jar file
2012-08-17 09:25:04 -04:00
26bb005731
Fix jar loader failing to inject any metadata at all if mcmod.info is not found.
2012-08-17 09:25:04 -04:00
8444fa6d3c
Change install.cmd to install.bat, why, cuz people are .... Updated readme to mention needing server and client.
2012-08-16 22:57:11 -07:00
11c1cae8b0
Some compatibility fixes for Rei's minimap, and tidy up a couple of things
2012-08-16 13:55:42 -04:00
4d87779d39
Fix Forge branding string call
2012-08-16 13:01:48 -04:00
1cc6778038
Update FML for mcp 72 final, change download location for FML files, and make the stop button work.
...
Hello is NOT going to go away :)
2012-08-16 12:22:56 -04:00
a7a1f55091
Fix critical bug in FML load controller that complains about injected mod containers
2012-08-16 08:34:12 -04:00
e1fd0b1d7b
Handle the case where a mod tries to do something stateful during constructor phase, and log a big
...
fat message about it. Don't do it!
2012-08-15 20:05:12 -04:00
81512c3458
Small fixes, including showing the FULL name of Forge Mod Loader
2012-08-15 19:54:56 -04:00
fcf6fd57ee
Fix up null array in keybinding handler
2012-08-15 19:17:21 -04:00
7988323073
Actually add in the system property for the minecraft home, should fix multimc too
2012-08-15 19:16:36 -04:00
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
96b78514a8
Cleanup fml.py a little, should fix double printing of 'patching file'
2012-08-15 03:10:45 -07:00
e0cb8cd503
Wrap mod description rendering in BLEND calls https://github.com/MinecraftForge/MinecraftForge/issues/96
2012-08-15 02:52:29 -07:00
022b3e57dc
Made getmodifiedsrc noop for server.
2012-08-15 00:50:40 -07:00
9ad520cb2a
Fix new eclipse workspace to load the project properly from start.
2012-08-15 00:50:16 -07:00
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
352df9cc30
Fix renderer's not getting the rendermanager set on them at registration time
2012-08-14 22:32:19 -04:00
eef3303dfe
Finished update to MCP 7.2, MC 1.3.2 pre.
2012-08-14 19:24:49 -07:00
646a0b4fc4
Fixup included workspace to have single project with client/server launches.
2012-08-14 17:42:40 -07:00
3d0bd2bc7a
Start working on MC 1.3.2
2012-08-14 20:09:24 -04:00
b69364e168
Add in a helper for code migrating from ML renderer stuff
2012-08-14 19:09:22 -04:00
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
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
5f4423119a
Fix entity spawn packets
2012-08-14 08:20:28 -04:00
d7dcbe7007
Force a Jenkins build
2012-08-14 01:21:56 -07:00
438c8eca35
fixed java.lang.NoSuchMethodException
...
getServerHandlerSpecDefaultValue() and
getClientHandlerSpecDefaultValue() should no longer give derp exeption
2012-08-14 09:50:22 +03:00
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
908227ce0c
Merge remote-tracking branch 'origin/master'
2012-08-13 21:05:14 -07:00
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
6f10295936
Hopefully let build continue if server reobf fails, and fix derp in FMLNetworkHandler for entities
2012-08-13 23:25:08 -04:00
a8f69529fd
Fix up concurrent modification exception - ticks for players now occur on both sides
2012-08-13 22:55:23 -04:00
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
416cac675b
Actually fix the applet launch - it now launches properly *and* closes the window
2012-08-13 22:12:36 -04:00
17bf8dc363
Fix up relaunch of the applet
2012-08-13 21:44:43 -04:00
466022b402
Change language loading a bit
2012-08-13 20:28:53 -04:00
df9ec4bf3f
Update spritehelper bitmaps for items and terrain
2012-08-13 20:08:03 -04:00
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
6a273dd98f
Fix derp in LanguageRegistry
2012-08-13 16:45:47 -04:00
f41391b13c
FMLModcontainer should not complain about annotations it has no idea about. so stfu fmlmodcontainer
2012-08-13 16:15:11 -04:00
179ed74456
Fix derp with EntityRegistry- bimap is not the right type for the name->container list
2012-08-13 15:55:24 -04:00
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
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
80b3f0fd97
Capture server packet handling errors into the FML log file for diagnostics
2012-08-13 11:52:30 -04:00
519d2365ca
one more change for the road :)
2012-08-13 01:24:02 -04:00
71642f02f8
Don't spit debug all over the floor
2012-08-13 00:24:15 -04:00
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
6f4dbd5376
Add in callableminecraftversion
2012-08-12 23:54:41 -04:00
9b74df5e62
Entity AI accessibility, also AccessTransformer can make certain classes public now
2012-08-12 23:50:27 -04:00
8d8f36bac0
Add in a simple packet dispatcher for sending packets around
2012-08-12 22:45:18 -04:00
8a0cfed5c6
Add in a sided packet registry so that client vs server can vary
2012-08-12 22:23:03 -04:00
e229b6f6eb
Fix double forge init on server
2012-08-12 20:34:23 -04:00
c1dccae4b8
Fixed getNextAvailableRenderId() returning ids in use by vanilla
2012-08-12 14:45:03 +02:00
f73e4b6169
Fix MCPMerger injecting Side/SideOnly when it already exists.
2012-08-12 04:27:36 -07:00
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
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
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
e1fc02b5b9
Add in "transform excluded" classes that we still need to take loading responsibility for
2012-07-29 23:30:37 -04:00
b53ce2aa90
Added in some dialogs when things don't go so well
2012-07-29 22:55:53 -04:00
ba28161f16
New logging stuff, also the early plugin api for forge
2012-07-29 22:54:59 -04:00
50ed44359d
Merge branch 'minecraft1.3' into newfmlmod
2012-07-23 23:02:25 -02:30
f78400711e
Fix up mod classloading delegation
2012-07-23 22:54:36 -02:30
69e895e687
Some patches to go along with the other changes
2012-07-23 22:51:16 -02:30
769663466f
More stuff as I roll out the changes
2012-07-23 22:50:37 -02:30
9e4131c3e8
A bunch more fixes for FML mods
2012-07-23 16:33:17 -02:30
8b5ddf1739
Merge remote-tracking branch 'mainlap/newkeys' into newfmlmod
...
Conflicts:
client/cpw/mods/fml/client/FMLClientHandler.java
2012-07-22 20:30:42 -02:30
5561f8218a
New key handling
2012-07-22 20:25:18 -02:30
2a19eca517
Check in a lot of recent work
2012-07-22 11:56:38 -02:30
3115f92ee4
Check in new fml mod work so far. Lots still to do.
2012-07-14 13:58:46 -04:00
2671641b83
Cleaned up the install script for the source distrabution to setup the workspace properly, delete argo, and download all required dependancies.
2012-07-12 18:07:58 -07:00
0a9ee584bf
Added call to clean_source to build script to fix patch fuzz on windows.
2012-07-12 18:06:39 -07:00
48dcdca805
Fix Client-Clean project to use relative path to argo.
2012-07-12 18:06:01 -07:00
2db9292ba5
Another bloody ticking fix. This should fix mods that use ML.setInGameHook(true,false) on the
...
server side to recieve ticks.
2012-07-08 22:06:11 -04:00
9d6266d85b
Fix up mod classloading delegation
2012-07-06 15:59:16 -04:00
25fb847dc1
Fixes
2012-07-06 10:42:49 -04:00
98e31e5f03
Incorporate server patches into client
2012-07-06 10:29:17 -04:00
0ff59e7978
Remove two places that are unpatchable now
2012-07-06 09:52:21 -04:00
97cfbb990d
Server repatching
2012-07-06 09:44:00 -04:00
59949849f0
Add a "checkpatches" target and check if your patches are up to date before running a repatch operation
2012-07-06 09:19:58 -04:00
be59dfff54
Launch through the applet launcher too
2012-07-06 01:04:33 -04:00
32e93213f1
Some patches for the server
2012-07-05 22:31:46 -04:00
b9466b8ee5
Lots of client patch fixup
2012-07-05 18:13:47 -04:00
275b78957a
Update git ignore to ignore a fernflowerzip that's lying around
2012-07-05 15:38:37 -04:00
4ab2a3cb6b
And we have a brand, "fml". We're definitely modded :)
2012-07-05 15:36:31 -04:00
58576c2a19
UnexpectedThrowable is now the much more awesome CrashReport!
2012-07-05 15:35:38 -04:00
c0b707a9bd
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
e8b09f4692
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
decbe8ba7c
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
53c2b50212
FFS let this fix that bloody ticking mess that is ML compatibility.
2012-07-03 23:03:51 -04:00
3d8a5edc30
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
275fd394c1
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
d1f791f94e
Merge branch 'master' into minecraft1.3
2012-07-03 08:15:58 -04:00
60b50bb7f2
Tweak build xml for more cleanliness
2012-07-03 08:14:35 -04:00
9cafdf94ac
Merge branch 'antscriptupdates'
2012-07-02 23:50:49 -04:00
07a1927c25
Update some stuff
2012-07-02 23:49:40 -04:00
777b4407c2
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 23:49:06 -04:00
a98ffafd71
Add in more options for ant script and clean up needing to clean every time.
2012-07-02 23:43:29 -04:00
414d59b1aa
Merge branch 'testrecover'
2012-07-02 20:19:23 -04:00
f0aa28162e
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 15:56:33 -04:00
2090264599
Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of
...
setup and added an updatepatches call too
2012-07-02 15:54:25 -04:00
ecaa158981
Merge branch 'antscriptupdates' into minecraft1.3
...
Conflicts:
build.xml
2012-07-02 15:21:15 -04:00
6c99b80b73
Add in a setupenvironment ant target specifically for setting up an FML environment from scratch
2012-07-02 15:16:40 -04:00
0418f01886
Harvest MC version from MCP
2012-07-02 13:31:45 -04:00
6f8409a2ce
fix sided proxy bukkit test (not used so not a biggie)
2012-07-02 12:32:41 -04:00
a8f599983e
Harvest MC version from MCP
2012-07-02 12:24:37 -04:00
b51ce21b70
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -04:00
731dbf5175
Working simple scheduled ticking, Player ticks
2012-06-28 23:37:30 -04:00
d3b48f0c21
Support tick spacing through new IScheduledTickHandler
2012-06-28 17:10:35 -04:00
ce9be2864c
Change TickType.WORLD to send the world as arg[0] to match the server.
2012-06-28 14:24:34 -04:00
541951416e
And there are not 1000 seconds in a second
2012-06-28 08:31:32 -04:00
4f8d71e289
Seconds are 1000 milliseconds long. Not 1 millisecond long.
2012-06-28 08:27:21 -04:00
7098d613a0
Tweak profiler command on bukkit
2012-06-28 08:21:24 -04:00
e688e04446
Fix up a derp in the timing command
2012-06-27 22:13:55 -04:00
0878bd1fcf
Fix code to use guava 10 only. Stupid bukkit plugins and daft dependencies on guava 10!
2012-06-27 08:23:53 -04:00
1c7bcf8077
Tweak for end profiling
2012-06-26 23:37:54 -04:00
81d4d77202
Add in simple profiler for bukkit
2012-06-26 23:16:23 -04:00
5a5ff97f39
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
a7caad10ba
Add in bukkit support for recipe change
2012-06-26 15:40:30 -04:00
64dab3c8d7
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -04:00
5d4fdd1337
Update tester mod
2012-06-22 09:30:47 -04:00
77479d8b74
Fix ticking for GUI ticks too!
2012-06-22 09:30:27 -04:00
dd7ee6e268
Fix dependency string processing error
2012-06-22 06:21:04 -04:00
1236abf679
ModSorting test case
2012-06-21 21:56:16 -04:00
64d1b29c43
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04:00
262c68a81d
Added stupididty exception for common issue with getMinecraftLogger.
2012-06-21 03:17:33 -07:00
21042e6913
Rename unused ML prop config files if they exist (to .bak) and
...
skip generating if not needed
2012-06-20 21:17:32 -04:00
58d6e58b93
Update bukkit with changes
2012-06-20 12:36:48 -04:00
6ba65d047f
Revert "Test failing build"
...
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
63be4cb88f
Revert "Revert "Fail the build when recompilation fails""
...
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
acbc8d9a1b
Revert "Fail the build when recompilation fails"
...
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
e8db35228b
Test failing build
2012-06-20 08:35:47 -04:00
198dd807fd
Fail the build when recompilation fails
2012-06-20 08:35:14 -04:00
02f9578b52
Fix huge bug/typo in basemodticker that stopped ticks getting sent
2012-06-20 08:03:57 -04:00
308525987d
Fix compilation error, Protip: Don't use java7 things when compiling for java6, and Don't report successful build on compilation errors cpw.
2012-06-20 02:14:07 -07:00
ef7514288b
Remove cr's from modinfo descriptions, they print oddly in Minecraft.
2012-06-19 19:58:48 -07:00
8a7b91fb1c
Print mod metadata info errors if we are in MCP.
2012-06-19 19:55:28 -07:00
07bebf187c
Should fix concurent modification exceptions when using removeSpawns
2012-06-19 19:44:52 -07:00
5ee3a057a2
Remove some eclipse preference files
2012-06-19 19:44:07 -07:00
9495094a48
Update gitignore to ignore some eclipse preference files.
2012-06-19 19:43:46 -07:00
c0dffcbcec
Merge pull request #29 from ScottKillen/master
...
Fixed WorldType to allow custom WorldTypes
2012-06-19 19:22:06 -07:00
06fffe54b1
Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance.
2012-06-17 19:30:10 -07:00
944fd02fca
More ticking cleanup
2012-06-17 18:53:49 -04:00
4385704172
Remove WorldLoad tick from modloader mods- too early. *sigh*
2012-06-17 18:49:19 -04:00
6d46fefd83
Make sure to reset the clock trigger
2012-06-17 18:41:54 -04:00
Christian