Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx2048M

# Fabric Properties
# check these on https://fabricmc.net/develop
minecraft_version=26.2-rc-2
minecraft_version=26.2
loader_version=0.18.3
loom_version=1.17-SNAPSHOT

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public static void register(
homeListBuilder
.requires(ECPerms.require(ECPerms.Registry.home_tp, 0))
.executes(ListCommandFactory.create(
ECText.getInstance().getString("cmd.home.list.start"),
"cmd.home.list.start",
"home tp",
HomeCommand.Suggestion::getSuggestionEntries));

Expand Down Expand Up @@ -255,7 +255,7 @@ public static void register(
warpListBuilder
.requires(ECPerms.require(ECPerms.Registry.warp_tp, 0))
.executes(ListCommandFactory.create(
ECText.getInstance().getString("cmd.warp.list.start"),
"cmd.warp.list.start",
"warp tp",
(context) -> ManagerLocator.getInstance().getWorldDataManager().getAccessibleWarps(context.getSource().getPlayerOrException()).toList(),
NamedMinecraftLocation::getName
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ private ListCommandFactory() {}

// Specify leading response text, and supplier of list of strings/Text
public static <T> Command<CommandSourceStack> create(
String responsePreText,
String translationKey,
String commandExecText,
SuggestionListProvider<Entry<String, T>> suggestionsProvider)
{
return (CommandContext<CommandSourceStack> context) -> {
String responsePreText = ECText.getInstance().getString(translationKey);
var styleProvider = PlayerProfile.accessFromContextOrThrow(context);
Collection<Entry<String, T>> suggestionsList = suggestionsProvider.getSuggestionList(context);

Expand All @@ -46,12 +47,13 @@ public static <T> Command<CommandSourceStack> create(
}

public static <T> Command<CommandSourceStack> create(
String responsePreText,
String translationKey,
String commandExecText,
SuggestionListProvider<T> suggestionsProvider,
Function<T, String> nameAccessor)
{
return (CommandContext<CommandSourceStack> context) -> {
String responsePreText = ECText.getInstance().getString(translationKey);
var styleProvider = PlayerProfile.accessFromContextOrThrow(context);
Collection<T> suggestionsList = suggestionsProvider.getSuggestionList(context);

Expand Down