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

1445 commits

Author SHA1 Message Date
Christian
82004fe703 Kill more references to modloader. 2013-11-10 13:15:26 -05:00
Christian
2867dfdfa5 Remove all public all the time from Minecraft. It is unnecessary with ModLoader gone. DEAL WITH IT. File AT public requests, make a coremod, whatever. This needed to die. 2013-11-10 12:01:26 -05:00
Christian
5cec48da72 Deprecation cleanup. Bye bye more modloader stuffs 2013-11-10 11:58:34 -05:00
Christian
a8e44dad47 First pass : kill modloader, clean up warnings 2013-11-10 11:49:06 -05:00
Lex Manos
394cfa940e Join the developers list in the pom and fix the client run configs in the workspace. 2013-11-09 19:22:17 -08:00
Abrar Syed
43bcf33f49 Update 1.6.4-rel.json 2013-11-09 21:14:58 -06:00
Christian
4cefffa1c9 Change the build to capture an MCP version, also, tweak the sources so mavenLocal can be used for ForgeGradle 2013-11-09 20:00:05 -05:00
Christian
e378a24759 Fix license and naming 2013-11-09 14:28:54 -05:00
AbrarSyed
923b2069ec added src distribution gradle file 2013-11-09 14:28:54 -05:00
Lex Manos
b4a5c25d36 Move to install to not clutter root directory with the .bat and .sh files I know are coming. 2013-11-09 14:28:54 -05:00
Lex Manos
e034f74311 Include eclipse template workspace, for packaging in src distro. 2013-11-09 14:28:54 -05:00
Lex Manos
8364a4e522 Add gradle wrapper 2013-11-09 14:28:53 -05:00
Lex Manos
d0bae88b04 Publish to repo folder for local testing. 2013-11-09 14:28:53 -05:00
AbrarSyed
c272eceac8 Step 3: The Rebirth 2013-11-09 14:28:53 -05:00
Lex Manos
d41794a9b6 Step 2: The Reformation 2013-11-09 14:28:53 -05:00
AbrarSyed
d2d36880b0 Step 1: The Purge 2013-11-09 14:28:53 -05:00
Christian
7831555a7f Add in the ability to strip interface references for specific interfaces - this is probably mostly useful for 
scala scenarios where sythetic methods are generated and is not a substitute for using Optional.Method where appropriate.
Closes #300
 2013-11-09 14:27:15 -05:00
Christian
3b42a14dba Change a couple of warnings, as a prelude to 1.7- preinit is now required for all GameRegistry activity, and every item and block REQUIRES registration. 2013-11-06 16:18:41 -05:00
Christian
83d8713bea Fix derp with custom properties. They work now! 2013-11-05 22:23:24 -05:00
Christian
289678252b Fix recursive API dependency resolution. Allows nested APIs, such as BuildCraft's 2013-10-31 09:39:34 -04:00
Christian
cfeebf7810 Fix up duplicate entries 2013-10-30 22:46:19 -04:00
Christian
ee8630bc55 Add in an API marker for API type packages. 
This does several things:
1. Packages marked as API will generate a new "modid" (the provides) that can be depended on.
2. Packages marked as API will be searched systemwide, and anything declaring that package (even without the API marker)
will get an implicit dependency on the API package.
3. The API package itself will get a soft dependency on the "owner" package.

@Optional elements can refer to the API packages instead of a concrete mod as well.
 2013-10-30 22:20:28 -04:00
Christian
9efeaa8caa Attempt to inject coremods as tweakers, so both can share a dependency ordering 2013-10-27 13:28:50 -04:00
Christian
f7a6bb7eb7 Wrapping coremods as tweakers. Part 1. 2013-10-20 11:53:07 +02:00
Christian
cfb78d482a Fix up documentation of VersionCheckHandler - it only ever accepted a String and only works on the NetworkMod annotated class 2013-10-20 11:45:00 +02:00
Christian
09c7df2bb3 Modify ordering of networkmod registration and mod instantiation. This fixes VersionCheckHandler logging an incorrect failure message due 
to NPE.
 2013-10-20 11:41:28 +02:00
