keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
1743 commits 1 branch 2 tags 103 MiB
Commit graph

337 commits

Author SHA1 Message Date
Arkan Emberwalker
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
Lex Manos
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
Lex Manos
79ca5bbf86 Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. 2015-04-07 19:36:20 -07:00
GotoLink
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
cpw
9d1f554075 Merge remote-tracking branch 'origin/1.7.10' 2015-04-01 17:17:24 -04:00
cpw
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
45ec6e0833 OK, this is finally actually working, I think... 2015-04-01 15:56:48 -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
cpw
8309a32ad2 Forgot the register handling bit. Registration should work now.. 2015-03-31 13:38:30 -04:00
diesieben07
8f5bb75ef2 Fix scala mods, Closes #621 2015-03-28 16:00:50 +01:00
Lex Manos
ddcc6a1aa4 Enhance output of common FML errors in crash reports and server GUI. 2015-03-27 01:40:23 -07:00
Lex Manos
68c3a85fef Enhance output of common FML errors in crash reports and server GUI. 2015-03-27 01:17:57 -07:00
Matthew Messinger
8da78750aa Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560 2015-03-23 22:58:02 -04: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
diesieben07
961570f253 Fix ModDiscoverer ignoring inner classes. 2015-03-21 19:15:26 +01: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
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
LexManos
5ac394de0e Merge pull request #614 from tterrag1098/betterModList 
Improve mod list GUI, adds sort buttons and a search bar
 2015-03-16 10:01:12 -07:00
cpw
d81fd22792 First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items. 
It probably doesn't work yet though.
 2015-03-15 16:22:28 -04:00
cpw
278612ad98 Try and improve performance of the registry by avoiding superType.cast. 2015-03-14 15:32:34 -04:00
tterrag1098
a27e7e03dd Improve mod list GUI, add sort and search 2015-03-13 18:38:10 -04:00
Lex Manos
418b7794d2 Fix Debug packet logger on local memory connections. 2015-03-04 21:00:31 -08:00
LexManos
7223e1a7d9 Merge pull request #609 from Zot201/1.8 
Add transformer to allow protected/private classes to use the event bus.
 2015-03-04 09:49:25 -08:00
Zot201
ccffcf60f8 Fix Event Bus Access Issues 
1) Allow overriding methods in subclass without extra SubscribeEvent annotations
2) Transform event subscribers to have public method/class
 2015-03-01 15:37:47 +09:00
Lex Manos
9335e2907b Fix NPEs in mlast commit. 2015-02-21 19:48:48 -08:00
Lex Manos
7269d22449 New @Mod properties to define which environment to load the mod on. 
clientSideOnly will only be loaded in the Client environment.
serverSideOnly will only be loaded in the Dedicated server environment.
Combine with acceptedMinecraftVersions to prevent users from loading the mod in the incorrect environment.
 2015-02-21 18:33:30 -08:00
Lex Manos
0281b74c7c Fix double decoding of UTF8 characters in lang files. 2015-02-21 17:27:21 -08:00
Lex Manos
0a8a535e2c Quiet ClassPatchManager debug spam by default. Reenable using -Dfml.debugClassPatchManager=true. 2015-02-15 17:30:56 -08:00
Lex Manos
d14ad7dd9a Filter more known libraries from potential mod canidates. 2015-02-15 17:30:18 -08:00
RainWarrior
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
diesieben07
1a2c521b63 Handle empty lines in language files gracefully 2015-02-13 15:34:54 +01:00
Fry
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
RainWarrior
a4e70e44e1 Added blaming of coremods and mods not targetting Java 6 2015-02-13 08:07:27 +03:00
Lex Manos
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
Lex Manos
79b5c28d38 Merge remote-tracking branch 'origin/1.8' 2015-01-31 18:33:32 -08: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
LexManos
9a2c4998ae Merge pull request #591 from Minecrell/patch-1 
Exclude only log4j2 queue from class loader
 2015-01-18 14:46:18 -08:00
LexManos
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
Minecrell
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
HEmile
a7ff70eaa4 Fixed getEffectiveSide() for Netty Server threads 2014-12-23 20:26:37 +01:00
Lex Manos
2096bcb5ab Finish removing marker in mapping entry names. FMLMissingMappingsEvent/FMLModIdMappingEvent should fire with correct names now. 2014-12-15 06:57:59 -08:00
Lex Manos
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
Lumien
6f19fd1513 Save the mod list of players in their NetworkDispatcher (Make it accessable for mods) 2014-12-06 16:31:58 +01:00
Lex Manos
5b07c7fead Update Dev mcp mappings to 11-30 snapshot. 2014-12-01 18:28:18 -08:00