Commit graph

1725 commits

Author SHA1 Message Date
Christian
7549eb90a7 Add a bit of javadoc 2013-09-05 08:22:28 -04:00
Christian
df132a0296 Merge branch 'displayname' of github.com:MachineMuse/MinecraftForge into sometweaks
Conflicts:
	patches/minecraft/net/minecraft/entity/player/EntityPlayer.java.patch
2013-09-05 08:20:49 -04:00
Christian
e499a6d375 Merge branch 'objTessellation' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:58:56 -04:00
Christian
fe5f5e690e Fix patch for new MCP naming. 2013-09-05 07:57:21 -04:00
Christian
21cd975ae3 Merge branch 'mouseevent2' of github.com:MachineMuse/MinecraftForge into sometweaks 2013-09-05 07:47:52 -04:00
Christian
32073a5bc1 Reduce patch size significantly 2013-09-05 07:45:29 -04:00
iChun
6cf8408752 Fix player push out of blocks clientside being hardcoded and not based on entity size.
Added player eyeHeight field to allow changeable eye heights of players rather than being hardcoded per player class as well as add a getDefaultEyeHeight function.
2013-09-05 14:57:34 +08:00
MachineMuse
7a77b61ddd fixed logic error 2013-09-04 15:27:45 -06:00
MachineMuse
ad09526bee inserted hook into Minecraft.java 2013-09-04 15:05:29 -06:00
MachineMuse
e3e3ea54f9 Added mouse event 2013-09-04 15:01:37 -06:00
MachineMuse
cb9c26d49c Memoization of display name result 2013-09-04 14:22:22 -06:00
Christian
cf88896ad7 Update version to 9.10.1 for mcp naming changes. 2013-09-03 18:09:07 -04:00
Christian
0d44234239 Update forge for MCP naming updates
Updated FML:
MinecraftForge/FML@d0c6e92900 Update MCP data
2013-09-03 18:04:12 -04:00
MachineMuse
96c045137d Merge remote-tracking branch 'forge/master' into objTessellation 2013-09-03 15:45:45 -06:00
MachineMuse
0e3037e85d Added display name hook 2013-09-03 14:55:11 -06:00
Christian
5c334d7627 Fix possible NPE in searching code. 2013-09-02 15:44:27 -04:00
Christian
7246914605 Updated FML:
MinecraftForge/FML@2a9c485edc Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server.
2013-09-02 12:24:57 -04:00
Christian
d9b72a2282 Updated FML:
MinecraftForge/FML@a13598b17e Use java 1.6 compatible method of closing the zip file. Stops stupid compile error.
2013-09-02 00:13:23 -04:00
Christian
4eb05ed571 Small fix to container registry. emptyContainer is not null, it's "NULL_EMPTYCONTAINER" now and won't match any valid container. 2013-08-28 22:16:59 -04:00
Christian
5a8def7d00 Tweak the release to add in assets to the distributable. *sigh* 2013-08-28 07:59:45 -04:00
robin
90be31ddc8 create french localization 2013-08-28 13:14:30 +02:00
Christian
dddb9b3189 Add some starting work for a forge tps command. Also update coremod for new FML behaviour 2013-08-27 23:07:30 -04:00
Christian
0c06d3b47a Updated FML:
MinecraftForge/FML@1c9a853868 Allow coremods to properly inject asset readers.
MinecraftForge/FML@40b54013b4 Allow server side lang file injection, hopefully
2013-08-27 23:04:48 -04:00
Michael Hahn
cc96840aa8 capacity was not respected
Updated to properly calculate the amount of free space in the tank
before checking that against the amount of the resource.
2013-08-26 12:21:31 -05:00
jk-5
f78eba09fd Added GuiOpenEvent
You can use this for a clean way to override guis, without needing an
TickHandler to check if the gui you want to override is open and show
your own gui

