cpw
5990e29af7
Merge pull request #247 from jk-5/patch-1
...
Pull request for #232
2013-07-06 18:54:54 -07:00
Christian
2676c8999c
Update mcp data. fixes #248
2013-07-06 21:25:36 -04:00
Christian
3a200e901e
Fix coremod injection into main system. Should stop double-dipping coremods.
2013-07-06 20:51:00 -04:00
Jeffrey Kog
c97ac284a5
Update ModLoaderFuelHelper.java
2013-07-04 08:33:03 +02:00
Christian
3f4bf61ae6
Update key
2013-07-03 08:28:59 -04:00
Christian
155e846818
Add in support for mods/<mcversion> as a mod location. Also drop coremods as a location. They go in mods too now.
2013-07-02 23:03:01 -04:00
Christian
ba3707af22
More javadoc cleanup
2013-07-02 19:39:02 -04:00
Christian
ad79b9ed86
Fix up some deprecation warnings, and clean up coremod code that's going
...
away.
2013-07-02 19:27:50 -04:00
Christian
7aa7221756
Fix transformer search
2013-07-02 18:40:23 -04:00
cpw
8844554da6
Merge pull request #243 from jrtc27/modclassloader
...
Fixed ClassCastException when loading ModLoader mods
2013-07-02 15:32:35 -07:00
James Clarke
6f0eedc9a6
Fixed ClassCastException when loading ModLoader mods
2013-07-02 20:48:00 +01:00
Christian
f21cd286ca
Resource packs, part two. FML mods are now resource packs. Vanilla will scan anything under 'assets'
...
and turn it into a resource prefix. Use resourcelocations to look stuff up.
2013-07-02 11:11:50 -04:00
Christian
fbd57b3264
Mods are now loaded as resource packs. Vanilla will scan for valid prefixes based on subdirs of 'assets' which
...
can then be referenced as ResourceLocations with the "<prefix>:path" notation.
2013-07-02 01:39:40 -04:00
Christian
efc369ee83
Fix EventHandler annotation.
2013-07-02 01:08:51 -04:00
Christian
c418da353f
Cleanup coremod code, server side working now.
2013-06-30 22:51:56 -04:00
Christian
3f15cd54c2
Functional client @ 1.6.1
2013-06-30 21:02:23 -04:00
Christian
7406b38d8a
1.6.1
2013-06-30 16:50:30 -04:00
Christian
2e3f2461fa
More fixes, binpatching works
2013-06-29 15:16:18 -04:00
Christian
95f7345ff7
First draft of 1.6 update
2013-06-29 13:33:14 -04:00
Christian
bc02f3e67b
New mappings for marker
2013-06-29 09:20:59 -04:00
LexManos
5741f669d5
Base GenDiff off deobf data's class list instead of the merged jar. Add option to delete target files that generate patches.
2013-06-29 01:40:01 -07:00
LexManos
5b0117ec76
Re-wrote/orginized a lot of fml.py. Almost everything is re-written/moved.
...
This is done in preperation for MCP to roll out SpecialSource support and the new 1.6 structure.
Also done for my sanity while reading through the code.
Intruduced a new function. If there is a 'mcp_data' folder in the FML folder, it will be copied to the MCP work directory after MCP is extracted.
It DOES overwrite anything that already exists.
This is intended for places like BuildServer to place libraries/assets to prevent them from needing to be downloaded every version.
Introduced a dev-env json. Need to write the eclipse workspace references to the new libraries.
Out custom json includes asm and legacylauncher.
Added proper OptionParsing to decompile.py
2013-06-27 20:48:52 -07:00
Christian
e06d9d0fbc
Add a simple property annotation system for mods.
2013-06-27 08:40:31 -04:00
Christian
ab91647546
Changed to the EventHandler annotation universally, documentation and stuff.
2013-06-26 14:52:56 -04:00
Christian
b236a4a4db
Fixes, so it builds again..
2013-06-24 16:30:18 -04:00
LexManos
3a9f123a16
Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'.
2013-06-23 23:06:25 -07:00
Christian
d369fe1c25
No more debug please
2013-06-15 01:11:29 -04:00
Christian
fef0f6422d
More fixups for new launcher model
2013-06-14 20:45:52 -04:00
Christian
2eb81ac88b
Merge in binpatch and use launcher
2013-06-14 17:21:49 -04:00
Christian
e02a91f008
More tweaks
2013-06-14 09:32:51 -04:00
Christian
ced1b95155
Server side tested and working. Setup is complex atm. That will change.
2013-06-13 09:57:55 -04:00
Christian
8f910dfa5d
First cut of runtime binary patching. Needs some work to actually test it in a real scenario..
2013-06-12 08:53:10 -04:00
Christian
05a854cd2a
Small tweaks to the mcp data. Nothing major..
2013-06-11 14:47:23 -04:00
Christian
22738de028
Attempt to properly fix deadlock if the internal server derps. It should never hang now. Damn you fast computer..
2013-06-11 14:41:19 -04:00
Christian
cd0466395a
Fix sysout with trailing messages after a newline
2013-06-06 11:52:15 -04:00
Christian
24c4056651
Add in an optional modid identifier for @SidedProxy. It's main use is when both scala and java @Mods reside in the
...
same package, and you want the @SidedProxy behaviour for a specific @Mod language type. In general it should not be needed otherwise.
2013-06-06 10:05:34 -04:00
Christian
59fe905695
Don't continue trying to send events to mods that depend on errored mods.
2013-06-04 13:59:04 -04:00
Christian
6f3da97365
Don't throw an exception if the scala adapter find a java proxy. I may add some distinguishers to @SidedProxy so you know which mod it's for.
2013-06-04 12:51:46 -04:00
Christian
edc1fb24e2
Send the "suspect list", and print the suspect versions
2013-05-27 11:03:23 -04:00
Christian
f1d68ed4c8
Throw the sorting exception
2013-05-27 10:46:22 -04:00
Christian
82e9de8641
More tweaks to the mod sorting code
2013-05-27 10:09:51 -04:00
Christian
843a13c1ab
Try and clean up cycle detection output a bit
2013-05-27 09:25:50 -04:00
Christian
3bf50c4bbe
Fix server side derp with Forge network packet handler
2013-05-21 11:01:50 -04:00
Christian
4922e90d81
Separate network mod config from setup. Allows for Forge Packet Handler nicety
2013-05-20 21:40:42 -04:00
Florian Nücke
8517a824e5
Merge declaration and initialization of a variable.
2013-05-08 20:16:15 +02:00
Florian Nücke
2cca7aa759
Some more Scala @SidedProxy adjustments. Now properly supporting pure singletons, i.e.
...
object C {
@SidedProxy(...)
var proxy: P = null
}
Removed fallback, as all such singletons are properly handled by the new code now, and class implementations fall back to the code also used for plain Java mods.
2013-05-08 19:04:35 +02:00
Florian Nücke
23b070c7d0
Alternative @SidedProxy setter for Scala.
2013-05-08 05:36:28 +02:00
CovertJaguar
99bb50d8f8
Improved Entity Spawn Error
2013-04-29 20:41:20 -07:00
Christian
f0bba74a47
Update for minecraft 1.5.2
2013-04-27 01:24:06 -04:00
Christian
58ba24add2
Fix possible NPEs in GameData
2013-04-22 21:14:34 -04:00
cpw