keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
906 commits 1 branch 2 tags 103 MiB
Commit graph

872 commits

Author SHA1 Message Date
Christian
3e94ee2c36 Fix up keyboard events for modloader 2012-08-19 01:44:33 -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
f86a29468e Add in support for "dummy" keybindings- ones that are added to the list but never do anything 
so the mod can handle it all themselves.
 2012-08-18 10:24:29 -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
298d6db6e2 Fix ModLoader add XP Smelting 2012-08-18 10:09:25 -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
73bf3a8985 Fix up ML GUI ticking. Thanks sharose! 2012-08-17 16:09:46 -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
LexManos
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
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
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
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
LexManos
7e68b53196 Fix path trimming for copytree 2012-08-04 20:36:27 -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
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
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
fbc968e1b4 Change place commands.py backup is stored. 2012-08-03 23:24:58 -07:00
LexManos
08eb7c5c45 FML finish won't updatemcp automatically, easier integration with forge. 2012-08-03 17:36:16 -07:00
LexManos
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
LexManos
34706d6acf Moved setting up eclipse to setup_mcp 2012-08-03 16:56:00 -07:00
LexManos
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
LexManos
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
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
LexManos
476dfbc754 Fix MockBlock compile 2012-08-03 01:47:09 -07:00
LexManos
f1717526d8 Download argo/guava source references in install, and updated eclipse workspaces to reference them. 2012-08-02 23:36:00 -07:00
LexManos
56153c43d6 Cleaned up commands.patch, removed debug print in fml.py 2012-08-02 21:14:06 -07:00
LexManos
79ed963c4a Remove clientdrop, old reference files. 2012-08-02 20:32:51 -07:00
LexManos
5f848d3d2a Delete some dead files 2012-08-02 19:42:12 -07:00
Christian
1b20de0ab6 Fix commands patch, WorldType patch and some ML compat stuff 2012-08-02 20:09:18 -02:30
Christian
6d70a76c95 More fixes 2012-08-02 16:50:30 -02:30
Christian
b51c357d50 More build fixes for jenkins 2012-08-02 10:33:29 -02:30
Christian
e44515304a Try and fix the jenkins build 2012-08-02 10:30:52 -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
LexManos
1e47f3e468 Introduced patching of runtime/commands.py to allow for usage of the src/common folder. 2012-08-02 00:51:51 -07:00
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
7f8bf56d4f Fix classpath for Client, maybe? 2012-08-01 21:19:11 -02:30
Christian
22fd1652a0 Line endings for this branch 2012-08-01 21:18:55 -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
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
LexManos
d0036dda00 Updated eclipse projects to have src-common linked resources 2012-08-01 03:52:03 -07:00
LexManos
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
LexManos
62535863ad Add temp AccessTransformer config for FML 2012-08-01 03:18:31 -07:00
LexManos
629b384f0d Discard old setup script 2012-08-01 03:18:02 -07:00
LexManos
b9982f18f5 Fixed AccessTransformer issue with trying to load files, instead of resources. 2012-08-01 03:17:36 -07:00
Christian
1753b28475 Commit the start of some pluggable transformers 2012-07-31 09:46:45 -04: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
50ed44359d Merge branch 'minecraft1.3' into newfmlmod 2012-07-23 23:02:25 -02:30
Christian
f78400711e Fix up mod classloading delegation 2012-07-23 22:54:36 -02:30
Christian
69e895e687 Some patches to go along with the other changes 2012-07-23 22:51:16 -02:30
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
LexManos
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
LexManos
0a9ee584bf Added call to clean_source to build script to fix patch fuzz on windows. 2012-07-12 18:06:39 -07:00
LexManos
48dcdca805 Fix Client-Clean project to use relative path to argo. 2012-07-12 18:06:01 -07: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
25fb847dc1 Fixes 2012-07-06 10:42:49 -04:00
Christian
98e31e5f03 Incorporate server patches into client 2012-07-06 10:29:17 -04:00
Christian
0ff59e7978 Remove two places that are unpatchable now 2012-07-06 09:52:21 -04:00
Christian
97cfbb990d Server repatching 2012-07-06 09:44:00 -04:00
Christian
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
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
275b78957a Update git ignore to ignore a fernflowerzip that's lying around 2012-07-05 15:38:37 -04:00
Christian
4ab2a3cb6b And we have a brand, "fml". We're definitely modded :) 2012-07-05 15:36:31 -04:00
Christian
58576c2a19 UnexpectedThrowable is now the much more awesome CrashReport! 2012-07-05 15:35:38 -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
d1f791f94e Merge branch 'master' into minecraft1.3 2012-07-03 08:15:58 -04:00
Christian
60b50bb7f2 Tweak build xml for more cleanliness 2012-07-03 08:14:35 -04:00
Christian
9cafdf94ac Merge branch 'antscriptupdates' 2012-07-02 23:50:49 -04:00
Christian
07a1927c25 Update some stuff 2012-07-02 23:49:40 -04:00
Christian
777b4407c2 Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 23:49:06 -04:00
Christian
a98ffafd71 Add in more options for ant script and clean up needing to clean every time. 2012-07-02 23:43:29 -04:00
Christian
414d59b1aa Merge branch 'testrecover' 2012-07-02 20:19:23 -04:00
Christian
f0aa28162e Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 15:56:33 -04:00
Christian
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
Christian
ecaa158981 Merge branch 'antscriptupdates' into minecraft1.3 
Conflicts:
	build.xml
 2012-07-02 15:21:15 -04:00
