3d03b31d00
More progress bar hooks
2015-04-24 17:47:39 -04:00
d18d493174
More progress bar action!
2015-04-24 17:11:49 -04:00
ab3413a31e
Add in resource reloading to the bar. Tidy up some of the labels a bit.
2015-04-24 16:00:22 -04:00
591971936d
Cleanup RenderEntityItem patch, fixes Z-fighting issue in EntityItems. Closes #1824
2015-04-23 23:46:55 -07:00
53a21e7e47
Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:38:32 +03:00
68def9c352
Merge pull request #647 from AbrarSyed/patch-1
...
Fixed scala module libs in dev json
2015-04-23 18:55:27 -07:00
99c60ee156
fixed scala module libs in jsons
2015-04-23 20:54:14 -05:00
3f59b560d7
Merge pull request #1814 from Lunatrius/block-dispatcher
...
Extracted the creation of RegionRenderCache into a method for extendability
2015-04-22 13:25:48 -07:00
ea9d805e4f
Extracted the creation of RegionRenderCache into a method.
...
Classes extending RegionRenderCache can change the behavior of the cache, allowing to visually change blocks (schematics etc).
2015-04-22 15:40:07 +02:00
87e6c29028
Fix up multiple injections of cmdline files via versionspecificmoddir.
...
Closes #645
2015-04-22 08:31:25 -04:00
ba354da317
Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:28:19 -04:00
6398961c48
Call some loader stuffs
2015-04-20 23:34:36 -04:00
8c54026f2d
Merge branch '1.7.10-load-progress' of github.com:RainWarrior/FML into 1.7.10
2015-04-20 23:15:37 -04:00
5b06b71d04
Splash screen implementation
2015-04-21 06:09:29 +03:00
b049b39760
Update to use the inherited jar format. Simplifies a lot..
2015-04-20 22:25:29 -04:00
e1ed3c07c2
Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638
2015-04-18 21:48:49 -04:00
de066a86da
Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker.
2015-04-17 02:07:01 -07:00
c5f22f56d8
Dissallow color codes in mod names displayed in Mod gui list. And code formatting.
2015-04-13 21:52:53 -07:00
5a5ef86da9
Merge pull request #636 from tterrag1098/betterModList
...
Fix control codes being used for mod list sort. Clean up sorting code.
2015-04-13 17:13:52 -07:00
3fbd6b0810
Fix control codes being used for mod list sort. Clean up sorting code and fix a bug with right click clearing.
2015-04-12 00:51:03 -04:00
5ac654dc1c
MinecraftForge/FML@888e489394 Allow registering custom language adapters.
...
MinecraftForge/FML@906f94ca14 Some tidyup of the PR
MinecraftForge/FML@1c025f1843 Patch TracingPrintStream to handle Kotlin IO.
2015-04-11 18:21:50 -04:00
5f7c3bd72d
Patch TracingPrintStream to handle Kotlin IO.
...
Kotlins internal IO suite wraps the old System.out style, so descend
deeper in the stack when kotlin.io is detected.
2015-04-11 18:15:35 -04:00
6cdde0f9e4
Patch TracingPrintStream to handle Kotlin IO.
...
Kotlins internal IO suite wraps the old System.out style, so descend
deeper in the stack when kotlin.io is detected.
2015-04-11 18:13:25 -04:00
592c9c8e42
Fix itemCtorArgs javadoc in registerBlock
2015-04-11 18:09:31 -04:00
4af2ba3949
Some tidyup of the PR
2015-04-11 18:05:00 -04:00
0055973f43
Allow registering custom language adapters.
...
Allows external mods/library jars to provide language adapters for
languages not supported in native Forge.
2015-04-11 18:05:00 -04:00
1fa358ccee
Some tidyup of the PR
2015-04-11 18:02:00 -04:00
2b3cdaa752
Allow registering custom language adapters.
...
Allows external mods/library jars to provide language adapters for
languages not supported in native Forge.
2015-04-11 17:36:16 +01:00
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
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
994f722843
Clean up some dead code
2015-04-10 22:34:06 -04:00
4be96044d0
Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
2015-04-10 22:28:39 -04:00
07e14a9fa4
MinecraftForge/FML@4a753227ad Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
2015-04-10 03:36:51 -07:00
aeb4b03bf4
Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors.
2015-04-10 03:28:41 -07:00
c11952714c
Merge pull request #1752 from AbrarSyed/patch1
...
changed run configs to GradleStarts
2015-04-09 12:11:32 -07:00
2f5b5f5ffe
Updated FML:
...
MinecraftForge/FML@c8160311d5 Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only
MinecraftForge/FML@9a894952af Merge pull request #627 from GotoLink/patch-1
MinecraftForge/FML@40faac6452 Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 20:12:19 -07:00
79ca5bbf86
Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 19:36:20 -07:00
f6c50cc3af
Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 19:32:25 -07:00
cf7122ed59
Merge pull request #1771 from iChun/master
...
Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex.
2015-04-04 14:31:43 -07:00
b2f1b036de
Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex.
2015-04-04 22:30:23 +01:00
e0bc6fc65c
Merge pull request #1770 from iChun/master
...
Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10.
2015-04-03 21:14:46 -07:00
8c35bc1dc7
Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10.
...
RenderPlayerEvent.Specials was removed because the special effects are done in the LayerRenderer now.
2015-04-03 21:11:43 +01:00
6d71b05838
Merge pull request #627 from GotoLink/patch-1
...
Stop IllegalFormatConversionException thrown
2015-04-02 13:32:56 -07:00
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
5071e76881
Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only
...
%d is not a valid format for getModId(), which returns String.
2015-04-02 18:33:19 +02:00
ee414b2037
Cherry-pick 01aaa7dc97480b381ca0d192ec65016d7baeb747
...
Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560
2015-04-01 19:51:44 -04:00
01000f9d34
Update FML - merge the 1.7.10 changes in to forge @ 1.8. Wow git is (sorta) AWESOME!
...
MinecraftForge/FML@6b0ae369eb Try and improve performance of the registry by avoiding superType.cast.
MinecraftForge/FML@dfebcafd49 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.
MinecraftForge/FML@6011419fa0 Clean up my patch. Terrible person I am..
MinecraftForge/FML@c6bbd0e82d Forgot that I need a noarg ctor. I'm so rusty.
MinecraftForge/FML@6edc1635de Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events) works properly
MinecraftForge/FML@4ca6f6e19f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
MinecraftForge/FML@6f6cec96be Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever.
MinecraftForge/FML@13ac015f0c Change iterator behaviour for the registry - include substitutions in the standard iterator, so that vanilla MC methods visit them (so they can get textures etc). The fml special one only visits the absolute set, used mostly for sanity checking and serialization.
MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI.
MinecraftForge/FML@12ccf9cf49 Rather than try to fall back to the backup level.dat in case of weirdness in the ID map, just fail hard. There is probably a serious modder derp in this case and there's nothing FML can do to recover the situation except avoid making it worse.
MinecraftForge/FML@e8cd368da3 It's an IllegalState not an IllegalArgument *sigh*
MinecraftForge/FML@2be9c74342 And fix itemblocks being removed, leaving behind a residual block. This is a legitimate action - use the missing mapping event to let the mod tell us about it
MinecraftForge/FML@7d8804cf65 You can't setAction to BLOCKONLY
MinecraftForge/FML@13df640d9d Pull in a lot of the FML tweaks from 1.7 to 1.8
MinecraftForge/FML@447beaa99e Merge remote-tracking branch 'origin/1.7.10'
2015-04-01 17:50:58 -04:00
8fe5d26e94
Merge remote-tracking branch 'origin/1.7.10'
...
Conflicts:
fml
2015-04-01 17:43:25 -04:00
9d1f554075
Merge remote-tracking branch 'origin/1.7.10'
2015-04-01 17:17:24 -04:00
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