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

1288 commits

Author SHA1 Message Date
Christian
d2712dafdb Format the log messages through MessageFormat. Thanks CovertJaguar for the pointer. Closes #282 2013-09-19 08:23:56 -04:00
Lex Manos
fcf2af484d Update the src distro's eclipse workspace. 2013-09-18 15:21:56 -07:00
Christian
b721a51bc4 Update mc_versions data and commands patch and eclipse workspace 2013-09-18 18:01:04 -04:00
Christian
3768ca1713 Update mcp mod info 2013-09-18 17:02:41 -04:00
Christian
2ea5f04228 Update for real 1.6.3 update 2013-09-18 16:59:28 -04:00
Christian
12c556bc36 Update for pre-ninja 1.6.3 update 2013-09-18 16:33:11 -04:00
Christian
88f1dce658 Merge branch 'master' into newtweak 2013-09-18 14:49:53 -04:00
Christian
56bf94b441 Update for new installer and thank you. 2013-09-17 21:56:25 -04:00
Christian
466902654e Add in support for using a mirror list and provide checksums for packed download of libs 2013-09-15 22:58:39 -04:00
Christian
4fc4accb6e Fix sidedness derp in LanguageRegistry. 2013-09-13 19:04:25 -05:00
Christian
9387bae26b Update MCP data 2013-09-03 17:56:09 -04:00
Christian
b41a7e1dab Remove @SideOnly from 70318 (getDistance) it makes no sense that it's not on the server. 2013-09-02 12:24:17 -04:00
Christian
b9ac2ac13c Use java 1.6 compatible method of closing the zip file. Stops stupid compile error. 2013-09-02 00:12:36 -04:00
Christian
4f9b778d14 Allow server side lang file injection, hopefully 2013-08-27 22:45:10 -04:00
Christian
5925fa7c79 Allow coremods to properly inject asset readers. 2013-08-27 12:31:37 -04:00
Christian
ded1a92dfd Update tweaker for new Launcher API 2013-08-23 10:42:26 -04:00
Christian
3b4f1983ce More exception handling for less derpiness. 2013-08-20 20:46:18 -04:00
Christian
94462565a5 Reset the IWorldGenerator seed for each mod, before calling. That should mean worldgen is consistent 
and not dependent on mod ordering, or mod sideeffects.
 2013-08-19 14:56:01 -04:00
Christian
6818c0f4da Try and use the relaunch log, which should be classloaded.. 2013-08-19 14:55:37 -04:00
Christian
4eb97daac3 Fix up scala refs, for better results 2013-08-18 18:58:36 -04:00
Christian
ed258920a0 Check keys, not values *sigh* 2013-08-17 13:27:43 -04:00
Christian
877dc77b75 And more coremod logging 2013-08-17 13:14:55 -04:00
Christian
dcba47209f Add in some log information 2013-08-17 13:10:28 -04:00
Christian
904e2df1f9 And actually instantiate the collection *sigh* 2013-08-17 12:57:15 -04:00
Christian
643e3d441a Add in "FMLCorePluginContainsMod" in the manifest. If this value is 
present, FML will attempt to parse your mod jar file as a normal mod
file as well, instantiating mod containers there.
 2013-08-17 12:48:38 -04:00
Christian
8f9b54a97a Clean up a couple of resources. Also, don't parse jars just because 
they're in the mods dir
 2013-08-17 11:40:15 -04:00
Christian
7c7cafbae1 Make sure we only add args to the argument list if a tweaker hasn't already. 
Should fix LiteLoader compatibility issue.
 2013-08-16 16:28:55 -04:00
Christian
779139b3ca Fix stupid derp is stupid. Closes #275 and means sp614x can do his thing 2013-08-16 16:18:50 -04:00
LexManos
4406d1e171 Update installer. 2013-08-06 11:42:38 -07:00
Bo
ea33f502fc Fixed install.sh not passing arguments to install.py 2013-08-03 17:43:57 +01:00
Grom PE
971dc1eb00 Add missing SideOnly in BaseMod 
NetClientHandler exists only on client side and thus method using it should be annotated with SideOnly.
 2013-08-01 14:19:30 +07:00
