LexManos
cab151ec44
Fixed ItemMonsterPlacer.getEggInfo missing return. Closes #1975
2015-06-26 17:54:38 -07:00
cpw
16ff1be093
Merge branch '1.7.10'
...
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
2015-06-21 21:59:51 -04:00
Lex Manos
7041fbc27e
Time each bar in the loading screen and print it to the log, useful information to see where most time is spent in loading.
2015-06-18 22:18:27 -07:00
Lex Manos
e519278888
Add TextureManager to loading screen.
2015-06-18 22:17:21 -07:00
Lex Manos
4235ca36ea
Make TextureMap for items and blocks skip the first pass of loading/stitching textures.
...
Should decrease loading times for large packs.
May cause issues with some mods so use -Dfml.skipFirstTextureLoad=false to disable.
2015-06-18 20:13:31 -07:00
Lex Manos
6527792d06
Add the stitching allocation stage to loading screen.
2015-06-18 20:13:17 -07:00
Lex Manos
c158af902f
New system in EntityRegistry to allow modders to register spawn eggs.
...
For entites that do not use the global ID system.
{Which no mod entity should}
Vanilla spawn eggs will now detect a 'entity_name' entry in it's NBT data and use that for spawning/rendering.
2015-06-18 18:05:12 -07:00
Lex Manos
ee1e229b66
Change custom payload lock to be buffer itself incase multiple packets use the same backend buffer. Closes #1908
2015-06-07 00:06:00 -07:00
Lex Manos
e6eeb03108
Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
...
(cherry picked from commit 19d7e16fa6
)
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
2015-06-01 17:15:06 -04:00
Lex Manos
19d7e16fa6
Finish loading screen before going fullscreen. Closes MinecraftForge/FML#662
2015-05-25 14:32:35 -07:00
cpw
081a949bfd
Merge branch '1.7.10'
...
Conflicts:
patches/minecraft/net/minecraft/client/Minecraft.java.patch
src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
src/main/java/net/minecraftforge/fml/client/FMLFileResourcePack.java
src/main/java/net/minecraftforge/fml/client/FMLFolderResourcePack.java
src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
src/main/java/net/minecraftforge/fml/common/IFMLSidedHandler.java
src/main/java/net/minecraftforge/fml/common/LoadController.java
src/main/java/net/minecraftforge/fml/common/Loader.java
src/main/java/net/minecraftforge/fml/common/asm/transformers/EventSubscriptionTransformer.java
src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java
src/main/resources/fml_at.cfg
2015-05-10 23:55:11 -04:00
RainWarrior
fb18c07722
Eliminated texture name allocation race condition
2015-05-04 21:54:33 +03:00
cpw
1fdd18398e
Fix broken log message in vanilla.
2015-04-24 19:02:54 -04:00
cpw
454e2e36a4
Track mipmaps and texture upload
2015-04-24 19:01:49 -04:00
cpw
3d03b31d00
More progress bar hooks
2015-04-24 17:47:39 -04:00
cpw
d18d493174
More progress bar action!
2015-04-24 17:11:49 -04:00
cpw
ab3413a31e
Add in resource reloading to the bar. Tidy up some of the labels a bit.
2015-04-24 16:00:22 -04:00
RainWarrior
5b06b71d04
Splash screen implementation
2015-04-21 06:09:29 +03:00
cpw
fa5ab52acd
Enhance error output for bad textures a bit more and try and capture more types of error..
2015-04-11 12:12:37 -04:00
cpw
c7622c06d7
Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable
...
format.
2015-04-11 00:52:58 -04:00
cpw
38cdbc16e2
Fix json cache crash, handle the file much more cleanly. Probably an MC JIRA since
...
it's a vanilla bug. Closes #619
2015-04-02 13:07:40 -04:00
cpw
c3559b2dbd
Pull in a lot of the FML tweaks from 1.7 to 1.8
...
Merge remote-tracking branch 'origin/1.7.10'
Conflicts:
src/main/java/cpw/mods/fml/common/MissingModsException.java
2015-04-01 17:06:12 -04:00
cpw
f4972b7611
Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events)
...
works properly
2015-03-20 15:55:16 -04:00
cpw
a8cbbfcd99
Clean up my patch. Terrible person I am..
2015-03-20 15:00:19 -04:00
cpw
889c967a5b
Something I meant to add a long time ago, but it got overlooked. My apologies. Presend the (int)
...
dimension ID in the serverhello packet. This should be 100% backward compatible with existing servers
but bumping a server to this version will allow clients with this version as well to now login in
dimensions outside the byte range. Probably fixes a bunch of mods that add dimensions.
2015-03-20 14:19:54 -04:00
Lex Manos
418b7794d2
Fix Debug packet logger on local memory connections.
2015-03-04 21:00:31 -08:00
LexManos
4d4f82816f
Merge pull request #610 from Zot201/1.8
...
Fixed WorldInfo properties not loaded
2015-03-04 10:34:25 -08:00
Zot201
189619fcdd
Fixed WorldInfo properties not loaded
2015-03-05 03:21:19 +09:00
Fry
c85aa9351a
Merge pull request #597 from RainWarrior/blame
...
Added blaming of coremods and mods not targetting Java 6
2015-02-13 08:05:20 +03:00
RainWarrior
a4e70e44e1
Added blaming of coremods and mods not targetting Java 6
2015-02-13 08:07:27 +03:00
Lex Manos
e903f0ff69
Added ability for language files to opt-in to loading using normal Java properties format.
...
This allows for escape characters, as well as keeping %d and %f replacements in tact.
To opt-in, the lang file must have this comment line:
# PARSE_ESCAPES
As this is opt-in, any errors resulting from misused format strings is on the modder/end user.
2015-02-04 17:23:41 -08:00
Lex Manos
1b80328d3f
Reset S->C CustomPayload data after Write, allowing the same packet to be written multiple times. Closes #588
2015-02-02 12:09:26 -08:00
Lex Manos
e9dbc71362
Ensure that EntitySpawn and OpenGUI packets are handled in the world thread.
...
Also log all errors that are thrown in FutureTasks.
2014-12-13 17:45:38 -08:00
Lex Manos
5b07c7fead
Update Dev mcp mappings to 11-30 snapshot.
2014-12-01 18:28:18 -08:00
Lex Manos
878f995711
Add the ability to register custom variant names in ModelBakery.
2014-10-13 20:48:09 -07:00
Lex Manos
c002b98e5e
Automatically register BlockStates when block is initally registered, and clear the list when new snapshots are injected. Modders DO NOT touch the registry in Block directly. Closes #537
2014-10-09 05:05:43 -07:00
Lex Manos
468d35e635
Take control over Item.BLOCK_TO_ITEM map and register Block's to this map from GameRegistry.
2014-10-03 17:48:57 -07:00
Lex Manos
28ff001cc0
Move FML to net.minecraft.fml package.
2014-09-22 22:50:54 -07:00
Lex Manos
511c370193
Preliminary network protocol re-work. vanilla clients can now connect. Further cleanup needed.
2014-09-22 19:29:40 -07:00
Lex Manos
1ac0c5d87f
Inital 1.8 patch update. 'It compiles!'
2014-09-19 17:25:14 -07:00
diesieben07
2dc1911f54
Make Keyevent also fire for key releases
2014-09-01 01:10:29 +02:00
cpw
0e13403457
Wrap the server description box a little bit shorter. Stops the overlapping. Closes #489
2014-08-29 21:54:20 -04:00
Christian
7ee877a567
Last part is the itemstack transformer. Itemstacks should now only be loosely coupled with the items within.
2014-08-01 21:07:02 -02:30
Christian
2d37b14555
AllowPlayerLogins only after the server has completed the core init tasks. Closes #372
2014-07-31 10:17:11 -02:30
Christian
0c088a4299
Tweak Itemstack patch to always delegate to the method call. Set the field, so it's in sync.
2014-07-31 09:47:35 -02:30
Christian
f5bcb6f0ca
Add a delegate to every item and block. this should help with renaming fun stuffs. Also, fix all the tabs from my previous commits. *sigh*
2014-07-30 21:18:31 -02:30
cpw
5643237fb9
Sorta revert 908491d5e7ac26becdac938f38cc90d6b9d73ce1 but merge assets
...
into the map, rather than force overwriting. Fixes skyboy's comment.
2014-07-20 10:46:22 -04:00
Lex Manos
4ba024ca2e
Hacky interm solution to #475 to buy me time to re-write FML's network protocol.
2014-07-18 12:25:02 -07:00
Lex Manos
59c628f777
Move LaunguageRegistry call above normal asset loading to allow resource packs to override mod's language systems.
2014-07-14 13:53:37 -07:00
Lex Manos
e6e019896f
Update realms library to 1.3.1, and implement network latch when connecting to Realms. Tested and working.
2014-07-11 17:56:07 -07:00