diesieben07
9662b5a657
Added hook for custom PotionEffect rendering in the inventory
2014-06-30 02:06:39 +02:00
cpw
5217f6f8bb
MinecraftForge/FML@db219fb287 API is now able to "provide" and "own" itself. Useful for libraries without a Mod in them. To go along with this, you can now require an API, with a version, in your mod dependency string
2014-06-26 22:18:41 -04:00
cpw
3b648d826f
Merge pull request #1183 from bspkrs/master
...
fixed dupe quotes issue with category names that require quotes when save is called more than once
2014-06-26 16:34:12 -04:00
bspkrs
f8be9a237c
fixed compounding quotes issue with category names that require quotes when save is called more than once
2014-06-26 16:31:27 -04:00
cpw
ebf0e7617a
Update to MC 1.7.10, bump to 10.13.0
...
MinecraftForge/FML@bc420dcb0b Fix Eclipse launching attribute
MinecraftForge/FML@1e0134a1ca Merge pull request #455 from rumickon/feature
MinecraftForge/FML@1c5db211af Update for release 1.7.10
MinecraftForge/FML@79a0c5e559 Merge branch 'mc179'
2014-06-26 15:07:51 -04:00
cpw
f1c7a2c134
Merge branch 'prerelease'
2014-06-26 14:57:33 -04:00
cpw
32e577d5bf
Fix API incompatibilities. Should mean mods will work with new config changes.
2014-06-26 14:45:43 -04:00
LexManos
2d7f22ade8
Merge pull request #1180 from luacs1998/patch-2
...
Update mc version string
2014-06-25 18:49:10 -07:00
luacs1998
23c6d0ef55
Update mc version string
...
Or was I not supposed to?
2014-06-26 09:03:22 +08:00
cpw
6998e76d3f
Fix API incompatibilities. Should mean mods will work with new config changes.
2014-06-25 20:47:33 -04:00
cpw
af23e296f2
Fix mcp release number
2014-06-25 20:19:38 -04:00
cpw
fcd13f5e71
Merge branch 'master' into prerelease
2014-06-25 20:18:42 -04:00
cpw
bcda92e941
Merge branch 'bspkrsgui'
2014-06-25 20:16:20 -04:00
cpw
013c0b0feb
MinecraftForge/FML@701d98eafa Added config GUI system
...
MinecraftForge/FML@50164db5c1 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
MinecraftForge/FML@7eb36a1481 Merge branch 'bspkrsgui'
2014-06-25 20:15:08 -04:00
cpw
24c05a73ce
Merge branch 'master' of github.com:bspkrs/MinecraftForge into bspkrsgui
...
Conflicts:
src/main/resources/assets/forge/lang/en_US.lang
2014-06-25 20:13:36 -04:00
cpw
ced81b5c93
Clean patch cruft.
2014-06-25 20:09:42 -04:00
cpw
c7f9d5a529
Fix new method with Side.CLIENT when it shouldn't have it. Closes a bunch of reports of problems.
2014-06-25 18:59:14 -04:00
cpw
cbc873bc8b
MinecraftForge/FML@701d98eafa Added config GUI system
...
MinecraftForge/FML@50164db5c1 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui
MinecraftForge/FML@7eb36a1481 Merge branch 'bspkrsgui'
MinecraftForge/FML@96a7e14a45 Merge branch 'master' into mc179
MinecraftForge/FML@f45f18b1d7 Fix accessing guava from transformers
MinecraftForge/FML@8f7adced47 Fix library issue. mojang auth requests newer libs, so we get them at dev time. But the mojang json doesn't refer them at runtime. So there's a lib mismatch. Fortunately all are available at mojang, so we can update the json.
2014-06-25 18:31:02 -04:00
cpw
c8b3719810
MinecraftForge/FML@5d6dc5dce3 Fix up other exit points. Should stop process hangs for clean exits.
...
MinecraftForge/FML@8a240ec3c7 Merge branch 'master' into mc179
MinecraftForge/FML@0cd5ef6bb7 Fix NPE when no FMLAT is defined
2014-06-25 09:15:37 -04:00
cpw
4c26057a4e
MinecraftForge/FML@5d6dc5dce3 Fix up other exit points. Should stop process hangs for clean exits.
2014-06-24 22:16:39 -04:00
cpw
0bbee11b3c
MinecraftForge/FML@e152984538 Add support for mod access transformers without a coremod requirement. Use the "FMLAT" manifest attribute, with a space separate list of files that live in the 'META-INF' directory. They should conform to standard AT formatting.
2014-06-24 22:05:38 -04:00
cpw
729d8fb721
MinecraftForge/FML@06ab104c9a Force the descriptors to the right type for the field they're referencing. Fixes the sand issue
2014-06-24 18:35:48 -04:00
Lex Manos
7ba54ffd48
Fix flower pots not droping the items that are inside them.
2014-06-23 22:06:52 -07:00
Lex Manos
256d865db6
Update to 1.7.10-pre4.
2014-06-23 21:55:16 -07:00
Christian
1275aa732e
Null check the Item in the supplied stack as well as the stack itself.
2014-06-22 14:47:24 -04:00
Christian
4778c33902
And fix firing for single player loading.
2014-06-22 14:39:23 -04:00
Christian
127605ec3e
Fix derpity derp.
2014-06-22 10:11:32 -04:00
Christian
f7736e9a0a
Fire an event when a player loads or saves from disk. Mods that want to load an additional
...
player related file from the players dir can now do so in that event.
2014-06-21 17:38:21 -04:00
Christian
ea7c11baf4
Some patch offsets
...
MinecraftForge/FML@7219061b05 Also patch in warnings for Vec3Pool - similarly removed.
MinecraftForge/FML@dff2204558 FML now sets a security manager (FINALLY!). It's primary purpose at this point is to catch rogue calls to System.exit so that they can cause a proper crash report, rather than silently abandoning the game.
2014-06-21 17:34:52 -04:00
LexManos
755dd9b954
Merge pull request #1164 from lumien231/Fix-DimensionCrash
...
Fixes a server crash caused by a player joining that is in a non existen...
2014-06-20 17:31:45 -07:00
Lumien
a21ad8fa9d
Fixes a server crash caused by a player joining that is in a non existent dimension
2014-06-20 11:18:23 +02:00
LexManos
9701e944c2
Merge pull request #1162 from Thog92/1.7-biome
...
Add missing 1.7 biomes to BiomeDictionary
2014-06-19 11:26:38 -07:00
Thog92
a905fe578b
Add missing 1.7 biomes to BiomeDictionary
2014-06-19 19:06:27 +02:00
LexManos
5ac6f2289b
Merge pull request #1155 from Zarathul/master
...
Added soft return for modders passing invalid negative ids to OreDictionary.getOreName. Warning: WILL Error in 1.8+
2014-06-16 19:49:13 -07:00
Zarathul
e68cfa9f72
Fixed ArrayIndexOutOfBoundsException in getOreName
...
Added sanity check to prevent ArrayIndexOutOfBoundsException in getOreName for negative ids.
2014-06-16 23:00:40 +02:00
Lex Manos
bb15efd037
Fixed vines generation for hanging off of trees.
2014-06-15 11:59:11 -07:00
LexManos
7d700c9ad2
Merge pull request #1147 from bloodmc/chunkasync
...
Don't call ChunkDataEvent.Load async
2014-06-12 23:10:30 -07:00
bloodshot
61a6b67d51
Don't call ChunkDataEvent.Load async
...
ChunkDataEvent.Load must be called after TE's are loaded since this is
what mods expect. The event is handled by ChunkIOProvider during
callStage2.
2014-06-13 00:52:13 -04:00
LexManos
96286b77f9
Merge pull request #938 from bloodmc/chunkasync
...
Load chunks asynchronously for players.
2014-06-12 17:43:28 -07:00
LexManos
7b6b88b002
Merge pull request #1125 from alucas/addmissingjumpevent
...
Add missing onLivingJump calls
2014-06-12 16:20:03 -07:00
Lex Manos
1b7190c50b
Pop version for new Recomended build.
2014-06-12 15:16:56 -07:00
Travis Watkins
e6bbcf6a3d
Load chunks asynchronously for players.
...
When a player triggers a chunk load via walking around or teleporting
there is no need to stop everything and get this chunk on the main thread.
The client is used to having to wait some time for this chunk and the
server doesn't immediately do anything with it except send it to the
player. At the same time chunk loading is the last major source of file IO
that still runs on the main thread.
These two facts make it possible to offload chunks loaded for this reason
to another thread. However, not all parts of chunk loading can happen off
the main thread. For this we use the new AsynchronousExecutor system to
split chunk loading in to three pieces. The first is loading data from
disk, decompressing it, and parsing it in to an NBT structure. The second
piece is creating entities and tile entities in the chunk and adding them
to the world, this is still done on the main thread. The third piece is
informing everyone who requested a chunk load that the load is finished.
For this we register callbacks and then run them on the main thread once
the previous two stages are finished.
There are still cases where a chunk is needed immediately and these will
still trigger chunk loading entirely on the main thread. The most obvious
case is plugins using the API to request a chunk load. We also must load
the chunk immediately when something in the world tries to access it. In
these cases we ignore any possibly pending or in progress chunk loading
that is happening asynchronously as we will have the chunk loaded by the
time they are finished.
The hope is that overall this system will result in less CPU time and
pauses due to blocking file IO on the main thread thus giving more
consistent performance. Testing so far has shown that this also speeds up
chunk loading client side although some of this is likely to be because
we are sending less chunks at once for the client to process.
Thanks for ammaraskar for help with the implementation of this feature.
This commit is based off the following :
Bukkit/CraftBukkit@b8fc6ab2c1
Bukkit/CraftBukkit@85f5776df2
Bukkit/CraftBukkit@0714971ca2
Bukkit/CraftBukkit@7f49722f45
Bukkit/CraftBukkit@53ad0cf1ab
2014-06-12 16:51:17 -04:00
Christian
b12e0bff2a
MinecraftForge/FML@1a99ec7db6 Deprecate getAABBPool so people can stop using it in mods. Failure to do so will result in 1.7.10 upgrade incompatibility. Use getBoundingBox instead.
2014-06-12 14:45:25 -04:00
Christian
aaccbb8247
Warn when chunks are being self-recursively loaded. This can cause serious issues. Modders should watch out.
2014-06-12 14:45:25 -04:00
LexManos
c45ed6f6d8
Changed dustLapis to gemLapis to make OM SHUT THE HELL UP.
2014-06-11 22:43:15 -07:00
Lex Manos
dd5b51aac1
Fixed missed metadata offset, and now cache return values of getOres for speed.
2014-06-11 10:27:28 -07:00
Antoine
27d9edac67
Add missing onLivingJump calls
2014-06-11 13:37:36 +02:00
LexManos
a08357a845
Merge pull request #1126 from Cojomax99/fog_customization
...
World fog color and density can now be controlled through an event
2014-06-11 00:57:33 -07:00
Cojomax99
9a3bc1fff5
World fog color and density can now be controlled through an event
2014-06-11 10:54:54 +03:00
LexManos
4ae1abd7d4
Merge pull request #1134 from diesieben07/ender-teleport
...
Fix EnderTeleportEvent for Ender Pearls.
2014-06-10 18:49:32 -07:00
