Commit graph

6010 commits

Author SHA1 Message Date
Christian
784ad96194 Add in some additional ticket loading callbacks for ChickenBones. Closes #284
Add in a call to determine if there are possible chunktickets for a world. This should let
Mystcraft and other dynamic world generating mods check if they should immediately load
a world based on existing chunk tickets.
2012-12-02 00:56:53 -05:00
LexManos
0243df1c4a Fix issue where non-BlockContainer TEs would not be removed properly. 2012-11-30 20:22:50 -08:00
LexManos
e65c0a3d88 Fix issue where worlds were potentially unloaded improperly on server shutdown. 2012-11-29 04:05:00 -08:00
LexManos
fdb2933ceb Fix logic issue in ForgeChunkManager.ticketCountAvaliableFor(username) PR 2012-11-29 04:04:03 -08:00
LexManos
096989d4eb Small change to fix loading configs. 2012-11-27 22:43:23 -08:00
LexManos
e5231f306b Added section of the EntityData NBT that will be persisted for players across respawning. 2012-11-27 16:52:08 -08:00
LexManos
4a748beb69 Fix potential NPE in EntityJoin handler and print warning. 2012-11-27 16:12:54 -08:00
LexManos
cbe52abe42 Exposed some ChunkLoader information for PR #278 2012-11-27 15:28:59 -08:00
LexManos
7b6d65ce85 Small tweak to config to use Treemap 2012-11-27 14:53:43 -08:00
LexManos
820aa195bd Merge pull request #269 from XCompWiz/chunkcon
Adds a more intelligent chunk constructor
2012-11-27 14:53:12 -08:00
LexManos
530c19293b Fixed AIOOB issue with new sanity check in getBlock 2012-11-27 12:24:52 -08:00
LexManos
50426ea0fe Fix potential NPE in saving a property that didn't define a type. 2012-11-27 02:14:20 -08:00
LexManos
81b5db6f37 Added new functions to the Config class to allow for specification of comments when getting properties.
Added new getTerrainBlock whihc will limit the resuling ID to < 256, useful for world gen.
Calls to getBlock with IDs less then 256 will be assigned values above 256 {Thus freeing up terrain gen slots}
Made ConfigCategory implement Map<String, Propertery> should fix compatibility with most mods that broke two builds ago.
2012-11-27 02:06:29 -08:00
LexManos
adc2d61feb Merge pull request #277 from Xhamolk/patch-1
OreDictionary addition: getOreID(ItemStack)
2012-11-27 00:28:29 -08:00
LexManos
88f9fa75c9 New nested configuration category support, for PR #258 2012-11-26 23:46:01 -08:00
LexManos
07a6e4ed5f Fixed random chest items not generating to there max stack sizes. 2012-11-26 20:25:35 -08:00
LexManos
4bf2dbaeb7 Fixed issue with abandoned chunks. 2012-11-26 20:06:23 -08:00
Xhamolk_
c0276a63f7 OreDictionary addition: getOreID(ItemStack)
Allow getting the oreID from a ItemStack, as an alternative from getOreID(String).

