From 151ee93842a361031479d91f44132f9b561c5000 Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Tue, 30 Aug 2022 07:40:10 -0500
Subject: [PATCH] Move the api sub-project into core

---
 api/build.gradle                              | 38 -------------------
 .../seibel/lod/api/PleaseDeleteThisClass.java |  4 --
 coreSubProjects                               |  2 +-
 settings.gradle                               |  1 +
 4 files changed, 2 insertions(+), 43 deletions(-)
 delete mode 100644 api/build.gradle
 delete mode 100644 api/src/main/java/com/seibel/lod/api/PleaseDeleteThisClass.java

diff --git a/api/build.gradle b/api/build.gradle
deleted file mode 100644
index d01b7b924..000000000
--- a/api/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-version = "API-" + rootProject.versionStr
-
-configurations {
-
-}
-
-dependencies {
-
-}
-
-shadowJar {
-    exclude "architectury.common.json"
-    configurations = [project.configurations.shadowMe]
-
-    // Compression
-    relocate 'org.tukaani', 'distanthorizons.libraries.tukaani'
-    relocate 'org.apache.commons.compress', 'distanthorizons.libraries.apache.commons.compress'
-
-    // Toml & Json for config
-    relocate 'com.electronwill.nightconfig', 'distanthorizons.libraries.electronwill.nightconfig'
-
-    // FIXME: This is a massive library that is located in lots of different spots
-    relocate 'com.googlecode.json-simple', 'distanthorizons.libraries.googlecode.json-simple'
-    relocate 'org.json.simple', 'distanthorizons.libraries.json.simple'
-
-    // Theming
-    relocate 'com.formdev.flatlaf', 'distanthorizons.libraries.formdev.flatlaf'
-
-    // SVG
-    relocate 'com.kitfox.svg', 'distanthorizons.libraries.kitfox.svg'
-
-    classifier null
-    mergeServiceFiles()
-}
-
-// Using jar.finalizedBy(shadowJar) causes issues so we do this scuffed bypass
-jar.dependsOn(shadowJar)
-jar.enabled(false)
\ No newline at end of file
diff --git a/api/src/main/java/com/seibel/lod/api/PleaseDeleteThisClass.java b/api/src/main/java/com/seibel/lod/api/PleaseDeleteThisClass.java
deleted file mode 100644
index 4796333e8..000000000
--- a/api/src/main/java/com/seibel/lod/api/PleaseDeleteThisClass.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.seibel.lod.api;
-
-public interface PleaseDeleteThisClass {
-}
diff --git a/coreSubProjects b/coreSubProjects
index 9799b0a26..14d0e65c6 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 9799b0a263fb9cc30b9b8ed1dce914fe363f0533
+Subproject commit 14d0e65c6887212ab088cb579a308c26944c28af
diff --git a/settings.gradle b/settings.gradle
index 6b94ea1aa..6d881212d 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -15,5 +15,6 @@ include("forge")
 include("core")
 project(":core").projectDir = file('coreSubProjects/core')
 include("api")
+project(":api").projectDir = file('coreSubProjects/api')
 
 rootProject.name = "DistantHorizons"