commit ce0695d6f9ad0ba90f8798214f9ee5f92e7fb2da Author: Aizistral Date: Sun Jan 25 00:59:03 2026 +0100 Time to snort some caffeine baby 🚀 🚀 🚀 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ae46002 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.launch +.settings +.metadata +.classpath +.project diff --git a/Fabric/.gitattributes b/Fabric/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/Fabric/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/Fabric/.gitignore b/Fabric/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/Fabric/.gitignore @@ -0,0 +1,40 @@ +# gradle + +.gradle/ +build/ +out/ +classes/ + +# eclipse + +*.launch + +# idea + +.idea/ +*.iml +*.ipr +*.iws + +# vscode + +.settings/ +.vscode/ +bin/ +.classpath +.project + +# macos + +*.DS_Store + +# fabric + +run/ + +# java + +hs_err_*.log +replay_*.log +*.hprof +*.jfr diff --git a/Fabric/build.gradle b/Fabric/build.gradle new file mode 100644 index 0000000..62742c5 --- /dev/null +++ b/Fabric/build.gradle @@ -0,0 +1,56 @@ +plugins { + id 'net.fabricmc.fabric-loom-remap' version "${loom_version}" + id 'maven-publish' +} + +version = project.mod_version +group = project.maven_group + +base { + archivesName = project.archives_base_name +} + +repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings loom.officialMojangMappings() + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" + + // Fabric API. This is technically optional, but you probably want it anyway. + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}" + +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": inputs.properties.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 8 +} + +java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +jar { + inputs.property "archivesName", project.base.archivesName +} \ No newline at end of file diff --git a/Fabric/gradle.properties b/Fabric/gradle.properties new file mode 100644 index 0000000..4edb3dc --- /dev/null +++ b/Fabric/gradle.properties @@ -0,0 +1,20 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx4G +org.gradle.parallel=true + +# IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 +org.gradle.configuration-cache=false + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.16.4 +loader_version=0.18.4 +loom_version=1.15-SNAPSHOT + +# Mod Properties +mod_version=Fabric-MC1.16.4-v1.0.0 +maven_group=com.aizistral.nochatrestrictions +archives_base_name=nochatrestrictions + +# Dependencies +fabric_api_version=0.42.0+1.16 \ No newline at end of file diff --git a/Fabric/gradle/wrapper/gradle-wrapper.jar b/Fabric/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..61285a6 Binary files /dev/null and b/Fabric/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Fabric/gradle/wrapper/gradle-wrapper.properties b/Fabric/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..19a6bde --- /dev/null +++ b/Fabric/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/Fabric/gradlew b/Fabric/gradlew new file mode 100644 index 0000000..adff685 --- /dev/null +++ b/Fabric/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# 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 +# +# https://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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# 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 ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/Fabric/gradlew.bat b/Fabric/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/Fabric/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@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=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@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="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 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! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/Fabric/settings.gradle b/Fabric/settings.gradle new file mode 100644 index 0000000..75c4d72 --- /dev/null +++ b/Fabric/settings.gradle @@ -0,0 +1,10 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/Fabric/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java new file mode 100644 index 0000000..5924e06 --- /dev/null +++ b/Fabric/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java @@ -0,0 +1,12 @@ +package com.aizistral.nochatrestrictions; + +import net.fabricmc.api.ModInitializer; + +public class NoChatRestrictions implements ModInitializer { + + @Override + public void onInitialize() { + // NO-OP + } + +} \ No newline at end of file diff --git a/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/NCRCore.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/NCRCore.java new file mode 100644 index 0000000..40521d3 --- /dev/null +++ b/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/NCRCore.java @@ -0,0 +1,8 @@ +package com.aizistral.nochatrestrictions.core; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class NCRCore { + public static final Logger LOGGER = LogManager.getLogger("NoChatRestrictions"); +} diff --git a/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/WrappedSocialInteractionsService.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/WrappedSocialInteractionsService.java new file mode 100644 index 0000000..c761c9c --- /dev/null +++ b/Fabric/src/main/java/com/aizistral/nochatrestrictions/core/WrappedSocialInteractionsService.java @@ -0,0 +1,36 @@ +package com.aizistral.nochatrestrictions.core; + +import java.util.UUID; +import com.mojang.authlib.minecraft.SocialInteractionsService; + +public class WrappedSocialInteractionsService implements SocialInteractionsService { + private final SocialInteractionsService service; + + public WrappedSocialInteractionsService(SocialInteractionsService service) { + if (service == null) + throw new NullPointerException("'service' argument cannot be null!"); + + this.service = service; + } + + @Override + public boolean serversAllowed() { + return true; + } + + @Override + public boolean realmsAllowed() { + return true; + } + + @Override + public boolean chatAllowed() { + return true; + } + + @Override + public boolean isBlockedPlayer(UUID playerID) { + return this.service.isBlockedPlayer(playerID); + } + +} diff --git a/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java b/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java new file mode 100644 index 0000000..86c35d4 --- /dev/null +++ b/Fabric/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java @@ -0,0 +1,29 @@ +package com.aizistral.nochatrestrictions.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.CallbackInfoReturnable; + +import com.aizistral.nochatrestrictions.core.NCRCore; +import com.aizistral.nochatrestrictions.core.WrappedSocialInteractionsService; +import com.mojang.authlib.minecraft.SocialInteractionsService; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; + +import net.minecraft.client.Minecraft; +import net.minecraft.client.main.GameConfig; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Inject(method = { "func_244735_a", "createSocialInteractions" }, at = @At("RETURN"), cancellable = true) + public void onCreateSocialInteractions(YggdrasilAuthenticationService authService, GameConfig gameConfig, + CallbackInfoReturnable info) { + SocialInteractionsService returnedService = info.getReturnValue(); + assert returnedService != null; + info.setReturnValue(new WrappedSocialInteractionsService(returnedService)); + + NCRCore.LOGGER.info("Successfully supplanted SocialInteractionsService with a wrapped version."); + } + +} diff --git a/Fabric/src/main/resources/fabric.mod.json b/Fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..f6bdf17 --- /dev/null +++ b/Fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,31 @@ +{ + "schemaVersion": 1, + "id": "nochatrestrictions", + "version": "${version}", + "name": "No Chat Restrictions", + "description": "A mod dedicated to removing restrictions around the use of multiplayer features, including in-game chat.", + "authors": [ + "Aizistral" + ], + "contact": { + "homepage": "https://modrinth.com/project/no-chat-restrictions", + "sources": "https://github.com/Aizistral-Studios/No-Chat-Restrictions", + "issues": "https://github.com/Aizistral-Studios/No-Chat-Restrictions/issues" + }, + "license": "WTFPL", + "environment": "*", + "entrypoints": { + "main": [ + "com.aizistral.nochatrestrictions.NoChatRestrictions" + ] + }, + "mixins": [ + "nochatrestrictions.mixins.json" + ], + "depends": { + "fabricloader": ">=0.18.4", + "minecraft": "~1.16.4", + "java": ">=8", + "fabric": "*" + } +} \ No newline at end of file diff --git a/Fabric/src/main/resources/nochatrestrictions.mixins.json b/Fabric/src/main/resources/nochatrestrictions.mixins.json new file mode 100644 index 0000000..18b9f1c --- /dev/null +++ b/Fabric/src/main/resources/nochatrestrictions.mixins.json @@ -0,0 +1,16 @@ +{ + "required": true, + "package": "com.aizistral.nochatrestrictions.mixins", + "compatibilityLevel": "JAVA_8", + "minVersion": "0.8", + "mixins": [], + "client": [ + "MixinMinecraft" + ], + "injectors": { + "defaultRequire": 1 + }, + "overwrites": { + "requireAnnotations": true + } +} \ No newline at end of file diff --git a/Forge/.gitattributes b/Forge/.gitattributes new file mode 100644 index 0000000..f811f6a --- /dev/null +++ b/Forge/.gitattributes @@ -0,0 +1,5 @@ +# Disable autocrlf on generated files, they always generate with LF +# Add any extra files or paths here to make git stop saying they +# are changed when only line endings change. +src/generated/**/.cache/cache text eol=lf +src/generated/**/*.json text eol=lf diff --git a/Forge/.gitignore b/Forge/.gitignore new file mode 100644 index 0000000..12f8644 --- /dev/null +++ b/Forge/.gitignore @@ -0,0 +1,25 @@ +# eclipse +bin +*.launch +.settings +.metadata +.classpath +.project + +# idea +out +*.ipr +*.iws +*.iml +.idea + +# gradle +build +.gradle + +# other +eclipse +run + +# Files from Forge MDK +forge*changelog.txt diff --git a/Forge/build.gradle b/Forge/build.gradle new file mode 100644 index 0000000..15d21c0 --- /dev/null +++ b/Forge/build.gradle @@ -0,0 +1,99 @@ +buildscript { + repositories { + maven { url = 'https://files.minecraftforge.net/maven' } + maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } + mavenCentral() + jcenter() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true + classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT' + } +} + +apply plugin: 'net.minecraftforge.gradle' +apply plugin: 'eclipse' +apply plugin: 'idea' +apply plugin: 'maven-publish' +apply plugin: 'org.spongepowered.mixin' + +mixin { + add sourceSets.main, "nochatrestrictions.refmap.json" +} + +version = project.modVersion +group = 'com.aizistral.nochatrestrictions' +archivesBaseName = 'NoChatRestrictions' + +sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' + +println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch')) + +minecraft { + mappings channel: 'snapshot', version: '20201028-1.16.3' + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') + + runs { + client { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + arg "-mixin.config=nochatrestrictions.mixins.json" + + mods { + nochatrestrictions { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP' + property 'forge.logging.console.level', 'debug' + arg "-mixin.config=nochatrestrictions.mixins.json" + + mods { + nochatrestrictions { + source sourceSets.main + } + } + } + } +} + +repositories { + maven { url = "https://repo.spongepowered.org/maven" } + mavenCentral() + jcenter() +} + +dependencies { + minecraft 'net.minecraftforge:forge:1.16.4-35.1.37' + annotationProcessor 'org.spongepowered:mixin:0.8' + 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 { + manifest { + attributes([ + "Specification-Title": "NoChatRestrictions", + "Specification-Vendor": "Aizistral", + "Specification-Version": project.version, + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" :"NoChatRestrictions", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ"), + "TweakClass": "org.spongepowered.asm.launch.MixinTweaker", + "TweakOrder": 0, + "MixinConfigs" : "nochatrestrictions.mixins.json" + ]) + } +} + +jar.finalizedBy('reobfJar') \ No newline at end of file diff --git a/Forge/gradle.properties b/Forge/gradle.properties new file mode 100644 index 0000000..9d4e194 --- /dev/null +++ b/Forge/gradle.properties @@ -0,0 +1,6 @@ +# Sets default memory used for gradle commands. Can be overridden by user or command line properties. +# This is required to provide enough memory for the Minecraft decompilation process. +org.gradle.jvmargs=-Xmx4G +org.gradle.daemon=false + +modVersion=Forge-MC1.16.4-v1.0.0 \ No newline at end of file diff --git a/Forge/gradle/wrapper/gradle-wrapper.jar b/Forge/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..7a3265e Binary files /dev/null and b/Forge/gradle/wrapper/gradle-wrapper.jar differ diff --git a/Forge/gradle/wrapper/gradle-wrapper.properties b/Forge/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..1d5b29f --- /dev/null +++ b/Forge/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-4.10.3-bin.zip diff --git a/Forge/gradlew b/Forge/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/Forge/gradlew @@ -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/Forge/gradlew.bat b/Forge/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/Forge/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/Forge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java new file mode 100644 index 0000000..bb21a2c --- /dev/null +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/NoChatRestrictions.java @@ -0,0 +1,12 @@ +package com.aizistral.nochatrestrictions; + +import net.minecraftforge.fml.common.Mod; + +@Mod("nochatrestrictions") +public class NoChatRestrictions { + + public NoChatRestrictions() { + // NO-OP + } + +} diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/core/NCRCore.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/NCRCore.java new file mode 100644 index 0000000..40521d3 --- /dev/null +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/NCRCore.java @@ -0,0 +1,8 @@ +package com.aizistral.nochatrestrictions.core; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; + +public class NCRCore { + public static final Logger LOGGER = LogManager.getLogger("NoChatRestrictions"); +} diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedSocialInteractionsService.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedSocialInteractionsService.java new file mode 100644 index 0000000..c761c9c --- /dev/null +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/core/WrappedSocialInteractionsService.java @@ -0,0 +1,36 @@ +package com.aizistral.nochatrestrictions.core; + +import java.util.UUID; +import com.mojang.authlib.minecraft.SocialInteractionsService; + +public class WrappedSocialInteractionsService implements SocialInteractionsService { + private final SocialInteractionsService service; + + public WrappedSocialInteractionsService(SocialInteractionsService service) { + if (service == null) + throw new NullPointerException("'service' argument cannot be null!"); + + this.service = service; + } + + @Override + public boolean serversAllowed() { + return true; + } + + @Override + public boolean realmsAllowed() { + return true; + } + + @Override + public boolean chatAllowed() { + return true; + } + + @Override + public boolean isBlockedPlayer(UUID playerID) { + return this.service.isBlockedPlayer(playerID); + } + +} diff --git a/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java b/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java new file mode 100644 index 0000000..674acc6 --- /dev/null +++ b/Forge/src/main/java/com/aizistral/nochatrestrictions/mixins/MixinMinecraft.java @@ -0,0 +1,31 @@ +package com.aizistral.nochatrestrictions.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 org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +import com.aizistral.nochatrestrictions.core.NCRCore; +import com.aizistral.nochatrestrictions.core.WrappedSocialInteractionsService; +import com.mojang.authlib.minecraft.SocialInteractionsService; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilSocialInteractionsService; + +import net.minecraft.client.GameConfiguration; +import net.minecraft.client.Minecraft; + +@Mixin(Minecraft.class) +public class MixinMinecraft { + + @Inject(method = { "func_244735_a", "createSocialInteractions" }, at = @At("RETURN"), cancellable = true) + public void onCreateSocialInteractions(YggdrasilAuthenticationService authService, GameConfiguration gameConfig, + CallbackInfoReturnable info) { + SocialInteractionsService returnedService = info.getReturnValue(); + assert returnedService != null; + info.setReturnValue(new WrappedSocialInteractionsService(returnedService)); + + NCRCore.LOGGER.info("Successfully supplanted SocialInteractionsService with a wrapped version."); + } + +} diff --git a/Forge/src/main/resources/META-INF/mods.toml b/Forge/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..3657180 --- /dev/null +++ b/Forge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,25 @@ +modLoader="javafml" +loaderVersion="[35,)" +license="WTFPL" +issueTrackerURL="https://github.com/Aizistral-Studios/No-Chat-Restrictions/issues" + +[[mods]] +modId="nochatrestrictions" +version="${file.jarVersion}" +displayName="No Chat Restrictions" +displayURL="https://modrinth.com/project/no-chat-restrictions" +authors="Aizistral" +description="A mod dedicated to removing restrictions around the use of multiplayer features, including in-game chat." + +[[dependencies.nochatrestrictions]] + modId="forge" + mandatory=true + versionRange="[35,)" + ordering="NONE" + side="BOTH" +[[dependencies.nochatrestrictions]] + modId="minecraft" + mandatory=true + versionRange="[1.16.4,1.17)" + ordering="NONE" + side="BOTH" diff --git a/Forge/src/main/resources/nochatrestrictions.mixins.json b/Forge/src/main/resources/nochatrestrictions.mixins.json new file mode 100644 index 0000000..63cc278 --- /dev/null +++ b/Forge/src/main/resources/nochatrestrictions.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "package": "com.aizistral.nochatrestrictions.mixins", + "compatibilityLevel": "JAVA_8", + "minVersion": "0.8", + "refmap": "nochatrestrictions.refmap.json", + "mixins": [], + "client": [ + "MixinMinecraft" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/Forge/src/main/resources/pack.mcmeta b/Forge/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..8f48285 --- /dev/null +++ b/Forge/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "NoChatRestrictions Resources", + "pack_format": 6 + } +} diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..d474e19 --- /dev/null +++ b/LICENSE @@ -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. \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..ee57451 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# No Chat Restrictions + +A Minecraft mod dedicated to removing restrictions around the use of multiplayer features, including in-game chat. \ No newline at end of file