e1fc02b5b9
Add in "transform excluded" classes that we still need to take loading responsibility for
2012-07-29 23:30:37 -04:00
b53ce2aa90
Added in some dialogs when things don't go so well
2012-07-29 22:55:53 -04:00
ba28161f16
New logging stuff, also the early plugin api for forge
2012-07-29 22:54:59 -04:00
50ed44359d
Merge branch 'minecraft1.3' into newfmlmod
2012-07-23 23:02:25 -02:30
f78400711e
Fix up mod classloading delegation
2012-07-23 22:54:36 -02:30
69e895e687
Some patches to go along with the other changes
2012-07-23 22:51:16 -02:30
769663466f
More stuff as I roll out the changes
2012-07-23 22:50:37 -02:30
9e4131c3e8
A bunch more fixes for FML mods
2012-07-23 16:33:17 -02:30
8b5ddf1739
Merge remote-tracking branch 'mainlap/newkeys' into newfmlmod
...
Conflicts:
client/cpw/mods/fml/client/FMLClientHandler.java
2012-07-22 20:30:42 -02:30
5561f8218a
New key handling
2012-07-22 20:25:18 -02:30
2a19eca517
Check in a lot of recent work
2012-07-22 11:56:38 -02:30
3115f92ee4
Check in new fml mod work so far. Lots still to do.
2012-07-14 13:58:46 -04:00
2671641b83
Cleaned up the install script for the source distrabution to setup the workspace properly, delete argo, and download all required dependancies.
2012-07-12 18:07:58 -07:00
0a9ee584bf
Added call to clean_source to build script to fix patch fuzz on windows.
2012-07-12 18:06:39 -07:00
48dcdca805
Fix Client-Clean project to use relative path to argo.
2012-07-12 18:06:01 -07:00
2db9292ba5
Another bloody ticking fix. This should fix mods that use ML.setInGameHook(true,false) on the
...
server side to recieve ticks.
2012-07-08 22:06:11 -04:00
9d6266d85b
Fix up mod classloading delegation
2012-07-06 15:59:16 -04:00
25fb847dc1
Fixes
2012-07-06 10:42:49 -04:00
98e31e5f03
Incorporate server patches into client
2012-07-06 10:29:17 -04:00
0ff59e7978
Remove two places that are unpatchable now
2012-07-06 09:52:21 -04:00
97cfbb990d
Server repatching
2012-07-06 09:44:00 -04:00
59949849f0
Add a "checkpatches" target and check if your patches are up to date before running a repatch operation
2012-07-06 09:19:58 -04:00
be59dfff54
Launch through the applet launcher too
2012-07-06 01:04:33 -04:00
32e93213f1
Some patches for the server
2012-07-05 22:31:46 -04:00
b9466b8ee5
Lots of client patch fixup
2012-07-05 18:13:47 -04:00
275b78957a
Update git ignore to ignore a fernflowerzip that's lying around
2012-07-05 15:38:37 -04:00
4ab2a3cb6b
And we have a brand, "fml". We're definitely modded :)
2012-07-05 15:36:31 -04:00
58576c2a19
UnexpectedThrowable is now the much more awesome CrashReport!
2012-07-05 15:35:38 -04:00
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
e8b09f4692
Got the relauncher downloading and injecting library files
2012-07-05 15:23:37 -04:00
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
53c2b50212
FFS let this fix that bloody ticking mess that is ML compatibility.
2012-07-03 23:03:51 -04:00
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
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
d1f791f94e
Merge branch 'master' into minecraft1.3
2012-07-03 08:15:58 -04:00
60b50bb7f2
Tweak build xml for more cleanliness
2012-07-03 08:14:35 -04:00
9cafdf94ac
Merge branch 'antscriptupdates'
2012-07-02 23:50:49 -04:00
07a1927c25
Update some stuff
2012-07-02 23:49:40 -04:00
777b4407c2
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 23:49:06 -04:00
a98ffafd71
Add in more options for ant script and clean up needing to clean every time.
2012-07-02 23:43:29 -04:00
414d59b1aa
Merge branch 'testrecover'
2012-07-02 20:19:23 -04:00
f0aa28162e
Merge branch 'antscriptupdates' into minecraft1.3
2012-07-02 15:56:33 -04:00
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
ecaa158981
Merge branch 'antscriptupdates' into minecraft1.3
...
Conflicts:
build.xml
2012-07-02 15:21:15 -04:00
6c99b80b73
Add in a setupenvironment ant target specifically for setting up an FML environment from scratch
2012-07-02 15:16:40 -04:00
0418f01886
Harvest MC version from MCP
2012-07-02 13:31:45 -04:00
6f8409a2ce
fix sided proxy bukkit test (not used so not a biggie)
2012-07-02 12:32:41 -04:00
a8f599983e
Harvest MC version from MCP
2012-07-02 12:24:37 -04:00
b51ce21b70
Initial checkin. Some patches are probably missing, but client compiles.
2012-06-29 20:18:04 -04:00
731dbf5175
Working simple scheduled ticking, Player ticks
2012-06-28 23:37:30 -04:00
d3b48f0c21
Support tick spacing through new IScheduledTickHandler
2012-06-28 17:10:35 -04:00
ce9be2864c
Change TickType.WORLD to send the world as arg[0] to match the server.
2012-06-28 14:24:34 -04:00
541951416e
And there are not 1000 seconds in a second
2012-06-28 08:31:32 -04:00
4f8d71e289
Seconds are 1000 milliseconds long. Not 1 millisecond long.
2012-06-28 08:27:21 -04:00
7098d613a0
Tweak profiler command on bukkit
2012-06-28 08:21:24 -04:00
e688e04446
Fix up a derp in the timing command
2012-06-27 22:13:55 -04:00
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
1c7bcf8077
Tweak for end profiling
2012-06-26 23:37:54 -04:00
81d4d77202
Add in simple profiler for bukkit
2012-06-26 23:16:23 -04:00
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
a7caad10ba
Add in bukkit support for recipe change
2012-06-26 15:40:30 -04:00
64dab3c8d7
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -04:00
5d4fdd1337
Update tester mod
2012-06-22 09:30:47 -04:00
77479d8b74
Fix ticking for GUI ticks too!
2012-06-22 09:30:27 -04:00
dd7ee6e268
Fix dependency string processing error
2012-06-22 06:21:04 -04:00
1236abf679
ModSorting test case
2012-06-21 21:56:16 -04:00
64d1b29c43
Fix ticking properly - ML world ticks now fire once, properly
2012-06-21 18:11:40 -04:00
262c68a81d
Added stupididty exception for common issue with getMinecraftLogger.
2012-06-21 03:17:33 -07:00
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
58d6e58b93
Update bukkit with changes
2012-06-20 12:36:48 -04:00
6ba65d047f
Revert "Test failing build"
...
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
63be4cb88f
Revert "Revert "Fail the build when recompilation fails""
...
This reverts commit c2d920d738a294462338fbe955c62a0f4034304c.
2012-06-20 08:44:08 -04:00
acbc8d9a1b
Revert "Fail the build when recompilation fails"
...
This reverts commit 482e3be3c9a96df8cefad81d78c7a4e83ad898b4.
2012-06-20 08:39:11 -04:00
e8db35228b
Test failing build
2012-06-20 08:35:47 -04:00
198dd807fd
Fail the build when recompilation fails
2012-06-20 08:35:14 -04:00
02f9578b52
Fix huge bug/typo in basemodticker that stopped ticks getting sent
2012-06-20 08:03:57 -04:00
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
ef7514288b
Remove cr's from modinfo descriptions, they print oddly in Minecraft.
2012-06-19 19:58:48 -07:00
8a7b91fb1c
Print mod metadata info errors if we are in MCP.
2012-06-19 19:55:28 -07:00
07bebf187c
Should fix concurent modification exceptions when using removeSpawns
2012-06-19 19:44:52 -07:00
5ee3a057a2
Remove some eclipse preference files
2012-06-19 19:44:07 -07:00
9495094a48
Update gitignore to ignore some eclipse preference files.
2012-06-19 19:43:46 -07:00
c0dffcbcec
Merge pull request #29 from ScottKillen/master
...
Fixed WorldType to allow custom WorldTypes
2012-06-19 19:22:06 -07:00
06fffe54b1
Added EntityRendererProxy class for compatibility with ModLoader mods that rely on it's existance.
2012-06-17 19:30:10 -07:00
944fd02fca
More ticking cleanup
2012-06-17 18:53:49 -04:00
4385704172
Remove WorldLoad tick from modloader mods- too early. *sigh*
2012-06-17 18:49:19 -04:00
6d46fefd83
Make sure to reset the clock trigger
2012-06-17 18:41:54 -04:00
ce71f85095
Force all client modloader ticks to occur at render end
2012-06-17 18:41:05 -04:00
83fa5ffa5e
Client
...
======
Added hook in GuiCreateWorld to allow WorldType to present GUI on world creation.
2012-06-17 15:05:16 -04:00
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
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
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
27f8d07e44
Server side fix for invalid parameter to onCrafting
2012-06-13 20:02:35 -07:00
c306da9d6d
Proper fix for scroll list not covering all of the hidden scroll items.
2012-06-13 19:59:54 -07:00
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
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
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
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
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
ad8e9f10c3
Fix up "errored" mod states so they actually read as errors
2012-06-09 11:07:07 -04:00
b8ae8664ac
Fix up bukkit for biome code
2012-06-09 10:47:43 -04:00
df205d7d3f
Fix up biome handling for client and server
2012-06-09 10:27:24 -04:00
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
bc72bf11ee
Tweak error handling - report the exception that caused the bailout
2012-06-08 15:31:30 -04:00
4a050fbdba
Fix parameter ordering in ticks
2012-06-08 15:22:40 -04:00
16ab855df5
Update bukkit for world gen tweaks
2012-06-07 19:47:11 -04:00
320503340b
Change world generation to expose a mod interface
2012-06-07 19:44:03 -04:00
749cb7bcd6
Update bukkit for early load change
2012-06-07 19:28:07 -04:00
00a9cd4a5f
Attempt early initialization of Minecraft Forge
2012-06-07 19:25:49 -04:00
33fc5228ce
Update bukkit handler
2012-06-07 17:57:07 -04:00
0768f82522
Add in a server side WORLDLOAD tick
2012-06-07 17:54:43 -04:00
6f91209ea8
Fix ticking- need to register the basemod tickhandler *sigh*
2012-06-07 16:31:23 -04:00
110ca0f3ba
Fix ticking for new name "GAME" vs "WORLD"
2012-06-07 16:21:01 -04:00
0814f177c5
Update bukkit handlers
2012-06-07 14:03:42 -04:00
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
5acab9e790
Expose a "clean" ticking interface and fix server tick loop for world ticks
2012-06-07 11:12:51 -04:00
c62c1df791
Tweak width of description
2012-06-07 08:39:22 -04:00
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
5997bd3b87
Interm implementation of keyboardEvent for ModLoader.
2012-06-06 01:43:49 -07:00
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
20fc9de087
removed 'if (client.theWorld != null)' so it also ticks in the main menu
2012-06-04 20:36:57 +03:00
eae26b0562
Helps to have a retention policy
2012-06-02 22:41:50 -04:00
eeeaf140a7
Helps to have a retention policy for runtime annotations
2012-06-02 22:40:45 -04:00
38978a35dc
Add in bukkit proxy handler
2012-06-02 22:14:25 -04:00
1f7baa09b5
More proxy code
2012-06-02 22:12:15 -04:00
f15d9c507f
Introduce a proxy side loader for mod use
2012-06-02 22:12:15 -04:00
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
202933c409
Update credits information
2012-06-02 11:45:47 -04:00
8baf435a4a
Update readme for the client side
2012-06-02 11:44:26 -04:00
446faad048
Update bukkit handler to inject names at startup
2012-06-02 11:03:20 -04:00
716b32c8ab
Merge remote-tracking branch 'origin/master'
2012-06-01 23:25:18 -04:00
c9731ed7e3
Fix up optifine detection properly
2012-06-01 23:23:50 -04:00
0e6ccd81ed
Update bukkit handler
2012-06-01 23:10:38 -04:00
de8a5cfc8b
Slight reorganization of texture ticking - accomodate optifine
2012-06-01 23:07:32 -04:00
174d6691bd
Add in optifine visibility for the mod list. Will search for an "optifine_mod.info" file on the
...
class path if sp614x wants to add one to optifine.
2012-06-01 14:55:49 -04:00
7d07a752d8
Fix ticking on bukkit server
2012-06-01 11:08:32 -04:00
ad5dc783d8
Fix ticking on the server
2012-06-01 11:07:14 -04:00
ed08c425af
Implement missing language load hook for server
2012-06-01 10:22:08 -04:00
2f09a048d6
Tweaks to basemod setup
2012-06-01 00:33:51 -04:00
4085617ca2
Bukkitside fixup
2012-06-01 00:27:46 -04:00
51701d09fd
Merge branch 'bukkitreorg'
2012-05-31 23:07:16 -04:00
cfb99b01c8
Fix copied code. Derpbag.
2012-05-31 22:48:44 -04:00
e35d31e50d
Update FML with recent mainline changes
2012-05-31 22:48:44 -04:00
c4ad78ab87
Update bukkit with new mod fixes
2012-05-31 22:48:44 -04:00
ac779739aa
Damn you bukkit with your same names for different classes!!!! EntityPlayer->EntityHuman
2012-05-31 22:48:44 -04:00
09d5bf95ae
Fix chunk generators for bukkit
2012-05-31 22:48:44 -04:00
b2e01d8f2a
Bukkit version
2012-05-31 22:48:44 -04:00
2521e5b390
Merge branch 'bukkit' - massive code reorganization for fml 2.0
...
Conflicts:
common/cpw/mods/fml/common/IWorldGenerator.java
common/cpw/mods/fml/common/registry/FMLRegistry.java
common/cpw/mods/fml/common/registry/IMinecraftRegistry.java
common/net/minecraft/server/CommonRegistry.java
common/net/minecraft/server/IMinecraftRegistry.java
common/net/minecraft/src/CommonRegistry.java
common/net/minecraft/src/IMinecraftRegistry.java
2012-05-31 22:45:19 -04:00
ae6621bfdd
More tweaks for proper API
2012-05-31 22:42:23 -04:00
dfd15acb6d
Reorganize for bukkit integration
2012-05-31 22:09:45 -04:00
660521e6f2
Fix project, new gui layout with screenshot, thanks Sengir!
2012-05-30 09:25:04 -04:00
b5a10c0153
Add in missing hooks, add branding information to the crash report
2012-05-27 07:14:35 -04:00
d4fd21dcbc
Fixed regex issue in last push.
2012-05-27 01:40:22 -07:00
379c5b2888
Fixed up for newline before case bodies.
2012-05-27 01:24:45 -07:00
51a959f8a4
Should fix windows {me} generating different patches then linux {cpw}
2012-05-27 00:22:27 -07:00
7d7c395ff3
Move first tick to the real first tick
2012-05-26 02:30:21 -04:00
7c590e62c6
Merge in the mod texture changes from Lex
2012-05-26 02:29:35 -04:00
6191ed61e0
Fixed location refs to fmlversion.properties
2012-05-25 23:25:05 -07:00
96b442e3cc
Add in a static render access class for optifine and other render editing mods to use
2012-05-25 22:13:51 -04:00
3454b43daa
Add in a "world load" tick fired just as the world completes loading. This SHOULD fix millinaire.
2012-05-25 17:21:30 -04:00
f3b15940ee
Changing up the mod list data
2012-05-25 15:25:35 -04:00
7667df0caf
Fixed up ModTexture* classes to use the ITextureFX events to resize the image as needed. Also fixed ModTextureStatic's not being applied properly.
2012-05-24 22:48:15 -07:00
d45134eb9a
Fix up two stupid overwrites in my mergeup from lex
2012-05-24 23:18:04 -04:00
fe710a9245
Fix derp in MTS
2012-05-24 22:13:33 -04:00
46b7dc0fec
Patch fixing
2012-05-24 21:40:34 -04:00
f5598573a2
Update some stuff for updated tweaks
2012-05-24 21:39:16 -04:00
d7c9010c92
Update FMLClient with my changes
2012-05-24 21:33:43 -04:00
012c378427
my tweaks
2012-05-24 21:06:27 -04:00
00ca4ead44
difflist should include server and client now.
2012-05-24 03:48:59 -07:00
2927be6247
Some patch cleanup.
2012-05-24 02:18:20 -07:00
a9b317c941
Rewrote how HD Texture support worked, to make it easier for Optifine to integrate.
...
Fixed TextureFlamesFX for extramly large texture sizes.
Fixed the texture size sceme to allow for different sizes of textures in the same pack.
2012-05-24 01:35:37 -07:00
1727ce69ed
Line number changed..
2012-05-24 01:33:50 -07:00
0d5ab57fa0
Fix up the watch
2012-05-18 20:42:12 -04:00
2dcd1c4065
And some tweaks to the texture handling
2012-05-18 20:17:07 -04:00
a40ba43957
Fix up some fubars in MTS and MTA
2012-05-18 20:16:41 -04:00
88f3c4f9bd
Lots of error handling.
2012-05-18 10:38:40 -04:00
dd94427f22
Missed a patch *sigh*
2012-05-17 21:57:24 -04:00
cc4641b0d9
Add simple API to allow mods to let their textures be overriden by other mods
2012-05-17 21:47:12 -04:00
a9e17048e6
Because, of course, I broke the first build...
2012-05-17 20:27:24 -04:00
abee6d2507
Some logging of texture overrides- also, only unregister if it's an actual ModTextureStatic, not if it's a subclass.
2012-05-17 15:39:04 -04:00
1004a3236a
Derpy exceptions derpy exception handling
2012-05-17 15:19:25 -04:00
8aacd2d127
Remove the dependency in RenderEngine, decided on the simple API for texture FX
2012-05-17 15:11:21 -04:00
bc3790e3ca
Tweak the render patch- we won't fail if the updateTexture call fails
2012-05-16 00:34:50 -04:00
77d6ae8ffa
Update patches: add in a setup for most of the texturefx classes
2012-05-16 00:01:12 -04:00
a220fb34e2
Tweaking texture loading
2012-05-16 00:00:52 -04:00
ddb1085064
Fix tileSize -> iconTileSize. Stupid MCP
2012-05-15 22:34:17 -04:00
319758bd33
Catch throwable (NoClassDefFoundError) and don't abort loading- it's probably a badly named class file.
2012-05-15 22:23:00 -04:00
1b299b4ff4
Fix some derpy
2012-05-15 22:18:41 -04:00
25ced3f321
Update patches for hd textures
2012-05-15 22:10:38 -04:00
0e3dcc4eda
Change hd texture handling
2012-05-15 22:05:24 -04:00
6903deb69d
Refresh the renderengine patch- catch and log some texture pack reload errors
2012-05-15 16:21:40 -04:00
5412be2d76
More mod list fixes
2012-05-15 16:19:46 -04:00
a77aeedee2
Lots of cleanup on the mod list, pretend we're the mcpatcher for mod HD detection.
2012-05-15 15:52:19 -04:00
bc23e7a657
Fix up fubar in worldprovider. Add in obfuscation detection. Capture the exception that crashes minecraft in the log file.
2012-05-14 18:21:35 -04:00
6b23024f11
ModLoader worldtype hackery compatibility
2012-05-14 16:21:05 -04:00
c2264c97aa
Fix derp
2012-05-14 14:16:50 -04:00
828ada8aa6
Only log the warning once per texture
2012-05-14 13:20:50 -04:00
5c48a3c146
push patches
2012-05-14 12:22:46 -04:00
028fc2505b
Fix millinaire support. Fix Portal eating rendering time. add in profile visibility for mod stuff.
2012-05-14 11:38:54 -04:00
6f6c3ee939
Fix the serverside. FUUUUUUUU!
2012-05-14 01:45:56 -04:00
Christian