Now is easier to exchange items for their equivalencies through the OreDictionary.
2012-11-26 21:22:11 -06:00
cpw
26159e3ed9 Merge pull request #274 from iChun/patch-2
Add check that Entity saves to disk before saving entity to saved chunkloading data.
2012-11-24 11:14:21 -08:00
iChun
1e8c2a9acf Add check that Entity saves to disk before saving entity to saved chunkloading data.
Returning false to addEntityID prevents the entity from being saved (cred to LexManos)
Entities which do not save to disk but are chunkloaders causes errors the next time the world loads. This ought to fix it.
2012-11-24 16:27:17 +08:00
LexManos
9a1c12c492 Updated FML, proper free-sprite list for /gui/items.png, and fixed MCP version. 2012-11-21 16:07:20 -08:00
LexManos
adad5c96cf Marked more spots in gui/items bitmask as being free. 2012-11-21 15:58:04 -08:00
Zach Laster
17151718aa Fixes ordering for z & x loops (proper array increment order)
The ordering before would skip about in the ids and metadata arrays.  This runs linearly and should improve performance.
Done live on github
2012-11-21 14:56:17 +02:00
XCompWiz
e8aaf81627 Fixes some weird formatting 2012-11-21 05:15:20 +02:00
XCompWiz
0eba8eeaab Adds a more intelligent chunk constructor
Adds a chunk constructor with full block id range, that's metadata
sensitive, has intelligent coord ordering, and which allows for
generation at greater heights than 127.
2012-11-21 05:05:51 +02:00
LexManos
10cdc06cc3 Delete duplicate file 2012-11-20 18:07:39 -08:00
LexManos
78ff6182fe Finished repackaging net.minecraft.* net.minecraft.client is left 2012-11-20 17:58:22 -08:00
LexManos
7fb23bf89f More re-packaging, got most classes out of the default package. 2012-11-20 17:22:55 -08:00
Christian
957afc4d62 Move server specific patch back to common from minecraft.
Update FML: 1f5c58b
1f5c58b Fix up MCP version
61e4db2 Merge joined.exc add update howto
5efc1eb Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone sho
3b3600d Modified merger to just consider all server classes as common. And moved
edcc5ca Forgot mcp.cfg
ca79dfe Updated to 1.4.5b
5945279 Fix python error
57bf643 Modified decompile so that we do not have to decompile the server, saves
d9d0a46 Cleaned up some tabs
2fac644 Change usage of ZipFile, fixes issues with Mac's default instation of py
2012-11-20 09:09:06 -05:00
Christian
25a10d6fc4 Fix up MCP version 2012-11-20 08:47:14 -05:00
Christian
389608116f Merge joined.exc add update howto 2012-11-20 08:38:33 -05:00
Christian
f74b8ac30b Revert "Fix MC-2497 - derpy torch flames. Moved from forge. Everyone should benefit."
This reverts commit fa567014a54b3273002fe9cf424ab4cf3ec54c3a.
2012-11-20 08:27:13 -05:00
LexManos
554d86f59b Remove common folder from projects 2012-11-20 03:15:45 -08:00
LexManos
f75bf90e77 Move IBossDisplayData to shared 2012-11-20 03:15:16 -08:00
LexManos
8b1ed2d255 First half of new patches 2012-11-20 03:15:01 -08:00
LexManos
586807c2c8 Update FML imports 2012-11-20 03:14:36 -08:00
LexManos
73a22bb571 Inital script side commit for MC source repackaging done. 2012-11-20 01:55:41 -08:00
LexManos
2e2751e5c0 Fix TE Issue 2012-11-19 20:05:16 -08:00
LexManos
397d36e900 Modified merger to just consider all server classes as common. And moved the defnition of CodecMus to the config. 2012-11-19 17:45:53 -08:00
LexManos
5bc4d22bdd Updated to MC 1.4.5b 2012-11-19 16:03:52 -08:00
LexManos
745b697779 Forgot mcp.cfg 2012-11-19 15:47:18 -08:00
LexManos
950154aa61 Updated to 1.4.5b 2012-11-19 15:35:08 -08:00
LexManos
5e5919f61c Fix python error 2012-11-19 15:03:13 -08:00
LexManos
786b04c57d Modified decompile so that we do not have to decompile the server, saves time. 2012-11-19 15:01:04 -08:00
LexManos
72938c9133 Cleaned up some tabs 2012-11-19 15:00:11 -08:00
LexManos
f842aa75bb Change usage of ZipFile, fixes issues with Mac's default instation of python. Also cleaned the python a little bit. 2012-11-19 13:33:22 -08:00
LexManos
ee266cd325 Removed GnuWin32 programs, should no longer be needed as we've moved to python. 2012-11-19 13:31:11 -08:00
Christian
f30daebbcb Update FML: 570592b
570592b Attempt to fix a possible comodification risk
2012-11-18 21:22:38 -05:00
Christian
02b6904843 Attempt to fix a possible comodification risk 2012-11-18 20:40:48 -05:00
Christian
913f3adade Stupid eclipse resetting preferences. Spaces, not tabs!!! 2012-11-18 19:33:15 -05:00