5e7cb9106d
A lot of missing patches to code re-added. Almost all functionality should now
...
be restored.
ModLoader compatibility is not yet assured, there are some wrapper classes that
need re-writing first
2012-08-10 16:39:03 -04:00
1c189ae762
Add in a registration method for gui handlers
2012-08-10 11:12:57 -04:00
3c1b234a61
Fix up MCP merger - it definitely works now - the game runs and runs well.
...
Fix up a couple of small network related issues.
Fix up the server launching fml properly.
2012-08-10 10:03:33 -04:00
6eb4bceee3
Add in missing patch - also, launch FML properly from the server
2012-08-09 09:21:16 -04:00
6d0f7ace17
Entity spawn adjustment - tracker
2012-08-09 08:40:32 -04:00
185babbd85
Entity spawning - done
2012-08-09 01:58:14 -04:00
c1b3bfd007
Fix up annotation parser to parse arrays and enums
2012-08-08 22:10:56 -04:00
9b81775a2f
Added SideTransformer to strip side only functions/fields out.
2012-08-08 18:53:41 -07:00
ac8945a4f8
Stage 1 of merging the client and server for MCP.
...
Results:
Client: 362
Server: 3 (Only due to issues of FF decompilation inconsistancies)
Common: 910
Stage 2: Write runtime transformer to remove annotated fields/methods with invalid side annotation.
2012-08-08 05:48:06 -07:00
77f4cc5bea
Gui Handler ported from MC forge
2012-08-08 00:31:24 -04:00
8998d4c5e0
Revert dumb stuff with commands patch - lots of gfx patching
2012-08-07 23:11:37 -04:00
0ddf61cee2
Almost finished basic network stuff now
2012-08-07 20:41:37 -04:00
84efb72e46
Update some patches- more network work
2012-08-07 20:10:36 -04:00
f4b9055171
Bunch of hooks re-added : network is more complete now, lot of basemod cleanup, moving stuff into
...
the registry area
2012-08-06 22:30:13 -04:00
12927291a7
Fix location of forge in common handler - also some tweaks to modloader and other stuff
2012-08-06 17:27:21 -04:00
73bdd512c5
Network support - there's still some work to do and full id sync isn't done yet, but it has proper registration
...
semantics and hooks for 250 handling
2012-08-06 16:12:50 -04:00
8bda53cb77
Add in a lot of network handler stuff - also, expose the asm harvested data
2012-08-06 09:52:42 -04:00
09098f8a0f
Remove some unneeded fields from the annotations
2012-08-05 02:24:02 -04:00
63d5d42512
Made empty constructor for ModMetadata public
2012-08-04 22:51:57 -07:00
e92be964fd
Change property name to fml.modStates not fml.disabledMods- it makes more sense that way
2012-08-04 12:35:46 -04:00
969de94d8a
Add in a bit of logging when events get sent to mod containers
2012-08-04 11:45:40 -04:00
e39092335a
Allow coremods to inject a modcontainer and run code
...
this will mean that FML is deliberately and very obviously incompatible with a modloader installation.
Fix up worldtype so that the server can run.
2012-08-04 11:31:06 -04:00
fc8c2ac6e4
Merged transformers/ to /common and renamed the asm source download to align better with the asm bin file name.
2012-08-03 23:51:49 -07:00
7949a15226
Removed FMLRegistry, and IMinecraftRegistry.
...
Updated server side to use the seperated registry classes like the client does.
Updated searge name references on server
Made StatBase.statName public using AccessTransformer
Server should compile now
2012-08-03 01:50:48 -07:00
6d70a76c95
More fixes
2012-08-02 16:50:30 -02:30
dab4179024
Change some event names, hook up the event code for server events for FML
2012-08-02 09:31:03 -02:30
582a785fb8
Change some stuff around - begin launching the server through the wrapper too.
...
A lot of patches went in - the client and server both launch and start up mods.
2012-08-02 02:08:30 -02:30
ff152479e6
More stuff
2012-08-01 21:19:11 -02:30
5f51e63385
A load of transformer accesses- also a few tweaks to the transformer, and linux support in the fml python
2012-08-01 18:59:45 -02:30
62535863ad
Add temp AccessTransformer config for FML
2012-08-01 03:18:31 -07:00
e7a7b3c844
XP for smelting
2012-07-30 23:07:53 -04:00
6f8b39ea09
Beginning the 1.3.1 update
2012-07-30 22:31:07 -04:00
e001103ed8
Add in the ability to create versioned dependencies for mod relationships
...
BaseMod versions are loaded too late so will never work as a versioned
dependency requirement, but can have versioned deps of others
2012-07-30 17:01:27 -04:00
d1d12e4ebd
Fix up coremods with relaunch, add in a sample "coremod"
2012-07-30 11:34:30 -04:00
b79ec382d7
Add in events for the method pre/init/post annotations so we can add in extra data during the event phase
2012-07-30 00:33:21 -04:00
a850ea6bc0
Fix whitespace issue
2012-07-29 23:54:07 -04:00
825f1a8b50
Fix window sticking around - it doesn't anymore
2012-07-29 23:46:52 -04:00
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
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
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
98e31e5f03
Incorporate server patches into client
2012-07-06 10:29:17 -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
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
07a1927c25
Update some stuff
2012-07-02 23:49: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
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
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
64dab3c8d7
Add in a new recipe handler registry method for ease of adding recipes to MC
2012-06-26 15:29:34 -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
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
6ba65d047f
Revert "Test failing build"
...
This reverts commit 744febc38e915a12c388fe01ba6715d31b6b6ee2.
2012-06-20 08:44:49 -04:00
e8db35228b
Test failing build
2012-06-20 08:35:47 -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
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
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
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
ad8e9f10c3
Fix up "errored" mod states so they actually read as errors
2012-06-09 11:07:07 -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
320503340b
Change world generation to expose a mod interface
2012-06-07 19:44:03 -04:00
00a9cd4a5f
Attempt early initialization of Minecraft Forge
2012-06-07 19:25:49 -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
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
5997bd3b87
Interm implementation of keyboardEvent for ModLoader.
2012-06-06 01:43:49 -07: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
de8a5cfc8b
Slight reorganization of texture ticking - accomodate optifine
2012-06-01 23:07:32 -04:00
2f09a048d6
Tweaks to basemod setup
2012-06-01 00:33:51 -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
b5a10c0153
Add in missing hooks, add branding information to the crash report
2012-05-27 07:14:35 -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
8aacd2d127
Remove the dependency in RenderEngine, decided on the simple API for texture FX
2012-05-17 15:11:21 -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
0e3dcc4eda
Change hd texture handling
2012-05-15 22:05:24 -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
028fc2505b
Fix millinaire support. Fix Portal eating rendering time. add in profile visibility for mod stuff.
2012-05-14 11:38:54 -04:00
a01711361d
HD patching complete? Clean up mod info data, Dummy field for dummy mods
2012-05-14 01:39:21 -04:00
00aee5b8e1
Actually pass in the mod name
2012-05-12 02:25:15 -04:00
b26b3fda1b
Fix up incorrect dependency handling
2012-05-12 02:10:50 -04:00
caa5384552
Fix nulls in the mod list, start building the gui screen
2012-05-12 00:47:04 -04:00
053fd64bde
Gui related ticking
2012-05-12 00:00:33 -04:00
c689991986
Try always loading the language data
2012-05-11 23:37:58 -04:00
1146642dec
Always load the "en_US" langpack into the translation table first, then the actual language.
2012-05-11 22:20:09 -04:00
394b046220
Fix missing ml.sendpacket, call in renderers
2012-05-11 17:31:28 -04:00
f1453839b4
Fix problem with nulls in getModList
...
Work on the meta information file
2012-05-11 15:18:26 -04:00
7735567ce0
More tweaks to stuff: mod list, branding, more hooks
2012-05-11 01:45:36 -04:00
abc7b3f2a6
Tidying up and more hooks
2012-05-10 21:30:06 -04:00
b7861ec04c
Tweak block rendering organization. Add in worldgen for client.
2012-05-10 19:51:15 -04:00
813ad71f13
Tidy up a lot of code- ModLoader and BaseMod are now almost identical client and server side
2012-05-10 18:54:25 -04:00
bb2af1d883
Tweak ordering for sorting- should be a stable sort now
2012-05-10 15:48:26 -04:00
5a93998097
Lots of tweaks to mod output pretty printing. new versioning scheme.
2012-05-10 09:42:31 -04:00
8d0a9b770d
Fixed up the ModLoader render block hook, RP's blocks now render.
2012-05-10 01:00:07 -07:00
f4862dc40d
Fixes
2012-05-10 02:01:23 -04:00
7846f10c74
Add in some more stuff for handling key bindings, rendering
2012-05-07 17:44:49 -04:00
0438fbd47e
Reorganize ticking a bit
2012-05-07 01:39:55 -04:00
b6b5955404
Working on the ticking stuff
2012-05-07 00:54:18 -04:00
55d252b657
more client side hooks and Texture overrides/animations.
2012-05-06 16:32:59 -07:00
49be023eab
Halfway through ticking- won't compile
2012-05-06 00:58:40 -04:00
bca823c421
Let's get hooking!
2012-05-05 19:52:53 -04:00
e0e77a6bb5
API is restored for client side. Implementation starting.
2012-05-05 14:42:46 -04:00
816b0738e4
The beginning
2012-05-04 17:02:12 -04:00
4b4ad6781e
Introduce the client side FML
2012-05-03 19:40:55 -04:00
e261ad1295
Tweak the loader a little bit to just use file names, not fully qualified directories when referring
...
to mods.
2012-04-18 14:03:30 -04:00
0ec65b4b3a
Fix "soft" dependencies so they can exist properly
2012-04-14 10:01:55 -04:00
2ae31bddd2
Add in more "Player" related events. Fix up some MLProp stuff
2012-04-09 10:18:24 -04:00
f92149aef5
Fix regular expressions, thanks ChickenBones!
2012-04-09 09:19:20 -04:00
33f1e26df4
A proper console command handler, also fix ordering of loaded mods
2012-04-08 09:55:56 -04:00
07437b95ae
Add in a console command handler so you can access the command console
2012-04-08 02:00:57 -04:00
8fa4c1645c
Don't send a register unless I have channels. Add the channel to the mod channels list.
2012-04-08 01:11:32 -04:00
331768b272
Call my handleLogin hook from NetLoginHandler, tweak output in server gui and log file.
2012-04-07 22:11:01 -04:00
0ae4c2e4a9
Fix subdirectory loading properly: mods will load inside eclipse..
2012-04-06 16:14:01 -04:00
38094093b3
Actually figure out the path for directory class loading
2012-04-06 15:24:28 -04:00
cd2be85575
regular expressions in java==fail
2012-04-06 15:03:41 -04:00
b26bf5ab96
Recurse into subdirectories found
2012-04-06 14:43:12 -04:00
040a1d8cf7
Try multiple "jar" sources- for eclipse testing
2012-04-06 14:23:14 -04:00
a858478b92
it's addURL not addUrl dumbo
2012-04-06 13:57:40 -04:00
9304420a2c
it's getdeclaredmethod, dipstick
2012-04-06 13:47:01 -04:00
71a9bf9f70
Fix package private resolution of fields/methods from base minecraft by loading into minecraft's class loader not our own
2012-04-06 13:27:50 -04:00
765194e8db
Should load from whatever minecraft comes from now...
2012-04-06 09:59:58 -04:00
55fe1aa1e3
Build should work now. Fix a stupid javadoc import.
2012-04-05 21:44:06 -04:00
fc1dfa9cca
Documentation: lots
...
Some eclipse workspace settings that might help?
2012-04-05 16:22:47 -04:00
8b1f984c53
Handle the minecraft object registry better- now the client compiles too
...
Also a quickie astyle run over the code..
2012-04-05 12:36:54 -04:00
3b19792a12
Reorganize the code a little bit- move some stuff that was on FMLHandler to the common handler. Add a delegate
...
into the common handler that delegates to the right sided handler
2012-04-05 11:34:57 -04:00
e828c1793d
Run Astyle over the FML code. Happy lex?
2012-04-05 10:07:52 -04:00
3b0126d197
Channel validation
2012-04-03 22:45:27 -04:00
053552cdcc
NetworkHandler doesn't care about channel ownership
2012-04-03 17:06:02 -04:00
09efd147e1
Modloader complete
2012-04-03 17:04:26 -04:00
1e3cd7ca97
Config dir handling
2012-04-03 15:53:59 -04:00
e243ffd1ce
MLProp
2012-04-03 15:41:25 -04:00
35ece09cfa
Mod sorting
2012-04-03 12:03:21 -04:00
971de1c2b4
Everything except ordering
2012-04-02 23:06:30 -04:00
63dbdd8db3
Update to 1.2.5 and hopefully forge compatibility
2012-04-02 18:09:06 -04:00
8e1f51d792
Forge support
2012-04-01 02:14:14 -04:00
a8351a0e84
Initial attempts to support forge stuff
2012-03-31 02:28:14 -04:00
ebf945f2bd
Fix NPE
2012-03-31 01:04:29 -04:00
e27f1c3a70
More logging and maybe fix default package mods
2012-03-31 00:59:43 -04:00
8091d8bdaf
Logging fun. Whee!
2012-03-31 00:52:50 -04:00
281c455b5d
Fail
2012-03-31 00:46:47 -04:00
44779a56b1
More logging
2012-03-31 00:43:54 -04:00
f37c8ae4d7
Tweak class loader
2012-03-31 00:22:08 -04:00
28ac773c0a
Some implementation
2012-03-30 22:26:16 -04:00
cec16187c1
some build and logging tweaks
2012-03-30 21:21:43 -04:00
7f985856ec
Fix derpy
2012-03-30 21:07:42 -04:00
d8580c2d02
Tweak loader a bit
2012-03-30 21:03:25 -04:00
d97aaa4e82
Move more stuff around
2012-03-30 16:25:49 -04:00
c7437f3a3b
Build system
2012-03-30 16:22:10 -04:00
Christian