From bed7b5d10e03b346eed2d7272627afe48ae6348c Mon Sep 17 00:00:00 2001 From: Konicai <71294714+Konicai@users.noreply.github.com> Date: Sat, 17 Jun 2023 11:47:42 -0400 Subject: [PATCH 1/3] Bump logj4 (#3888) --- bootstrap/standalone/build.gradle.kts | 6 ++---- .../geyser/platform/standalone/GeyserStandaloneLogger.java | 1 + bootstrap/standalone/src/main/resources/log4j2.xml | 4 ++-- gradle/libs.versions.toml | 6 +++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/bootstrap/standalone/build.gradle.kts b/bootstrap/standalone/build.gradle.kts index b5fae9db3..eaf895108 100644 --- a/bootstrap/standalone/build.gradle.kts +++ b/bootstrap/standalone/build.gradle.kts @@ -7,10 +7,8 @@ dependencies { api(projects.core) implementation(libs.terminalconsoleappender) { - exclude("org.apache.logging.log4j", "log4j-core") - exclude("org.jline", "jline-reader") - exclude("org.jline", "jline-terminal") - exclude("org.jline", "jline-terminal-jna") + exclude("org.apache.logging.log4j") + exclude("org.jline") } implementation(libs.bundles.jline) diff --git a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java index e7e24a465..3c29bc648 100644 --- a/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java +++ b/bootstrap/standalone/src/main/java/org/geysermc/geyser/platform/standalone/GeyserStandaloneLogger.java @@ -92,6 +92,7 @@ public class GeyserStandaloneLogger extends SimpleTerminalConsole implements Gey Configurator.setLevel(log.getName(), debug ? Level.DEBUG : Level.INFO); } + @Override public boolean isDebug() { return log.isDebugEnabled(); } diff --git a/bootstrap/standalone/src/main/resources/log4j2.xml b/bootstrap/standalone/src/main/resources/log4j2.xml index 0738acdcd..54f6f9528 100644 --- a/bootstrap/standalone/src/main/resources/log4j2.xml +++ b/bootstrap/standalone/src/main/resources/log4j2.xml @@ -2,10 +2,10 @@ - + - + diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d179c7576..31c732712 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ adventure = "4.14.0-20230424.215040-7" adventure-platform = "4.1.2" junit = "5.9.2" checkerframework = "3.19.0" -log4j = "2.17.1" +log4j = "2.20.0" jline = "3.21.0" terminalconsoleappender = "1.2.0" folia = "1.19.4-R0.1-SNAPSHOT" @@ -65,7 +65,7 @@ netty-transport-native-kqueue = { group = "io.netty", name = "netty-transport-na log4j-api = { group = "org.apache.logging.log4j", name = "log4j-api", version.ref = "log4j" } log4j-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j" } -log4j-slf4j18-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j18-impl", version.ref = "log4j" } +log4j-slf4j2-impl = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j" } jline-terminal = { group = "org.jline", name = "jline-terminal", version.ref = "jline" } jline-terminal-jna = { group = "org.jline", name = "jline-terminal-jna", version.ref = "jline" } @@ -103,6 +103,6 @@ protocol-connection = { group = "org.cloudburstmc.protocol", name = "bedrock-con jackson = [ "jackson-annotations", "jackson-core", "jackson-dataformat-yaml" ] fastutil = [ "fastutil-int-int-maps", "fastutil-int-long-maps", "fastutil-int-byte-maps", "fastutil-int-boolean-maps", "fastutil-object-int-maps", "fastutil-object-object-maps" ] adventure = [ "adventure-text-serializer-gson", "adventure-text-serializer-legacy", "adventure-text-serializer-plain" ] -log4j = [ "log4j-api", "log4j-core", "log4j-slf4j18-impl" ] +log4j = [ "log4j-api", "log4j-core", "log4j-slf4j2-impl" ] jline = [ "jline-terminal", "jline-terminal-jna", "jline-reader" ] protocol = [ "protocol-common", "protocol-codec", "protocol-connection" ] From 2368b63ad5f6f1d3f0a15d203aac1ea0fcc9b39d Mon Sep 17 00:00:00 2001 From: Konicai <71294714+Konicai@users.noreply.github.com> Date: Sun, 18 Jun 2023 17:45:25 -0400 Subject: [PATCH 2/3] Allow deferred registries to be loaded/set more than once (#3892) --- .../geyser/registry/DeferredRegistry.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java index bf3050a61..6a2f2ae37 100644 --- a/core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java +++ b/core/src/main/java/org/geysermc/geyser/registry/DeferredRegistry.java @@ -69,6 +69,12 @@ public final class DeferredRegistry implements IRegistry { this.loader = () -> deferredLoader.get().load(input); } + /** + * Gets the underlying value held by this registry. + * + * @return the underlying value held by this registry + * @throws IllegalStateException if this deferred registry has not been loaded yet + */ @Override public M get() { if (!this.loaded) { @@ -80,13 +86,15 @@ public final class DeferredRegistry implements IRegistry { @Override public void set(M mappings) { - if (!this.loaded) { - throw new IllegalStateException("Registry has not been loaded yet!"); - } - this.backingRegistry.set(mappings); } + /** + * Registers what is specified in the given {@link Consumer} into the underlying value. + * + * @param consumer the consumer + * @throws IllegalStateException if this deferred registry has not been loaded yet + */ @Override public void register(Consumer consumer) { if (!this.loaded) { @@ -100,10 +108,6 @@ public final class DeferredRegistry implements IRegistry { * Loads the registry. */ public void load() { - if (this.loaded) { - throw new IllegalStateException("Registry has already been loaded!"); - } - this.backingRegistry.set(this.loader.get()); this.loaded = true; } From e5aa320d220eefc733c6053bc0414d2be63066bf Mon Sep 17 00:00:00 2001 From: Konicai <71294714+Konicai@users.noreply.github.com> Date: Sun, 18 Jun 2023 17:45:59 -0400 Subject: [PATCH 3/3] Fix condition for using author's api branch (#3893) --- .github/workflows/pullrequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 23e1576ae..5f4127b2b 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -31,7 +31,7 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: Use author's API repo if it exists - if: steps.find_forks.outputs.target_branch_found == 'true' + if: ${{ steps.find_forks.outputs.target_branch_found == 'true' }} env: API_FORK_URL: ${{ steps.find_forks.outputs.user_fork_url }} API_FORK_BRANCH: ${{ github.event.pull_request.head.ref }}