cpw
952218c845 Add in some reverse lookup methods for game registry data 2013-07-29 22:05:22 +02:00
cpw
7d31e4b25e Temporarily add a version of 'reobfuscate.py' that will resolve complex 
reobfuscation graph issues with specialsource. Copy it over 'reobfuscate.py'
in the mcp runtime dir. Hopefully will have an MCP/specialsource fix in
the coming days.
 2013-07-28 22:38:26 +02:00
cpw
e71ee7721b Fix keybindings being derped 2013-07-28 20:52:12 +02:00
LexManos
f872ac0a90 Use json 2.9.1 nightly for OSX in release json like vanilla does. 2013-07-17 12:21:26 -07:00
LexManos
f4311e2fae Stupid spaces and windows escaping -.- 2013-07-16 14:34:43 -07:00
LexManos
a9e2a2089f Add quotes for paths with spaces -.- 2013-07-16 13:35:14 -07:00
LexManos
f40e4cf3a8 Use a temporary file for recompile's command line to combat command length to long issues. 2013-07-16 13:08:26 -07:00
LexManos
9de739723f Fix potential NPE in villager skin registry. 2013-07-16 10:32:29 -07:00
LexManos
136e2180f7 Fix server launching. 2013-07-15 10:57:44 -07:00
Christian
10c6e5e353 Fix logo handling. no more NPE if the logo can't be found. Also, fix location of mcp logo now. 2013-07-14 13:40:55 -04:00
Christian
d0c2a8e62b Fix up jar sanity check code. FML validation of the jar works now and doesn't derp classloading. 2013-07-14 13:11:32 -04:00
Christian
8f2823709c The server.classpath generates the runtime manifest, so it needs the 
non-debug asm jars.
 2013-07-14 11:12:42 -04:00
LexManos
bf6f038793 Update Forge signature for new private key 2013-07-12 03:05:20 -07:00
LexManos
5d89e17ae9 Update build and eclipse workspaces for debug asm. 2013-07-12 00:22:11 -07:00
Christian
caeb0afecf Coremods now have a primitive dependency capability. Also, we search mods dir for special 
"TweakClass" manifests. These are using the vanilla tweak mechanism to inject into
Minecraft. Helpful for other "platform" systems, when you don't want to have to deal
with json changes!
 2013-07-11 23:23:33 -04:00
LexManos
3dd0b5d496 Kill release time scala libraries, to be re-evaluated after all movement is done and shit is fixed. May require manual instalation for mods that use scala. 2013-07-11 15:24:54 -07:00
LexManos
09cf5feee5 Kill mcp's truncate method, for more useful logs. 2013-07-10 15:23:21 -07:00
Christian
e33a1a02bf Fix up logos in the mod screen. Clean up some unnecessary casts and suppressions, use the -debug asm 
library at dev time, since it contains full symbols and code in compiled form.
 2013-07-10 15:47:13 -04:00
Christian
32680bb84d Force a global asset scan prior to mod construction : you should be able to 
reference assets anywhere in your mod now.
 2013-07-10 00:42:40 -04:00
Christian
28727a51a6 Update FML for new stealth update for 1.6.2 2013-07-09 15:00:28 -04:00
cpw
11bf88fceb Merge pull request #254 from CaptainShadows/patch-1 
@InstanceFactory was set to look for Fields instead of methods
 2013-07-09 07:19:24 -07:00
