Commit Graph

1312 Commits

Author SHA1 Message Date
Christian add83f145a Check in patches. Add in some network timeout tweaking values so you can debug the network. 2013-12-06 08:07:09 -05:00
Christian 1c44a6c181 A network design I like. It uses the netty embedded channel to allow mods to build channel pipelines on top of
custom payload packets.
2013-12-06 03:11:03 -05:00
Christian fadff73489 The basic network handshaking for FML is done. All scenarios seem to work. 2013-12-04 00:11:08 -05:00
Christian 37a00f0158 Update gitignore 2013-12-02 23:54:15 -05:00
Christian e5ffbd7fdf Merge branch 'master' of github.com:MinecraftForge/FML
Conflicts:
	install/build.gradle
	patches/minecraft/net/minecraft/client/multiplayer/NetClientHandler.java.patch
	patches/minecraft/net/minecraft/network/NetServerHandler.java.patch
2013-12-02 23:52:27 -05:00
Christian f10969e3aa Pass 1: Most patches are restored.
NOTES: 1. Network is completely broken. 2. GameRegistry is partially broken. 3. ID sync is not in.
2013-12-02 23:48:26 -05:00
cpw b501f21624 Merge pull request #311 from AbrarSyed/patch-3
fix derp in example builscript
2013-11-27 02:13:42 -08:00
Abrar Syed 75b64fe9b8 fix derp in example builscript 2013-11-26 14:23:31 -06:00
Lex Manos 45aa1485b3 Don't validate signatures in dev env. 2013-11-20 13:18:26 -08:00
Lex Manos 7b737de2c1 Make the working directory the root of the eclipse workspace. 2013-11-17 19:26:21 -08:00
LexManos c45c99d07c Merge pull request #307 from AbrarSyed/master
updated samples
2013-11-17 17:58:01 -08:00
AbrarSyed af3e74d940 updated samples 2013-11-17 18:21:24 -06:00
LexManos a5efa91e6a Merge pull request #306 from MinecraftForge/1.6.4
Actually do it correctly. Should be more forge friendly now.
2013-11-17 10:04:27 -08:00
Christian b7b97efe81 Actually do it correctly. Should be more forge friendly now. 2013-11-13 19:10:11 -05:00
Christian 90e3b49ea5 Merge branch '1.6.4' 2013-11-13 07:55:12 -05:00
Christian 56c9c3c77f Way to go, missing import. *sigh* 2013-11-13 07:45:37 -05:00
Christian c060a44371 Don't try and open GUIs on the server. 2013-11-12 18:04:25 -05:00
Christian b8ece10f0b Merge branch '1.6.4' 2013-11-12 17:02:08 -05:00
pahimar 95a8b419ef Add in null protection for client/server sides of handleChat 2013-11-11 14:12:02 -05:00
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
LexManos 0ad83d84c5 Merge pull request #302 from AbrarSyed/patch-1
Update 1.6.4-rel.json
2013-11-09 19:15:34 -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