release: Version 2.0.8

.github/workflows/minimotd.yml

@@ -6,17 +6,17 @@ jobs:
     if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: gradle/wrapper-validation-action@v1
     - name: Set up JDK
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
-        java-version: '16'
+        distribution: 'temurin'
+        java-version: '17'
     - name: Build with Gradle
       run: ./gradlew build
     - run: mkdir staging && cp build/libs/*.jar staging
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v3
       with:
         name: Package
         path: staging

build-logic/settings.gradle.kts

@@ -1,10 +1,8 @@
 import ca.stellardrift.build.configurate.ConfigFormats
 import ca.stellardrift.build.configurate.catalog.PolyglotVersionCatalogExtension
 
-enableFeaturePreview("VERSION_CATALOGS")
-
 plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0"
+  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
 }
 
 extensions.configure<PolyglotVersionCatalogExtension> {

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

@@ -14,6 +14,7 @@ version = (version as String)
 
 indra {
   javaVersions {
+    minimumToolchain(17)
     target(8)
   }
   github(Constants.GITHUB_USER, Constants.GITHUB_REPO)

build-logic/src/main/kotlin/shadow-extensions.kt

@@ -1,4 +1,3 @@
-import com.github.jengelman.gradle.plugins.shadow.internal.DependencyFilter
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 fun ShadowJar.commonRelocation(pkg: String) {
@@ -9,13 +8,6 @@ fun ShadowJar.platformRelocation(platform: String, pkg: String) {
   relocate(pkg, "${Constants.RELOCATION_BASE_PACKAGE}.platform_$platform.$pkg")
 }
 
-fun ShadowJar.configureForNativeAdventurePlatform() {
-  platformRelocation("kyori", "net.kyori.adventure.text.minimessage")
-  dependencies {
-    excludeAdventureExceptMiniMessage()
-  }
-}
-
 fun ShadowJar.commonConfiguration() {
   commonRelocation("org.spongepowered.configurate")
   commonRelocation("com.typesafe.config")
@@ -25,9 +17,8 @@ fun ShadowJar.commonConfiguration() {
   }
 }
 
-private fun DependencyFilter.excludeAdventureExceptMiniMessage() {
-  exclude { dependency ->
-    dependency.moduleGroup == "net.kyori"
-      && dependency.moduleName != "adventure-text-minimessage"
+fun ShadowJar.configureForNativeAdventurePlatform() {
+  dependencies {
+    exclude { dependency -> dependency.moduleGroup == "net.kyori" }
   }
 }

build.gradle.kts

@@ -1,7 +1,3 @@
 plugins {
   id("minimotd.build-logic")
 }
-
-group = "xyz.jpenilla"
-version = "2.0.5"
-description = "Use MiniMessage text formatting in the server list MOTD."

bukkit/build.gradle.kts

@@ -9,18 +9,20 @@ dependencies {
   implementation(libs.slf4jJdk14)
   implementation(libs.adventurePlatformBukkit)
   implementation(libs.bstatsBukkit)
+  implementation(libs.paperlib)
   compileOnly(libs.paperApi)
 }
 
 tasks {
   runServer {
-    minecraftVersion("1.18")
+    minecraftVersion("1.19")
   }
   shadowJar {
     commonRelocation("org.slf4j")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")
     commonRelocation("org.bstats")
+    commonRelocation("io.papermc.lib")
   }
 }
 
@@ -32,7 +34,7 @@ bukkit {
   authors = listOf("jmp")
   softDepend = listOf("ViaVersion")
   commands {
-    create("minimotd") {
+    register("minimotd") {
       description = "MiniMOTD Command"
       usage = "/minimotd help"
       permission = "minimotd.admin"

bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/BukkitCommand.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -23,6 +23,7 @@
  */
 package xyz.jpenilla.minimotd.bukkit;
 
+import io.papermc.lib.PaperLib;
 import java.awt.image.BufferedImage;
 import java.nio.file.Path;
 import net.kyori.adventure.platform.bukkit.BukkitAudiences;
@@ -44,24 +45,18 @@ public final class MiniMOTDPlugin extends JavaPlugin implements MiniMOTDPlatform
   private Logger logger;
   private MiniMOTD<CachedServerIcon> miniMOTD;
   private BukkitAudiences audiences;
