diff --git a/.gitignore b/.gitignore
index 7406d75..17f3765 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@
 /classes/
 /output/
 debug/
+run/
 
 /javadocs/
 *-javadoc/
diff --git a/build.gradle b/build.gradle
index 2e9fbe2..71e872c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,6 +18,27 @@ archivesBaseName = "fairyfactions"
 
 minecraft {
 	mappings channel: 'snapshot', version: '20200514-1.16'
+
+	runs {
+		client {
+			workingDirectory project.file('run')
+
+			mods {
+				fairyfactions {
+					source sourceSets.main
+				}
+			}
+		}
+		server {
+			workingDirectory project.file('run')
+
+			mods {
+				fairyfactions {
+					source sourceSets.main
+				}
+			}
+		}
+	}
 }
 
 dependencies {
@@ -32,7 +53,6 @@ jar {
 		attributes([
 			"Specification-Title": "fairyfactions",
 			"Specification-Vendor": "allaryin",
-			"Specification-Version": "0.6.0",
 			"Implementation-Title": project.name,
 			"Implementation-Version": "${version}",
 			"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
new file mode 100644
index 0000000..3840e46
--- /dev/null
+++ b/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,30 @@
+modLoader="javafml"
+loaderVersion="[33,)"
+license="Apache-2.0"
+issueTrackerURL="https://github.com/allaryin/FairyFactions/issues"
+showAsResourcePack=false
+
+[[mods]]
+    modId="fairyfactions"
+    version="${file.jarVersion}"
+    displayName="Fairy Factions"
+    displayURL="https://www.curseforge.com/minecraft/mc-mods/fairy-factions"
+    authors="allaryin"
+    credits="KodaichiZero - original mod"
+    description='''
+    Taming tribal fairies for silliness, fun, and profit!
+    '''
+
+    [[dependencies.fairyfactions]]
+        modId="forge"
+        mandatory=true
+        versionRange="[33.0,)"
+        ordering="AFTER"
+        side="BOTH"
+
+    [[dependencies.fairyfactions]]
+        modId="minecraft"
+        mandatory=true
+        versionRange="[1.16.2]"
+        ordering="NONE"
+        side="BOTH"
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
deleted file mode 100644
index ac7ff07..0000000
--- a/src/main/resources/mcmod.info
+++ /dev/null
@@ -1,16 +0,0 @@
-[
-{
-  "modid": "FairyFactions",
-  "name": "Fairy Factions",
-  "description": "",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
-  "url": "",
-  "updateUrl": "",
-  "authorList": ["allaryin"],
-  "credits": "KodaichiZero - original mod",
-  "logoFile": "",
-  "screenshots": [],
-  "dependencies": []
-}
-]
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
new file mode 100644
index 0000000..d344bed
--- /dev/null
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "Fairy Factions resources",
+        "pack_format": 6
+    }
+}
\ No newline at end of file