diff --git a/scratch3/build.gradle b/scratch3/build.gradle index 72d9dec2..a98e14f4 100644 --- a/scratch3/build.gradle +++ b/scratch3/build.gradle @@ -57,7 +57,7 @@ task npmBuild { assemble.dependsOn(npmBuild) jar { - into 'scratch3', { + into 'static/scratch3', { from "$buildDir/scratch-gui/build" } } diff --git a/web/build.gradle b/web/build.gradle index d8918d44..03f97bdf 100644 --- a/web/build.gradle +++ b/web/build.gradle @@ -8,6 +8,7 @@ dependencies { implementation project(':api') implementation project(':storeys') implementation project(':scratch') + implementation project(':scratch3') implementation 'org.osgi:org.osgi.core:6.0.0' implementation 'ch.vorburger.minecraft.osgi:api:1.0.0' @@ -39,6 +40,7 @@ shadowJar { include(project(':api')) include(project(':storeys')) include(project(':scratch')) + include(project(':scratch3')) include(dependency("io.vertx:vertx-core")) include(dependency("io.vertx:vertx-web")) include(dependency("io.vertx:vertx-auth-common"))