From 329530de0e5f3909aad299b59156aed0b3d9cb97 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Mon, 1 Jul 2024 12:24:53 +0200 Subject: [PATCH] Update ReplayStudio so it works via includeBuild --- build.gradle.kts | 12 +++--------- libs/ReplayStudio | 2 +- root.gradle.kts | 3 +-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 2b0f1bfd..40724baa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -156,15 +156,9 @@ dependencies { implementation(shadow("com.github.ReplayMod.JavaBlend:2.79.0:a0696f8")!!) - implementation(shadow("com.github.ReplayMod:ReplayStudio") { - attributes { - // Force use of jar (as opposed to classes directory) because only the jar contains the relocated ViaVersion - // Doesn't seem to work for IDE though, so will have to publishToMavenLocal it for that. - attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR)) - } - }) - // FIXME this should be pulled in by ReplayStudio, and IntelliJ sees it, but javac for some reason does not - implementation("com.github.viaversion:opennbt:0a02214") // 2.0-SNAPSHOT (ViaVersion Edition) + implementation(shadow("com.github.ReplayMod:ReplayStudio")!!) + // FIXME hack because I don't know how to get this to be inherited properly + implementation(rootProject.files("libs/ReplayStudio/.gradle/prebundled-jars/viaVersion.jar")) implementation(project(path = jGui.path, configuration = "namedElements")) implementation(shadow("com.github.ReplayMod:lwjgl-utils:27dcd66")!!) diff --git a/libs/ReplayStudio b/libs/ReplayStudio index 5d17653d..872810f8 160000 --- a/libs/ReplayStudio +++ b/libs/ReplayStudio @@ -1 +1 @@ -Subproject commit 5d17653db9b10f4b4741ab4af659595855cd10f8 +Subproject commit 872810f8444d20040f083af20f4d390aa1999036 diff --git a/root.gradle.kts b/root.gradle.kts index 3342ee39..68715784 100755 --- a/root.gradle.kts +++ b/root.gradle.kts @@ -34,8 +34,7 @@ subprojects { maven("https://jitpack.io") } } - - if (name == "jGui") { + if (name == "jGui" || name == "ReplayStudio") { return@subprojects } val (_, minor) = name.split("-")[0].split(".")