keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity
371 commits 1 branch 2 tags 103 MiB
Commit graph

365 commits

Author SHA1 Message Date
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
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
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
Christian
e8db35228b Test failing build 2012-06-20 08:35:47 -04:00
Christian
198dd807fd Fail the build when recompilation fails 2012-06-20 08:35:14 -04:00
Christian
02f9578b52 Fix huge bug/typo in basemodticker that stopped ticks getting sent 2012-06-20 08:03:57 -04:00
LexManos
308525987d Fix compilation error, Protip: Don't use java7 things when compiling for java6, and Don't report successful build on compilation errors cpw. 2012-06-20 02:14:07 -07:00
LexManos
ef7514288b Remove cr's from modinfo descriptions, they print oddly in Minecraft. 2012-06-19 19:58:48 -07:00
LexManos
8a7b91fb1c Print mod metadata info errors if we are in MCP. 2012-06-19 19:55:28 -07:00
LexManos
07bebf187c Should fix concurent modification exceptions when using removeSpawns 2012-06-19 19:44:52 -07:00
LexManos
5ee3a057a2 Remove some eclipse preference files 2012-06-19 19:44:07 -07:00
LexManos
9495094a48 Update gitignore to ignore some eclipse preference files. 2012-06-19 19:43:46 -07:00
LexManos
c0dffcbcec Merge pull request #29 from ScottKillen/master 
Fixed WorldType to allow custom WorldTypes
 2012-06-19 19:22:06 -07:00
LexManos
06fffe54b1 Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance. 2012-06-17 19:30:10 -07:00
Christian
944fd02fca More ticking cleanup 2012-06-17 18:53:49 -04:00
Christian
4385704172 Remove WorldLoad tick from modloader mods- too early. *sigh* 2012-06-17 18:49:19 -04:00
Christian
6d46fefd83 Make sure to reset the clock trigger 2012-06-17 18:41:54 -04:00
Christian
ce71f85095 Force all client modloader ticks to occur at render end 2012-06-17 18:41:05 -04:00
Scott Killen
83fa5ffa5e Client 
======
Added hook in GuiCreateWorld to allow WorldType to present GUI on world creation.
 2012-06-17 15:05:16 -04:00
Scott Killen
f85c7a48ca **Client** 
* Delegated World.func_46068_G() (getHorizon), which depends on WorldType, to the WorldType class per LexManos' suggestion
 2012-06-17 00:04:50 -04:00
Scott Killen
efc8d1bb37 Client 
======
- Fixed WorldType to allow custom WorldTypes in world creation GUI.
- Deprecated client WorldType.getSeaLevel() and renamed it with the more accurate name of getMinimumSpawnHeight.
- Changed related reference WorldProvider.

Server
======
- Fixed WorldType to allow custom WorldTypes
- Added methods to WorldType giving it the exact abilities of client WorldType
- Adjusted WorldProvider so that it relies on WorldType the same way it does on client.
 2012-06-16 23:31:17 -04:00
Dion Williams
64f7b219af Make FML logs use system line endings for consistency with Java stack traces in the logs. 2012-06-14 18:01:35 +01:00
LexManos
27f8d07e44 Server side fix for invalid parameter to onCrafting 2012-06-13 20:02:35 -07:00
LexManos
c306da9d6d Proper fix for scroll list not covering all of the hidden scroll items. 2012-06-13 19:59:54 -07:00
Christian
5a24f7f0d7 Merge pull request #26 from GenuineSounds/patch-2 
Incorrectly passing the IInventory of the extraction slot instead of the...
 2012-06-13 18:52:46 -07:00
Brian Wiegand
04917a9a8c Incorrectly passing the IInventory of the extraction slot instead of the crafting matrix, get back to me on why it's doing this instead of the default behavior of ModLoader and Forge. 2012-06-13 15:17:33 -07:00
Brian Wiegand
a5b699c2ca Having the string trimmed to 9 made most long strings show a couple of pixels at the very top and very bottom. ie 
https://dl.dropbox.com/u/79514/2012-06-13_13.25.35.png
 2012-06-13 14:09:07 -07:00
