0281b74c7c
Fix double decoding of UTF8 characters in lang files.
2015-02-21 17:27:21 -08:00
0a8a535e2c
Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true.
2015-02-15 17:30:56 -08:00
d14ad7dd9a
Filter more known libraries from potential mod canidates.
2015-02-15 17:30:18 -08:00
68efb9d6f4
Moved transformer wrappers to a separate package (should fix signing errors), fixed debug mods not loading in forgedev (string comparison).
2015-02-14 05:17:14 +03:00
1a2c521b63
Handle empty lines in language files gracefully
2015-02-13 15:34:54 +01:00
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
a4e70e44e1
Added blaming of coremods and mods not targetting Java 6
2015-02-13 08:07:27 +03:00
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
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
79b5c28d38
Merge remote-tracking branch 'origin/1.8'
2015-01-31 18:33:32 -08:00
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
9a2c4998ae
Merge pull request #591 from Minecrell/patch-1
...
Exclude only log4j2 queue from class loader
2015-01-18 14:46:18 -08:00
c7da6c703f
Merge pull request #575 from lumien231/1.8
...
Save the mod list of players in their NetworkDispatcher
2015-01-16 14:40:06 -08:00
8cfca4376f
Exclude only log4j2 queue from class loader
...
Right now the complete com.mojang package is excluded from the LaunchClassLoader on the server. This means mods can't transform authlib for example which doesn't need to be excluded for the UI to work. By excluding only the specific log4j2 QueueLogAppender, mods can also transform the classes in the com.mojang.authlib package.
2015-01-16 23:15:17 +01:00
a7ff70eaa4
Fixed getEffectiveSide() for Netty Server threads
2014-12-23 20:26:37 +01:00
2096bcb5ab
Finish removing marker in mapping entry names. FMLMissingMappingsEvent/FMLModIdMappingEvent should fire with correct names now.
2014-12-15 06:57:59 -08:00
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
6f19fd1513
Save the mod list of players in their NetworkDispatcher (Make it accessable for mods)
2014-12-06 16:31:58 +01:00
5b07c7fead
Update Dev mcp mappings to 11-30 snapshot.
2014-12-01 18:28:18 -08:00
7b2e7ac3c9
Unlink banner block and item id. Mojang should of matched these up but they didn't -.-
2014-12-01 18:00:28 -08:00
4a92959cc1
Finalize modded handshakes in the World tick thread. Prevents potential CMEs when login event takes to long to fire.
2014-11-28 10:37:55 -08:00
229848a4cb
Add details message to MissingModsException and WrongMinecraftVersionException to make the Crash logs more useful.
2014-11-08 15:13:59 -08:00
0dc112a198
Add duplicate protection to ModDiscoverer, do not process files in the mods directory if we already found them in the classpath. {Such as if LiteLoader is installed and added it} Closes #557
2014-11-05 15:27:43 -08:00
2544df8e44
Re-enabled Entity-Render registration
2014-10-19 20:05:39 -04:00
7e53132918
changed pass-thru method name to fix MCP name conflict
...
fixed a few old javadoc object name mistakes
2014-10-15 02:08:41 -04:00
878f995711
Add the ability to register custom variant names in ModelBakery.
2014-10-13 20:48:09 -07:00
70b57c337a
Removed unneeded rebuild, was toying with where to put it.
2014-10-09 05:22:50 -07:00
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
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
471c9c5fd5
Remove debug code that was causing console spam in Forge.
2014-10-06 15:28:29 -07:00
cfaedc384a
Update TerminalTransformer for new FML package. Closes #535
2014-10-06 00:53:38 -07:00
e4cdefb0e1
General class name cleanup, spelling mistakes and FF decompile issues.
2014-10-04 02:05:43 -07:00
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
f759f73801
Renamed TileEntityRendererChestHelper -> TileEntityItemStackRenderer
...
This class is used to render any tile entities in a non-location specific major
Such as EntityItems, In minecarts, Held by entities, anyhting that isn't in world.
Switched the class names for BiomeGenForest $1 and $2 as Fernflower decompiled
them in oposite order.
2014-10-03 17:48:28 -07:00
20d78df6e6
added mappings to default build.gradle
2014-10-03 15:57:04 -05:00
1b587948f8
Add joptsimple as a server required library. Closes #531
2014-10-01 11:26:06 -07:00
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
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
28ff001cc0
Move FML to net.minecraft.fml package.
2014-09-22 22:50:54 -07:00
1f1166e722
Move vanilla trades to inner class to prevent initilizer order issues.
2014-09-22 19:30:14 -07:00
511c370193
Preliminary network protocol re-work. vanilla clients can now connect. Further cleanup needed.
2014-09-22 19:29:40 -07:00
1ac0c5d87f
Inital 1.8 patch update. 'It compiles!'
2014-09-19 17:25:14 -07:00
ebb91ba280
1.8 Conf update. Uses MCPData Snapshots now.
2014-09-18 17:57:33 -07:00
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
6192119682
Add jsr305 dev-time dependancy for Nullable/Nonnull annotations. Unneeded at runtime.
2014-09-08 17:50:46 -07:00
ad752886b0
Allow injecting alternative container types. This is the core support code for allowing sponge plugins!
2014-09-07 20:51:54 +12:00
3dae97cb4a
Is vanilla possible with this mod load, side tests.
2014-09-07 20:13:37 +12:00
509d244ed4
Clean up import
2014-09-07 19:59:56 +12:00
9c27520427
Fix derp with ModType annotation. mods should load again now..
2014-09-01 16:05:04 -04:00
1419a02d13
Merge branch 'simple-netw-improve' of github.com:diesieben07/FML
2014-08-31 21:50:25 -04:00
2dc1911f54
Make Keyevent also fire for key releases
2014-09-01 01:10:29 +02:00
a04c3e12fe
Canonicalized file paths in modListFile handling with the minecraftDirectory.
2014-08-31 14:14:15 -04:00
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
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
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
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
0e13403457
Wrap the server description box a little bit shorter. Stops the overlapping. Closes #489
2014-08-29 21:54:20 -04:00
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
08ac6d548f
Allow client handshake to be reset by server to support BungeeCord.
2014-08-26 20:49:20 -04:00
70c115588c
Fix java 8u20. Closes #501 and a bunch of other bugs too.
2014-08-25 17:09:50 -04:00
bd8bd65ca1
Update for launchwrapper 1.11. Fixes java 6 compatibility.
2014-08-20 23:02:27 -04:00
c87a11e165
Mark the promise a success in the outbound handler.
2014-08-20 22:49:11 -04:00
ceae256c56
Fix ups from feedback.
2014-08-20 22:46:39 -04:00
e07bd74e34
Fix NPE from a boolean
2014-08-20 10:28:50 -04:00
dddbbd3bac
ItemStack swapping
2014-08-20 10:28:39 -04:00
2ca75b3fa4
Update to legacylauncher 1.10 and asm 5.0.3
2014-08-16 13:21:07 -04:00
19b62a9fb8
Cleanup override warnings
2014-08-16 11:30:01 -04:00
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
7c5eb19645
Some more tidying up of the exit handling
2014-08-16 10:32:00 -04:00
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
1d336e0aa7
Fix almost invisible NPE in TerminalTransformer when loading a non-existant class
2014-08-15 16:03:45 -04:00
c8c6190566
Extend timeout for client to 5 seconds. Should fix Forge #1322
2014-08-13 10:23:01 -04:00
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
cb62a70d66
Merge pull request #494 from AntonBoch1244/patch-1
...
Build.Gradle Patch
2014-08-12 11:55:15 -07:00
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
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
e5fe05a1cd
Build.Gradle Patch
...
Changing assetDir to runDir and set runDir to "eclipse"
2014-08-05 22:08:58 +04:00
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
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
07466ab036
First draft of add alias. It is probably not properly persistent atm.
2014-08-01 21:07:03 -02:30
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
2c804c9b44
Update README.txt
2014-07-31 11:00:53 -02:30
8622b3fde9
Add a constructor to CustomModLoadingDisplayException. Closes #387
2014-07-31 10:46:33 -02:30
2d37b14555
AllowPlayerLogins only after the server has completed the core init tasks. Closes #372
2014-07-31 10:17:11 -02:30
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
f649eccc51
Default collections, so that we don't crash if useDependencyInfo is true. Closes #485
2014-07-31 09:53:27 -02:30
fe29a98c62
Fix nested directory for language resources. Closes MinecraftForge#1264
2014-07-31 09:48:03 -02:30
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
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
7ac077ed36
Add a custom version range factory method. Should hush skyboy's complaints. Closes #486
2014-07-30 16:46:16 -02:30
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
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
655d902195
And fix the read side too, incase someone is trying to bitbang and failing.
2014-07-29 21:36:44 -02:30
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
522b648185
Merge branch 'std-redir' of github.com:Emberwalker/FML
2014-07-29 14:49:42 -02:30
6819f5d45d
Update realms to 1.3.2
2014-07-29 14:24:41 -02:30
0de92f4db7
Clean up a bunch of compiler warnings.
2014-07-29 14:11:41 -02:30
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
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
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
4ed75fd963
Fix FMLAT manifest AccessTransformers, class loader fun! Closes #477
2014-07-16 00:24:03 -07:00
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
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
87dde51b8d
Add a terminal transformer and tweaker.
2014-07-12 17:37:41 -04:00
e8c251808b
Don't scan ObjectHolders if there was an error already, derpitude will ensure.
2014-07-12 12:03:34 -04:00
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
7cd70b3f26
Update tweaker login to use authlib.
2014-07-11 17:52:43 -07:00
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
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
2d56512ab2
Update authlib and realms to latest json data.
2014-07-07 17:25:37 -07:00
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
d969137b19
Force preferIPv4Stack to true early in the load chain to combat netty loopback issues.
2014-07-07 09:29:34 -07:00
e7087fcc48
Scala people test your shit.
2014-07-06 17:12:58 -07:00
920fd866b4
Merge branch 'scalaupdate'
2014-07-06 10:05:51 -04:00
efdbdea99f
Update realms to 1.2.9
2014-07-06 10:05:34 -04:00
2994a2c8ad
Merge branch 'patch-1' of github.com:Soaryn/FML into scalaupdate
2014-07-05 16:26:48 -04:00
79e6167d8d
Updated Scala to latest stable
...
Updates the -dev portion of the json files for 1.7.10 for scala 2.11.1
Updates the -rel portion of the json files for 1.7.10 for scala 2.11.1
2014-07-05 22:54:58 +03:00
56f9373a17
updated run configs for GradleStart/Server classes
2014-07-04 22:02:29 -05:00
3164dd95bf
Fix unneeded cast causing crash in new Config GUI system.
2014-07-03 11:13:11 -07:00
fd060bcce6
updated gradle wrapper to gradle 2.0
2014-07-02 15:54:55 -05:00
1182bc4bd6
Add overloaded version of SimpleNetworkWrapper#registerMessage that takes the MessageHandler instance directly, allowing to specify the same handler for multiple messages.
2014-06-30 00:00:06 +02:00
71a9586fbb
API is now able to "provide" and "own" itself. Useful for libraries without a Mod in them.
...
To go along with this, you can now require an API, with a version, in your mod dependency string
2014-06-26 22:09:50 -04:00
8afc9c465c
Update for release 1.7.10
2014-06-26 14:48:46 -04:00
b7b9ddc9cd
Merge pull request #455 from rumickon/feature
...
Fix Eclipse launching attribute
2014-06-26 10:21:19 -07:00
7cafaed696
Fix library issue. mojang auth requests newer libs, so we get them at dev time. But the
...
mojang json doesn't refer them at runtime. So there's a lib mismatch. Fortunately all are
available at mojang, so we can update the json.
2014-06-25 18:28:50 -04:00
b9db002614
Fix accessing guava from transformers
2014-06-25 17:49:00 -04:00
bb7aa340dc
Merge branch 'master' into mc179
2014-06-25 17:03:05 -04:00
0a00d40ba2
Fix Eclipse launching attribute
2014-06-25 23:49:17 +04:00
25e44a8b32
Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
2014-06-25 13:09:10 -04:00
f5d8e85fc5
Fix NPE when no FMLAT is defined
2014-06-25 09:11:07 -04:00
380027daf0
Merge branch 'master' into mc179
...
Conflicts:
src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
2014-06-24 22:18:03 -04:00
3dbe6ccded
Fix up other exit points. Should stop process hangs for clean exits.
2014-06-24 22:15:11 -04:00
88a411550a
Add support for mod access transformers without a coremod requirement.
...
Use the "FMLAT" manifest attribute, with a space separate list of files
that live in the 'META-INF' directory. They should conform to standard AT
formatting.
2014-06-24 21:34:07 -04:00
237c28b6cb
Force the descriptors to the right type for the field they're referencing. Fixes
...
the sand issue
2014-06-24 18:34:34 -04:00
6aae913919
Harden the security manager and make it less spammy. Clean up a bunch of deprecation warnings from guava.
2014-06-21 23:03:41 -04:00
94f6fffc80
remove the deprecation patches. The methods are gone now
2014-06-21 22:48:15 -04:00
06f91d8936
Merge branch 'master' into mc179
2014-06-21 22:44:38 -04:00
9b976b7afe
Fix server side to write properly
2014-06-21 22:44:25 -04:00
ea89e1a3f7
Pre4 update
2014-06-21 21:13:22 -04:00
c1ea6639d4
Fix up some patching bugs. Fully functional @ pre3
2014-06-21 15:55:32 -04:00
90ad27d985
FML now sets a security manager (FINALLY!). It's primary purpose at this point is to catch
...
rogue calls to System.exit so that they can cause a proper crash report, rather than
silently abandoning the game.
2014-06-15 16:37:42 -04:00
1c78a09cfd
Also patch in warnings for Vec3Pool - similarly removed.
2014-06-13 08:51:07 -04:00
be7cf8c01e
Checking in pre3 work
2014-06-12 21:13:26 -04:00
23c6b9d245
Implement STDOUT/STDERR redirection.
...
These streams now redirect to log4j2, with form '[class:method:line]: Original message'.
2014-06-12 20:28:56 +01:00
fada1ad7bb
Deprecate getAABBPool so people can stop using it in mods. Failure to do so will result in 1.7.10 upgrade incompatibility. Use getBoundingBox instead.
2014-06-08 21:30:47 -04:00
3084368af3
Tweak bad packet warning some. Makes it a bit more log friendly.
2014-06-08 14:35:16 -04:00
8e64a82423
Fix REPLY handling in SimpleNetworkWrapper. Closes #440
2014-06-05 14:31:44 -04:00
b861e95b17
Added config GUI system
2014-06-04 17:36:47 -04:00
c27f4b34f8
Merge branch 'master' into mc179
2014-06-03 13:04:49 -04:00
8883803260
Nullcheck the dispatchers on players. Should stop some crashes when spamming connectivity.
2014-06-02 22:12:13 -04:00
Lex Manos