code: optimize code

Author: jfglzs

src/main/java/io/github/optijava/opt_carpet_addition/OptCarpetAddition.java

@@ -55,19 +55,21 @@ public void onGameStarted() {
             //#else
             if (Objects.equals(rule.name, "forceFakePlayerGameMode") && !Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false")) {
             //#endif
-                GameMode gameMode = GameMode.SURVIVAL;
+                GameMode gameMode;
 
                 if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) {
                     gameMode = GameMode.CREATIVE;
                 } else if (OptCarpetSettings.forceFakePlayerGameMode.equals("adventure")) {
                     gameMode = GameMode.ADVENTURE;
+                } else {
+                    gameMode = GameMode.SURVIVAL;
                 }
 
-                for (ServerPlayerEntity player : serverCommandSource.getServer().getPlayerManager().getPlayerList()) {
+                serverCommandSource.getServer().getPlayerManager().getPlayerList().forEach(player -> {
                     if (player instanceof EntityPlayerMPFake) {
                         player.changeGameMode(gameMode);
                     }
-                }
+                });
             }
 
             //#if MC >= 11900
@@ -145,7 +147,7 @@ public void registerCommands(CommandDispatcher<ServerCommandSource> dispatcher)
 
     @Override
     public void onPlayerLoggedIn(ServerPlayerEntity player) {
-        if (player instanceof EntityPlayerMPFake && !(Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false"))) {
+        if (!(Objects.equals(OptCarpetSettings.forceFakePlayerGameMode, "false")) && player instanceof EntityPlayerMPFake) {
             GameMode gameMode = GameMode.SURVIVAL;
 
             if (OptCarpetSettings.forceFakePlayerGameMode.equals("creative")) {

src/main/java/io/github/optijava/opt_carpet_addition/commands/ListAdvanceCommand.java

@@ -30,7 +30,7 @@ private static int listAdvance(CommandContext<ServerCommandSource> context) {
             MinecraftServer minecraftServer = context.getSource().getServer();
             StringBuilder sb = new StringBuilder();
             sb.append("\n");
-            for (ServerPlayerEntity s : minecraftServer.getPlayerManager().getPlayerList()) {
+            minecraftServer.getPlayerManager().getPlayerList().forEach(s -> {
                 //#if MC >= 12110
                 //$$ sb.append(s.getName().getString()).append("    ").append(s.getGameMode().getId()).append("    ").append(s.networkHandler.getLatency()).append("ms    ").append(s.getIp()).append("    ").append(s.getGameProfile().id().toString()).append("\n");
                 //#endif
@@ -40,7 +40,7 @@ private static int listAdvance(CommandContext<ServerCommandSource> context) {
                 //#if MC < 12004
                 sb.append(s.getName().getString()).append("    ").append(s.interactionManager.getGameMode().getName()).append("    ").append(s.pingMilliseconds).append("ms    ").append(s.getIp()).append("    ").append(s.getGameProfile().getId().toString()).append("\n");
                 //#endif
-            }
+            });
             // OptCarpetAddition.LOGGER.info(sb.toString());
             Messenger.m(context.getSource(), sb.toString());
         } catch (Exception e) {

src/main/java/io/github/optijava/opt_carpet_addition/commands/PlayerTpCommand.java

@@ -277,38 +277,18 @@ private static void executeTpHere(String commandSourcePlayerName, CommandContext
     }
 
     private static boolean checkTpBlacklist(String name) {
-        for (String s : OptCarpetSettings.tpLimitConfigBean.TpBlacklist) {
-            if (name.startsWith(s)) {
-                return false;
-            }
-        }
-        return true;
+        return OptCarpetSettings.tpLimitConfigBean.TpBlacklist.stream().noneMatch(name::startsWith);
     }
 
     private static boolean checkTpWhitelist(String name) {
-        for (String s : OptCarpetSettings.tpLimitConfigBean.TpWhitelist) {
-            if (name.startsWith(s)) {
-                return true;
-            }
-        }
-        return false;
+        return OptCarpetSettings.tpLimitConfigBean.TpWhitelist.stream().anyMatch(name::startsWith);
     }
 
     private static boolean checkTpHereBlacklist(String name) {
-        for (String s : OptCarpetSettings.tpLimitConfigBean.TphereBlacklist) {
-            if (name.startsWith(s)) {
-                return false;
-            }
-        }
-        return true;
+        return OptCarpetSettings.tpLimitConfigBean.TphereBlacklist.stream().noneMatch(name::startsWith);
     }
 
     private static boolean checkTpHereWhitelist(String name) {
-        for (String s : OptCarpetSettings.tpLimitConfigBean.TphereWhitelist) {
-            if (name.startsWith(s)) {
-                return true;
-            }
-        }
-        return false;
+        return OptCarpetSettings.tpLimitConfigBean.TphereWhitelist.stream().anyMatch(name::startsWith);
     }
 }