Skip to content

fix a crash when a player gets killed by an enchanted item #132

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

Open
macuguita wants to merge 1 commit into
base: 1.21
Choose a base branch
from
Open

fix a crash when a player gets killed by an enchanted item #132

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
24 changes: 11 additions & 13 deletions src/main/java/folk/sisby/surveyor/util/TextUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
package folk.sisby.surveyor.util;

import net.minecraft.text.MutableText;
import net.minecraft.text.Style;
import net.minecraft.text.Text;
import net.minecraft.text.Texts;
import net.minecraft.text.*;
import net.minecraft.util.Formatting;

import java.util.Arrays;
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.function.Function;

public class TextUtil {
public static Text stripInteraction(Text text) {
MutableText mutable = text.copy();
List<Text> siblings = mutable.getSiblings().stream().map(TextUtil::stripInteraction).toList();
mutable.getSiblings().clear();
mutable.getSiblings().addAll(siblings);
return stripInteractionNonRecursively(mutable);
}
TextContent content = text.getContent() instanceof TranslatableTextContent t
? new TranslatableTextContent(t.getKey(), t.getFallback(), Arrays.stream(t.getArgs())
.map(a -> a instanceof Text c ? stripInteraction(c) : a)
.toArray())
: text.getContent();

public static Text stripInteractionNonRecursively(Text text) {
return text.copy().styled(s -> s.withHoverEvent(null).withClickEvent(null).withInsertion(null));
MutableText result = MutableText.of(content)
.setStyle(text.getStyle().withHoverEvent(null).withClickEvent(null).withInsertion(null));
text.getSiblings().forEach(s -> result.append(stripInteraction(s)));
return result;
}

public static MutableText highlightStrings(Collection<String> list, Function<String, Formatting> highlighter) {
Expand Down