LexManos
5115f4f1e4 Fixed KeyBinding issue with ModLoader container, if you register a KeyBinding twice it will discard the old one. And fixed issue where getVersion() could return null causing NPE. 2012-06-10 17:19:05 -07:00
LexManos
b12cafb5c5 Made it so it will attempt to scale any Texture Effects that return data for smaller texture resolutions. Made the size descrepancy only a error for ITextureFX texture effects. 2012-06-10 05:56:52 -07:00
Christian
ad8e9f10c3 Fix up "errored" mod states so they actually read as errors 2012-06-09 11:07:07 -04:00
Christian
b8ae8664ac Fix up bukkit for biome code 2012-06-09 10:47:43 -04:00
Christian
df205d7d3f Fix up biome handling for client and server 2012-06-09 10:27:24 -04:00
Scott Killen
abcb583dd0 - Fixed client crash bug in add/remove Biome functionality. Arrays.asList() returns a fixed-sized list per java spec. Adding and removing biomes throws UnsupportedOperationException. 
- Fixed same on server and added disabled removeBiome functionality. This touched a lot of classes as the nonWorking removeBiome seemed to be lots of places inconsistent with addBiome.
 2012-06-09 07:59:35 -04:00
Christian
bc72bf11ee Tweak error handling - report the exception that caused the bailout 2012-06-08 15:31:30 -04:00
Christian
4a050fbdba Fix parameter ordering in ticks 2012-06-08 15:22:40 -04:00
Christian
16ab855df5 Update bukkit for world gen tweaks 2012-06-07 19:47:11 -04:00
Christian
320503340b Change world generation to expose a mod interface 2012-06-07 19:44:03 -04:00
Christian
749cb7bcd6 Update bukkit for early load change 2012-06-07 19:28:07 -04:00
Christian
00a9cd4a5f Attempt early initialization of Minecraft Forge 2012-06-07 19:25:49 -04:00
Christian
33fc5228ce Update bukkit handler 2012-06-07 17:57:07 -04:00
Christian
0768f82522 Add in a server side WORLDLOAD tick 2012-06-07 17:54:43 -04:00
Christian
6f91209ea8 Fix ticking- need to register the basemod tickhandler *sigh* 2012-06-07 16:31:23 -04:00
Christian
110ca0f3ba Fix ticking for new name "GAME" vs "WORLD" 2012-06-07 16:21:01 -04:00
Christian Weeks
0814f177c5 Update bukkit handlers 2012-06-07 14:03:42 -04:00
Christian Weeks
856fa4f337 Reorganize basemod ticking to use ITickHandler. Introduce "GAME" tick vs "WORLD" tick for 
mods that want to tick per world and "globally"
 2012-06-07 13:53:16 -04:00
Christian Weeks
5acab9e790 Expose a "clean" ticking interface and fix server tick loop for world ticks 2012-06-07 11:12:51 -04:00
Christian Weeks
c62c1df791 Tweak width of description 2012-06-07 08:39:22 -04:00
LexManos
779b3298bd Fix for in game tick running when it shouldn't. Fixed some tabbing issue in crazy's PR. 2012-06-06 08:01:54 -07:00
LexManos
5997bd3b87 Interm implementation of keyboardEvent for ModLoader. 2012-06-06 01:43:49 -07:00
LexManos
c6de498904 Add static log() functions to the RenderAccessLibrary, and fixed up the logo rendering to better display the images. 2012-06-05 18:49:07 -07:00
crazyputje
20fc9de087 removed 'if (client.theWorld != null)' so it also ticks in the main menu 2012-06-04 20:36:57 +03:00
Christian Weeks
eae26b0562 Helps to have a retention policy 2012-06-02 22:41:50 -04:00
Christian Weeks
eeeaf140a7 Helps to have a retention policy for runtime annotations 2012-06-02 22:40:45 -04:00
Christian Weeks
38978a35dc Add in bukkit proxy handler 2012-06-02 22:14:25 -04:00
Christian Weeks
1f7baa09b5 More proxy code 2012-06-02 22:12:15 -04:00
Christian Weeks
f15d9c507f Introduce a proxy side loader for mod use 2012-06-02 22:12:15 -04:00
LexManos
b56b01571c Fixed GuiModList Logo rendering to allow for logos of different sizes to be rendered properly. Logos will render themselves full underneath the text, It is the modder's job to make it look good. 2012-06-02 18:05:57 -07:00
Christian Weeks
202933c409 Update credits information 2012-06-02 11:45:47 -04:00
Christian Weeks
8baf435a4a Update readme for the client side 2012-06-02 11:44:26 -04:00
Christian Weeks
446faad048 Update bukkit handler to inject names at startup 2012-06-02 11:03:20 -04:00
Christian Weeks
716b32c8ab Merge remote-tracking branch 'origin/master' 2012-06-01 23:25:18 -04:00
Christian Weeks
c9731ed7e3 Fix up optifine detection properly 2012-06-01 23:23:50 -04:00
Christian Weeks
0e6ccd81ed Update bukkit handler 2012-06-01 23:10:38 -04:00