release: Version 2.0.10

this change does not affect Paper users

.github/workflows/build.yml

@@ -0,0 +1,14 @@
+name: "build"
+
+on:
+  push:
+    branches: [ "**" ]
+    tags-ignore: [ "**" ]
+  pull_request:
+
+jobs:
+  call-build:
+    uses: "jpenilla/actions/.github/workflows/shared-ci.yml@master"
+    with:
+      artifacts-path: 'build/libs/*.jar'
+      loom: true

.github/workflows/minimotd.yml

@@ -1,22 +0,0 @@
-name: Build MiniMOTD
-on: [ push, pull_request ]
-jobs:
-  build:
-    # Only run on PRs if the source branch is on someone else's repo
-    if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: gradle/wrapper-validation-action@v1
-    - name: Set up JDK
-      uses: actions/setup-java@v3
-      with:
-        distribution: 'temurin'
-        java-version: '17'
-    - name: Build with Gradle
-      run: ./gradlew build
-    - run: mkdir staging && cp build/libs/*.jar staging
-    - uses: actions/upload-artifact@v3
-      with:
-        name: Package
-        path: staging

build-logic/src/main/kotlin/minimotd.base-conventions.gradle.kts

@@ -3,7 +3,7 @@ import com.adarshr.gradle.testlogger.theme.ThemeType
 plugins {
   id("java-library")
   id("net.kyori.indra")
-  id("net.kyori.indra.publishing")
+  id("net.kyori.indra.git")
   id("net.kyori.indra.checkstyle")
   id("net.kyori.indra.license-header")
   id("com.adarshr.test-logger")

common/src/main/java/xyz/jpenilla/minimotd/common/config/ConfigLoader.java

@@ -23,9 +23,14 @@
  */
 package xyz.jpenilla.minimotd.common.config;
 
+import java.lang.reflect.Method;
 import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
 import org.spongepowered.configurate.CommentedConfigurationNode;
 import org.spongepowered.configurate.ConfigurateException;
 import org.spongepowered.configurate.ConfigurationOptions;
@@ -34,6 +39,7 @@ import org.spongepowered.configurate.objectmapping.ObjectMapper;
 import org.spongepowered.configurate.serialize.SerializationException;
 import org.spongepowered.configurate.serialize.TypeSerializerCollection;
 
