mirror of
https://github.com/TheWhiteDog9487/ServerAddressSpaceFix.git
synced 2025-09-18 18:56:55 +00:00
Compare commits
6 Commits
1.20
...
44e81e4eed
Author | SHA1 | Date | |
---|---|---|---|
44e81e4eed | |||
![]() |
8c32ac9cad | ||
cb7a0f57e3 | |||
7e6b5bea64 | |||
e59891c7df | |||
006481d186 |
9
.gitattributes
vendored
Normal file
9
.gitattributes
vendored
Normal file
@@ -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
|
||||||
|
|
37
.github/workflows/build.yml
vendored
Normal file
37
.github/workflows/build.yml
vendored
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
# Automatically build the project and run any configured tests for every push
|
||||||
|
# and submitted pull request. This can help catch issues that only occur on
|
||||||
|
# certain platforms or Java versions, and provides a first line of defence
|
||||||
|
# against bad commits.
|
||||||
|
|
||||||
|
name: build
|
||||||
|
on: [pull_request, push]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
strategy:
|
||||||
|
matrix:
|
||||||
|
# Use these Java versions
|
||||||
|
java: [
|
||||||
|
21, # Current Java LTS
|
||||||
|
]
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- name: checkout repository
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: validate gradle wrapper
|
||||||
|
uses: gradle/wrapper-validation-action@v2
|
||||||
|
- name: setup jdk ${{ matrix.java }}
|
||||||
|
uses: actions/setup-java@v4
|
||||||
|
with:
|
||||||
|
java-version: ${{ matrix.java }}
|
||||||
|
distribution: 'microsoft'
|
||||||
|
- name: make gradle wrapper executable
|
||||||
|
run: chmod +x ./gradlew
|
||||||
|
- name: build
|
||||||
|
run: ./gradlew build
|
||||||
|
- name: capture build artifacts
|
||||||
|
if: ${{ matrix.java == '21' }} # Only upload artifacts built from latest java
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: Artifacts
|
||||||
|
path: build/libs/
|
38
README.md
38
README.md
@@ -6,23 +6,27 @@
|
|||||||
如果你在“添加服务器”或者“直接连接”界面输入的服务器地址首尾或者中间包含空格,这个模组会自动帮你把它去掉。
|
如果你在“添加服务器”或者“直接连接”界面输入的服务器地址首尾或者中间包含空格,这个模组会自动帮你把它去掉。
|
||||||
以防止上面提到的“未知的主机”Bug的出现。
|
以防止上面提到的“未知的主机”Bug的出现。
|
||||||
|
|
||||||
# 为什么会有这个模组
|
<details>
|
||||||
前几个月吧,我想玩一个服务器。从那个服务器的官网把地址复制下来,粘贴到“服务器地址”中保存之后,居然出现了“未知的主机”。
|
<summary>为什么会有这个模组</summary>
|
||||||
莫慌,这显然是DNS没查找到对应的地址,先Ping一下。
|
<pre>
|
||||||
Ping能找到域名对应的地址,然后我又怀疑是长城又在搞什么,用站长之家的工具测了一下,所有的结果和我的都是一样的啊。
|
前几个月吧,我想玩一个服务器。从那个服务器的官网把地址复制下来,粘贴到“服务器地址”中保存之后,居然出现了“未知的主机”。
|
||||||
这就比较奇怪了。
|
莫慌,这显然是DNS没查找到对应的地址,先Ping一下。
|
||||||
然后在折腾了一段时间之后,我发现了问题。
|
Ping能找到域名对应的地址,然后我又怀疑是长城又在搞什么,用站长之家的工具测了一下,所有的结果和我的都是一样的啊。
|
||||||
**我复制到的服务器地址的末尾,有一个空格。**
|
这就比较奇怪了。
|
||||||
这就很难绷了啊,再继续折腾了一段时间,确认问题能够稳定复现之后,我去漏洞追踪器提交了一个Bug。
|
然后在折腾了一段时间之后,我发现了问题。
|
||||||
结果您猜怎么着?
|
<strong>我复制到的服务器地址的末尾,有一个空格。</strong>
|
||||||

|
这就很难绷了啊,再继续折腾了一段时间,确认问题能够稳定复现之后,我去漏洞追踪器提交了一个Bug。
|
||||||

