cpw
65ab79cf69
Revert "Merge pull request #650 from luacs1998/1.7.10"
...
This undoes the seriously broken change from Sponge to support Mixins, that breaks
a wide variety of coremods. Given the widespread incompatibility it introduces, it
won't be re-added at 1.7.10.
This reverts commit 8ccfa24764a3f4854f5334c0da1224286175e13b, reversing
changes made to 7c10b93a2ded2799d41b73b67a2766c31e992d8a.
2015-05-04 08:50:08 -04:00
cpw
c43e4a8022
Fix the ordering of the messages, so they make sense now.
2015-05-02 22:13:41 -04:00
cpw
858c64ffd3
Optifine can tell us when they're ready for the new splash screen.
2015-04-29 08:15:35 -04:00
LexManos
fd8c2ba08c
Merge pull request #650 from luacs1998/1.7.10
...
Add classloader exclusion for ASM
2015-04-27 15:30:09 -07:00
cpw
ddc6b0a19f
Synchronize the available libraries. Turns out we've been forcing a newer apache commons-lang(3.2.1)
...
for a long time, also sync the dev guava - we've been forcing 17 for a long time too. Bumping
commons-lang to 3.3.2 since that's what Mojang are shipping with 1.8. It has no observable ill effects
Closes #651
2015-04-26 11:32:28 -04:00
luacs1998
aad4678d40
Add classloader exclusion for ASM
2015-04-26 20:14:35 +08:00
RainWarrior
626a192ce6
Loading screen: moved config file to the standard config directory; added the option to load textures from the custom resource pack
2015-04-26 00:22:43 +03:00
cpw
46c5505565
Splash progress screen will not load in the presence of optifine anymore.
2015-04-25 15:05:28 -04:00
cpw
89daceb9eb
Add a config file that lets you add additional soft dependencies at runtime - injectedDependencies.json
...
Example here: https://gist.github.com/cpw/d3edc292631708f2d454
2015-04-25 01:30:17 -04:00
cpw
4e6aa905f0
Fix trying to close the screen during error.
2015-04-25 00:41:50 -04:00
RainWarrior
794ff1d1b4
Loading screen: logo rotation is now optional; initial support for animated textures - animation rate is fixed for now.
2015-04-25 05:12:02 +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
RainWarrior
753115678a
fixed bar text positioning
2015-04-25 01:37:39 +03:00
RainWarrior
c8acd763ef
Thread errors should be correctly displayed in the crash report now
2015-04-25 01:27:57 +03: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
53a21e7e47
Correctly track exceptions thrown in the loading screen rendering thread
2015-04-24 05:38:32 +03:00
cpw
87e6c29028
Fix up multiple injections of cmdline files via versionspecificmoddir.
...
Closes #645
2015-04-22 08:31:25 -04:00
cpw
ba354da317
Make sure to close the splash screen if there's gonna be an error display
2015-04-21 00:28:19 -04:00
cpw
6398961c48
Call some loader stuffs
2015-04-20 23:34:36 -04:00
cpw
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
RainWarrior
5b06b71d04
Splash screen implementation
2015-04-21 06:09:29 +03:00
cpw
b049b39760
Update to use the inherited jar format. Simplifies a lot..
2015-04-20 22:25:29 -04:00
cpw
e1ed3c07c2
Exceptions during construction phase should not propogate and cause an immediate crash. Closes #638
2015-04-18 21:48:49 -04:00
Arkan Emberwalker
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
tterrag1098
592c9c8e42
Fix itemCtorArgs javadoc in registerBlock
2015-04-11 18:09:31 -04:00
cpw
4af2ba3949
Some tidyup of the PR
2015-04-11 18:05:00 -04:00
Arkan Emberwalker
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
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
994f722843
Clean up some dead code
2015-04-10 22:34:06 -04:00
Lex Manos
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
Lex Manos
f6c50cc3af
Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored.
2015-04-07 19:32:25 -07: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
Matthew Messinger
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
cpw
0d79aa1e0a
You can't setAction to BLOCKONLY
2015-03-31 15:38:53 -04:00
cpw
d684a4e066
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
2015-03-31 15:29:51 -04:00
cpw
0b8ff5890a
It's an IllegalState not an IllegalArgument *sigh*
2015-03-31 15:11:39 -04:00
cpw
0bff21315c
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.
2015-03-31 15:09:49 -04:00
Lex Manos
ddcc6a1aa4
Enhance output of common FML errors in crash reports and server GUI.
2015-03-27 01:40:23 -07:00
cpw
c2f11ecc35
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.
Closes #618
2015-03-22 12:56:05 -04:00
cpw
2451e49df2
Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever.
2015-03-22 12:54:05 -04:00
cpw
3df54d3d0f
What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise.
...
Closes #616
2015-03-22 12:03:37 -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
613c5edc7d
Forgot that I need a noarg ctor. I'm so rusty.
2015-03-20 15:11:12 -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
cpw
278612ad98
Try and improve performance of the registry by avoiding superType.cast.
2015-03-14 15:32:34 -04:00