Lex Manos
0b0b94978c Make each mod's EventBus log a child of it's main logger. 2013-10-19 18:24:24 -07:00
Christian
fa97bebf34 Fix up handling the new method signature data for NetworkCheckHandlers 2013-10-14 21:28:15 -04:00
Christian
c56f2e3b37 Use null to empty, so missing values work. *sigh* 2013-10-13 22:36:47 -04:00
Christian
5e03f2e85b Primitive capability for tweakers to order. Add a "TweakOrder" integer 
property to your manifest, or accept the default of zero.
 2013-10-12 10:28:11 -04:00
Kevin Ji
cfcdb92c8e Very minor style fixes 
Replacing tabs with spaces consistently, making brace styles consistent, etc.
 2013-10-09 19:53:50 -07:00
Christian
daf454af62 Support, and fix up, interface lists for Optional 2013-10-09 13:58:14 -04:00
Lex Manos
1754a5820a Delay sound system backend initalization to speed up startup and prevent race condition on some computers. 2013-10-06 11:13:07 -07:00
Christian
b542f13c5c ModLoader is officially deprecated. It will all cease to be with 1.7. 2013-10-06 11:06:31 -04:00
Christian
955d532264 Optional shouldn't be constructable itself. It's purely a wrapper thing. 2013-10-06 10:56:47 -04:00
Christian
19173a7b97 Add in support for Optional interfaces and methods. Be gone coremods! 2013-10-04 17:20:05 -04:00
Christian
ea25a3ffd0 Fix null killing the server 2013-09-29 15:51:38 -04:00
Lex Manos
7e53a294fe Fix md5s for new checksums.sha1 in scala libraries. 2013-09-28 19:47:32 -07:00
Christian
05c66728e7 Attempt at a shared modlist implementation - should allow visibility between liteloader and fml for "mod list display" 2013-09-27 10:45:20 -04:00
Christian
dc72bfe56a Cross-modsystem compatibility fix with thanks to Mumfrey @ liteloader 2013-09-27 10:01:39 -04:00
Christian
ef70a1d29e Add to both the classloader and the parent 2013-09-26 13:01:00 -04:00
Christian
9bcf633e8c Fix deobf tweaker 2013-09-26 10:11:29 -04:00
Christian
036cda37b0 TYPOS!!! 2013-09-26 09:33:48 -04:00
Christian
cbf22b0ab5 Separate deobf tweaker so it runs last. Should fix problems with cascaded tweakers 
expecting an obf environment.
 2013-09-26 09:23:25 -04:00
Christian
952d602f49 Update for launchwrapper 1.8 2013-09-25 16:40:59 -04:00
Christian
61ae96f03a Use the negative cache in latest legacylauncher. 2013-09-25 11:46:11 -04:00
Christian
96d9c3b8bc Add debugging for deobfuscation 
Add negative caching for field and method maps. Should shortcut some work

Fix handling the case where a class doesn't exist, but still needs deobf

Ask the patch manager for the bytes for the class, not the classLoader

Fix up some more places where we should look for a patched class

Fix problem with empty source classes and runtime deobfuscation
 2013-09-25 07:37:25 -04:00
Lex Manos
c1623cb8e3 Update to new installer that uses xz compression and better support for non-standard jvms 2013-09-24 23:21:17 -07:00
Christian
8f17d1c694 And use the parent that's actually going to be valid. *sigh* 2013-09-24 08:42:13 -04:00
Christian
8929267b20 Herpaderp. Make addURL accessible. *sigh* 2013-09-24 07:33:11 -04:00
Christian
48c92084da Fix injection of tweaker into system 2013-09-23 13:33:16 -04:00
Simon McVittie
5bf7d3cb4b Fix NPE when loading second single-player world 
After leaving a single-player world, getServer() can return null, resulting
in the stack trace below, "Fatal errors were detected during the
transition from SERVER_STOPPING to SERVER_ABOUT_TO_START",
"The ForgeModLoader state engine has become corrupted" and the client
getting stuck forever.

Exception in thread "Server thread" java.lang.NullPointerException
at cpw.mods.fml.client.FMLClientHandler.serverStopped(FMLClientHandler.java:620)
at cpw.mods.fml.common.FMLCommonHandler.handleServerStopped(FMLCommonHandler.java:468)
at net.minecraft.server.MinecraftServer.run(MinecraftServer.java:471)
at net.minecraft.server.ThreadMinecraftServer.run(SourceFile:583)
 2013-09-22 16:56:24 +01:00
