Commit Graph

  • 6049d371f3 MinecraftForge/FML@ce791cb1f2 Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors. MinecraftForge/FML@852710962a Clean up some dead code cpw 2015-04-10 22:46:53 -04:00
  • 994f722843 Clean up some dead code cpw 2015-04-10 22:34:06 -04:00
  • 4be96044d0 Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors. Lex Manos 2015-04-10 03:28:41 -07:00
  • 6d3494a853 Merge pull request #1791 from KingLemming/1.7.10-fluid KingLemming 2015-04-10 20:11:17 -04:00
  • 37d63b3fe9 Adds a warning to the FluidContainerRegistry when a mod does something stupid! Also denies the registration. King Lemming 2015-04-10 20:09:58 -04:00
  • 291c57b624 Merge pull request #1789 from KingLemming/1.7.10-fluid KingLemming 2015-04-10 16:41:29 -04:00
  • 186f92479d Fixes FluidContainerRegistry properly - no more corner case where client/server mods disagree. King Lemming 2015-04-10 16:38:45 -04:00
  • 7e9dfb1a11 Merge pull request #4 from MinecraftForge/1.7.10 KingLemming 2015-04-10 16:24:33 -04:00
  • 07e14a9fa4 MinecraftForge/FML@4a753227ad Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors. Lex Manos 2015-04-10 03:36:51 -07:00
  • aeb4b03bf4 Rework EventSubscriptionTransformer to bake @Cancelable and @HasResult values, should increase EventBus performance even more by removing logic from Event constructors. Lex Manos 2015-04-10 03:28:41 -07:00
  • 806b4a3bdf Merge pull request #1784 from KingLemming/1.7.10-fluid KingLemming 2015-04-09 17:45:09 -04:00
  • 433b7ca589 Fixes #1782 King Lemming 2015-04-09 17:28:20 -04:00
  • 78db5732ca Merge pull request #2 from MinecraftForge/1.7.10 KingLemming 2015-04-09 16:56:04 -04:00
  • c11952714c Merge pull request #1752 from AbrarSyed/patch1 LexManos 2015-04-09 12:11:32 -07:00
  • dfd42ab573 Player sensitive version of Block.getPickBlock Timothy Tomkins 2015-04-09 02:09:58 -04:00
  • 24802143eb Merge pull request #1775 from Prototik/patch-1 LexManos 2015-04-08 09:25:01 -07:00
  • a42cf1ae37 Fix FluidRegsitry.registerFluid Sergey Shatunov 2015-04-08 17:26:40 +06:00
  • 2f5b5f5ffe Updated FML: MinecraftForge/FML@c8160311d5 Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only MinecraftForge/FML@9a894952af Merge pull request #627 from GotoLink/patch-1 MinecraftForge/FML@40faac6452 Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. Lex Manos 2015-04-07 20:12:19 -07:00
  • 02ebc9ca21 Restore binary compatibility issues in FluidRegistry caused by recent changes. Lex Manos 2015-04-07 20:06:55 -07:00
  • 1fd39578b0 MinecraftForge/FML@31cf2a9cab Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. Lex Manos 2015-04-07 20:06:01 -07:00
  • 79ca5bbf86 Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. Lex Manos 2015-04-07 19:36:20 -07:00
  • f6c50cc3af Remove J7 only constructor in EnhancedRuntimeException, J6 compiling compatibility restored. Lex Manos 2015-04-07 19:32:25 -07:00
  • 1eb535f14f Copy fortress.dat from vanilla location Irtimaled 2015-04-07 14:40:17 +01:00
  • 4f0e2fb9c4 You shouldn't be creating FluidStacks from unregistered Fluids. Warn clearly on failed registrations, and make a useful log message for failed fluidstack creations. Should help a lot with tracking down broken mods that are doing this wrongly. cpw 2015-04-05 22:37:40 -04:00
  • f7395f517b Allow for duplicate Fluid Blocks. It's annoying to be sure but just as with the OreDictionary, we'll have to handle it. King Lemming 2015-04-05 19:39:15 -04:00
  • defaddecec Fix formatting cpw 2015-04-05 16:13:17 -04:00
  • 7506a5b7ad Add in a fluidid transformer cpw 2015-04-05 15:28:27 -04:00
  • 3fc40b955a Removed fluidID from ItemStack. King Lemming 2015-03-25 01:27:15 -04:00
  • cf7122ed59 Merge pull request #1771 from iChun/master LexManos 2015-04-04 14:31:43 -07:00
  • b2f1b036de Readded but deprecated the old RenderPlayerEvent that were deleted. Sorry, Lex. iChun 2015-04-04 22:30:23 +01:00
  • e0bc6fc65c Merge pull request #1770 from iChun/master LexManos 2015-04-03 21:14:46 -07:00
  • 8c35bc1dc7 Reimplement RenderPlayerEvent that was removed in the port to 1.8 from 1.7.10. RenderPlayerEvent.Specials was removed because the special effects are done in the LayerRenderer now. iChun 2015-04-03 21:11:43 +01:00
  • 38b9febfe5 Forge really should have always supported the concept of an "exact spawn". Individual world providers can still change this behaviour of course, but for default maps it makes sense to support it as a config option. cpw 2015-04-03 10:31:25 -04:00
  • e837b2e2cd MinecraftForge/FML@12ccf9cf49 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. MinecraftForge/FML@e8cd368da3 It's an IllegalState not an IllegalArgument *sigh* MinecraftForge/FML@2be9c74342 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 MinecraftForge/FML@7d8804cf65 You can't setAction to BLOCKONLY MinecraftForge/FML@c73861efe6 Cherry-pick 01aaa7dc97480b381ca0d192ec65016d7baeb747 Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560 MinecraftForge/FML@94c45b48c1 Fix json cache crash, handle the file much more cleanly. Probably an MC JIRA since it's a vanilla bug. Closes #619 cpw 2015-04-03 10:26:17 -04:00
  • 6d71b05838 Merge pull request #627 from GotoLink/patch-1 LexManos 2015-04-02 13:32:56 -07:00
  • 38cdbc16e2 Fix json cache crash, handle the file much more cleanly. Probably an MC JIRA since it's a vanilla bug. Closes #619 cpw 2015-04-02 13:07:40 -04:00
  • 5071e76881 Stop IllegalFormatConversionException thrown if @Mod has flagged client-only or server-only GotoLink 2015-04-02 18:33:19 +02:00
  • ee414b2037 Cherry-pick 01aaa7dc97480b381ca0d192ec65016d7baeb747 Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560 Matthew Messinger 2015-04-01 19:51:44 -04:00
  • 01000f9d34 Update FML - merge the 1.7.10 changes in to forge @ 1.8. Wow git is (sorta) AWESOME! cpw 2015-04-01 17:50:55 -04:00
  • 8fe5d26e94 Merge remote-tracking branch 'origin/1.7.10' cpw 2015-04-01 17:43:25 -04:00
  • 9d1f554075 Merge remote-tracking branch 'origin/1.7.10' cpw 2015-04-01 17:17:24 -04:00
  • c3559b2dbd Pull in a lot of the FML tweaks from 1.7 to 1.8 cpw 2015-04-01 17:06:12 -04:00
  • 0a61ffb57e MinecraftForge/FML@2afd55ab82 Fix scala mods, Closes #621 MinecraftForge/FML@c541b08ef6 Merge pull request #622 from diesieben07/scala-fix MinecraftForge/FML@d5021417dd Forgot the register handling bit. Registration should work now.. MinecraftForge/FML@5a65c65686 OK, this is finally actually working, I think... cpw 2015-04-01 16:08:42 -04:00
  • 45ec6e0833 OK, this is finally actually working, I think... cpw 2015-04-01 15:56:48 -04:00
  • 46b1b82f13 Fixed mipmapping not being enabled by expanding 1x1 texture RainWarrior 2015-04-01 16:06:03 +03:00
  • e1c83de490 Comment on previous commit fix - it worked. Thanks to skyboy and tterrag for investigating and verifying. A chest as an acheivement icon will recreate the original problem, for note. cpw 2015-04-01 07:13:14 -04:00
  • 1b7ce7592c Experimental "fix" for the weird rendering in the Acheivements screen. Thanks skyboy for spotting this. cpw 2015-03-31 20:50:16 -04:00
  • 0d79aa1e0a You can't setAction to BLOCKONLY cpw 2015-03-31 15:38:53 -04:00
  • 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 cpw 2015-03-31 15:29:51 -04:00
  • 0b8ff5890a It's an IllegalState not an IllegalArgument *sigh* cpw 2015-03-31 15:11:39 -04:00
  • 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. cpw 2015-03-31 15:03:18 -04:00
  • 8309a32ad2 Forgot the register handling bit. Registration should work now.. cpw 2015-03-31 13:38:30 -04:00
  • 8ce395ea4e Merge pull request #622 from diesieben07/scala-fix LexManos 2015-03-28 11:23:59 -07:00
  • 8f5bb75ef2 Fix scala mods, Closes #621 diesieben07 2015-03-28 16:00:50 +01:00
  • 0f162ddc6a Updated FML: MinecraftForge/FML@2a268cd566 Improve mod list GUI, add sort and search MinecraftForge/FML@951fc2d9fd First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items. MinecraftForge/FML@410582222d Merge pull request #614 from tterrag1098/betterModList MinecraftForge/FML@ba0b176430 Fix ModDiscoverer ignoring inner classes. MinecraftForge/FML@9cc313eab9 Merge pull request #617 from diesieben07/innerclass-disc MinecraftForge/FML@01aaa7dc97 Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560 MinecraftForge/FML@8cecc47b85 Merge pull request #620 from killjoy1221/extra-coremod-fix MinecraftForge/FML@38d9a5f444 Enhance output of common FML errors in crash reports and server Lex Manos 2015-03-27 03:03:31 -07:00
  • 9e7e9e5cbf MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI. Force load anonymous minecraft classes used in crash reports. This prevents some crashes being hiddedn behind class definiton exceptions. Lex Manos 2015-03-27 02:54:55 -07:00
  • ddcc6a1aa4 Enhance output of common FML errors in crash reports and server GUI. Lex Manos 2015-03-27 01:40:23 -07:00
  • 68c3a85fef Enhance output of common FML errors in crash reports and server GUI. Lex Manos 2015-03-27 01:17:57 -07:00
  • b1f18107e6 Merge pull request #620 from killjoy1221/extra-coremod-fix LexManos 2015-03-24 05:13:45 -07:00
  • 8da78750aa Fix mods defined via --mods or --modListFile launch args not being searched for coremods. #560 Matthew Messinger 2015-03-23 22:58:02 -04:00
  • ce10d0dfd0 MinecraftForge/FML@4ca6f6e19f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise. MinecraftForge/FML@6f6cec96be Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever. MinecraftForge/FML@13ac015f0c 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. cpw 2015-03-22 13:07:06 -04:00
  • 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. cpw 2015-03-22 12:54:34 -04:00
  • 2451e49df2 Substitutions need to be activated when they're registered, otherwise they won't appear in world, ever. cpw 2015-03-22 12:54:05 -04:00
  • 3df54d3d0f What a dumb oversight. One needs to copy the active substitution set to the active gamedata. Doesn't work well otherwise. cpw 2015-03-22 12:03:37 -04:00
  • 3bb9c6a92c Merge pull request #617 from diesieben07/innerclass-disc LexManos 2015-03-21 13:15:43 -07:00
  • 8d09b39d80 Merge pull request #1755 from simon816/custom-tileentity-data LexManos 2015-03-21 13:10:43 -07:00
  • 961570f253 Fix ModDiscoverer ignoring inner classes. diesieben07 2015-03-21 19:15:26 +01:00
  • 301088acdc Add getTileData() to TileEntity simon816 2015-03-21 01:23:55 +00:00
  • c9fd2b6173 MinecraftForge/FML@6b0ae369eb Try and improve performance of the registry by avoiding superType.cast. MinecraftForge/FML@dfebcafd49 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. MinecraftForge/FML@6011419fa0 Clean up my patch. Terrible person I am.. MinecraftForge/FML@c6bbd0e82d Forgot that I need a noarg ctor. I'm so rusty. MinecraftForge/FML@6edc1635de Need to load the dimension from disk - do it without filling out the player so that the normal player loading (including events) works properly cpw 2015-03-20 14:40:47 -04:00
  • 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 cpw 2015-03-20 15:55:16 -04:00
  • 613c5edc7d Forgot that I need a noarg ctor. I'm so rusty. cpw 2015-03-20 15:11:12 -04:00
  • a8cbbfcd99 Clean up my patch. Terrible person I am.. cpw 2015-03-20 15:00:19 -04:00
  • 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. cpw 2015-03-20 14:19:54 -04:00
  • 36d6d74e95 Merge pull request #1754 from JamiesWhiteShirt/master LexManos 2015-03-19 13:47:36 -07:00
  • 3b567a92d8 Added newVolume and newPitch to PlaySoundAtEntityEvent. Deprecated ForgeEventFactory.onPlaySoundAt, added replacement ForgeEventFactory.onPlaySoundAtEntity. JamiesWhiteShirt 2015-03-19 12:37:21 +01:00
  • 07c42b89fd changed run configs to GradleStarts AbrarSyed 2015-03-17 23:40:48 -05:00
  • 888bab92c3 Merge pull request #1723 from Geforce132/master LexManos 2015-03-16 10:01:53 -07:00
  • 5ac394de0e Merge pull request #614 from tterrag1098/betterModList LexManos 2015-03-16 10:01:12 -07:00
  • d81fd22792 First attempt at making FMLControlledRegistry something a bit more generic than just blocks/items. cpw 2015-03-15 16:22:28 -04:00
  • 278612ad98 Try and improve performance of the registry by avoiding superType.cast. cpw 2015-03-14 15:32:34 -04:00
  • d2f36d56f1 -Added EntityMountEvent. Geforce132 2015-02-20 20:03:16 -06:00
  • a27e7e03dd Improve mod list GUI, add sort and search tterrag1098 2015-03-13 18:38:10 -04:00
  • 588f4e3350 Merge pull request #1745 from diesieben07/ingamegui-fix LexManos 2015-03-11 15:46:14 -07:00
  • 642003e065 Fix jukebox message being too low with forge diesieben07 2015-03-11 23:25:41 +01:00
  • 5229abc26d Updated FML: MinecraftForge/FML@3e7ae47f8f Fix Event Bus Access Issues MinecraftForge/FML@c8e2a5f377 Fixed WorldInfo properties not loaded MinecraftForge/FML@7f96b2c69a Fix Debug packet logger on local memory connections. Lex Manos 2015-03-04 21:13:15 -08:00
  • 418b7794d2 Fix Debug packet logger on local memory connections. Lex Manos 2015-03-04 21:00:31 -08:00
  • 6244e88f10 Merge pull request #1739 from robin4002/master LexManos 2015-03-04 11:33:06 -08:00
  • af0316ab9b remove translation and add a note for contributors robin4002 2015-03-04 20:21:16 +01:00
  • 4d4f82816f Merge pull request #610 from Zot201/1.8 LexManos 2015-03-04 10:34:25 -08:00
  • 189619fcdd Fixed WorldInfo properties not loaded Zot201 2015-03-05 03:21:19 +09:00
  • 7223e1a7d9 Merge pull request #609 from Zot201/1.8 LexManos 2015-03-04 09:49:25 -08:00
  • d93e8bcf48 Merge pull request #1733 from Zot201/enchantment-fix LexManos 2015-03-02 12:10:12 -08:00
  • ecca5720c8 Fixed enchanting table applying secondary enchs. Zot201 2015-03-02 17:00:38 +09:00
  • 7355bdf600 Merge pull request #1721 from me4502/update-event LexManos 2015-02-28 22:54:48 -08:00
  • c21e38cd3b Add NeighborNotiftyEvent. Me4502 2015-03-01 16:53:32 +10:00
  • ccffcf60f8 Fix Event Bus Access Issues Zot201 2014-11-27 16:02:30 +09:00
  • 1af0734f51 Fix compile error in ClientHax's PR. Lex Manos 2015-02-26 23:20:43 -08:00
  • d82e80b2cf Merge pull request #1729 from clienthax/master LexManos 2015-02-26 22:16:22 -08:00
  • 848dee14d2 Current spawner implementation checks the EntitySpawnPlacementRegistry hashmap to check where a entity should spawn as there is no way to modify this without the use of reflection or a AT, you can not specify where you want your entity to spawn adding this helper method will allow developers to specify where they want their entity to spawn. clienthax 2015-02-25 19:22:55 +00:00
  • 31e1aae91a Merge pull request #1730 from Tmtravlr/master LexManos 2015-02-26 17:34:56 -08:00