Skip to content

Refactor name validation and update formatting logic #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Voxxin wants to merge 1 commit into from
Closed

Refactor name validation and update formatting logic #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.3
loader_version=0.15.11
# Mod Properties
minecraft_version=1.21.6
loader_version=0.16.1
mod_version = 1.0.5
maven_group = com.github.voxxin
archives_base_name = ColourMyServers
31 changes: 7 additions & 24 deletions src/main/java/com/github/voxxin/colourmyservers/mixin/server/EditServerScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
package com.github.voxxin.colourmyservers.mixin.server;

import com.github.voxxin.colourmyservers.util.ComponentU;
import com.github.voxxin.colourmyservers.util.ErrorCatching;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.components.toasts.SystemToast;
import net.minecraft.client.gui.screens.EditServerScreen;
import net.minecraft.client.multiplayer.resolver.ServerAddress;
import net.minecraft.network.chat.Component;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -17,32 +12,20 @@

@Mixin(EditServerScreen.class)
public class EditServerScreenMixin {

@Shadow private EditBox nameEdit;

@Shadow private Button addButton;

@Inject(at = @At("TAIL"), method = "init")
public void init(CallbackInfo ci) {
if (!nameEdit.getValue().isEmpty()) nameEdit.setMaxLength(9999999);
}

@Inject(at = @At("HEAD"), method = "onAdd", cancellable = true)
public void onAdd(CallbackInfo ci) {
if (ErrorCatching.stringTooLong(this.nameEdit.getValue())) {
ErrorCatching.nameTooLongToast();
ci.cancel();
}
nameEdit.setMaxLength(Integer.MAX_VALUE);
}

@Inject(at = @At("HEAD"), method = "updateAddButtonStatus", cancellable = true)
public void updateAddButtonStatus(CallbackInfo ci) {
if (ErrorCatching.stringTooLong(this.nameEdit.getValue())) {
if (this.addButton.active) {
ErrorCatching.nameTooLongToast();
}
this.addButton.active = false;
@Inject(at = @At("HEAD"), method = {"onAdd", "updateAddButtonStatus"}, cancellable = true)
public void handleValidation(CallbackInfo ci) {
if (ErrorCatching.isTooLong(nameEdit.getValue())) {
if (addButton.active) ErrorCatching.showToast();
addButton.active = false;
ci.cancel();
}
}
}
}
8 changes: 4 additions & 4 deletions src/main/java/com/github/voxxin/colourmyservers/mixin/server/ServerSelectionListMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ public class ServerSelectionListMixin {
method = "render",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;IIIZ)I", ordinal = 0
target = "Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;III)V", ordinal = 0
)
)
private int render(GuiGraphics instance, Font font, String string, int i, int j, int k, boolean bl) {
net.minecraft.network.chat.Component component = new ComponentU(string).getComponent();
return instance.drawString(font, component, i, j, k, bl);
private void render(GuiGraphics instance, Font font, String string, int i, int j, int k) {
net.minecraft.network.chat.Component component = new ComponentU(string).parse();
instance.drawString(font, component, i, j, k);
}
}
14 changes: 4 additions & 10 deletions ...ain/java/com/github/voxxin/colourmyservers/mixin/world/CreateWorldScreenGameTabMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.github.voxxin.colourmyservers.mixin.world;

import com.github.voxxin.colourmyservers.util.ComponentU;
import com.github.voxxin.colourmyservers.util.CreateWorldScreenExt;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
Expand All @@ -10,19 +9,14 @@
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 org.spongepowered.asm.mixin.injection.callback.LocalCapture;

@Mixin(CreateWorldScreen.GameTab.class)
public class CreateWorldScreenGameTabMixin {

@Shadow @Final private EditBox nameEdit;

@Inject(at = @At(value = "TAIL"), method = "<init>", locals = LocalCapture.CAPTURE_FAILHARD)
@Inject(at = @At("TAIL"), method = "<init>")
private void init(CreateWorldScreen createWorldScreen, CallbackInfo ci) {
if (!nameEdit.getValue().isEmpty()) nameEdit.setMaxLength(9999999);
nameEdit.setResponder(w -> {
((CreateWorldScreenExt)createWorldScreen).cms$updateFinalizeButton(w);
});
nameEdit.setMaxLength(Integer.MAX_VALUE);
nameEdit.setResponder(w -> ((CreateWorldScreenExt) createWorldScreen).updateFinalizeButton(w));
}
}
}
35 changes: 11 additions & 24 deletions src/main/java/com/github/voxxin/colourmyservers/mixin/world/CreateWorldScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package com.github.voxxin.colourmyservers.mixin.world;

