Commit Graph
7785 Commits
Author SHA1 Message Date
Abrar Syed 5cb03bc07d fix List configs 2012-12-06 09:09:34 -05:00
GuntherDW 021ec72f11 Fix typo in chunkmanager config 2012-12-06 09:31:06 +01:00
Christian 538755dad7 Tweak release.py script: HEAD==master in general
Update FML: 26a2ef5
26a2ef5 Add a modid on the mods list, should make it easier to do things like fo
b4e3490 Fix build eclipse extractor task
828341f Fix typo
7a8dae5 Try and make branch non-derpy
d3c0e1f Try defaulting branch differently
9c77d3f Remove old eclipse workspace and ship/extract as a zip file (use ant set
6371e9b Assume Forge is the parent directory when checking for AT configs.
516954e Name both zips the same format
1151d5c Last part of branch name only please
25f1dda Try and get a valid branch name on jenkins
39a146f Clean up build.xml script- support outputting a branched jar file
037dcae Small derp in install.py
01d6da3 Try marking python as binary.
8b26659 FML will now attempt to download MCP as part of the install process Now
42b3e6a Windows Python distrabution created using py2exe, thanks Fesh0r for the
e709ab8 Marked more spots in gui/items bitmask as being free.
2012-12-05 22:09:01 -05:00
Christian d4b06fd4bc Add a modid on the mods list, should make it easier to do things like forge chunkloading config 2012-12-04 18:08:27 -05:00
Christian 7b7255013a Fix build eclipse extractor task 2012-12-04 18:04:45 -05:00
LexManos 742e93caec Fix issue with DimensionManager.shouldLoadSpawn 2012-12-04 02:01:01 -08:00
Christian 71044df76b Fix typo 2012-12-04 01:30:38 -05:00
Christian edb4e08b22 Merge branch 'master' into repackage
Conflicts:
	eclipse/Clean/.classpath
	eclipse/Clean/.project
	eclipse/FML/.classpath
	eclipse/FML/.project
	install/fml.py
2012-12-04 01:24:50 -05:00
Christian fa34555efa Try and make branch non-derpy 2012-12-03 23:47:23 -05:00
Christian 45583a7420 Try defaulting branch differently 2012-12-03 22:26:12 -05:00
LexManos 51159de108 Update python files to add support for specifying MCP directory and FML downloading MCP on the fly. 2012-12-03 18:15:38 -08:00
LexManos d124a56844 Update FML, now includes python, and will download MCP for you 2012-12-03 18:14:50 -08:00
LexManos 76ee9440a9 Add wget and unzip from GnuWin32 for use in the setup scripts. 2012-12-03 18:12:05 -08:00
Christian e8ff9f25d9 Remove old eclipse workspace and ship/extract as a zip file (use ant setupenvironment)
Fix up install.py for forge multibranch changes
2012-12-03 19:55:37 -05:00
LexManos 61a90e9e74 Assume Forge is the parent directory when checking for AT configs. 2012-12-03 16:53:03 -08:00
Christian 9cdbadb66c Merge branch 'master' into repackage
Conflicts:
	patches/minecraft/net/minecraft/client/EntityFX.java.patch
2012-12-03 17:31:29 -05:00
Christian 6fdf5960ef Name both zips the same format 2012-12-03 08:38:20 -05:00
Christian 329fe50b1d Last part of branch name only please 2012-12-03 08:30:44 -05:00
Christian 461173a778 Try and get a valid branch name on jenkins 2012-12-03 08:23:21 -05:00
Christian 16418dd7ad Clean up build.xml script- support outputting a branched jar file 2012-12-03 08:13:20 -05:00
LexManos e334a469fb Small derp in install.py 2012-12-02 20:26:36 -08:00
LexManos d583a760ec Try marking python as binary. 2012-12-02 20:19:55 -08:00
LexManos c584d4e3db FML will now attempt to download MCP as part of the install process
Now shipping a py2exe version of python for windows.
Linux/Macs should come with python pre-installed so they do not have a distrabution here.
2012-12-02 19:59:22 -08:00
LexManos 5cf07b008e Windows Python distrabution created using py2exe, thanks Fesh0r for the script. 2012-12-02 19:56:17 -08:00
Christian e3dfb1e3b7 Fix #289 2012-12-02 22:00:12 -05:00
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