Update forge implementation to 1.21.6

Author: TBlueF

implementations/fabric/src/main/java/de/bluecolored/bluemap/fabric/FabricCommandSource.java

@@ -25,7 +25,7 @@
 package de.bluecolored.bluemap.fabric;
 
 import com.flowpowered.math.vector.Vector3d;
-import com.mojang.serialization.DataResult;
+import com.google.gson.JsonElement;
 import com.mojang.serialization.JsonOps;
 import de.bluecolored.bluemap.common.commands.TextFormat;
 import de.bluecolored.bluemap.common.serverinterface.CommandSource;
@@ -55,8 +55,9 @@ public void sendMessage(Component text) {
         if (TextFormat.lineCount(text) > 1)
             text = Component.newline().append(text).appendNewline();
 
-        DataResult<Text> result = TextCodecs.CODEC.parse(JsonOps.INSTANCE, GsonComponentSerializer.gson().serializeToTree(text.compact()));
-        delegate.sendMessage(result.getOrThrow());
+        JsonElement textJson = GsonComponentSerializer.gson().serializeToTree(text.compact());
+        Text minecraftText = TextCodecs.CODEC.parse(JsonOps.INSTANCE, textJson).getOrThrow();
+        delegate.sendMessage(minecraftText);
     }
 
     @Override

implementations/forge/build.gradle.kts

@@ -6,11 +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 forgeVersion = "51.0.1"
+val forgeVersion = "56.0.7"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)

implementations/forge/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/forge/src/main/java/de/bluecolored/bluemap/forge/ForgeEventForwarder.java

@@ -25,10 +25,9 @@
 package de.bluecolored.bluemap.forge;
 
 import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -53,10 +53,10 @@
 import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 import net.minecraftforge.fml.IExtensionPoint;
-import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
@@ -77,7 +77,7 @@ public class ForgeMod implements Server {
     private final Map<UUID, Player> onlinePlayerMap;
     private final List<ForgePlayer> onlinePlayerList;
 
-    public ForgeMod() {
+    public ForgeMod(FMLJavaModLoadingContext context) {
         Logger.global.clear();
         Logger.global.put(new Log4jLogger(LogManager.getLogger(Plugin.PLUGIN_NAME)));
 
@@ -97,7 +97,7 @@ public ForgeMod() {
         MinecraftForge.EVENT_BUS.register(this.eventForwarder);
 
         //Make sure the mod being absent on the other network side does not cause the client to display the server as incompatible
-        ModLoadingContext.get().registerExtensionPoint(
+        context.registerExtensionPoint(
                 IExtensionPoint.DisplayTest.class,
                 () -> new IExtensionPoint.DisplayTest(
                         () -> IExtensionPoint.DisplayTest.IGNORESERVERONLY,
@@ -152,7 +152,7 @@ public void onTick(ServerTickEvent evt) {
 
     @Override
     public String getMinecraftVersion() {
-        return SharedConstants.getCurrentVersion().getId();
+        return SharedConstants.getCurrentVersion().id();
     }
 
     @Override

implementations/forge/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()));