From bbfa14bce0475e0affa56c2ddb449c886f60dbc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Sat, 9 Jan 2021 20:10:40 +0100
Subject: [PATCH] Moved Sedna etc. to separate mod we depend on.

---
 LICENSE                               |  2 +-
 build.gradle                          | 25 +++++++++----------------
 gradle.properties                     |  2 ++
 src/main/resources/META-INF/mods.toml | 12 +++++++++---
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/LICENSE b/LICENSE
index f1d5d46a..c8f3b7e4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Florian "Sangar" Nücke
+Copyright (c) 2020-2021 Florian "Sangar" Nücke
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/build.gradle b/build.gradle
index 8d36904f..7382030b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -44,11 +44,6 @@ archivesBaseName = "${mod_name}-MC${minecraft_version}"
 sourceCompatibility = targetCompatibility = JavaVersion.VERSION_1_8
 compileJava.sourceCompatibility = compileJava.targetCompatibility = JavaVersion.VERSION_1_8
 
-configurations {
-    embed
-    implementation.extendsFrom embed
-}
-
 repositories {
     mavenCentral()
     maven { url "http://dvs1.progwml6.com/files/maven" } // JEI
@@ -60,13 +55,17 @@ dependencies {
 
     compileOnly 'org.jetbrains:annotations:16.0.2'
 
-    embed('li.cil.ceres:ceres:0.0.2+') { transitive = false }
-    embed('li.cil.sedna:sedna:0.0.1+') { transitive = false }
-    embed('li.cil.sedna:sedna-buildroot:0.0.1+') { transitive = false }
+    implementation 'li.cil.ceres:ceres:0.0.2+18'
+    implementation 'li.cil.sedna:sedna:0.0.1+83'
+    implementation 'li.cil.sedna:sedna-buildroot:0.0.1+'
+    implementation 'li.cil.oc2:oc2-sedna:0.0.1+'
 
     compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")
 
+    testImplementation 'li.cil.ceres:ceres:0.0.2+18'
+    testImplementation 'li.cil.sedna:sedna:0.0.1+83'
+
     testImplementation "org.mockito:mockito-core:2.+"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.3.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.3.1'
@@ -77,13 +76,13 @@ processResources {
         include 'META-INF/mods.toml'
 
         expand([
-                'mod_id'               : mod_id,
                 'mod_version'          : version,
                 'mod_name'             : mod_name,
                 'mod_url'              : mod_url,
                 'mod_issues_url'       : mod_issues_url,
                 'forge_version_min'    : forge_version_min,
-                'minecraft_version_min': minecraft_version_min
+                'minecraft_version_min': minecraft_version_min,
+                'oc2_sedna_version_min': oc2_sedna_version_min
         ])
     }
 }
@@ -139,12 +138,6 @@ minecraft {
 jar {
     finalizedBy 'reobfJar'
 
-    configurations.embed.each {
-        from(project.zipTree(it)) {
-            exclude 'META-INF', 'META-INF/**'
-        }
-    }
-
     manifest {
         attributes([
                 "Specification-Title"     : "oc2",
diff --git a/gradle.properties b/gradle.properties
index 8da3ccf2..f08a06b1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,6 +19,8 @@ version_major=0
 version_minor=0
 version_patch=1
 
+oc2_sedna_version_min=0.0.1
+
 jei_version=7.6.0.58
 
 curse.project.id=0
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 96cd8a9d..5d5b7d15 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -4,7 +4,7 @@ issueTrackerURL = "${mod_issues_url}"
 license = "MIT"
 
 [[mods]]
-modId = "${mod_id}"
+modId = "oc2"
 version = "${mod_version}"
 displayName = "${mod_name}"
 displayURL = "${mod_url}"
@@ -14,15 +14,21 @@ description = '''
 Modern computers for the modern player.
 '''
 
-[[dependencies.scannable]]
+[[dependencies.oc2]]
 modId = "forge"
 mandatory = true
 versionRange = "[${forge_version_min},)"
 ordering = "NONE"
 side = "BOTH"
-[[dependencies.scannable]]
+[[dependencies.oc2]]
 modId = "minecraft"
 mandatory = true
 versionRange = "[${minecraft_version_min}]"
 ordering = "NONE"
 side = "BOTH"
+[[dependencies.oc2]]
+modId = "oc2-sedna"
+mandatory = true
+versionRange = "[${oc2_sedna_version_min}]"
+ordering = "NONE"
+side = "BOTH"
\ No newline at end of file