Backport to 1.21.1

Author: TBlueF

buildSrc/src/main/kotlin/bluemap.base.gradle.kts

@@ -24,10 +24,10 @@ repositories {
 
     mavenCentral()
     maven ("https://libraries.minecraft.net")
-    maven ("https://repo.papermc.io/repository/maven-public")
     maven ( "https://maven.fabricmc.net" )
     maven ( "https://maven.neoforged.net/releases" )
     maven ( "https://maven.minecraftforge.net" )
+    maven ("https://repo.papermc.io/repository/maven-public")
 }
 
 publishing {

implementations/fabric/build.gradle.kts

@@ -8,13 +8,13 @@ plugins {
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21.9", "1.21.10"
+    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
 val yarnMappings = "${minecraftVersion}+build.1"
 val fabricLoaderVersion = "0.17.2"
-val fabricApiVersion = "0.133.14+${minecraftVersion}"
+val fabricApiVersion = "0.100.1+${minecraftVersion}"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)

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

@@ -41,7 +41,6 @@
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
-import net.kyori.adventure.text.serializer.json.JSONComponentSerializer;
 import net.minecraft.SharedConstants;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -138,7 +137,7 @@ public void onInitialize() {
 
     @Override
     public String getMinecraftVersion() {
-        return SharedConstants.getGameVersion().comp_4024();
+        return SharedConstants.getGameVersion().getId();
     }
 
     @Override

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

@@ -143,12 +143,12 @@ private void update(ServerPlayerEntity player) {
 
         this.name = Text.of(player.getName().getString());
 
-        Vec3d pos = player.getEntityPos();
+        Vec3d pos = player.getPos();
         this.position = new Vector3d(pos.getX(), pos.getY(), pos.getZ());
         this.rotation = new Vector3d(player.getPitch(), player.getHeadYaw(), 0);
         this.sneaking = player.isSneaking();
 
-        net.minecraft.server.world.ServerWorld world = player.getEntityWorld();
+        net.minecraft.server.world.ServerWorld world = player.getServerWorld();
 
         this.skyLight = world.getLightingProvider().get(LightType.SKY).getLightLevel(player.getBlockPos());
         this.blockLight = world.getLightingProvider().get(LightType.BLOCK).getLightLevel(player.getBlockPos());

implementations/forge/build.gradle.kts

@@ -6,11 +6,11 @@ plugins {
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"
+    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
-val forgeVersion = "56.0.7"
+val forgeVersion = "51.0.1"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)

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

@@ -27,7 +27,7 @@
 import de.bluecolored.bluemap.common.serverinterface.ServerEventListener;
 import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedOutEvent;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

@@ -53,8 +53,9 @@
 import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
 import net.minecraftforge.event.server.ServerStoppingEvent;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
+import net.minecraftforge.eventbus.api.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;
@@ -97,7 +98,7 @@ public ForgeMod(FMLJavaModLoadingContext context) {
         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
-        context.registerExtensionPoint(
+        ModLoadingContext.get().registerExtensionPoint(
                 IExtensionPoint.DisplayTest.class,
                 () -> new IExtensionPoint.DisplayTest(
                         () -> IExtensionPoint.DisplayTest.IGNORESERVERONLY,
@@ -146,13 +147,13 @@ public void onServerStopping(ServerStoppingEvent event) {
     }
 
     @SubscribeEvent
-    public void onTick(ServerTickEvent.Post evt) {
+    public void onTick(ServerTickEvent evt) {
         updateSomePlayers();
     }
 
     @Override
     public String getMinecraftVersion() {
-        return SharedConstants.getCurrentVersion().id();
+        return SharedConstants.getCurrentVersion().getId();
     }
 
     @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.level();
+        ServerLevel world = player.serverLevel();
 
         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/build.gradle.kts

@@ -6,11 +6,11 @@ plugins {
 }
 
 val supportedMinecraftVersions = listOf(
-    "1.21.6", "1.21.7", "1.21.8", "1.21.9", "1.21.10"
+    "1.21", "1.21.1", "1.21.2", "1.21.3", "1.21.4"
 )
 
 val minecraftVersion = supportedMinecraftVersions.first()
-val neoVersion = "21.6.11-beta"
+val neoVersion = "21.0.0-beta"
 
 val shadowInclude: Configuration by configurations.creating
 configurations.api.get().extendsFrom(shadowInclude)

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().id();
+        return SharedConstants.getCurrentVersion().getId();
     }
 
     @Override