Christian
6c99b80b73 Add in a setupenvironment ant target specifically for setting up an FML environment from scratch 2012-07-02 15:16: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
a8f599983e Harvest MC version from MCP 2012-07-02 12:24:37 -04:00
Christian
b51ce21b70 Initial checkin. Some patches are probably missing, but client compiles. 2012-06-29 20:18:04 -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
ce9be2864c Change TickType.WORLD to send the world as arg[0] to match the server. 2012-06-28 14:24:34 -04:00
Christian
541951416e And there are not 1000 seconds in a second 2012-06-28 08:31:32 -04:00
Christian
4f8d71e289 Seconds are 1000 milliseconds long. Not 1 millisecond long. 2012-06-28 08:27:21 -04:00
Christian
7098d613a0 Tweak profiler command on bukkit 2012-06-28 08:21:24 -04:00
Christian
e688e04446 Fix up a derp in the timing command 2012-06-27 22:13:55 -04:00
Christian
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
Christian
1c7bcf8077 Tweak for end profiling 2012-06-26 23:37:54 -04:00
Christian
81d4d77202 Add in simple profiler for bukkit 2012-06-26 23:16:23 -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
a7caad10ba Add in bukkit support for recipe change 2012-06-26 15:40:30 -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
5d4fdd1337 Update tester mod 2012-06-22 09:30:47 -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
1236abf679 ModSorting test case 2012-06-21 21:56:16 -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
58d6e58b93 Update bukkit with changes 2012-06-20 12:36:48 -04:00
Christian
6ba65d047f Revert "Test failing build" 
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
 2012-06-20 08:44:49 -04:00
Christian
63be4cb88f Revert "Revert "Fail the build when recompilation fails"" 
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
 2012-06-20 08:44:08 -04:00
Christian
acbc8d9a1b Revert "Fail the build when recompilation fails" 
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
 2012-06-20 08:39:11 -04:00
Christian
e8db35228b Test failing build 2012-06-20 08:35:47 -04:00
Christian
198dd807fd Fail the build when recompilation fails 2012-06-20 08:35:14 -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
LexManos
ef7514288b Remove cr's from modinfo descriptions, they print oddly in Minecraft. 2012-06-19 19:58:48 -07:00
LexManos
8a7b91fb1c Print mod metadata info errors if we are in MCP. 2012-06-19 19:55:28 -07:00
LexManos
07bebf187c Should fix concurent modification exceptions when using removeSpawns 2012-06-19 19:44:52 -07:00
LexManos
5ee3a057a2 Remove some eclipse preference files 2012-06-19 19:44:07 -07:00
LexManos
9495094a48 Update gitignore to ignore some eclipse preference files. 2012-06-19 19:43:46 -07:00
LexManos
c0dffcbcec Merge pull request #29 from ScottKillen/master 
Fixed WorldType to allow custom WorldTypes
 2012-06-19 19:22:06 -07:00
