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

244 commits

Author SHA1 Message Date
Christian
e8c5b0791f Fix an NPE in TileEntity trying to generate a crash report. Make suspicious classes just return the obvious. 
Fix NPE for FML crash report on server. Clean up dead patches.
 2012-11-16 22:50:00 -05:00
LexManos
6191f2530c Fix for ModLoader static overrides not displaying. 2012-11-15 14:08:41 -08:00
Christian
8a40e72f90 Fix up derpy file name handling: closes #127 
Fix up duping childmods: closes #126
FMLPreinitializationEvent now offers a getLogger() that'll return your mod a personalized logger instance
 2012-11-12 17:54:21 -05:00
Christian
dd011e16d2 Support for ModLoader 1.4.2. Good job Risu! 2012-10-28 23:55:58 -04:00
Christian
1a31cd0886 Fix up some javadoc complaints 2012-10-25 16:18:42 -04:00
Christian
c2f4738c8c MCP deserves lots of credit. So here it is. 2012-10-25 09:02:49 -04:00
Christian
f9db650310 Duplicate Mod display screen. 2012-10-24 09:41:46 -04:00
Christian
b88f2e6938 Fix RenderRegistry render ID - now at 36 
Fix SpriteMaps - they're running out fast! Switch to forge if you can!
RenderBiped now has an armorlist- so armortypes add to it as well
 2012-10-21 12:41:53 -04:00
