build: 1.21.6-rc1

Author: ishland

.github/workflows/build.yml

@@ -36,7 +36,7 @@ jobs:
         run: ./gradlew build
       - name: upload to modrinth and curseforge
         run: ./gradlew modrinth curseforge
-        if: github.ref == 'refs/heads/ver/1.21.5'
+        if: github.ref == 'refs/heads/ver/1.21.6'
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_API_TOKEN }}

gradle.properties

@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.5
-yarn_mappings=1.21.5+build.1
-loader_version=0.16.10
+minecraft_version=1.21.6-rc1
+yarn_mappings=1.21.6-rc1+build.1
+loader_version=0.16.14
 
 # Mod Properties
 mod_version = 0.2.0+beta.7

src/main/java/com/ishland/vmp/mixins/chunk/loading/async_chunk_on_player_login/MixinServerConfigurationNetworkHandler.java

@@ -32,6 +32,7 @@
 import net.minecraft.server.world.ChunkTicketType;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.text.Text;
+import net.minecraft.util.ErrorReporter;
 import net.minecraft.util.Unit;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
@@ -91,13 +92,13 @@ private void onDisconnect(DisconnectionInfo info, CallbackInfo ci) {
         }
     }
 
-    @WrapOperation(method = "onReady", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/PlayerManager;createPlayer(Lcom/mojang/authlib/GameProfile;Lnet/minecraft/network/packet/c2s/common/SyncedClientOptions;)Lnet/minecraft/server/network/ServerPlayerEntity;"))
-    private ServerPlayerEntity replacePlayer(PlayerManager instance, GameProfile profile, SyncedClientOptions syncedOptions, Operation<ServerPlayerEntity> original) {
+    @WrapOperation(method = "onReady", at = @At(value = "NEW", target = "(Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/server/world/ServerWorld;Lcom/mojang/authlib/GameProfile;Lnet/minecraft/network/packet/c2s/common/SyncedClientOptions;)Lnet/minecraft/server/network/ServerPlayerEntity;"))
+    private ServerPlayerEntity replacePlayer(MinecraftServer server, ServerWorld world, GameProfile profile, SyncedClientOptions clientOptions, Operation<ServerPlayerEntity> original) {
         if (this.vmp$heldPlayer != null) {
             this.vmp$dropTicket();
             return this.vmp$heldPlayer;
         } else {
-            return original.call(instance, profile, syncedOptions);
+            return original.call(server, world, profile, clientOptions);
         }
     }
 
@@ -116,19 +117,20 @@ private void delayJoinWorld(ServerPlayerConfigurationTask instance, Consumer<Pac
                 return;
             }
 
-            ServerPlayerEntity player = playerManager.createPlayer(this.profile, this.syncedOptions);
+            ServerPlayerEntity player = new ServerPlayerEntity(this.server, this.server.getOverworld(), this.profile, this.syncedOptions);
             this.vmp$heldPlayer = player;
 
-            RegistryKey<World> registryKey = playerManager.loadPlayerData(player)
-                    .flatMap(nbt -> DimensionType.worldFromDimensionNbt(new Dynamic<>(NbtOps.INSTANCE, nbt.get("Dimension"))).resultOrPartial(LOGGER::error))
-                    .orElse(World.OVERWORLD);
-            ServerWorld storedWorld = playerManager.getServer().getWorld(registryKey);
             ServerWorld actualWorld;
-            if (storedWorld == null) {
-                LOGGER.warn("Unknown respawn dimension {}, defaulting to overworld", registryKey);
-                actualWorld = playerManager.getServer().getOverworld();
-            } else {
-                actualWorld = storedWorld;
+            try (ErrorReporter.Logging logging = new ErrorReporter.Logging(player.getErrorReporterContext(), LOGGER)) {
+                RegistryKey<World> registryKey = playerManager.loadPlayerData(player, logging)
+                        .flatMap(view -> view.read("Dimension", World.CODEC)).orElse(World.OVERWORLD);
+                ServerWorld storedWorld = playerManager.getServer().getWorld(registryKey);
+                if (storedWorld == null) {
+                    LOGGER.warn("Unknown respawn dimension {}, defaulting to overworld", registryKey);
+                    actualWorld = playerManager.getServer().getOverworld();
+                } else {
+                    actualWorld = storedWorld;
+                }
             }
 
             ChunkPos chunkPos = new ChunkPos(player.getBlockPos());

src/main/java/com/ishland/vmp/mixins/networking/no_flush/MixinClientConnection.java

@@ -3,6 +3,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelFutureListener;
 import io.netty.channel.EventLoop;
 import io.netty.util.concurrent.AbstractEventExecutor;
 import net.minecraft.network.ClientConnection;
@@ -22,7 +23,7 @@ private Channel dontFlush(Channel instance) {
     }
 
     @WrapOperation(method = "sendImmediately", at = @At(value = "INVOKE", target = "Lio/netty/channel/EventLoop;execute(Ljava/lang/Runnable;)V"))
-    private void avoidImmediateExecute(EventLoop instance, Runnable runnable, Operation<Void> original, Packet<?> packet, @Nullable PacketCallbacks callbacks, boolean flush) {
+    private void avoidImmediateExecute(EventLoop instance, Runnable runnable, Operation<Void> original, Packet<?> packet, @Nullable ChannelFutureListener channelFutureListener, boolean flush) {
         if (!flush && instance instanceof AbstractEventExecutor executor) {
             executor.lazyExecute(runnable);
         } else {

src/main/java/com/ishland/vmp/mixins/playerwatching/optimize_nearby_entity_tracking_lookups/MixinServerPlayerEntity.java

@@ -14,8 +14,8 @@
 @Mixin(ServerPlayerEntity.class)
 public abstract class MixinServerPlayerEntity extends PlayerEntity implements ServerPlayerEntityExtension {
 
-    public MixinServerPlayerEntity(World world, BlockPos pos, float yaw, GameProfile gameProfile) {
-        super(world, pos, yaw, gameProfile);
+    public MixinServerPlayerEntity(World world, GameProfile profile) {
+        super(world, profile);
     }
 
     private double vmpTracking$prevX = Double.NaN;