diff --git a/src/main/java/io/github/sakurawald/module/initializer/chat/ChatInitializer.java b/src/main/java/io/github/sakurawald/module/initializer/chat/ChatInitializer.java index 33776961d..0b2ec2190 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/chat/ChatInitializer.java +++ b/src/main/java/io/github/sakurawald/module/initializer/chat/ChatInitializer.java @@ -109,7 +109,7 @@ private void registerEnderPlaceholder() { MessageUtil.ofComponent(player, "display.ender_chest.text") .hoverEvent(MessageUtil.ofComponent(player, "display.click.prompt")) .clickEvent(buildDisplayClickEvent(displayUUID)); - return PlaceholderResult.value(MessageUtil.toVomponent(replacement)); + return PlaceholderResult.value(MessageUtil.toText(replacement)); }); } @@ -126,7 +126,7 @@ private void registerInvPlaceholder() { .hoverEvent(MessageUtil.ofComponent(player, "display.click.prompt")) .clickEvent(buildDisplayClickEvent(displayUUID)); - return PlaceholderResult.value(MessageUtil.toVomponent(replacement)); + return PlaceholderResult.value(MessageUtil.toText(replacement)); }); } @@ -142,7 +142,7 @@ public void registerItemPlaceholder() { Component.text("[%s]".formatted(player.getMainHandStack().getName().getString())) .hoverEvent(MessageUtil.ofComponent(player, "display.click.prompt")) .clickEvent(buildDisplayClickEvent(displayUUID)); - return PlaceholderResult.value(MessageUtil.toVomponent(replacement)); + return PlaceholderResult.value(MessageUtil.toText(replacement)); }); } @@ -179,7 +179,7 @@ public void registerPosPlaceholder() { .clickEvent(ClickEvent.runCommand(clickCommand)) .hoverEvent(Component.text(hoverString + "\n").append(MessageUtil.ofComponent(player, "chat.xaero_waypoint_add"))); - return PlaceholderResult.value(MessageUtil.toVomponent(component)); + return PlaceholderResult.value(MessageUtil.toText(component)); }); } diff --git a/src/main/java/io/github/sakurawald/module/initializer/works/WorksInitializer.java b/src/main/java/io/github/sakurawald/module/initializer/works/WorksInitializer.java index f9be4cd4f..8f6cc9aaf 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/works/WorksInitializer.java +++ b/src/main/java/io/github/sakurawald/module/initializer/works/WorksInitializer.java @@ -209,7 +209,7 @@ private boolean hasPermission(ServerPlayerEntity player, Work work) { .setItem(Items.PLAYER_HEAD) .setName(MessageUtil.ofText(player, "works.list.help")) .setSkullOwner(GuiUtil.QUESTION_MARK_ICON) - .setLore(MessageUtil.ofVomponents(player, "works.list.help.lore"))); + .setLore(MessageUtil.ofTextList(player, "works.list.help.lore"))); gui.setSlot(52, new GuiElementBuilder() .setItem(Items.COMPASS) .setName(MessageUtil.ofText(player, "search")) diff --git a/src/main/java/io/github/sakurawald/module/initializer/works/work_type/ProductionWork.java b/src/main/java/io/github/sakurawald/module/initializer/works/work_type/ProductionWork.java index d0146c7f0..2491110c0 100644 --- a/src/main/java/io/github/sakurawald/module/initializer/works/work_type/ProductionWork.java +++ b/src/main/java/io/github/sakurawald/module/initializer/works/work_type/ProductionWork.java @@ -61,7 +61,7 @@ private List formatSampleCounter(ServerPlayerEntity player) { double rate = entry.getValue() * ((double) (3600 * 1000) / ((Math.min(this.sample.sampleEndTimeMS, currentTimeMS)) - this.sample.sampleStartTimeMS)); net.kyori.adventure.text.Component component = MessageUtil.ofComponent(player, "works.production_work.prop.sample_counter.entry", entry.getValue(), rate) .replaceText(TextReplacementConfig.builder().matchLiteral("[item]").replacement(Text.translatable(key)).build()); - ret.add(MessageUtil.toVomponent(component)); + ret.add(MessageUtil.toText(component)); }); if (ret.isEmpty()) { @@ -76,7 +76,7 @@ public List asLore(ServerPlayerEntity player) { List ret = super.asLore(player); // note: hide sample info in lore if sample not exists if (this.sample.sampleStartTimeMS == 0) { - ret.addAll((MessageUtil.ofVomponents(player, "works.production_work.sample.not_exists"))); + ret.addAll((MessageUtil.ofTextList(player, "works.production_work.sample.not_exists"))); return ret; } @@ -141,7 +141,7 @@ public void openSpecializedSettingsGui(ServerPlayerEntity player, SimpleGui pare gui.addSlot(new GuiElementBuilder() .setItem(Items.CLOCK) .setName(MessageUtil.ofText(player, "works.production_work.set.sample")) - .setLore(MessageUtil.ofVomponents(player, "works.production_work.set.sample.lore")) + .setLore(MessageUtil.ofTextList(player, "works.production_work.set.sample.lore")) .setCallback(() -> new ConfirmGui(player) { @Override public void onConfirm() { diff --git a/src/main/java/io/github/sakurawald/module/mixin/afk/ServerPlayerMixin.java b/src/main/java/io/github/sakurawald/module/mixin/afk/ServerPlayerMixin.java index 2179d44b0..207c5a0b5 100644 --- a/src/main/java/io/github/sakurawald/module/mixin/afk/ServerPlayerMixin.java +++ b/src/main/java/io/github/sakurawald/module/mixin/afk/ServerPlayerMixin.java @@ -19,7 +19,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import static io.github.sakurawald.util.MessageUtil.ofComponent; -import static io.github.sakurawald.util.MessageUtil.toVomponent; +import static io.github.sakurawald.util.MessageUtil.toText; @Mixin(ServerPlayerEntity.class) public abstract class ServerPlayerMixin implements AfkStateAccessor { @@ -45,7 +45,7 @@ public abstract class ServerPlayerMixin implements AfkStateAccessor { cir.setReturnValue(Text.literal("afk " + player.getGameProfile().getName())); net.kyori.adventure.text.@NotNull Component component = ofComponent(null, false,Configs.configHandler.model().modules.afk.format) .replaceText(TextReplacementConfig.builder().match("%player_display_name%").replacement(player.getDisplayName()).build()); - cir.setReturnValue(toVomponent(component)); + cir.setReturnValue(toText(component)); } else { cir.setReturnValue(null); } diff --git a/src/main/java/io/github/sakurawald/util/MessageUtil.java b/src/main/java/io/github/sakurawald/util/MessageUtil.java index 317a47d19..efe998298 100644 --- a/src/main/java/io/github/sakurawald/util/MessageUtil.java +++ b/src/main/java/io/github/sakurawald/util/MessageUtil.java @@ -168,7 +168,7 @@ public static void sendMessageToPlayerEntity(PlayerEntity player, String key, Ob return ofText(null, false, str, args); } - public static List ofVomponents(@Nullable Audience audience, String key, Object... args) { + public static List ofTextList(@Nullable Audience audience, String key, Object... args) { String lines = getString(audience, key, args); List ret = new ArrayList<>(); @@ -178,7 +178,7 @@ public static List ofVomponents(@Nullable Audience audience, String key, O return ret; } - public static @NotNull Text toVomponent(Component component) { + public static @NotNull Text toText(Component component) { return adventure.toNative(component); }