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

1754 commits

This branch
This branch
All branches
Author SHA1 Message Date
LexManos
4e8d5255ed Merge pull request #652 from AbrarSyed/patch-2 
remapped parameters and added ending newlines
 2015-04-29 14:45:59 -07:00
AbrarSyed
8e14f9e1cc remapped parameters and added ending newlines 2015-04-29 13:37:09 -05:00
LexManos
1aacf9cfe2 Merge pull request #649 from luacs1998/master 
Add classloader exclusion for ASM
 2015-04-27 15:29:34 -07:00
luacs1998
0c933be8dd Add classloader exclusion for ASM 2015-04-26 20:40:22 +08:00
LexManos
68def9c352 Merge pull request #647 from AbrarSyed/patch-1 
Fixed scala module libs in dev json
 2015-04-23 18:55:27 -07:00
AbrarSyed
99c60ee156 fixed scala module libs in jsons 2015-04-23 20:54:14 -05:00
Lex Manos
c5f22f56d8 Dissallow color codes in mod names displayed in Mod gui list. And code formatting. 2015-04-13 21:52:53 -07:00
LexManos
5a5ef86da9 Merge pull request #636 from tterrag1098/betterModList 
Fix control codes being used for mod list sort. Clean up sorting code.
 2015-04-13 17:13:52 -07:00
tterrag1098
3fbd6b0810 Fix control codes being used for mod list sort. Clean up sorting code and fix a bug with right click clearing. 2015-04-12 00:51:03 -04:00
Arkan Emberwalker
6cdde0f9e4 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:13:25 -04:00
cpw
1fa358ccee Some tidyup of the PR 2015-04-11 18:02:00 -04:00
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
LexManos
6d71b05838 Merge pull request #627 from GotoLink/patch-1 
Stop IllegalFormatConversionException thrown
 2015-04-02 13:32:56 -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
LexManos
8ce395ea4e Merge pull request #622 from diesieben07/scala-fix 
Fix scala mods, Closes #621
 2015-03-28 11:23:59 -07: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
LexManos
b1f18107e6 Merge pull request #620 from killjoy1221/extra-coremod-fix 
Fixed typo causing coremods to be missed in certain situations.
 2015-03-24 05:13:45 -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
LexManos
3bb9c6a92c Merge pull request #617 from diesieben07/innerclass-disc 
Fix ModDiscoverer ignoring inner classes.
 2015-03-21 13:15:43 -07: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
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
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
4d4f82816f Merge pull request #610 from Zot201/1.8 
Fixed WorldInfo properties not loaded
 2015-03-04 10:34:25 -08:00
Zot201
189619fcdd Fixed WorldInfo properties not loaded 2015-03-05 03:21:19 +09: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