Detection of server operators and more debug commands

Author: MrSlimeDiamond

lib/src/main/java/org/galliumpowered/data/ServerOperator.java

@@ -22,6 +22,7 @@ public class PermissionManager {
     public boolean playerHasPermission(Player player, String permission) {
         log.debug("Called playerHasPermission");
         if (permission.isEmpty()) return true;
+        if (player.isOperator()) return true;
         try {
             // Check against player
             log.debug("Checking against player...");

lib/src/main/java/org/galliumpowered/permission/PermissionManager.java

@@ -147,4 +147,11 @@ default void setPrefix(String prefix) throws SQLException {
      * @return Player online status
      */
     boolean isOnline();
+
+    /**
+     * Get whether this player is a server operator
+     *
+     * @return Server operator status
+     */
+    boolean isOperator();
 }

lib/src/main/java/org/galliumpowered/world/entity/Player.java

@@ -7,13 +7,18 @@
 
 import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.GameProfileRepository;
 import com.mojang.authlib.minecraft.MinecraftSessionService;
 import com.mojang.datafixers.DataFixer;
 import java.io.BufferedReader;
+import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.io.Reader;
 import java.io.Writer;
 import java.net.InetAddress;
 import java.net.Proxy;
@@ -24,6 +29,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
+import java.util.UUID;
 import java.util.function.BooleanSupplier;
 import java.util.regex.Pattern;
 import javax.annotation.Nullable;
@@ -68,9 +74,7 @@
 import net.minecraft.world.level.storage.WorldData;
 import org.galliumpowered.Gallium;
 import org.galliumpowered.GalliumConsole;
-import org.galliumpowered.Mod;
 import org.galliumpowered.event.system.ServerStartEvent;
-import org.apache.logging.log4j.LogManager;
 import org.galliumpowered.plugin.PluginLifecycleState;
 
 public class DedicatedServer extends MinecraftServer implements ServerInterface {

server/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java

@@ -1,7 +1,6 @@
 package org.galliumpowered;
 
 import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.dedicated.DedicatedServer;
 import org.galliumpowered.bridge.BridgeImpl;
 import org.galliumpowered.command.CommandManager;
 import org.galliumpowered.database.Database;

server/src/main/java/org/galliumpowered/Mod.java

@@ -80,6 +80,11 @@ public boolean isOnline() {
                 .anyMatch(player -> player.getUUID().equals(UUID.fromString(getUUID())));
     }
 
+    @Override
+    public boolean isOperator() {
+        return Mod.getMinecraftServer().getPlayerList().isOp(serverPlayer.getGameProfile());
+    }
+
     @Override
     public String getName() {
         return serverPlayer.getName().getContents().strip();

server/src/main/java/org/galliumpowered/world/entity/PlayerImpl.java

@@ -1,6 +1,7 @@
 package org.galliumpowered.testplugin.commands;
 
 import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.NamedTextColor;
 import org.galliumpowered.Gallium;
 import org.galliumpowered.annotation.Args;
 import org.galliumpowered.annotation.Command;
@@ -88,4 +89,34 @@ public void suicideCommand(CommandContext ctx) {
             Gallium.getServer().sendMsgToAll(Component.text(player.getPrefix() + player.getName() + Colors.GREEN + " took the easy way out."));
         });
     }
+
+    @Command(aliases = "amiop", description = "Check if you are an operator")
+    public void checkOpCommand(CommandContext ctx) {
+        ctx.ifPlayer(player ->
+                player.sendMessage(Component.text(player.isOperator()))
+        ).ifConsole(console ->
+                console.sendMessage("You're the console, silly, of course you're op.")
+        );
+    }
+
+    @Command(aliases = "searchplayer", description = "Search for a player (debug command)", args = {
+            @Args(type = ArgumentType.SINGLE, name = "username")
+    })
+    public void searchPlayerCommand(CommandContext ctx) {
+        ctx.getArgument("username").ifPresentOrElse(username -> {
+            // Search for the player by their username
+            Gallium.getServer().getPlayerByName(username).ifPresentOrElse(player -> {
+                ctx.getCaller().sendMessage(
+                        "Found player! Username: " + player.getName() + " UUID: " +
+                                player.getUUID());
+            }, () -> {
+                ctx.getCaller().sendMessage(
+                        Component.text("Could not find that player").color(NamedTextColor.RED));
+            });
+
+        }, () -> {
+            ctx.getCaller()
+                    .sendMessage(Component.text("Specify a username!").color(NamedTextColor.RED));
+        });
+    }
 }