LexManos
06fffe54b1 Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance. 2012-06-17 19:30:10 -07:00
Christian
944fd02fca More ticking cleanup 2012-06-17 18:53:49 -04:00
Christian
4385704172 Remove WorldLoad tick from modloader mods- too early. *sigh* 2012-06-17 18:49:19 -04:00
Christian
6d46fefd83 Make sure to reset the clock trigger 2012-06-17 18:41:54 -04:00
Christian
ce71f85095 Force all client modloader ticks to occur at render end 2012-06-17 18:41:05 -04:00
Scott Killen
83fa5ffa5e Client 
======
Added hook in GuiCreateWorld to allow WorldType to present GUI on world creation.
 2012-06-17 15:05:16 -04:00
Scott Killen
f85c7a48ca **Client** 
* Delegated World.func_46068_G() (getHorizon), which depends on WorldType, to the WorldType class per LexManos' suggestion
 2012-06-17 00:04:50 -04:00
Scott Killen
efc8d1bb37 Client 
======
- Fixed WorldType to allow custom WorldTypes in world creation GUI.
- Deprecated client WorldType.getSeaLevel() and renamed it with the more accurate name of getMinimumSpawnHeight.
- Changed related reference WorldProvider.

Server
======
- Fixed WorldType to allow custom WorldTypes
- Added methods to WorldType giving it the exact abilities of client WorldType
- Adjusted WorldProvider so that it relies on WorldType the same way it does on client.
 2012-06-16 23:31:17 -04:00
Dion Williams
64f7b219af Make FML logs use system line endings for consistency with Java stack traces in the logs. 2012-06-14 18:01:35 +01:00
LexManos
27f8d07e44 Server side fix for invalid parameter to onCrafting 2012-06-13 20:02:35 -07:00
LexManos
c306da9d6d Proper fix for scroll list not covering all of the hidden scroll items. 2012-06-13 19:59:54 -07:00
Christian
5a24f7f0d7 Merge pull request #26 from GenuineSounds/patch-2 
Incorrectly passing the IInventory of the extraction slot instead of the...
 2012-06-13 18:52:46 -07:00
Brian Wiegand
04917a9a8c Incorrectly passing the IInventory of the extraction slot instead of the crafting matrix, get back to me on why it's doing this instead of the default behavior of ModLoader and Forge. 2012-06-13 15:17:33 -07:00
Brian Wiegand
a5b699c2ca Having the string trimmed to 9 made most long strings show a couple of pixels at the very top and very bottom. ie 
https://dl.dropbox.com/u/79514/2012-06-13_13.25.35.png
 2012-06-13 14:09:07 -07:00
LexManos
5115f4f1e4 Fixed KeyBinding issue with ModLoader container, if you register a KeyBinding twice it will discard the old one. And fixed issue where getVersion() could return null causing NPE. 2012-06-10 17:19:05 -07:00
LexManos
b12cafb5c5 Made it so it will attempt to scale any Texture Effects that return data for smaller texture resolutions. Made the size descrepancy only a error for ITextureFX texture effects. 2012-06-10 05:56:52 -07:00
Christian
ad8e9f10c3 Fix up "errored" mod states so they actually read as errors 2012-06-09 11:07:07 -04:00
Christian
b8ae8664ac Fix up bukkit for biome code 2012-06-09 10:47:43 -04:00
Christian
df205d7d3f Fix up biome handling for client and server 2012-06-09 10:27:24 -04:00
Scott Killen
abcb583dd0 - Fixed client crash bug in add/remove Biome functionality. Arrays.asList() returns a fixed-sized list per java spec. Adding and removing biomes throws UnsupportedOperationException. 
- Fixed same on server and added disabled removeBiome functionality. This touched a lot of classes as the nonWorking removeBiome seemed to be lots of places inconsistent with addBiome.
 2012-06-09 07:59:35 -04:00
