Commit graph

6022 commits

Author SHA1 Message Date
Christian
ecaa158981 Merge branch 'antscriptupdates' into minecraft1.3
Conflicts:
	build.xml
2012-07-02 15:21:15 -04:00
Christian
33517d2b8d Merge branch 'antscriptupdates' 2012-07-02 15:17:32 -04:00
Christian
6c99b80b73 Add in a setupenvironment ant target specifically for setting up an FML environment from scratch 2012-07-02 15:16:40 -04:00
Christian
0418f01886 Harvest MC version from MCP 2012-07-02 13:31:45 -04:00
Christian
6f8409a2ce fix sided proxy bukkit test (not used so not a biggie) 2012-07-02 12:32:41 -04:00
Christian
a8f599983e Harvest MC version from MCP 2012-07-02 12:24:37 -04:00
LexManos
9e6c49d9d9 Fix furnaces not smelting the proper number of results after the first one. Damn you tahg, fix this! Keeps falling through my cracks. 2012-07-01 06:52:38 -07:00
Christian
b51ce21b70 Initial checkin. Some patches are probably missing, but client compiles. 2012-06-29 20:18:04 -04:00
LexManos
74d5cdcb9d Merge pull request #94 from cpw/hastileentitybugfix
Fix server check "blockHasTileEntity" used to determine if getDescriptionPacket
2012-06-29 14:02:34 -07:00
Christian
9100172867 Fix server check "blockHasTileEntity" used to determine if getDescriptionPacket
is sent for the block to be metadata sensitive. Thanks iChun!
2012-06-29 09:47:10 -04:00
Christian
731dbf5175 Working simple scheduled ticking, Player ticks 2012-06-28 23:37:30 -04:00
Christian
d3b48f0c21 Support tick spacing through new IScheduledTickHandler 2012-06-28 17:10:35 -04:00
LexManos
dd5d3256d4 Merge pull request #93 from cpw/fixghost4096
Fix ghost players who appear if they don't have the 4096 fix installed
2012-06-28 12:45:01 -07:00
Christian
ce9be2864c Change TickType.WORLD to send the world as arg[0] to match the server. 2012-06-28 14:24:34 -04:00
Christian
59a783e8b9 Fix ghost players who appear if they don't have the 4096 fix installed 2012-06-28 13:44:07 -04:00
Christian
541951416e And there are not 1000 seconds in a second 2012-06-28 08:31:32 -04:00
Christian
4f8d71e289 Seconds are 1000 milliseconds long. Not 1 millisecond long. 2012-06-28 08:27:21 -04:00
Christian
7098d613a0 Tweak profiler command on bukkit 2012-06-28 08:21:24 -04:00
Christian
e688e04446 Fix up a derp in the timing command 2012-06-27 22:13:55 -04:00
LexManos
7f832b4504 Fix container creative to not add Blocks above 256 unless it's told to. 2012-06-27 17:20:25 -07:00
LexManos
0e6e8b87aa Merge pull request #91 from cpw/multiversefix
Fix world provider behaviour: WorldProvider.byDimension should always return a new instance- otherwise you can end up with worlds overwriting one another
2012-06-27 14:37:01 -07:00
Christian
43e4ed7872 Fix world provider behaviour: WorldProvider.byDimension should always return
a new instance- otherwise you can end up with worlds overwriting one another
2012-06-27 17:21:41 -04:00
Christian
0878bd1fcf Fix code to use guava 10 only. Stupid bukkit plugins and daft dependencies on guava 10! 2012-06-27 08:23:53 -04:00
Christian
1c7bcf8077 Tweak for end profiling 2012-06-26 23:37:54 -04:00
Christian
81d4d77202 Add in simple profiler for bukkit 2012-06-26 23:16:23 -04:00
Christian
5a5ff97f39 Add in a mechanism to get the modcontainer for a mod - so things can be programmatically changed 2012-06-26 16:24:50 -04:00
Christian
a7caad10ba Add in bukkit support for recipe change 2012-06-26 15:40:30 -04:00
Christian
64dab3c8d7 Add in a new recipe handler registry method for ease of adding recipes to MC 2012-06-26 15:29:34 -04:00
LexManos
f174cb3948 Merge remote-tracking branch 'origin/master' 2012-06-26 12:10:57 -07:00
LexManos
9efdca3aab Fixed isBlockReplaceable and placing ItemBlocks' 2012-06-26 12:10:42 -07:00
LexManos
84613d5a92 Fucking spelling nazis 2012-06-24 14:48:09 -07:00
LexManos
61e8b92a78 Updated FML to build 153 2012-06-22 18:49:30 -07:00
LexManos
62078cdd46 Fix bitmask bug related to 4096 in multi-block change. 2012-06-22 18:49:05 -07:00
LexManos
3d48b69d4f Added configuration option to disable the darkroom mechanic. For servers who wish to not risk destruction at one broken pipe. 2012-06-22 17:44:04 -07:00
LexManos
f0f7e0e139 Add option to randomize potential spawn locations to have a more randomly dispersed spawn patern, useful for games like FTB vs. 2012-06-22 17:13:32 -07:00
LexManos
53fc30d29d Fix NPE related to server/client not having block ids synced properly. 2012-06-22 17:12:27 -07:00
Christian
5d4fdd1337 Update tester mod 2012-06-22 09:30:47 -04:00
Christian
77479d8b74 Fix ticking for GUI ticks too! 2012-06-22 09:30:27 -04:00
Christian
dd7ee6e268 Fix dependency string processing error 2012-06-22 06:21:04 -04:00
Christian
1236abf679 ModSorting test case 2012-06-21 21:56:16 -04:00
LexManos
caebbafabd FML 150, more tick related work. 2012-06-21 15:28:44 -07:00
Christian
64d1b29c43 Fix ticking properly - ML world ticks now fire once, properly 2012-06-21 18:11:40 -04:00
LexManos
e9c66f63fd Close inputstream 2012-06-21 06:11:17 -07:00
LexManos
d7817aef39 More bugfixes related to portal generation. Should be all now. 2012-06-21 05:09:25 -07:00
LexManos
6547556280 Fix Vanilla bug where nether portals would not work above 127 2012-06-21 04:06:44 -07:00
LexManos
2d434dd84f Updated to FML 149, should fix all ticking issues with ModLoader mods 2012-06-21 04:06:15 -07:00
LexManos
acf70e1047 Some 4096 I missed in custom renderers. 2012-06-21 04:05:50 -07:00
LexManos
262c68a81d Added stupididty exception for common issue with getMinecraftLogger. 2012-06-21 03:17:33 -07:00
Christian
21042e6913 Rename unused ML prop config files if they exist (to .bak) and
skip generating if not needed
2012-06-20 21:17:32 -04:00
Christian
58d6e58b93 Update bukkit with changes 2012-06-20 12:36:48 -04:00