style(command): simplify code

auioc · Mar 29, 2022 · 42cb7e2 · 42cb7e2
1 parent 196b3ac
commit 42cb7e2
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/src/main/java/org/auioc/mods/arnicalib/client/command/argument/LanguageInfoArgument.java b/src/main/java/org/auioc/mods/arnicalib/client/command/argument/LanguageInfoArgument.java
@@ -1,7 +1,7 @@
 package org.auioc.mods.arnicalib.client.command.argument;
 
-import java.util.SortedSet;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;
@@ -20,7 +20,7 @@
 @OnlyIn(Dist.CLIENT)
 public class LanguageInfoArgument implements ArgumentType<LanguageInfo> {
 
-    private static final DynamicCommandExceptionType UNKNOWN_CREATIVE_MODE_TAB = new DynamicCommandExceptionType(
+    private static final DynamicCommandExceptionType UNKNOWN_LANGUAGE_CODE = new DynamicCommandExceptionType(
         (langCode) -> TextUtils.I18nText(ArnicaLib.i18n("argument.language_info.unknown"), langCode)
     );
 
@@ -32,19 +32,18 @@ public static LanguageInfoArgument languageInfo() {
     public LanguageInfo parse(StringReader reader) throws CommandSyntaxException {
         String langCode = reader.readString();
         return getLanguages()
-            .stream()
             .filter((langInfo) -> langInfo.getCode().equals(langCode))
             .findAny()
-            .orElseThrow(() -> UNKNOWN_CREATIVE_MODE_TAB.create(langCode));
+            .orElseThrow(() -> UNKNOWN_LANGUAGE_CODE.create(langCode));
     }
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return SharedSuggestionProvider.suggest(getLanguages().stream().map(LanguageInfo::getCode), builder);
+        return SharedSuggestionProvider.suggest(getLanguages().map(LanguageInfo::getCode), builder);
     }
 
-    private static SortedSet<LanguageInfo> getLanguages() {
-        return Minecraft.getInstance().getLanguageManager().getLanguages();
+    private static Stream<LanguageInfo> getLanguages() {
+        return Minecraft.getInstance().getLanguageManager().getLanguages().stream();
     }
 
 }
diff --git a/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java b/src/main/java/org/auioc/mods/arnicalib/common/command/argument/CreativeModeTabArgument.java
@@ -1,8 +1,8 @@
 package org.auioc.mods.arnicalib.common.command.argument;
 
 import java.util.Arrays;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
 import com.mojang.brigadier.StringReader;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.context.CommandContext;
@@ -29,23 +29,19 @@ public static CreativeModeTabArgument creativeModeTab() {
     @Override
     public CreativeModeTab parse(StringReader reader) throws CommandSyntaxException {
         String langId = reader.readString();
-        return getAllTabs()
-            .stream()
+        return getTabs()
             .filter((tab) -> getLangId(tab).equals(langId))
             .findAny()
             .orElseThrow(() -> UNKNOWN_CREATIVE_MODE_TAB.create(langId));
     }
 
     @Override
     public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
-        return SharedSuggestionProvider.suggest(
-            getAllTabs().stream().map(CreativeModeTabArgument::getLangId),
-            builder
-        );
+        return SharedSuggestionProvider.suggest(getTabs().map(CreativeModeTabArgument::getLangId), builder);
     }
 
-    public static List<CreativeModeTab> getAllTabs() {
-        return Arrays.asList(CreativeModeTab.TABS);
+    public static Stream<CreativeModeTab> getTabs() {
+        return Arrays.asList(CreativeModeTab.TABS).stream();
     }
 
     public static String getLangId(CreativeModeTab tab) {