Christian
85811a013d Fix classpath for launchwrapper 1.7 2013-09-21 16:15:05 -04:00
Christian
0c365eb893 Update workspaces for 1.6.4 2013-09-20 17:23:18 -04:00
Christian
da0972980b Fix up a deep crash in the early server init hanging the client 2013-09-20 17:12:01 -04:00
Christian
74b7cba492 Update for MC 1.6.4 2013-09-20 16:25:12 -04:00
Lex Manos
1928c177ac Make final transformers actually work on methods as well. 2013-09-19 12:59:12 -07:00
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
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
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
Christian
e97834b433 Fix URL for MCP 2013-04-23 07:22:25 -04:00
Christian
4d442ac219 Fix possible NPEs in GameData 2013-04-22 21:14:34 -04:00
Christian
8974a78c0a Attempt to reduce lines on the screen for id mismatch. Hopefully prevents game crashes. 2013-04-22 21:14:34 -04:00
cpw
d15889075c Merge pull request #225 from MarcinSc/master 
Suggested fix for issue 221
 2013-04-21 11:32:51 -07:00
Marcin Sciesinski
bdee7e3c5b Fixing the GameRegistry. Now it is possible to register a Block with a BlockItem using following code: 
MyBlock myBlock = new MyBlock();
GameRegistry.registerBlock(myBlock, MyBlockItem.class, "myBlock");
where MyBlockItem class has one constructor with signature:
public MyBlockItem(int id, Block block)
 2013-04-21 19:01:18 +01:00
Christian
0512525c58 Add a to string to fmlmodcontainer: should mean less derpy cyclic dependency data 2013-04-21 13:58:18 -04:00
Glought
074d7c2ec7 Update FMLDeobfuscatingRemapper.java 
Fixes a "Type mismath:cannot convert from element type Object to FieldNode" error at line 176.
 2013-04-21 05:09:19 -07:00
Christian
3446f1ce26 Fix scala supporting SidedProxy. It should work now. 2013-04-20 23:31:22 -04:00
Christian
6c0bb61425 Fix a small modloader compatibility derp: closes #222 2013-04-20 22:55:56 -04:00
Christian
e204d580a8 Fix possible NPE in findItemStack, closes #218 2013-04-17 07:55:33 -04:00
Christian
3d142df102 Use more expressive language when a version specifier is a simple unbounded above condition 2013-04-16 13:46:55 -04:00
Christian
0888a95f2d Fix to output versions in crash logs 2013-04-16 13:46:55 -04:00
cpw
470070e2ce Merge pull request #216 from agaricusb/add-srgname 
Add srgname to registerTileEntityWithAlternatives
 2013-04-15 15:50:47 -07:00
Christian
1a9cb9e3c9 Add in some caching of the read field descriptions for efficiency 2013-04-15 17:30:35 -04:00
Agaricus
03bc9cf00a Add type info to properly deobfuscate overloaded fields. Fixes #210. 2013-04-14 16:54:11 -07:00
Agaricus
76275cafc4 Add srgname to registerTileEntityWithAlternatives 2013-04-14 14:11:37 -07:00
Christian
0a1f3e3150 MCP names update 2013-04-10 12:28:20 -04:00
LexManos
d89f0dc683 Re-worked the Texture patches, optifine helper function, and re-added support for dynamically rotating the texture for mod authors who do things horribly wrong. 2013-04-09 20:06:41 -07:00
Christian
ff95739dc8 Fix compilation derp, and clean up rotation helper. 2013-04-09 21:20:31 -04:00
Christian
2208df18c4 And add the patches *sigh* 2013-04-09 20:26:10 -04:00
Christian
10f08460a6 Very significant improvement in performance by using glSubImage to upload data. Inspired by frequent complaints about performance of hires 
texture packs. They probably still need a beefy system but should work. Hopefully I can figure out why the subImage GL side copy isn't working
properly for an even more significant speed boost. But this gets things started.
 2013-04-09 20:15:14 -04:00
LexManos
bc44fbe7dd Fixed issue with instalation when java/javac commands had quotes. 2013-04-05 10:26:33 -07:00
LexManos
5cd066767a Sanitize input to isRemappedClass to use '/' as a package seperator like the srg files. 2013-04-04 23:30:10 -07:00
LexManos
2c0133af1d Added the ability to save transformed classes to disc for debugging. 2013-04-04 10:32:48 -07:00