+@DefaultQualifier(NonNull.class)
 public final class ConfigLoader<C> {
   private static final TypeSerializerCollection SERIALIZERS;
 
@@ -45,12 +51,14 @@ public final class ConfigLoader<C> {
 
   private final HoconConfigurationLoader loader;
   private final ObjectMapper<C> mapper;
+  private final List<Consumer<C>> postProcess;
 
   public ConfigLoader(
-    final @NonNull Class<C> configClass,
-    final @NonNull Path configPath,
-    final @NonNull UnaryOperator<ConfigurationOptions> optionsModifier
+    final Class<C> configClass,
+    final Path configPath,
+    final UnaryOperator<ConfigurationOptions> optionsModifier
   ) {
+    this.postProcess = this.findPostProcessors(configClass);
     this.loader = HoconConfigurationLoader.builder()
       .path(configPath)
       .defaultOptions(options ->
@@ -67,6 +75,24 @@ public final class ConfigLoader<C> {
     }
   }
 
+  private List<Consumer<C>> findPostProcessors(final Class<C> configClass) {
+    final List<Consumer<C>> ret = new ArrayList<>();
+    for (final Method method : configClass.getDeclaredMethods()) {
+      if (method.getAnnotation(PostProcessor.class) == null) {
+        continue;
+      }
+      ret.add(config -> {
+        try {
+          method.setAccessible(true);
+          method.invoke(config);
+        } catch (final ReflectiveOperationException ex) {
+          throw new RuntimeException("Failed to invoke post processor method", ex);
+        }
+      });
+    }
+    return ret;
+  }
+
   public ConfigLoader(
     final @NonNull Class<C> configClass,
     final @NonNull Path configPath
@@ -76,7 +102,11 @@ public final class ConfigLoader<C> {
 
   public @NonNull C load() throws ConfigurateException {
     final CommentedConfigurationNode node = this.loader.load();
-    return this.mapper.load(node);
+    final C config = this.mapper.load(node);
+    for (final Consumer<C> processor : this.postProcess) {
+      processor.accept(config);
+    }
+    return config;
   }
 
   public void save(final @NonNull C config) throws ConfigurateException {

common/src/main/java/xyz/jpenilla/minimotd/common/config/PluginSettings.java

@@ -24,6 +24,7 @@
 package xyz.jpenilla.minimotd.common.config;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
@@ -64,7 +65,7 @@ public final class PluginSettings {
     }
 
     public @Nullable String findConfigStringForHost(final @NonNull String host) {
-      return this.virtualHostConfigs.get(host);
+      return this.virtualHostConfigs.get(host.toLowerCase(Locale.ENGLISH));
     }
   }
 
@@ -76,4 +77,10 @@ public final class PluginSettings {
     return this.updateChecker;
   }
 
+  @PostProcessor
+  private void lowercaseVirtualHosts() {
+    final Map<String, String> virtualHosts = new HashMap<>(this.proxySettings.virtualHostConfigs);
+    this.proxySettings.virtualHostConfigs.clear();
+    virtualHosts.forEach((host, config) -> this.proxySettings.virtualHostConfigs.put(host.toLowerCase(Locale.ENGLISH), config));
+  }
 }

common/src/main/java/xyz/jpenilla/minimotd/common/config/PostProcessor.java

@@ -0,0 +1,34 @@
+/*
+ * This file is part of MiniMOTD, licensed under the MIT License.
+ *
+ * Copyright (c) 2020-2022 Jason Penilla
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package xyz.jpenilla.minimotd.common.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface PostProcessor {
+}

dist/bukkit-bungeecord/build.gradle.kts

@@ -9,13 +9,9 @@ tasks.jar {
 val platforms = setOf(
   projects.minimotdBukkit,
   projects.minimotdBungeecord,
-  projects.minimotdVelocity,
-  projects.minimotdFabric,
-  projects.minimotdSponge7,
-  projects.minimotdSponge8
 ).map { it.dependencyProject }
 
-val universal = tasks.register<Jar>("universal") {
+val dist = tasks.register<Jar>("bukkitAndBungeeJar") {
   artifacts.add("archives", this)
   archiveClassifier.set(null as String?)
   duplicatesStrategy = DuplicatesStrategy.EXCLUDE
@@ -27,5 +23,5 @@ val universal = tasks.register<Jar>("universal") {
 }
 
 miniMOTDPlatform {
-  jarTask.set(universal)
+  jarTask.set(dist)
 }

gradle.properties

@@ -1,5 +1,5 @@
 group=xyz.jpenilla
-version=2.0.8
+version=2.0.10
 description=Use MiniMessage text formatting in the server list MOTD.
 
 org.gradle.caching=true

gradle/libs.versions.yml

@@ -8,17 +8,19 @@ plugins:
   org.spongepowered.gradle.plugin: 2.0.2
   net.minecrell.plugin-yml.bungee: &plugin-yml 0.5.2
   net.minecrell.plugin-yml.bukkit: *plugin-yml
-  xyz.jpenilla.run-paper: 1.0.6
+  xyz.jpenilla.run-paper: &run-task 2.0.1
+  xyz.jpenilla.run-velocity: *run-task
+  xyz.jpenilla.run-waterfall: *run-task
 
 versions:
   indra: 2.1.1
   shadow: 7.1.2
   testLoggerPlugin: 3.2.0
-  adventure: 4.11.0
-  adventurePlatform: 4.1.1
-  adventurePlatformFabric: 5.4.0-SNAPSHOT
+  adventure: 4.12.0
+  adventurePlatform: 4.2.0
+  adventurePlatformFabric: 5.6.0
   configurate: 4.1.2
-  checkerQual: 3.22.2
+  checkerQual: 3.28.0
   slf4j: 1.7.32
   gson: 2.8.0
   guava: 21.0
@@ -26,12 +28,12 @@ versions:
   paperApi: 1.16.5-R0.1-SNAPSHOT
   paperlib: 1.0.8-SNAPSHOT
   waterfallApi: 1.16-R0.4-SNAPSHOT
-  fabricApi: 0.56.0+1.19
-  fabricLoader: 0.14.8
-  fabricMinecraft: 1.19
+  fabricApi: 0.68.1+1.19.3
+  fabricLoader: 0.14.11
+  fabricMinecraft: 1.19.3
   spongeApi7: 7.2.0
   velocityApi: 3.1.2-SNAPSHOT
-  jupiterEngine: 5.8.2
+  jupiterEngine: 5.9.0
 
 dependencies:
   adventureBom:

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

platform/bukkit/build.gradle.kts

@@ -15,9 +15,10 @@ dependencies {
 
 tasks {
   runServer {
-    minecraftVersion("1.19")
+    minecraftVersion("1.19.3")
   }
   shadowJar {
+    platformRelocation("bukkit", "xyz.jpenilla.minimotd.common")
     commonRelocation("org.slf4j")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")

platform/bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PingListener.java

@@ -56,6 +56,11 @@ public final class PingListener implements Listener {
         event.setMotd(LegacyComponentSerializer.legacySection().serialize(motd));
       }
     });
-    response.icon(event::setServerIcon);
+    response.icon(icon -> {
+      try {
+        event.setServerIcon(icon);
+      } catch (final UnsupportedOperationException ignore) {
+      }
+    });
   }
 }

platform/bungeecord/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
   id("minimotd.shadow-platform")
   id("net.minecrell.plugin-yml.bungee")
+  id("xyz.jpenilla.run-waterfall")
 }
 
 dependencies {
@@ -12,10 +13,14 @@ dependencies {
 
 tasks {
   shadowJar {
+    platformRelocation("bungee", "xyz.jpenilla.minimotd.common")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")
     commonRelocation("org.bstats")
   }
+  runWaterfall {
+    waterfallVersion("1.19")
+  }
 }
 
 bungee {

platform/fabric/build.gradle.kts

@@ -37,7 +37,6 @@ tasks {
     configurations = listOf(shade)
     commonConfiguration()
     commonRelocation("io.leangen.geantyref")
-    platformRelocation("fabric", "xyz.jpenilla.minimotd.common")
   }
   remapJar {
     archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")

platform/sponge8/build.gradle.kts

@@ -41,7 +41,6 @@ sponge {
 tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
-    platformRelocation("sponge8", "xyz.jpenilla.minimotd.common")
     dependencies {
       exclude(dependency("io.leangen.geantyref:geantyref"))
     }

platform/velocity/build.gradle.kts

@@ -1,6 +1,7 @@
 plugins {
   id("minimotd.shadow-platform")
   id("net.kyori.blossom")
+  id("xyz.jpenilla.run-velocity")
 }
 
 dependencies {
@@ -14,9 +15,11 @@ tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
     commonRelocation("io.leangen.geantyref")
-    platformRelocation("velocity", "xyz.jpenilla.minimotd.common")
     commonRelocation("org.bstats")
   }
+  runVelocity {
+    velocityVersion(libs.versions.velocityApi.get())
+  }
 }
 
 blossom {

settings.gradle.kts

@@ -27,21 +27,28 @@ pluginManagement {
 
 plugins {
   id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
-  id("quiet-fabric-loom") version "0.12-SNAPSHOT"
+  id("quiet-fabric-loom") version "1.0-SNAPSHOT"
 }
 
 rootProject.name = "MiniMOTD"
 
+fun setup(name: String, dir: String) {
+  include(name)
+  project(":$name").projectDir = file(dir)
+}
+
+fun platform(name: String) = setup("minimotd-$name", "platform/$name")
+fun dist(name: String) = setup("minimotd-$name", "dist/$name")
+
+setup("minimotd-common", "common")
+
 sequenceOf(
-  "common",
   "bukkit",
   "sponge8",
   "sponge7",
   "bungeecord",
   "velocity",
   "fabric",
-  "universal"
-).forEach {
-  include("minimotd-$it")
-  project(":minimotd-$it").projectDir = file(it)
-}
+).forEach(::platform)
+
+dist("bukkit-bungeecord")