Unify Forge and Vanilla implementation. Closes #245.

Thanks to @Voltasalt for helping with this.

.gitattributes

@@ -1,6 +1,12 @@
 # Normalize as LF in the repository, OS native locally
 * text=auto
+
+*.bat text eol=crlf
+gradlew text eol=lf
+*.sh text eol=lf
+
 *.java text
+*.java diff=java
 
 # Binary files that should not be modified
 *.dat binary

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "SpongeAPI"]
-	path = SpongeAPI
-	url = git://github.com/SpongePowered/SpongeAPI.git
-[submodule "Mixin"]
-	path = Mixin
-	url = git://github.com/SpongePowered/Mixin.git
+[submodule "Common"]
+	path = Common
+	url = https://github.com/SpongePowered/SpongeCommon.git

.travis.yml

@@ -1,12 +1,19 @@
 sudo: false
+
 language: java
 jdk:
   - openjdk6
   - openjdk7
   - oraclejdk7
   - oraclejdk8
+
+git:
+  submodules: false
+before_install: git submodule update --init --recursive
+
 env: GRADLE_OPTS="-Xms1g -Xmx3g"
-install: gradle setupCIWorkspace
-script: gradle build
+install: ./gradlew setupCIWorkspace
+script: ./gradlew build
+
 notifications:
   email: false

README.md

@@ -16,25 +16,25 @@ A Forge implementation of the Sponge API. It is licensed under the [MIT License]
 
 ## Clone
 The following steps will ensure your project is cloned properly.  
-1. `git clone [email protected]:SpongePowered/Sponge.git`  
-2. `cd Sponge`  
-3. `git submodule update --init --recursive`  
-4. `cp scripts/pre-commit .git/hooks`
+
+1. `git clone --recursive https://github.com/SpongePowered/Sponge.git`
+2. `cd Sponge`
+3. `cp scripts/pre-commit .git/hooks`
 
 ## Setup
 __Note:__ If you do not have [Gradle] installed then use ./gradlew for Unix systems or Git Bash and gradlew.bat for Windows systems in place of any 'gradle' command.
 
 __For [Eclipse]__  
   1. Run `gradle setupDecompWorkspace --refresh-dependencies`  
-  2. Make sure you have the Gradle plugin installed (Help > Eclipse Marketplace > Gradle Integration Plugin)  
-  3. Import Sponge as a Gradle project (File > Import)
-  4. Select the root folder for Sponge and click **Build Model**
+  2. Run `gradle eclipse`
+  3. Import Sponge as an existing project (File > Import > General)
+  4. Select the root folder for Sponge and make sure `Search for nested projects` is enabled
   5. Check Sponge when it finishes building and click **Finish**
 
 __For [IntelliJ]__  
   1. Run `gradle setupDecompWorkspace --refresh-dependencies`  
   2. Make sure you have the Gradle plugin enabled (File > Settings > Plugins).  
-  3. Click File > Import Module and select the **build.gradle** file for Sponge.
+  3. Click File > New > Project from Existing Sources > Gradle and select the root folder for Sponge.
 
 ## Running
 __Note:__ The following is aimed to help you setup run configurations for Eclipse and IntelliJ, if you do not want to be able to run Sponge directly from your IDE then you can skip this.  
@@ -72,7 +72,6 @@ __Server__
 | Working directory | ./run/server (Included in project) |
 | Module classpath  | Sponge (IntelliJ Only)             |
 
-
 ## Building
 __Note:__ If you do not have [Gradle] installed then use ./gradlew for Unix systems or Git Bash and gradlew.bat for Windows systems in place of any 'gradle' command.