From 8d86ee4f162335efeb4851c9d4c4f4025ea8fce5 Mon Sep 17 00:00:00 2001
From: jojo <yoyosource@nidido.de>
Date: Wed, 30 Dec 2020 13:39:05 +0100
Subject: [PATCH] Optimize Argument.GAMEMODE

---
 .../src/de/steamwar/command/Argument.java     | 22 +++++--------------
 .../de/steamwar/command/ArgumentUtils.java    |  1 -
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/SpigotCore_Main/src/de/steamwar/command/Argument.java b/SpigotCore_Main/src/de/steamwar/command/Argument.java
index ff3ecfd..d5b680c 100644
--- a/SpigotCore_Main/src/de/steamwar/command/Argument.java
+++ b/SpigotCore_Main/src/de/steamwar/command/Argument.java
@@ -50,22 +50,14 @@ public class Argument<T> {
     public static final Argument<Player> PLAYER = new Argument<>(Bukkit::getPlayer, Objects::nonNull, () -> Bukkit.getOnlinePlayers().stream().map(Player::getName).toArray(String[]::new));
 
     public static final Argument<GameMode> GAMEMODE = new Argument<>(s -> {
-        switch (s) {
-            case "creative":
-            case "c":
-            case "1":
+        switch (s.toLowerCase()) {
+            case "creative": case "c": case "1":
                 return GameMode.CREATIVE;
-            case "survival":
-            case "s":
-            case "0":
+            case "survival": case "s": case "0":
                 return GameMode.SURVIVAL;
-            case "spectator":
-            case "sp":
-            case "3":
+            case "spectator": case "sp": case "3":
                 return GameMode.SPECTATOR;
-            case "adventure":
-            case "a":
-            case "2":
+            case "adventure": case "a": case "2":
                 return GameMode.ADVENTURE;
         }
         return null;
@@ -107,9 +99,7 @@ public class Argument<T> {
     public Optional<?> valueSupplier(String s) {
         try {
             T argumentMapped = mapper.apply(s);
-            if (constraint.test(argumentMapped)) {
-                return Optional.ofNullable(argumentMapped);
-            }
+            if (constraint.test(argumentMapped)) return Optional.ofNullable(argumentMapped);
         } catch (NumberFormatException e) {
             return Optional.empty();
         } catch (Exception e) {
diff --git a/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java b/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java
index 4ad0746..676482f 100644
--- a/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java
+++ b/SpigotCore_Main/src/de/steamwar/command/ArgumentUtils.java
@@ -22,7 +22,6 @@ package de.steamwar.command;
 
 import java.util.Arrays;
 import java.util.function.BiPredicate;
-import java.util.function.Function;
 import java.util.function.Predicate;
 
 public class ArgumentUtils {