diff options
| author | Aizistral | 2023-01-02 14:37:04 +0100 |
|---|---|---|
| committer | Aizistral | 2023-01-02 14:37:04 +0100 |
| commit | af90a12079c558ea4a1efc9385e93bcdcb9917dd (patch) | |
| tree | 2eccea5899a998bbd52be8fa15c5eb6cd0430ae0 /forge/src | |
| parent | 6d61f99a1547eab58e88dcea7e3901511f0929d2 (diff) | |
Commence work on branch unification
Diffstat (limited to 'forge/src')
12 files changed, 389 insertions, 0 deletions
diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java new file mode 100644 index 0000000..65bac6e --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java @@ -0,0 +1,42 @@ +package com.aizistral.nochatreports.forge; + +import java.nio.charset.Charset; +import java.util.function.Predicate; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.aizistral.nochatreports.config.NCRConfig; + +import net.minecraft.network.protocol.login.ServerboundHelloPacket; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.network.ServerGamePacketListenerImpl; +import net.minecraft.server.network.ServerLoginPacketListenerImpl; +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.event.EventNetworkChannel; +import net.minecraftforge.network.simple.SimpleChannel; +import net.minecraftforge.server.ServerLifecycleHooks; + +@Mod("nochatreports") +public class NoChatReports { + public static final Logger LOGGER = LogManager.getLogger(); + + public NoChatReports() { + LOGGER.info("KONNICHIWA ZA WARUDO!"); + LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); + + NCRConfig.load(); + } +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java new file mode 100644 index 0000000..4181a77 --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java @@ -0,0 +1,115 @@ +package com.aizistral.nochatreports.forge; + +import java.util.List; + +import com.aizistral.nochatreports.NoChatReports; +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.core.SigningMode; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; +import com.google.common.collect.ImmutableList; + +import net.minecraft.Util; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.ConnectScreen; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.ClientPlayerNetworkEvent; +import net.minecraftforge.client.event.ScreenEvent; +import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; + +@EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE) +public class NoChatReportsClient { + private static boolean signingKeysPresent = false; + + private NoChatReportsClient() { + throw new IllegalStateException("Can't touch this"); + } + + @OnlyIn(Dist.CLIENT) + public static void onDisconnect(Minecraft client) { + if (!NCRConfig.getClient().enableMod()) + return; + + if (NCRConfig.getCommon().enableDebugLog()) { + NoChatReports.LOGGER.info("Disconnected from server, resetting safety state!"); + } + + ServerSafetyState.reset(); + } + + @SubscribeEvent + @OnlyIn(Dist.CLIENT) + public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { + Minecraft client = Minecraft.getInstance(); + ClientPacketListener handler = client.getConnection(); + + if (!NCRConfig.getClient().enableMod()) + return; + + client.execute(() -> { + if (!client.isLocalServer()) { + if (ServerSafetyState.isOnRealms()) { + // NO-OP + } else if (!handler.getConnection().isEncrypted()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else if (client.getCurrentServer() instanceof ServerDataExtension ext && + ext.preventsChatReports()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else if (NCRConfig.getServerPreferences().hasMode(ServerSafetyState.getLastServer(), + SigningMode.ALWAYS)) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.setAllowChatSigning(true); + } else { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); + } + } else { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SINGLEPLAYER); + } + + if (NCRConfig.getCommon().enableDebugLog()) { + NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); + } + + if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) { + handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client")); + } + }); + } + + public static boolean areSigningKeysPresent() { + return signingKeysPresent; + } + + public static void setSigningKeysPresent(boolean present) { + signingKeysPresent = present; + } + + public static void resendLastChatMessage() { + var mc = Minecraft.getInstance(); + var chatScr = mc.screen instanceof ChatScreen chat ? chat : null; + + if (chatScr == null) { + chatScr = new ChatScreen(""); + chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight()); + } + + chatScr.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false); + } + + +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java new file mode 100644 index 0000000..74f1220 --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java @@ -0,0 +1,32 @@ +package com.aizistral.nochatreports.forge.mixins.client; + +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; + +import com.aizistral.nochatreports.forge.NoChatReportsClient; + +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; + +@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) { + NoChatReportsClient.onDisconnect(Minecraft.getInstance()); + } + } + +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java new file mode 100644 index 0000000..e128c3e --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java @@ -0,0 +1,22 @@ +package com.aizistral.nochatreports.forge.mixins.client; + +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; + +import com.aizistral.nochatreports.forge.NoChatReportsClient; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; +import net.minecraft.network.chat.Component; + +@Mixin(ClientHandshakePacketListenerImpl.class) +public class MixinClientHandshakePacketListenerImpl { + + @Inject(method = "onDisconnect", at = @At("HEAD")) + private void invokeLoginDisconnectEvent(Component reason, CallbackInfo info) { + NoChatReportsClient.onDisconnect(Minecraft.getInstance()); + } + +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java new file mode 100644 index 0000000..817cea3 --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java @@ -0,0 +1,22 @@ +package com.aizistral.nochatreports.forge.mixins.client; + +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; + +import com.aizistral.nochatreports.forge.NoChatReportsClient; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.chat.Component; + +@Mixin(value = ClientPacketListener.class) +public class MixinClientPacketListener { + + @Inject(method = "onDisconnect", at = @At("HEAD")) + private void handleDisconnection(Component reason, CallbackInfo info) { + NoChatReportsClient.onDisconnect(Minecraft.getInstance()); + } + +} diff --git a/forge/src/forge/java/net/fabricmc/api/EnvType.java b/forge/src/forge/java/net/fabricmc/api/EnvType.java new file mode 100644 index 0000000..253b6e8 --- /dev/null +++ b/forge/src/forge/java/net/fabricmc/api/EnvType.java @@ -0,0 +1,48 @@ +/* + * Copyright 2016 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.api; + +/** + * Represents a type of environment. + * + * <p>A type of environment is a jar file in a <i>Minecraft</i> version's json file's {@code download} + * subsection, including the {@code client.jar} and the {@code server.jar}.</p> + * + * @see Environment + * @see EnvironmentInterface + */ +public enum EnvType { + /** + * Represents the client environment type, in which the {@code client.jar} for a + * <i>Minecraft</i> version is the main game jar. + * + * <p>A client environment type has all client logic (client rendering and integrated + * server logic), the data generator logic, and dedicated server logic. It encompasses + * everything that is available on the {@linkplain #SERVER server environment type}.</p> + */ + CLIENT, + /** + * Represents the server environment type, in which the {@code server.jar} for a + * <i>Minecraft</i> version is the main game jar. + * + * <p>A server environment type has the dedicated server logic and data generator + * logic, which are all included in the {@linkplain #CLIENT client environment type}. + * However, the server environment type has its libraries embedded compared to the + * client.</p> + */ + SERVER +} diff --git a/forge/src/forge/java/net/fabricmc/api/Environment.java b/forge/src/forge/java/net/fabricmc/api/Environment.java new file mode 100644 index 0000000..1db59da --- /dev/null +++ b/forge/src/forge/java/net/fabricmc/api/Environment.java @@ -0,0 +1,48 @@ +/* + * Copyright 2016 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.api; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Applied to declare that the annotated element is present only in the specified environment. + * + * <p>Use with caution, as Fabric-loader will remove the annotated element in a mismatched environment!</p> + * + * <p>When the annotated element is removed, bytecode associated with the element will not be removed. + * For example, if a field is removed, its initializer code will not, and will cause an error on execution.</p> + * + * <p>If an overriding method has this annotation and its overridden method doesn't, + * unexpected behavior may happen. If an overridden method has this annotation + * while the overriding method doesn't, it is safe, but the method can be used from + * the overridden class only in the specified environment.</p> + * + * @see EnvironmentInterface + */ +@Retention(RetentionPolicy.CLASS) +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PACKAGE}) +@Documented +public @interface Environment { + /** + * Returns the environment type that the annotated element is only present in. + */ + EnvType value(); +} diff --git a/forge/src/forge/resources/META-INF/MANIFEST.MF b/forge/src/forge/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..b4613f2 --- /dev/null +++ b/forge/src/forge/resources/META-INF/MANIFEST.MF @@ -0,0 +1 @@ +MixinConfigs: nochatreports.mixins.json, nochatreports-forge.mixins.json
\ No newline at end of file diff --git a/forge/src/forge/resources/META-INF/accesstransformer.cfg b/forge/src/forge/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..390e8b0 --- /dev/null +++ b/forge/src/forge/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,23 @@ +public net.minecraft.client.gui.screens.SimpleOptionsSubScreen f_96668_ #list +public-f net.minecraft.client.gui.components.ImageButton f_94224_ #xTexStart +public-f net.minecraft.client.gui.components.ImageButton f_94225_ #yTexStart +public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents +public-f net.minecraft.network.chat.contents.TranslatableContents f_237498_ #args +public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents +public net.minecraft.client.gui.screens.multiplayer.WarningScreen f_210915_ #message +public net.minecraft.client.multiplayer.ClientPacketListener f_240902_ #signedMessageEncoder +public net.minecraft.client.multiplayer.ClientPacketListener f_252517_ #chatSession +public net.minecraft.client.gui.components.Tooltip f_257026_ #MAX_WIDTH +public net.minecraft.client.gui.components.Tooltip f_256850_ #message +public net.minecraft.client.gui.components.Tooltip f_257004_ #narration +public net.minecraft.client.gui.components.Tooltip f_256766_ #cachedTooltip +public net.minecraft.client.gui.screens.Screen f_96541_ #minecraft +public net.minecraft.client.gui.screens.Screen f_96542_ #itemRenderer +public net.minecraft.client.gui.screens.Screen f_96547_ #font +public net.minecraft.client.gui.components.AbstractWidget f_256816_ #tooltip +public net.minecraft.client.gui.components.AbstractWidget f_256936_ #tooltipMsDelay +public net.minecraft.client.gui.screens.OptionsScreen f_260594_ #TELEMETRY + +public net.minecraft.client.gui.components.Tooltip <init>(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V #<init> +public-f net.minecraft.client.gui.components.AbstractWidget m_257936_()V #updateTooltip +public-f net.minecraft.client.gui.components.CycleButton m_257795_()V #updateTooltip
\ No newline at end of file diff --git a/forge/src/forge/resources/META-INF/mods.toml b/forge/src/forge/resources/META-INF/mods.toml new file mode 100644 index 0000000..d3afb8e --- /dev/null +++ b/forge/src/forge/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/forge/src/forge/resources/nochatreports-forge.mixins.json b/forge/src/forge/resources/nochatreports-forge.mixins.json new file mode 100644 index 0000000..0f0effa --- /dev/null +++ b/forge/src/forge/resources/nochatreports-forge.mixins.json @@ -0,0 +1,18 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.aizistral.nochatreports.forge.mixins", + "compatibilityLevel": "JAVA_17", + "verbose": true, + "mixins": [], + "client": [ + "client.MixinClientConnection", + "client.MixinClientHandshakePacketListenerImpl", + "client.MixinClientPacketListener" + ], + "server": [], + "injectors": { + "defaultRequire": 1 + }, + "refmap": "nochatreports-forge.refmap.json" +} diff --git a/forge/src/forge/resources/pack.mcmeta b/forge/src/forge/resources/pack.mcmeta new file mode 100644 index 0000000..1a52c3a --- /dev/null +++ b/forge/src/forge/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "No Chat Reports Resources", + "pack_format": 6 + } +} |
