Commit Graph

1663 Commits

Author SHA1 Message Date
Lex Manos 1b587948f8 Add joptsimple as a server required library. Closes #531 2014-10-01 11:26:06 -07:00
Lex Manos 10d3062fc6 Restructure block and item mapping data in world save and network to potentially expand to custom mod ID registry syncing. Tip: ONLY use those functions in GameData that are marked as public API as internal API may change in 1.8. 2014-10-01 01:07:23 -07:00
LexManos 27ea6bb6fa Merge pull request #527 from bspkrs/1.8
Update Config Gui stuff for 1.8
2014-09-30 13:05:00 -07:00
bspkrs 927df1559e Update Config Gui stuff for 1.8
updated mappings to snapshot 20140930
got rid of derpy generics code
2014-09-30 05:20:56 -04:00
Lex Manos 28ff001cc0 Move FML to net.minecraft.fml package. 2014-09-22 22:50:54 -07:00
Lex Manos 1f1166e722 Move vanilla trades to inner class to prevent initilizer order issues. 2014-09-22 19:30:14 -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
Lex Manos ebb91ba280 1.8 Conf update. Uses MCPData Snapshots now. 2014-09-18 17:57:33 -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
cpw 88a0805e93 Merge branch 'keyup-event' of github.com:diesieben07/FML 2014-08-31 21:42:10 -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
cpw 67ebda9ace Merge branch 'bungeecord' of github.com:bloodmc/FML 2014-08-29 21:37:48 -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