Christian
45175c0e94
Expose more of the village construction parts for building village
...
pieces
2012-08-19 11:23:29 -04:00
Christian
52d3f237af
Allow access to the type "ComponentVillage"
2012-08-19 10:35:06 -04:00
Christian
09c7ea2d9d
Documentation and registration for villager stuff
2012-08-19 10:30:24 -04:00
Christian
3a0ad876b5
Fix javadoc derp
2012-08-19 10:21:19 -04:00
Christian
8a521c1d32
Villager trading, manipulation and village enhancement. Still WIP but should be functional
2012-08-19 10:13:15 -04:00
Christian
b07f1069b9
Fix exception based logging to actually log the exception!
2012-08-19 09:31:26 -04:00
Christian
a1385f4797
Pickup notification
2012-08-19 00:26:55 -04:00
Christian
ce276375b2
Update fml_at with new transforms
2012-08-18 20:08:27 -04:00
Christian
9a540ef6d4
Fix derp where client sided packet handler would be created on a dedi server env
2012-08-18 19:50:46 -04:00
Christian
b65a38cb30
Don't complain about minecraft source code being in "net.minecraft.src". Derp.
2012-08-18 10:09:53 -04:00
Christian
3d87561505
Actually register client/server packetspecs as their correct sides! fixes #71
2012-08-18 09:28:36 -04:00
Christian
1cbe058250
Error if channel name is invalid - either too short, or too long
2012-08-17 16:59:48 -04:00
Christian
8a679f6d9e
Add a connect and read timeout for downloading libraries. This should really stop the "waiting forever" at startup screen.
2012-08-17 16:21:18 -04:00
Christian
0e473145b3
GIANT FAT WARNINGS if you use any code in net.minecraft.src or any subpackage thereof. Get it out of there, now!
2012-08-17 16:13:05 -04:00
Christian
5ea0932e24
Organize ALL the imports
2012-08-17 09:25:04 -04:00
Christian
290f2d6781
Expose the server in serverstart event
2012-08-17 09:25:04 -04:00
Christian
94f834d5d7
Fix up directory injection of log file locations
2012-08-17 09:25:04 -04:00
Christian
30d6970e77
Refer to FMLLog, not FMLRelaunchLog
2012-08-17 09:25:04 -04:00
Christian
8408f58fb1
Tidy up server launch - reflection not required anymore
2012-08-17 09:25:04 -04:00
Christian
0fab4eca7b
Also, log what the directory discoverer finds for mcmod.info
2012-08-17 09:25:04 -04:00
Christian
549969ade6
And log the exception if it has a problem reading the jar file
2012-08-17 09:25:04 -04:00
Christian
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
Christian
11c1cae8b0
Some compatibility fixes for Rei's minimap, and tidy up a couple of things
2012-08-16 13:55:42 -04:00
Christian
4d87779d39
Fix Forge branding string call
2012-08-16 13:01:48 -04:00
Christian
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
Christian
a7a1f55091
Fix critical bug in FML load controller that complains about injected mod containers
2012-08-16 08:34:12 -04:00
Christian
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
Christian
81512c3458
Small fixes, including showing the FULL name of Forge Mod Loader
2012-08-15 19:54:56 -04:00
Christian
fcf6fd57ee
Fix up null array in keybinding handler
2012-08-15 19:17:21 -04:00
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
eef3303dfe
Finished update to MCP 7.2, MC 1.3.2 pre.
2012-08-14 19:24:49 -07: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
remuladgryta
438c8eca35
fixed java.lang.NoSuchMethodException
...
getServerHandlerSpecDefaultValue() and
getClientHandlerSpecDefaultValue() should no longer give derp exeption
2012-08-14 09:50:22 +03: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
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
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
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
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
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
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
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
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
5a1f84ed5b
Added some extra error prints, hopeully get something useful when installed in the client.
2012-08-10 18:54:06 -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
Christian
1c189ae762
Add in a registration method for gui handlers
2012-08-10 11:12:57 -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
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
Christian
185babbd85
Entity spawning - done
2012-08-09 01:58:14 -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
Christian
8bda53cb77
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -04:00
Christian
09098f8a0f
Remove some unneeded fields from the annotations
2012-08-05 02:24:02 -04:00
LexManos
63d5d42512
Made empty constructor for ModMetadata public
2012-08-04 22:51:57 -07:00
Christian
e92be964fd
Change property name to fml.modStates not fml.disabledMods- it makes more sense that way
2012-08-04 12:35:46 -04:00
Christian
969de94d8a
Add in a bit of logging when events get sent to mod containers
2012-08-04 11:45:40 -04:00
Christian
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
LexManos
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
LexManos
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
Christian
6d70a76c95
More fixes
2012-08-02 16:50:30 -02:30
Christian
dab4179024
Change some event names, hook up the event code for server events for FML
2012-08-02 09:31:03 -02:30
Christian
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
Christian
ff152479e6
More stuff
2012-08-01 21:19:11 -02:30
Christian
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
LexManos
62535863ad
Add temp AccessTransformer config for FML
2012-08-01 03:18:31 -07:00
Christian
e7a7b3c844
XP for smelting
2012-07-30 23:07:53 -04:00
Christian
6f8b39ea09
Beginning the 1.3.1 update
2012-07-30 22:31:07 -04:00
Christian
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
Christian
d1d12e4ebd
Fix up coremods with relaunch, add in a sample "coremod"
2012-07-30 11:34:30 -04:00
Christian
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
Christian
a850ea6bc0
Fix whitespace issue
2012-07-29 23:54:07 -04:00
Christian
825f1a8b50
Fix window sticking around - it doesn't anymore
2012-07-29 23:46:52 -04:00
Christian
e1fc02b5b9
Add in "transform excluded" classes that we still need to take loading responsibility for
2012-07-29 23:30:37 -04:00
Christian
b53ce2aa90
Added in some dialogs when things don't go so well
2012-07-29 22:55:53 -04:00
Christian
ba28161f16
New logging stuff, also the early plugin api for forge
2012-07-29 22:54:59 -04:00
Christian
769663466f
More stuff as I roll out the changes
2012-07-23 22:50:37 -02:30
Christian
9e4131c3e8
A bunch more fixes for FML mods
2012-07-23 16:33:17 -02:30
Christian
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
Christian
5561f8218a
New key handling
2012-07-22 20:25:18 -02:30
Christian
2a19eca517
Check in a lot of recent work
2012-07-22 11:56:38 -02:30
Christian
3115f92ee4
Check in new fml mod work so far. Lots still to do.
2012-07-14 13:58:46 -04:00
Christian
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
Christian
9d6266d85b
Fix up mod classloading delegation
2012-07-06 15:59:16 -04:00
Christian
98e31e5f03
Incorporate server patches into client
2012-07-06 10:29:17 -04:00
Christian
be59dfff54
Launch through the applet launcher too
2012-07-06 01:04:33 -04:00
Christian
32e93213f1
Some patches for the server
2012-07-05 22:31:46 -04:00
Christian
b9466b8ee5
Lots of client patch fixup
2012-07-05 18:13:47 -04:00
Christian
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
Christian
e8b09f4692
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
Christian
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
Christian
53c2b50212
FFS let this fix that bloody ticking mess that is ML compatibility.
2012-07-03 23:03:51 -04:00
Christian
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
Christian
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
Christian
07a1927c25
Update some stuff
2012-07-02 23:49:40 -04:00
Christian
0418f01886
Harvest MC version from MCP
2012-07-02 13:31:45 -04:00
Christian
6f8409a2ce
fix sided proxy bukkit test (not used so not a biggie)
2012-07-02 12:32:41 -04:00
Christian
731dbf5175
Working simple scheduled ticking, Player ticks
2012-06-28 23:37:30 -04:00
Christian
d3b48f0c21
Support tick spacing through new IScheduledTickHandler
2012-06-28 17:10:35 -04:00
Christian
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
Christian
64dab3c8d7
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -04:00
Christian
77479d8b74
Fix ticking for GUI ticks too!
2012-06-22 09:30:27 -04:00
Christian
dd7ee6e268
Fix dependency string processing error
2012-06-22 06:21:04 -04:00
Christian
64d1b29c43
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04:00
LexManos
262c68a81d
Added stupididty exception for common issue with getMinecraftLogger.
2012-06-21 03:17:33 -07:00
Christian
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
Christian
6ba65d047f
Revert "Test failing build"
...
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
Christian
e8db35228b
Test failing build
2012-06-20 08:35:47 -04:00
Christian
02f9578b52
Fix huge bug/typo in basemodticker that stopped ticks getting sent
2012-06-20 08:03:57 -04:00
LexManos
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