|
结果您猜怎么着?
|
||||||

|
<img src="https://github.com/TheWhiteDog9487/ServerAddressSpaceFix/blob/%E4%B8%BB%E8%A6%81/%E5%9B%BE%E7%89%87/Snipaste_2023-10-18_15-22-39.png?raw=true" alt="漏洞追踪器上提的问题" srcset="">
|
||||||
我英语完全不行,就没继续说下去了,问题描述都是用翻译写的。
|
<img src="https://github.com/TheWhiteDog9487/ServerAddressSpaceFix/blob/%E4%B8%BB%E8%A6%81/%E5%9B%BE%E7%89%87/Snipaste_2023-10-18_15-22-47.png?raw=true" alt="下面的评论" srcset="">
|
||||||
但是吧,我打心里觉得这事多少有点离谱。
|
<img src="https://github.com/TheWhiteDog9487/ServerAddressSpaceFix/blob/%E4%B8%BB%E8%A6%81/%E5%9B%BE%E7%89%87/Snipaste_2023-10-18_15-22-57.png?raw=true" alt="更早的一个问题报" srcset="">
|
||||||
既然你的地址是String类,那在后面调用一下trim方法很难吗?
|
我英语完全不行,就没继续说下去了,问题描述都是用翻译写的。
|
||||||
而且,我作为一个玩家,你跟我说,“这都是你自己不小心,这根本就不能算是个Bug“,我是不能接受的。
|
但是吧,我打心里觉得这事多少有点离谱。
|
||||||
**所以,有了这个模组。**
|
既然你的地址是String类,那在后面调用一下trim方法很难吗?
|
||||||
|
而且,我作为一个玩家,你跟我说,“这都是你自己不小心,这根本就不能算是个Bug“,我是不能接受的。
|
||||||
|
<strong>所以,有了这个模组。</strong>
|
||||||
|
</pre>
|
||||||
|
</details>
|
||||||
|
|
||||||
# 已知问题
|
# 已知问题
|
||||||
所有已知问题均被修复,如果有新的欢迎通知我。
|
所有已知问题均被修复,如果有新的欢迎通知我。
|
||||||
|
99
build.gradle
99
build.gradle
@@ -1,99 +0,0 @@
|
|||||||
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.
|
|
||||||
|
|
||||||
maven {
|
|
||||||
name 'Xander Maven'
|
|
||||||
url 'https://maven.isxander.dev/releases'}
|
|
||||||
maven { url "https://maven.terraformersmc.com/releases/" }
|
|
||||||
}
|
|
||||||
|
|
||||||
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}"
|
|
||||||
modImplementation "dev.isxander.yacl:yet-another-config-lib-fabric:3.3.1+1.20.4"
|
|
||||||
// https://maven.isxander.dev/#/releases/dev/isxander/yacl/yet-another-config-lib-fabric
|
|
||||||
modImplementation "com.terraformersmc:modmenu:9.0.0"
|
|
||||||
}
|
|
||||||
|
|
||||||
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.
|
|
||||||
}
|
|
||||||
}
|
|
93
build.gradle.kts
Normal file
93
build.gradle.kts
Normal file
@@ -0,0 +1,93 @@
|
|||||||
|
plugins {
|
||||||
|
id("fabric-loom") version "1.8-SNAPSHOT"
|
||||||
|
id("maven-publish")
|
||||||
|
}
|
||||||
|
|
||||||
|
version = project.extra["mod_version"] as String
|
||||||
|
group = project.extra["maven_group"] as String
|
||||||
|
|
||||||
|
base {
|
||||||
|
archivesName.set(project.extra["archives_base_name"] as String)
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
name = "Xander Maven"
|
||||||
|
url = uri("https://maven.isxander.dev/releases")}
|
||||||
|
maven {
|
||||||
|
name = "Terraformers"
|
||||||
|
url = uri("https://maven.terraformersmc.com/releases")}
|
||||||
|
}
|
||||||
|
|
||||||
|
loom {
|
||||||
|
splitEnvironmentSourceSets()
|
||||||
|
|
||||||
|
mods {
|
||||||
|
create("twd-sasf") {
|
||||||
|
sourceSet(sourceSets["main"])
|
||||||
|
sourceSet(sourceSets["client"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
// To change the versions see the gradle.properties file
|
||||||
|
minecraft("com.mojang:minecraft:${project.extra["minecraft_version"]}")
|
||||||
|
mappings("net.fabricmc:yarn:${project.extra["yarn_mappings"]}:v2")
|
||||||
|
modImplementation("net.fabricmc:fabric-loader:${project.extra["loader_version"]}")
|
||||||
|
|
||||||
|
// Fabric API. This is technically optional, but you probably want it anyway.
|
||||||
|
modImplementation("net.fabricmc.fabric-api:fabric-api:${project.extra["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.extra["fabric_version"]}")
|
||||||
|
|
||||||
|
modImplementation("com.terraformersmc:modmenu:${project.extra["modmenu_version"]}")
|
||||||
|
modImplementation("dev.isxander:yet-another-config-lib:${project.extra["yacl_version"]}")
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.processResources {
|
||||||
|
inputs.property("version", project.version)
|
||||||
|
filesMatching("fabric.mod.json") {
|
||||||
|
expand("version" to project.version)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.withType<JavaCompile> {
|
||||||
|
options.release.set(21)
|
||||||
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
withSourcesJar()
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_21
|
||||||
|
targetCompatibility = JavaVersion.VERSION_21
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.jar {
|
||||||
|
from("LICENSE") {
|
||||||
|
rename { "${it}_${project.base.archivesName.get()}" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tasks.remapJar{
|
||||||
|
// https://docs.gradle.org/current/dsl/org.gradle.api.tasks.bundling.Jar.html#org.gradle.api.tasks.bundling.Jar:archiveFileName
|
||||||
|
// 用这个属性设置jar包的文件名格式
|
||||||
|
// 别用上面那个Jar任务的配置,会被remapJar覆盖掉
|
||||||
|
archiveFileName = "${project.base.archivesName.get()}-${project.version} mc${project.extra["compatible_with"]}.jar"}
|
||||||
|
tasks.remapSourcesJar{
|
||||||
|
archiveFileName = "${project.base.archivesName.get()}-${project.version} mc${project.extra["compatible_with"]}-sources.jar"}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
publications {
|
||||||
|
create<MavenPublication>("mavenJava") {
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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.
|
||||||
|
}
|
||||||
|
}
|
@@ -4,20 +4,28 @@ org.gradle.parallel=true
|
|||||||
|
|
||||||
# Fabric Properties
|
# Fabric Properties
|
||||||
# check these on https://fabricmc.net/develop
|
# check these on https://fabricmc.net/develop
|
||||||
minecraft_version=1.20.4
|
minecraft_version=1.21.3
|
||||||
yarn_mappings=1.20.4+build.3
|
yarn_mappings=1.21.3+build.2
|
||||||
loader_version=0.15.3
|
loader_version=0.16.7
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=0.1.4
|
mod_version=0.2.1
|
||||||
maven_group=xyz.thewhitedog9487
|
maven_group=xyz.thewhitedog9487
|
||||||
archives_base_name=ServerAddressSpaceFix
|
archives_base_name=ServerAddressSpaceFix
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
fabric_version=0.93.1+1.20.4
|
fabric_version=0.106.1+1.21.3
|
||||||
|
|
||||||
loom_libraries_base=https://bmclapi2.bangbang93.com/maven/
|
compatible_with=1.21+1.21.x
|
||||||
loom_resources_base=https://bmclapi2.bangbang93.com/assets/
|
# https://modrinth.com/mod/modmenu/versions
|
||||||
loom_version_manifests=https://bmclapi2.bangbang93.com/mc/game/version_manifest.json
|
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
|
||||||
loom_experimental_versions=https://maven.fabricmc.net/net/minecraft/experimental_versions.json
|
modmenu_version=12.0.0-beta.1
|
||||||
loom_fabric_repository=https://repository.hanbings.io/proxy/
|
# https://modrinth.com/mod/yacl/versions
|
||||||
|
# https://maven.isxander.dev/#/releases/dev/isxander/yet-another-config-lib
|
||||||
|
yacl_version=3.6.1+1.21.2-fabric
|
||||||
|
|
||||||
|
# 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/
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,6 +1,6 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
validateDistributionUrl=true
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
@@ -1,11 +0,0 @@
|
|||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
name = 'Fabric'
|
|
||||||
url = 'https://maven.aliyun.com/repository/gradle-plugin'
|
|
||||||
url = 'https://maven.fabricmc.net/'
|
|
||||||
}
|
|
||||||
mavenCentral()
|
|
||||||
gradlePluginPortal()
|
|
||||||
}
|
|
||||||
}
|
|
9
settings.gradle.kts
Normal file
9
settings.gradle.kts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
pluginManagement {
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
name = "Fabric"
|
||||||
|
url = uri("https://maven.fabricmc.net/")}
|
||||||
|
mavenCentral()
|
||||||
|
gradlePluginPortal()
|
||||||
|
}
|
||||||
|
}
|
@@ -13,13 +13,13 @@ public class ModMenu implements ModMenuApi {
|
|||||||
@Override
|
@Override
|
||||||
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
public ConfigScreenFactory<?> getModConfigScreenFactory() {
|
||||||
return parent -> YetAnotherConfigLib.createBuilder()
|
return parent -> YetAnotherConfigLib.createBuilder()
|
||||||
.title(Text.translatable("title.thewhitedog9487.twd-sasf.config"))
|
.title(Text.translatable("title.twd-sasf.config"))
|
||||||
.category(ConfigCategory.createBuilder()
|
.category(ConfigCategory.createBuilder()
|
||||||
.name(Text.translatable("config.thewhitedog9487.twd-sasf.category.general"))
|
.name(Text.translatable("config.twd-sasf.category.general"))
|
||||||
.option(Option.<Boolean>createBuilder()
|
.option(Option.<Boolean>createBuilder()
|
||||||
.name(Text.translatable("option.thewhitedog9487.twd-sasf.ModEnabled"))
|
.name(Text.translatable("option.twd-sasf.ModEnabled"))
|
||||||
.binding(true, () -> Settings.ModEnabled, newVal -> Settings.ModEnabled = newVal)
|
.binding(true, () -> Settings.ModEnabled, newVal -> Settings.ModEnabled = newVal)
|
||||||
.description(OptionDescription.of(Text.translatable("option.thewhitedog9487.twd-sasf.ModEnabled.description")))
|
.description(OptionDescription.of(Text.translatable("option.twd-sasf.ModEnabled.description")))
|
||||||
.controller(TickBoxControllerBuilder::create)
|
.controller(TickBoxControllerBuilder::create)
|
||||||
.build())
|
.build())
|
||||||
.build())
|
.build())
|
||||||
|
@@ -9,6 +9,6 @@ public class ServerAddressSpaceFixClient implements ClientModInitializer {
|
|||||||
@Override
|
@Override
|
||||||
public void onInitializeClient() {
|
public void onInitializeClient() {
|
||||||
// This entrypoint is suitable for setting up client-specific logic, such as rendering.
|
// This entrypoint is suitable for setting up client-specific logic, such as rendering.
|
||||||
LOGGER.info("ServerAddressSpaceFix正在初始化!");
|
LOGGER.info("ServerAddressSpaceFix Loading!");
|
||||||
}
|
}
|
||||||
}
|
}
|
@@ -1,12 +0,0 @@
|
|||||||
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.multiplayer.DirectConnectScreen.class)
|
|
||||||
public interface DirectConnectScreenAccessor {
|
|
||||||
@Accessor("addressField")
|
|
||||||
TextFieldWidget Mixin_GetAddressField();
|
|
||||||
}
|
|
@@ -1,14 +1,15 @@
|
|||||||
package xyz.thewhitedog9487.mixin.client;
|
package xyz.thewhitedog9487.mixin.client;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.screen.multiplayer.AddServerScreen;
|
||||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
import xyz.thewhitedog9487.Settings;
|
import xyz.thewhitedog9487.Settings;
|
||||||
|
|
||||||
@Mixin(net.minecraft.client.gui.screen.multiplayer.AddServerScreen.class)
|
@Mixin(AddServerScreen.class)
|
||||||
public class MixinAddServerScreen {
|
public class MixinAddServerScreen {
|
||||||
@Redirect(method = "addAndClose", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;getText()Ljava/lang/String;", ordinal = 1))
|
@Redirect(method = "addAndClose", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;getText()Ljava/lang/String;", ordinal = 1))
|
||||||
private String trimGetText(TextFieldWidget instance) {
|
private String trimGetText(TextFieldWidget instance) {
|
||||||
if( !Settings.ModEnabled ) { return instance.getText(); }
|
if( Settings.ModEnabled == false ) { return instance.getText(); }
|
||||||
return instance.getText().replace(" ", "");}}
|
else return instance.getText().replace(" ", "");}}
|
@@ -1,16 +1,23 @@
|
|||||||
package xyz.thewhitedog9487.mixin.client;
|
package xyz.thewhitedog9487.mixin.client;
|
||||||
|
|
||||||
|
import net.minecraft.client.gui.screen.multiplayer.DirectConnectScreen;
|
||||||
import net.minecraft.client.gui.widget.TextFieldWidget;
|
import net.minecraft.client.gui.widget.TextFieldWidget;
|
||||||
import org.spongepowered.asm.mixin.Mixin;
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.gen.Accessor;
|
||||||
import org.spongepowered.asm.mixin.injection.At;
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
import xyz.thewhitedog9487.Settings;
|
import xyz.thewhitedog9487.Settings;
|
||||||
|
|
||||||
@Mixin(net.minecraft.client.gui.screen.multiplayer.DirectConnectScreen.class)
|
@Mixin(DirectConnectScreen.class)
|
||||||
|
interface DirectConnectScreenAccessor {
|
||||||
|
@Accessor("addressField")
|
||||||
|
TextFieldWidget Mixin_GetAddressField();}
|
||||||
|
|
||||||
|
@Mixin(DirectConnectScreen.class)
|
||||||
public class MixinDirectConnectScreen {
|
public class MixinDirectConnectScreen {
|
||||||
@Redirect(method = "saveAndClose", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;getText()Ljava/lang/String;"))
|
@Redirect(method = "saveAndClose", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/widget/TextFieldWidget;getText()Ljava/lang/String;"))
|
||||||
private String trimGetText(TextFieldWidget instance) {
|
private String trimGetText(TextFieldWidget instance) {
|
||||||
if( !Settings.ModEnabled ) { return instance.getText(); }
|
if( Settings.ModEnabled == false ) { return instance.getText(); }
|
||||||
String trimmedText = instance.getText().replace(" ", "");
|
String trimmedText = instance.getText().replace(" ", "");
|
||||||
((DirectConnectScreenAccessor) this).Mixin_GetAddressField().setText(trimmedText);
|
((DirectConnectScreenAccessor) this).Mixin_GetAddressField().setText(trimmedText);
|
||||||
return trimmedText;}}
|
return trimmedText;}}
|
@@ -0,0 +1,19 @@
|
|||||||
|
package xyz.thewhitedog9487.mixin.client;
|
||||||
|
|
||||||
|
import net.minecraft.client.network.ServerInfo;
|
||||||
|
import org.objectweb.asm.Opcodes;
|
||||||
|
import org.spongepowered.asm.mixin.Mixin;
|
||||||
|
import org.spongepowered.asm.mixin.injection.At;
|
||||||
|
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||||
|
import xyz.thewhitedog9487.Settings;
|
||||||
|
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
|
||||||
|
@Mixin(ServerInfo.class)
|
||||||
|
public class MixinServerInfo {
|
||||||
|
@Redirect(method = "<init>", at = @At(value = "FIELD", opcode = Opcodes.PUTFIELD, target = "Lnet/minecraft/client/network/ServerInfo;address:Ljava/lang/String;"))
|
||||||
|
private void RemoveSpace_Write(ServerInfo original, String value) {
|
||||||
|
if( Settings.ModEnabled == false ) {
|
||||||
|
original.address = value;
|
||||||
|
return; }
|
||||||
|
else { original.address = value.replace(" ", ""); } }}
|
@@ -1,11 +1,12 @@
|
|||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"package": "xyz.thewhitedog9487.mixin.client",
|
"package": "xyz.thewhitedog9487.mixin.client",
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_21",
|
||||||
"client": [
|
"client": [
|
||||||
"DirectConnectScreenAccessor",
|
"DirectConnectScreenAccessor",
|
||||||
"MixinAddServerScreen",
|
"MixinAddServerScreen",
|
||||||
"MixinDirectConnectScreen"
|
"MixinDirectConnectScreen",
|
||||||
|
"MixinServerInfo"
|
||||||
],
|
],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
@@ -3,8 +3,8 @@
|
|||||||
"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\nTip: If you need to use the configuration menu, install the YetAnotherConfigLib mod",
|
"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\nTip: If you need to use the configuration menu, install the YetAnotherConfigLib mod",
|
||||||
"twd-sasf.bilibili": "Bilibili",
|
"twd-sasf.bilibili": "Bilibili",
|
||||||
"twd-sasf.blog": "Blog",
|
"twd-sasf.blog": "Blog",
|
||||||
"title.thewhitedog9487.twd-sasf.config": "ServerAddressSpaceFix",
|
"title.twd-sasf.config": "ServerAddressSpaceFix",
|
||||||
"config.thewhitedog9487.twd-sasf.category.general": "General",
|
"config.twd-sasf.category.general": "General",
|
||||||
"option.thewhitedog9487.twd-sasf.ModEnabled": "Whether To Enable The Mod Feature",
|
"option.twd-sasf.ModEnabled": "Whether To Enable The Mod Feature",
|
||||||
"option.thewhitedog9487.twd-sasf.ModEnabled.description": "There is no need to restart the game, and the modification will take effect immediately after it is saved"
|
"option.twd-sasf.ModEnabled.description": "There is no need to restart the game, and the modification will take effect immediately after it is saved"
|
||||||
}
|
}
|
@@ -3,8 +3,8 @@
|
|||||||
"modmenu.descriptionTranslation.twd-sasf": "修复添加服务器或直接连接时,服务器地址首尾包含空格导致的“未知的主机”Bug\n提示:如果需要使用配置菜单,请安装YetAnotherConfigLib模组",
|
"modmenu.descriptionTranslation.twd-sasf": "修复添加服务器或直接连接时,服务器地址首尾包含空格导致的“未知的主机”Bug\n提示:如果需要使用配置菜单,请安装YetAnotherConfigLib模组",
|
||||||
"twd-sasf.bilibili": "哔哩哔哩主页",
|
"twd-sasf.bilibili": "哔哩哔哩主页",
|
||||||
"twd-sasf.blog": "TheWhiteDog9487的博客",
|
"twd-sasf.blog": "TheWhiteDog9487的博客",
|
||||||
"title.thewhitedog9487.twd-sasf.config": "服务器地址首尾空格修复",
|
"title.twd-sasf.config": "服务器地址首尾空格修复",
|
||||||
"config.thewhitedog9487.twd-sasf.category.general": "通用",
|
"config.twd-sasf.category.general": "通用",
|
||||||
"option.thewhitedog9487.twd-sasf.ModEnabled": "是否启用模组功能",
|
"option.twd-sasf.ModEnabled": "是否启用模组功能",
|
||||||
"option.thewhitedog9487.twd-sasf.ModEnabled.description": "无需重启游戏,修改并保存后立刻生效"
|
"option.twd-sasf.ModEnabled.description": "无需重启游戏,修改并保存后立刻生效"
|
||||||
}
|
}
|
@@ -27,9 +27,9 @@
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
"depends": {
|
"depends": {
|
||||||
"fabricloader": ">=0.15.3",
|
"fabricloader": ">=0.15.11",
|
||||||
"minecraft": ["1.20","1.20.*"],
|
"minecraft": ["1.21","1.21.*"],
|
||||||
"java": ">=17"
|
"java": ">=21"
|
||||||
},
|
},
|
||||||
"suggests": {
|
"suggests": {
|
||||||
"another-mod": "*"
|
"another-mod": "*"
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"required": true,
|
"required": true,
|
||||||
"package": "xyz.thewhitedog9487.mixin",
|
"package": "xyz.thewhitedog9487.mixin",
|
||||||
"compatibilityLevel": "JAVA_17",
|
"compatibilityLevel": "JAVA_21",
|
||||||
"mixins": [],
|
"mixins": [],
|
||||||
"injectors": {
|
"injectors": {
|
||||||
"defaultRequire": 1
|
"defaultRequire": 1
|
||||||
|
Reference in New Issue
Block a user