From 23a48f6909a66c2c3487bdef066d28048717d503 Mon Sep 17 00:00:00 2001 From: Aizistral Date: Fri, 17 Jun 2022 14:46:34 +0200 Subject: THE WAY IS LIT, THE PATH IS CLEAR --- .../aizistral/nochatreports/MixinConnector.java | 13 ++++ .../com/aizistral/nochatreports/NoChatReports.java | 70 +++++++++++++++++++++ .../nochatreports/handlers/NoReportsConfig.java | 64 +++++++++++++++++++ .../mixins/MixinClientPacketListener.java | 23 +++++++ .../nochatreports/mixins/MixinLocalPlayer.java | 41 ++++++++++++ .../nochatreports/mixins/MixinOptions.java | 36 +++++++++++ .../nochatreports/mixins/MixinPlayer.java | 23 +++++++ .../mixins/MixinServerboundChatPacket.java | 26 ++++++++ src/main/resources/META-INF/MANIFEST.MF | 1 + src/main/resources/META-INF/mods.toml | 12 ++++ src/main/resources/NCR_logo.png | Bin 0 -> 12770 bytes .../resources/assets/nochatreports/lang/en_us.json | 3 + src/main/resources/nochatreports.mixins.json | 20 ++++++ src/main/resources/pack.mcmeta | 6 ++ 14 files changed, 338 insertions(+) create mode 100644 src/main/java/com/aizistral/nochatreports/MixinConnector.java create mode 100644 src/main/java/com/aizistral/nochatreports/NoChatReports.java create mode 100644 src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java create mode 100644 src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java create mode 100644 src/main/resources/META-INF/MANIFEST.MF create mode 100644 src/main/resources/META-INF/mods.toml create mode 100644 src/main/resources/NCR_logo.png create mode 100644 src/main/resources/assets/nochatreports/lang/en_us.json create mode 100644 src/main/resources/nochatreports.mixins.json create mode 100644 src/main/resources/pack.mcmeta (limited to 'src/main') diff --git a/src/main/java/com/aizistral/nochatreports/MixinConnector.java b/src/main/java/com/aizistral/nochatreports/MixinConnector.java new file mode 100644 index 0000000..dc2b9a6 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/MixinConnector.java @@ -0,0 +1,13 @@ +package com.aizistral.nochatreports; + +import org.spongepowered.asm.mixin.Mixins; +import org.spongepowered.asm.mixin.connect.IMixinConnector; + +public class MixinConnector implements IMixinConnector { + + @Override + public void connect() { + Mixins.addConfigurations("nochatreports.mixins.json"); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java new file mode 100644 index 0000000..adaf08b --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -0,0 +1,70 @@ +package com.aizistral.nochatreports; + +import java.util.function.Predicate; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.aizistral.nochatreports.handlers.NoReportsConfig; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.simple.SimpleChannel; + +@Mod(NoChatReports.MODID) +public class NoChatReports { + public static final String MODID = "nochatreports"; + public static final Logger LOGGER = LogManager.getLogger(); + private static final String PTC_VERSION = "1"; + private static final Predicate ANY = obj -> true; + private static SimpleChannel packetInstance; + + public NoChatReports() { + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onLoadComplete); + + MinecraftForge.EVENT_BUS.register(this); + + NoReportsConfig.loadConfig(); + } + + private void onLoadComplete(final FMLLoadCompleteEvent event) { + // NO-OP + } + + private void setup(final FMLCommonSetupEvent event) { + packetInstance = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main")) + .networkProtocolVersion(() -> PTC_VERSION) + .clientAcceptedVersions(NoReportsConfig.demandsOnServer() ? PTC_VERSION::equals : ANY) + .serverAcceptedVersions(NoReportsConfig.demandsOnClient() ? PTC_VERSION::equals : ANY) + .simpleChannel(); + } + + private void doClientStuff(final FMLClientSetupEvent event) { + // NO-OP + } + + private void enqueueIMC(final InterModEnqueueEvent event) { + // NO-OP + } + + private void processIMC(final InterModProcessEvent event) { + // NO-OP + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java new file mode 100644 index 0000000..2a9068a --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java @@ -0,0 +1,64 @@ +package com.aizistral.nochatreports.handlers; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Optional; + +import javax.annotation.Nullable; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.fml.loading.FMLPaths; + +public class NoReportsConfig { + private static final File CONFIG_FOLDER = FMLPaths.CONFIGDIR.get().toFile(); + private static final File CONFIG_FILE = new File(CONFIG_FOLDER, "NoChatReports.json"); + private static NoReportsConfig INSTANCE; + private boolean demandOnClient, demandOnServer; + + public static void loadConfig() { + INSTANCE = readFile(); + + if (INSTANCE == null) { + INSTANCE = new NoReportsConfig(); + INSTANCE.demandOnServer = true; + } + + writeFile(INSTANCE); + } + + @Nullable + private static NoReportsConfig readFile() { + if (!CONFIG_FILE.exists() || !CONFIG_FILE.isFile()) + return null; + + try (FileReader reader = new FileReader(CONFIG_FILE)) { + NoReportsConfig transience = new Gson().fromJson(reader, NoReportsConfig.class); + return transience; + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + private static void writeFile(NoReportsConfig instance) { + try (FileWriter writer = new FileWriter(CONFIG_FILE)) { + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + gson.toJson(instance, writer); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public static boolean demandsOnClient() { + return INSTANCE.demandOnClient; + } + + public static boolean demandsOnServer() { + return INSTANCE.demandOnServer; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java new file mode 100644 index 0000000..396832a --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.client.multiplayer.PlayerInfo; +import net.minecraft.network.chat.PlayerChatMessage; + +@Mixin(ClientPacketListener.class) +public class MixinClientPacketListener { + + /** + * @reason Prevents client from trying to validate chat messages relayed + * by the server. They will come unsigned as in good old days, so no point. + * @author Aizistral + */ + @Overwrite + private boolean hasValidSignature(PlayerChatMessage message, PlayerInfo info) { + return true; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java new file mode 100644 index 0000000..24ed9d0 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java @@ -0,0 +1,41 @@ +package com.aizistral.nochatreports.mixins; + +import javax.annotation.Nullable; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import com.mojang.brigadier.ParseResults; + +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.commands.SharedSuggestionProvider; +import net.minecraft.commands.arguments.ArgumentSignatures; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MessageSignature; +import net.minecraft.network.chat.MessageSigner; + +@Mixin(LocalPlayer.class) +public class MixinLocalPlayer { + + /** + * @reason Never sign messages, so that neither server nor other clients have + * proof of them being sent from your account. + * @author Aizistral + */ + + @Overwrite + private MessageSignature signMessage(MessageSigner signer, Component message) { + return MessageSignature.unsigned(); + } + + /** + * @reason Same as above, except commands mostly concern only server. + * @author Aizistral + */ + + @Overwrite + private ArgumentSignatures signCommandArguments(MessageSigner signer, ParseResults results, @Nullable Component component) { + return ArgumentSignatures.empty(); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java new file mode 100644 index 0000000..78c0343 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java @@ -0,0 +1,36 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import com.google.common.collect.ImmutableList; +import com.mojang.serialization.Codec; + +import net.minecraft.client.OptionInstance; +import net.minecraft.client.Options; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; + +@Mixin(Options.class) +public class MixinOptions { + private OptionInstance alternativeOption; + + /** + * @reason Disable secure chat option, since it will not work anyways. + * @author Aizistral + */ + + @Overwrite + public OptionInstance onlyShowSecureChat() { + if (this.alternativeOption == null) { + this.alternativeOption = new OptionInstance<>("options.onlyShowSecureChat", + OptionInstance.cachedConstantTooltip(Component.translatable("gui.nochatreport.secureChat")), + (component, value) -> { + return value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF; + }, new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL), false, (value) -> {}); + } + + return this.alternativeOption; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java new file mode 100644 index 0000000..e4326fa --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.ProfilePublicKey; + +@Mixin(Player.class) +public class MixinPlayer { + + /** + * @reason Prevents server from trying to validate signatures on incoming + * chat messages. Also prevents it from relaying public keys to other clients. + * @author Aizistral + */ + + @Overwrite + public ProfilePublicKey getProfilePublicKey() { + return null; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java new file mode 100644 index 0000000..d1f1814 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java @@ -0,0 +1,26 @@ +package com.aizistral.nochatreports.mixins; + +import java.util.UUID; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.network.chat.MessageSignature; +import net.minecraft.network.protocol.game.ServerboundChatPacket; + +@Mixin(ServerboundChatPacket.class) +public class MixinServerboundChatPacket { + + /** + * @reason Strip signatures before relaying messages to other clients, + * if they somehow arrive signed. This is important for mod to be able + * to operate in server-only mode. + * @author Aizistral + */ + + @Overwrite + public MessageSignature getSignature(UUID uuid) { + return MessageSignature.unsigned(); + } + +} diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..520b722 --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1 @@ +MixinConnector: com.aizistral.nochatreports.MixinConnector diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..d3afb8e --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,12 @@ +license="WTFPL" +modLoader="javafml" +loaderVersion="[31,)" +[[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/src/main/resources/NCR_logo.png b/src/main/resources/NCR_logo.png new file mode 100644 index 0000000..433dc42 Binary files /dev/null and b/src/main/resources/NCR_logo.png differ diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json new file mode 100644 index 0000000..28caa07 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "gui.nochatreport.secureChat": "This option cannot work with No Chat Reports, since there are no signatures to verify." +} \ No newline at end of file diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json new file mode 100644 index 0000000..aa3858a --- /dev/null +++ b/src/main/resources/nochatreports.mixins.json @@ -0,0 +1,20 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.aizistral.nochatreports.mixins", + "compatibilityLevel": "JAVA_17", + "refmap": "nochatreports.refmap.json", + "verbose": true, + "mixins": [ + "MixinPlayer", + "MixinServerboundChatPacket" + ], + "client": [ + "MixinLocalPlayer", + "MixinClientPacketListener", + "MixinOptions" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..1a52c3a --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "No Chat Reports Resources", + "pack_format": 6 + } +} -- cgit v1.2.3