From 2c52392451dc6af607b9b2194f6f460ecaff96a8 Mon Sep 17 00:00:00 2001 From: Kas-tle <26531652+Kas-tle@users.noreply.github.com> Date: Mon, 25 Sep 2023 17:32:49 +0000 Subject: [PATCH] Formatting + remove artifacts Signed-off-by: GitHub --- .github/workflows/build.yml | 21 ------------------- .../geysermc/floodgate/util/ClassNames.java | 11 ++++++---- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 70a9e6e9..a53a65eb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,27 +22,6 @@ jobs: arguments: build cache-read-only: ${{ github.ref_name != 'master' && github.ref_name != 'development' }} - - name: Archive artifacts (Floodgate Bungee) - uses: actions/upload-artifact@v2 - if: success() - with: - name: Floodgate Bungee - path: bungee/build/libs/floodgate-bungee.jar - - - name: Archive artifacts (Floodgate Spigot) - uses: actions/upload-artifact@v2 - if: success() - with: - name: Floodgate Spigot - path: spigot/build/libs/floodgate-spigot.jar - - - name: Archive artifacts (Floodgate Velocity) - uses: actions/upload-artifact@v2 - if: success() - with: - name: Floodgate Velocity - path: velocity/build/libs/floodgate-velocity.jar - - name: Publish to Maven Repository if: ${{ github.repository == 'GeyserMC/Floodgate' }} uses: gradle/gradle-build-action@v2 diff --git a/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java b/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java index 2b40a2b1..77e00cc7 100644 --- a/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java +++ b/spigot/src/main/java/org/geysermc/floodgate/util/ClassNames.java @@ -103,7 +103,7 @@ public class ClassNames { String nmsPackage = SPIGOT_MAPPING_PREFIX + '.'; - + // SpigotInjector MINECRAFT_SERVER = getClassOrFallback( "net.minecraft.server.MinecraftServer", @@ -292,9 +292,12 @@ private static T checkNotNull(@CheckForNull T toCheck, @CheckForNull String } // Ensure one of two is not null - private static T checkNotNull(@CheckForNull T toCheck, @CheckForNull T toCheck2, - @CheckForNull String objectName, - @CheckForNull String objectName2) { + private static T checkNotNull( + @CheckForNull T toCheck, + @CheckForNull T toCheck2, + @CheckForNull String objectName, + @CheckForNull String objectName2 + ) { return Preconditions.checkNotNull(toCheck != null ? toCheck : toCheck2, objectName2 + " cannot be null if " + objectName + " is null"); }