final module name refactor prior to release, hopefully

build.gradle

@@ -16,8 +16,12 @@ def mcVersion = "1.14.1 Pre-Release 2"
 def yarnVersion = "+build.2"
 
 def getSubprojectVersion(project, version) {
-	def latestCommit = grgit.log(paths: [project.name], maxCommits: 1).get(0)
-	return version + "+" + latestCommit.id.substring(0, 8)
+	def latestCommits = grgit.log(paths: [project.name], maxCommits: 1)
+	if (latestCommits.isEmpty()) {
+		return version + "+uncommited"
+	} else {
+		return version + "+" + latestCommits.get(0).id.substring(0, 8)
+	}
 }
 
 allprojects {
@@ -155,6 +159,7 @@ publishing {
 
 task licenseFormatAll
 subprojects { p -> licenseFormatAll.dependsOn("${p.path}:licenseFormat") }
+subprojects.each { remapJar.dependsOn("${it.path}:remapJar") }
 
 dependencies {
 	afterEvaluate {

fabric-api-base/build.gradle

@@ -1,2 +1,2 @@
-archivesBaseName = "fabric-lib"
+archivesBaseName = "fabric-api-base"
 version = getSubprojectVersion(project, "0.1.0")

fabric-api-base/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "fabric-lib",
+  "id": "fabric-api-base",
   "version": "${version}",
   "license": "Apache-2.0"
-}
+}

fabric-commands-v0/build.gradle

@@ -0,0 +1,6 @@
+archivesBaseName = "fabric-commands-v0"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':fabric-api-base', configuration: 'dev')
+}

fabric-commands-v0/src/main/resources/fabric.mod.json

@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
-  "id": "fabric-keybindings",
+  "id": "fabric-commands-v0",
   "version": "${version}",
   "license": "Apache-2.0",
   "mixins": [
-    "fabric-keybindings.mixins.json"
+    "fabric-commands-v0.mixins.json"
   ]
 }

fabric-commands/build.gradle

@@ -1,6 +0,0 @@
-archivesBaseName = "fabric-registry-commands"
-version = getSubprojectVersion(project, "0.1.0")
-
-dependencies {
-	compile project(path: ':fabric-lib', configuration: 'dev')
-}

fabric-containers-v0/build.gradle

@@ -0,0 +1,7 @@
+archivesBaseName = "fabric-containers-v0"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':fabric-api-base', configuration: 'dev')
+	compile project(path: ':fabric-networking-v0', configuration: 'dev')
+}

fabric-containers-v0/src/main/resources/fabric.mod.json

@@ -1,14 +1,14 @@
 {
   "schemaVersion": 1,
-  "id": "fabric-containers",
+  "id": "fabric-containers-v0",
   "version": "${version}",
   "license": "Apache-2.0",
   "mixins": [
-    "fabric-containers.mixins.json"
+    "fabric-containers-v0.mixins.json"
   ],
   "entrypoints": {
     "client": [
       "net.fabricmc.fabric.impl.client.gui.ScreenProviderRegistryImpl::init"
     ]
   }
-}
+}

fabric-containers/build.gradle

@@ -1,7 +0,0 @@
-archivesBaseName = "fabric-containers"
-version = getSubprojectVersion(project, "0.1.0")
-
-dependencies {
-	compile project(path: ':fabric-lib', configuration: 'dev')
-	compile project(path: ':fabric-networking', configuration: 'dev')
-}

fabric-content-registries-v0/build.gradle

@@ -0,0 +1,7 @@
+archivesBaseName = "fabric-content-registries-v0"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':fabric-api-base', configuration: 'dev')
+	compile project(path: ':fabric-resource-loader-v0', configuration: 'dev')
+}

fabric-content-registries-v0/src/main/resources/fabric.mod.json

@@ -0,0 +1,9 @@
+{
+  "schemaVersion": 1,
+  "id": "fabric-content-registries-v0",
+  "version": "${version}",
+  "license": "Apache-2.0",
+  "mixins": [
+    "fabric-content-registries-v0.mixins.json"
+  ]
+}