Christian
8ce9b05d8b Fix for new names INetworkManager and ITexturePack. I also provide refactoring scripts for both, for your use... 2012-10-20 17:07:59 -04:00
Christian
7ac53b4772 Fix some compilation issues. Requires resolving the worldclient abstract method 2012-10-20 11:30:01 -04:00
Christian
7327ea75f7 Add in the ability for a client to throw a custom exception that displays a custom gui instead of the default error message. 2012-10-16 12:39:04 -04:00
Christian
4f0ddca554 Bonus extra character. thanks randomitter! 2012-10-16 09:06:13 -04:00
Vazkii
f2e4e20f35 Add Null check to FMLClientHandler.sendPacket 2012-10-05 17:36:52 +02:00
Christian
0ed0d284b5 New stuff on the ModLoader! Risu has been busy. Closes #114 2012-10-02 08:29:12 -04:00
Christian
9a8a38d345 Mods can now declare a range of minecraft versions they will run against 2012-10-02 01:29:46 -04:00
Christian
eb034416ae Fix parent child counts showing properly. Closes #107 thanks scott! 2012-09-25 19:00:36 -04:00
Christian
37340b0f80 Readd ancient searge name so dan200 and computercraft can run again. REMOVE THAT CODE DAN. 2012-09-24 17:22:16 -04:00
Christian
98151df96b Fix missing import. Thanks ichun :( 2012-09-21 18:17:56 -04:00
iChun
efb0e73df9 Fixed ModTextureAnimation not updating and not binding to correct image. 2012-09-17 23:46:09 +08:00
LexManos
48d12444c0 Remove a bunch of warning about javadoc, not a real fix, but no more warning. 2012-09-15 18:04:56 -07:00
Christian
149a626e5a Tie parent/child containers together again. Should close #96 2012-09-15 15:58:20 -04:00
Christian
3461c12d95 Remove debug cruft 2012-09-07 23:14:54 -04:00
Christian
ab34f2d2cf Attempt to build some protocol negotiation, and fix packet1login so that the dimension is a short, matching packet9respawn 2012-09-07 22:46:31 -04:00
Christian
c4d5c89f85 Compatibility level is now passed from server to client - and 
the client tracks it. This means certain packet changes can be made
without breaking comms, hopefully
 2012-09-07 19:32:36 -04:00
Christian
8b8d9a58f6 Capture and leverage Packet131MapData 2012-09-06 10:03:30 -04:00
Christian
6d9b9fde47 Overlooked chat message support *sigh*. Fixes wierd mods that communicate through custom 
chat messages rather than anything else. Hi Superior enchanting!
 2012-09-04 12:37:59 -04:00
Christian
2af15b3a95 Fix compatibility with ModLoader dispenser hook. Fixes a bug with 
IDispenseHandler too - though it means that interface is now
deprecated
 2012-09-03 11:37:17 -04:00
Christian
8f70ed5f33 Also, make missing entity not blow things up 2012-08-31 16:49:35 -04:00
Christian
bd137b7f06 Fix up addRenderer to catch exceptions from the basemod, also, addrenderer now supplies a list of the 
default renderers from MC for editing and will note the changes made.
 2012-08-31 11:18:17 -04:00
Christian
3b0c0fcecf Fix keybindings not loading properly from gamesettings file after restart 2012-08-28 22:15:18 -04:00
Christian
5a6275f0e1 Fix up network negotiation - now it will disconnect with a nice 
error screen if there are missing mods on the client vs server
 2012-08-26 22:13:43 -04:00
Christian
b32dea398b Fix missing addCommand call: thanks "spawnwolf test command" 2012-08-26 13:07:35 -04:00
Christian
fe73f11443 Versions now have two flavours: the @Mod(version) which is the "programmatic version" and 
is used for all version relationship calculation. The "display version" as sourced from
mcmod.info is used for display purposes only and can be literally anything. Note: they fall back
to one another when they're missing, and to "1.0" if both are absent.

Also, changed @Instance. Now, you can inject *other* mods using @Instance as long as you depend
on them as a "before" or "dependency" relationship. Classes containing @Instance will only be
loaded if the Mod the @Instance refers is present. So you don't have to worry about runtime class
resolution.
 2012-08-26 10:45:00 -04:00
Christian
c465b17afe Fix up handing corrupt mcmod.info 2012-08-23 16:43:28 -04:00
Christian
87fa59b0f7 Fix up version handling properly. Hopefully, and the error screen. 2012-08-23 15:29:17 -04:00
Christian
e7c6a47951 Fix oddity with Screen, print a version out in the sorted list! 2012-08-23 14:28:49 -04:00
Christian
4b6b090712 Fix up versioned dependencies so they work a lot better, also add in a missing mods screen 2012-08-23 13:43:25 -04:00
Christian
e6dce6cdbc Fix missing serverSendPacket 2012-08-23 09:02:12 -04:00
Christian
e37b40dac9 Trading support for ModLoader - thanks Herblore! 2012-08-23 01:40:03 -04:00
Christian
346661cc6b More ML compatibility - fix up dragon mounts, thanks! 2012-08-23 00:37:45 -04:00
Christian
0ae888e8f8 Fix entity handling for ModLoader mods, thanks parachute mod! 2012-08-22 23:46:16 -04:00
Christian
4d44836bb3 Fix textures not applying properly 2012-08-22 17:27:06 -04:00
Christian
e713f7b1c2 Fix up entity spawning - hopefully they won't warp anymore. 2012-08-22 15:11:59 -04:00
Christian
a17396eca5 Fix up dispenser handling, add in new params for the dispenser: breaks IDispenseHandler, sorry 2012-08-20 21:44:54 -04:00
Christian
b8a30cec94 GUIs working in FML for ML mods 2012-08-20 21:44:28 -04:00
Christian
bb98ae9e28 Support gui opening for Shelf mod 2012-08-20 21:43:59 -04:00
Christian
3e94ee2c36 Fix up keyboard events for modloader 2012-08-19 01:44:33 -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
298d6db6e2 Fix ModLoader add XP Smelting 2012-08-18 10:09:25 -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
11c1cae8b0 Some compatibility fixes for Rei's minimap, and tidy up a couple of things 2012-08-16 13:55:42 -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
LexManos
e0cb8cd503 Wrap mod description rendering in BLEND calls https://github.com/MinecraftForge/MinecraftForge/issues/96 2012-08-15 02:52:29 -07:00
Christian
75fb35b240 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:06:49 -04:00
Christian
04fc1c6c59 Fix renderer's not getting the rendermanager set on them at registration time 2012-08-14 21:59:47 -04:00
Christian
b69364e168 Add in a helper for code migrating from ML renderer stuff 2012-08-14 19:09:22 -04: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
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
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
8d8f36bac0 Add in a simple packet dispatcher for sending packets around 2012-08-12 22:45:18 -04:00
Krapht
c1dccae4b8 Fixed getNextAvailableRenderId() returning ids in use by vanilla 2012-08-12 14:45:03 +02: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
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
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
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
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
Christian
185babbd85 Entity spawning - done 2012-08-09 01:58:14 -04: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
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
8bda53cb77 Add in a lot of network handler stuff - also, expose the asm harvested data 2012-08-06 09:52:42 -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
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
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
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
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
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
b9466b8ee5 Lots of client patch fixup 2012-07-05 18:13:47 -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
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