mirror of
https://github.com/TheWhiteDog9487/ServerAddressSpaceFix.git
synced 2024-11-22 12:37:03 +08:00
Compare commits
3 Commits
006481d186
...
cb7a0f57e3
Author | SHA1 | Date | |
---|---|---|---|
cb7a0f57e3 | |||
7e6b5bea64 | |||
e59891c7df |
100
build.gradle
100
build.gradle
@ -1,100 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id 'fabric-loom' version '1.6-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 {
|
|
||||||
name = "Terraformers"
|
|
||||||
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:yet-another-config-lib:3.5.0+1.21-fabric'
|
|
||||||
// https://maven.isxander.dev/#/releases/dev/isxander/yacl/yet-another-config-lib-fabric
|
|
||||||
modImplementation "com.terraformersmc:modmenu:11.0.0-beta.1"
|
|
||||||
}
|
|
||||||
|
|
||||||
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,14 +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.21
|
minecraft_version=1.21.3
|
||||||
yarn_mappings=1.21+build.1
|
yarn_mappings=1.21.3+build.2
|
||||||
loader_version=0.15.11
|
loader_version=0.16.7
|
||||||
|
|
||||||
# Mod Properties
|
# Mod Properties
|
||||||
mod_version=0.2.0
|
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.100.1+1.21
|
fabric_version=0.106.1+1.21.3
|
||||||
|
|
||||||
|
compatible_with=1.21+1.21.x
|
||||||
|
# https://modrinth.com/mod/modmenu/versions
|
||||||
|
# https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
|
||||||
|
modmenu_version=12.0.0-beta.1
|
||||||
|
# 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.8-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()
|
||||||
|
}
|
||||||
|
}
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user