Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-03-12 14:49:11 +01:00
Code Issues Projects Releases Wiki Activity

Rebase to master and fix complication issues

Browse Source
This commit is contained in:
Kieran Wallbanks 2021-03-15 14:56:37 +00:00
parent 8dc7328c76
commit 63aaee698e
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/main/java/net/minestom/server/command/builder/suggestion/SuggestionEntry.java
View File

@ -1,5 +1,6 @@
package net.minestom.server.command.builder.suggestion;
import net.kyori.adventure.text.Component;
import net.minestom.server.chat.JsonMessage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -7,15 +8,25 @@ import org.jetbrains.annotations.Nullable;
public class SuggestionEntry {
private final String entry;
private final JsonMessage tooltip;
private final Component tooltip;
/**
* @deprecated Use {{@link #SuggestionEntry(String, JsonMessage)}}
*/
@Deprecated
public SuggestionEntry(@NotNull String entry, @Nullable JsonMessage tooltip) {
this.entry = entry;
this.tooltip = tooltip;
this.tooltip = tooltip.asComponent();
}
public SuggestionEntry(@NotNull String entry, @Nullable Component tooltip) {
this.entry = entry;
this.tooltip = tooltip.asComponent();
}
public SuggestionEntry(@NotNull String entry) {
this(entry, null);
this.entry = entry;
this.tooltip = null;
}
@NotNull
@ -24,7 +35,16 @@ public class SuggestionEntry {
}
@Nullable
public JsonMessage getTooltip() {
public Component getTooltip() {
return tooltip;
}
/**
* @deprecated Use {@link #getTooltip()}
*/
@Deprecated
@Nullable
public JsonMessage getTooltipJson() {
return JsonMessage.fromComponent(tooltip);
}
}

2
src/main/java/net/minestom/server/entity/Player.java
View File

@ -17,8 +17,6 @@ import net.minestom.server.advancements.AdvancementTab;
import net.minestom.server.adventure.AdventurePacketConvertor;
import net.minestom.server.adventure.Localizable;
import net.minestom.server.attribute.Attribute;
import net.minestom.server.attribute.AttributeInstance;
import net.minestom.server.bossbar.BossBar;
import net.minestom.server.chat.ChatParser;
import net.minestom.server.chat.ColoredText;
import net.minestom.server.chat.JsonMessage;

2
src/test/java/demo/commands/HealthCommand.java
View File

@ -59,7 +59,7 @@ public class HealthCommand extends Command {
}
private void sendSuggestionMessage(CommandSender sender, CommandContext context) {
sender.sendMessage(Component.text("/health " + args.get("mode") + " [Integer]"));
sender.sendMessage(Component.text("/health " + context.get("mode") + " [Integer]"));
}
private void onHealthCommand(CommandSender sender, CommandContext context) {