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
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
8d8f36bac0
Add in a simple packet dispatcher for sending packets around
2012-08-12 22:45:18 -04:00
c1dccae4b8
Fixed getNextAvailableRenderId() returning ids in use by vanilla
2012-08-12 14:45:03 +02: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
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
7b2d09844c
More ticking hooks, and some other bits of clean up. Very close to "done" now.
2012-08-10 17:11:01 -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
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
185babbd85
Entity spawning - done
2012-08-09 01:58:14 -04: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
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
8bda53cb77
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -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
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
6d70a76c95
More fixes
2012-08-02 16:50:30 -02:30
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
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
ba28161f16
New logging stuff, also the early plugin api for forge
2012-07-29 22:54:59 -04:00
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
25fb847dc1
Fixes
2012-07-06 10:42:49 -04:00
98e31e5f03
Incorporate server patches into client
2012-07-06 10:29:17 -04:00
b9466b8ee5
Lots of client patch fixup
2012-07-05 18:13:47 -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
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
07a1927c25
Update some stuff
2012-07-02 23:49:40 -04:00
b51ce21b70
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -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
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
64dab3c8d7
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -04:00
77479d8b74
Fix ticking for GUI ticks too!
2012-06-22 09:30:27 -04:00
64d1b29c43
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04: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
06fffe54b1
Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance.
2012-06-17 19:30:10 -07:00
4385704172
Remove WorldLoad tick from modloader mods- too early. *sigh*
2012-06-17 18:49:19 -04:00
c306da9d6d
Proper fix for scroll list not covering all of the hidden scroll items.
2012-06-13 19:59:54 -07:00
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
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
df205d7d3f
Fix up biome handling for client and server
2012-06-09 10:27:24 -04:00
4a050fbdba
Fix parameter ordering in ticks
2012-06-08 15:22:40 -04:00
320503340b
Change world generation to expose a mod interface
2012-06-07 19:44:03 -04:00
00a9cd4a5f
Attempt early initialization of Minecraft Forge
2012-06-07 19:25:49 -04:00
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
5acab9e790
Expose a "clean" ticking interface and fix server tick loop for world ticks
2012-06-07 11:12:51 -04:00
c62c1df791
Tweak width of description
2012-06-07 08:39:22 -04:00
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
5997bd3b87
Interm implementation of keyboardEvent for ModLoader.
2012-06-06 01:43:49 -07:00
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
20fc9de087
removed 'if (client.theWorld != null)' so it also ticks in the main menu
2012-06-04 20:36:57 +03:00
eeeaf140a7
Helps to have a retention policy for runtime annotations
2012-06-02 22:40:45 -04:00
f15d9c507f
Introduce a proxy side loader for mod use
2012-06-02 22:12:15 -04:00
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
c9731ed7e3
Fix up optifine detection properly
2012-06-01 23:23:50 -04:00
de8a5cfc8b
Slight reorganization of texture ticking - accomodate optifine
2012-06-01 23:07:32 -04:00
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
ae6621bfdd
More tweaks for proper API
2012-05-31 22:42:23 -04:00
dfd15acb6d
Reorganize for bukkit integration
2012-05-31 22:09:45 -04:00
660521e6f2
Fix project, new gui layout with screenshot, thanks Sengir!
2012-05-30 09:25:04 -04:00
7d7c395ff3
Move first tick to the real first tick
2012-05-26 02:30:21 -04:00
7c590e62c6
Merge in the mod texture changes from Lex
2012-05-26 02:29:35 -04:00
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
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
f3b15940ee
Changing up the mod list data
2012-05-25 15:25:35 -04:00
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
d45134eb9a
Fix up two stupid overwrites in my mergeup from lex
2012-05-24 23:18:04 -04:00
fe710a9245
Fix derp in MTS
2012-05-24 22:13:33 -04:00
f5598573a2
Update some stuff for updated tweaks
2012-05-24 21:39:16 -04:00
d7c9010c92
Update FMLClient with my changes
2012-05-24 21:33:43 -04:00
012c378427
my tweaks
2012-05-24 21:06:27 -04:00
2927be6247
Some patch cleanup.
2012-05-24 02:18:20 -07:00
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
a40ba43957
Fix up some fubars in MTS and MTA
2012-05-18 20:16:41 -04:00
88f3c4f9bd
Lots of error handling.
2012-05-18 10:38:40 -04:00
cc4641b0d9
Add simple API to allow mods to let their textures be overriden by other mods
2012-05-17 21:47:12 -04:00
a9e17048e6
Because, of course, I broke the first build...
2012-05-17 20:27:24 -04:00
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
8aacd2d127
Remove the dependency in RenderEngine, decided on the simple API for texture FX
2012-05-17 15:11:21 -04:00
a220fb34e2
Tweaking texture loading
2012-05-16 00:00:52 -04:00
1b299b4ff4
Fix some derpy
2012-05-15 22:18:41 -04:00
0e3dcc4eda
Change hd texture handling
2012-05-15 22:05:24 -04:00
5412be2d76
More mod list fixes
2012-05-15 16:19:46 -04:00
Christian
