Commit graph

1160 commits

Author SHA1 Message Date
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
Christian
8be20d6805 Add in a pretty sorting error screen 2013-05-27 10:28:00 -04:00
Christian
e3cd509b9a More tweaks to the mod sorting code 2013-05-27 10:09:51 -04:00
Christian
ece6290c19 Try and clean up cycle detection output a bit 2013-05-27 09:25:50 -04:00
Christian
aa18bed75e Fix server side derp with Forge network packet handler 2013-05-21 11:01:50 -04:00
Christian
c8cc7b27d1 Separate network mod config from setup. Allows for Forge Packet Handler nicety 2013-05-20 21:40:42 -04:00
cpw
8f779cf618 Merge pull request #230 from fnuecke/master
Alternative setter logic for @SidedProxy in Scala classes/mods.
2013-05-11 15:34:37 -07:00
LexManos
6b39f612df Don't spit error on LWJGL not supporting 4.3 just warning. 2013-05-11 10:55:39 -07:00
Florian Nücke
15e6ddcb14 Merge declaration and initialization of a variable. 2013-05-08 20:16:15 +02:00
Florian Nücke
a14c627cd7 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
283dfb6e7d Alternative @SidedProxy setter for Scala. 2013-05-08 05:36:28 +02:00
LexManos
4db40c7861 Add version detection to astyle and print error if it doesnt detect version 2.0+
Also fixed astyle's config for max-instatement-indent that sometimes caused crashes with certian versions of astyle.
2013-05-03 14:26:27 -07:00
cpw
3d5658b90f Merge pull request #227 from CovertJaguar/patch-1
Improved Entity Spawn Error
2013-04-29 22:10:53 -07:00
CovertJaguar
ce99b80932 Improved Entity Spawn Error 2013-04-29 20:41:20 -07:00
LexManos
42564b3988 Fix scalac detection to actually use the located command instead of defaulting to 'scalac' 2013-04-28 16:35:23 -07:00
LexManos
bff831ce8d Update MCP's md5 for the fixed srg files. 2013-04-28 12:33:42 -07:00
Christian
3baad0a897 Update for minecraft 1.5.2 2013-04-27 01:24:06 -04:00
Christian
2c7c944e96 Don't leave scala running in interactive mode. 2013-04-23 22:56:18 -04:00
LexManos
74e9b293e1 Fix patch derp. 2013-04-23 19:47:43 -07:00
Christian
5a81b37bcf Fix when an old scalac is present on the system to not fail the build 2013-04-23 22:43:51 -04:00
Christian
cee176eb96 Some fixups for scala compilation in MCP. Scala should now be compilable and reobfuscatable with srgnames in MCP. 2013-04-23 07:40:49 -04:00