Christian
1fe0dcec09 And don't forget to remove the test code 2013-07-09 08:31:40 -04:00
Christian
fbfc11c9a9 Decode the file URL. Hopefully will make things work more.. 2013-07-09 08:30:47 -04:00
LexManos
95aa81bb3f Disable signature check of client for now, it's broken. 2013-07-09 05:04:11 -07:00
LexManos
50a8b1cc68 Temporarily disable GuiModList's Mod logos. 2013-07-09 03:27:49 -07:00
LexManos
a0211c4fb7 Don't validate signatures on servers, they are not signed. 2013-07-09 03:27:29 -07:00
LexManos
f45499612d Add MC Version to installed version name. 2013-07-09 03:27:01 -07:00
LexManos
66531ad420 Fix NPE in new debug line when patch targets don't exist. 2013-07-09 01:21:50 -07:00
Christian
67caa6692d Don't initialize the server. 2013-07-08 22:31:15 -04:00
Christian
2f299820fb FML now verifies that the minecraft jar is correct and intact. This is intended to discourage those who think that 
modifying the minecraft jar is still acceptable.
 2013-07-08 22:10:06 -04:00
Christian
9071d7d5e2 Test server-siding ResourceLocation 2013-07-08 19:31:00 -04:00
Christian
e0b7d1599c The game is going to exit in face of patch mismatch, unless you force it to run with fml.ignorePatchDiscrepancies in the system properties. 2013-07-08 14:34:03 -04:00
Christian
bfe955dbf2 Update for stealth update. Thanks mojang! 2013-07-08 13:19:55 -04:00
Christian
e64c07a109 We now generate an adler32 checksum for each patched file and verify at load time that they match. 
Mismatch won't crash, but will emit a big warning..
 2013-07-08 13:19:14 -04:00
Christian
94315253b1 Tweak debug data on patched classes 2013-07-08 12:28:32 -04:00
Captain Shadows
b788686126 @InstanceFactory was set to look for Fields instead of methods 
"fix it" to now match the javadoc :P

if it was set like that so modders wouldn't use it, it might be better to just say so in the documentation
 2013-07-08 00:07:54 -04:00
LexManos
611668931e Update eclipse workspaces for 1.6.2 2013-07-07 13:11:22 -07:00
Christian
ab3220cbb3 Add the jsons for 1.6.2 2013-07-07 16:05:53 -04:00
Christian
d164343522 Update for 1.6.2 and MCP 8.04 2013-07-07 15:49:11 -04:00
Christian
dcab319acf Add cascadedTweaks. This will allow simple coexistence for any other mod framework using 
the tweaker system as well. Hi Voxel and LiteLoader!
 2013-07-06 22:26:03 -04:00
cpw
53a607bad9 Merge pull request #247 from jk-5/patch-1 
Pull request for #232
 2013-07-06 18:54:54 -07:00
Christian
9c8b8bb794 Update mcp data. fixes #248 2013-07-06 21:25:36 -04:00
Christian
412a86ec71 Fix coremod injection into main system. Should stop double-dipping coremods. 2013-07-06 20:51:00 -04:00
Jeffrey Kog
3f257231a5 Update ModLoaderFuelHelper.java 2013-07-04 08:33:03 +02:00
LexManos
d04480b8b0 Move Resource refreshing until affter postInit. 2013-07-03 22:29:10 -07:00
LexManos
a1db21a601 Fix missing argument and startclient/startserver support. 2013-07-03 19:30:30 -07:00
LexManos
4f535cfbf8 Update to new MCP bugfix version, Fixes: Missing Armor/Item rendering, and Boss health mapping issues. 2013-07-03 18:23:38 -07:00
LexManos
0b1fdde35d Fix eclipse workspaces and launch configurations. 2013-07-03 18:22:57 -07:00
LexManos
c3974de125 Add deobf-data to setup env. 2013-07-03 18:22:06 -07:00
Christian
30ec1e06c7 Update key 2013-07-03 08:28:59 -04:00
Christian
a2a8f1247f 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
e45767d20a More javadoc cleanup 2013-07-02 19:39:02 -04:00
Christian
aaaffda3f0 Fix up some deprecation warnings, and clean up coremod code that's going 
away.
 2013-07-02 19:27:50 -04:00