Christian
bc72bf11ee Tweak error handling - report the exception that caused the bailout 2012-06-08 15:31:30 -04:00
Christian
4a050fbdba Fix parameter ordering in ticks 2012-06-08 15:22:40 -04:00
Christian
16ab855df5 Update bukkit for world gen tweaks 2012-06-07 19:47:11 -04:00
Christian
320503340b Change world generation to expose a mod interface 2012-06-07 19:44:03 -04:00
Christian
749cb7bcd6 Update bukkit for early load change 2012-06-07 19:28:07 -04:00
Christian
00a9cd4a5f Attempt early initialization of Minecraft Forge 2012-06-07 19:25:49 -04:00
Christian
33fc5228ce Update bukkit handler 2012-06-07 17:57:07 -04:00
Christian
0768f82522 Add in a server side WORLDLOAD tick 2012-06-07 17:54:43 -04:00
Christian
6f91209ea8 Fix ticking- need to register the basemod tickhandler *sigh* 2012-06-07 16:31:23 -04:00
Christian
110ca0f3ba Fix ticking for new name "GAME" vs "WORLD" 2012-06-07 16:21:01 -04:00
Christian Weeks
0814f177c5 Update bukkit handlers 2012-06-07 14:03:42 -04:00
Christian Weeks
856fa4f337 Reorganize basemod ticking to use ITickHandler. Introduce "GAME" tick vs "WORLD" tick for 
mods that want to tick per world and "globally"
 2012-06-07 13:53:16 -04:00
Christian Weeks
5acab9e790 Expose a "clean" ticking interface and fix server tick loop for world ticks 2012-06-07 11:12:51 -04:00
Christian Weeks
c62c1df791 Tweak width of description 2012-06-07 08:39:22 -04:00
LexManos
779b3298bd Fix for in game tick running when it shouldn't. Fixed some tabbing issue in crazy's PR. 2012-06-06 08:01:54 -07:00
LexManos
5997bd3b87 Interm implementation of keyboardEvent for ModLoader. 2012-06-06 01:43:49 -07:00
LexManos
c6de498904 Add static log() functions to the RenderAccessLibrary, and fixed up the logo rendering to better display the images. 2012-06-05 18:49:07 -07:00
crazyputje
20fc9de087 removed 'if (client.theWorld != null)' so it also ticks in the main menu 2012-06-04 20:36:57 +03:00
Christian Weeks
eae26b0562 Helps to have a retention policy 2012-06-02 22:41:50 -04:00
Christian Weeks
eeeaf140a7 Helps to have a retention policy for runtime annotations 2012-06-02 22:40:45 -04:00
Christian Weeks
38978a35dc Add in bukkit proxy handler 2012-06-02 22:14:25 -04:00
Christian Weeks
1f7baa09b5 More proxy code 2012-06-02 22:12:15 -04:00
Christian Weeks
f15d9c507f Introduce a proxy side loader for mod use 2012-06-02 22:12:15 -04:00
LexManos
b56b01571c Fixed GuiModList Logo rendering to allow for logos of different sizes to be rendered properly. Logos will render themselves full underneath the text, It is the modder's job to make it look good. 2012-06-02 18:05:57 -07:00
Christian Weeks
202933c409 Update credits information 2012-06-02 11:45:47 -04:00
Christian Weeks
8baf435a4a Update readme for the client side 2012-06-02 11:44:26 -04:00
Christian Weeks
446faad048 Update bukkit handler to inject names at startup 2012-06-02 11:03:20 -04:00
Christian Weeks
716b32c8ab Merge remote-tracking branch 'origin/master' 2012-06-01 23:25:18 -04:00
Christian Weeks
c9731ed7e3 Fix up optifine detection properly 2012-06-01 23:23:50 -04:00
Christian Weeks
0e6ccd81ed Update bukkit handler 2012-06-01 23:10:38 -04:00
Christian Weeks
de8a5cfc8b Slight reorganization of texture ticking - accomodate optifine 2012-06-01 23:07:32 -04:00
Christian Weeks
174d6691bd Add in optifine visibility for the mod list. Will search for an "optifine_mod.info" file on the 
class path if sp614x wants to add one to optifine.
 2012-06-01 14:55:49 -04:00
