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
Steven Downer
79d224f76e
Update to ASM5 for Java 8 support
...
SpecialSource updated ASM5 and ForgeGradle supports ASM5 as well but
neither FML or Forge were actually updated to support ASM5 opcodes. This
commit resolves this.
Signed-off-by: Steven Downer <grinch@outlook.com>
2015-01-28 20:17:21 -06:00
Lex Manos
97bdcc7991
Fix FML's package for net.miencraftforge on maven. Fixes uploading of new builds.
...
Note: 1.7.10 builds are bug fixes only while FML/Forge for 1.8 stabelizes.
2014-10-06 15:36:17 -07:00
Lex Manos
471c9c5fd5
Remove debug code that was causing console spam in Forge.
2014-10-06 15:28:29 -07:00
Lex Manos
5f65fb754e
Add IEventExceptionHandler for EventBus to allow special handeling exceptions that are fired while running an event.
...
Events now track what 'phase' they are in during the execution process. Each EventPriority is a 'phase'.
An exception is thrown if the event attempts to set its phase to a previous one.
2014-09-08 17:54:41 -07:00
Lex Manos
6192119682
Add jsr305 dev-time dependancy for Nullable/Nonnull annotations. Unneeded at runtime.
2014-09-08 17:50:46 -07:00
cpw
ad752886b0
Allow injecting alternative container types. This is the core support code for allowing sponge plugins!
2014-09-07 20:51:54 +12:00
cpw
3dae97cb4a
Is vanilla possible with this mod load, side tests.
2014-09-07 20:13:37 +12:00
cpw
509d244ed4
Clean up import
2014-09-07 19:59:56 +12:00
cpw
9c27520427
Fix derp with ModType annotation. mods should load again now..
2014-09-01 16:05:04 -04:00
cpw
1419a02d13
Merge branch 'simple-netw-improve' of github.com:diesieben07/FML
2014-08-31 21:50:25 -04:00
diesieben07
2dc1911f54
Make Keyevent also fire for key releases
2014-09-01 01:10:29 +02:00
cpw
a04c3e12fe
Canonicalized file paths in modListFile handling with the minecraftDirectory.
2014-08-31 14:14:15 -04:00
cpw
f5cf87304b
Two new features. ModLists can have a "parent" mod list. Circularity will
...
result in a crash, so be careful. Mods specified in a child will override
ones from a parent (using the maven group:name:classifier triple to identify -
ignoring the version component)
Finally, ModSide is now doable in MANIFEST.MF. If you have this, it can tell
a mod to only load on a client, or on a dedicated server (though I'd watch out
before using the dediserver one, you'll never load in integrated servers then).
The default value is BOTH, which means you'll load both sides, other values are
CLIENT and SERVER, obviously. Perhaps, also, CAULDRON might be possible?
2014-08-31 14:00:28 -04:00
cpw
c604a5e048
Change the mods and modListFile argument handling a bit. Other tweakers will get a chance at looking
...
at them now - they're only removed right before launch.
2014-08-31 13:35:38 -04:00
cpw
981ffe362d
OK, lets make that a csv list. It'll let you be liteloader and fml in one jar file!
2014-08-30 17:45:35 -04:00
cpw
0c50d7b92d
Add in ModType to the jar manifest. If it's present, and doesn't have value "FML"
...
it will be skipped from the modloading cycle. This should let liteloader mods have a .jar extension.
2014-08-30 17:39:43 -04: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
cpw
f0d8b887b4
Fix bug with entityspawn - if the entity doesn't extend livingbase, it fails
...
to write a headyaw byte, and everything will be derped for that packet.
Fixes #499 , but probably a bunch of others.
2014-08-29 21:43:17 -04:00
bloodshot
08ac6d548f
Allow client handshake to be reset by server to support BungeeCord.
2014-08-26 20:49:20 -04:00
cpw
70c115588c
Fix java 8u20. Closes #501 and a bunch of other bugs too.
2014-08-25 17:09:50 -04:00
cpw
bd8bd65ca1
Update for launchwrapper 1.11. Fixes java 6 compatibility.
2014-08-20 23:02:27 -04:00
cpw
c87a11e165
Mark the promise a success in the outbound handler.
2014-08-20 22:49:11 -04:00
cpw
ceae256c56
Fix ups from feedback.
2014-08-20 22:46:39 -04:00
cpw
e07bd74e34
Fix NPE from a boolean
2014-08-20 10:28:50 -04:00
cpw
dddbbd3bac
ItemStack swapping
2014-08-20 10:28:39 -04:00
cpw
2ca75b3fa4
Update to legacylauncher 1.10 and asm 5.0.3
2014-08-16 13:21:07 -04:00
cpw
19b62a9fb8
Cleanup override warnings
2014-08-16 11:30:01 -04:00
cpw
13d81e05db
More cleanup of exit handling, also add a couple more noise classes to the list of things ignored.
2014-08-16 10:32:22 -04:00
cpw
7c5eb19645
Some more tidying up of the exit handling
2014-08-16 10:32:00 -04:00
cpw
4692e66389
Allow a clean way to exit the game without big ugly warnings, but with logging information available if needed. Closes #496
2014-08-15 16:16:07 -04:00
cpw
1d336e0aa7
Fix almost invisible NPE in TerminalTransformer when loading a non-existant class
2014-08-15 16:03:45 -04:00
cpw
c8c6190566
Extend timeout for client to 5 seconds. Should fix Forge #1322
2014-08-13 10:23:01 -04:00
cpw
18c71e5f2f
Fix the ItemStack transformer to find the method and field so it works with srg and mcp naming.
2014-08-12 21:57:19 -04:00
LexManos
cb62a70d66
Merge pull request #494 from AntonBoch1244/patch-1
...
Build.Gradle Patch
2014-08-12 11:55:15 -07:00
cpw
5527b9f01e
Clear button list on FML fatal error screens. The hidden cancel button should not be
...
there.
Closes #497
2014-08-12 09:16:15 -04:00
LexManos
12d4047459
Merge pull request #484 from bspkrs/master
...
Added support for \n in GuiConfig tooltip strings + a slider fix
2014-08-07 14:41:51 -07:00
AntonBoch1244
e5fe05a1cd
Build.Gradle Patch
...
Changing assetDir to runDir and set runDir to "eclipse"
2014-08-05 22:08:58 +04:00
Christian
269080fee5
FML now supports passing a json formatted modlist as an argument, as well as a comma separated argument list.
...
These facilitate modpacks mostly, by meaning you don't need to duplicate mods. The modlist is arranged in the
maven style, with mods referenced maven-like.
2014-08-01 22:18:50 -02:30
Christian
d21f8f6dbd
Finally fix stupid NPE error caused by FML trying to parse the super of Object in IDEA envs.
2014-08-01 21:43:53 -02:30
Christian
07466ab036
First draft of add alias. It is probably not properly persistent atm.
2014-08-01 21:07:03 -02:30
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
cpw
2c804c9b44
Update README.txt
2014-07-31 11:00:53 -02:30
Christian
8622b3fde9
Add a constructor to CustomModLoadingDisplayException. Closes #387
2014-07-31 10:46:33 -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
0607bffb92
Kill net.minecraft.src warning. It hasn't served a purpose in a long time now. Closes #313
2014-07-31 10:02:47 -02:30
Christian
f649eccc51
Default collections, so that we don't crash if useDependencyInfo is true. Closes #485
2014-07-31 09:53:27 -02:30
Christian
fe29a98c62
Fix nested directory for language resources. Closes MinecraftForge#1264
2014-07-31 09:48:03 -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
Christian
7ac077ed36
Add a custom version range factory method. Should hush skyboy's complaints. Closes #486
2014-07-30 16:46:16 -02:30
Christian
14f7bb44d9
Make more noise when people screw up mod downloading and put .jar.zip in their mod folders.
2014-07-30 12:38:55 -02:30
Christian
f8b5ae45f1
Make LogContext optional. This can be useful for debugging mod issues, but
...
Apache's implementation in log4j2 is responsible for a very significant % of
the overall runtime. Quite frankly this is shockingly bad performance from
what is supposed to be a high performance logging framework. Anyway, until we
can figure out if we can fix it, we're turning it off by default.
2014-07-29 21:48:14 -02:30
Christian
655d902195
And fix the read side too, incase someone is trying to bitbang and failing.
2014-07-29 21:36:44 -02:30
Christian
03174602f6
If an IO exception comes from the datawatcher, spew it all over the console
...
don't discard it silently. Should stop pixelmon blaming forge for their mistakes.
2014-07-29 21:33:19 -02:30
Christian
522b648185
Merge branch 'std-redir' of github.com:Emberwalker/FML
2014-07-29 14:49:42 -02:30
Christian
6819f5d45d
Update realms to 1.3.2
2014-07-29 14:24:41 -02:30
Christian
0de92f4db7
Clean up a bunch of compiler warnings.
2014-07-29 14:11:41 -02:30
bspkrs
09d68fb7bd
added support for \n in tooltip strings
...
added \n test tooltip localization
fixed int/double conversion error in slider entry
added test slider scenario that highlighted conversion error
2014-07-24 16:51:15 -04:00
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
4ed75fd963
Fix FMLAT manifest AccessTransformers, class loader fun! Closes #477
2014-07-16 00:24:03 -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
b1ec7b420c
Add ExitVisitor to the TerminalTransformer that finds and intercepts any calls to Runtime.exit or System.exit.
2014-07-12 17:20:01 -07:00
cpw
87dde51b8d
Add a terminal transformer and tweaker.
2014-07-12 17:37:41 -04:00
cpw
e8c251808b
Don't scan ObjectHolders if there was an error already, derpitude will ensure.
2014-07-12 12:03:34 -04: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
Lex Manos
7cd70b3f26
Update tweaker login to use authlib.
2014-07-11 17:52:43 -07:00
LexManos
d4d562c1ca
Merge pull request #468 from bspkrs/master
...
Added slider controls for numerics. Default control is textbox, but slider can be used as a custom list entry class.
2014-07-07 20:15:10 -07:00
bspkrs
e57223a676
added slider controls for numerics. default control is textbox, but slider can be used as a custom list entry class.
...
fixed constructor javadocs in GuiConfig
2014-07-07 23:01:56 -04:00
Lex Manos
2d56512ab2
Update authlib and realms to latest json data.
2014-07-07 17:25:37 -07:00
Lex Manos
a8aac402eb
Add system property to skip doing world backups when game registry changes. This is SEVERLY ill-advised, if you do this DO NOT ask for any support.
2014-07-07 17:25:09 -07:00
Lex Manos
d969137b19
Force preferIPv4Stack to true early in the load chain to combat netty loopback issues.
2014-07-07 09:29:34 -07:00
Lex Manos
e7087fcc48
Scala people test your shit.
2014-07-06 17:12:58 -07:00
cpw
920fd866b4
Merge branch 'scalaupdate'
2014-07-06 10:05:51 -04:00
cpw
efdbdea99f
Update realms to 1.2.9
2014-07-06 10:05:34 -04:00
cpw
2994a2c8ad
Merge branch 'patch-1' of github.com:Soaryn/FML into scalaupdate
2014-07-05 16:26:48 -04:00
