From 4d3873cb1f335ee4e94b5aa7bbdb079a03f6b3b6 Mon Sep 17 00:00:00 2001 From: Allink Date: Sat, 14 May 2022 11:25:17 +0100 Subject: [PATCH] Fix incorrectly formatted commit --- .../java/dev/plex/BukkitTelnetModule.java | 44 ++++++++++----- .../automation/PatchedTelnetCompiler.java | 53 +++++++++++++------ 2 files changed, 66 insertions(+), 31 deletions(-) diff --git a/src/main/java/dev/plex/BukkitTelnetModule.java b/src/main/java/dev/plex/BukkitTelnetModule.java index e9ce4d8..f940aaf 100644 --- a/src/main/java/dev/plex/BukkitTelnetModule.java +++ b/src/main/java/dev/plex/BukkitTelnetModule.java @@ -10,52 +10,66 @@ import org.bukkit.Bukkit; import java.lang.reflect.Method; -public class BukkitTelnetModule extends PlexModule { +public class BukkitTelnetModule extends PlexModule +{ @Getter private static BukkitTelnetModule module; boolean failed = false; private BukkitTelnet bukkitTelnet; @Override - public void load() { + public void load() + { module = this; } @Override - public void enable() { - if (getPlex().getSystem().equalsIgnoreCase("permissions") && !Bukkit.getPluginManager().isPluginEnabled("Vault")) { + public void enable() + { + if (getPlex().getSystem().equalsIgnoreCase("permissions") && !Bukkit.getPluginManager().isPluginEnabled("Vault")) + { failed = true; PlexLog.error("Plex-BukkitTelnet requires the 'Vault' plugin as well as a Permissions plugin that hooks into 'Vault.' We recommend LuckPerms!"); module.disable(); return; } - if (!Bukkit.getPluginManager().isPluginEnabled("BukkitTelnet")) { + if (!Bukkit.getPluginManager().isPluginEnabled("BukkitTelnet")) + { failed = true; PlexLog.warn("The Plex-BukkitTelnet module requires the BukkitTelnet plugin to work. I am automatically compiling BukkitTelnet plugin for you, however if something fails, please download it from: https://github.com/plexusorg/BukkitTelnet/releases"); - try { + try + { PatchedTelnetCompiler.execute(); return; - } catch (Exception e) { + } + catch (Exception e) + { PlexLog.error("Failed to compile patched telnet."); e.printStackTrace(); } - + module.disable(); return; } - try { + try + { failed = true; Class clazz = Class.forName("me.totalfreedom.bukkittelnet.BukkitTelnet"); Method method = clazz.getDeclaredMethod("getPlugin"); - } catch (ClassNotFoundException | NoSuchMethodException ignored) { + } + catch (ClassNotFoundException | NoSuchMethodException ignored) + { PlexLog.warn("You are using an older version of BukkitTelnet that does not support Plex. I am automatically compiling a build that does work for you, however if something fails, please download a version that does from: https://ci.plex.us.org/job/Plex-BukkitTelnet"); - try { + try + { PatchedTelnetCompiler.execute(); return; - } catch (Exception e) { + } + catch (Exception e) + { PlexLog.error("Failed to compile patched telnet."); e.printStackTrace(); } @@ -69,8 +83,10 @@ public class BukkitTelnetModule extends PlexModule { } @Override - public void disable() { - if (failed) { + public void disable() + { + if (failed) + { PlexLog.error("Disabling Module-BukkitTelnet. Please resolve the above error."); } } diff --git a/src/main/java/dev/plex/automation/PatchedTelnetCompiler.java b/src/main/java/dev/plex/automation/PatchedTelnetCompiler.java index 349f119..bbbde8f 100644 --- a/src/main/java/dev/plex/automation/PatchedTelnetCompiler.java +++ b/src/main/java/dev/plex/automation/PatchedTelnetCompiler.java @@ -24,7 +24,8 @@ import java.util.Timer; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -public class PatchedTelnetCompiler { +public class PatchedTelnetCompiler +{ private static final PluginManager PLUGIN_MANAGER = Bukkit.getPluginManager(); private static final URI CODE_ARCHIVE = URI.create("https://github.com/plexusorg/BukkitTelnet/archive/refs/heads/master.zip"); private static final Path PLUGIN_DIRECTORY = Bukkit.getServer().getPluginsFolder().toPath(); @@ -37,13 +38,16 @@ public class PatchedTelnetCompiler { private static final String DOWNLOADED_ARCHIVE_PATH = String.valueOf(ROOT_PATH.resolve("BukkitTelnet-master.zip")); private static final HttpClient HTTP_CLIENT = HttpClient.newHttpClient(); - public static void execute() throws Exception { + public static void execute() throws Exception + { // Create directories final List directories = ImmutableList.of(ROOT_PATH, EXTRACT_TARGET); - for (Path directory : directories) { + for (Path directory : directories) + { PlexLog.debug("Checking if {0} exists...", String.valueOf(directory)); - if (Files.notExists(directory)) { + if (Files.notExists(directory)) + { PlexLog.debug("It doesn't! Creating directory..."); Files.createDirectory(directory); } @@ -52,7 +56,8 @@ public class PatchedTelnetCompiler { downloadArchive(); } - private static void downloadArchive() throws Exception { + private static void downloadArchive() throws Exception + { PlexLog.log("Downloading archive..."); // Create the request final HttpRequest request = HttpRequest.newBuilder() @@ -80,23 +85,30 @@ public class PatchedTelnetCompiler { extractArchive(); } - private static void extractArchive() throws Exception { + private static void extractArchive() throws Exception + { PlexLog.log("Extracting archive..."); final ZipInputStream inputStream = new ZipInputStream(new FileInputStream(DOWNLOADED_ARCHIVE_PATH)); ZipEntry entry = inputStream.getNextEntry(); - while (entry != null) { + while (entry != null) + { final Path outputDestination = EXTRACT_TARGET.resolve(entry.getName()); - if (entry.isDirectory()) { - if (Files.notExists(outputDestination)) { + if (entry.isDirectory()) + { + if (Files.notExists(outputDestination)) + { PlexLog.debug("{0} doesn't exist, creating it!", String.valueOf(outputDestination)); Files.createDirectory(outputDestination); } - } else { + } + else + { final FileOutputStream outputStream = new FileOutputStream(String.valueOf(outputDestination)); int read = 0; - while ((read = inputStream.read()) != -1) { + while ((read = inputStream.read()) != -1) + { outputStream.write(read); } @@ -110,12 +122,14 @@ public class PatchedTelnetCompiler { executeGradleTarget(); } - private static void executeGradleTarget() throws Exception { + private static void executeGradleTarget() throws Exception + { PlexLog.log("Executing gradle target..."); boolean nix = !System.getProperty("os.name").toLowerCase().contains("win"); // Assume Windows if name contains win String gradlew = String.valueOf(nix ? EXTRACT_SUBDIR.resolve("gradlew") : EXTRACT_SUBDIR.resolve("gradlew.bat")); - if (nix) { + if (nix) + { final ProcessBuilder chmodBuilder = new ProcessBuilder("chmod", "+x", gradlew); Process chmodProcess = chmodBuilder.start(); chmodProcess.waitFor(); @@ -135,14 +149,18 @@ public class PatchedTelnetCompiler { copyBinary(); } - private static void copyBinary() throws Exception { + private static void copyBinary() throws Exception + { PlexLog.log("Copying binaries..."); final File binaryDirectory = new File(String.valueOf(BINARIES_PATH)); final File[] files = binaryDirectory.listFiles(); - if (files == null) { + if (files == null) + { throw new IllegalStateException("Didn't manage to compile jars!"); - } else if (files.length == 0) { + } + else if (files.length == 0) + { throw new IllegalStateException("Didn't manage to compile jars!"); } @@ -162,7 +180,8 @@ public class PatchedTelnetCompiler { done(); } - private static void done() { + private static void done() + { BukkitTelnetModule.getModule().enable(); } }