Update to 26.2

build.gradle

@@ -1,4 +1,4 @@
 plugins {
-    id 'net.fabricmc.fabric-loom' version '1.15.5' apply false
+    id 'net.fabricmc.fabric-loom' version '1.17-SNAPSHOT' apply false
     id 'net.neoforged.moddev' version '2.0.141' apply false
 }

common/src/main/java/cc/unilock/nilcord/discord/Discord.java

@@ -139,6 +139,10 @@ public void sendMessageToDiscord(String message) {
     }
 
     public void sendMessageToDiscord(String message, @Nullable ServerPlayer player) {
+        if (this.shutdown) {
+            System.out.println("Dropping '" + message + "' because");
+        }
+
         if (!CONFIG.discord.webhook.enabled.value() || this.webhook == null || player == null) {
             sendBotMessageToDiscord(message);
         } else {
@@ -185,11 +189,11 @@ private String parseMentions(String message) {
         TextChannel textChannel = jda.getTextChannelById(CONFIG.discord.channel_id.value());
         if (textChannel != null) {
             for (Member member : textChannel.getMembers()) {
-                message = Pattern.compile(Pattern.quote("@" + member.getUser().getName()), Pattern.CASE_INSENSITIVE).matcher(msg).replaceAll(member.getAsMention());
+                msg = Pattern.compile(Pattern.quote("@" + member.getUser().getName()), Pattern.CASE_INSENSITIVE).matcher(msg).replaceAll(member.getAsMention());
             }
         }
 
-        return message;
+        return msg;
     }
 
     public void startJda() {

fabric/build.gradle

@@ -59,7 +59,7 @@ loom {
 }
 
 def loaderAttribute = Attribute.of('io.github.mcgradleconventions.loader', String)
-['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements', 'includeInternal', 'modCompileClasspath'].each { variant ->
+['apiElements', 'runtimeElements', 'sourcesElements', 'javadocElements', 'modCompileClasspath'].each { variant ->
     configurations.named("$variant") {
         attributes {
             attribute(loaderAttribute, 'fabric')

fabric/src/main/java/cc/unilock/nilcord/NilcordFabric.java

@@ -17,10 +17,8 @@ public void onInitialize() {
             Nilcord.server = server;
             Nilcord.serverInit();
         });
-        ServerLifecycleEvents.SERVER_STARTED.register(server -> {
-            Nilcord.serverStart();
-        });
-        ServerLifecycleEvents.SERVER_STOPPING.register(server -> {
+        ServerLifecycleEvents.SERVER_STARTED.register(server -> Nilcord.serverStart());
+        ServerLifecycleEvents.SERVER_STOPPED.register(server -> {
             Nilcord.serverStop();
             Nilcord.server = null;
         });
@@ -29,12 +27,8 @@ public void onInitialize() {
         ServerMessageEvents.CHAT_MESSAGE.register((message, sender, params) -> {
             Nilcord.playerChatMessage(sender, message.decoratedContent());
         });
-        ServerPlayerEvents.JOIN.register(player -> {
-            Nilcord.playerJoin(player);
-        });
-        ServerPlayerEvents.LEAVE.register(player -> {
-            Nilcord.playerLeave(player);
-        });
+        ServerPlayerEvents.JOIN.register(Nilcord::playerJoin);
+        ServerPlayerEvents.LEAVE.register(Nilcord::playerLeave);
         ServerLivingEntityEvents.AFTER_DEATH.register((entity, damageSource) -> {
             if (entity instanceof ServerPlayer player) {
                 Nilcord.playerDeath(player, damageSource);

gradle.properties

@@ -7,8 +7,8 @@ group=cc.unilock.nilcord
 java_version=25
 
 # Common
-minecraft_version=26.1.1
-minecraft_version_base=26.1
+minecraft_version=26.2
+minecraft_version_base=26.2
 mod_name=Nilcord
 mod_author=unilock
 mod_id=nilcord
@@ -17,20 +17,20 @@ credits=
 description=Yet another Discord bridge for Minecraft.
 minecraft_version_range=[26.1,)
 # https://projects.neoforged.net/neoforged/neoform
-neo_form_version=26.1.1-1
+neo_form_version=26.2-1
 
 # Dependencies
 jda_version=6.4.1
 kaleido_version=0.3.3+1.3.2
-papi_fabric_version=3.0.0-beta.2+26.1
-papi_neoforge_version=3.0.0-beta.2+neoforge+26.1
+papi_fabric_version=3.1.0-beta.1+26.2
+papi_neoforge_version=3.1.0-beta.1+26.2+neoforge
 
 # Fabric: https://fabricmc.net/develop/
-fabric_version=0.145.4+26.1.1
-fabric_loader_version=0.18.6
+fabric_version=0.152.2+26.2
+fabric_loader_version=0.19.3
 
 # NeoForge: https://projects.neoforged.net/neoforged/neoforge
-neoforge_version=26.1.1.15-beta
+neoforge_version=26.2.0.6-beta
 neoforge_loader_version_range=[4,)
 
 # Gradle

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/src/main/java/cc/unilock/nilcord/NilcordNeoForge.java

@@ -10,7 +10,7 @@
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.server.ServerStartedEvent;
 import net.neoforged.neoforge.event.server.ServerStartingEvent;
-import net.neoforged.neoforge.event.server.ServerStoppingEvent;
+import net.neoforged.neoforge.event.server.ServerStoppedEvent;
 
 @Mod(Constants.MOD_ID)
 public class NilcordNeoForge {
@@ -32,7 +32,7 @@ public void serverStarted(ServerStartedEvent event) {
             Nilcord.serverStart();
         }
         @SubscribeEvent
-        public void serverStopping(ServerStoppingEvent event) {
+        public void serverStopped(ServerStoppedEvent event) {
             Nilcord.serverStop();
             Nilcord.server = null;
         }