Christian Weeks
7d07a752d8 Fix ticking on bukkit server 2012-06-01 11:08:32 -04:00
Christian Weeks
ad5dc783d8 Fix ticking on the server 2012-06-01 11:07:14 -04:00
Christian Weeks
ed08c425af Implement missing language load hook for server 2012-06-01 10:22:08 -04:00
Christian Weeks
2f09a048d6 Tweaks to basemod setup 2012-06-01 00:33:51 -04:00
Christian Weeks
4085617ca2 Bukkitside fixup 2012-06-01 00:27:46 -04:00
Christian Weeks
51701d09fd Merge branch 'bukkitreorg' 2012-05-31 23:07:16 -04:00
Christian Weeks
cfb99b01c8 Fix copied code. Derpbag. 2012-05-31 22:48:44 -04:00
Christian Weeks
e35d31e50d Update FML with recent mainline changes 2012-05-31 22:48:44 -04:00
Christian Weeks
c4ad78ab87 Update bukkit with new mod fixes 2012-05-31 22:48:44 -04:00
Christian Weeks
ac779739aa Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman 2012-05-31 22:48:44 -04:00
Christian Weeks
09d5bf95ae Fix chunk generators for bukkit 2012-05-31 22:48:44 -04:00
Christian Weeks
b2e01d8f2a Bukkit version 2012-05-31 22:48:44 -04:00
Christian Weeks
2521e5b390 Merge branch 'bukkit' - massive code reorganization for fml 2.0 
Conflicts:
	common/cpw/mods/fml/common/IWorldGenerator.java
	common/cpw/mods/fml/common/registry/FMLRegistry.java
	common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
	common/net/minecraft/server/CommonRegistry.java
	common/net/minecraft/server/IMinecraftRegistry.java
	common/net/minecraft/src/CommonRegistry.java
	common/net/minecraft/src/IMinecraftRegistry.java
 2012-05-31 22:45:19 -04:00
Christian Weeks
ae6621bfdd More tweaks for proper API 2012-05-31 22:42:23 -04:00
Christian Weeks
dfd15acb6d Reorganize for bukkit integration 2012-05-31 22:09:45 -04:00
Christian Weeks
660521e6f2 Fix project, new gui layout with screenshot, thanks Sengir! 2012-05-30 09:25:04 -04:00
Christian Weeks
b5a10c0153 Add in missing hooks, add branding information to the crash report 2012-05-27 07:14:35 -04:00
LexManos
d4fd21dcbc Fixed regex issue in last push. 2012-05-27 01:40:22 -07:00
LexManos
379c5b2888 Fixed up for newline before case bodies. 2012-05-27 01:24:45 -07:00
LexManos
51a959f8a4 Should fix windows {me} generating different patches then linux {cpw} 2012-05-27 00:22:27 -07:00
Christian Weeks
7d7c395ff3 Move first tick to the real first tick 2012-05-26 02:30:21 -04:00
Christian Weeks
7c590e62c6 Merge in the mod texture changes from Lex 2012-05-26 02:29:35 -04:00
LexManos
6191ed61e0 Fixed location refs to fmlversion.properties 2012-05-25 23:25:05 -07:00
Christian Weeks
96b442e3cc Add in a static render access class for optifine and other render editing mods to use 2012-05-25 22:13:51 -04:00
Christian Weeks
3454b43daa Add in a "world load" tick fired just as the world completes loading. This SHOULD fix millinaire. 2012-05-25 17:21:30 -04:00
Christian Weeks
f3b15940ee Changing up the mod list data 2012-05-25 15:25:35 -04:00
LexManos
7667df0caf Fixed up ModTexture* classes to use the ITextureFX events to resize the image as needed. Also fixed ModTextureStatic's not being applied properly. 2012-05-24 22:48:15 -07:00
Christian Weeks
d45134eb9a Fix up two stupid overwrites in my mergeup from lex 2012-05-24 23:18:04 -04:00
Christian Weeks
fe710a9245 Fix derp in MTS 2012-05-24 22:13:33 -04:00
Christian Weeks
46b7dc0fec Patch fixing 2012-05-24 21:40:34 -04:00
Christian Weeks
f5598573a2 Update some stuff for updated tweaks 2012-05-24 21:39:16 -04:00
Christian Weeks
d7c9010c92 Update FMLClient with my changes 2012-05-24 21:33:43 -04:00
Christian Weeks
012c378427 my tweaks 2012-05-24 21:06:27 -04:00
LexManos
00ca4ead44 difflist should include server and client now. 2012-05-24 03:48:59 -07:00
LexManos
2927be6247 Some patch cleanup. 2012-05-24 02:18:20 -07:00
LexManos
a9b317c941 Rewrote how HD Texture support worked, to make it easier for Optifine to integrate. 
Fixed TextureFlamesFX for extramly large texture sizes.
Fixed the texture size sceme to allow for different sizes of textures in the same pack.
 2012-05-24 01:35:37 -07:00
