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
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
b51ce21b70
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -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
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
64d1b29c43
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04: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
06fffe54b1
Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance.
2012-06-17 19:30:10 -07:00
Christian
4385704172
Remove WorldLoad tick from modloader mods- too early. *sigh*
2012-06-17 18:49:19 -04:00
LexManos
c306da9d6d
Proper fix for scroll list not covering all of the hidden scroll items.
2012-06-13 19:59:54 -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
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
df205d7d3f
Fix up biome handling for client and server
2012-06-09 10:27:24 -04:00
Christian
4a050fbdba
Fix parameter ordering in ticks
2012-06-08 15:22:40 -04:00
Christian
320503340b
Change world generation to expose a mod interface
2012-06-07 19:44:03 -04:00
Christian
00a9cd4a5f
Attempt early initialization of Minecraft Forge
2012-06-07 19:25:49 -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
eeeaf140a7
Helps to have a retention policy for runtime annotations
2012-06-02 22:40:45 -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
c9731ed7e3
Fix up optifine detection properly
2012-06-01 23:23:50 -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
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
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
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
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
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
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
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
8aacd2d127
Remove the dependency in RenderEngine, decided on the simple API for texture FX
2012-05-17 15:11:21 -04:00
Christian Weeks
a220fb34e2
Tweaking texture loading
2012-05-16 00:00:52 -04:00
Christian Weeks
1b299b4ff4
Fix some derpy
2012-05-15 22:18:41 -04:00
Christian Weeks
0e3dcc4eda
Change hd texture handling
2012-05-15 22:05:24 -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
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
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
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
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
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
LexManos
ef6bb505b9
Inventroy rendering
2012-05-10 01:25:56 -07:00
LexManos
8d0a9b770d
Fixed up the ModLoader render block hook, RP's blocks now render.
2012-05-10 01:00:07 -07:00
LexManos
2afed48993
Should fix colliding model ids with MC's internal IDs
2012-05-09 23:38:01 -07:00
Christian Weeks
311ca8866e
Fix up build script a bit, all modloader is public, and fix tile entity renderer
2012-05-10 00:07:46 -04:00
Christian Weeks
7846f10c74
Add in some more stuff for handling key bindings, rendering
2012-05-07 17:44:49 -04:00
Christian Weeks
0438fbd47e
Reorganize ticking a bit
2012-05-07 01:39:55 -04:00
Christian Weeks
56e7270dee
Separate sprite handling, fix worldtype
2012-05-07 01:26:21 -04:00
Christian Weeks
b6b5955404
Working on the ticking stuff
2012-05-07 00:54:18 -04:00
LexManos
55d252b657
more client side hooks and Texture overrides/animations.
2012-05-06 16:32:59 -07:00
Christian Weeks
49be023eab
Halfway through ticking- won't compile
2012-05-06 00:58:40 -04:00
Christian Weeks
8c79b9b946
ModLoader moves forwards
2012-05-05 20:33:40 -04:00
Christian Weeks
bca823c421
Let's get hooking!
2012-05-05 19:52:53 -04:00
Christian Weeks
e0e77a6bb5
API is restored for client side. Implementation starting.
2012-05-05 14:42:46 -04:00
Christian Weeks
816b0738e4
The beginning
2012-05-04 17:02:12 -04:00
Christian Weeks
4b4ad6781e
Introduce the client side FML
2012-05-03 19:40:55 -04:00
LexManos
9220174dbc
Created eclipse workspace, should allow simple and quick access to working on FML
2012-04-05 00:06:11 -07:00
