From d21e334e15c30d5b9ea641c53648a8bc085f28fc Mon Sep 17 00:00:00 2001
From: James Seibel <jeseibel@gondtc.com>
Date: Sat, 10 Sep 2022 20:02:50 -0500
Subject: [PATCH] move Client/Server API back into the Core sub-project

---
 commonInterface/build.gradle                  | 38 -------------------
 .../lod/core/api/internal/a7/ClientApi.java   |  0
 .../lod/core/api/internal/a7/ServerApi.java   |  0
 3 files changed, 38 deletions(-)
 delete mode 100644 commonInterface/build.gradle
 rename {commonInterface => core}/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java (100%)
 rename {commonInterface => core}/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java (100%)

diff --git a/commonInterface/build.gradle b/commonInterface/build.gradle
deleted file mode 100644
index 8c0121a81..000000000
--- a/commonInterface/build.gradle
+++ /dev/null
@@ -1,38 +0,0 @@
-version = "Core-Shared-" + 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/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java
similarity index 100%
rename from commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java
rename to core/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java
diff --git a/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java b/core/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java
similarity index 100%
rename from commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java
rename to core/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java