From 64dc2089c3333a0eed10069521bedd7c58e44110 Mon Sep 17 00:00:00 2001 From: Lixfel Date: Sat, 24 Sep 2022 20:20:57 +0200 Subject: [PATCH] Fix Build and missing SchematicData function --- SpigotCore_10/build.gradle | 2 +- SpigotCore_12/build.gradle | 2 +- SpigotCore_14/build.gradle | 4 ++-- SpigotCore_15/build.gradle | 2 +- SpigotCore_18/build.gradle | 6 +++--- SpigotCore_19/build.gradle | 4 ++-- SpigotCore_8/build.gradle | 4 ++-- SpigotCore_9/build.gradle | 2 +- SpigotCore_Main/build.gradle | 2 +- SpigotCore_Main/src/de/steamwar/sql/SchematicData.java | 6 +++--- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SpigotCore_10/build.gradle b/SpigotCore_10/build.gradle index 2157455..21565c9 100644 --- a/SpigotCore_10/build.gradle +++ b/SpigotCore_10/build.gradle @@ -43,7 +43,7 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") + compileOnly project(":SpigotCore_Main") compileOnly swdep("Spigot-1.10") } diff --git a/SpigotCore_12/build.gradle b/SpigotCore_12/build.gradle index 6b6e5df..571fa60 100644 --- a/SpigotCore_12/build.gradle +++ b/SpigotCore_12/build.gradle @@ -43,7 +43,7 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") + compileOnly project(":SpigotCore_Main") compileOnly swdep("Spigot-1.12") } diff --git a/SpigotCore_14/build.gradle b/SpigotCore_14/build.gradle index 8aa97f9..1effd11 100644 --- a/SpigotCore_14/build.gradle +++ b/SpigotCore_14/build.gradle @@ -43,8 +43,8 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") - implementation project(':CommonCore') + compileOnly project(":SpigotCore_Main") + compileOnly project(':CommonCore') compileOnly project(":SpigotCore_8") compileOnly project(":SpigotCore_9") diff --git a/SpigotCore_15/build.gradle b/SpigotCore_15/build.gradle index d5adbc4..5d6bf1e 100644 --- a/SpigotCore_15/build.gradle +++ b/SpigotCore_15/build.gradle @@ -43,7 +43,7 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") + compileOnly project(":SpigotCore_Main") compileOnly swdep("Spigot-1.15") } diff --git a/SpigotCore_18/build.gradle b/SpigotCore_18/build.gradle index f95ffc5..ea1260c 100644 --- a/SpigotCore_18/build.gradle +++ b/SpigotCore_18/build.gradle @@ -43,9 +43,9 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") - implementation project(":SpigotCore_14") - implementation project(':CommonCore') + compileOnly project(":SpigotCore_Main") + compileOnly project(":SpigotCore_14") + compileOnly project(':CommonCore') compileOnly swdep("WorldEdit-1.15") diff --git a/SpigotCore_19/build.gradle b/SpigotCore_19/build.gradle index 05103f3..6f8f9d6 100644 --- a/SpigotCore_19/build.gradle +++ b/SpigotCore_19/build.gradle @@ -43,8 +43,8 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") - implementation project(":SpigotCore_14") + compileOnly project(":SpigotCore_Main") + compileOnly project(":SpigotCore_14") compileOnly project(":SpigotCore_18") compileOnly swdep("WorldEdit-1.15") diff --git a/SpigotCore_8/build.gradle b/SpigotCore_8/build.gradle index 4a72bb4..58ea10e 100644 --- a/SpigotCore_8/build.gradle +++ b/SpigotCore_8/build.gradle @@ -43,8 +43,8 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") - implementation project(':CommonCore') + compileOnly project(":SpigotCore_Main") + compileOnly project(':CommonCore') compileOnly swdep("Spigot-1.8") compileOnly swdep("WorldEdit-1.12") diff --git a/SpigotCore_9/build.gradle b/SpigotCore_9/build.gradle index b3f804a..4585a01 100644 --- a/SpigotCore_9/build.gradle +++ b/SpigotCore_9/build.gradle @@ -43,7 +43,7 @@ sourceSets { } dependencies { - implementation project(":SpigotCore_Main") + compileOnly project(":SpigotCore_Main") compileOnly project(":SpigotCore_8") compileOnly swdep("Spigot-1.9") diff --git a/SpigotCore_Main/build.gradle b/SpigotCore_Main/build.gradle index 6cd4051..a8b5675 100644 --- a/SpigotCore_Main/build.gradle +++ b/SpigotCore_Main/build.gradle @@ -64,7 +64,7 @@ dependencies { testImplementation 'junit:junit:4.13.2' testImplementation 'org.hamcrest:hamcrest:2.2' - implementation project(':CommonCore') + compileOnly project(':CommonCore') } processResources { diff --git a/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java b/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java index bb80a77..2c259ab 100644 --- a/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java +++ b/SpigotCore_Main/src/de/steamwar/sql/SchematicData.java @@ -84,15 +84,15 @@ public class SchematicData { } public void saveFromPlayer(Player player, boolean newFormat) throws IOException, NoClipboardException { - updateDatabase(WorldEditWrapper.impl.getPlayerClipboard(player, newFormat), newFormat); + saveFromStream(WorldEditWrapper.impl.getPlayerClipboard(player, newFormat), newFormat); } @Deprecated public void saveFromBytes(byte[] bytes, boolean newFormat) { - updateDatabase(new ByteArrayInputStream(bytes), newFormat); + saveFromStream(new ByteArrayInputStream(bytes), newFormat); } - private void updateDatabase(InputStream blob, boolean newFormat) { + public void saveFromStream(InputStream blob, boolean newFormat) { updateDatabase.update(blob, newFormat, node.getId()); node.setNodeFormat(newFormat); }