From b33f7bbabd95805ba8c0de63cbecabebd85c7fa5 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 5 Sep 2022 11:27:16 -0500 Subject: [PATCH] add commonInterface 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 insertions(+) create mode 100644 commonInterface/build.gradle rename {core => commonInterface}/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java (100%) rename {core => commonInterface}/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java (100%) diff --git a/commonInterface/build.gradle b/commonInterface/build.gradle new file mode 100644 index 000000000..8c0121a81 --- /dev/null +++ b/commonInterface/build.gradle @@ -0,0 +1,38 @@ +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/core/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java similarity index 100% rename from core/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java rename to commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ClientApi.java diff --git a/core/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java b/commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java similarity index 100% rename from core/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java rename to commonInterface/src/main/java/com/seibel/lod/core/api/internal/a7/ServerApi.java