From 903cb3a5ebebb80610bf9be183931fb7183b1d38 Mon Sep 17 00:00:00 2001
From: Matthew Messinger <mattmess1221@gmail.com>
Date: Tue, 8 Dec 2015 16:53:08 -0500
Subject: [PATCH] merge common with root

---
 build.gradle                                  | 27 +++++++------------
 settings.gradle                               |  2 +-
 .../minelittlepony/common/IPonyArmor.java     |  0
 .../minelittlepony/common/MLPCommonProxy.java |  0
 voxellib/build.gradle                         | 12 ++++++++-
 5 files changed, 21 insertions(+), 20 deletions(-)
 rename {common/src => src}/main/java/com/brohoof/minelittlepony/common/IPonyArmor.java (100%)
 rename {common/src => src}/main/java/com/brohoof/minelittlepony/common/MLPCommonProxy.java (100%)

diff --git a/build.gradle b/build.gradle
index 57acf863..fdc7a2ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,15 +16,6 @@ minecraft {
     tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker'
 	clientJvmArgs += '-Dmcpenv=true'
 }
-project('common') {
-	apply plugin: 'net.minecraftforge.gradle.tweaker-client'
-	minecraft {
-		version = rootProject.minecraft.version
-		mappings = rootProject.minecraft.mappings
-		runDir = rootProject.minecraft.runDir
-		tweakClass = rootProject.minecraft.tweakClass
-	}
-}
 project('forge') {
 	apply plugin: 'net.minecraftforge.gradle.forge'
 	minecraft {
@@ -34,7 +25,7 @@ project('forge') {
 		replace '@VERSION@',project.version
 	}
 	dependencies {
-		provided project(':common')
+		provided rootProject
 	}
 }
 
@@ -57,26 +48,26 @@ repositories.flatDir {
 	dir 'liteloader'
 }
 dependencies {
-	compile project('common')
     deobfProvided 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames'
 	provided voxellib
 }
 jar {
 	manifest.attributes.remove 'TweakClass'
-
-	extension 'litemod'
-	from project('common').sourceSets.main.output
-	from project('forge').sourceSets.main.output
 }
-task standaloneJar(type: Jar, dependsOn: [{voxellib.build}, reobfJar]) {
+task standaloneJar(type: Jar, dependsOn: [{voxellib.reobfObfJar}, {project('forge').compileJava}]) {
 	extension 'litemod'
-	from zipTree(jar.archivePath)
+	from sourceSets.main.output
+	from {project('forge').sourceSets.main.output}
 
 	// voxellib
-    from {voxellib.jar.archivePath}
+    from {voxellib.obfJar.archivePath}
 
     classifier 'standalone'
 }
 artifacts {
     archives standaloneJar
 }
+reobf{
+	jar.task.enabled = false
+	standaloneJar{}
+}
diff --git a/settings.gradle b/settings.gradle
index bf2dc4c4..8ca604a6 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,3 +1,3 @@
 rootProject.name = 'MineLittlePony'
 
-include 'voxellib', 'common', 'forge'
+include 'voxellib', 'forge'
diff --git a/common/src/main/java/com/brohoof/minelittlepony/common/IPonyArmor.java b/src/main/java/com/brohoof/minelittlepony/common/IPonyArmor.java
similarity index 100%
rename from common/src/main/java/com/brohoof/minelittlepony/common/IPonyArmor.java
rename to src/main/java/com/brohoof/minelittlepony/common/IPonyArmor.java
diff --git a/common/src/main/java/com/brohoof/minelittlepony/common/MLPCommonProxy.java b/src/main/java/com/brohoof/minelittlepony/common/MLPCommonProxy.java
similarity index 100%
rename from common/src/main/java/com/brohoof/minelittlepony/common/MLPCommonProxy.java
rename to src/main/java/com/brohoof/minelittlepony/common/MLPCommonProxy.java
diff --git a/voxellib/build.gradle b/voxellib/build.gradle
index f0f52a54..b0d10922 100644
--- a/voxellib/build.gradle
+++ b/voxellib/build.gradle
@@ -15,4 +15,14 @@ repositories.flatDir {
 dependencies {
     deobfCompile 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames'
 }
-jar.manifest.attributes.remove 'TweakClass'
+jar {
+	manifest.attributes.remove 'TweakClass'
+	classifier 'dev'
+}
+task obfJar(type:Jar) {
+	from sourceSets.main.output
+}
+reobf {
+	jar.task.enabled = false
+	obfJar {}
+}
\ No newline at end of file