-  private String serverPackageName;
-  private String serverApiVersion;
-  private int majorMinecraftVersion;
 
   @Override
   public void onEnable() {
     this.logger = LoggerFactory.getLogger(this.getName());
     this.miniMOTD = new MiniMOTD<>(this);
     this.audiences = BukkitAudiences.create(this);
-    this.serverPackageName = this.getServer().getClass().getPackage().getName();
-    this.serverApiVersion = this.serverPackageName.substring(this.serverPackageName.lastIndexOf('.') + 1);
-    this.majorMinecraftVersion = Integer.parseInt(this.serverApiVersion.split("_")[1]);
 
     if (PAPER_PING_EVENT_EXISTS) {
-      this.getServer().getPluginManager().registerEvents(new PaperPingListener(this, this.miniMOTD), this);
+      this.getServer().getPluginManager().registerEvents(new PaperPingListener(this.miniMOTD), this);
     } else {
-      this.getServer().getPluginManager().registerEvents(new PingListener(this, this.miniMOTD), this);
-      if (this.majorMinecraftVersion >= 12) { // PaperServerListPingEvent was added in 1.12
+      this.getServer().getPluginManager().registerEvents(new PingListener(this.miniMOTD), this);
+      if (PaperLib.getMinecraftVersion() >= 12) { // PaperServerListPingEvent was added in 1.12
         this.suggestPaper();
       }
     }
@@ -100,10 +95,6 @@ public final class MiniMOTDPlugin extends JavaPlugin implements MiniMOTDPlatform
     return this.getServer().loadServerIcon(image);
   }
 
-  public int majorMinecraftVersion() {
-    return this.majorMinecraftVersion;
-  }
-
   public @NonNull BukkitAudiences audiences() {
     return this.audiences;
   }

bukkit/src/main/java/xyz/jpenilla/minimotd/bukkit/PaperPingListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -24,6 +24,7 @@
 package xyz.jpenilla.minimotd.bukkit;
 
 import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
+import io.papermc.lib.PaperLib;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -35,13 +36,11 @@ import xyz.jpenilla.minimotd.common.PingResponse;
 import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
 
 public final class PaperPingListener implements Listener {
-  private final MiniMOTDPlugin plugin;
   private final LegacyComponentSerializer unusualHexSerializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
   private final MiniMOTD<CachedServerIcon> miniMOTD;
 
-  PaperPingListener(final @NonNull MiniMOTDPlugin plugin, final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
+  PaperPingListener(final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
     this.miniMOTD = miniMOTD;
-    this.plugin = plugin;
   }
 
   @EventHandler
@@ -52,7 +51,7 @@ public final class PaperPingListener implements Listener {
 
     response.playerCount().applyCount(event::setNumPlayers, event::setMaxPlayers);
     response.motd(motd -> {
-      if (event.getClient().getProtocolVersion() < Constants.MINECRAFT_1_16_PROTOCOL_VERSION || this.plugin.majorMinecraftVersion() < 16) {
+      if (event.getClient().getProtocolVersion() < Constants.MINECRAFT_1_16_PROTOCOL_VERSION || PaperLib.getMinecraftVersion() < 16) {
         event.setMotd(LegacyComponentSerializer.legacySection().serialize(motd));
       } else {
         event.setMotd(this.unusualHexSerializer.serialize(motd));

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

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -23,6 +23,7 @@
  */
 package xyz.jpenilla.minimotd.bukkit;
 
+import io.papermc.lib.PaperLib;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -36,10 +37,8 @@ import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
 public final class PingListener implements Listener {
   private final MiniMOTD<CachedServerIcon> miniMOTD;
   private final LegacyComponentSerializer unusualHexSerializer = LegacyComponentSerializer.builder().hexColors().useUnusualXRepeatedCharacterHexFormat().build();
-  private final MiniMOTDPlugin plugin;
 
-  PingListener(final @NonNull MiniMOTDPlugin plugin, final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
-    this.plugin = plugin;
+  PingListener(final @NonNull MiniMOTD<CachedServerIcon> miniMOTD) {
     this.miniMOTD = miniMOTD;
   }
 
@@ -51,7 +50,7 @@ public final class PingListener implements Listener {
 
     event.setMaxPlayers(response.playerCount().maxPlayers());
     response.motd(motd -> {
-      if (this.plugin.majorMinecraftVersion() > 15) {
+      if (PaperLib.getMinecraftVersion() > 15) {
         event.setMotd(this.unusualHexSerializer.serialize(motd));
       } else {
         event.setMotd(LegacyComponentSerializer.legacySection().serialize(motd));

bungeecord/build.gradle.kts

@@ -5,7 +5,6 @@ plugins {
 
 dependencies {
   implementation(projects.minimotdCommon)
-  implementation(libs.slf4jJdk14)
   implementation(libs.adventurePlatformBungeecord)
   implementation(libs.bstatsBungeecord)
   compileOnly(libs.waterfallApi)
@@ -13,7 +12,6 @@ dependencies {
 
 tasks {
   shadowJar {
-    commonRelocation("org.slf4j")
     commonRelocation("io.leangen.geantyref")
     commonRelocation("net.kyori")
     commonRelocation("org.bstats")

bungeecord/src/main/java/xyz/jpenilla/minimotd/bungee/BungeeCommand.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

bungeecord/src/main/java/xyz/jpenilla/minimotd/bungee/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

bungeecord/src/main/java/xyz/jpenilla/minimotd/bungee/PingListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/build.gradle.kts

@@ -10,7 +10,6 @@ tasks.jar {
 }
 
 dependencies {
-  api(libs.slf4jApi)
   api(libs.configurateHocon)
   api(platform(libs.adventureBom))
   api(libs.adventureApi)
@@ -19,6 +18,7 @@ dependencies {
     exclude("com.google.code.gson", "gson")
   }
   api(libs.minimessage)
+  compileOnlyApi(libs.slf4jApi)
   compileOnlyApi(libs.checkerQual)
   compileOnlyApi(libs.gson)
   testImplementation(libs.gson)

common/src/main/java/xyz/jpenilla/minimotd/common/CommandHandler.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -121,7 +121,7 @@ public final class CommandHandler {
   }
 
   private static Component miniMessage(final String message) {
-    return MiniMessage.miniMessage().parse(message);
+    return MiniMessage.miniMessage().deserialize(message);
   }
 
   @FunctionalInterface

common/src/main/java/xyz/jpenilla/minimotd/common/Constants.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -44,5 +44,5 @@ public final class Constants {
 
   public static final int MINECRAFT_1_16_PROTOCOL_VERSION = 735;
 
-  public static final Component COMMAND_PREFIX = MiniMessage.miniMessage().parse("<white>[</white><gradient:#0047AB:#ADD8E6>" + PluginMetadata.NAME + "</gradient><white>]</white>");
+  public static final Component COMMAND_PREFIX = MiniMessage.miniMessage().deserialize("<white>[</white><gradient:#0047AB:#ADD8E6>" + PluginMetadata.NAME + "</gradient><white>]</white>");
 }

common/src/main/java/xyz/jpenilla/minimotd/common/IconManager.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -28,9 +28,9 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.stream.Stream;
 import javax.imageio.ImageIO;
@@ -38,7 +38,7 @@ import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 public final class IconManager<I> {
-  private final Map<String, I> icons = new HashMap<>();
+  private final Map<String, I> icons = new ConcurrentHashMap<>();
   private final MiniMOTD<I> miniMOTD;
   private final Path iconsDirectory;
 

common/src/main/java/xyz/jpenilla/minimotd/common/MiniMOTD.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -27,6 +27,8 @@ import java.nio.file.Path;
 import java.util.concurrent.ThreadLocalRandom;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.text.minimessage.tag.resolver.Placeholder;
+import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.checkerframework.framework.qual.DefaultQualifier;
@@ -36,8 +38,6 @@ import xyz.jpenilla.minimotd.common.config.MiniMOTDConfig;
 import xyz.jpenilla.minimotd.common.util.Components;
 
 import static net.kyori.adventure.text.Component.newline;
-import static net.kyori.adventure.text.minimessage.Template.template;
-import static net.kyori.adventure.text.minimessage.template.TemplateResolver.templates;
 
 @DefaultQualifier(NonNull.class)
 public final class MiniMOTD<I> {
@@ -112,7 +112,7 @@ public final class MiniMOTD<I> {
     final String max = Integer.toString(count.maxPlayers());
     return MiniMessage.miniMessage().deserialize(
       replacePlayerCount(input, online, max),
-      templates(template("online_players", online), template("max_players", max))
+      TagResolver.resolver(Placeholder.unparsed("online_players", online), Placeholder.unparsed("max_players", max))
     );
   }
 

common/src/main/java/xyz/jpenilla/minimotd/common/MiniMOTDPlatform.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/src/main/java/xyz/jpenilla/minimotd/common/PingResponse.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

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

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

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

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

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

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -49,7 +49,7 @@ public final class MiniMOTDConfig {
 
   @Comment("The list of MOTDs to display\n"
     + "\n"
-    + " - Supported placeholders: {onlinePlayers}, {maxPlayers}\n"
+    + " - Supported placeholders: <online_players>, <max_players>\n"
     + " - Putting more than one will cause one to be randomly chosen each refresh")
   private final List<MOTD> motds = new ArrayList<>();
 

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

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -46,7 +46,7 @@ public final class PlayerCountModifier implements Int2IntFunction {
     return this.function.apply(actualPlayers);
   }
 
-  public final @NonNull String input() {
+  public @NonNull String input() {
     return this.input;
   }
 

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

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/src/main/java/xyz/jpenilla/minimotd/common/util/ComponentColorDownsampler.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/src/main/java/xyz/jpenilla/minimotd/common/util/Components.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/src/main/java/xyz/jpenilla/minimotd/common/util/Int2IntFunction.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/src/main/java/xyz/jpenilla/minimotd/common/util/Pair.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/src/main/java/xyz/jpenilla/minimotd/common/util/UpdateChecker.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

common/src/test/java/xyz/jpenilla/minimotd/common/util/ComponentColorDownsamplerTest.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

fabric/build.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
+  id("quiet-fabric-loom")
   id("minimotd.platform-conventions")
   id("com.github.johnrengelman.shadow")
-  id("quiet-fabric-loom")
 }
 
 val shade: Configuration by configurations.creating
@@ -16,13 +16,10 @@ dependencies {
 
   shade(implementation(projects.minimotdCommon) {
     exclude("net.kyori")
-    exclude("org.slf4j")
   })
 
   modImplementation(libs.adventurePlatformFabric)
   include(libs.adventurePlatformFabric)
-  implementation(libs.minimessage)
-  include(libs.minimessage)
 }
 
 miniMOTDPlatform {
@@ -36,9 +33,6 @@ indra {
 }
 
 tasks {
-  runServer {
-    standardInput = System.`in`
-  }
   shadowJar {
     configurations = listOf(shade)
     commonConfiguration()
@@ -46,7 +40,6 @@ tasks {
     platformRelocation("fabric", "xyz.jpenilla.minimotd.common")
   }
   remapJar {
-    input.set(shadowJar.flatMap { it.archiveFile })
     archiveFileName.set("${project.name}-mc$minecraftVersion-${project.version}.jar")
   }
   processResources {

fabric/src/main/java/xyz/jpenilla/minimotd/fabric/MiniMOTDFabric.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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
@@ -36,7 +36,7 @@ import java.util.Base64;
 import java.util.concurrent.CompletableFuture;
 import javax.imageio.ImageIO;
 import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.kyori.adventure.platform.fabric.FabricServerAudiences;
@@ -99,7 +99,7 @@ public final class MiniMOTDFabric implements ModInitializer, MiniMOTDPlatform<St
     }
 
     final CommandHandler handler = new CommandHandler(this.miniMOTD);
-    CommandRegistrationCallback.EVENT.register((dispatcher, $) -> dispatcher.register(
+    CommandRegistrationCallback.EVENT.register((dispatcher, commandBuildContext, commandSelection) -> dispatcher.register(
       literal("minimotd")
         .requires(source -> source.hasPermission(4))
         .then(literal("reload").executes(new WrappingExecutor(handler::reload)))

fabric/src/main/java/xyz/jpenilla/minimotd/fabric/access/ConnectionAccess.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

fabric/src/main/java/xyz/jpenilla/minimotd/fabric/mixin/ConnectionMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

fabric/src/main/java/xyz/jpenilla/minimotd/fabric/mixin/ServerHandshakePacketListenerImplMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

fabric/src/main/java/xyz/jpenilla/minimotd/fabric/mixin/ServerStatusPacketListenerImplMixin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

fabric/src/main/resources/fabric.mod.json

@@ -23,8 +23,8 @@
     "minimotd-fabric.mixins.json"
   ],
   "depends": {
-    "fabricloader": ">=0.12.8",
-    "fabric": ">=0.31.0",
-    "minecraft": ">=1.18"
+    "fabricloader": ">=0.14.6",
+    "fabric": "*",
+    "minecraft": "1.19.x"
   }
 }

gradle.properties

@@ -1,3 +1,7 @@
+group=xyz.jpenilla
+version=2.0.8
+description=Use MiniMessage text formatting in the server list MOTD.
+
 org.gradle.caching=true
 org.gradle.configureondemand=true
 org.gradle.jvmargs=-Xmx2G

gradle/libs.versions.yml

@@ -5,34 +5,33 @@ metadata:
 
 plugins:
   net.kyori.blossom: 1.3.0
-  org.spongepowered.gradle.plugin: 2.0.0
-  net.minecrell.plugin-yml.bungee: &plugin-yml 0.5.0
+  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.4
+  xyz.jpenilla.run-paper: 1.0.6
 
 versions:
-  indra: 2.0.6
-  shadow: 7.1.0
-  testLoggerPlugin: 3.0.0
-  adventure: 4.9.3
-  adventurePlatform: 4.0.1
-  adventurePlatformFabric: 5.0.0
-  minimessage: 4.2.0-SNAPSHOT
+  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
   configurate: 4.1.2
-  checkerQual: 3.19.0
+  checkerQual: 3.22.2
   slf4j: 1.7.32
-  log4jSlf4jImpl: 2.8.1
   gson: 2.8.0
   guava: 21.0
-  bstats: 2.2.1
+  bstats: 3.0.0
   paperApi: 1.16.5-R0.1-SNAPSHOT
+  paperlib: 1.0.8-SNAPSHOT
   waterfallApi: 1.16-R0.4-SNAPSHOT
-  fabricApi: 0.43.1+1.18
-  fabricLoader: 0.12.8
-  fabricMinecraft: 1.18
+  fabricApi: 0.56.0+1.19
+  fabricLoader: 0.14.8
+  fabricMinecraft: 1.19
   spongeApi7: 7.2.0
-  velocityApi: 3.1.0
-  jupiterEngine: 5.8.1
+  velocityApi: 3.1.2-SNAPSHOT
+  jupiterEngine: 5.8.2
 
 dependencies:
   adventureBom:
@@ -67,7 +66,6 @@ dependencies:
   minimessage:
     group: net.kyori
     name: adventure-text-minimessage
-    version: { ref: minimessage }
 
   configurateHocon:
     group: org.spongepowered
@@ -87,10 +85,6 @@ dependencies:
     group: org.slf4j
     name: slf4j-jdk14
     version: { ref: slf4j }
-  log4jSlf4jImpl:
-    group: org.apache.logging.log4j
-    name: log4j-slf4j-impl
-    version: { ref: log4jSlf4jImpl }
 
   gson:
     group: com.google.code.gson
@@ -122,6 +116,10 @@ dependencies:
     group: com.destroystokyo.paper
     name: paper-api
     version: { ref: paperApi }
+  paperlib:
+    group: io.papermc
+    name: paperlib
+    version: { ref: paperlib }
 
   waterfallApi:
     group: io.github.waterfallmc

gradle/wrapper/gradle-wrapper.properties

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

license.txt

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Jason Penilla
+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

license_header.txt

@@ -1,6 +1,6 @@
 This file is part of MiniMOTD, licensed under the MIT License.
 
-Copyright (c) 2021 Jason Penilla
+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

settings.gradle.kts

@@ -1,15 +1,16 @@
-enableFeaturePreview("VERSION_CATALOGS")
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 
 dependencyResolutionManagement {
   repositories {
-    // mavenLocal()
     mavenCentral()
-    maven("https://oss.sonatype.org/content/repositories/snapshots/")
-    maven("https://papermc.io/repo/repository/maven-public/")
-    maven("https://nexus.velocitypowered.com/repository/maven-public/")
+    maven("https://s01.oss.sonatype.org/content/repositories/snapshots/") {
+      mavenContent { snapshotsOnly() }
+    }
+    maven("https://repo.papermc.io/repository/maven-public/")
     maven("https://repo.spongepowered.org/repository/maven-public/")
-    maven("https://repo.jpenilla.xyz/snapshots/")
+    maven("https://repo.jpenilla.xyz/snapshots/") {
+      mavenContent { snapshotsOnly() }
+    }
   }
   repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
 }
@@ -25,8 +26,8 @@ pluginManagement {
 }
 
 plugins {
-  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.0"
-  id("quiet-fabric-loom") version "0.10-SNAPSHOT"
+  id("ca.stellardrift.polyglot-version-catalogs") version "5.0.1"
+  id("quiet-fabric-loom") version "0.12-SNAPSHOT"
 }
 
 rootProject.name = "MiniMOTD"

sponge7/build.gradle.kts

@@ -5,9 +5,7 @@ plugins {
 }
 
 dependencies {
-  implementation(projects.minimotdCommon) {
-    exclude("org.slf4j", "slf4j-api")
-  }
+  implementation(projects.minimotdCommon)
   implementation(libs.adventurePlatformSpongeApi)
   compileOnly(libs.spongeApi7)
   implementation(libs.bstatsSponge)

sponge7/src/main/java/xyz/jpenilla/minimotd/sponge7/ClientPingServerEventListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

sponge7/src/main/java/xyz/jpenilla/minimotd/sponge7/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

sponge8/build.gradle.kts

@@ -9,14 +9,11 @@ plugins {
 
 dependencies {
   implementation(projects.minimotdCommon)
-  implementation(libs.log4jSlf4jImpl) {
-    isTransitive = false
-  }
 }
 
 sponge {
   injectRepositories(false)
-  apiVersion("8.0.0-SNAPSHOT")
+  apiVersion("8.1.0-SNAPSHOT")
   plugin(rootProject.name.toLowerCase(Locale.ENGLISH)) {
     loader {
       name(PluginLoaders.JAVA_PLAIN)
@@ -44,8 +41,6 @@ sponge {
 tasks {
   shadowJar {
     configureForNativeAdventurePlatform()
-    commonRelocation("org.apache.logging.slf4j")
-    platformRelocation("log4j", "org.slf4j")
     platformRelocation("sponge8", "xyz.jpenilla.minimotd.common")
     dependencies {
       exclude(dependency("io.leangen.geantyref:geantyref"))

sponge8/src/main/java/xyz/jpenilla/minimotd/sponge8/ClientPingServerEventListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

sponge8/src/main/java/xyz/jpenilla/minimotd/sponge8/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

universal/build.gradle.kts

@@ -12,7 +12,7 @@ val platforms = setOf(
   projects.minimotdVelocity,
   projects.minimotdFabric,
   projects.minimotdSponge7,
-  //projects.minimotdSponge8
+  projects.minimotdSponge8
 ).map { it.dependencyProject }
 
 val universal = tasks.register<Jar>("universal") {
@@ -23,7 +23,6 @@ val universal = tasks.register<Jar>("universal") {
   for (platform in platforms) {
     val jarTask = platform.miniMOTDPlatform.jarTask
     from(zipTree(jarTask.flatMap { it.archiveFile }))
-    dependsOn(jarTask) // todo: remove when updating Gradle to 7.1 (https://github.com/gradle/gradle/issues/15569)
   }
 }
 

velocity/build.gradle.kts

@@ -4,9 +4,7 @@ plugins {
 }
 
 dependencies {
-  implementation(projects.minimotdCommon) {
-    exclude("org.slf4j", "slf4j-api")
-  }
+  implementation(projects.minimotdCommon)
   implementation(libs.bstatsVelocity)
   compileOnly(libs.velocityApi)
   annotationProcessor(libs.velocityApi)

velocity/src/main/java/xyz/jpenilla/minimotd/velocity/MiniMOTDPlugin.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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

velocity/src/main/java/xyz/jpenilla/minimotd/velocity/PingListener.java

@@ -1,7 +1,7 @@
 /*
  * This file is part of MiniMOTD, licensed under the MIT License.
  *
- * Copyright (c) 2021 Jason Penilla
+ * 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