diff options
| author | Aizistral | 2023-01-02 14:37:04 +0100 |
|---|---|---|
| committer | Aizistral | 2023-01-02 14:37:04 +0100 |
| commit | af90a12079c558ea4a1efc9385e93bcdcb9917dd (patch) | |
| tree | 2eccea5899a998bbd52be8fa15c5eb6cd0430ae0 | |
| parent | 6d61f99a1547eab58e88dcea7e3901511f0929d2 (diff) | |
Commence work on branch unification
74 files changed, 914 insertions, 308 deletions
diff --git a/build.gradle b/build.gradle index c4859a0..c71c142 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,29 @@ archivesBaseName = project.archives_base_name version = project.mod_version group = project.maven_group +apply from: 'common.gradle' + +sourceSets { + fabric { + java { + compileClasspath += main.compileClasspath + main.output + runtimeClasspath += main.runtimeClasspath + main.output + } + } +} + +configurations { + fabricCompile.extendsFrom mainCompile + fabricRuntime.extendsFrom mainRuntime +} + loom { - accessWidenerPath = file("src/main/resources/nochatreports.accesswidener") + accessWidenerPath = file("src/fabric/resources/nochatreports.accesswidener") + + mixin { + add(sourceSets.main, "nochatreports.refmap.json") + add(sourceSets.fabric, "nochatreports-fabric.refmap.json") + } } repositories { @@ -40,6 +61,8 @@ dependencies { modImplementation include(fabricApi.module("fabric-resource-loader-v0", project.fabric_version)) } +sourceSets.remove(sourceSets.test) + processResources { inputs.property "version", project.version @@ -56,24 +79,25 @@ java { // withSourcesJar() } -task testJar (type: Jar) { - classifier = 'test' - from sourceSets.test.output - testJar.finalizedBy('prepareRemapJar') - testJar.finalizedBy('remapJar') - - from("LICENSE") { - // NO-OP - } - - doFirst { - remapJar.classifier = 'test-reobf' - remapJar.inputFile = testJar.outputs.files.singleFile - } -} +//task testJar (type: Jar) { +// classifier = 'test' +// from sourceSets.test.output +// testJar.finalizedBy('prepareRemapJar') +// testJar.finalizedBy('remapJar') +// +// from("LICENSE") { +// // NO-OP +// } +// +// doFirst { +// remapJar.classifier = 'test-reobf' +// remapJar.inputFile = testJar.outputs.files.singleFile +// } +//} jar { - + from sourceSets.fabric.output + from("LICENSE") { // NO-OP } diff --git a/common.gradle b/common.gradle new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/common.gradle diff --git a/forge/.gitignore b/forge/.gitignore new file mode 100644 index 0000000..41f9d62 --- /dev/null +++ b/forge/.gitignore @@ -0,0 +1,36 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Aizistral +.apt_generated +logs +omniconfig_first +*works +Users +.factorypath +deps/Soulbound* +multiuser_args.txt +old_enigmatic_desc.txt +**/TestEventHandler* +/.apt_generated_tests/ +src/main
\ No newline at end of file diff --git a/forge/build.gradle b/forge/build.gradle new file mode 100644 index 0000000..955bb53 --- /dev/null +++ b/forge/build.gradle @@ -0,0 +1,257 @@ +buildscript { + repositories { + mavenCentral() + maven { url "file:///${project.projectDir}/deps/" } + maven { url = 'https://maven.minecraftforge.net' } + maven { url = 'https://dist.creeper.host/Sponge/maven' } + maven { url 'https://plugins.gradle.org/m2/' } + maven { + url = 'https://repo.spongepowered.org/repository/maven-public/' + content { includeGroup "org.spongepowered" } + } + maven { + name "Gradle Plugin Portal" + url 'https://plugins.gradle.org/m2/' + content { + includeGroup "gradle.plugin.com.matthewprenger" + includeGroup "com.modrinth" + } + } + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' + classpath 'org.spongepowered:mixingradle:0.7.+' + } +} + +plugins { + id "com.modrinth.minotaur" version "2.+" +} + +println("Applying plugins...") + +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'org.spongepowered.mixin' +apply plugin: 'eclipse' +apply plugin: 'maven-publish' +apply plugin: 'com.matthewprenger.cursegradle' + +apply from: '../common.gradle' + +println("Specifying project version/group/archivesBaseName...") +version = "${mod_version}" +group = "${mod_group}" +archivesBaseName = "${mod_archives_name}" + +println("Specifying Java compatibility...") +java.toolchain.languageVersion = JavaLanguageVersion.of(17) +compileJava.options.encoding = "UTF-8" + +println("Java Installation Data:") +println(" - Java Version: " + System.getProperty('java.version')) +println(" - JVM Version: " + System.getProperty('java.vm.version')) +println(" - Vendor: " + System.getProperty('java.vendor')) +println(" - OS Archetype: " + System.getProperty('os.arch')) + +sourceSets { + forge { + java { + compileClasspath += main.output + runtimeClasspath += main.output + } + } +} + +configurations { + forgeCompile.extendsFrom mainCompile + forgeRuntime.extendsFrom mainRuntime +} + +mixin { + println("Specifying refmaps for Mixin...") + add sourceSets.main, "nochatreports.refmap.json" + add sourceSets.forge, "nochatreports-forge.refmap.json" +} + +minecraft { + println("Specifying MCP mappings...") + mappings channel: 'official', version: project.version_mc + println("Specifying Access Transformer configuration...") + accessTransformer = file('src/forge/resources/META-INF/accesstransformer.cfg') + + runs { + client { + properties 'org.gradle.jvmargs': '-Xms4G -Xmx4G' + properties 'fml.earlyprogresswindow': 'false' + properties 'mixin.env.disableRefMap': 'true' + workingDirectory project.file('run') + + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + + mods { + nochatreports { + source sourceSets.main + } + } + } + + server { + properties 'mixin.env.disableRefMap': 'true' + workingDirectory project.file('run') + + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + + mods { + nochatreports { + source sourceSets.main + } + } + } + } +} + +sourceSets.remove(sourceSets.test) +sourceSets.main.resources { + // NO-OP +} + +repositories { + println("Specifying repositories...") + flatDir { dirs 'deps' } + maven { url = "https://maven.theillusivec4.top/" } // curios + maven { url = "https://maven.blamejared.com/" } // patchouli + maven { url = "https://repo.spongepowered.org/maven" } // mixin + maven { url "https://dvs1.progwml6.com/files/maven/" } // no idea +} + +dependencies { + println("Processing dependencies...") + + // Minecraft & Forge + minecraft "net.minecraftforge:forge:${version_forge}" + annotationProcessor 'org.spongepowered:mixin:0.8.5:processor' +} + + +jar { + from sourceSets.forge.output + println("Processing manifest...") + + manifest { + attributes([ + "Specification-Title": "${mod_name}", + "Specification-Vendor": "${mod_author}", + "Specification-Version": "${mod_version}", + "Implementation-Title": "${mod_name}", + "Implementation-Version": "${mod_version}", + "Implementation-Vendor" :"${mod_author}", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + "MixinConfigs": "nochatreports.mixins.json, nochatreports-forge.mixins.json" + ]) + } +} + +processResources { + println("Processing resources...") + + exclude 'META-INF/mods.toml' + + from("${project.projectDir}/docs/META-INF") { + println("Inflating mods.toml...") + + // Replace properties in mods.toml with ones derived from settings.gradle + include 'mods.toml' + expand 'mod_license': mod_license, + 'mod_version': project.version, + 'mod_id' : mod_id, + 'mod_name': mod_name, + 'mod_url': mod_url, + 'mod_author': mod_author, + 'mod_description': mod_description, + 'mod_icon': mod_icon, + 'issue_tracker_url': issue_tracker_url, + 'mod_credits': mod_credits, + 'dep_forge': dep_forge, + 'dep_minecraft': dep_minecraft + into 'META-INF' + } + + from("${project.projectDir}/docs") { + include 'changelog.html' + } + + from("${project.projectDir}") { + include 'LICENSE' + } +} + +curseforge { + + project { + println("Pushing CurseGradle specifications for project ID: ${curse_id}") + + // Specified as cmd argument + apiKey = findProperty('curseKey') ?: 'none' + + id = "${curse_id}" + releaseType = "${curse_release}" + changelogType = 'html' + changelog = file('docs/changelog.html') + + addGameVersion project.version_mc + addGameVersion 'Java 17' + addGameVersion 'Forge' + + //addArtifact(sourcesJar) + //addArtifact(apiJar) + } +} + +modrinth { + token = findProperty('modrinthKey') ?: 'none' + projectId = "no-chat-reports" + versionNumber = "Forge-" + project.version + versionName = "No Chat Reports Forge-" + project.version + versionType = "release" + changelog = rootProject.file("docs/changelog.html").text + uploadFile = jar + gameVersions = [ project.version_mc ] + + //syncBodyFrom = rootProject.file("docs/README.md").text +} + +task upload { + dependsOn('modrinth') + dependsOn('curseforge') +} + + +task updateResources() { + // NO-OP +} + +tasks.updateResources.dependsOn processResources + +//tasks.withType(JavaCompile) { +// options.failOnError(true) +//} + +jar.finalizedBy('reobfJar') +//publish.dependsOn('reobfJar') + +publishing { + + publications { + mavenJava(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file:///${project.projectDir}/mcmodsrepo" + } + } +}
\ No newline at end of file diff --git a/forge/gradle.properties b/forge/gradle.properties new file mode 100644 index 0000000..0cc420c --- /dev/null +++ b/forge/gradle.properties @@ -0,0 +1,32 @@ +# Gradle +org.gradle.jvmargs=-Xmx4G +org.gradle.daemon=false + +# Mod +mod_version=1.19.3-v1.6.0 +mod_group=com.aizistral.nochatreports +mod_id=nochatreports +mod_name=No Chat Reports +mod_archives_name=NoChatReports-FORGE +mod_url=https://www.curseforge.com/minecraft/mc-mods/no-chat-reports +issue_tracker_url=https://github.com/Aizistral-Studious/No-Chat-Reports/issues +mod_author=Aizistral + +mod_description=Simple mod that disables chat reports. +mod_credits=Me, for making such an amazing mod. + +mod_icon=NCR_logo.png +mod_license=WTFPL + +# Dependency specifications for mods.toml +dep_forge=[37,) +dep_minecraft=[1.19.3,) + +# Dependencies specifications for build.gradle +version_mc=1.19.3 +version_forge=1.19.3-44.0.48 +version_mcp=1.19.3 + +# CurseGradle +curse_id=634062 +curse_release=release
\ No newline at end of file diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java new file mode 100644 index 0000000..65bac6e --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReports.java @@ -0,0 +1,42 @@ +package com.aizistral.nochatreports.forge; + +import java.nio.charset.Charset; +import java.util.function.Predicate; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.aizistral.nochatreports.config.NCRConfig; + +import net.minecraft.network.protocol.login.ServerboundHelloPacket; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.server.network.ServerGamePacketListenerImpl; +import net.minecraft.server.network.ServerLoginPacketListenerImpl; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.event.EventNetworkChannel; +import net.minecraftforge.network.simple.SimpleChannel; +import net.minecraftforge.server.ServerLifecycleHooks; + +@Mod("nochatreports") +public class NoChatReports { + public static final Logger LOGGER = LogManager.getLogger(); + + public NoChatReports() { + LOGGER.info("KONNICHIWA ZA WARUDO!"); + LOGGER.info("Default JVM text encoding is: " + Charset.defaultCharset().displayName()); + + NCRConfig.load(); + } +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java new file mode 100644 index 0000000..4181a77 --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/NoChatReportsClient.java @@ -0,0 +1,115 @@ +package com.aizistral.nochatreports.forge; + +import java.util.List; + +import com.aizistral.nochatreports.NoChatReports; +import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.core.ServerDataExtension; +import com.aizistral.nochatreports.core.ServerSafetyLevel; +import com.aizistral.nochatreports.core.ServerSafetyState; +import com.aizistral.nochatreports.core.SigningMode; +import com.aizistral.nochatreports.gui.UnsafeServerScreen; +import com.google.common.collect.ImmutableList; + +import net.minecraft.Util; +import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.screens.ChatScreen; +import net.minecraft.client.gui.screens.ConnectScreen; +import net.minecraft.client.gui.screens.DisconnectedScreen; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.screens.TitleScreen; +import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.contents.TranslatableContents; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.event.ClientPlayerNetworkEvent; +import net.minecraftforge.client.event.ScreenEvent; +import net.minecraftforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent; +import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber; +import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus; + +@EventBusSubscriber(modid = "nochatreports", bus = Bus.FORGE) +public class NoChatReportsClient { + private static boolean signingKeysPresent = false; + + private NoChatReportsClient() { + throw new IllegalStateException("Can't touch this"); + } + + @OnlyIn(Dist.CLIENT) + public static void onDisconnect(Minecraft client) { + if (!NCRConfig.getClient().enableMod()) + return; + + if (NCRConfig.getCommon().enableDebugLog()) { + NoChatReports.LOGGER.info("Disconnected from server, resetting safety state!"); + } + + ServerSafetyState.reset(); + } + + @SubscribeEvent + @OnlyIn(Dist.CLIENT) + public static void onPlayReady(ClientPlayerNetworkEvent.LoggingIn event) { + Minecraft client = Minecraft.getInstance(); + ClientPacketListener handler = client.getConnection(); + + if (!NCRConfig.getClient().enableMod()) + return; + + client.execute(() -> { + if (!client.isLocalServer()) { + if (ServerSafetyState.isOnRealms()) { + // NO-OP + } else if (!handler.getConnection().isEncrypted()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else if (client.getCurrentServer() instanceof ServerDataExtension ext && + ext.preventsChatReports()) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SECURE); + } else if (NCRConfig.getServerPreferences().hasMode(ServerSafetyState.getLastServer(), + SigningMode.ALWAYS)) { + ServerSafetyState.updateCurrent(ServerSafetyLevel.INSECURE); + ServerSafetyState.setAllowChatSigning(true); + } else { + ServerSafetyState.updateCurrent(ServerSafetyLevel.UNKNOWN); + } + } else { + ServerSafetyState.updateCurrent(ServerSafetyLevel.SINGLEPLAYER); + } + + if (NCRConfig.getCommon().enableDebugLog()) { + NoChatReports.LOGGER.info("Sucessfully connected to server, safety state: {}", ServerSafetyState.getCurrent()); + } + + if (NCRConfig.getClient().demandOnServer() && !ServerSafetyState.getCurrent().isSecure()) { + handler.getConnection().disconnect(Component.translatable("disconnect.nochatreports.client")); + } + }); + } + + public static boolean areSigningKeysPresent() { + return signingKeysPresent; + } + + public static void setSigningKeysPresent(boolean present) { + signingKeysPresent = present; + } + + public static void resendLastChatMessage() { + var mc = Minecraft.getInstance(); + var chatScr = mc.screen instanceof ChatScreen chat ? chat : null; + + if (chatScr == null) { + chatScr = new ChatScreen(""); + chatScr.init(mc, mc.getWindow().getGuiScaledWidth(), mc.getWindow().getGuiScaledHeight()); + } + + chatScr.handleChatInput(NCRConfig.getEncryption().getLastMessage(), false); + } + + +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java new file mode 100644 index 0000000..74f1220 --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientConnection.java @@ -0,0 +1,32 @@ +package com.aizistral.nochatreports.forge.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.aizistral.nochatreports.forge.NoChatReportsClient; + +import io.netty.channel.ChannelHandlerContext; +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.Connection; +import net.minecraft.network.PacketListener; + +@Mixin(Connection.class) +public class MixinClientConnection { + @Shadow + private PacketListener packetListener; + + @Inject(method = "channelInactive", at = @At("HEAD")) + private void handleDisconnect(ChannelHandlerContext context, CallbackInfo info) { + // not the case for client/server query + if (this.packetListener instanceof ClientHandshakePacketListenerImpl + || this.packetListener instanceof ClientPacketListener) { + NoChatReportsClient.onDisconnect(Minecraft.getInstance()); + } + } + +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java new file mode 100644 index 0000000..e128c3e --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientHandshakePacketListenerImpl.java @@ -0,0 +1,22 @@ +package com.aizistral.nochatreports.forge.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.aizistral.nochatreports.forge.NoChatReportsClient; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl; +import net.minecraft.network.chat.Component; + +@Mixin(ClientHandshakePacketListenerImpl.class) +public class MixinClientHandshakePacketListenerImpl { + + @Inject(method = "onDisconnect", at = @At("HEAD")) + private void invokeLoginDisconnectEvent(Component reason, CallbackInfo info) { + NoChatReportsClient.onDisconnect(Minecraft.getInstance()); + } + +} diff --git a/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java new file mode 100644 index 0000000..817cea3 --- /dev/null +++ b/forge/src/forge/java/com/aizistral/nochatreports/forge/mixins/client/MixinClientPacketListener.java @@ -0,0 +1,22 @@ +package com.aizistral.nochatreports.forge.mixins.client; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +import com.aizistral.nochatreports.forge.NoChatReportsClient; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.network.chat.Component; + +@Mixin(value = ClientPacketListener.class) +public class MixinClientPacketListener { + + @Inject(method = "onDisconnect", at = @At("HEAD")) + private void handleDisconnection(Component reason, CallbackInfo info) { + NoChatReportsClient.onDisconnect(Minecraft.getInstance()); + } + +} diff --git a/forge/src/forge/java/net/fabricmc/api/EnvType.java b/forge/src/forge/java/net/fabricmc/api/EnvType.java new file mode 100644 index 0000000..253b6e8 --- /dev/null +++ b/forge/src/forge/java/net/fabricmc/api/EnvType.java @@ -0,0 +1,48 @@ +/* + * Copyright 2016 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.api; + +/** + * Represents a type of environment. + * + * <p>A type of environment is a jar file in a <i>Minecraft</i> version's json file's {@code download} + * subsection, including the {@code client.jar} and the {@code server.jar}.</p> + * + * @see Environment + * @see EnvironmentInterface + */ +public enum EnvType { + /** + * Represents the client environment type, in which the {@code client.jar} for a + * <i>Minecraft</i> version is the main game jar. + * + * <p>A client environment type has all client logic (client rendering and integrated + * server logic), the data generator logic, and dedicated server logic. It encompasses + * everything that is available on the {@linkplain #SERVER server environment type}.</p> + */ + CLIENT, + /** + * Represents the server environment type, in which the {@code server.jar} for a + * <i>Minecraft</i> version is the main game jar. + * + * <p>A server environment type has the dedicated server logic and data generator + * logic, which are all included in the {@linkplain #CLIENT client environment type}. + * However, the server environment type has its libraries embedded compared to the + * client.</p> + */ + SERVER +} diff --git a/forge/src/forge/java/net/fabricmc/api/Environment.java b/forge/src/forge/java/net/fabricmc/api/Environment.java new file mode 100644 index 0000000..1db59da --- /dev/null +++ b/forge/src/forge/java/net/fabricmc/api/Environment.java @@ -0,0 +1,48 @@ +/* + * Copyright 2016 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.api; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Applied to declare that the annotated element is present only in the specified environment. + * + * <p>Use with caution, as Fabric-loader will remove the annotated element in a mismatched environment!</p> + * + * <p>When the annotated element is removed, bytecode associated with the element will not be removed. + * For example, if a field is removed, its initializer code will not, and will cause an error on execution.</p> + * + * <p>If an overriding method has this annotation and its overridden method doesn't, + * unexpected behavior may happen. If an overridden method has this annotation + * while the overriding method doesn't, it is safe, but the method can be used from + * the overridden class only in the specified environment.</p> + * + * @see EnvironmentInterface + */ +@Retention(RetentionPolicy.CLASS) +@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.CONSTRUCTOR, ElementType.PACKAGE}) +@Documented +public @interface Environment { + /** + * Returns the environment type that the annotated element is only present in. + */ + EnvType value(); +} diff --git a/forge/src/forge/resources/META-INF/MANIFEST.MF b/forge/src/forge/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..b4613f2 --- /dev/null +++ b/forge/src/forge/resources/META-INF/MANIFEST.MF @@ -0,0 +1 @@ +MixinConfigs: nochatreports.mixins.json, nochatreports-forge.mixins.json
\ No newline at end of file diff --git a/forge/src/forge/resources/META-INF/accesstransformer.cfg b/forge/src/forge/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..390e8b0 --- /dev/null +++ b/forge/src/forge/resources/META-INF/accesstransformer.cfg @@ -0,0 +1,23 @@ +public net.minecraft.client.gui.screens.SimpleOptionsSubScreen f_96668_ #list +public-f net.minecraft.client.gui.components.ImageButton f_94224_ #xTexStart +public-f net.minecraft.client.gui.components.ImageButton f_94225_ #yTexStart +public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents +public-f net.minecraft.network.chat.contents.TranslatableContents f_237498_ #args +public-f net.minecraft.network.chat.MutableComponent f_237194_ #contents +public net.minecraft.client.gui.screens.multiplayer.WarningScreen f_210915_ #message +public net.minecraft.client.multiplayer.ClientPacketListener f_240902_ #signedMessageEncoder +public net.minecraft.client.multiplayer.ClientPacketListener f_252517_ #chatSession +public net.minecraft.client.gui.components.Tooltip f_257026_ #MAX_WIDTH +public net.minecraft.client.gui.components.Tooltip f_256850_ #message +public net.minecraft.client.gui.components.Tooltip f_257004_ #narration +public net.minecraft.client.gui.components.Tooltip f_256766_ #cachedTooltip +public net.minecraft.client.gui.screens.Screen f_96541_ #minecraft +public net.minecraft.client.gui.screens.Screen f_96542_ #itemRenderer +public net.minecraft.client.gui.screens.Screen f_96547_ #font +public net.minecraft.client.gui.components.AbstractWidget f_256816_ #tooltip +public net.minecraft.client.gui.components.AbstractWidget f_256936_ #tooltipMsDelay +public net.minecraft.client.gui.screens.OptionsScreen f_260594_ #TELEMETRY + +public net.minecraft.client.gui.components.Tooltip <init>(Lnet/minecraft/network/chat/Component;Lnet/minecraft/network/chat/Component;)V #<init> +public-f net.minecraft.client.gui.components.AbstractWidget m_257936_()V #updateTooltip +public-f net.minecraft.client.gui.components.CycleButton m_257795_()V #updateTooltip
\ No newline at end of file diff --git a/forge/src/forge/resources/META-INF/mods.toml b/forge/src/forge/resources/META-INF/mods.toml new file mode 100644 index 0000000..d3afb8e --- /dev/null +++ b/forge/src/forge/resources/META-INF/mods.toml @@ -0,0 +1,12 @@ +license="WTFPL" +modLoader="javafml" +loaderVersion="[31,)" +[[mods]] +modId="nochatreports" +version="1.0.0" +displayName="No Chat Reports" +authors="Aizistral" +logoFile="NCR_logo.png" +description=''' +None +'''
\ No newline at end of file diff --git a/forge/src/forge/resources/nochatreports-forge.mixins.json b/forge/src/forge/resources/nochatreports-forge.mixins.json new file mode 100644 index 0000000..0f0effa --- /dev/null +++ b/forge/src/forge/resources/nochatreports-forge.mixins.json @@ -0,0 +1,18 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.aizistral.nochatreports.forge.mixins", + "compatibilityLevel": "JAVA_17", + "verbose": true, + "mixins": [], + "client": [ + "client.MixinClientConnection", + "client.MixinClientHandshakePacketListenerImpl", + "client.MixinClientPacketListener" + ], + "server": [], + "injectors": { + "defaultRequire": 1 + }, + "refmap": "nochatreports-forge.refmap.json" +} diff --git a/forge/src/forge/resources/pack.mcmeta b/forge/src/forge/resources/pack.mcmeta new file mode 100644 index 0000000..1a52c3a --- /dev/null +++ b/forge/src/forge/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "No Chat Reports Resources", + "pack_format": 6 + } +} diff --git a/gradle.properties b/gradle.properties index 586aa89..d0b820d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -9,7 +9,7 @@ yarn_mappings=1.19.3+build.1 loader_version=0.14.11 # Mod Properties -mod_version=1.19.3-v1.19.0 +mod_version=1.19.3-v2.0.0 maven_group=com.aizistral.nochatreports archives_base_name=NoChatReports-FABRIC diff --git a/settings.gradle b/settings.gradle index b02216b..1120568 100644 --- a/settings.gradle +++ b/settings.gradle @@ -8,3 +8,6 @@ pluginManagement { gradlePluginPortal() } } + +rootProject.name = 'No-Chat-Reports' +include('forge')
\ No newline at end of file diff --git a/setup-links.bat b/setup-links.bat new file mode 100644 index 0000000..e31246b --- /dev/null +++ b/setup-links.bat @@ -0,0 +1,2 @@ +mklink /J "./forge/src/main" "./src/main" +pause
\ No newline at end of file diff --git a/src/fabric/java/com/aizistral/nochatreports/fabric/RandomFabricClass.java b/src/fabric/java/com/aizistral/nochatreports/fabric/RandomFabricClass.java new file mode 100644 index 0000000..c2bfc09 --- /dev/null +++ b/src/fabric/java/com/aizistral/nochatreports/fabric/RandomFabricClass.java @@ -0,0 +1,9 @@ +package com.aizistral.nochatreports.fabric; + +public class RandomFabricClass { + public static final String HELLO = "HELLO"; + + public RandomFabricClass() { + + } +} diff --git a/src/fabric/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java b/src/fabric/java/com/aizistral/nochatreports/fabric/mixins/MixinMinecraft.java new file mode 100644 index 0000000..70f3f9e --- /dev/null +++ b/src/fabric/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.NoChatReports; + +import net.minecraft.client.Minecraft; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Inject(method = "run", at = @At("HEAD")) + private void onRun(CallbackInfo info) { + NoChatReports.LOGGER.info("Game entered main loop!"); + } + +} diff --git a/src/main/resources/fabric.mod.json b/src/fabric/resources/fabric.mod.json index e158781..c883c9f 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/fabric/resources/fabric.mod.json @@ -33,7 +33,8 @@ ] }, "mixins": [ - "nochatreports.mixins.json" + "nochatreports.mixins.json", + "nochatreports-fabric.mixins.json" ], "depends": { diff --git a/src/test/resources/nochatreportstest.mixins.json b/src/fabric/resources/nochatreports-fabric.mixins.json index 94fec99..3406294 100644 --- a/src/test/resources/nochatreportstest.mixins.json +++ b/src/fabric/resources/nochatreports-fabric.mixins.json @@ -1,14 +1,12 @@ { "required": true, "minVersion": "0.8", - "package": "com.aizistral.nochatreports.debug.mixins", + "package": "com.aizistral.nochatreports.fabric.mixins", "compatibilityLevel": "JAVA_17", "verbose": true, "mixins": [ ], "client": [ - "MixinPlayerEntry", - "MixinAbuseReportSenderServices", "MixinMinecraft" ], "server": [ diff --git a/src/main/resources/nochatreports.accesswidener b/src/fabric/resources/nochatreports.accesswidener index ccf4f65..ccf4f65 100644 --- a/src/main/resources/nochatreports.accesswidener +++ b/src/fabric/resources/nochatreports.accesswidener diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java index a70f8f0..584e8ac 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReports.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -1,6 +1,5 @@ package com.aizistral.nochatreports; -import com.aizistral.nochatreports.config.NCRConfig; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.networking.v1.PacketSender; import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; @@ -12,6 +11,8 @@ 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; /** diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java index 4cd2f8e..2fa7ecf 100644 --- a/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java +++ b/src/main/java/com/aizistral/nochatreports/NoChatReportsClient.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports; +import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerDataExtension; import com.aizistral.nochatreports.core.ServerSafetyLevel; diff --git a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java index edc8bec..6f5f488 100644 --- a/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/JSONConfig.java @@ -9,6 +9,8 @@ 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.google.gson.ExclusionStrategy; import com.google.gson.FieldAttributes; import com.google.gson.Gson; diff --git a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java index 7a90aa8..6163a88 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java +++ b/src/main/java/com/aizistral/nochatreports/config/ModMenuIntegration.java @@ -1,5 +1,6 @@ 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; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java index 7f203bc..5a1137f 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfig.java @@ -1,6 +1,12 @@ 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; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java index 6054f7e..800deaf 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigClient.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.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; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java index 38df30e..861f57d 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigCommon.java @@ -1,5 +1,8 @@ package com.aizistral.nochatreports.config; +import com.aizistral.nochatreports.config.JSONConfig; +import com.aizistral.nochatreports.config.NCRConfigCommon; + 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/config/NCRConfigEncryption.java index 525abff..6cd4f0a 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRConfigEncryption.java @@ -1,5 +1,7 @@ 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; diff --git a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java index d94be20..81ad97f 100644 --- a/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java +++ b/src/main/java/com/aizistral/nochatreports/config/NCRServerPreferences.java @@ -8,6 +8,8 @@ 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; diff --git a/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java index c68aed9..8d63bd1 100644 --- a/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java +++ b/src/main/java/com/aizistral/nochatreports/config/ServerAddressAdapter.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.config; +import com.aizistral.nochatreports.config.ServerAddressAdapter; import com.google.gson.TypeAdapter; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; diff --git a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java index 39e9a11..a614bba 100644 --- a/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java +++ b/src/main/java/com/aizistral/nochatreports/core/EncryptionUtil.java @@ -2,6 +2,7 @@ package com.aizistral.nochatreports.core; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.encryption.Encryptor; + import net.minecraft.network.chat.Component; import net.minecraft.network.chat.ComponentContents; import net.minecraft.network.chat.MutableComponent; diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java index 69e69aa..817f192 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyLevel.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.core; +import com.aizistral.nochatreports.core.ServerSafetyState; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.network.chat.Component; diff --git a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java index ced4281..73b08ad 100644 --- a/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java +++ b/src/main/java/com/aizistral/nochatreports/core/ServerSafetyState.java @@ -1,6 +1,8 @@ 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; diff --git a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java index 3402d6c..32b6dba 100644 --- a/src/main/java/com/aizistral/nochatreports/core/SigningMode.java +++ b/src/main/java/com/aizistral/nochatreports/core/SigningMode.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.core; import org.jetbrains.annotations.Nullable; import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.core.SigningMode; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java index 09b075c..197f753 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryption.java @@ -2,6 +2,9 @@ package com.aizistral.nochatreports.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/encryption/AESCFB8Encryptor.java index 63476f3..c4f045d 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESCFB8Encryptor.java @@ -4,6 +4,11 @@ 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; + import java.nio.ByteBuffer; import java.security.InvalidKeyException; import java.security.spec.AlgorithmParameterSpec; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java index 359d509..5c4216a 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryption.java @@ -2,6 +2,9 @@ package com.aizistral.nochatreports.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/encryption/AESECBEncryptor.java index a853f0c..d12051a 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESECBEncryptor.java @@ -3,6 +3,11 @@ package com.aizistral.nochatreports.encryption; import net.minecraft.util.Tuple; 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; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java index f2c4922..84145d2 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryption.java @@ -7,6 +7,9 @@ import javax.crypto.SecretKey; 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; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java index 2094c5a8..cfde341 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESEncryptor.java @@ -4,6 +4,10 @@ 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 java.nio.ByteBuffer; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryption.java index f50ec85..edb5eb4 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryption.java @@ -2,6 +2,9 @@ package com.aizistral.nochatreports.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/encryption/AESGCMEncryptor.java index 9ef7ed7..c2f5450 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/AESGCMEncryptor.java @@ -4,6 +4,11 @@ import net.minecraft.util.Tuple; 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; diff --git a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java index 16536bc..5ea07d7 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryption.java @@ -3,6 +3,9 @@ package com.aizistral.nochatreports.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/encryption/CaesarEncryptor.java index 926c657..ada6a66 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/CaesarEncryptor.java @@ -2,6 +2,10 @@ package com.aizistral.nochatreports.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/encryption/Encryption.java index 0e32da8..e9e2248 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryption.java @@ -6,6 +6,13 @@ 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/encryption/Encryptor.java index 0ccd39c..346db89 100644 --- a/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java +++ b/src/main/java/com/aizistral/nochatreports/encryption/Encryptor.java @@ -9,6 +9,8 @@ import java.security.InvalidKeyException; import java.security.SecureRandom; import java.util.Arrays; +import com.aizistral.nochatreports.encryption.Encryption; + public abstract class Encryptor<T extends Encryption> { protected static final SecureRandom RANDOM = new SecureRandom(); protected static final Char2CharMap BASE64R_SHIFTS = createBase64RShifts(); diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java index 0b1f2d8..25f6d54 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java +++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedImageButton.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.gui; +import com.aizistral.nochatreports.gui.AdvancedTooltip; import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java index 9523845..0dddb9c 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java +++ b/src/main/java/com/aizistral/nochatreports/gui/AdvancedTooltip.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.gui; +import com.aizistral.nochatreports.gui.AdvancedTooltip; import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.*; import net.fabricmc.api.EnvType; diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java index 2b0d94a..9303c18 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionButton.java @@ -1,6 +1,10 @@ package com.aizistral.nochatreports.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 net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.ImageButton; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java index 1ecbd34..89fa174 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionConfigScreen.java @@ -3,6 +3,8 @@ package com.aizistral.nochatreports.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 com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.vertex.PoseStack; import net.fabricmc.api.EnvType; diff --git a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java index 0882a0a..0c1b9f3 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/EncryptionWarningScreen.java @@ -1,6 +1,9 @@ package com.aizistral.nochatreports.gui; import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.gui.EncryptionConfigScreen; +import com.aizistral.nochatreports.gui.TriageWarningScreen; + import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.ChatFormatting; diff --git a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java index 3fb2b79..86120a4 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/RealmsWarningScreen.java @@ -1,6 +1,8 @@ package com.aizistral.nochatreports.gui; import com.aizistral.nochatreports.config.NCRConfig; +import com.aizistral.nochatreports.gui.TriageWarningScreen; + import net.minecraft.ChatFormatting; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java b/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java index 56817c6..03e31f9 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/TriageWarningScreen.java @@ -1,5 +1,6 @@ package com.aizistral.nochatreports.gui; +import com.aizistral.nochatreports.gui.AdaptiveWarningScreen; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.Util; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java index 36820a8..20c5604 100644 --- a/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java +++ b/src/main/java/com/aizistral/nochatreports/gui/UnsafeServerScreen.java @@ -4,6 +4,7 @@ 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 net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java index b023769..0238320 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatComponent.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.mixins.client; import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.EncryptionUtil; + import net.minecraft.ChatFormatting; import net.minecraft.client.GuiMessageTag; import net.minecraft.client.gui.components.ChatComponent; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java index 30ac570..675e642 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinChatListener.java @@ -8,6 +8,7 @@ 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 net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ChatScreen; import net.minecraft.client.multiplayer.chat.ChatListener; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java index 75e4705..73ec799 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinConnectScreen.java @@ -3,6 +3,7 @@ package com.aizistral.nochatreports.mixins.client; import com.aizistral.nochatreports.NoChatReports; import com.aizistral.nochatreports.config.NCRConfig; import com.aizistral.nochatreports.core.ServerSafetyState; + import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.ConnectScreen; import net.minecraft.client.gui.screens.Screen; diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java index 754db1f..969afd0 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinGuiMessageTag.java @@ -1,12 +1,13 @@ package com.aizistral.nochatreports.mixins.client; -import com.aizistral.nochatreports.config.NCRConfig; 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; + @Mixin(GuiMessageTag.class) public class MixinGuiMessageTag { diff --git a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java index 7da207f..fb0d66b 100644 --- a/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java +++ b/src/main/java/com/aizistral/nochatreports/mixins/client/MixinServerStatusPinger$1.java @@ -1,5 +1,7 @@ package com.aizistral.nochatreports.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; @@ -17,8 +19,18 @@ import net.minecraft.network.protocol.status.ServerStatus; @Mixin(targets = "net/minecraft/client/multiplayer/ServerStatusPinger$1") public class MixinServerStatusPinger$1 { - @Shadow @Final - private ServerData val$data; + private static final Field SERVER_DATA_FIELD; + + static { + // We use reflection here because Mixin's AP dies when trying to process @Shadow of this lol + try { + Class<?> pinger = Class.forName("net.minecraft.client.multiplayer.ServerStatusPinger$1"); + SERVER_DATA_FIELD = pinger.getDeclaredField("val$p_105460_"); + SERVER_DATA_FIELD.setAccessible(true); + } catch (Exception ex) { + throw new RuntimeException("Reflection failed in MixinServerStatusPinger$1", ex); + } + } /** * @reason Ensure "preventsChatReports" property is transferred from {@link ServerStatus} to @@ -29,14 +41,17 @@ public class MixinServerStatusPinger$1 { @Inject(method = "handleStatusResponse(Lnet/minecraft/network/protocol/status/ClientboundStatusResponsePacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/protocol/status/ServerStatus;getPlayers()Lnet/minecraft/network/protocol/status/ServerStatus$Players;", ordinal = 0, shift = At.Shift.BEFORE)) private void getNoChatReports(ClientboundStatusResponsePacket packet, CallbackInfo info) { - boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports(); - ((ServerDataExtension) this.val$data).setPreventsChatReports(preventsReports); - - if (NCRConfig.getCommon().enableDebugLog()) { - NoChatReports.LOGGER.info("Received status response packet from server, preventsChatReports: {}", - preventsReports); + try { + boolean preventsReports = ((ServerDataExtension) packet.getStatus()).preventsChatReports(); + ((ServerDataExtension) SERVER_DATA_FIELD.get(this)).setPreventsChatReports(preventsReports); + + if (NCRConfig.getCommon().enableDebugLog()) { + NoChatReports.LOGGER.info("Received status response packet from server, preventsChatReports: {}", + preventsReports); + } + } catch (IllegalArgumentException | IllegalAccessException ex) { + throw new RuntimeException("Failed to get ServerData field via reflection", ex); } - } } diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json index 82bf72c..c7c2bd0 100644 --- a/src/main/resources/nochatreports.mixins.json +++ b/src/main/resources/nochatreports.mixins.json @@ -39,5 +39,6 @@ ], "injectors": { "defaultRequire": 1 - } + }, + "refmap": "nochatreports.refmap.json" } diff --git a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java b/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java deleted file mode 100644 index 3d04e27..0000000 --- a/src/test/java/com/aizistral/nochatreports/debug/NoChatReportsDebug.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.aizistral.nochatreports.debug; - -import java.util.UUID; - -import com.mojang.authlib.minecraft.BanDetails; - -import net.fabricmc.api.ModInitializer; -import net.fabricmc.fabric.api.networking.v1.PacketSender; -import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents; -import net.minecraft.network.chat.Component; -import net.minecraft.server.MinecraftServer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; - -public final class NoChatReportsDebug implements ModInitializer { - @Override - public void onInitialize() { - ServerPlayConnectionEvents.JOIN.register(this::onPlayReady); - } - - private void onPlayReady(ServerGamePacketListenerImpl handler, PacketSender sender, MinecraftServer server) { - server.execute(() -> { - UnrealPlayer player = new UnrealPlayer(UUID.fromString("069a79f4-44e9-4726-a5be-fca90e38aaf5"), "Notch"); - //player.join(server, handler); - Component component = Component.Serializer.fromJson("{\"translate\":\"%s\",\"with\":[{\"extra\":[{\"clickEvent\":{\"action\":\"suggest_command\",\"value\":\"/tell Aizistral \"},\"hoverEvent\":{\"action\":\"show_entity\",\"contents\":{\"id\":\"bfa45411-874a-4ee0-b3bd-00c716059d95\",\"name\":{\"text\":\"Aizistral\"},\"type\":\"minecraft:player\"}},\"insertion\":\"Aizistral\",\"text\":\"Aizistral\"},{\"text\":\"> \"},{\"text\":\"['(9^~©²~.2>5¶(4,+:.9!¿¿\"}],\"text\":\"<\"},{\"text\":\"['(9^~©²~.2>5¶(4,+:.9!¿¿\"}]}"); - //player.sendSystem(server, handler, component); - - //player.sendMessage(server, handler, "This message is so real and legit", null); - - //UnrealPlayer.DEFAULT.join(server, handler); - //UnrealPlayer.DEFAULT.sendMessage(server, handler, "I'm definitely not gay", "§8I§a'§bM §cG§dA§eY"); - //UnrealPlayer.DEFAULT.sendMessage(server, handler, "gOODBYE LOL", null); - //UnrealPlayer.DEFAULT.leave(server, handler); - - //NoChatReports.LOGGER.info("Unreal player deployed"); - }); - } - - public static BanDetails getFakeBan() { - return null; - // return new BanDetails(UUID.fromString(Minecraft.getInstance().getUser().getUuid()), - // null, null, null); - } - -} diff --git a/src/test/java/com/aizistral/nochatreports/debug/ReportWriter.java b/src/test/java/com/aizistral/nochatreports/debug/ReportWriter.java deleted file mode 100644 index 538841b..0000000 --- a/src/test/java/com/aizistral/nochatreports/debug/ReportWriter.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.aizistral.nochatreports.debug; - -import java.io.BufferedWriter; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Date; - -import com.aizistral.nochatreports.debug.mixins.MixinAbuseReportSenderServices; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.ibm.icu.text.SimpleDateFormat; -import com.mojang.authlib.minecraft.client.ObjectMapper; -import com.mojang.authlib.yggdrasil.request.AbuseReportRequest; - -import net.fabricmc.loader.api.FabricLoader; - -/** - * Allows to save chat reports locally. See {@link MixinAbuseReportSenderServices} for details. - * - * @author Aizistral - */ - -public final class ReportWriter { - private static final ObjectMapper MAPPER = ObjectMapper.create(); - private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); - - public static void saveReport(AbuseReportRequest report) { - String string = MAPPER.writeValueAsString(report); - SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd_hh.mm.ss"); - Path path = FabricLoader.getInstance().getGameDir().resolve("intercepted-reports/report-" - + format.format(Date.from(report.report.createdTime)) + ".json"); - path.getParent().toFile().mkdirs(); - - try (BufferedWriter writer = Files.newBufferedWriter(path)) { - GSON.toJson(GSON.fromJson(string, Object.class), writer); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - -} diff --git a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java b/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java deleted file mode 100644 index 8681ae5..0000000 --- a/src/test/java/com/aizistral/nochatreports/debug/UnrealPlayer.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.aizistral.nochatreports.debug; - -import java.util.UUID; - -/** - * Exists solely to help with testing some of the features of the mod. - * You can use this to trick client into thinking there is another player - * on server, and send chat messages as if they are from that player. - * <br><br> - * DON'T FORGET TO TURN "convertToGameMessage" OFF! - * - * @author Aizistral - */ - -public class UnrealPlayer { - public static final UnrealPlayer DEFAULT = new UnrealPlayer(UUID.fromString("bfa45411-874a-4ee0-b3bd-00c716059d95"), "Aizistral"); - private final UUID id; - private final String name; - - public UnrealPlayer(UUID id, String name) { - this.id = id; - this.name = name; - } - - // public void join(MinecraftServer server, ServerGamePacketListenerImpl connection) { - // ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.ADD_PLAYER, - // this.getPlayer(server)); - // connection.send(packet); - // } - // - // public void leave(MinecraftServer server, ServerGamePacketListenerImpl connection) { - // ClientboundPlayerInfoPacket packet = new ClientboundPlayerInfoPacket(Action.REMOVE_PLAYER, - // this.getPlayer(server)); - // connection.send(packet); - // } - // - // public ServerPlayer getPlayer(MinecraftServer server) { - // return new ServerPlayer(server, server.overworld(), new GameProfile(this.id, this.name), null); - // } - // - // public void sendSystem(MinecraftServer server, ServerGamePacketListenerImpl connection, Component message) { - // ServerPlayer player = this.getPlayer(server); - // ClientboundSystemChatPacket packet = new ClientboundSystemChatPacket(message, false); - // connection.send(packet); - // } - // - // public void sendMessage(MinecraftServer server, ServerGamePacketListenerImpl connection, String message, @Nullable String unsigned) { - // ServerPlayer player = this.getPlayer(server); - // ClientboundPlayerChatPacket packet = new ClientboundPlayerChatPacket(new PlayerChatMessage( - // new SignedMessageHeader(MessageSignature.EMPTY, this.id), MessageSignature.EMPTY, - // new SignedMessageBody(new ChatMessageContent(message, Component.literal(message)), Instant.now(), 0, - // LastSeenMessages.EMPTY), unsigned != null ? Optional.of(Component.literal(unsigned)) - // : Optional.empty(), FilterMask.PASS_THROUGH), - // ChatType.bind(ChatType.CHAT, player).toNetwork(server.registryAccess())); - // - // - // // new ClientboundPlayerChatPacket(Component.literal(message), - // // unsigned != null ? Optional.of(Component.literal(unsigned)) : Optional.empty(), 0, - // // new ChatSender(this.id, Component.literal(this.name)), Instant.now(), - // // Crypt.SaltSignaturePair.EMPTY); - // connection.send(packet); - // } - -} diff --git a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java deleted file mode 100644 index a3e7339..0000000 --- a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinAbuseReportSenderServices.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.aizistral.nochatreports.debug.mixins; - -import java.util.UUID; -import java.util.concurrent.CompletableFuture; - -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Shadow; - -import com.aizistral.nochatreports.debug.ReportWriter; -import com.mojang.authlib.minecraft.report.AbuseReport; -import com.mojang.authlib.yggdrasil.request.AbuseReportRequest; -import com.mojang.datafixers.util.Unit; - -import net.minecraft.client.multiplayer.chat.report.AbuseReportSender; -import net.minecraft.client.multiplayer.chat.report.ReportEnvironment; - -@Mixin(AbuseReportSender.Services.class) -public class MixinAbuseReportSenderServices { - @Shadow @Final - private ReportEnvironment environment; - - /** - * @reason Write report locally instead of trying to send it to Mojang. - * Allows to intercept and examine contents of the report. - * @author Aizistral - */ - - @Overwrite - public CompletableFuture<Unit> send(UUID uuid, AbuseReport abuseReport) { - AbuseReportRequest abuseReportRequest = new AbuseReportRequest(1, uuid, - abuseReport, this.environment.clientInfo(), this.environment.thirdPartyServerInfo(), - this.environment.realmInfo()); - ReportWriter.saveReport(abuseReportRequest); - return CompletableFuture.supplyAsync(() -> Unit.INSTANCE); - } - -} diff --git a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinMinecraft.java b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinMinecraft.java deleted file mode 100644 index 34fcf9f..0000000 --- a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinMinecraft.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.aizistral.nochatreports.debug.mixins; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; - -import com.aizistral.nochatreports.debug.NoChatReportsDebug; -import com.mojang.authlib.minecraft.BanDetails; - -import net.minecraft.client.Minecraft; - -@Mixin(Minecraft.class) -public class MixinMinecraft { - /** - * Replaces real ban screen with a fake one for testing. - * @return Fake ban screen - * @reason Testing - * @author Aizistral - */ - @Overwrite - public BanDetails multiplayerBan() { - return NoChatReportsDebug.getFakeBan(); - } - -} diff --git a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinPlayerEntry.java b/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinPlayerEntry.java deleted file mode 100644 index e7e4cfc..0000000 --- a/src/test/java/com/aizistral/nochatreports/debug/mixins/MixinPlayerEntry.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.aizistral.nochatreports.debug.mixins; - -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -import net.minecraft.client.gui.screens.social.PlayerEntry; -import net.minecraft.client.multiplayer.chat.report.AbuseReportSender; - -@Mixin(PlayerEntry.class) -public class MixinPlayerEntry { - - /** - * @reason Always allow to report players on server, even if services are - * unreachable (which they are in IDE). Useful when used along with - * {@link MixinAbuseReportSenderServices}. - * @author Aizistral - */ - - @Redirect(method = "<init>", at = @At(value = "INVOKE", target = - "Lnet/minecraft/client/multiplayer/chat/report/AbuseReportSender;isEnabled()Z")) - private boolean forceEnableReporting(AbuseReportSender sender) { - return true; - } - -} diff --git a/src/test/resources/NCR_logo.png b/src/test/resources/NCR_logo.png Binary files differdeleted file mode 100644 index 9427c0b..0000000 --- a/src/test/resources/NCR_logo.png +++ /dev/null diff --git a/src/test/resources/assets/minecraft/textures/gui/title/edition.png b/src/test/resources/assets/minecraft/textures/gui/title/edition.png Binary files differdeleted file mode 100644 index 09004f4..0000000 --- a/src/test/resources/assets/minecraft/textures/gui/title/edition.png +++ /dev/null diff --git a/src/test/resources/fabric.mod.json b/src/test/resources/fabric.mod.json deleted file mode 100644 index d364a5f..0000000 --- a/src/test/resources/fabric.mod.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "schemaVersion": 1, - "id": "nochatreportstest", - "version": "${version}", - - "name": "No Chat Reports Test", - "description": "Testmod", - "authors": [ - "Aizistral" - ], - "contact": { - "homepage": "https://www.curseforge.com/minecraft/mc-mods/no-chat-reports", - "sources": "https://github.com/Aizistral-Studios/No-Chat-Reports" - }, - - "license": "WTFPL", - "icon": "NCR_logo.png", - - "environment": "*", - "entrypoints": { - "main": [ - "com.aizistral.nochatreports.debug.NoChatReportsDebug" - ] - }, - "mixins": [ - "nochatreportstest.mixins.json" - ], - - "depends": { - "fabricloader": ">=0.14.6", - "fabric": "*", - "minecraft": "~1.19", - "java": ">=17" - }, - "suggests": {} -} |