Proper close check
2013-08-24 09:32:34 +02:00
Christian
b2c1eae652 Updated FML:
MinecraftForge/FML@b993cf4a98 More exception handling for less derpiness.
2013-08-20 21:01:02 -04:00
Christian
8fed427251 In the time honoured tradition of trying to fix vanilla, we today attempt to patch the pathfinding AI so that it doesn't lag when
there's a lot of entities. Basically, if the zombie can't reach the villager, backoff subsequent pathfinding attempts. Hopefully
should really help with lag caused by zombie swarms.
2013-08-20 11:55:57 -04:00
Christian
b2d309b17e Allow multipass RenderItem rendering for terrain icons too. Should fix sengir's saplings. 2013-08-19 16:32:47 -04:00
Christian
8d6f893083 Updated FML:
MinecraftForge/FML@913f6f6d36 Try and use the relaunch log, which should be classloaded..
MinecraftForge/FML@ac065ff5f7 Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent and not dependent on mod ordering, or mod sideeffects.
2013-08-19 15:28:50 -04:00
LexManos
faba7e2a07 Skipp toss event for null entity items. Closes #732 2013-08-19 10:45:57 -07:00
LexManos
baf1e771e9 Cache world on all render passes in case some mod disables the first pass. 2013-08-19 10:45:29 -07:00
LexManos
461a30812b Fix bug with custom Fluids. You can now drown in them! 2013-08-18 23:16:36 -07:00
Christian
4b64c15ae8 Updated FML:
MinecraftForge/FML@9468e41bbf Fix up scala refs, for better results
2013-08-18 19:02:20 -04:00
cpw
3625a409a5 Merge pull request #730 from Soaryn/patch-1
Adds Temperature to Lava
2013-08-17 11:17:34 -07:00
Christian
8533f974e8 Updated FML:
MinecraftForge/FML@ffdd056a18 Check keys, not values *sigh*
2013-08-17 13:28:06 -04:00
Christian
667db45b1d Updated FML:
MinecraftForge/FML@f157e7a6ec And more coremod logging
2013-08-17 13:15:18 -04:00
Christian
bafbac3d51 Updated FML:
MinecraftForge/FML@4a9d0f9bd5 Add in some log information
2013-08-17 13:10:43 -04:00
Christian
92c095412d Updated FML:
MinecraftForge/FML@0398916666 And actually instantiate the collection *sigh*
2013-08-17 12:57:37 -04:00
Christian
ea31a51285 Updated FML:
MinecraftForge/FML@dec9a3924d Add in "FMLCorePluginContainsMod" in the manifest. If this value is present, FML will attempt to parse your mod jar file as a normal mod file as well, instantiating mod containers there.
2013-08-17 12:49:37 -04:00
Christian
8f66346aeb Updated FML:
MinecraftForge/FML@2470120680 Clean up a couple of resources. Also, don't parse jars just because they're in the mods dir
2013-08-17 11:44:06 -04:00
Christian
9741d6348f Updated FML:
MinecraftForge/FML@9a5e24e338 Fix stupid derp is stupid. Closes #275 and means sp614x can do his thing
MinecraftForge/FML@ba90b61607 Make sure we only add args to the argument list if a tweaker hasn't already. Should fix LiteLoader compatibility issue.
2013-08-17 11:13:02 -04:00
Soaryn
8c762223a4 Adds Temperature to Lava
Missing lava temperature. Feel free to change it to any value. 
1300K is the typical max for Magma so wasn't sure what was desired. Regardless, better than the same temp as water at 295K 😄
2013-08-15 19:55:15 -04:00
LexManos
ffd2fbcc84 Fix NPE in enchangint books. 2013-08-13 15:25:09 -07:00
LexManos
b0f4497bbe Fix inverted case, search works now. 2013-08-11 16:01:27 -07:00
LexManos
97f6138cf8 Merge pull request #606 from Shukaro/master
Add stone and cobblestone to ore dictionary
2013-08-10 23:29:01 -07:00
LexManos
f65f042910 Addition: Added isAllowedOnBooks hook to Enchantments Closes #589 2013-08-10 23:23:41 -07:00
LexManos
7ad79b42bc Deprecate Block.addCreativeItems, Kill in 1.6.3+ Closes #655 2013-08-10 23:07:49 -07:00
LexManos
4f172ae9a5 Merge pull request #679 from Chicken-Bones/invchanged
Add onNeighborTileChange callback to block by generalizing func_96440_m ...
2013-08-10 22:53:43 -07:00
LexManos
5fadba7ddc Merge pull request #702 from MrMasochism/master
Added new function for control over dismount underwater
2013-08-10 22:07:02 -07:00
LexManos
ffd4d4afc3 Allow creative tabs to have a search box if they want to Closes #592 2013-08-10 22:04:58 -07:00