From 41251a1e1835f4d7f6f82475c27ebbdeabfa6aa3 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Tue, 21 May 2019 20:43:28 +0200 Subject: [PATCH] Update ReplayStudio to remove ViaVersion server plugin classes --- versions/common.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/common.gradle b/versions/common.gradle index 627457da..38aff89d 100644 --- a/versions/common.gradle +++ b/versions/common.gradle @@ -254,7 +254,7 @@ dependencies { def studioVersion = mcVersionStr if (studioVersion == '1.8.9') studioVersion = '1.8' - shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:53c6ca4", shadeExclusions + shadow "com.github.ReplayMod.ReplayStudio:$studioVersion:076c41b", shadeExclusions shadowReobf(project(":jGui:$jGuiVersion")){ transitive = false // FG 1.2 puts all MC deps into the compile configuration and we don't want to shade those @@ -315,6 +315,11 @@ task configureRelocation() { } else if (!pkg.startsWith('com/replaymod')) { pkgs << pkg.substring(0, pkg.indexOf('/', 4)) } + } else if (pkg.startsWith('net/')) { + if (!pkg.startsWith('net/minecraft') + && !pkg.startsWith('net/fabric')) { + pkgs << pkg.substring(0, pkg.indexOf('/', 'net/'.length())) + } } else if (pkg.startsWith('org/')) { if (pkg.startsWith('org/apache/')) { if (pkg.startsWith('org/apache/commons/')) {