Merge branch '1.21.11' into feature/antispam

Author: emyfops

src/main/java/com/lambda/mixin/render/ChatInputSuggestorMixin.java

@@ -17,42 +17,23 @@
 
 package com.lambda.mixin.render;
 
-import com.google.common.base.Strings;
 import com.lambda.command.CommandManager;
-import com.lambda.graphics.renderer.gui.font.core.LambdaAtlas;
-import com.lambda.module.modules.client.LambdaMoji;
-import com.lambda.module.modules.client.StyleEditor;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.suggestion.Suggestions;
-import com.mojang.brigadier.suggestion.SuggestionsBuilder;
 import net.minecraft.client.gui.screen.ChatInputSuggestor;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.network.ClientPlayNetworkHandler;
 import net.minecraft.command.CommandSource;
-import org.jetbrains.annotations.Nullable;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Stream;
 
 @Mixin(ChatInputSuggestor.class)
 public abstract class ChatInputSuggestorMixin {
-    @Unique private static final Pattern COLON_PATTERN = Pattern.compile("(:[a-zA-Z0-9_]+)");
-    @Unique private static final Pattern EMOJI_PATTERN = Pattern.compile("(:)([a-zA-Z0-9_]+)(:)");
     @Shadow @Final TextFieldWidget textField;
-    @Shadow private @Nullable CompletableFuture<Suggestions> pendingSuggestions;
 
     @Shadow
     public abstract void show(boolean narrateFirstSuggestion);
@@ -67,64 +48,4 @@ private boolean refreshModify(boolean showCompletions) {
     private CommandDispatcher<CommandSource> wrapRefresh(ClientPlayNetworkHandler instance, Operation<CommandDispatcher<CommandSource>> original) {
         return (CommandDispatcher<CommandSource>) CommandManager.INSTANCE.currentDispatcher(textField.getText());
     }
-
-    @Inject(method = "refresh", at = @At("TAIL"))
-    private void refreshEmojiSuggestion(CallbackInfo ci) {
-        if (!LambdaMoji.INSTANCE.isEnabled() ||
-                !LambdaMoji.INSTANCE.getSuggestions()) return;
-
-        String typing = textField.getText();
-
-        // Don't suggest emojis in commands
-        if (CommandManager.INSTANCE.isCommand(typing) ||
-                CommandManager.INSTANCE.isLambdaCommand(typing)) return;
-
-        int cursor = textField.getCursor();
-        String textToCursor = typing.substring(0, cursor);
-        if (textToCursor.isEmpty()) return;
-
-        // Most right index at the left of the regex expression
-        int start = neoLambda$getLastColon(textToCursor);
-        if (start == -1) return;
-
-        Matcher emojiMatcher = EMOJI_PATTERN.matcher(textToCursor);
-        Map<String, ?> emojiKeys = LambdaAtlas.INSTANCE.getKeys(StyleEditor.INSTANCE.getEmojiFont());
-        while (emojiMatcher.find()) {
-            int openingColon = emojiMatcher.start(1);
-            String key = emojiMatcher.group(2);
-            int closingColon = emojiMatcher.end(3);
-
-            if (emojiKeys.containsKey(key) && start >= openingColon && start < closingColon) {
-                // If the colon is part of a previous valid emoji, return
-                return;
-            }
-        }
-
-        String emojiString = textToCursor.substring(start + 1);
-
-        Stream<String> results = emojiKeys.keySet().stream()
-                .filter(s -> s.startsWith(emojiString))
-                .map(s -> s + ":");
-
-        pendingSuggestions = CommandSource.suggestMatching(results, new SuggestionsBuilder(textToCursor, start + 1));
-        pendingSuggestions.thenRun(() -> {
-            if (!pendingSuggestions.isDone()) return;
-
-            show(false);
-        });
-    }
-
-    @Unique
-    private int neoLambda$getLastColon(String input) {
-        if (Strings.isNullOrEmpty(input)) return -1;
-
-        int i = -1;
-        Matcher matcher = COLON_PATTERN.matcher(input);
-
-        while (matcher.find()) {
-            i = matcher.start();
-        }
-
-        return i;
-    }
 }

src/main/kotlin/com/lambda/command/commands/PrefixCommand.kt

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2025 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.command.commands
+
+import com.lambda.brigadier.CommandResult.Companion.failure
+import com.lambda.brigadier.CommandResult.Companion.success
+import com.lambda.brigadier.argument.greedyString
+import com.lambda.brigadier.argument.string
+import com.lambda.brigadier.argument.value
+import com.lambda.brigadier.execute
+import com.lambda.brigadier.executeWithResult
+import com.lambda.brigadier.required
+import com.lambda.command.CommandRegistry
+import com.lambda.command.LambdaCommand
+import com.lambda.config.Configuration
+import com.lambda.config.Setting
+import com.lambda.util.Communication.info
+import com.lambda.util.extension.CommandBuilder
+import com.lambda.util.text.buildText
+import com.lambda.util.text.literal
+
+object PrefixCommand : LambdaCommand(
+	"prefix",
+	usage = "prefix <prefix>",
+	description = "Sets the prefix for Lambda commands. If the prefix does not seem to work, try putting it in double quotes."
+) {
+	// i have no idea why someone would want to use some of these as a prefix
+	// but ig the people who run 20 clients at once could benefit from this
+	val ptrn = Regex("^[!\"#$%&'()*+,\\-./:;<=>?@\\[\\\\\\]^_`{|}~]$")
+
+	override fun CommandBuilder.create() {
+		required(greedyString("prefix")) { prefixStr ->
+			executeWithResult {
+				val prefix = prefixStr().value()
+				if (!ptrn.matches(prefix)) {
+					return@executeWithResult failure("Prefix must be a single non-alphanumeric ASCII character, excluding spaces.")
+				}
+				val prefixChar = prefix.first()
+				val configurable = Configuration.configurableByName("command") ?: return@executeWithResult failure("No command configurable found.")
+				val setting = configurable.settings.find { it.name == "prefix" } as? Setting<*, Char>
+					?: return@executeWithResult failure("Prefix setting is not a Char or can not be found.")
+				setting.trySetValue(prefixChar)
+				return@executeWithResult success()
+			}
+		}
+
+		execute {
+			info(
+				buildText {
+					literal("The prefix is currently: ${CommandRegistry.prefix}")
+				}
+			)
+		}
+	}
+}