Update neoforge implementation to 1.21.6

Author: TBlueF

implementations/fabric/build.gradle.kts

@@ -113,6 +113,7 @@ modrinth {
 curseforgeBlueMap {
     addGameVersion("Fabric")
     addGameVersion("Java ${java.toolchain.languageVersion.get()}")
+    addGameVersion("Server")
     supportedMinecraftVersions.forEach {
         addGameVersion(it)
     }

implementations/forge/build.gradle.kts

@@ -119,6 +119,7 @@ modrinth {
 curseforgeBlueMap {
     addGameVersion("Forge")
     addGameVersion("Java ${java.toolchain.languageVersion.get()}")
+    addGameVersion("Server")
     supportedMinecraftVersions.forEach {
         addGameVersion(it)
     }

implementations/neoforge/build.gradle.kts

@@ -6,12 +6,11 @@ plugins {
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4", "1.21.5"
+    "1.21.6"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
-val neoVersion = "21.0.0-beta"
-val loaderVersion = "4"
+val neoVersion = "21.6.11-beta"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)
@@ -77,7 +76,6 @@ tasks.withType(ProcessResources::class).configureEach {
         "version" to project.version,
         "minecraft_version" to minecraftVersion,
         "neo_version" to neoVersion,
-        "loader_version" to loaderVersion,
     )
     inputs.properties(replacements)
     filesMatching(listOf(
@@ -110,6 +108,7 @@ modrinth {
 curseforgeBlueMap {
     addGameVersion("NeoForge")
     addGameVersion("Java ${java.toolchain.languageVersion.get()}")
+    addGameVersion("Server")
     supportedMinecraftVersions.forEach {
         addGameVersion(it)
     }

implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeCommandSource.java

@@ -25,12 +25,15 @@
 package de.bluecolored.bluemap.forge;
 
 import com.flowpowered.math.vector.Vector3d;
+import com.google.gson.JsonElement;
+import com.mojang.serialization.JsonOps;
 import de.bluecolored.bluemap.common.commands.TextFormat;
 import de.bluecolored.bluemap.common.serverinterface.CommandSource;
 import de.bluecolored.bluemap.common.serverinterface.ServerWorld;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.network.chat.ComponentSerialization;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -50,8 +53,9 @@ public void sendMessage(Component text) {
         if (TextFormat.lineCount(text) > 1)
             text = Component.newline().append(text).appendNewline();
 
-        delegate.sendSystemMessage(Objects.requireNonNull(net.minecraft.network.chat.Component.Serializer
-                .fromJson(GsonComponentSerializer.gson().serialize(text.compact()), delegate.registryAccess())));
+        JsonElement textJson = GsonComponentSerializer.gson().serializeToTree(text.compact());
+        net.minecraft.network.chat.Component minecraftText = ComponentSerialization.CODEC.parse(JsonOps.INSTANCE, textJson).getOrThrow();
+        delegate.sendSystemMessage(minecraftText);
     }
 
     @Override

implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgeMod.java

@@ -140,7 +140,7 @@ public void onTick(ServerTickEvent.Post evt) {
 
     @Override
     public String getMinecraftVersion() {
-        return SharedConstants.getCurrentVersion().getId();
+        return SharedConstants.getCurrentVersion().id();
     }
 
     @Override

implementations/neoforge/src/main/java/de/bluecolored/bluemap/forge/ForgePlayer.java

@@ -150,7 +150,7 @@ private void update(ServerPlayer player) {
         this.rotation = new Vector3d(player.getXRot(), player.getYHeadRot(), 0);
         this.sneaking = player.isCrouching();
 
-        ServerLevel world = player.serverLevel();
+        ServerLevel world = player.level();
 
         this.skyLight = world.getChunkSource().getLightEngine().getLayerListener(LightLayer.SKY).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));
         this.blockLight = world.getChunkSource().getLightEngine().getLayerListener(LightLayer.BLOCK).getLightValue(new BlockPos(player.getBlockX(), player.getBlockY(), player.getBlockZ()));

implementations/neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -1,5 +1,3 @@
-modLoader="javafml"
-loaderVersion="[${loader_version},)"
 license="MIT"
 
 [[mods]]