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
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
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
Christian
b51ce21b70
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -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
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
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
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
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
Christian
64d1b29c43
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04: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
Christian
6ba65d047f
Revert "Test failing build"
...
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
Christian
63be4cb88f
Revert "Revert "Fail the build when recompilation fails""
...
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
Christian
acbc8d9a1b
Revert "Fail the build when recompilation fails"
...
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
