From 496eb454acb757e81038c8ae618d4768b4868842 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sun, 30 Mar 2025 15:33:44 +0200 Subject: [PATCH] quick-e2e: update plugin file copying logic and add directory creation --- .../src/main/java/de/oliver/quicke2e/Main.java | 7 +++++-- .../quicke2e/steps/copyFile/CopyFileService.java | 11 ++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java index b6560a96..72ede382 100644 --- a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java +++ b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/Main.java @@ -40,12 +40,15 @@ public class Main { startScript.writeStartScript(context); GradleService gradle = new GradleService(); +// gradle.runTask(":plugins:fancynpcs:shadowJar"); // gradle.runTask(":plugins:fancyholograms:shadowJar"); // gradle.runTask(":plugins:fancyvisuals:shadowJar"); CopyFileService copyFile = new CopyFileService(); - copyFile.copyFile(context, "plugins/fancyholograms/build/libs", "FancyHolograms-.*\\.jar", "plugins"); - copyFile.copyFile(context, "plugins/fancyvisuals/build/libs", "FancyVisuals-.*\\.jar", "plugins"); + copyFile.createDirectory(context, "plugins"); + copyFile.copyFile(context, "plugins/fancynpcs/build/libs", "FancyNpcs-.*\\.jar", "plugins/FancyNpcs.jar"); + copyFile.copyFile(context, "plugins/fancyholograms-v2/build/libs", "FancyHolograms-.*\\.jar", "plugins/FancyHolograms.jar"); + copyFile.copyFile(context, "plugins/fancyvisuals/build/libs", "FancyVisuals-.*\\.jar", "plugins/FancyVisuals.jar"); StartServerService startServer = new StartServerService(); startServer.startServer(context); diff --git a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/copyFile/CopyFileService.java b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/copyFile/CopyFileService.java index e5a7af72..d9903641 100644 --- a/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/copyFile/CopyFileService.java +++ b/tools/quick-e2e/src/main/java/de/oliver/quicke2e/steps/copyFile/CopyFileService.java @@ -29,7 +29,7 @@ public class CopyFileService { } } - Path target = context.serverEnvPath().resolve(destination + "/" + Path.of(realSource).getFileName()); + Path target = context.serverEnvPath().resolve(destination); try { Files.copy(Path.of(realSource), target, StandardCopyOption.REPLACE_EXISTING); @@ -37,4 +37,13 @@ public class CopyFileService { e.printStackTrace(); } } + + public void createDirectory(Context context, String directory) { + Path path = context.serverEnvPath().resolve(directory); + try { + Files.createDirectories(path); + } catch (IOException e) { + e.printStackTrace(); + } + } }