fabric-content-registries/build.gradle

@@ -1,7 +0,0 @@
-archivesBaseName = "fabric-content-registries"
-version = getSubprojectVersion(project, "0.1.0")
-
-dependencies {
-	compile project(path: ':fabric-lib', configuration: 'dev')
-	compile project(path: ':fabric-resource-loader', configuration: 'dev')
-}

fabric-content-registries/src/main/resources/fabric.mod.json

@@ -1,9 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "fabric-content-registries",
-  "version": "${version}",
-  "license": "Apache-2.0",
-  "mixins": [
-    "fabric-content-registries.mixins.json"
-  ]
-}

fabric-crash-report-info-v1/build.gradle

@@ -1,2 +1,2 @@
-archivesBaseName = "fabric-crash-report-info"
+archivesBaseName = "fabric-crash-report-info-v1"
 version = getSubprojectVersion(project, "0.1.0")

fabric-crash-report-info-v1/src/main/resources/fabric.mod.json

@@ -0,0 +1,9 @@
+{
+  "schemaVersion": 1,
+  "id": "fabric-crash-report-info-v1",
+  "version": "${version}",
+  "license": "Apache-2.0",
+  "mixins": [
+    "fabric-crash-report-info-v1.mixins.json"
+  ]
+}

fabric-crash-report-info/src/main/resources/fabric.mod.json

@@ -1,9 +0,0 @@
-{
-  "schemaVersion": 1,
-  "id": "fabric-crash-report-info",
-  "version": "${version}",
-  "license": "Apache-2.0",
-  "mixins": [
-    "fabric-crash-report-info.mixins.json"
-  ]
-}

fabric-events-interaction-v0/build.gradle

@@ -0,0 +1,6 @@
+archivesBaseName = "fabric-events-interaction-v0"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':fabric-api-base', configuration: 'dev')
+}

fabric-events-interaction-v0/src/main/resources/fabric.mod.json

@@ -1,6 +1,6 @@
 {
   "schemaVersion": 1,
-  "id": "fabric-events-interaction",
+  "id": "fabric-events-interaction-v0",
   "version": "${version}",
   "license": "Apache-2.0",
   "entrypoints": {
@@ -12,6 +12,6 @@
     ]
   },
   "mixins": [
-    "fabric-events-interaction.mixins.json"
+    "fabric-events-interaction-v0.mixins.json"
   ]
 }

fabric-events-interaction/build.gradle

@@ -1,6 +0,0 @@
-archivesBaseName = "fabric-events-interaction"
-version = getSubprojectVersion(project, "0.1.0")
-
-dependencies {
-	compile project(path: ':fabric-lib', configuration: 'dev')
-}

fabric-events-lifecycle-v0/build.gradle

@@ -0,0 +1,6 @@
+archivesBaseName = "fabric-events-lifecycle-v0"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':fabric-api-base', configuration: 'dev')
+}

fabric-events-lifecycle-v0/src/main/resources/fabric.mod.json

@@ -1,9 +1,9 @@
 {
   "schemaVersion": 1,
-  "id": "fabric-events-lifecycle",
+  "id": "fabric-events-lifecycle-v0",
   "version": "${version}",
   "license": "Apache-2.0",
   "mixins": [
     "fabric-events-lifecycle.mixins.json"
   ]
-}
+}

fabric-events-lifecycle/build.gradle

@@ -1,6 +0,0 @@
-archivesBaseName = "fabric-events-lifecycle"
-version = getSubprojectVersion(project, "0.1.0")
-
-dependencies {
-	compile project(path: ':fabric-lib', configuration: 'dev')
-}

fabric-item-groups-v0/build.gradle

@@ -0,0 +1,6 @@
+archivesBaseName = "fabric-item-groups-v0"
+version = getSubprojectVersion(project, "0.1.0")
+
+dependencies {
+	compile project(path: ':fabric-resource-loader-v0', configuration: 'dev')
+}