LexManos
1727ce69ed Line number changed.. 2012-05-24 01:33:50 -07:00
Christian Weeks
0d5ab57fa0 Fix up the watch 2012-05-18 20:42:12 -04:00
Christian Weeks
2dcd1c4065 And some tweaks to the texture handling 2012-05-18 20:17:07 -04:00
Christian Weeks
a40ba43957 Fix up some fubars in MTS and MTA 2012-05-18 20:16:41 -04:00
Christian Weeks
88f3c4f9bd Lots of error handling. 2012-05-18 10:38:40 -04:00
Christian Weeks
dd94427f22 Missed a patch *sigh* 2012-05-17 21:57:24 -04:00
Christian Weeks
cc4641b0d9 Add simple API to allow mods to let their textures be overriden by other mods 2012-05-17 21:47:12 -04:00
Christian Weeks
a9e17048e6 Because, of course, I broke the first build... 2012-05-17 20:27:24 -04:00
Christian Weeks
abee6d2507 Some logging of texture overrides- also, only unregister if it's an actual ModTextureStatic, not if it's a subclass. 2012-05-17 15:39:04 -04:00
Christian Weeks
1004a3236a Derpy exceptions derpy exception handling 2012-05-17 15:19:25 -04:00
Christian Weeks
8aacd2d127 Remove the dependency in RenderEngine, decided on the simple API for texture FX 2012-05-17 15:11:21 -04:00
Christian Weeks
bc3790e3ca Tweak the render patch- we won't fail if the updateTexture call fails 2012-05-16 00:34:50 -04:00
Christian Weeks
77d6ae8ffa Update patches: add in a setup for most of the texturefx classes 2012-05-16 00:01:12 -04:00
Christian Weeks
a220fb34e2 Tweaking texture loading 2012-05-16 00:00:52 -04:00
Christian Weeks
ddb1085064 Fix tileSize -> iconTileSize. Stupid MCP 2012-05-15 22:34:17 -04:00
Christian Weeks
319758bd33 Catch throwable (NoClassDefFoundError) and don't abort loading- it's probably a badly named class file. 2012-05-15 22:23:00 -04:00
Christian Weeks
1b299b4ff4 Fix some derpy 2012-05-15 22:18:41 -04:00
Christian Weeks
25ced3f321 Update patches for hd textures 2012-05-15 22:10:38 -04:00
Christian Weeks
0e3dcc4eda Change hd texture handling 2012-05-15 22:05:24 -04:00
Christian Weeks
6903deb69d Refresh the renderengine patch- catch and log some texture pack reload errors 2012-05-15 16:21:40 -04:00
Christian Weeks
5412be2d76 More mod list fixes 2012-05-15 16:19:46 -04:00
Christian Weeks
a77aeedee2 Lots of cleanup on the mod list, pretend we're the mcpatcher for mod HD detection. 2012-05-15 15:52:19 -04:00
Christian Weeks
bc23e7a657 Fix up fubar in worldprovider. Add in obfuscation detection. Capture the exception that crashes minecraft in the log file. 2012-05-14 18:21:35 -04:00
Christian Weeks
6b23024f11 ModLoader worldtype hackery compatibility 2012-05-14 16:21:05 -04:00
Christian Weeks
c2264c97aa Fix derp 2012-05-14 14:16:50 -04:00
Christian Weeks
828ada8aa6 Only log the warning once per texture 2012-05-14 13:20:50 -04:00
Christian Weeks
5c48a3c146 push patches 2012-05-14 12:22:46 -04:00
Christian Weeks
028fc2505b Fix millinaire support. Fix Portal eating rendering time. add in profile visibility for mod stuff. 2012-05-14 11:38:54 -04:00
Christian Weeks
6f6c3ee939 Fix the serverside. FUUUUUUUU! 2012-05-14 01:45:56 -04:00
Christian Weeks
a01711361d HD patching complete? Clean up mod info data, Dummy field for dummy mods 2012-05-14 01:39:21 -04:00
Christian Weeks
d48213b444 Improving the scroll list, HD texture patches 2012-05-13 02:46:39 -04:00
Christian Weeks
00aee5b8e1 Actually pass in the mod name 2012-05-12 02:25:15 -04:00
Christian Weeks
b26b3fda1b Fix up incorrect dependency handling 2012-05-12 02:10:50 -04:00
Christian Weeks
ff26096a0f Fix stupid problem with braces 2012-05-12 01:06:58 -04:00
Christian Weeks
fdd80dad80 Tick only when there's a world 2012-05-12 01:03:36 -04:00
Christian Weeks
caa5384552 Fix nulls in the mod list, start building the gui screen 2012-05-12 00:47:04 -04:00
Christian Weeks
053fd64bde Gui related ticking 2012-05-12 00:00:33 -04:00
Christian Weeks
c689991986 Try always loading the language data 2012-05-11 23:37:58 -04:00
Christian Weeks
1146642dec Always load the "en_US" langpack into the translation table first, then the actual language. 2012-05-11 22:20:09 -04:00
Christian Weeks
658f018404 Derpy derp- fix stupid pointless cast 2012-05-11 17:41:33 -04:00
Christian Weeks
394b046220 Fix missing ml.sendpacket, call in renderers 2012-05-11 17:31:28 -04:00
Christian Weeks
c032e39fed Actually mark the sprite as used when you allocate it! 2012-05-11 16:49:21 -04:00
Christian Weeks
a6da168420 Helps to add the new hook! 2012-05-11 16:30:23 -04:00
Christian Weeks
0cd0d69ec4 Hook texture pack changes and loads so we can register override textures 2012-05-11 16:23:26 -04:00
Christian Weeks
f1453839b4 Fix problem with nulls in getModList 
Work on the meta information file
 2012-05-11 15:18:26 -04:00
Christian Weeks
7735567ce0 More tweaks to stuff: mod list, branding, more hooks 2012-05-11 01:45:36 -04:00
Christian Weeks
abc7b3f2a6 Tidying up and more hooks 2012-05-10 21:30:06 -04:00
Christian Weeks
b7861ec04c Tweak block rendering organization. Add in worldgen for client. 2012-05-10 19:51:15 -04:00
Christian Weeks
813ad71f13 Tidy up a lot of code- ModLoader and BaseMod are now almost identical client and server side 2012-05-10 18:54:25 -04:00
Christian Weeks
bb2af1d883 Tweak ordering for sorting- should be a stable sort now 2012-05-10 15:48:26 -04:00
Christian Weeks
7b5ad64378 Update git version capture 2012-05-10 13:01:39 -04:00
Christian Weeks
be9557b8ef Ignore jenkins tags 2012-05-10 12:53:27 -04:00
Christian Weeks
57af97858b Tweak some build stuff for versioning 2012-05-10 12:24:17 -04:00
Christian Weeks
89a6790222 Update build to actually put Loader in... 2012-05-10 11:16:58 -04:00
Christian Weeks
4c9ca1ffc1 tweak location of build properties in src jar 2012-05-10 10:09:56 -04:00