diff options
Diffstat (limited to 'src/main/java/com/aizistral')
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/NoChatReports.java | 34 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/NCRClient.java (renamed from src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java) | 49 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/NCRCore.java | 50 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java (renamed from src/main/java/com/aizistral/nochatreports/config/JSONConfig.java) | 23 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java | 275 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java (renamed from src/main/java/com/aizistral/nochatreports/config/NCRConfig.java) | 24 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java (renamed from src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java) | 14 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java (renamed from src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java) | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/NCRConfigEncryption.java (renamed from src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java) | 10 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java (renamed from src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java) | 17 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/config/ServerAddressAdapter.java (renamed from src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java (renamed from src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java) | 10 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/core/ServerDataExtension.java (renamed from src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyLevel.java (renamed from src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java (renamed from src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java) | 18 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java (renamed from src/main/java/com/aizistral/nochatreports/core/SigningMode.java) | 7 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryption.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java) | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryptor.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java) | 16 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryption.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java) | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryptor.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java) | 12 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryption.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java) | 16 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryptor.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java) | 22 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryption.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryption.java) | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryptor.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java) | 14 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryption.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java) | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryptor.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/Encryption.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/Encryption.java) | 9 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/encryption/Encryptor.java (renamed from src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java) | 10 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java) | 7 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java (renamed from src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java (renamed from src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java) | 25 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java (renamed from src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java) | 25 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/EncryptionWarningScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/FontHelper.java (renamed from src/main/java/com/aizistral/nochatreports/gui/FontHelper.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java (renamed from src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java) | 7 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java) | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/TriageWarningScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java (renamed from src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java) | 19 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java) | 22 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java) | 45 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java) | 9 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java) | 50 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java) | 18 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java) | 23 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java) | 7 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java) | 25 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java) | 11 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java) | 28 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java) | 5 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java) | 16 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRowHelper.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java) | 12 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java) | 14 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinToastComponent.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java) | 8 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatusSerializer.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java) | 6 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinDedicatedServer.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinPlayerList.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java) | 10 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java) | 2 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java (renamed from src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java) | 4 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java | 16 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/platform/events/ClientEvents.java | 23 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/platform/events/PlatformEvent.java | 37 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/platform/events/particular/Disconnect.java | 11 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/common/platform/events/particular/PlayReady.java | 11 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java | 276 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java | 35 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java | 22 | ||||
| -rw-r--r-- | src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java | 20 |
75 files changed, 826 insertions, 771 deletions
diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java deleted file mode 100644 index 584e8ac..0000000 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.aizistral.nochatreports; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; -import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking; -import net.minecraft.network.chat.Component; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import com.aizistral.nochatreports.config.NCRConfig; - -import java.nio.charset.Charset; - -/** - * Common initializer for the mod. Some networking and config setup here. - * @author Aizistral - */ - -public final class NoChatReports implements ModInitializer { - public static final Logger LOGGER = LogManager.getLogger(); - - @Override - public void onInitialize() { - LOGGER.info("KONNICHIWA ZA WARUDO!"); - LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); - - NCRConfig.load(); - } - -} diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java index 2fa7ecf..524cfe0 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/NCRClient.java @@ -1,54 +1,47 @@ -package com.aizistral.nochatreports; +package com.aizistral.nochatreports.common; -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.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerDataExtension; +import com.aizistral.nochatreports.common.core.ServerSafetyLevel; +import com.aizistral.nochatreports.common.core.ServerSafetyState; +import com.aizistral.nochatreports.common.core.SigningMode; +import com.aizistral.nochatreports.common.platform.PlatformProvider; +import com.aizistral.nochatreports.common.platform.events.ClientEvents; -import net.fabricmc.api.ClientModInitializer; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; -import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking; -import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; -import net.minecraft.client.gui.screens.telemetry.TelemetryInfoScreen; import net.minecraft.client.multiplayer.ClientPacketListener; -import net.minecraft.client.multiplayer.ProfileKeyPairManager; import net.minecraft.network.chat.Component; -/** - * Client initializer for the mod. Some networking setup here, as well as few screen-related events. - * @author Aizistral - */ - @Environment(EnvType.CLIENT) -public final class NoChatReportsClient implements ClientModInitializer { +public class NCRClient { private static boolean signingKeysPresent = false; - @Override - public void onInitializeClient() { - NoChatReports.LOGGER.info("Client initialization..."); + private NCRClient() { + throw new IllegalStateException("Can't touch this"); + } + + static void setup() { + NCRCore.LOGGER.info("Client initialization..."); - ClientPlayConnectionEvents.JOIN.register(this::onPlayReady); - ClientPlayConnectionEvents.DISCONNECT.register(this::onDisconnect); + ClientEvents.DISCONNECT.register(NCRClient::onDisconnect); + ClientEvents.PLAY_READY.register(NCRClient::onPlayReady); } - private void onDisconnect(ClientPacketListener handler, Minecraft client) { + private static void onDisconnect(Minecraft client) { if (!NCRConfig.getClient().enableMod()) return; if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Disconnected from server, resetting safety state!"); + NCRCore.LOGGER.info("Disconnected from server, resetting safety state!"); } ServerSafetyState.reset(); } - private void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client) { + private static void onPlayReady(ClientPacketListener handler, Minecraft client) { if (!NCRConfig.getClient().enableMod()) return; @@ -73,7 +66,7 @@ public final class NoChatReportsClient implements ClientModInitializer { } if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); + NCRCore.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); } if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) { diff --git a/src/main/java/com/aizistral/nochatreports/common/NCRCore.java b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java new file mode 100644 index 0000000..257835b --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/NCRCore.java @@ -0,0 +1,50 @@ +package com.aizistral.nochatreports.common; + +import java.nio.charset.Charset; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.platform.PlatformProvider; +import com.google.common.base.Preconditions; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +public class NCRCore { + public static final Logger LOGGER = LogManager.getLogger(); + private static PlatformProvider provider = null; + + private NCRCore() { + throw new IllegalStateException("Can't touch this"); + } + + public static PlatformProvider getProvider() { + return provider; + } + + public static void awaken(PlatformProvider platformProvider) { + Preconditions.checkArgument(provider == null, "NCRCore already awake"); + provider = platformProvider; + + setup(); + + if (provider.getEnvironment() == EnvType.CLIENT) { + clientSetup(); + } + } + + private static void setup() { + LOGGER.info("KONNICHIWA ZA WARUDO!"); + LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); + + NCRConfig.load(); + } + + @Environment(EnvType.CLIENT) + private static void clientSetup() { + NCRClient.setup(); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java index 6f5f488..258b340 100644 --- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/JSONConfig.java @@ -1,28 +1,23 @@ -package com.aizistral.nochatreports.config; +package com.aizistral.nochatreports.common.config; import java.io.BufferedReader; import java.io.BufferedWriter; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Optional; import java.util.function.Supplier; -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.config.JSONConfig; -import com.aizistral.nochatreports.config.ServerAddressAdapter; +import com.aizistral.nochatreports.common.NCRCore; import com.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.JsonSyntaxException; import net.fabricmc.api.EnvType; -import net.fabricmc.loader.api.FabricLoader; import net.minecraft.client.multiplayer.resolver.ServerAddress; public abstract class JSONConfig { - protected static final Path CONFIG_DIR = FabricLoader.getInstance().getConfigDir(); + protected static final Path CONFIG_DIR = NCRCore.getProvider().getConfigDir(); protected static final Gson GSON = createGson(); protected final String fileName; @@ -38,7 +33,7 @@ public abstract class JSONConfig { } public void saveFile() { - NoChatReports.LOGGER.info("Writing config file {}...", this.fileName); + NCRCore.LOGGER.info("Writing config file {}...", this.fileName); writeFile(this.fileName, this); } @@ -49,7 +44,7 @@ public abstract class JSONConfig { public abstract JSONConfig getDefault(); public static <T extends JSONConfig> T loadConfig(Class<T> configClass, Supplier<T> freshInstance, String fileName) { - NoChatReports.LOGGER.info("Reading config file {}...", fileName); + NCRCore.LOGGER.info("Reading config file {}...", fileName); T config = readFile(fileName, configClass).orElseGet(freshInstance); config.uponLoad(); return config; @@ -64,8 +59,8 @@ public abstract class JSONConfig { try (BufferedReader reader = Files.newBufferedReader(file)) { return Optional.of(GSON.fromJson(reader, configClass)); } catch (Exception ex) { - NoChatReports.LOGGER.fatal("Could not read config file: {}", file); - NoChatReports.LOGGER.fatal("This likely indicates the file is corrupted. " + NCRCore.LOGGER.fatal("Could not read config file: {}", file); + NCRCore.LOGGER.fatal("This likely indicates the file is corrupted. " + "You can try deleting it to fix this problem. Full stacktrace below:"); ex.printStackTrace(); return null; @@ -81,7 +76,7 @@ public abstract class JSONConfig { GSON.toJson(config, writer); } } catch (Exception ex) { - NoChatReports.LOGGER.fatal("Could not write config file: {}", file); + NCRCore.LOGGER.fatal("Could not write config file: {}", file); throw new RuntimeException(ex); } } @@ -101,7 +96,7 @@ public abstract class JSONConfig { } }); - if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { + if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { builder.registerTypeAdapter(ServerAddress.class, ServerAddressAdapter.INSTANCE); } diff --git a/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java new file mode 100644 index 0000000..2fda1fa --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/config/ModMenuIntegration.java @@ -0,0 +1,275 @@ +//package com.aizistral.nochatreports.common.config; +// +//import java.util.Arrays; +//import java.util.List; +//import java.util.stream.Stream; +// +//import com.aizistral.nochatreports.common.core.ServerSafetyState; +//import com.aizistral.nochatreports.common.core.SigningMode; +//import com.aizistral.nochatreports.common.gui.FontHelper; +//import com.terraformersmc.modmenu.api.ConfigScreenFactory; +//import com.terraformersmc.modmenu.api.ModMenuApi; +// +//import me.shedaniel.clothconfig2.api.ConfigBuilder; +//import me.shedaniel.clothconfig2.api.ConfigCategory; +//import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; +//import net.fabricmc.api.EnvType; +//import net.fabricmc.api.Environment; +//import net.minecraft.ChatFormatting; +//import net.minecraft.client.Minecraft; +//import net.minecraft.locale.Language; +//import net.minecraft.network.chat.ClickEvent; +//import net.minecraft.network.chat.Component; +//import net.minecraft.network.chat.HoverEvent; +// +///** +// * Implementation of ModMenu and ClothConfig support for the mod. +// * @author MODKILLER1001 +// */ +// +//// TODO We need to move this into fabric package +//@Environment(EnvType.CLIENT) +//public final class ModMenuIntegration implements ModMenuApi { +// +// private String translateKey(String key) { +// return Language.getInstance().getOrDefault(key); +// } +// +// private Component[] wrapTooltip(String text) { +// List<String> list = FontHelper.wrap(Minecraft.getInstance().font, text, 250); +// Component[] tooltip = new Component[list.size()]; +// +// for (int i = 0; i < list.size(); i++) { +// tooltip[i] = Component.literal(list.get(i)); +// } +// +// return tooltip; +// } +// +// private Component[] makeTooltip(String key) { +// return this.wrapTooltip(this.translateKey(key)); +// } +// +// @Override +// public ConfigScreenFactory<?> getModConfigScreenFactory() { +// return screen -> { +// +// // Get the previous screen +// ConfigBuilder builder = ConfigBuilder.create() +// .setParentScreen(Minecraft.getInstance().screen) +// .setTitle(Component.translatable("configuration.NoChatReports.config")); +// +// // Set category +// ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client")); +// ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan")); +// +// ConfigEntryBuilder entryBuilder = builder.entryBuilder(); +// +// // Set an option for enableMod +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip")) +// .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> { +// NCRConfig.getClient().enableMod = newValue; +// NCRConfig.getClient().saveFile(); +// })) +// .build()); +// +// // Set an option for showNCRButton +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showNCRButton"), NCRConfig.getClient().showNCRButton) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.showNCRButton.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().showNCRButton = newValue) +// .build()); +// +// +// String signingTooltip = this.translateKey("option.NoChatReports.defaultSigningMode.tooltip") +// + "\n "; +// +// for (SigningMode mode : SigningMode.values()) { +// if (mode.isSelectableGlobally()) { +// signingTooltip += "\n\n"; +// signingTooltip += ChatFormatting.AQUA; +// signingTooltip += ChatFormatting.BOLD; +// signingTooltip += ChatFormatting.UNDERLINE; +// signingTooltip += this.translateKey(mode.getNameKey()); +// signingTooltip += ChatFormatting.RESET; +// signingTooltip += "\n"; +// signingTooltip += this.translateKey(mode.getTooltipKey()); +// } +// } +// +// // Dropdown for defaultSigningMode +// client.addEntry( +// entryBuilder.startStringDropdownMenu(Component.translatable("option.NoChatReports.defaultSigningMode"), +// NCRConfig.getClient().defaultSigningMode.getName().getString()) +// .setTooltip(this.wrapTooltip(signingTooltip)) +// .setDefaultValue(SigningMode.PROMPT.getName().getString()) +// .setSelections(Stream.of(SigningMode.values()).filter(SigningMode::isSelectableGlobally) +// .map(mode -> mode.getName().getString()).toList()) +// .setSaveConsumer(newValue -> { +// NCRConfig.getClient().defaultSigningMode = Arrays.stream(SigningMode.values()) +// .filter(mode -> mode.getName().getString().equals(newValue)) +// .findFirst().get(); +// }) +// .setSuggestionMode(false) +// .build() +// ); +// +// // Set an option for showReloadButton +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NCRConfig.getClient().showReloadButton) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.showReloadButton.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().showReloadButton = newValue) +// .build()); +// +// // Set an option for verifiedIconEnabled +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.verifiedIconEnabled"), NCRConfig.getClient().verifiedIconEnabled) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconEnabled.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconEnabled = newValue) +// .build()); +// +// // Set an option for verifiedIconOffsetX +// client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetX"), NCRConfig.getClient().verifiedIconOffsetX) +// .setDefaultValue(0) +// .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetX.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetX = newValue) +// .build()); +// +// // Set an option for verifiedIconOffsetY +// client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetY"), NCRConfig.getClient().verifiedIconOffsetY) +// .setDefaultValue(0) +// .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetY.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetY = newValue) +// .build()); +// +// // Warning for showEncryptionButton +// client.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning")) +// .build()); +// +// // Set an option for showEncryptionButton +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionButton"), NCRConfig.getEncryption().showEncryptionButton) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionButton.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionButton = newValue) +// .build()); +// +// // Set an option for showEncryptionIndicators +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionIndicators"), NCRConfig.getEncryption().showEncryptionIndicators) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionIndicators.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionIndicators = newValue) +// .build()); +// +// // Set an option for showServerSafety +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NCRConfig.getClient().showServerSafety) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.showServerSafety.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().showServerSafety = newValue) +// .build()); +// +// // Add link for documentation for showServerSafety +// client.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.moreInfo") +// .withStyle(s -> s +// .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety")))) +// .build()); +// +// // Set an option for hideInsecureMessageIndicators +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideInsecureMessageIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.hideInsecureMessageIndicators.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().hideInsecureMessageIndicators = newValue) +// .build()); +// +// // Set an option for hideModifiedMessageIndicators +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideModifiedMessageIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.hideModifiedMessageIndicators.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().hideModifiedMessageIndicators = newValue) +// .build()); +// +// // Set an option for hideSystemMessageIndicators +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSystemMessageIndicators"), NCRConfig.getClient().hideSystemMessageIndicators) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.hideSystemMessageIndicators.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().hideSystemMessageIndicators = newValue) +// .build()); +// +// // Set an option for hideWarningToast +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NCRConfig.getClient().hideWarningToast) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.hideWarningToast.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().hideWarningToast = newValue) +// .build()); +// +// // Set an option for hideSigningRequestMessage +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSigningRequestMessage"), NCRConfig.getClient().hideSigningRequestMessage) +// .setDefaultValue(false) +// .setTooltip(this.makeTooltip("option.NoChatReports.hideSigningRequestMessage.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().hideSigningRequestMessage = newValue) +// .build()); +// +// // Set an option for alwaysHideReportButton +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NCRConfig.getClient().alwaysHideReportButton) +// .setDefaultValue(false) +// .setTooltip(this.makeTooltip("option.NoChatReports.alwaysHideReportButton.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().alwaysHideReportButton = newValue) +// .build()); +// +// // Set an option for demandOnServer +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NCRConfig.getClient().demandOnServer) +// .setDefaultValue(false) +// .setTooltip(this.makeTooltip("option.NoChatReports.demandOnServer.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().demandOnServer = newValue) +// .build()); +// +// // Set an option for enableDebugLog +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NCRConfig.getCommon().enableDebugLog) +// .setDefaultValue(false) +// .setTooltip(this.makeTooltip("option.NoChatReports.enableDebugLog.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getCommon().enableDebugLog = newValue) +// .build()); +// +// // Set an option for disableTelemetry +// client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NCRConfig.getClient().disableTelemetry) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.disableTelemetry.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getClient().disableTelemetry = newValue) +// .build()); +// +// // Set an option for demandOnClient +// lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient) +// .setDefaultValue(false) +// .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue) +// .build()); +// +// // Set an option for demandOnClientMessage +// lan.addEntry(entryBuilder.startStrField(Component.translatable("option.NoChatReports.demandOnClientMessage"), NCRConfig.getCommon().demandOnClientMessage) +// .setDefaultValue(NCRConfig.getCommon().demandOnClientMessage) +// .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClientMessage.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClientMessage = newValue) +// .build()); +// +// // Set an option for convertToGameMessage +// lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue) +// .build()); +// +// // Set an option for addQueryData +// lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.addQueryData"), NCRConfig.getCommon().addQueryData) +// .setDefaultValue(true) +// .setTooltip(this.makeTooltip("option.NoChatReports.addQueryData.tooltip")) +// .setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue) +// .build()); +// +// // Save config +// builder.setSavingRunnable(NCRConfig::save); +// return builder.build(); +// }; +// } +// +//}
\ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java index 5a1137f..01c33fa 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfig.java @@ -1,21 +1,15 @@ -package com.aizistral.nochatreports.config; - -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.config.JSONConfig; -import com.aizistral.nochatreports.config.NCRConfigClient; -import com.aizistral.nochatreports.config.NCRConfigCommon; -import com.aizistral.nochatreports.config.NCRConfigEncryption; -import com.aizistral.nochatreports.config.NCRServerPreferences; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.fabricmc.loader.api.FabricLoader; +package com.aizistral.nochatreports.common.config; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.util.function.Supplier; +import com.aizistral.nochatreports.common.NCRCore; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + public final class NCRConfig { private static NCRConfigCommon common = null; private static NCRConfigClient client = null; @@ -56,7 +50,7 @@ public final class NCRConfig { public static void load() { common = JSONConfig.loadConfig(NCRConfigCommon.class, NCRConfigCommon::new, NCRConfigCommon.FILE_NAME); - if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { + if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { client = JSONConfig.loadConfig(NCRConfigClient.class, NCRConfigClient::new, NCRConfigClient.FILE_NAME); serverPreferences = JSONConfig.loadConfig(NCRServerPreferences.class, NCRServerPreferences::new, NCRServerPreferences.FILE_NAME); encryption = JSONConfig.loadConfig(NCRConfigEncryption.class, NCRConfigEncryption::new, NCRConfigEncryption.FILE_NAME); @@ -68,7 +62,7 @@ public final class NCRConfig { public static void save() { checkLoaded(() -> common).saveFile(); - if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) { + if (NCRCore.getProvider().getEnvironment() == EnvType.CLIENT) { checkLoaded(() -> client).saveFile(); checkLoaded(() -> serverPreferences).saveFile(); checkLoaded(() -> encryption).saveFile(); @@ -82,7 +76,7 @@ public final class NCRConfig { https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files """, StandardCharsets.UTF_8); } catch (Exception ex) { - NoChatReports.LOGGER.fatal("Could not write README file: {}", readme); + NCRCore.LOGGER.fatal("Could not write README file: {}", readme); throw new RuntimeException(ex); } } diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java index 800deaf..30db481 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigClient.java @@ -1,11 +1,9 @@ -package com.aizistral.nochatreports.config; +package com.aizistral.nochatreports.common.config; -import com.aizistral.nochatreports.config.JSONConfig; -import com.aizistral.nochatreports.config.NCRConfigClient; -import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.core.SigningMode; -import com.aizistral.nochatreports.mixins.client.MixinChatListener; -import com.aizistral.nochatreports.mixins.client.MixinToastComponent; +import com.aizistral.nochatreports.common.core.ServerSafetyLevel; +import com.aizistral.nochatreports.common.core.SigningMode; +import com.aizistral.nochatreports.common.mixins.client.MixinChatListener; +import com.aizistral.nochatreports.common.mixins.client.MixinToastComponent; public final class NCRConfigClient extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Client.json"; @@ -86,7 +84,7 @@ public final class NCRConfigClient extends JSONConfig { * * This is true by default. * - * @see com.aizistral.nochatreports.mixins.client.MixinGuiMessageTag#onSystem + * @see com.aizistral.nochatreports.common.mixins.client.MixinGuiMessageTag#onSystem */ public boolean hideSystemMessageIndicators() { diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java index 861f57d..9242d90 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigCommon.java @@ -1,7 +1,4 @@ -package com.aizistral.nochatreports.config; - -import com.aizistral.nochatreports.config.JSONConfig; -import com.aizistral.nochatreports.config.NCRConfigCommon; +package com.aizistral.nochatreports.common.config; public final class NCRConfigCommon extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Common.json"; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigEncryption.java index 6cd4f0a..a876c91 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRConfigEncryption.java @@ -1,14 +1,12 @@ -package com.aizistral.nochatreports.config; - -import com.aizistral.nochatreports.config.JSONConfig; -import com.aizistral.nochatreports.config.NCRConfigEncryption; -import com.aizistral.nochatreports.encryption.Encryption; -import com.aizistral.nochatreports.encryption.Encryptor; +package com.aizistral.nochatreports.common.config; import java.security.InvalidKeyException; import java.util.List; import java.util.Optional; +import com.aizistral.nochatreports.common.encryption.Encryption; +import com.aizistral.nochatreports.common.encryption.Encryptor; + public class NCRConfigEncryption extends JSONConfig { protected static final String FILE_NAME = "NoChatReports/NCR-Encryption.json"; protected boolean skipWarning = false, enableEncryption = false, encryptPublic = true, diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java b/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java index 81ad97f..77b12c1 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/NCRServerPreferences.java @@ -1,19 +1,12 @@ -package com.aizistral.nochatreports.config; +package com.aizistral.nochatreports.common.config; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; -import java.util.Optional; import org.jetbrains.annotations.Nullable; -import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.config.JSONConfig; -import com.aizistral.nochatreports.config.NCRServerPreferences; -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.aizistral.nochatreports.common.NCRClient; +import com.aizistral.nochatreports.common.core.ServerSafetyState; +import com.aizistral.nochatreports.common.core.SigningMode; import net.minecraft.client.multiplayer.resolver.ServerAddress; @@ -35,7 +28,7 @@ public class NCRServerPreferences extends JSONConfig { } public SigningMode getModeUnresolved(@Nullable ServerAddress address) { - if (!NoChatReportsClient.areSigningKeysPresent()) + if (!NCRClient.areSigningKeysPresent()) return SigningMode.NEVER_FORCED; else if (ServerSafetyState.isInSingleplayer()) return SigningMode.NEVER; diff --git a/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java b/src/main/java/com/aizistral/nochatreports/common/config/ServerAddressAdapter.java index 8d63bd1..21a2d9a 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java +++ b/src/main/java/com/aizistral/nochatreports/common/config/ServerAddressAdapter.java @@ -1,15 +1,15 @@ -package com.aizistral.nochatreports.config; +package com.aizistral.nochatreports.common.config; + +import java.io.IOException; -import com.aizistral.nochatreports.config.ServerAddressAdapter; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.multiplayer.resolver.ServerAddress; -import java.io.IOException; - @Environment(EnvType.CLIENT) public class ServerAddressAdapter extends TypeAdapter<ServerAddress> { public static final ServerAddressAdapter INSTANCE = new ServerAddressAdapter(); diff --git a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java index a614bba..842dc86 100644 --- a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/EncryptionUtil.java @@ -1,7 +1,9 @@ -package com.aizistral.nochatreports.core; +package com.aizistral.nochatreports.common.core; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.encryption.Encryptor; +import java.util.Optional; + +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.encryption.Encryptor; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentContents; @@ -9,8 +11,6 @@ import net.minecraft.network.chat.MutableComponent; import net.minecraft.network.chat.contents.LiteralContents; import net.minecraft.network.chat.contents.TranslatableContents; -import java.util.Optional; - public class EncryptionUtil { public static Optional<Component> tryDecrypt(Component component) { diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerDataExtension.java index a92ea52..6b6e26f 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerDataExtension.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerDataExtension.java @@ -1,7 +1,7 @@ -package com.aizistral.nochatreports.core; +package com.aizistral.nochatreports.common.core; -import com.aizistral.nochatreports.mixins.client.MixinServerData; -import com.aizistral.nochatreports.mixins.common.MixinServerStatus; +import com.aizistral.nochatreports.common.mixins.client.MixinServerData; +import com.aizistral.nochatreports.common.mixins.common.MixinServerStatus; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.protocol.status.ServerStatus; diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyLevel.java index 817f192..81e3517 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyLevel.java @@ -1,9 +1,5 @@ -package com.aizistral.nochatreports.core; +package com.aizistral.nochatreports.common.core; -import com.aizistral.nochatreports.core.ServerSafetyState; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java index 73b08ad..366811f 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/ServerSafetyState.java @@ -1,13 +1,4 @@ -package com.aizistral.nochatreports.core; - -import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.gui.UnsafeServerScreen; - -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.client.Minecraft; -import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.network.chat.LocalChatSession; +package com.aizistral.nochatreports.common.core; import java.util.ArrayList; import java.util.List; @@ -16,6 +7,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.jetbrains.annotations.Nullable; +import com.aizistral.nochatreports.common.gui.UnsafeServerScreen; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.resolver.ServerAddress; + /** * All this global state is questionable, but we have to... * @author Aizistral diff --git a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java b/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java index 32b6dba..51e3d91 100644 --- a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java +++ b/src/main/java/com/aizistral/nochatreports/common/core/SigningMode.java @@ -1,12 +1,9 @@ -package com.aizistral.nochatreports.core; +package com.aizistral.nochatreports.common.core; import org.jetbrains.annotations.Nullable; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.SigningMode; +import com.aizistral.nochatreports.common.config.NCRConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryption.java index 197f753..9908ec8 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryption.java @@ -1,10 +1,7 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; import java.security.InvalidKeyException; -import com.aizistral.nochatreports.encryption.AESCFB8Encryptor; -import com.aizistral.nochatreports.encryption.AESEncryption; - public class AESCFB8Encryption extends AESEncryption { protected AESCFB8Encryption() { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryptor.java index c4f045d..682cb91 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESCFB8Encryptor.java @@ -1,19 +1,15 @@ -package com.aizistral.nochatreports.encryption; - -import net.minecraft.util.Tuple; - -import javax.crypto.SecretKey; -import javax.crypto.spec.IvParameterSpec; - -import com.aizistral.nochatreports.encryption.AESCFB8Encryption; -import com.aizistral.nochatreports.encryption.AESEncryptor; -import com.aizistral.nochatreports.encryption.Encryption; +package com.aizistral.nochatreports.common.encryption; import java.nio.ByteBuffer; import java.security.InvalidKeyException; import java.security.spec.AlgorithmParameterSpec; import java.util.Random; +import javax.crypto.SecretKey; +import javax.crypto.spec.IvParameterSpec; + +import net.minecraft.util.Tuple; + public class AESCFB8Encryptor extends AESEncryptor<AESCFB8Encryption> { protected AESCFB8Encryptor(String key) throws InvalidKeyException { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryption.java index 5c4216a..1c12c51 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryption.java @@ -1,10 +1,7 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; import java.security.InvalidKeyException; -import com.aizistral.nochatreports.encryption.AESECBEncryptor; -import com.aizistral.nochatreports.encryption.AESEncryption; - public class AESECBEncryption extends AESEncryption { protected AESECBEncryption() { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryptor.java index d12051a..aa1f864 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESECBEncryptor.java @@ -1,15 +1,11 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; -import net.minecraft.util.Tuple; +import java.security.InvalidKeyException; +import java.security.spec.AlgorithmParameterSpec; import javax.crypto.SecretKey; -import com.aizistral.nochatreports.encryption.AESECBEncryption; -import com.aizistral.nochatreports.encryption.AESEncryptor; -import com.aizistral.nochatreports.encryption.Encryption; - -import java.security.InvalidKeyException; -import java.security.spec.AlgorithmParameterSpec; +import net.minecraft.util.Tuple; public class AESECBEncryptor extends AESEncryptor<AESECBEncryption> { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryption.java index 84145d2..91cd92a 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryption.java @@ -1,6 +1,10 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; -import net.minecraft.util.StringUtil; +import java.security.InvalidKeyException; +import java.security.NoSuchAlgorithmException; +import java.security.spec.InvalidKeySpecException; +import java.security.spec.KeySpec; +import java.util.Random; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; @@ -8,13 +12,7 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.SecretKeySpec; -import com.aizistral.nochatreports.encryption.Encryption; - -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.security.spec.InvalidKeySpecException; -import java.security.spec.KeySpec; -import java.util.Random; +import net.minecraft.util.StringUtil; public abstract class AESEncryption extends Encryption { private final String mode, padding; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryptor.java index cfde341..7e71d91 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESEncryptor.java @@ -1,12 +1,7 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; -import net.minecraft.util.Tuple; - -import javax.crypto.*; -import javax.crypto.spec.SecretKeySpec; - -import com.aizistral.nochatreports.encryption.AESEncryption; -import com.aizistral.nochatreports.encryption.Encryptor; +import static javax.crypto.Cipher.DECRYPT_MODE; +import static javax.crypto.Cipher.ENCRYPT_MODE; import java.nio.ByteBuffer; import java.security.InvalidAlgorithmParameterException; @@ -14,8 +9,15 @@ import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; import java.security.spec.AlgorithmParameterSpec; -import static javax.crypto.Cipher.DECRYPT_MODE; -import static javax.crypto.Cipher.ENCRYPT_MODE; +import javax.crypto.AEADBadTagException; +import javax.crypto.BadPaddingException; +import javax.crypto.Cipher; +import javax.crypto.IllegalBlockSizeException; +import javax.crypto.NoSuchPaddingException; +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + +import net.minecraft.util.Tuple; public abstract class AESEncryptor<T extends AESEncryption> extends Encryptor<T> { private final T encryption; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryption.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryption.java index edb5eb4..d94b6fc 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryption.java @@ -1,10 +1,7 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; import java.security.InvalidKeyException; -import com.aizistral.nochatreports.encryption.AESEncryption; -import com.aizistral.nochatreports.encryption.AESGCMEncryptor; - public class AESGCMEncryption extends AESEncryption { protected AESGCMEncryption() { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryptor.java index c2f5450..f91a0ab 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/AESGCMEncryptor.java @@ -1,17 +1,13 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; -import net.minecraft.util.Tuple; +import java.nio.ByteBuffer; +import java.security.InvalidKeyException; +import java.security.spec.AlgorithmParameterSpec; import javax.crypto.SecretKey; import javax.crypto.spec.GCMParameterSpec; -import com.aizistral.nochatreports.encryption.AESEncryptor; -import com.aizistral.nochatreports.encryption.AESGCMEncryption; -import com.aizistral.nochatreports.encryption.Encryption; - -import java.nio.ByteBuffer; -import java.security.InvalidKeyException; -import java.security.spec.AlgorithmParameterSpec; +import net.minecraft.util.Tuple; public class AESGCMEncryptor extends AESEncryptor<AESGCMEncryption> { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java b/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryption.java index 5ea07d7..27a1261 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryption.java @@ -1,11 +1,8 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; import java.security.InvalidKeyException; import java.security.SecureRandom; -import com.aizistral.nochatreports.encryption.CaesarEncryptor; -import com.aizistral.nochatreports.encryption.Encryption; - public class CaesarEncryption extends Encryption { protected CaesarEncryption() { diff --git a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java b/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryptor.java index ada6a66..7eb8010 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/CaesarEncryptor.java @@ -1,11 +1,7 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; import java.security.InvalidKeyException; -import com.aizistral.nochatreports.encryption.CaesarEncryption; -import com.aizistral.nochatreports.encryption.Encryption; -import com.aizistral.nochatreports.encryption.Encryptor; - public class CaesarEncryptor extends Encryptor<CaesarEncryption> { private static final char PARAGRAPH = '\u00a7', PARAGRAPH_PLACEHOLDER = '\uffef', DELETE = '\u007f', DELETE_PLACEHOLDER = '\ufff0'; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java b/src/main/java/com/aizistral/nochatreports/common/encryption/Encryption.java index e9e2248..259d89d 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/Encryption.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.encryption; +package com.aizistral.nochatreports.common.encryption; import java.security.InvalidKeyException; import java.util.ArrayList; @@ -6,13 +6,6 @@ import java.util.Base64; import java.util.Collections; import java.util.List; -import com.aizistral.nochatreports.encryption.AESCFB8Encryption; -import com.aizistral.nochatreports.encryption.AESECBEncryption; -import com.aizistral.nochatreports.encryption.AESGCMEncryption; -import com.aizistral.nochatreports.encryption.CaesarEncryption; -import com.aizistral.nochatreports.encryption.Encryption; -import com.aizistral.nochatreports.encryption.Encryptor; - public abstract class Encryption { private static final List<Encryption> REGISTERED = new ArrayList<>(); protected static final Base64.Encoder BASE64_ENCODER = Base64.getEncoder(); diff --git a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java b/src/main/java/com/aizistral/nochatreports/common/encryption/Encryptor.java index 346db89..61718a4 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/common/encryption/Encryptor.java @@ -1,15 +1,13 @@ -package com.aizistral.nochatreports.encryption; - -import it.unimi.dsi.fastutil.chars.Char2CharArrayMap; -import it.unimi.dsi.fastutil.chars.Char2CharMap; -import it.unimi.dsi.fastutil.chars.Char2CharMaps; +package com.aizistral.nochatreports.common.encryption; import java.nio.charset.StandardCharsets; import java.security.InvalidKeyException; import java.security.SecureRandom; import java.util.Arrays; -import com.aizistral.nochatreports.encryption.Encryption; +import it.unimi.dsi.fastutil.chars.Char2CharArrayMap; +import it.unimi.dsi.fastutil.chars.Char2CharMap; +import it.unimi.dsi.fastutil.chars.Char2CharMaps; public abstract class Encryptor<T extends Encryption> { protected static final SecureRandom RANDOM = new SecureRandom(); diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java index 898b1f5..931645c 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/AdaptiveWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdaptiveWarningScreen.java @@ -1,17 +1,12 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; import org.jetbrains.annotations.Nullable; import com.mojang.blaze3d.vertex.PoseStack; -import net.minecraft.Util; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.Checkbox; import net.minecraft.client.gui.components.MultiLineLabel; -import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; public abstract class AdaptiveWarningScreen extends Screen { diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java index 25f6d54..6d4cd1a 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedImageButton.java @@ -1,7 +1,7 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; -import com.aizistral.nochatreports.gui.AdvancedTooltip; import com.mojang.blaze3d.vertex.PoseStack; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.ImageButton; diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java index 0dddb9c..e3de67f 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/AdvancedTooltip.java @@ -1,8 +1,20 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; + +import java.util.List; +import java.util.function.Supplier; +import java.util.stream.Collectors; + +import org.jetbrains.annotations.Nullable; +import org.joml.Matrix4f; -import com.aizistral.nochatreports.gui.AdvancedTooltip; import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.BufferUploader; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.VertexFormat; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.Minecraft; @@ -14,13 +26,6 @@ import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.network.chat.Component; import net.minecraft.util.FormattedCharSequence; -import org.jetbrains.annotations.Nullable; -import org.joml.Matrix4f; - -import java.util.List; -import java.util.function.Supplier; -import java.util.stream.Collectors; - @Environment(EnvType.CLIENT) public class AdvancedTooltip extends Tooltip { @Nullable diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java index 9303c18..44d286f 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionButton.java @@ -1,12 +1,8 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.gui.AdvancedImageButton; -import com.aizistral.nochatreports.gui.EncryptionConfigScreen; -import com.aizistral.nochatreports.gui.EncryptionWarningScreen; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java index 89fa174..c0cdb47 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionConfigScreen.java @@ -1,24 +1,27 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.config.NCRConfigEncryption; -import com.aizistral.nochatreports.encryption.Encryption; -import com.aizistral.nochatreports.gui.AdvancedImageButton; -import com.aizistral.nochatreports.gui.AdvancedTooltip; +import java.util.Objects; + +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.config.NCRConfigEncryption; +import com.aizistral.nochatreports.common.encryption.Encryption; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.Font; -import net.minecraft.client.gui.components.*; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.Checkbox; +import net.minecraft.client.gui.components.CycleButton; +import net.minecraft.client.gui.components.EditBox; +import net.minecraft.client.gui.components.ImageButton; +import net.minecraft.client.gui.components.MultiLineLabel; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.AnvilScreen; -import net.minecraft.client.gui.screens.inventory.CommandBlockEditScreen; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.StringUtil; -import org.spongepowered.include.com.google.common.base.Objects; @Environment(EnvType.CLIENT) public class EncryptionConfigScreen extends Screen { @@ -142,7 +145,7 @@ public class EncryptionConfigScreen extends Screen { if (!StringUtil.isNullOrEmpty(this.getConfig().getEncryptionPassphrase())) { this.passField.setValue(this.getConfig().getEncryptionPassphrase()); } else if (!StringUtil.isNullOrEmpty(this.getConfig().getEncryptionKey())) { - if (!Objects.equal(this.getConfig().getEncryptionKey(), this.algorithmButton.getValue() + if (!Objects.equals(this.getConfig().getEncryptionKey(), this.algorithmButton.getValue() .getDefaultKey())) { this.keyField.setValue(this.getConfig().getEncryptionKey()); } else { diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionWarningScreen.java index 0c1b9f3..954c6f3 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/EncryptionWarningScreen.java @@ -1,8 +1,6 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.gui.EncryptionConfigScreen; -import com.aizistral.nochatreports.gui.TriageWarningScreen; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java b/src/main/java/com/aizistral/nochatreports/common/gui/FontHelper.java index a0a1638..044dcc8 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/FontHelper.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/FontHelper.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java index 1ec6af2..78cba5a 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/InvisibleButton.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/InvisibleButton.java @@ -1,13 +1,14 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; + +import java.util.function.Supplier; import com.mojang.blaze3d.vertex.PoseStack; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.client.gui.components.Button; import net.minecraft.network.chat.Component; -import java.util.function.Supplier; - @Environment(EnvType.CLIENT) public class InvisibleButton extends Button { diff --git a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java index 86120a4..74dee15 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/RealmsWarningScreen.java @@ -1,7 +1,6 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.gui.TriageWarningScreen; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.Button; diff --git a/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/TriageWarningScreen.java index 03e31f9..c47b14a 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/TriageWarningScreen.java @@ -1,12 +1,8 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; -import com.aizistral.nochatreports.gui.AdaptiveWarningScreen; -import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.Util; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.Checkbox; -import net.minecraft.client.gui.components.MultiLineLabel; import net.minecraft.client.gui.screens.ConfirmLinkScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.network.chat.CommonComponents; diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java index 20c5604..239b23b 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/gui/UnsafeServerScreen.java @@ -1,27 +1,14 @@ -package com.aizistral.nochatreports.gui; +package com.aizistral.nochatreports.common.gui; -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.aizistral.nochatreports.gui.AdaptiveWarningScreen; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerSafetyState; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; -import net.minecraft.Util; -import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.ChatScreen; -import net.minecraft.client.gui.screens.ConfirmLinkScreen; 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.gui.screens.multiplayer.SafetyScreen; -import net.minecraft.client.gui.screens.multiplayer.WarningScreen; -import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; @Environment(EnvType.CLIENT) diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java index 0238320..273ea57 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatComponent.java @@ -1,8 +1,15 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.EncryptionUtil; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.At.Shift; + +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.EncryptionUtil; + +import org.spongepowered.asm.mixin.injection.ModifyArg; +import org.spongepowered.asm.mixin.injection.ModifyVariable; import net.minecraft.ChatFormatting; import net.minecraft.client.GuiMessageTag; @@ -10,11 +17,6 @@ import net.minecraft.client.gui.components.ChatComponent; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.FormattedText; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.At.Shift; -import org.spongepowered.asm.mixin.injection.ModifyArg; -import org.spongepowered.asm.mixin.injection.ModifyVariable; @Mixin(ChatComponent.class) public class MixinChatComponent { @@ -56,7 +58,7 @@ public class MixinChatComponent { + "Lnet/minecraft/client/gui/Font;)Ljava/util/List;", ordinal = 0)) private FormattedText modifyGUIMessage(FormattedText msg) { if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Adding chat message, structure: " + + NCRCore.LOGGER.info("Adding chat message, structure: " + Component.Serializer.toStableJson((Component) msg)); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java index 675e642..f0a6d8c 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatListener.java @@ -1,22 +1,9 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.EncryptionUtil; -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 java.time.Instant; +import java.util.Base64; +import java.util.UUID; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.ChatScreen; -import net.minecraft.client.multiplayer.chat.ChatListener; -import net.minecraft.client.multiplayer.chat.ChatTrustLevel; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.MutableComponent; -import net.minecraft.network.chat.PlayerChatMessage; -import net.minecraft.network.chat.contents.TranslatableContents; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; @@ -25,9 +12,23 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import java.time.Instant; -import java.util.Base64; -import java.util.UUID; +import com.aizistral.nochatreports.common.NCRClient; +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.EncryptionUtil; +import com.aizistral.nochatreports.common.core.ServerSafetyLevel; +import com.aizistral.nochatreports.common.core.ServerSafetyState; +import com.aizistral.nochatreports.common.core.SigningMode; +import com.aizistral.nochatreports.common.gui.UnsafeServerScreen; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.multiplayer.chat.ChatListener; +import net.minecraft.client.multiplayer.chat.ChatTrustLevel; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; +import net.minecraft.network.chat.PlayerChatMessage; +import net.minecraft.network.chat.contents.TranslatableContents; @Mixin(ChatListener.class) public class MixinChatListener { @@ -51,7 +52,7 @@ public class MixinChatListener { return; if (NCRConfig.getServerPreferences().hasModeCurrent(SigningMode.ON_DEMAND)) { - ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage); + ServerSafetyState.scheduleSigningAction(NCRClient::resendLastChatMessage); ServerSafetyState.setAllowChatSigning(true); if (NCRConfig.getClient().hideSigningRequestMessage()) { @@ -100,7 +101,7 @@ public class MixinChatListener { // Debug never dies if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Received message: {}, from: {}, signature: {}", + NCRCore.LOGGER.info("Received message: {}, from: {}, signature: {}", Component.Serializer.toStableJson(playerChatMessage.unsignedContent()), playerChatMessage.link().sender(), Base64.getEncoder().encodeToString(playerChatMessage.signature() != null ? playerChatMessage.signature().bytes() : new byte[0])); diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java index 9fff6d9..24e5fad 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatOptionsScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatOptionsScreen.java @@ -1,23 +1,18 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import java.util.List; import java.util.Optional; -import org.jetbrains.annotations.NotNull; import org.spongepowered.asm.mixin.Mixin; -import com.aizistral.nochatreports.config.NCRConfig; -import com.mojang.blaze3d.vertex.PoseStack; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.client.Minecraft; import net.minecraft.client.OptionInstance; import net.minecraft.client.Options; -import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.screens.ChatOptionsScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.gui.screens.SimpleOptionsSubScreen; import net.minecraft.network.chat.Component; -import net.minecraft.util.FormattedCharSequence; /** * Mixin responsible for graying out "Only Show Secure Chat" option. diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java index 18b673e..46e9ebd 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinChatScreen.java @@ -1,42 +1,32 @@ -package com.aizistral.nochatreports.mixins.client; - -import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.aizistral.nochatreports.core.SigningMode; -import com.aizistral.nochatreports.gui.AdvancedImageButton; -import com.aizistral.nochatreports.gui.AdvancedTooltip; -import com.aizistral.nochatreports.gui.EncryptionButton; -import com.aizistral.nochatreports.gui.EncryptionWarningScreen; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.*; +package com.aizistral.nochatreports.common.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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatreports.common.NCRClient; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerSafetyLevel; +import com.aizistral.nochatreports.common.core.ServerSafetyState; +import com.aizistral.nochatreports.common.core.SigningMode; +import com.aizistral.nochatreports.common.gui.AdvancedImageButton; +import com.aizistral.nochatreports.common.gui.AdvancedTooltip; +import com.aizistral.nochatreports.common.gui.EncryptionButton; +import com.aizistral.nochatreports.common.gui.EncryptionWarningScreen; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.multiplayer.resolver.ServerAddress; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.FormattedCharSequence; -import org.joml.Matrix4f; -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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; /** * This is responsible for adding safety status indicator to the bottom-right corner of chat screen. @@ -60,7 +50,7 @@ public abstract class MixinChatScreen extends Screen { if (this.minecraft.getConnection().getConnection().isEncrypted()) { if (!this.normalizeChatMessage(string).isEmpty()) { ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); - ServerSafetyState.scheduleSigningAction(NoChatReportsClient::resendLastChatMessage); + ServerSafetyState.scheduleSigningAction(NCRClient::resendLastChatMessage); ServerSafetyState.setAllowChatSigning(true); info.setReturnValue(true); } @@ -93,7 +83,7 @@ public abstract class MixinChatScreen extends Screen { if (NCRConfig.getClient().showServerSafety() && NCRConfig.getClient().enableMod()) { this.safetyStatusButton = new AdvancedImageButton(buttonX, this.height - 37, 20, 20, this.getXOffset(), 0, 20, CHAT_STATUS_ICONS, 128, 128, btn -> { - if (!NoChatReportsClient.areSigningKeysPresent()) + if (!NCRClient.areSigningKeysPresent()) return; var address = ServerSafetyState.getLastServer(); diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java index 2d3e697..1074931 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinClientPacketListener.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinClientPacketListener.java @@ -1,19 +1,21 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.core.ServerSafetyState; +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.common.core.ServerSafetyLevel; +import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.mojang.brigadier.ParseResults; + import net.minecraft.client.multiplayer.ClientPacketListener; import net.minecraft.commands.SharedSuggestionProvider; import net.minecraft.network.chat.SignableCommand; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ServerboundChatCommandPacket; import net.minecraft.network.protocol.game.ServerboundChatPacket; -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(ClientPacketListener.class) public abstract class MixinClientPacketListener { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java index 73ec799..8f94138 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinConnectScreen.java @@ -1,19 +1,20 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import com.aizistral.nochatreports.NoChatReports; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; +import org.jetbrains.annotations.Nullable; +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.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerSafetyState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.Screen; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.client.multiplayer.resolver.ServerAddress; -import org.jetbrains.annotations.Nullable; -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(ConnectScreen.class) public class MixinConnectScreen { @@ -34,9 +35,9 @@ public class MixinConnectScreen { ServerSafetyState.setLastServer(serverAddress); if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Connecting to: {}", + NCRCore.LOGGER.info("Connecting to: {}", serverAddress.getHost() + ":" + serverAddress.getPort()); - NoChatReports.LOGGER.info("Server Data IP: {}", serverData != null ? serverData.ip : "null"); + NCRCore.LOGGER.info("Server Data IP: {}", serverData != null ? serverData.ip : "null"); } } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java index 969afd0..9b7fac5 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTag.java @@ -1,12 +1,13 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import net.minecraft.client.GuiMessageTag; 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.CallbackInfoReturnable; -import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.common.config.NCRConfig; + +import net.minecraft.client.GuiMessageTag; @Mixin(GuiMessageTag.class) public class MixinGuiMessageTag { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java index 6ef1488..2f6e656 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTagIcon.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinGuiMessageTagIcon.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; import java.util.Arrays; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java index cf5f6be..4f99934 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinJoinMultiplayerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinJoinMultiplayerScreen.java @@ -1,37 +1,22 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import java.util.List; -import java.util.stream.Collectors; - -import org.joml.Matrix4f; 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.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.aizistral.nochatreports.gui.AdvancedImageButton; -import com.aizistral.nochatreports.gui.AdvancedTooltip; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.blaze3d.vertex.BufferBuilder; -import com.mojang.blaze3d.vertex.BufferUploader; -import com.mojang.blaze3d.vertex.DefaultVertexFormat; -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.Tesselator; -import com.mojang.blaze3d.vertex.VertexFormat; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerSafetyState; +import com.aizistral.nochatreports.common.gui.AdvancedImageButton; +import com.aizistral.nochatreports.common.gui.AdvancedTooltip; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; -import net.minecraft.client.renderer.GameRenderer; -import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.locale.Language; import net.minecraft.network.chat.CommonComponents; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.FormattedCharSequence; /** * This is responsible for adding config reload button to server selection menu. diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java index c6dc485..ca36de9 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinMinecraft.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinMinecraft.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -8,10 +8,9 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.NoChatReportsClient; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.mojang.authlib.minecraft.TelemetrySession; +import com.aizistral.nochatreports.common.NCRClient; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerSafetyState; import net.minecraft.client.Minecraft; import net.minecraft.client.main.GameConfig; @@ -24,7 +23,7 @@ public class MixinMinecraft { @Inject(method = "<init>(Lnet/minecraft/client/main/GameConfig;)V", at = @At("RETURN")) private void onConstructed(GameConfig config, CallbackInfo info) { - NoChatReportsClient.setSigningKeysPresent(this.profileKeyPairManager.prepareKeyPair() + NCRClient.setSigningKeysPresent(this.profileKeyPairManager.prepareKeyPair() .join().isPresent()); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java index 0798ba1..b90e9b1 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOnlineServerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOnlineServerEntry.java @@ -1,10 +1,21 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerDataExtension; -import com.aizistral.nochatreports.gui.FontHelper; +import java.util.ArrayList; +import java.util.stream.Collectors; + +import org.spongepowered.asm.mixin.Final; +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.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerDataExtension; +import com.aizistral.nochatreports.common.gui.FontHelper; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiComponent; import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; @@ -13,15 +24,6 @@ import net.minecraft.client.multiplayer.ServerData; import net.minecraft.locale.Language; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import org.spongepowered.asm.mixin.Final; -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 java.util.ArrayList; -import java.util.stream.Collectors; @Mixin(ServerSelectionList.OnlineServerEntry.class) public abstract class MixinOnlineServerEntry extends ServerSelectionList.Entry { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java index 7064ed6..e2ffe8c 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinOptions.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinOptions.java @@ -1,18 +1,17 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.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.CallbackInfoReturnable; -import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.common.config.NCRConfig; 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) diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java index 59348f1..6f4b091 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinPlayerEntry.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinPlayerEntry.java @@ -1,8 +1,6 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import java.util.List; import java.util.UUID; -import java.util.function.Consumer; import java.util.function.Supplier; import org.spongepowered.asm.mixin.Final; @@ -12,22 +10,18 @@ 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 com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.aizistral.nochatreports.gui.AdvancedImageButton; -import com.aizistral.nochatreports.gui.InvisibleButton; -import com.mojang.blaze3d.vertex.PoseStack; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerSafetyState; +import com.aizistral.nochatreports.common.gui.AdvancedImageButton; +import com.aizistral.nochatreports.common.gui.InvisibleButton; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; -import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.components.Tooltip; import net.minecraft.client.gui.screens.social.PlayerEntry; import net.minecraft.client.gui.screens.social.SocialInteractionsScreen; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.FormattedCharSequence; @Mixin(PlayerEntry.class) public class MixinPlayerEntry { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java index 7bcb9a8..a6f16ef 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRealmsConnect.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRealmsConnect.java @@ -1,13 +1,13 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.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.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyLevel; -import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerSafetyLevel; +import com.aizistral.nochatreports.common.core.ServerSafetyState; import com.mojang.realmsclient.dto.RealmsServer; import net.minecraft.client.multiplayer.resolver.ServerAddress; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRowHelper.java index 1c1958b..2efd6c2 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinRowHelper.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinRowHelper.java @@ -1,19 +1,15 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import org.spongepowered.asm.mixin.Final; 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.CallbackInfoReturnable; -import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.client.gui.components.AbstractWidget; import net.minecraft.client.gui.components.GridWidget; import net.minecraft.client.gui.screens.OptionsScreen; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.network.chat.Component; @Mixin(GridWidget.RowHelper.class) public abstract class MixinRowHelper { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java index b311e43..095cf7f 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerData.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerData.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; @@ -6,7 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import com.aizistral.nochatreports.core.ServerDataExtension; +import com.aizistral.nochatreports.common.core.ServerDataExtension; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java index fb0d66b..a6cfaa2 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinServerStatusPinger$1.java @@ -1,17 +1,15 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; import java.lang.reflect.Field; -import org.spongepowered.asm.mixin.Final; 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.NoChatReports; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerDataExtension; +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerDataExtension; import net.minecraft.client.multiplayer.ServerData; import net.minecraft.network.protocol.status.ClientboundStatusResponsePacket; @@ -46,7 +44,7 @@ public class MixinServerStatusPinger$1 { ((ServerDataExtension) SERVER_DATA_FIELD.get(this)).setPreventsChatReports(preventsReports); if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Received status response packet from server, preventsChatReports: {}", + NCRCore.LOGGER.info("Received status response packet from server, preventsChatReports: {}", preventsReports); } } catch (IllegalArgumentException | IllegalAccessException ex) { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java index 859743d..240620d 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinTitleScreen.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinTitleScreen.java @@ -1,15 +1,17 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; -import com.aizistral.nochatreports.gui.RealmsWarningScreen; -import com.mojang.realmsclient.RealmsMainScreen; -import net.minecraft.client.gui.screens.Screen; -import net.minecraft.client.gui.screens.TitleScreen; -import net.minecraft.network.chat.CommonComponents; 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.common.gui.RealmsWarningScreen; +import com.mojang.realmsclient.RealmsMainScreen; + +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.network.chat.CommonComponents; + @Mixin(TitleScreen.class) public class MixinTitleScreen extends Screen { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinToastComponent.java index 601ccef..1d098e0 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinToastComponent.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinToastComponent.java @@ -1,11 +1,11 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.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.config.NCRConfig; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.client.gui.components.toasts.SystemToast; import net.minecraft.client.gui.components.toasts.SystemToast.SystemToastIds; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java index 2bd51c6..1c9ffd8 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinYggdrasilUserApiService.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/client/MixinYggdrasilUserApiService.java @@ -1,20 +1,16 @@ -package com.aizistral.nochatreports.mixins.client; +package com.aizistral.nochatreports.common.mixins.client; import java.util.concurrent.Executor; 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.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.common.config.NCRConfig; import com.mojang.authlib.minecraft.TelemetrySession; -import com.mojang.authlib.minecraft.UserApiService; import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; -import net.minecraft.client.telemetry.ClientTelemetryManager; - @Mixin(value = YggdrasilUserApiService.class, remap = false) public class MixinYggdrasilUserApiService { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java index ebe1fbb..41563a5 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatus.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatus.java @@ -1,12 +1,12 @@ -package com.aizistral.nochatreports.mixins.common; +package com.aizistral.nochatreports.common.mixins.common; 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.CallbackInfoReturnable; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerDataExtension; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerDataExtension; import net.minecraft.network.protocol.status.ServerStatus; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatusSerializer.java index f8a9009..300c047 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/common/MixinServerStatusSerializer.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/common/MixinServerStatusSerializer.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.common; +package com.aizistral.nochatreports.common.mixins.common; import java.lang.reflect.Type; @@ -8,8 +8,8 @@ import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.LocalCapture; -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerDataExtension; +import com.aizistral.nochatreports.common.config.NCRConfig; +import com.aizistral.nochatreports.common.core.ServerDataExtension; import com.google.gson.JsonDeserializationContext; import com.google.gson.JsonElement; import com.google.gson.JsonObject; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinDedicatedServer.java index 75a1b7b..7ece057 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinDedicatedServer.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinDedicatedServer.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.server; +package com.aizistral.nochatreports.common.mixins.server; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinPlayerList.java index 6cbafe2..9de6d81 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinPlayerList.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinPlayerList.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.server; +package com.aizistral.nochatreports.common.mixins.server; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java index 395f317..01232e7 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerGamePacketListenerImpl.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerGamePacketListenerImpl.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.server; +package com.aizistral.nochatreports.common.mixins.server; import org.jetbrains.annotations.Nullable; import org.spongepowered.asm.mixin.Mixin; @@ -7,8 +7,8 @@ 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.NoChatReports; -import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.network.PacketSendListener; import net.minecraft.network.chat.Component; @@ -34,7 +34,7 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC @Inject(method = "send(Lnet/minecraft/network/protocol/Packet;)V", at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() : chat.body().content()); } @@ -59,7 +59,7 @@ public abstract class MixinServerGamePacketListenerImpl implements ServerPlayerC at = @At("HEAD"), cancellable = true) private void onSend(Packet<?> packet, @Nullable PacketSendListener packetSendListener, CallbackInfo info) { if (NCRConfig.getCommon().enableDebugLog() && packet instanceof ClientboundPlayerChatPacket chat) { - NoChatReports.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() + NCRCore.LOGGER.info("Sending message: {}", chat.unsignedContent() != null ? chat.unsignedContent() : chat.body().content()); } diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java index 44b3284..bf25d92 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatPacket.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatPacket.java @@ -1,4 +1,4 @@ -package com.aizistral.nochatreports.mixins.server; +package com.aizistral.nochatreports.common.mixins.server; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java index d88a2eb..d69e495 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/server/MixinServerboundChatSessionUpdatePacket.java +++ b/src/main/java/com/aizistral/nochatreports/common/mixins/server/MixinServerboundChatSessionUpdatePacket.java @@ -1,11 +1,11 @@ -package com.aizistral.nochatreports.mixins.server; +package com.aizistral.nochatreports.common.mixins.server; 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.config.NCRConfig; +import com.aizistral.nochatreports.common.config.NCRConfig; import net.minecraft.network.chat.Component; import net.minecraft.network.protocol.game.ServerGamePacketListener; diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java new file mode 100644 index 0000000..5dc064e --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/platform/PlatformProvider.java @@ -0,0 +1,16 @@ +package com.aizistral.nochatreports.common.platform; + +import java.io.File; +import java.nio.file.Path; + +import net.fabricmc.api.EnvType; + +public interface PlatformProvider { + + public EnvType getEnvironment(); + + public Path getMinecraftDir(); + + public Path getConfigDir(); + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/events/ClientEvents.java b/src/main/java/com/aizistral/nochatreports/common/platform/events/ClientEvents.java new file mode 100644 index 0000000..aaf34e2 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/platform/events/ClientEvents.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.common.platform.events; + +import java.util.Collection; +import java.util.function.Function; + +import com.aizistral.nochatreports.common.platform.events.particular.Disconnect; +import com.aizistral.nochatreports.common.platform.events.particular.PlayReady; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class ClientEvents { + public static final PlatformEvent<PlayReady> PLAY_READY = PlatformEvent.create(callbacks -> + (handler, client) -> callbacks.forEach(callback -> callback.handle(handler, client))); + + public static final PlatformEvent<Disconnect> DISCONNECT = PlatformEvent.create(callbacks -> + client -> callbacks.forEach(callback -> callback.handle(client))); + + private ClientEvents() { + throw new IllegalStateException("Can't touch this"); + } +} diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/events/PlatformEvent.java b/src/main/java/com/aizistral/nochatreports/common/platform/events/PlatformEvent.java new file mode 100644 index 0000000..2902f35 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/platform/events/PlatformEvent.java @@ -0,0 +1,37 @@ +package com.aizistral.nochatreports.common.platform.events; + +import java.lang.reflect.Array; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.function.Function; + +public class PlatformEvent<T> { + private final Collection<T> callbacks; + private final Function<Collection<T>, T> invokerFactory; + private volatile T invoker; + + private PlatformEvent(Function<Collection<T>, T> invokerFactory) { + this.callbacks = new LinkedList<>(); + this.invokerFactory = invokerFactory; + } + + public T invoker() { + return this.invoker; + } + + public void register(T callback) { + this.callbacks.add(callback); + this.update(); + } + + private void update() { + this.invoker = this.invokerFactory.apply(this.callbacks); + } + + static <T> PlatformEvent<T> create(Function<Collection<T>, T> invokerFactory) { + return new PlatformEvent<>(invokerFactory); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/events/particular/Disconnect.java b/src/main/java/com/aizistral/nochatreports/common/platform/events/particular/Disconnect.java new file mode 100644 index 0000000..efa1a0d --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/platform/events/particular/Disconnect.java @@ -0,0 +1,11 @@ +package com.aizistral.nochatreports.common.platform.events.particular; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientPacketListener; + +@Environment(EnvType.CLIENT) +public interface Disconnect { + public void handle(Minecraft client); +} diff --git a/src/main/java/com/aizistral/nochatreports/common/platform/events/particular/PlayReady.java b/src/main/java/com/aizistral/nochatreports/common/platform/events/particular/PlayReady.java new file mode 100644 index 0000000..9ebbf65 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/common/platform/events/particular/PlayReady.java @@ -0,0 +1,11 @@ +package com.aizistral.nochatreports.common.platform.events.particular; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientPacketListener; + +@Environment(EnvType.CLIENT) +public interface PlayReady { + public void handle(ClientPacketListener handler, Minecraft client); +} diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java deleted file mode 100644 index 6163a88..0000000 --- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java +++ /dev/null @@ -1,276 +0,0 @@ -package com.aizistral.nochatreports.config; - -import com.aizistral.nochatreports.config.NCRConfig; -import com.aizistral.nochatreports.core.ServerSafetyState; -import com.aizistral.nochatreports.core.SigningMode; -import com.aizistral.nochatreports.gui.FontHelper; -import com.terraformersmc.modmenu.api.ConfigScreenFactory; -import com.terraformersmc.modmenu.api.ModMenuApi; -import me.shedaniel.clothconfig2.api.ConfigBuilder; -import me.shedaniel.clothconfig2.api.ConfigCategory; -import me.shedaniel.clothconfig2.api.ConfigEntryBuilder; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.ChatFormatting; -import net.minecraft.client.Minecraft; -import net.minecraft.locale.Language; -import net.minecraft.network.chat.ClickEvent; -import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.HoverEvent; -import net.minecraft.network.chat.MutableComponent; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Stream; - -/** - * Implementation of ModMenu and ClothConfig support for the mod. - * - * @author MODKILLER1001 - */ - -@Environment(EnvType.CLIENT) -public final class ModMenuIntegration implements ModMenuApi { - - private String translateKey(String key) { - return Language.getInstance().getOrDefault(key); - } - - private Component[] wrapTooltip(String text) { - List<String> list = FontHelper.wrap(Minecraft.getInstance().font, text, 250); - Component[] tooltip = new Component[list.size()]; - - for (int i = 0; i < list.size(); i++) { - tooltip[i] = Component.literal(list.get(i)); - } - - return tooltip; - } - - private Component[] makeTooltip(String key) { - return this.wrapTooltip(this.translateKey(key)); - } - - @Override - public ConfigScreenFactory<?> getModConfigScreenFactory() { - return screen -> { - - // Get the previous screen - ConfigBuilder builder = ConfigBuilder.create() - .setParentScreen(Minecraft.getInstance().screen) - .setTitle(Component.translatable("configuration.NoChatReports.config")); - - // Set category - ConfigCategory client = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.client")); - ConfigCategory lan = builder.getOrCreateCategory(Component.translatable("configuration.NoChatReports.category.lan")); - - ConfigEntryBuilder entryBuilder = builder.entryBuilder(); - - // Set an option for enableMod - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableMod"), NCRConfig.getClient().enableMod) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.enableMod.tooltip")) - .setSaveConsumer(newValue -> ServerSafetyState.scheduleResetAction(() -> { - NCRConfig.getClient().enableMod = newValue; - NCRConfig.getClient().saveFile(); - })) - .build()); - - // Set an option for showNCRButton - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showNCRButton"), NCRConfig.getClient().showNCRButton) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.showNCRButton.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().showNCRButton = newValue) - .build()); - - - String signingTooltip = this.translateKey("option.NoChatReports.defaultSigningMode.tooltip") - + "\n "; - - for (SigningMode mode : SigningMode.values()) { - if (mode.isSelectableGlobally()) { - signingTooltip += "\n\n"; - signingTooltip += ChatFormatting.AQUA; - signingTooltip += ChatFormatting.BOLD; - signingTooltip += ChatFormatting.UNDERLINE; - signingTooltip += this.translateKey(mode.getNameKey()); - signingTooltip += ChatFormatting.RESET; - signingTooltip += "\n"; - signingTooltip += this.translateKey(mode.getTooltipKey()); - } - } - - // Dropdown for defaultSigningMode - client.addEntry( - entryBuilder.startStringDropdownMenu(Component.translatable("option.NoChatReports.defaultSigningMode"), - NCRConfig.getClient().defaultSigningMode.getName().getString()) - .setTooltip(this.wrapTooltip(signingTooltip)) - .setDefaultValue(SigningMode.PROMPT.getName().getString()) - .setSelections(Stream.of(SigningMode.values()).filter(SigningMode::isSelectableGlobally) - .map(mode -> mode.getName().getString()).toList()) - .setSaveConsumer(newValue -> { - NCRConfig.getClient().defaultSigningMode = Arrays.stream(SigningMode.values()) - .filter(mode -> mode.getName().getString().equals(newValue)) - .findFirst().get(); - }) - .setSuggestionMode(false) - .build() - ); - - // Set an option for showReloadButton - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showReloadButton"), NCRConfig.getClient().showReloadButton) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.showReloadButton.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().showReloadButton = newValue) - .build()); - - // Set an option for verifiedIconEnabled - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.verifiedIconEnabled"), NCRConfig.getClient().verifiedIconEnabled) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconEnabled.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconEnabled = newValue) - .build()); - - // Set an option for verifiedIconOffsetX - client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetX"), NCRConfig.getClient().verifiedIconOffsetX) - .setDefaultValue(0) - .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetX.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetX = newValue) - .build()); - - // Set an option for verifiedIconOffsetY - client.addEntry(entryBuilder.startIntField(Component.translatable("option.NoChatReports.verifiedIconOffsetY"), NCRConfig.getClient().verifiedIconOffsetY) - .setDefaultValue(0) - .setTooltip(this.makeTooltip("option.NoChatReports.verifiedIconOffsetY.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().verifiedIconOffsetY = newValue) - .build()); - - // Warning for showEncryptionButton - client.addEntry(entryBuilder.startTextDescription(Component.translatable("gui.NoChatReports.showEncryptionButtonWarning")) - .build()); - - // Set an option for showEncryptionButton - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionButton"), NCRConfig.getEncryption().showEncryptionButton) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionButton.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionButton = newValue) - .build()); - - // Set an option for showEncryptionIndicators - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showEncryptionIndicators"), NCRConfig.getEncryption().showEncryptionIndicators) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.showEncryptionIndicators.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getEncryption().showEncryptionIndicators = newValue) - .build()); - - // Set an option for showServerSafety - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.showServerSafety"), NCRConfig.getClient().showServerSafety) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.showServerSafety.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().showServerSafety = newValue) - .build()); - - // Add link for documentation for showServerSafety - client.addEntry(entryBuilder.startTextDescription(Component.translatable("option.NoChatReports.showServerSafety.moreInfo") - .withStyle(s -> s - .withHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, Component.translatable("https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety"))).withClickEvent(new ClickEvent(ClickEvent.Action.OPEN_URL, "https://github.com/Aizistral-Studios/No-Chat-Reports/wiki/Configuration-Files/#option-showserversafety")))) - .build()); - - // Set an option for hideInsecureMessageIndicators - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideInsecureMessageIndicators"), NCRConfig.getClient().hideInsecureMessageIndicators) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.hideInsecureMessageIndicators.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().hideInsecureMessageIndicators = newValue) - .build()); - - // Set an option for hideModifiedMessageIndicators - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideModifiedMessageIndicators"), NCRConfig.getClient().hideModifiedMessageIndicators) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.hideModifiedMessageIndicators.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().hideModifiedMessageIndicators = newValue) - .build()); - - // Set an option for hideSystemMessageIndicators - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSystemMessageIndicators"), NCRConfig.getClient().hideSystemMessageIndicators) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.hideSystemMessageIndicators.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().hideSystemMessageIndicators = newValue) - .build()); - - // Set an option for hideWarningToast - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideWarningToast"), NCRConfig.getClient().hideWarningToast) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.hideWarningToast.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().hideWarningToast = newValue) - .build()); - - // Set an option for hideSigningRequestMessage - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.hideSigningRequestMessage"), NCRConfig.getClient().hideSigningRequestMessage) - .setDefaultValue(false) - .setTooltip(this.makeTooltip("option.NoChatReports.hideSigningRequestMessage.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().hideSigningRequestMessage = newValue) - .build()); - - // Set an option for alwaysHideReportButton - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.alwaysHideReportButton"), NCRConfig.getClient().alwaysHideReportButton) - .setDefaultValue(false) - .setTooltip(this.makeTooltip("option.NoChatReports.alwaysHideReportButton.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().alwaysHideReportButton = newValue) - .build()); - - // Set an option for demandOnServer - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnServer"), NCRConfig.getClient().demandOnServer) - .setDefaultValue(false) - .setTooltip(this.makeTooltip("option.NoChatReports.demandOnServer.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().demandOnServer = newValue) - .build()); - - // Set an option for enableDebugLog - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.enableDebugLog"), NCRConfig.getCommon().enableDebugLog) - .setDefaultValue(false) - .setTooltip(this.makeTooltip("option.NoChatReports.enableDebugLog.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getCommon().enableDebugLog = newValue) - .build()); - - // Set an option for disableTelemetry - client.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.disableTelemetry"), NCRConfig.getClient().disableTelemetry) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.disableTelemetry.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getClient().disableTelemetry = newValue) - .build()); - - // Set an option for demandOnClient - lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.demandOnClient"), NCRConfig.getCommon().demandOnClient) - .setDefaultValue(false) - .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClient.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClient = newValue) - .build()); - - // Set an option for demandOnClientMessage - lan.addEntry(entryBuilder.startStrField(Component.translatable("option.NoChatReports.demandOnClientMessage"), NCRConfig.getCommon().demandOnClientMessage) - .setDefaultValue(NCRConfig.getCommon().demandOnClientMessage) - .setTooltip(this.makeTooltip("option.NoChatReports.demandOnClientMessage.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getCommon().demandOnClientMessage = newValue) - .build()); - - // Set an option for convertToGameMessage - lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.convertToGameMessage"), NCRConfig.getCommon().convertToGameMessage) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.convertToGameMessage.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getCommon().convertToGameMessage = newValue) - .build()); - - // Set an option for addQueryData - lan.addEntry(entryBuilder.startBooleanToggle(Component.translatable("option.NoChatReports.addQueryData"), NCRConfig.getCommon().addQueryData) - .setDefaultValue(true) - .setTooltip(this.makeTooltip("option.NoChatReports.addQueryData.tooltip")) - .setSaveConsumer(newValue -> NCRConfig.getCommon().addQueryData = newValue) - .build()); - - // Save config - builder.setSavingRunnable(NCRConfig::save); - return builder.build(); - }; - } - -}
\ No newline at end of file diff --git a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java new file mode 100644 index 0000000..2092a78 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReports.java @@ -0,0 +1,35 @@ +package com.aizistral.nochatreports.fabric; + +import java.nio.file.Path; + +import com.aizistral.nochatreports.common.NCRCore; +import com.aizistral.nochatreports.common.platform.PlatformProvider; + +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.ModInitializer; +import net.fabricmc.loader.api.FabricLoader; + +public class NoChatReports implements ModInitializer, PlatformProvider { + + @Override + public void onInitialize() { + NCRCore.awaken(this); + } + + @Override + public EnvType getEnvironment() { + return FabricLoader.getInstance().getEnvironmentType(); + } + + @Override + public Path getMinecraftDir() { + return FabricLoader.getInstance().getGameDir(); + } + + @Override + public Path getConfigDir() { + return FabricLoader.getInstance().getConfigDir(); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java new file mode 100644 index 0000000..2ae4236 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/fabric/NoChatReportsClient.java @@ -0,0 +1,22 @@ +package com.aizistral.nochatreports.fabric; + +import com.aizistral.nochatreports.common.platform.events.ClientEvents; + +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents; + +@Environment(EnvType.CLIENT) +public class NoChatReportsClient implements ClientModInitializer { + + @Override + public void onInitializeClient() { + ClientPlayConnectionEvents.JOIN.register((handler, sender, client) -> + ClientEvents.PLAY_READY.invoker().handle(handler, client)); + + ClientPlayConnectionEvents.DISCONNECT.register((handler, client) -> + ClientEvents.DISCONNECT.invoker().handle(client)); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java b/src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java new file mode 100644 index 0000000..aa573c2 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java @@ -0,0 +1,20 @@ +package com.aizistral.nochatreports.fabric.mixins; + +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.common.NCRCore; + +import net.minecraft.client.Minecraft; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Inject(method = "run", at = @At("HEAD")) + private void onRun(CallbackInfo info) { + NCRCore.LOGGER.info("Game entered main loop!"); + } + +} |