import com.github.voxxin.colourmyservers.util.ComponentU;
import com.github.voxxin.colourmyservers.util.CreateWorldScreenExt;
import com.github.voxxin.colourmyservers.util.ErrorCatching;
import net.minecraft.client.Minecraft;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.components.toasts.SystemToast;
import net.minecraft.client.gui.layouts.LinearLayout;
import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;
import net.minecraft.client.gui.screens.worldselection.WorldCreationUiState;
Expand All @@ -18,37 +15,27 @@
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.LocalCapture;

@Mixin(CreateWorldScreen.class)
public class CreateWorldScreenMixin implements CreateWorldScreenExt {

@Shadow @Final
WorldCreationUiState uiState;
@Unique private LinearLayout layout;

@Unique
private LinearLayout layout;

@Inject(method = "init", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
private void init(CallbackInfo ci, LinearLayout linearLayout) {
@Inject(method = "init", at = @At("TAIL"))
private void init(CallbackInfo ci, @Local LinearLayout linearLayout) {
this.layout = linearLayout;
}


@Override
public void cms$updateFinalizeButton(String name) {
this.layout.visitWidgets((w) -> {
public void updateFinalizeButton(String name) {
this.layout.visitWidgets(w -> {
if (w instanceof Button button && button.getMessage().equals(Component.translatable("selectWorld.create"))) {
if (ErrorCatching.stringTooLong(name)) {
if (button.active) {
ErrorCatching.nameTooLongToast();
}
button.active = false;
} else {
this.uiState.setName(name);
button.active = true;
}
boolean valid = !ErrorCatching.isTooLong(name);
if (!valid && button.active) ErrorCatching.showToast();
button.active = valid;
if (valid) uiState.setName(name);
}
});
}
}
}
29 changes: 6 additions & 23 deletions src/main/java/com/github/voxxin/colourmyservers/mixin/world/EditWorldScreenMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,26 @@
package com.github.voxxin.colourmyservers.mixin.world;

import com.github.voxxin.colourmyservers.util.ErrorCatching;
import it.unimi.dsi.fastutil.booleans.BooleanConsumer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import com.llamalad7.mixinextras.sugar.Local;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.components.EditBox;
import net.minecraft.client.gui.layouts.LinearLayout;
import net.minecraft.client.gui.screens.worldselection.EditWorldScreen;
import net.minecraft.world.level.storage.LevelStorageSource;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
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.LocalCapture;

@Mixin(EditWorldScreen.class)
public class EditWorldScreenMixin {

@Shadow @Final private EditBox nameEdit;

@Inject(method = "<init>", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD)
public void init(Minecraft minecraft, LevelStorageSource.LevelStorageAccess levelStorageAccess, String string, BooleanConsumer booleanConsumer, CallbackInfo ci, Font font, LinearLayout linearLayout, Button button) {
if (nameEdit.getValue().isEmpty()) nameEdit.setMaxLength(9999999);
@Inject(method = "<init>", at = @At("TAIL"))
public void init(CallbackInfo ci, @Local Button button) {
nameEdit.setMaxLength(Integer.MAX_VALUE);
nameEdit.setResponder(w -> {
if (ErrorCatching.stringTooLong(w)) {
if (button.active) {
ErrorCatching.nameTooLongToast();
}
button.active = false;
} else {
button.active = true;
}

if (w.isEmpty()) {
button.active = false;
}
button.active = !w.isEmpty() && !ErrorCatching.isTooLong(w);
});
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/github/voxxin/colourmyservers/mixin/world/WorldCreationUiStateMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
@Mixin(WorldCreationUiState.class)
public class WorldCreationUiStateMixin {

@Inject(at = @At(value = "INVOKE_ASSIGN", target = "Ljava/lang/String;trim()Ljava/lang/String;"), method = "findResultFolder", cancellable = true)
@Inject(at = @At(value = "HEAD"), method = "findResultFolder")
private void findResultFolder(String string, CallbackInfoReturnable<String> cir) {
cir.setReturnValue(new ComponentU(string).getComponent().getString());
string = new ComponentU(string).parse().getString();
}
}
8 changes: 4 additions & 4 deletions src/main/java/com/github/voxxin/colourmyservers/mixin/world/WorldSelectionListMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ public class WorldSelectionListMixin {
method = "render",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;IIIZ)I", ordinal = 0
target = "Lnet/minecraft/client/gui/GuiGraphics;drawString(Lnet/minecraft/client/gui/Font;Ljava/lang/String;III)V", ordinal = 0
)
)
private int render(GuiGraphics instance, Font font, String string, int i, int j, int k, boolean bl) {
net.minecraft.network.chat.Component component = new ComponentU(string).getComponent();
return instance.drawString(font, component, i, j, k, bl);
private void render(GuiGraphics instance, Font font, String string, int i, int j, int k) {
net.minecraft.network.chat.Component component = new ComponentU(string).parse();
instance.drawString(font, component, i, j, k);
}
}
Loading
Loading