fb7b47adb4
Merge pull request #2002 from ganymedes01/master
...
Disallow conflicting furnace recipes
2015-09-09 11:23:08 -07:00
31a3a18ec7
Disallow conflicting furnace recipes
2015-09-02 19:04:57 +01:00
b175d265b9
Much requested temporary hack for items and TESRs. Context: #1582 , #1597 , #1713 , #2058 and others.
2015-09-02 07:35:24 +03:00
d61a55b661
Use already provided profile for the player's own skin
2015-08-31 03:28:59 +01:00
90a88efd8a
Fixed issue where config folder would not be created before SplashProgress tried to read from it.
...
Default macs to disable the new loading screen due to to many macs having issues.
Users can enable it again by editing their config.
Catch and gracefully handle more errors when starting up the Splash Screen.
2015-08-22 18:55:32 -07:00
b211aca5ce
Merge branch 'fg2'
2015-08-20 12:27:20 -07:00
58ab3de7c1
Remove patches
2015-08-20 12:14:02 -07:00
b45fd787f3
Merge pull request #1969 from diesieben07/blockhighlight
...
Re-introduce RenderBlockOverlayEvent
2015-08-05 11:48:53 -07:00
614bbcb0da
FML is no more. FML has ceased to be. FML's expired and gone to meet its maker. FML's a stiff! Bereft of life, FML rests in peace.
2015-08-01 23:51:40 -04:00
7b18eab02d
Fix placing skulls on fence posts. Closes #2055
2015-07-31 15:10:47 -07:00
bd4b3debc3
Merge pull request #1968 from modwizcode/master
...
Fix harvest logic running in addition to shearable logic
2015-07-31 12:57:05 -07:00
5623634f56
Merge pull request #2048 from shadekiller666/UnlistedPropertyValue
...
Fix for ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty preventing block placement.
2015-07-25 15:12:57 -07:00
87bbbfafcc
Fixed a bug with ExtendedBlockStates containing at least one IProperty and one IUnlistedProperty not allowing blocks to be placed.
2015-07-25 14:55:42 -07:00
65123c66a0
Merge pull request #2004 from simon816/sign-nbt-fix
...
Fix placing signs with NBT prompting for text
2015-07-24 13:53:27 -07:00
5eea9cebae
Merge pull request #1983 from clienthax/patch-1
...
Make layer methods public
2015-07-23 12:13:00 -07:00
04d4b2cf76
Make EnumFacing events available server-side
2015-07-23 16:51:45 +02:00
9f571ff15d
Allow the new entity eggs to be created via middle-click
2015-07-16 14:13:48 +02:00
81eb6a8bb4
Fix placing signs with NBT prompting for text
2015-07-08 22:27:17 +01:00
97f8c246b8
Signed-off-by: Clienthax <clienthax@gmail.com>
2015-06-30 22:29:34 +01:00
c4f370a7e6
Custom transformations in forge blockstate json.
2015-06-30 21:37:11 +03:00
637e2c6f56
Merge pull request #1972 from bonii-xx/StateMapDomainFix
...
Fix StateMap always mapping properties to the "minecraft" domain
2015-06-26 04:03:25 -07:00
2bfa1ffc05
Add debug for max texture size and output when Texture Atlas can not stitch all textures.
2015-06-26 03:32:09 -07:00
e55ee43fd5
Fix StateMap always mapping properties to the "minecraft" domain instead of the mods, causing it to not find BlockState definitions.
2015-06-26 10:29:10 +02:00
ebef4553f3
Re-introduce RenderBlockOverlayEvent, seems to have been missed during 1.8 update
2015-06-25 19:09:32 +02:00
fe2c4c569d
Fix harvest logic running in addition to shearable logic
2015-06-24 14:28:47 -05:00
8f65678b99
Vanilla models can now use custom textures. Fixes #1962
2015-06-23 16:52:42 +03:00
bae83e6724
Merge remote-tracking branch 'origin/master'
2015-06-21 22:08:08 -04:00
16ff1be093
Merge branch '1.7.10'
...
Conflicts:
fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch
fml/patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
fml/patches/minecraft/net/minecraft/client/resources/SimpleReloadableResourceManager.java.patch
fml/src/main/java/net/minecraftforge/fml/relauncher/CoreModManager.java
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.java.patch
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
src/main/java/net/minecraftforge/client/model/obj/WavefrontObject.java
2015-06-21 21:59:51 -04:00
8bb34107f1
Merge pull request #1858 from FlansMods/master
...
Hook for Camera Angles, Including Roll
2015-06-21 11:19:26 -07:00
4235ca36ea
Make TextureMap for items and blocks skip the first pass of loading/stitching textures.
...
Should decrease loading times for large packs.
May cause issues with some mods so use -Dfml.skipFirstTextureLoad=false to disable.
2015-06-18 20:13:31 -07:00
ed09a25c65
Patch line number update. Ignore this.
2015-06-18 18:02:22 -07:00
f59b0a2932
Make Item.shouldCauseReequipAnimation is bit more precise and copy over the new item for rendering even if the animation is diabled.
2015-06-17 20:33:35 -07:00
030084f2b3
Add vanilla block rotation support back in for certain blocks that were missed in 1.8 update. Closes #1903
2015-06-17 17:28:18 -07:00
ed8b8bcf8f
Merge pull request #1932 from cheeserolls/patch-1
...
Fix incorrect block position in BlockReed canPlaceBlockAt
2015-06-17 16:48:42 -07:00
1dc7a80d4f
Merge pull request #1506 from mezz/GuiScreenInputEvents
...
Add GuiScreenEvents for keyboard and mouse input
2015-06-17 16:45:41 -07:00
87b55860af
Merge pull request #1781 from ShetiPhian/Block.getPickBlock
...
Player sensitive version of Block.getPickBlock
2015-06-17 16:37:03 -07:00
453ec39496
Add Item.shouldCauseReequipAnimation to allow modders more control over the 'Reequip' animation.
2015-06-17 16:36:41 -07:00
64263a9f8e
Throw more descriptive errors when mods attempt to register invalid global entity IDs.
2015-06-14 17:06:00 -07:00
16be913abc
Fix incorrect block position in BlockReed canPlaceBlockAt
...
block.canSustainPlant is called on the wrong block position. It should be called on the block below (the 'soil' block).
2015-06-12 10:14:22 +01:00
7406e3df9f
Merge pull request #1795 from lumien231/ExperienceEvent
...
Added LivingExperienceDropsEvent to change how much experience an entity drops
2015-06-09 13:23:01 -07:00
8b50f9ab36
Merge pull request #1907 from johnjohn/master
...
Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom ItemMaps
2015-06-09 12:37:33 -07:00
f62ee5c4f5
Merge pull request #1881 from ganymedes01/master
...
Added a brewing recipe registry system
2015-06-09 12:05:40 -07:00
486c0955cf
Added ItemMap type check to item frames and ItemRenderer, enabling vanilla style rendering for custom maps
2015-06-09 12:42:45 -06:00
0373920f99
Added a brewing registry system
2015-06-09 14:01:45 -03:00
1ad05f7f22
Missed patch for sign fix.
2015-06-08 16:23:30 -07:00
15a1d4cf0d
Remove worlds from WorldBorder when unloaded tol prevent memory leak, Closes #1923
2015-06-08 16:19:53 -07:00
1b689802a4
Limit Sign text to 384 json characters and strip control codes. This is 1.8.7's Sign fix. Thanks Searge.
2015-06-08 16:19:02 -07:00
e007f7cf39
Merge pull request #1868 from fuami/ISmartBlockModel_Damage
...
Add Block Breaking Animation for ISmartBlockModels
2015-06-06 03:39:11 +03:00
5cd4564a32
Added Breaking Animation for Smart Models, Checking each layer.
...
Added Layered Smart Render Test.
2015-06-05 19:23:17 -05:00
5064d33519
Mitigate potential issue with users requesting lots of server status information by caching ServerStatus json.
2015-06-03 23:16:25 -07:00
9b53b7e111
Add missing forge patch from 1.8 port
...
https://github.com/MinecraftForge/MinecraftForge/blob/1.7.10/patches/minecraft/net/minecraft/client/Minecraft.java.patch#L88
2015-06-04 01:55:13 +01:00
61f9c5a201
Merge pull request #1885 from LexManos/EnhanvedBlockStateJson
...
Hook BlockState's Json loading to add support for simplified Forge format.
2015-06-02 16:52:06 -07:00
267e1ee62f
Hook BlockState's Json loading to add support for simplified Forge format.
...
See https://github.com/MinecraftForge/MinecraftForge/pull/1885 for more details.
2015-06-02 16:49:56 -07:00
41cae458a4
Merge pull request #1911 from AlgorithmX2/ItemFramesOnSolidSurfaces
...
Allow placing item frames on Solid Block Faces (isSideSolid)
2015-06-01 20:45:28 -07:00
885d7602f9
Allow placing item frames on Solid Block Faces (isSideSolid)
2015-06-01 22:31:55 -05:00
d02636213a
Merge branch '1.7.10' - imports all the fluid fixups and other stuff from 1.7 into 1.8
...
Conflicts:
fml/src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java
fml/src/main/java/net/minecraftforge/fml/common/Loader.java
patches/minecraft/net/minecraft/client/Minecraft.java.patch
patches/minecraft/net/minecraft/client/renderer/texture/TextureMap.java.patch
patches/minecraft/net/minecraft/item/ItemArmor.java.patch
patches/minecraft/net/minecraft/nbt/CompressedStreamTools.java.patch
patches/minecraft/net/minecraft/nbt/NBTTagCompound.java.patch
patches/minecraft/net/minecraft/nbt/NBTTagList.java.patch
patches/minecraft/net/minecraft/world/World.java.patch
patches/minecraft/net/minecraft/world/WorldProvider.java.patch
src/main/java/net/minecraftforge/common/ForgeVersion.java
src/main/java/net/minecraftforge/common/network/ForgeMessage.java
src/main/java/net/minecraftforge/fluids/BlockFluidBase.java
src/main/java/net/minecraftforge/fluids/FluidContainerRegistry.java
src/main/java/net/minecraftforge/fluids/FluidRegistry.java
src/main/java/net/minecraftforge/oredict/OreDictionary.java
2015-06-01 16:29:34 -04:00
f9b1e4e23b
Merge pull request #1892 from AlgorithmX2/vanilla_lighting_bug
...
Fix Vanilla Lighting Bug - Fixes Top/Bottom Faces interpolation.
2015-05-26 19:24:37 -07:00
76f8843017
Fix Partial Face Lighting on Top/Bottom Faces ; Vanilla MC-80148
2015-05-26 19:33:56 -05:00
9fa51447a2
Fixed command exploit with C12
2015-05-25 16:08:42 -07:00
c608e7c04e
Fixes MC-75630 - Exploit with signs and command blocks
2015-05-25 15:28:14 -07:00
df5e594e95
Loosen up ServerChatEvent to support IChatComponent Closes #1893
2015-05-25 13:34:34 -07:00
8d7b999506
Merge pull request #1804 from Prototik/font
...
Add true support for unicode fonts
2015-05-21 10:43:22 -07:00
2798fc4e49
Add true support for unicode fonts
2015-05-21 20:14:56 +07:00
306af4feee
Added CameraSetup sub-event for camera angles
...
Allows players to alter yaw and pitch of renderViewEntity, but more importantly, adds the ability to roll the view.
Added camera roll hook
2015-05-19 16:14:44 +01:00
58fdfb6fa1
Fix patches after last fml merge.
2015-05-14 13:56:10 -04:00
b756bd5f9a
Added hook for IPerspectiveAwareModel in RenderItem.renderItemIntoGUI for ItemCameraTransforms.TransformType.GUI
2015-05-05 02:23:38 +02:00
a003d1b360
Merge pull request #1843 from Zaggy1024/getlightvaluefix
...
Make World.setBlockState check whether the light value from getLightValue(IBlockAccess, BlockPos) has changed.
2015-05-01 17:58:30 -07:00
ee003ef77e
Fixed a bug which caused the light level not to update when a block implements Block.getLightValue(IBlockAccess, BlockPos) to change the light value for different block states.
2015-05-01 17:10:08 -05:00
c6525cb3f3
Merge pull request #1832 from Parker8283/lhsf-1.8
...
[1.8] Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 17:21:30 -07:00
9a7c20e791
Fixes MC-52974: Host's skin doesn't load in LAN
2015-04-25 19:58:24 -04:00
2589a0d1f6
Removed @SideOnly(Side.CLIENT) from EnumWorldBlockLayer.
2015-04-25 18:45:49 -05:00
55cbba0764
MinecraftForge/FML@36688e781a Add in resource reloading to the bar. Tidy up some of the labels a bit.
...
MinecraftForge/FML@a1dc465a55 More progress bar action!
MinecraftForge/FML@bfcbf4ef43 More progress bar hooks
MinecraftForge/FML@a6670c415e Thread errors should be correctly displayed in the crash report now
MinecraftForge/FML@9a16d26186 fixed bar text positioning
MinecraftForge/FML@0059c63028 Track mipmaps and texture upload
MinecraftForge/FML@ef5f809752 Fix broken log message in vanilla.
2015-04-24 19:16:55 -04:00
591971936d
Cleanup RenderEntityItem patch, fixes Z-fighting issue in EntityItems. Closes #1824
2015-04-23 23:46:55 -07:00
ea9d805e4f
Extracted the creation of RegionRenderCache into a method.
...
Classes extending RegionRenderCache can change the behavior of the cache, allowing to visually change blocks (schematics etc).
2015-04-22 15:40:07 +02:00
7e9d2fb509
Reformat ItemArmor$ArmorMaterial.getBaseItem to use an if/then/else structure. The switch
...
causes the generation of an internal class which may derp custom armor addition.
Closes #1799
2015-04-19 12:04:22 -04:00
178acfbb20
Change logging to avoid the String.format bug. Closes #1809
2015-04-19 11:52:23 -04:00
1effc27790
Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker.
...
(cherry picked from commit de066a86da
2015-04-18 21:22:44 -04:00
de066a86da
Fixed NBTSizeTracker missing a lot of data being read. Also made new NBT object allocation claim 32-bits in the size tracker.
2015-04-17 02:07:01 -07:00
81ab4cbc5f
Added LivingExperienceDropsEvent to change the amount of experience an entity drops
2015-04-14 11:58:00 +02:00
eb12936a52
MinecraftForge/FML@0da1263ff9 Enhance error output for bad textures a bit more and try and capture more types of error..
2015-04-11 12:30:20 -04:00
345d905438
MinecraftForge/FML@be5ec06e31 Cleaning up the missing resource stack spam, and condensing the information into a usefully understandable format.
2015-04-11 01:03:50 -04:00
dfd42ab573
Player sensitive version of Block.getPickBlock
...
Block.getPickBlock was patched in 1.7 but was overlooked in 1.8.
Closes: https://github.com/MinecraftForge/MinecraftForge/issues/1709
2015-04-09 02:09:58 -04: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.
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.
2015-04-03 10:31:25 -04:00
01000f9d34
Update FML - merge the 1.7.10 changes in to forge @ 1.8. Wow git is (sorta) AWESOME!
...
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
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.
MinecraftForge/FML@24cb4a42c4 Enhance output of common FML errors in crash reports and server GUI.
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@13df640d9d Pull in a lot of the FML tweaks from 1.7 to 1.8
MinecraftForge/FML@447beaa99e Merge remote-tracking branch 'origin/1.7.10'
2015-04-01 17:50:58 -04:00
8fe5d26e94
Merge remote-tracking branch 'origin/1.7.10'
...
Conflicts:
fml
2015-04-01 17:43:25 -04: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.
2015-04-01 07:13:14 -04:00
1b7ce7592c
Experimental "fix" for the weird rendering in the Acheivements screen. Thanks skyboy for spotting this.
2015-03-31 20:50:16 -04:00
301088acdc
Add getTileData() to TileEntity
...
- The same idea as Entity.getEntityData()
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
2015-03-20 16:12:05 -04:00
3b567a92d8
Added newVolume and newPitch to PlaySoundAtEntityEvent. Deprecated ForgeEventFactory.onPlaySoundAt, added replacement ForgeEventFactory.onPlaySoundAtEntity.
2015-03-19 12:37:21 +01:00
888bab92c3
Merge pull request #1723 from Geforce132/master
...
Add an EntityMountEvent.
2015-03-16 10:01:53 -07:00
d2f36d56f1
-Added EntityMountEvent.
2015-03-13 19:12:16 -05:00
d93e8bcf48
Merge pull request #1733 from Zot201/enchantment-fix
...
Fixed enchanting table applying secondary enchs. Closes #1428
2015-03-02 12:10:12 -08:00
ecca5720c8
Fixed enchanting table applying secondary enchs.
2015-03-02 17:00:38 +09:00
7355bdf600
Merge pull request #1721 from me4502/update-event
...
Added NeighborNotifyEvent fired on server side only, allows for monitoring and disabling world 'physics' updates.
2015-02-28 22:54:48 -08:00
c21e38cd3b
Add NeighborNotiftyEvent.
2015-03-01 16:53:32 +10:00
1af0734f51
Fix compile error in ClientHax's PR.
2015-02-26 23:20:43 -08:00
d82e80b2cf
Merge pull request #1729 from clienthax/master
...
Add method to set entity placement type.
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.
Signed-off-by: Clienthax <clienthax@gmail.com>
Update EntitySpawnPlacementRegistry.java.patch
2015-02-27 03:58:40 +00:00
LexManos