diff options
| author | Aizistral | 2022-06-17 14:46:34 +0200 |
|---|---|---|
| committer | Aizistral | 2022-06-17 14:46:34 +0200 |
| commit | 23a48f6909a66c2c3487bdef066d28048717d503 (patch) | |
| tree | d6314af998fecf0befb7b66a6cfcffe9f31f003f | |
THE WAY IS LIT, THE PATH IS CLEAR
25 files changed, 933 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4981644 --- /dev/null +++ b/.gitignore @@ -0,0 +1,34 @@ +# 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*
\ No newline at end of file @@ -0,0 +1,11 @@ +DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +Version 2, December 2004 + +Everyone is permitted to copy and distribute verbatim or modified +copies of this license document, and changing it is allowed as long +as the name is changed. + +DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE +TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + +0. You just DO WHAT THE FUCK YOU WANT TO. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..8210250 --- /dev/null +++ b/build.gradle @@ -0,0 +1,215 @@ +buildscript { + repositories { + mavenLocal() + maven { url = 'https://maven.minecraftforge.net' } + maven { url = 'https://dist.creeper.host/Sponge/maven' } + maven { url 'https://plugins.gradle.org/m2/' } + mavenCentral() + maven { + url = 'https://repo.spongepowered.org/repository/maven-public/' + content { includeGroup "org.spongepowered" } + } + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + classpath 'gradle.plugin.com.matthewprenger:CurseGradle:1.4.0' + classpath group: 'org.spongepowered', name: 'mixingradle', version: '0.7-SNAPSHOT' + } +} + +println("Applying plugins...") + +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'maven-publish' +apply plugin: 'com.matthewprenger.cursegradle' +apply plugin: 'org.spongepowered.mixin' + +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) + +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')) + +mixin { + println("Specifying refmaps for Mixin...") + + add sourceSets.main, "nochatreports.refmap.json" +} + +minecraft { + println("Specifying MCP mappings...") + mappings channel: 'official', version: '1.19' + println("Specifying Access Transformer configuration...") + // accessTransformer = file('src/main/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.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' + annotationProcessor 'com.google.code.gson:gson:2.8.0' + annotationProcessor 'com.google.guava:guava:21.0' + annotationProcessor 'org.ow2.asm:asm-tree:7.2' + annotationProcessor 'org.ow2.asm:asm-commons:7.2' + annotationProcessor 'org.ow2.asm:asm-util:7.2' +} + + +jar { + 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"), + "MixinConnector": "${project.group}.MixinConnector" + ]) + } +} + +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') ?: 0 + + id = "${curse_id}" + releaseType = "${curse_release}" + changelogType = 'html' + changelog = file('docs/changelog.html') + + addGameVersion '1.18' + addGameVersion '1.18.1' + + //addArtifact(sourcesJar) + //addArtifact(apiJar) + } +} + + + +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/docs/META-INF/mods.toml b/docs/META-INF/mods.toml new file mode 100644 index 0000000..c8d50fb --- /dev/null +++ b/docs/META-INF/mods.toml @@ -0,0 +1,27 @@ +license="${mod_license}" +modLoader="javafml" +loaderVersion="[31,)" +issueTrackerURL="${issue_tracker_url}" +[[mods]] +modId="${mod_id}" +version="${mod_version}" +displayName="${mod_name}" +displayURL="${mod_url}" +logoFile="${mod_icon}" +credits="${mod_credits}" +authors="${mod_author}" +description=''' +${mod_description} +''' +[[dependencies.${mod_id}]] + modId="forge" + mandatory=true + versionRange="${dep_forge}" + ordering="NONE" + side="BOTH" +[[dependencies.${mod_id}]] + modId="minecraft" + mandatory=true + versionRange="${dep_minecraft}" + ordering="NONE" + side="BOTH" diff --git a/docs/README.md b/docs/README.md new file mode 100644 index 0000000..5ad79e9 --- /dev/null +++ b/docs/README.md @@ -0,0 +1,9 @@ +# No Chat Reports + +**Current Version:** 1.19-v1.0.0 + +**Minecraft Version:** 1.19.x + +**Forge Version:** 41.0.0 or later. + +Stripts cryptographic signatures from player messages, making it impossible to track and associate them with your Mojang/Microsoft account, as well as use Player Chat Reporting feature.
\ No newline at end of file diff --git a/docs/changelog.html b/docs/changelog.html new file mode 100644 index 0000000..bd11633 --- /dev/null +++ b/docs/changelog.html @@ -0,0 +1,6 @@ +<h3><b>The Changelog:</b></h3><br/> + +<h5><b>[Release 1.19-v1.0.0]:</b></h5> +<p> + - Initial release. +<p/> diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..821928e --- /dev/null +++ b/gradle.properties @@ -0,0 +1,32 @@ +# Gradle +org.gradle.jvmargs=-Xmx4G +org.gradle.daemon=false + +# Mod +mod_version=1.19-v1.0.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,1.19.1) + +# Dependencies specifications for build.gradle +version_mc=1.19 +version_forge=1.19-41.0.35 +version_mcp=1.19 + +# CurseGradle +curse_id=634062 +curse_release=release
\ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differnew file mode 100644 index 0000000..7a3265e --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e7fa367 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/main/java/com/aizistral/nochatreports/MixinConnector.java b/src/main/java/com/aizistral/nochatreports/MixinConnector.java new file mode 100644 index 0000000..dc2b9a6 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/MixinConnector.java @@ -0,0 +1,13 @@ +package com.aizistral.nochatreports; + +import org.spongepowered.asm.mixin.Mixins; +import org.spongepowered.asm.mixin.connect.IMixinConnector; + +public class MixinConnector implements IMixinConnector { + + @Override + public void connect() { + Mixins.addConfigurations("nochatreports.mixins.json"); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/NoChatReports.java b/src/main/java/com/aizistral/nochatreports/NoChatReports.java new file mode 100644 index 0000000..adaf08b --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/NoChatReports.java @@ -0,0 +1,70 @@ +package com.aizistral.nochatreports; + +import java.util.function.Predicate; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +import com.aizistral.nochatreports.handlers.NoReportsConfig; + +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.config.ModConfig; +import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent; +import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent; +import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent; +import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; +import net.minecraftforge.network.NetworkRegistry; +import net.minecraftforge.network.simple.SimpleChannel; + +@Mod(NoChatReports.MODID) +public class NoChatReports { + public static final String MODID = "nochatreports"; + public static final Logger LOGGER = LogManager.getLogger(); + private static final String PTC_VERSION = "1"; + private static final Predicate<String> ANY = obj -> true; + private static SimpleChannel packetInstance; + + public NoChatReports() { + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::doClientStuff); + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onLoadComplete); + + MinecraftForge.EVENT_BUS.register(this); + + NoReportsConfig.loadConfig(); + } + + private void onLoadComplete(final FMLLoadCompleteEvent event) { + // NO-OP + } + + private void setup(final FMLCommonSetupEvent event) { + packetInstance = NetworkRegistry.ChannelBuilder.named(new ResourceLocation(MODID, "main")) + .networkProtocolVersion(() -> PTC_VERSION) + .clientAcceptedVersions(NoReportsConfig.demandsOnServer() ? PTC_VERSION::equals : ANY) + .serverAcceptedVersions(NoReportsConfig.demandsOnClient() ? PTC_VERSION::equals : ANY) + .simpleChannel(); + } + + private void doClientStuff(final FMLClientSetupEvent event) { + // NO-OP + } + + private void enqueueIMC(final InterModEnqueueEvent event) { + // NO-OP + } + + private void processIMC(final InterModProcessEvent event) { + // NO-OP + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java new file mode 100644 index 0000000..2a9068a --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/handlers/NoReportsConfig.java @@ -0,0 +1,64 @@ +package com.aizistral.nochatreports.handlers; + +import java.io.File; +import java.io.FileReader; +import java.io.FileWriter; +import java.io.IOException; +import java.util.Optional; + +import javax.annotation.Nullable; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.fml.loading.FMLPaths; + +public class NoReportsConfig { + private static final File CONFIG_FOLDER = FMLPaths.CONFIGDIR.get().toFile(); + private static final File CONFIG_FILE = new File(CONFIG_FOLDER, "NoChatReports.json"); + private static NoReportsConfig INSTANCE; + private boolean demandOnClient, demandOnServer; + + public static void loadConfig() { + INSTANCE = readFile(); + + if (INSTANCE == null) { + INSTANCE = new NoReportsConfig(); + INSTANCE.demandOnServer = true; + } + + writeFile(INSTANCE); + } + + @Nullable + private static NoReportsConfig readFile() { + if (!CONFIG_FILE.exists() || !CONFIG_FILE.isFile()) + return null; + + try (FileReader reader = new FileReader(CONFIG_FILE)) { + NoReportsConfig transience = new Gson().fromJson(reader, NoReportsConfig.class); + return transience; + } catch (IOException ex) { + throw new RuntimeException(ex); + } + } + + private static void writeFile(NoReportsConfig instance) { + try (FileWriter writer = new FileWriter(CONFIG_FILE)) { + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + gson.toJson(instance, writer); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + } + + public static boolean demandsOnClient() { + return INSTANCE.demandOnClient; + } + + public static boolean demandsOnServer() { + return INSTANCE.demandOnServer; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java new file mode 100644 index 0000000..396832a --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinClientPacketListener.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.client.multiplayer.ClientPacketListener; +import net.minecraft.client.multiplayer.PlayerInfo; +import net.minecraft.network.chat.PlayerChatMessage; + +@Mixin(ClientPacketListener.class) +public class MixinClientPacketListener { + + /** + * @reason Prevents client from trying to validate chat messages relayed + * by the server. They will come unsigned as in good old days, so no point. + * @author Aizistral + */ + @Overwrite + private boolean hasValidSignature(PlayerChatMessage message, PlayerInfo info) { + return true; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java new file mode 100644 index 0000000..24ed9d0 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinLocalPlayer.java @@ -0,0 +1,41 @@ +package com.aizistral.nochatreports.mixins; + +import javax.annotation.Nullable; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import com.mojang.brigadier.ParseResults; + +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.commands.SharedSuggestionProvider; +import net.minecraft.commands.arguments.ArgumentSignatures; +import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MessageSignature; +import net.minecraft.network.chat.MessageSigner; + +@Mixin(LocalPlayer.class) +public class MixinLocalPlayer { + + /** + * @reason Never sign messages, so that neither server nor other clients have + * proof of them being sent from your account. + * @author Aizistral + */ + + @Overwrite + private MessageSignature signMessage(MessageSigner signer, Component message) { + return MessageSignature.unsigned(); + } + + /** + * @reason Same as above, except commands mostly concern only server. + * @author Aizistral + */ + + @Overwrite + private ArgumentSignatures signCommandArguments(MessageSigner signer, ParseResults<SharedSuggestionProvider> results, @Nullable Component component) { + return ArgumentSignatures.empty(); + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java new file mode 100644 index 0000000..78c0343 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinOptions.java @@ -0,0 +1,36 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import com.google.common.collect.ImmutableList; +import com.mojang.serialization.Codec; + +import net.minecraft.client.OptionInstance; +import net.minecraft.client.Options; +import net.minecraft.network.chat.CommonComponents; +import net.minecraft.network.chat.Component; + +@Mixin(Options.class) +public class MixinOptions { + private OptionInstance<Boolean> alternativeOption; + + /** + * @reason Disable secure chat option, since it will not work anyways. + * @author Aizistral + */ + + @Overwrite + public OptionInstance<Boolean> onlyShowSecureChat() { + if (this.alternativeOption == null) { + this.alternativeOption = new OptionInstance<>("options.onlyShowSecureChat", + OptionInstance.cachedConstantTooltip(Component.translatable("gui.nochatreport.secureChat")), + (component, value) -> { + return value ? CommonComponents.OPTION_ON : CommonComponents.OPTION_OFF; + }, new OptionInstance.Enum<>(ImmutableList.of(Boolean.FALSE), Codec.BOOL), false, (value) -> {}); + } + + return this.alternativeOption; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java new file mode 100644 index 0000000..e4326fa --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinPlayer.java @@ -0,0 +1,23 @@ +package com.aizistral.nochatreports.mixins; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.ProfilePublicKey; + +@Mixin(Player.class) +public class MixinPlayer { + + /** + * @reason Prevents server from trying to validate signatures on incoming + * chat messages. Also prevents it from relaying public keys to other clients. + * @author Aizistral + */ + + @Overwrite + public ProfilePublicKey getProfilePublicKey() { + return null; + } + +} diff --git a/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java new file mode 100644 index 0000000..d1f1814 --- /dev/null +++ b/src/main/java/com/aizistral/nochatreports/mixins/MixinServerboundChatPacket.java @@ -0,0 +1,26 @@ +package com.aizistral.nochatreports.mixins; + +import java.util.UUID; + +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +import net.minecraft.network.chat.MessageSignature; +import net.minecraft.network.protocol.game.ServerboundChatPacket; + +@Mixin(ServerboundChatPacket.class) +public class MixinServerboundChatPacket { + + /** + * @reason Strip signatures before relaying messages to other clients, + * if they somehow arrive signed. This is important for mod to be able + * to operate in server-only mode. + * @author Aizistral + */ + + @Overwrite + public MessageSignature getSignature(UUID uuid) { + return MessageSignature.unsigned(); + } + +} diff --git a/src/main/resources/META-INF/MANIFEST.MF b/src/main/resources/META-INF/MANIFEST.MF new file mode 100644 index 0000000..520b722 --- /dev/null +++ b/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1 @@ +MixinConnector: com.aizistral.nochatreports.MixinConnector diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..d3afb8e --- /dev/null +++ b/src/main/resources/META-INF/mods.toml @@ -0,0 +1,12 @@ +license="WTFPL" +modLoader="javafml" +loaderVersion="[31,)" +[[mods]] +modId="nochatreports" +version="1.0.0" +displayName="No Chat Reports" +authors="Aizistral" +logoFile="NCR_logo.png" +description=''' +None +'''
\ No newline at end of file diff --git a/src/main/resources/NCR_logo.png b/src/main/resources/NCR_logo.png Binary files differnew file mode 100644 index 0000000..433dc42 --- /dev/null +++ b/src/main/resources/NCR_logo.png diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json new file mode 100644 index 0000000..28caa07 --- /dev/null +++ b/src/main/resources/assets/nochatreports/lang/en_us.json @@ -0,0 +1,3 @@ +{ + "gui.nochatreport.secureChat": "This option cannot work with No Chat Reports, since there are no signatures to verify." +}
\ No newline at end of file diff --git a/src/main/resources/nochatreports.mixins.json b/src/main/resources/nochatreports.mixins.json new file mode 100644 index 0000000..aa3858a --- /dev/null +++ b/src/main/resources/nochatreports.mixins.json @@ -0,0 +1,20 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "com.aizistral.nochatreports.mixins", + "compatibilityLevel": "JAVA_17", + "refmap": "nochatreports.refmap.json", + "verbose": true, + "mixins": [ + "MixinPlayer", + "MixinServerboundChatPacket" + ], + "client": [ + "MixinLocalPlayer", + "MixinClientPacketListener", + "MixinOptions" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..1a52c3a --- /dev/null +++ b/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "No Chat Reports Resources", + "pack_format": 6 + } +} |
