diff options
| author | Aizistral | 2022-11-17 19:04:49 +0100 |
|---|---|---|
| committer | Aizistral | 2022-11-17 19:05:02 +0100 |
| commit | 82d46ed101098f2b63c581fe4e9859737c10093b (patch) | |
| tree | 90e3e7db41ca0ec61df99df4fb32a715cbf61cf4 /src/main/java/com/aizistral | |
| parent | e7b601d64c5f7723e413d4f569dab8214f043c65 (diff) | |
Nuke networking channel
Closes #297, closes #255
Diffstat (limited to 'src/main/java/com/aizistral')
6 files changed, 13 insertions, 105 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index c39ad33..a70f8f0 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -1,7 +1,6 @@ package com.aizistral.nochatreports; import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.network.ServerChannelHandler; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; @@ -22,27 +21,13 @@ import java.nio.charset.Charset; public final class NoChatReports implements ModInitializer { public static final Logger LOGGER = LogManager.getLogger(); - public static final ResourceLocation CHANNEL = new ResourceLocation("nochatreports", "sync"); @Override public void onInitialize() { LOGGER.info("KONNICHIWA ZA WARUDO!"); LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); - ServerPlayNetworking.registerGlobalReceiver(CHANNEL, ServerChannelHandler.INSTANCE); - ServerPlayConnectionEvents.JOIN.register(this::onPlayReady); NCRConfig.load(); } - private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) { - server.execute(() -> { - if (server.isSingleplayerOwner(handler.player.getGameProfile())) - return; - - if (NCRConfig.getCommon().demandOnClient() && !ServerPlayNetworking.canSend(handler, CHANNEL)) { - handler.disconnect(Component.literal(NCRConfig.getCommon().demandOnClientMessage())); - } - }); - } - } diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 6cdc7d3..3b85d03 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -4,7 +4,6 @@ import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerDataExtension; import com.aizistral.nochatreports.core.ServerSafetyLevel; import com.aizistral.nochatreports.core.ServerSafetyState; -import com.aizistral.nochatreports.network.ClientChannelHandler; import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; @@ -27,10 +26,6 @@ public final class NoChatReportsClient implements ClientModInitializer { public void onInitializeClient() { NoChatReports.LOGGER.info("Client initialization..."); - if (NCRConfig.getClient().enableMod()) { - ClientChannelHandler.INSTANCE.register(); - } - ClientPlayConnectionEvents.JOIN.register(this::onPlayReady); ClientPlayConnectionEvents.DISCONNECT.register(this::onDisconnect); } @@ -52,12 +47,9 @@ public final class NoChatReportsClient implements ClientModInitializer { client.execute(() -> { if (!client.isLocalServer()) { - boolean canSend = ClientPlayNetworking.canSend(NoChatReports.CHANNEL); if (ServerSafetyState.isOnRealms()) { // NO-OP - } else if (canSend) { - ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); } else if (client.getCurrentServer() instanceof ServerDataExtension ext && ext.preventsChatReports()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); @@ -76,7 +68,7 @@ public final class NoChatReportsClient implements ClientModInitializer { NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); } - if (NCRConfig.getClient().demandOnServer() && !ClientPlayNetworking.canSend(NoChatReports.CHANNEL)) { + if (NCRConfig.getClient().demandOnServer() && ServerSafetyState.getCurrent() != ServerSafetyLevel.SECURE) { handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client")); } }); diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java index b06836a..cf5f6be 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java @@ -13,7 +13,6 @@ import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerSafetyState; import com.aizistral.nochatreports.gui.AdvancedImageButton; import com.aizistral.nochatreports.gui.AdvancedTooltip; -import com.aizistral.nochatreports.network.ClientChannelHandler; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.BufferBuilder; import com.mojang.blaze3d.vertex.BufferUploader; @@ -70,10 +69,8 @@ public abstract class MixinJoinMultiplayerScreen extends Screen { if (enabled) { ((ImageButton)btn).xTexStart = 0; - ClientChannelHandler.INSTANCE.register(); } else { ((ImageButton)btn).xTexStart = 20; - ClientChannelHandler.INSTANCE.unregister(); } ServerSafetyState.reset(); diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java index f90fe74..d88a2eb 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java @@ -5,8 +5,12 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import com.aizistral.nochatreports.config.NCRConfig; + +import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ServerGamePacketListener; import net.minecraft.network.protocol.game.ServerboundChatSessionUpdatePacket; +import net.minecraft.server.network.ServerGamePacketListenerImpl; @Mixin(ServerboundChatSessionUpdatePacket.class) public class MixinServerboundChatSessionUpdatePacket { @@ -18,6 +22,14 @@ public class MixinServerboundChatSessionUpdatePacket { @Inject(method = "handle", at = @At("HEAD"), cancellable = true) private void onHandle(ServerGamePacketListener listener, CallbackInfo info) { + var impl = (ServerGamePacketListenerImpl) listener; + + if (!impl.getPlayer().getServer().isSingleplayerOwner(impl.getPlayer().getGameProfile())) { + if (NCRConfig.getCommon().demandOnClient()) { + impl.disconnect(Component.literal(NCRConfig.getCommon().demandOnClientMessage())); + } + } + info.cancel(); } diff --git a/src/main/java/com/aizistral/nochatreports/network/ClientChannelHandler.java b/src/main/java/com/aizistral/nochatreports/network/ClientChannelHandler.java deleted file mode 100644 index fd44f1a..0000000 --- a/src/main/java/com/aizistral/nochatreports/network/ClientChannelHandler.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.aizistral.nochatreports.network; - -import com.aizistral.nochatreports.NoChatReports; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking.PlayChannelHandler; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.network.FriendlyByteBuf; - -/** - * Mod's client channel handler. So far just passively exists. - * @author Aizistral - */ - -@Environment(EnvType.CLIENT) -public final class ClientChannelHandler implements PlayChannelHandler { - public static final ClientChannelHandler INSTANCE = new ClientChannelHandler(); - private boolean registered = false; - - private ClientChannelHandler() { - // Can't touch this - } - - @Override - public void receive(Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf, PacketSender responseSender) { - // NO-OP - } - - public void register() { - if (!this.registered) { - ClientPlayNetworking.registerGlobalReceiver(NoChatReports.CHANNEL, ClientChannelHandler.INSTANCE); - this.registered = true; - } - } - - public void unregister() { - if (this.registered) { - ClientPlayNetworking.unregisterGlobalReceiver(NoChatReports.CHANNEL); - this.registered = false; - } - } - - public boolean isRegistered() { - return this.registered; - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/network/ServerChannelHandler.java b/src/main/java/com/aizistral/nochatreports/network/ServerChannelHandler.java deleted file mode 100644 index a3a33c3..0000000 --- a/src/main/java/com/aizistral/nochatreports/network/ServerChannelHandler.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.aizistral.nochatreports.network; - -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking.PlayChannelHandler; -import net.minecraft.network.FriendlyByteBuf; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -/** - * Mod's server channel handler. So far just passively exists. - * @author Aizistral - */ - -public final class ServerChannelHandler implements PlayChannelHandler { - public static final ServerChannelHandler INSTANCE = new ServerChannelHandler(); - - private ServerChannelHandler() { - // Can't touch this - } - - @Override - public void receive(MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf, PacketSender responseSender) { - // NO-OP - } - -} |
