1.21.5 -> 25w14craftmine

Author: Sollace

build.gradle

@@ -4,7 +4,7 @@ buildscript {
     }
 }
 plugins {
-    id 'fabric-loom' version '1.6-SNAPSHOT'
+    id 'fabric-loom' version '1.10-SNAPSHOT'
     id 'maven-publish'
     id 'com.modrinth.minotaur' version '2.+'
     id 'org.ajoberstar.reckon' version '0.13.1'

gradle.properties

@@ -3,10 +3,10 @@ org.gradle.daemon=false
 
 # Fabric Properties
   # check these on https://fabricmc.net/develop
-  minecraft_version=1.21-pre2
-  yarn_mappings=1.21-pre2+build.2
-  loader_version=0.15.11
-  fabric_version=0.99.4+1.21
+  minecraft_version=25w14craftmine
+  yarn_mappings=25w14craftmine+build.3
+  loader_version=0.16.12
+  fabric_version=0.119.7+25w14craftmine
 
 # Mod Properties
   group=com.sollace
@@ -15,9 +15,9 @@ org.gradle.daemon=false
   description=Enhanced Networking API for Fabric
 
 # Publishing
-  minecraft_version_range=>=1.21-pre2
+  minecraft_version_range=>=25w14craftmine
   modrinth_loader_type=fabric
   modrinth_project_id=coknAH3s
 
 # Dependencies
-  modmenu_version=11.0.0-beta.1
+  modmenu_version=14.0.0-rc.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/com/sollace/fabwork/api/packets/C2SPacketType.java

@@ -38,6 +38,7 @@ public void sendToServer(T packet) {
         ClientSimpleNetworkingImpl.send(new Payload<>(packet, id));
     }
 
+    @SuppressWarnings("unchecked")
     @Deprecated
     public void sendToServer(Packet packet) {
         sendToServer((T)packet);
@@ -66,6 +67,7 @@ public net.minecraft.network.packet.Packet<ServerCommonPacketListener> toPacket(
         return ClientSimpleNetworkingImpl.createC2SPacket(new Payload<>(packet, id));
     }
 
+    @SuppressWarnings("unchecked")
     @Deprecated
     public net.minecraft.network.packet.Packet<ServerCommonPacketListener> toPacket(Packet packet) {
         return toPacket((T)packet);

src/main/java/com/sollace/fabwork/api/packets/S2CPacketType.java

@@ -8,6 +8,7 @@
 import net.minecraft.network.codec.PacketCodec;
 import net.minecraft.network.listener.ClientCommonPacketListener;
 import net.minecraft.network.packet.CustomPayload;
+import net.minecraft.server.GameInstance;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
@@ -26,6 +27,7 @@ public void sendToPlayer(T packet, ServerPlayerEntity recipient) {
         ServerPlayNetworking.send(recipient, new Payload<>(packet, id));
     }
 
+    @SuppressWarnings("unchecked")
     @Deprecated
     public void sendToPlayer(Packet packet, ServerPlayerEntity recipient) {
         sendToPlayer((T)packet, recipient);
@@ -41,6 +43,7 @@ public void sendToAllPlayers(T packet, World world) {
         });
     }
 
+    @SuppressWarnings("unchecked")
     @Deprecated
     public void sendToAllPlayers(Packet packet, World world) {
         sendToAllPlayers((T)packet, world);
@@ -53,6 +56,7 @@ public void sendToSurroundingPlayers(T packet, Entity entity) {
         }
     }
 
+    @SuppressWarnings("unchecked")
     @Deprecated
     public void sendToSurroundingPlayers(Packet packet, Entity entity) {
         sendToSurroundingPlayers((T)packet, entity);
@@ -61,16 +65,29 @@ public void sendToSurroundingPlayers(Packet packet, Entity entity) {
     public void sendToAllPlayers(T packet, MinecraftServer server) {
         Objects.requireNonNull(server, "Server cannot be null");
         var p = toPacket(packet);
-        server.getPlayerManager().getPlayerList().forEach(recipient -> {
+        server.getGameInstance().getPlayerManager().getPlayerList().forEach(recipient -> {
             recipient.networkHandler.sendPacket(p);
         });
     }
 
+    @SuppressWarnings("unchecked")
     @Deprecated
     public void sendToAllPlayers(Packet packet, MinecraftServer server) {
         sendToAllPlayers((T)packet, server);
     }
 
+    public void sendToAllPlayers(T packet, GameInstance game) {
+        Objects.requireNonNull(game, "Game cannot be null");
+        sendToAllPlayers(packet, game.getServer());
+    }
+
+    @SuppressWarnings("unchecked")
+    @Deprecated
+    public void sendToAllPlayers(Packet packet, GameInstance game) {
+        Objects.requireNonNull(game, "Game cannot be null");
+        sendToAllPlayers((T)packet, game.getServer());
+    }
+
     /**
      * Repackages a fabwork packet into a normal Minecraft protocol packet suitable for sending to a connected client.
      */
@@ -79,6 +96,7 @@ public net.minecraft.network.packet.Packet<ClientCommonPacketListener> toPacket(
         return ServerPlayNetworking.createS2CPacket(new Payload<>(packet, id));
     }
 
+    @SuppressWarnings("unchecked")
     @Deprecated
     public net.minecraft.network.packet.Packet<ClientCommonPacketListener> toPacket(Packet packet) {
         return toPacket((T)packet);

src/main/java/com/sollace/fabwork/impl/FabworkClientImpl.java

@@ -49,7 +49,7 @@ public void onInitializeClient() {
                 }, "Responding to server sync packet");
             });
 
-            ClientConfigurationConnectionEvents.READY.register((handler, client) -> {
+            ClientConfigurationConnectionEvents.COMPLETE.register((handler, client) -> {
                 LoaderUtil.invokeUntrusted(() -> {
                     STATE.verify(LOGGER, true).ifPresent(disconnectReason -> {
                        handler.onDisconnect(new DisconnectS2CPacket(disconnectReason));

src/main/java/com/sollace/fabwork/impl/FabworkServer.java

@@ -46,7 +46,7 @@ public void onInitialize() {
                     handler.addTask(new ServerPlayerConfigurationTask() {
                         @Override
                         public void sendPacket(Consumer<Packet<?>> sender) {
-                            LOGGER.info("Sending mod list to {}[{}]", handler.getDebugProfile().getName(), connection.getAddress());
+                            LOGGER.info("Sending mod list to {}[{}]", handler.method_69162().getName(), connection.getAddress());
                             sender.accept(ServerConfigurationNetworking.createS2CPacket(new ConsentMessage(emptyState.installedOnServer())));
                         }
 
@@ -56,11 +56,11 @@ public Key getKey() {
                         }
                     });
                 } else {
-                    LOGGER.warn("{}[{}] does not appear to have fabwork installed", handler.getDebugProfile().getName(), connection.getAddress());
+                    LOGGER.warn("{}[{}] does not appear to have fabwork installed", handler.method_69162().getName(), connection.getAddress());
                     if (config.allowUnmoddedClients) {
-                        LOGGER.warn("Connection to {}[{}] has been force permitted by server configuration. They are allowed to join checking installed mods! Their game may be broken upon joining!", handler.getDebugProfile().getName(), connection.getAddress());
+                        LOGGER.warn("Connection to {}[{}] has been force permitted by server configuration. They are allowed to join checking installed mods! Their game may be broken upon joining!", handler.method_69162().getName(), connection.getAddress());
                     } else {
-                        emptyState.verify(LOGGER, false).ifPresent(handler::disconnect);
+                        emptyState.verify(LOGGER, false).ifPresent(connection::disconnect);
                     }
                 }
             });
@@ -69,8 +69,8 @@ public Key getKey() {
                 LoaderUtil.invokeUntrusted(() -> {
                     SynchronisationState state = new SynchronisationState(payload.entries().stream(), emptyState.installedOnServer().stream());
                     ClientConnection connection = ClientConnectionAccessor.get(context.networkHandler());
-                    LOGGER.info("Got mod list from {}[{}]: {}", context.networkHandler().getDebugProfile().getName(), connection.getAddress(), ModEntriesUtil.stringify(state.installedOnClient()));
-                    state.verify(LOGGER, true).ifPresentOrElse(context.networkHandler()::disconnect, () -> context.networkHandler().completeTask(MOD_LIST_SYNC_TASK));
+                    LOGGER.info("Got mod list from {}[{}]: {}", context.networkHandler().method_69162().getName(), connection.getAddress(), ModEntriesUtil.stringify(state.installedOnClient()));
+                    state.verify(LOGGER, true).ifPresentOrElse(ClientConnectionAccessor.get(context.networkHandler())::disconnect, () -> context.networkHandler().completeTask(MOD_LIST_SYNC_TASK));
                 }, "Received synchronize response from client");
             });
         }

src/main/java/com/sollace/fabwork/impl/mixin/GameInstanceAccessor.java

@@ -0,0 +1,13 @@
+package com.sollace.fabwork.impl.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.server.GameInstance;
+import net.minecraft.server.network.ServerCommonNetworkHandler;
+
+@Mixin(ServerCommonNetworkHandler.class)
+public interface GameInstanceAccessor {
+    @Accessor("field_58305")
+    GameInstance getGameInstance();
+}

src/main/java/com/sollace/fabwork/impl/mixin/ServerCommonNetworkHandlerMixin.java

@@ -1,8 +1,6 @@
 package com.sollace.fabwork.impl.mixin;
 
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.gen.Accessor;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -11,26 +9,24 @@
 import com.sollace.fabwork.impl.ClientConnectionAccessor;
 import com.sollace.fabwork.impl.PlayPingSynchroniser;
 
+import net.minecraft.class_10972;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkThreadUtils;
 import net.minecraft.network.listener.ServerCommonPacketListener;
 import net.minecraft.network.packet.c2s.common.CommonPongC2SPacket;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.network.ServerCommonNetworkHandler;
 
-@Mixin(ServerCommonNetworkHandler.class)
+@Mixin(class_10972.class)
 abstract class ServerCommonNetworkHandlerMixin implements ServerCommonPacketListener, ClientConnectionAccessor {
-
-    @Shadow
-    protected @Final MinecraftServer server;
-
     @Inject(method = "onPong(Lnet/minecraft/network/packet/c2s/common/CommonPongC2SPacket;)V", at = @At("HEAD"))
     private void onOnPong(CommonPongC2SPacket packet, CallbackInfo info) {
-        NetworkThreadUtils.forceMainThread(packet, this, server);
-        PlayPingSynchroniser.onClientResponse(packet, server);
+        Object self = this;
+        if (self instanceof GameInstanceAccessor handler) {
+            NetworkThreadUtils.forceMainThread(packet, this, handler.getGameInstance().getThreadExecutor());
+            PlayPingSynchroniser.onClientResponse(packet, handler.getGameInstance().getThreadExecutor());
+        }
     }
 
     @Override
-    @Accessor("connection")
+    @Accessor("field_58317")
     public abstract ClientConnection getConnection();
 }

src/main/java/com/sollace/fabwork/impl/packets/ServerSimpleNetworkingImpl.java

@@ -24,7 +24,7 @@ public static <T> C2SPacketType<T> registerC2S(Identifier id, PacketCodec<? supe
         var type = new C2SPacketType<>(packetId, Payload.createCodec(packetId, codec), new ReceiverImpl<>(id));
         PayloadTypeRegistry.playC2S().register(type.id(), type.codec());
         ServerPlayNetworking.registerGlobalReceiver(type.id(), (payload, context) -> {
-            context.player().server.execute(() -> ((ReceiverImpl<ServerPlayerEntity, T>)type.receiver()).onReceive(context.player(), payload.packet()));
+            context.player().method_69130().getServer().execute(() -> ((ReceiverImpl<ServerPlayerEntity, T>)type.receiver()).onReceive(context.player(), payload.packet()));
         });
         return type;
     }