Christian
d648514a90 Revert "Keep these on our servers until the launcher is actually fixed -.-" 
This reverts commit f1b533ad87ea08d6e62259c59779bcec1636e2fe.
 2013-07-02 19:03:06 -04:00
Christian
f8f78c8a80 Fix transformer search 2013-07-02 18:40:23 -04:00
cpw
18c5bde7d0 Merge pull request #243 from jrtc27/modclassloader 
Fixed ClassCastException when loading ModLoader mods
 2013-07-02 15:32:35 -07:00
James Clarke
b2ef2bed36 Fixed ClassCastException when loading ModLoader mods 2013-07-02 20:48:00 +01:00
Christian
5d0d45ea40 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
LexManos
58a00d68a4 Keep these on our servers until the launcher is actually fixed -.- 2013-07-01 23:26:40 -07:00
Christian
0f319c41e0 Remember to update your patches!!!! 2013-07-02 02:14:31 -04:00
Christian
76a1489d4b 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
f978e6b50e Fix EventHandler annotation. 2013-07-02 01:08:51 -04:00
Christian
160b2dc749 Fix -rel json 2013-07-02 01:02:02 -04:00
LexManos
b474a69a90 Point scala downloads to our servers, Launcher doesn't like standard maven repos. 2013-07-01 21:53:13 -07:00
LexManos
b758104a37 Fix json syntax error. 2013-07-01 20:33:26 -07:00
Christian
fa9789a3d4 Fix up release JSON 2013-07-01 23:14:31 -04:00
Christian
46dcb86a62 Update json samples 2013-07-01 22:58:08 -04:00
LexManos
0f3e999323 Build installer package for the new client launcher. 2013-07-01 19:40:19 -07:00
LexManos
69d1a35cd5 Add FML Installer logo crated by @ZaverSLO https://twitter.com/ZaverSLO/status/349947190300508162 2013-07-01 19:38:44 -07:00
LexManos
7e8e083c80 Revert common folder fix, Common folder does nothing, feel free to delete it after first load. 2013-07-01 16:25:11 -07:00
LexManos
ed5d8fa2e6 Fix src distrabution, and got rid of pesky common folder in eclipse workspace. src is now installable. 2013-07-01 15:50:49 -07:00
Christian
ddbec7d9dd Update mcp URL. 2013-07-01 11:06:20 -04:00
Christian
3e8f4552dd Cleanup coremod code, server side working now. 2013-06-30 22:51:56 -04:00
LexManos
cd9a5d63a2 Add deobf data to merge-common, worspace is now actually runnable! 2013-06-30 19:41:51 -07:00
LexManos
f37e5b8338 Add deobf data to src dist. 
Dont create deobf jar as we ship the lzma
Added *.lzma to .gitignore
 2013-06-30 19:15:53 -07:00
LexManos
4e1ac5b80d Fix wrong project name in distro eclipse launch. 2013-06-30 18:33:26 -07:00
LexManos
d92b8e8589 Add windows lzma executable 
http://tukaani.org/xz/
He states that most things are under public domain, But I couldn't find an exact reference to this executable.
I'm going to assume it under public domain and distribuiting it here is fine. If not someone please direct me to the apropriate license and I will act accordingly.
 2013-06-30 18:31:24 -07:00
