diff --git a/build.gradle b/build.gradle
index c9a531d..283416b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,6 +5,9 @@ plugins {
     id 'net.minecraftforge.gradle' version '[6.0,6.2)'
 }
 
+// Enable the Jar-in-Jar system for your mod
+jarJar.enable()
+
 version = mod_version
 group = mod_group_id
 
@@ -105,23 +108,12 @@ minecraft {
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
         }
-        
-        all {
-            lazyToken('minecraft_classpath') {
-                configurations.embed.copyRecursive().resolve().collect { it.absolutePath }.join(File.pathSeparator)
-            }
-        }
     }
 }
 
 // Include resources generated by data generators.
 sourceSets.main.resources { srcDir 'src/generated/resources' }
 
-configurations {
-    embed
-    implementation.extendsFrom(embed)
-}
-
 repositories {
     // Put repositories for dependencies here
     // ForgeGradle automatically adds the Forge maven and Maven Central for you
@@ -150,7 +142,9 @@ dependencies {
     // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"],
     // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository.
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    embed "org.jgrapht:jgrapht-core:${jgt_version}"
+
+    minecraftLibrary "org.jgrapht:jgrapht-core:${jgt_version}"
+    jarJar(group: "org.jgrapht", name: "jgrapht-core", version: "[${jgt_version}]")
 
     // Example mod dependency with JEI - using fg.deobf() ensures the dependency is remapped to your development mappings
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
@@ -200,10 +194,6 @@ tasks.named('jar', Jar).configure {
                 'Implementation-Timestamp': new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
-
-    // TODO figure out if leaving this out causes jgrapht to be left out of the jar
-    // from configurations.embed.collect { it.isDirectory() ? it : zipTree(it) }
-
     // This is the preferred method to reobfuscate your jar file
     finalizedBy 'reobfJar'
 }
@@ -217,6 +207,8 @@ tasks.named('jar', Jar).configure {
 publishing {
     publications {
         register('mavenJava', MavenPublication) {
+            groupId mod_group_id
+            artifactId mod_name
             artifact jar
             pom.withXml {
                 def node = asNode()