Commit Graph
4660 Commits
Author SHA1 Message Date
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 7cafaed696 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:28:50 -04:00
cpw b9db002614 Fix accessing guava from transformers 2014-06-25 17:49:00 -04:00
cpw bb7aa340dc Merge branch 'master' into mc179 2014-06-25 17:03:05 -04:00
cpw 98d6d97c3e Merge branch 'bspkrsgui' 2014-06-25 17:02:40 -04:00
rumickon 0a00d40ba2 Fix Eclipse launching attribute 2014-06-25 23:49:17 +04:00
cpw 25e44a8b32 Merge branch 'master' of github.com:bspkrs/FML into bspkrsgui 2014-06-25 13:09:10 -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 f5d8e85fc5 Fix NPE when no FMLAT is defined 2014-06-25 09:11:07 -04:00
cpw 380027daf0 Merge branch 'master' into mc179
Conflicts:
	src/main/java/cpw/mods/fml/relauncher/FMLSecurityManager.java
2014-06-24 22:18:03 -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 3dbe6ccded Fix up other exit points. Should stop process hangs for clean exits. 2014-06-24 22:15:11 -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 88a411550a 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 21:34:07 -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
cpw 237c28b6cb Force the descriptors to the right type for the field they're referencing. Fixes
the sand issue
2014-06-24 18:34:34 -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 6aae913919 Harden the security manager and make it less spammy. Clean up a bunch of deprecation warnings from guava. 2014-06-21 23:03:41 -04:00
Christian 94f6fffc80 remove the deprecation patches. The methods are gone now 2014-06-21 22:48:15 -04:00
Christian 06f91d8936 Merge branch 'master' into mc179 2014-06-21 22:44:38 -04:00
Christian 9b976b7afe Fix server side to write properly 2014-06-21 22:44:25 -04:00
Christian ea89e1a3f7 Pre4 update 2014-06-21 21:13:22 -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
Christian c1ea6639d4 Fix up some patching bugs. Fully functional @ pre3 2014-06-21 15:55:32 -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
ganymedes01 85497cbf6e Added FluidStack sensitive version for Fluid's localised name
Would be helpful for determining names for more complex FluidStacks (with tag compounds for example)
2014-06-18 15:26:14 +01: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
Christian 90ad27d985 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-15 16:37:42 -04:00
Lex Manos bb15efd037 Fixed vines generation for hanging off of trees. 2014-06-15 11:59:11 -07:00
Christian 1c78a09cfd Also patch in warnings for Vec3Pool - similarly removed. 2014-06-13 08:51:07 -04: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
Christian be7cf8c01e Checking in pre3 work 2014-06-12 21:13:26 -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
Arkan Emberwalker 23c6b9d245 Implement STDOUT/STDERR redirection.
These streams now redirect to log4j2, with form '[class:method:line]: Original message'.
2014-06-12 20:28:56 +01:00