Commit graph

4396 commits

Author SHA1 Message Date
Christian
275b78957a Update git ignore to ignore a fernflowerzip that's lying around 2012-07-05 15:38:37 -04:00
Christian
4ab2a3cb6b And we have a brand, "fml". We're definitely modded :) 2012-07-05 15:36:31 -04:00
Christian
58576c2a19 UnexpectedThrowable is now the much more awesome CrashReport! 2012-07-05 15:35:38 -04:00
Christian
c0b707a9bd Merge branch 'master' into minecraft1.3
Bring some of the ticking fixes in

Conflicts:
	client/cpw/mods/fml/client/FMLClientHandler.java
	patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch
2012-07-05 15:30:21 -04:00
Christian
e8b09f4692 Got the relauncher downloading and injecting library files 2012-07-05 15:23:37 -04:00
LexManos
1012531538 Merge pull request #98 from cpw/master
Update to fml 175
2012-07-03 22:10:52 -07:00
Christian
e934a57f6b Update fml to 175- fixes some weird ticking behaviours for ML mods, adds in new ticking behaviours for smart mods 2012-07-04 00:29:15 -04:00
Christian
decbe8ba7c Tweak ticking YET AGAIN. Should fire a solitary GUILOAD tick right as the game screen loads.
Hopefully fixes worldload tick issue too
2012-07-04 00:16:30 -04:00
Christian
53c2b50212 FFS let this fix that bloody ticking mess that is ML compatibility. 2012-07-03 23:03:51 -04:00
Christian
3d8a5edc30 Separate gui ticking completely. send it as if it's a world tick. ML gui ticks are epically dumb.
Fix Worldload being filtered from the trigger arming.
Also, improve errors going to an error screen. There should be more information now.
2012-07-03 22:39:35 -04:00
Christian
275fd394c1 Change gui ticking and world load tick. Should close issue #40 and kill it deader
than a very very dead thing. *$^*(#% Modloader ticking b#%$hit
2012-07-03 21:37:54 -04:00
Christian
d1f791f94e Merge branch 'master' into minecraft1.3 2012-07-03 08:15:58 -04:00
Christian
60b50bb7f2 Tweak build xml for more cleanliness 2012-07-03 08:14:35 -04:00
Christian
9cafdf94ac Merge branch 'antscriptupdates' 2012-07-02 23:50:49 -04:00
Christian
07a1927c25 Update some stuff 2012-07-02 23:49:40 -04:00
Christian
777b4407c2 Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 23:49:06 -04:00
Christian
a98ffafd71 Add in more options for ant script and clean up needing to clean every time. 2012-07-02 23:43:29 -04:00
LexManos
a82498a083 Updated some remaining scripts to call there python versions. 2012-07-02 20:05:42 -07:00
LexManos
b70f3820f0 Removed symlink files, shouldn't be in the repo. 2012-07-02 20:04:15 -07:00
LexManos
eed01c4afc Moved licenses and credits into install folder. 2012-07-02 19:59:40 -07:00
Christian
414d59b1aa Merge branch 'testrecover' 2012-07-02 20:19:23 -04:00
Christian
f0aa28162e Merge branch 'antscriptupdates' into minecraft1.3 2012-07-02 15:56:33 -04:00
Christian
f0484a8941 Merge branch 'antscriptupdates' 2012-07-02 15:55:24 -04:00
Christian
2090264599 Some more fixes to the ant stuff: apply patches now happens at the right time, I grab fernflower as part of
setup and added an updatepatches call too
2012-07-02 15:54:25 -04:00
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