From a6785ace59293fa9dc0a6af13489069148c65495 Mon Sep 17 00:00:00 2001 From: embeddedt Date: Wed, 17 Apr 2024 05:01:32 -0400 Subject: Add NeoForge project (#464) * Port to NeoForge * Symlink fixes--- .../nochatreports/neoforge/NoChatReports.java | 60 ++++++++++++++++++++++ .../mixins/client/MixinClientConnection.java | 30 +++++++++++ .../MixinClientHandshakePacketListenerImpl.java | 20 ++++++++ .../mixins/client/MixinClientPacketListener.java | 25 +++++++++ .../mixins/client/MixinServerStatusPinger$1.java | 43 ++++++++++++++++ .../main/resources/META-INF/accesstransformer.cfg | 23 +++++++++ neoforge/src/main/resources/META-INF/mods.toml | 13 +++++ .../neoforge/nochatreports-neoforge.mixins.json | 17 ++++++ 8 files changed, 231 insertions(+) create mode 100644 neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java create mode 100644 neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java create mode 100644 neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java create mode 100644 neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java create mode 100644 neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java create mode 100644 neoforge/src/main/resources/META-INF/accesstransformer.cfg create mode 100644 neoforge/src/main/resources/META-INF/mods.toml create mode 100644 neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json (limited to 'neoforge/src') diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java new file mode 100644 index 0000000..5cf87aa --- /dev/null +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/NoChatReports.java @@ -0,0 +1,60 @@ +package com.aizistral.nochatreports.neoforge; + +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.platform.PlatformProvider; +import com.aizistral.nochatreports.common.platform.events.ClientEvents; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.neoforged.api.distmarker.Dist; +import net.neoforged.api.distmarker.OnlyIn; +import net.neoforged.neoforge.client.event.ClientPlayerNetworkEvent; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.Mod; +import net.neoforged.fml.common.Mod.EventBusSubscriber; +import net.neoforged.fml.common.Mod.EventBusSubscriber.Bus; +import net.neoforged.fml.loading.FMLEnvironment; +import net.neoforged.fml.loading.FMLPaths; + +import java.nio.file.Path; + +@Mod("nochatreports") +public class NoChatReports implements PlatformProvider { + + public NoChatReports() { + NCRCore.awaken(this); + } + + @Override + public boolean isOnClient() { + return FMLEnvironment.dist == Dist.CLIENT; + } + + @Override + public boolean isOnDedicatedServer() { + return FMLEnvironment.dist == Dist.DEDICATED_SERVER; + } + + @Override + public Path getMinecraftDir() { + return FMLPaths.GAMEDIR.get(); + } + + @Override + public Path getConfigDir() { + return FMLPaths.CONFIGDIR.get(); + } + + @EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE) + public static class Events { + + @SubscribeEvent + @OnlyIn(Dist.CLIENT) + public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { + Minecraft client = Minecraft.getInstance(); + ClientPacketListener handler = client.getConnection(); + ClientEvents.PLAY_READY.invoker().handle(handler, client); + } + + } + +} diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java new file mode 100644 index 0000000..8616b5a --- /dev/null +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientConnection.java @@ -0,0 +1,30 @@ +package com.aizistral.nochatreports.neoforge.mixins.client; + +import com.aizistral.nochatreports.common.platform.events.ClientEvents; +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.Connection; +import net.minecraft.network.PacketListener; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(Connection.class) +public class MixinClientConnection { + @Shadow + private PacketListener packetListener; + + @Inject(method = "channelInactive", at = @At("HEAD")) + private void handleDisconnect(ChannelHandlerContext context, CallbackInfo info) { + // not the case for client/server query + if (this.packetListener instanceof ClientHandshakePacketListenerImpl + || this.packetListener instanceof ClientPacketListener) { + ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance()); + } + } + +} diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java new file mode 100644 index 0000000..a250137 --- /dev/null +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientHandshakePacketListenerImpl.java @@ -0,0 +1,20 @@ +package com.aizistral.nochatreports.neoforge.mixins.client; + +import com.aizistral.nochatreports.common.platform.events.ClientEvents; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; +import net.minecraft.network.chat.Component; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(ClientHandshakePacketListenerImpl.class) +public class MixinClientHandshakePacketListenerImpl { + + @Inject(method = "onDisconnect", at = @At("HEAD")) + private void invokeLoginDisconnectEvent(Component reason, CallbackInfo info) { + ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance()); + } + +} diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java new file mode 100644 index 0000000..ee1b56a --- /dev/null +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinClientPacketListener.java @@ -0,0 +1,25 @@ +package com.aizistral.nochatreports.neoforge.mixins.client; + +import com.aizistral.nochatreports.common.platform.events.ClientEvents; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.chat.Component; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(value = ClientCommonPacketListenerImpl.class) +public class MixinClientPacketListener { + + @Inject(method = "onDisconnect", at = @At("HEAD")) + private void handleDisconnection(Component reason, CallbackInfo info) { + Object self = this; + + if (self instanceof ClientPacketListener) { + ClientEvents.DISCONNECT.invoker().handle(Minecraft.getInstance()); + } + } + +} diff --git a/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java new file mode 100644 index 0000000..80bb635 --- /dev/null +++ b/neoforge/src/main/java/com/aizistral/nochatreports/neoforge/mixins/client/MixinServerStatusPinger$1.java @@ -0,0 +1,43 @@ +package com.aizistral.nochatreports.neoforge.mixins.client; + +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.platform.extensions.ServerPingerExtension; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ServerData; +import org.spongepowered.asm.mixin.Mixin; + +import java.lang.reflect.Field; + +@Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1") +public class MixinServerStatusPinger$1 implements ServerPingerExtension { + private static final Field SERVER_DATA_FIELD; + + static { + // We use reflection here because Mixin's AP dies when trying to process @Shadow of this lol + try { + Class pinger = Class.forName("net.minecraft.client.multiplayer.ServerStatusPinger$1"); + + SERVER_DATA_FIELD = pinger.getDeclaredField("val$p_105460_"); + SERVER_DATA_FIELD.setAccessible(true); + } catch (Exception ex) { + Error error = new Error("Reflection failed in MixinServerStatusPinger$1!", ex); + + NCRCore.LOGGER.catching(error); + Minecraft.getInstance().execute(() -> { + throw error; + }); + + throw error; + } + } + + @Override + public ServerData getServerData() { + try { + return (ServerData) SERVER_DATA_FIELD.get(this); + } catch (Exception ex) { + throw new RuntimeException("Failed to get ServerData field via reflection", ex); + } + } + +} diff --git a/neoforge/src/main/resources/META-INF/accesstransformer.cfg b/neoforge/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..7106c8d --- /dev/null +++ b/neoforge/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,23 @@ +public net.minecraft.client.gui.screens.SimpleOptionsSubScreen list +public-f net.minecraft.network.chat.MutableComponent contents +public-f net.minecraft.network.chat.contents.TranslatableContents args +public-f net.minecraft.network.chat.MutableComponent contents +public net.minecraft.client.gui.screens.multiplayer.WarningScreen message +public net.minecraft.client.multiplayer.ClientPacketListener signedMessageEncoder +public net.minecraft.client.multiplayer.ClientPacketListener chatSession +public net.minecraft.client.gui.components.Tooltip MAX_WIDTH +public net.minecraft.client.gui.components.Tooltip message +public net.minecraft.client.gui.components.Tooltip narration +public net.minecraft.client.gui.components.Tooltip cachedTooltip +public net.minecraft.client.gui.screens.Screen minecraft +public net.minecraft.client.gui.screens.Screen itemRenderer +public net.minecraft.client.gui.screens.Screen font +public net.minecraft.client.gui.components.AbstractWidget tooltip +#public net.minecraft.client.gui.components.AbstractWidget tooltipMsDelay +public net.minecraft.client.gui.screens.OptionsScreen TELEMETRY + +public net.minecraft.client.gui.components.Tooltip (Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V +#public-f net.minecraft.client.gui.components.AbstractWidget updateTooltip()V +#public-f net.minecraft.client.gui.components.CycleButton updateTooltip()V + +public-f net.minecraft.client.gui.components.AbstractWidget render(Lnet/minecraft/client/gui/GuiGraphics;IIF)V \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..8b4420c --- /dev/null +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,13 @@ +license="WTFPL" +modLoader="javafml" +loaderVersion="[1,)" + +[[mods]] +modId="nochatreports" +version="1.0.0" +displayName="No Chat Reports" +authors="Aizistral" +logoFile="ncr_logo.png" +description=''' +None +''' \ No newline at end of file diff --git a/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json new file mode 100644 index 0000000..81e5afb --- /dev/null +++ b/neoforge/src/main/resources/mixins/neoforge/nochatreports-neoforge.mixins.json @@ -0,0 +1,17 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.aizistral.nochatreports.neoforge.mixins", + "compatibilityLevel": "JAVA_17", + "mixins": [], + "client": [ + "client.MixinClientConnection", + "client.MixinClientHandshakePacketListenerImpl", + "client.MixinClientPacketListener", + "client.MixinServerStatusPinger$1" + ], + "server": [], + "injectors": { + "defaultRequire": 1 + } +} -- cgit v1.2.3