commit 888e2d60cc0fd6816957aa11f03a4253672a060c Author: TheWhiteDog9487 Date: Wed Oct 18 15:48:48 2023 +0800 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c476faf --- /dev/null +++ b/.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/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..dfca670 --- /dev/null +++ b/README.md @@ -0,0 +1,29 @@ +# 介绍 +本模组意在修复一个2021年11月26号被报告但一直未修复的Bug +[漏洞追踪器链接](https://bugs.mojang.com/browse/MC-242809) + +# 为什么会有这个模组 +前几个月吧，我想玩一个服务器。从那个服务器的官网把地址复制下来，粘贴到“服务器地址”中保存之后，居然出现了“未知的主机”。 +莫慌，这显然是DNS没查找到对应的地址，先Ping一下。 +Ping能找到域名对应的地址，然后我有怀疑是长城又在搞什么，用站长之家的工具测了一下，所有的结果和我的都是一样的啊。 +这就比较奇怪了。 +然后在折腾了一段时间之后，我发现了问题。 +**我复制到的服务器地址的末尾，有一个空格。** +这就很难绷了啊，再继续折腾了一段时间，确认问题能够稳定复现之后，我去漏洞追踪器提交了一个Bug。 +结果您猜怎么着？ +![漏洞追踪器上提的问题](./图片/Snipaste_2023-10-18_15-22-39.png) +![下面的评论](./图片/Snipaste_2023-10-18_15-22-47.png) +![更早的一个问题报告](./图片/Snipaste_2023-10-18_15-22-57.png) +我英语完全不行，就没继续说下去了，问题描述都是用翻译写的。 +但是吧，我打心里觉得这事多少有点离谱。 +既然你的地址是String类，那在后面调用一下trim方法很难吗？ +而且，我作为一个玩家，你跟我说，“这都是你自己不小心，这根本就不能算是个Bug“，我是不能接受的。 +**所以，有了这个模组。** + +# 已知问题 +- 必须在服务器MOTD被加载出来之后，才能使用刷新按钮，不然被弄掉的空格自己又会回来，我也不知道为什么。 + +如果有谁愿意帮我把Bug修了，欢迎提交PR╰(*°▽°*)╯ + +# 开源许可 +我用的是比MIT更激进的WTFPL \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..445aedb --- /dev/null +++ b/build.gradle @@ -0,0 +1,91 @@ +plugins { + id 'fabric-loom' version '1.4-SNAPSHOT' + 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. +} + +loom { + splitEnvironmentSourceSets() + + mods { + "twd-sasf" { + sourceSet sourceSets.main + sourceSet sourceSets.client + } + } + +} + +dependencies { + // To change the versions see the gradle.properties file + minecraft "com.mojang:minecraft:${project.minecraft_version}" + mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" + 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_version}" + + // Uncomment the following line to enable the deprecated Fabric API modules. + // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time. + + // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" +} + +processResources { + inputs.property "version", project.version + + filesMatching("fabric.mod.json") { + expand "version": project.version + } +} + +tasks.withType(JavaCompile).configureEach { + it.options.release = 17 +} + +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_17 + targetCompatibility = JavaVersion.VERSION_17 +} + +jar { + from("LICENSE") { + rename { "${it}_${project.base.archivesName.get()}"} + } +} + +// configure the maven publication +publishing { + publications { + mavenJava(MavenPublication) { + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..734df98 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,23 @@ +# Done to increase the memory available to gradle. +org.gradle.jvmargs=-Xmx1G +org.gradle.parallel=true + +# Fabric Properties +# check these on https://fabricmc.net/develop +minecraft_version=1.20.1 +yarn_mappings=1.20.1+build.10 +loader_version=0.14.23 + +# Mod Properties +mod_version=0.1.0 +maven_group=xyz.thewhitedog9487 +archives_base_name=twd-sasf + +# Dependencies +fabric_version=0.90.0+1.20.1 + +loom_libraries_base=https://bmclapi2.bangbang93.com/maven/ +loom_resources_base=https://bmclapi2.bangbang93.com/assets/ +loom_version_manifests=https://bmclapi2.bangbang93.com/mc/game/version_manifest.json +loom_experimental_versions=https://maven.fabricmc.net/net/minecraft/experimental_versions.json +loom_fabric_repository=https://repository.hanbings.io/proxy/ \ No newline at end of file diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..0adc8e1 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 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. +# + +############################################################################## +# +# 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/subprojects/plugins/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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 + +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 + 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=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=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" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + 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 $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# 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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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 + +@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. +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 execute + +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 + +: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 %* + +: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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..98415ec --- /dev/null +++ b/settings.gradle @@ -0,0 +1,11 @@ +pluginManagement { + repositories { + maven { + name = 'Fabric' + url = 'https://maven.aliyun.com/repository/gradle-plugin' + url = 'https://maven.fabricmc.net/' + } + mavenCentral() + gradlePluginPortal() + } +} \ No newline at end of file diff --git a/src/client/java/xyz/thewhitedog9487/ServerAddressSpaceFixClient.java b/src/client/java/xyz/thewhitedog9487/ServerAddressSpaceFixClient.java new file mode 100644 index 0000000..8de49d7 --- /dev/null +++ b/src/client/java/xyz/thewhitedog9487/ServerAddressSpaceFixClient.java @@ -0,0 +1,10 @@ +package xyz.thewhitedog9487; + +import net.fabricmc.api.ClientModInitializer; + +public class ServerAddressSpaceFixClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} \ No newline at end of file diff --git a/src/client/java/xyz/thewhitedog9487/mixin/client/AddServerScreenAccessor.java b/src/client/java/xyz/thewhitedog9487/mixin/client/AddServerScreenAccessor.java new file mode 100644 index 0000000..8131fa3 --- /dev/null +++ b/src/client/java/xyz/thewhitedog9487/mixin/client/AddServerScreenAccessor.java @@ -0,0 +1,15 @@ +package xyz.thewhitedog9487.mixin.client; + +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.client.network.ServerInfo; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(net.minecraft.client.gui.screen.AddServerScreen.class) +public interface AddServerScreenAccessor { + @Accessor("server") + ServerInfo Mixin_GetServer(); + + @Accessor("addressField") + TextFieldWidget Mixin_GetAddressField(); +} diff --git a/src/client/java/xyz/thewhitedog9487/mixin/client/DirectConnectScreenAccessor.java b/src/client/java/xyz/thewhitedog9487/mixin/client/DirectConnectScreenAccessor.java new file mode 100644 index 0000000..90eb121 --- /dev/null +++ b/src/client/java/xyz/thewhitedog9487/mixin/client/DirectConnectScreenAccessor.java @@ -0,0 +1,15 @@ +package xyz.thewhitedog9487.mixin.client; + +import net.minecraft.client.gui.widget.TextFieldWidget; +import net.minecraft.client.network.ServerInfo; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.gen.Accessor; + +@Mixin(net.minecraft.client.gui.screen.DirectConnectScreen.class) +public interface DirectConnectScreenAccessor { + @Accessor("serverEntry") + ServerInfo Mixin_GetServerEntry(); + + @Accessor("addressField") + TextFieldWidget Mixin_GetAddressField(); +} diff --git a/src/client/java/xyz/thewhitedog9487/mixin/client/ExampleClientMixin.java b/src/client/java/xyz/thewhitedog9487/mixin/client/ExampleClientMixin.java new file mode 100644 index 0000000..e52e97c --- /dev/null +++ b/src/client/java/xyz/thewhitedog9487/mixin/client/ExampleClientMixin.java @@ -0,0 +1,15 @@ +package xyz.thewhitedog9487.mixin.client; + +import net.minecraft.client.MinecraftClient; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftClient.class) +public class ExampleClientMixin { + @Inject(at = @At("HEAD"), method = "run") + private void run(CallbackInfo info) { + // This code is injected into the start of MinecraftClient.run()V + } +} \ No newline at end of file diff --git a/src/client/java/xyz/thewhitedog9487/mixin/client/MixinAddServerScreen.java b/src/client/java/xyz/thewhitedog9487/mixin/client/MixinAddServerScreen.java new file mode 100644 index 0000000..d9b1c67 --- /dev/null +++ b/src/client/java/xyz/thewhitedog9487/mixin/client/MixinAddServerScreen.java @@ -0,0 +1,22 @@ +package xyz.thewhitedog9487.mixin.client; + +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(net.minecraft.client.gui.screen.AddServerScreen.class) +public class MixinAddServerScreen extends Screen { + protected MixinAddServerScreen(Text title) { + super(title);} + + @Inject(method = "addAndClose()V", at = @At("RETURN")) + private void addAndClose(CallbackInfo ci){ + var Server = ((AddServerScreenAccessor) this).Mixin_GetServer(); + var Address = ((AddServerScreenAccessor) this).Mixin_GetAddressField().getText(); + // this.server.address = this.addressField.getText(); + Server.address = Address.trim();} + +} diff --git a/src/client/java/xyz/thewhitedog9487/mixin/client/MixinDirectConnectScreen.java b/src/client/java/xyz/thewhitedog9487/mixin/client/MixinDirectConnectScreen.java new file mode 100644 index 0000000..0292391 --- /dev/null +++ b/src/client/java/xyz/thewhitedog9487/mixin/client/MixinDirectConnectScreen.java @@ -0,0 +1,22 @@ +package xyz.thewhitedog9487.mixin.client; + +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.text.Text; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(net.minecraft.client.gui.screen.DirectConnectScreen.class) +public class MixinDirectConnectScreen extends Screen { + protected MixinDirectConnectScreen(Text title) { + super(title);} + + @Inject(method = "saveAndClose()V", at = @At("RETURN")) + private void addAndClose(CallbackInfo ci){ + var ServerEntry = ((DirectConnectScreenAccessor) this).Mixin_GetServerEntry(); + var Address = ((DirectConnectScreenAccessor) this).Mixin_GetAddressField().getText(); + // this.serverEntry.address = this.addressField.getText(); + ServerEntry.address = Address.trim();} + +} diff --git a/src/client/resources/twd-sasf.client.mixins.json b/src/client/resources/twd-sasf.client.mixins.json new file mode 100644 index 0000000..f0e6437 --- /dev/null +++ b/src/client/resources/twd-sasf.client.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "package": "xyz.thewhitedog9487.mixin.client", + "compatibilityLevel": "JAVA_17", + "client": [ + "AddServerScreenAccessor", + "ExampleClientMixin", + "MixinAddServerScreen", + "MixinDirectConnectScreen" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/src/main/java/xyz/thewhitedog9487/ServerAddressSpaceFix.java b/src/main/java/xyz/thewhitedog9487/ServerAddressSpaceFix.java new file mode 100644 index 0000000..1f5b927 --- /dev/null +++ b/src/main/java/xyz/thewhitedog9487/ServerAddressSpaceFix.java @@ -0,0 +1,22 @@ +package xyz.thewhitedog9487; + +import net.fabricmc.api.ModInitializer; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ServerAddressSpaceFix implements ModInitializer { + // This logger is used to write text to the console and the log file. + // It is considered best practice to use your mod id as the logger's name. + // That way, it's clear which mod wrote info, warnings, and errors. + public static final Logger LOGGER = LoggerFactory.getLogger("twd-sasf"); + + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + LOGGER.info("Hello Fabric world!"); + } +} \ No newline at end of file diff --git a/src/main/java/xyz/thewhitedog9487/mixin/ExampleMixin.java b/src/main/java/xyz/thewhitedog9487/mixin/ExampleMixin.java new file mode 100644 index 0000000..4c98498 --- /dev/null +++ b/src/main/java/xyz/thewhitedog9487/mixin/ExampleMixin.java @@ -0,0 +1,15 @@ +package xyz.thewhitedog9487.mixin; + +import net.minecraft.server.MinecraftServer; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(MinecraftServer.class) +public class ExampleMixin { + @Inject(at = @At("HEAD"), method = "loadWorld") + private void init(CallbackInfo info) { + // This code is injected into the start of MinecraftServer.loadWorld()V + } +} \ No newline at end of file diff --git a/src/main/resources/assets/twd-sasf/icon.png b/src/main/resources/assets/twd-sasf/icon.png new file mode 100644 index 0000000..047b91f Binary files /dev/null and b/src/main/resources/assets/twd-sasf/icon.png differ diff --git a/src/main/resources/assets/twd-sasf/lang/en_us.json b/src/main/resources/assets/twd-sasf/lang/en_us.json new file mode 100644 index 0000000..8c9fd8b --- /dev/null +++ b/src/main/resources/assets/twd-sasf/lang/en_us.json @@ -0,0 +1,6 @@ +{ + "modmenu.nameTranslation.twd-sasf": "ServerAddressSpaceFix", + "modmenu.descriptionTranslation.twd-sasf": "Fixed the \"unknown host\" bug caused by the server address containing spaces at the beginning and end of the server address when adding a server or connecting directly", + "twd-sasf.bilibili": "Bilibili", + "twd-sasf.blog": "Blog" +} \ No newline at end of file diff --git a/src/main/resources/assets/twd-sasf/lang/zh_cn.json b/src/main/resources/assets/twd-sasf/lang/zh_cn.json new file mode 100644 index 0000000..05c9c94 --- /dev/null +++ b/src/main/resources/assets/twd-sasf/lang/zh_cn.json @@ -0,0 +1,6 @@ +{ + "modmenu.nameTranslation.twd-sasf": "服务器地址首尾空格修复", + "modmenu.descriptionTranslation.twd-sasf": "修复添加服务器或直接连接时，服务器地址首尾包含空格导致的“未知的主机”Bug", + "twd-sasf.bilibili": "哔哩哔哩主页", + "twd-sasf.blog": "TheWhiteDog9487的博客" +} \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..a893f58 --- /dev/null +++ b/src/main/resources/fabric.mod.json @@ -0,0 +1,47 @@ +{ + "schemaVersion": 1, + "id": "twd-sasf", + "version": "${version}", + "name": "ServerAddressSpaceFix", + "description": "服务器地址首尾空格修复", + "authors": [ + "TheWhiteDog9487" + ], + "contact": { + "homepage": "https://www.thewhitedog9487.xyz/", + "sources": "https://github.com/TheWhiteDog9487/ServerAddressSpaceFix", + "issues": "https://github.com/TheWhiteDog9487/ServerAddressSpaceFix/issues" + }, + "license": "WTFPL", + "icon": "assets/twd-sasf/icon.png", + "environment": "client", + "entrypoints": { + "main": [ + "xyz.thewhitedog9487.ServerAddressSpaceFix" + ], + "client": [ + "xyz.thewhitedog9487.ServerAddressSpaceFixClient" + ] + }, + "mixins": [ + "twd-sasf.mixins.json", + { + "config": "twd-sasf.client.mixins.json", + "environment": "client" + } + ], + "depends": { + "fabricloader": ">=0.14.23", + "minecraft": "~1.20.1", + "java": ">=17" + }, + "suggests": { + "another-mod": "*" + }, + "custom": { + "modmenu": { + "links": { + "twd-sasf.bilibili": "https://space.bilibili.com/401746666", + "twd-sasf.blog": "www.thewhitedog9487.xyz"}, + "update_checker": true}} +} \ No newline at end of file diff --git a/src/main/resources/twd-sasf.mixins.json b/src/main/resources/twd-sasf.mixins.json new file mode 100644 index 0000000..cdfb1a7 --- /dev/null +++ b/src/main/resources/twd-sasf.mixins.json @@ -0,0 +1,11 @@ +{ + "required": true, + "package": "xyz.thewhitedog9487.mixin", + "compatibilityLevel": "JAVA_17", + "mixins": [ + "ExampleMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} \ No newline at end of file diff --git a/图片/Snipaste_2023-10-18_15-22-39.png b/图片/Snipaste_2023-10-18_15-22-39.png new file mode 100644 index 0000000..5c5278e Binary files /dev/null and b/图片/Snipaste_2023-10-18_15-22-39.png differ diff --git a/图片/Snipaste_2023-10-18_15-22-47.png b/图片/Snipaste_2023-10-18_15-22-47.png new file mode 100644 index 0000000..6fb8efc Binary files /dev/null and b/图片/Snipaste_2023-10-18_15-22-47.png differ diff --git a/图片/Snipaste_2023-10-18_15-22-57.png b/图片/Snipaste_2023-10-18_15-22-57.png new file mode 100644 index 0000000..b59a142 Binary files /dev/null and b/图片/Snipaste_2023-10-18_15-22-57.png differ