Christian
5735c7f603 Client launch for eclipse 2013-06-30 21:06:33 -04:00
Christian
de18b5ecc1 Functional client @ 1.6.1 2013-06-30 21:02:23 -04:00
Christian
7371511e5a Tweak commands patch 2013-06-30 19:33:47 -04:00
Christian
569b791b93 1.6.1 2013-06-30 16:50:30 -04:00
Christian
72e0adedeb Some fixes for updated mcp code 2013-06-30 13:17:20 -04:00
Christian
daa85290e4 More fixups 2013-06-30 09:04:50 -04:00
LexManos
ae922989ed Another typo 2013-06-30 03:55:26 -07:00
LexManos
bdc0011e90 Fix typo in new packages. 2013-06-30 01:01:55 -07:00
LexManos
c7758deffa Push conf folder for 1.6, Relied heavily on a yet-unreleased version of MCP. 2013-06-29 22:48:24 -07:00
Christian
572c9acc59 More fixes, binpatching works 2013-06-29 15:16:18 -04:00
Christian
5b5f05859c First draft of 1.6 update 2013-06-29 13:33:14 -04:00
Christian
70b1dcfbac New mappings for marker 2013-06-29 09:20:59 -04:00
Christian
069aba5b46 Tweak missing mapping 2013-06-29 09:20:59 -04:00
LexManos
837a6fdf8a Add support for alternative maven servers in libraries. 
Also download sources for public libraries, and atach them in eclipse. DOCUMENTATION!! YAYA!
 2013-06-29 02:54:29 -07:00
LexManos
58ce9b33b3 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
028c77c3a0 Add Clean Server/Client launcher. Update Start.java to new Main class and login system. 2013-06-28 22:12:07 -07:00
LexManos
da8fb7f8a0 Update eclipse projects for new libraries dependancies, and update packages for new 1.6 classes. 2013-06-28 20:31:02 -07:00
LexManos
4cd3d06286 Add suggestions output if it can. 2013-06-27 22:58:00 -07:00
LexManos
030e8e71a8 Fixed update_packages.py for new folder strcture. 2013-06-27 22:30:40 -07:00
LexManos
cf448bb934 Add missing argument 2013-06-27 22:29:10 -07:00
LexManos
90c643183e 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
611c3b9591 Add a simple property annotation system for mods. 2013-06-27 08:40:31 -04:00
Christian
b2e9557b87 Changed to the EventHandler annotation universally, documentation and stuff. 2013-06-26 14:52:56 -04:00
Christian
3c0048b6d6 Fixes, so it builds again.. 2013-06-24 16:30:18 -04:00
Christian
b985ec886a Ignore binpatch 2013-06-24 16:03:54 -04:00
LexManos
3e346cb8b2 Add filter support for MCPMerger, and filter out libraries from the server's 'fat jar'. 2013-06-23 23:06:25 -07:00
LexManos
82c0fbce60 Upgraded minecraft downloader to work with new launcher's asset/library system 
New parameter:
  --no-assets: Disables the downloading of minecraft's asset tree, recomended that build servers supply this flag to prevent downloading of useless data.
 2013-06-20 16:23:15 -07:00
Christian
39858c6ead No more debug please 2013-06-15 01:11:29 -04:00
Christian
14ddd2be05 Fix build script. Add a sample JSON file. You'll need the newest Launcher code to run this. 2013-06-14 21:00:15 -04:00
Christian
30d836fa36 More fixups for new launcher model 2013-06-14 20:45:52 -04:00
Christian
07a5efe612 Merge in binpatch and use launcher 2013-06-14 17:21:49 -04:00
Christian
21240df8bc More tweaks 2013-06-14 09:32:51 -04:00
Christian
a923a2c142 Server side tested and working. Setup is complex atm. That will change. 2013-06-13 09:57:55 -04:00
Christian
4802d04bfd 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
83ed6fa32c Small tweaks to the mcp data. Nothing major.. 2013-06-11 14:47:23 -04:00
Christian
c170b98a8c 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
146e773264 Fix sysout with trailing messages after a newline 2013-06-06 11:52:15 -04:00
Christian
1261c7a3e0 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
fea7a25a86 Don't continue trying to send events to mods that depend on errored mods. 2013-06-04 13:59:04 -04:00
Christian
8602848f2c 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
2a064ffdc7 Send the "suspect list", and print the suspect versions 2013-05-27 11:03:23 -04:00
Christian
6ca37a60b7 Throw the sorting exception 2013-05-27 10:46:22 -04:00