Remove Unused Code

src/main/java/com/dreammaster/command/CustomDropsCommand.java

@@ -1,17 +1,17 @@
 package com.dreammaster.command;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
+import net.minecraft.command.PlayerNotFoundException;
+import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
 
 import com.dreammaster.main.MainRegistry;
 
-import eu.usrv.yamcore.auxiliary.PlayerChatHelper;
+import net.minecraft.util.ChatComponentTranslation;
 
 public class CustomDropsCommand extends CommandBase {
 
@@ -21,73 +21,52 @@ public String getCommandName() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "/customdrops reload|toggleinfo";
+    public String getCommandUsage(ICommandSender sender) {
+        return "dreamcraft.command.customdrops.usage";
     }
 
     @Override
     public List<String> getCommandAliases() {
-        List<String> aliases = new ArrayList<>();
-        aliases.add("cdrops");
-        aliases.add("cdr");
-        return aliases;
+        return Arrays.asList("cdrops", "cdr");
     }
 
     @Override
-    public void processCommand(ICommandSender pCmdSender, String[] pArgs) {
-        if (pArgs.length == 0) {
-            if (inGame(pCmdSender)) {
-                PlayerChatHelper.SendError(pCmdSender, "Syntax error. Type /customdrops help for help");
-            } else {
-                PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Syntax error. Type /customdrops help for help");
-            }
-        } else if ("help".equalsIgnoreCase(pArgs[0])) {
-            sendHelpToPlayer(pCmdSender);
-        } else if ("toggleinfo".equalsIgnoreCase(pArgs[0])) {
-            if (!inGame(pCmdSender)) {
-                PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] This command can only be executed in game");
+    public int getRequiredPermissionLevel() {
+        return 2;
+    }
+
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length == 0) {
+            throw new WrongUsageException(getCommandUsage(sender));
+        } else if ("toggleinfo".equalsIgnoreCase(args[0])) {
+            EntityPlayer targetPlayer;
+
+            if (args.length == 2) {
+                targetPlayer = getPlayer(sender, args[1]);
+            } else if (sender instanceof EntityPlayer entityPlayer) {
+                targetPlayer = entityPlayer;
             } else {
-                EntityPlayer tEP = (EntityPlayer) pCmdSender;
-                MainRegistry.Module_CustomDrops.toggleDeathInfoForPlayer(tEP);
+                throw new PlayerNotFoundException();
             }
-        } else if ("reload".equalsIgnoreCase(pArgs[0])) {
-            boolean tFlag = MainRegistry.Module_CustomDrops.ReloadCustomDrops();
-            if (!tFlag) {
-                if (!inGame(pCmdSender)) {
-                    PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Reload failed. Check your log for syntax errors");
-                } else {
-                    PlayerChatHelper.SendWarn(pCmdSender, "Reload failed. Check your log for syntax errors");
-                }
+
+            MainRegistry.Module_CustomDrops.toggleDeathInfoForPlayer(targetPlayer);
+        } else if ("reload".equalsIgnoreCase(args[0])) {
+            if (MainRegistry.Module_CustomDrops.ReloadCustomDrops()) {
+                sender.addChatMessage(new ChatComponentTranslation("dreamcraft.command.reload.success"));
             } else {
-                if (!inGame(pCmdSender)) {
-                    PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Reload done. New config is activated");
-                } else {
-                    PlayerChatHelper.SendInfo(pCmdSender, "Reload done. New config is activated");
-                }
+                sender.addChatMessage(new ChatComponentTranslation("dreamcraft.command.reload.failure"));
             }
         } else {
-            sendHelpToPlayer(pCmdSender);
-        }
-    }
-
-    private boolean inGame(ICommandSender pCmdSender) {
-        return pCmdSender instanceof EntityPlayer;
-    }
-
-    private void sendHelpToPlayer(ICommandSender pCmdSender) {
-        if (!inGame(pCmdSender)) {
-            PlayerChatHelper.SendPlain(pCmdSender, "[CDRP] Valid options are: reload");
-        } else {
-            PlayerChatHelper.SendInfo(pCmdSender, "/customdrops reload|toggleinfo");
+            throw new WrongUsageException(getCommandUsage(sender));
         }
     }
 
     @Override
-    public boolean canCommandSenderUseCommand(ICommandSender pCommandSender) {
-        if (pCommandSender instanceof EntityPlayerMP tEP) {
-            return MinecraftServer.getServer().getConfigurationManager().func_152596_g(tEP.getGameProfile());
-        } else {
-            return pCommandSender instanceof MinecraftServer;
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return getListOfStringsMatchingLastWord(args, "toggleinfo", "reload");
         }
+        return null;
     }
 }

src/main/java/com/dreammaster/command/CustomFuelsCommand.java

@@ -1,17 +1,15 @@
 package com.dreammaster.command;
 
-import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.ICommandSender;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
+import net.minecraft.command.WrongUsageException;
 
 import com.dreammaster.main.MainRegistry;
 
-import eu.usrv.yamcore.auxiliary.PlayerChatHelper;
+import net.minecraft.util.ChatComponentTranslation;
 
 public class CustomFuelsCommand extends CommandBase {
 
@@ -21,66 +19,40 @@ public String getCommandName() {
     }
 
     @Override
-    public String getCommandUsage(ICommandSender p_71518_1_) {
-        return "/customfuels reload";
+    public String getCommandUsage(ICommandSender sender) {
+        return "dreamcraft.command.customfuels.usage";
     }
 
     @Override
     public List<String> getCommandAliases() {
-        ArrayList<String> aliases = new ArrayList<>();
-        aliases.add("cfuels");
-        aliases.add("cfl");
-        return aliases;
+        return Arrays.asList("cfuels", "cfl");
     }
 
     @Override
-    public void processCommand(ICommandSender pCmdSender, String[] pArgs) {
-        if (pArgs.length == 0) {
-            if (inGame(pCmdSender)) {
-                PlayerChatHelper.SendError(pCmdSender, "Syntax error. Type /customfuels help for help");
-            } else {
-                PlayerChatHelper.SendPlain(pCmdSender, "[CFLS] Syntax error. Type /customfuels help for help");
-            }
-        } else if ("help".equalsIgnoreCase(pArgs[0])) {
-            sendHelpToPlayer(pCmdSender);
-        } else if ("reload".equalsIgnoreCase(pArgs[0])) {
-            boolean tFlag = MainRegistry.Module_CustomFuels.ReloadCustomFuels();
-            if (!tFlag) {
-                if (!inGame(pCmdSender)) {
-                    PlayerChatHelper.SendPlain(pCmdSender, "[CFLS] Reload failed. Check your log for syntax errors");
-                } else {
-                    PlayerChatHelper.SendWarn(pCmdSender, "Reload failed. Check your log for syntax errors");
-                }
-            } else {
-                if (!inGame(pCmdSender)) {
-                    PlayerChatHelper.SendPlain(pCmdSender, "[CFLS] Reload done. New config is activated");
-                } else {
-                    PlayerChatHelper.SendInfo(pCmdSender, "Reload done. New config is activated");
-                }
-            }
-        } else {
-            sendHelpToPlayer(pCmdSender);
-        }
+    public int getRequiredPermissionLevel() {
+        return 2;
     }
 
-    private boolean inGame(ICommandSender pCmdSender) {
-        return pCmdSender instanceof EntityPlayer;
-    }
-
-    private void sendHelpToPlayer(ICommandSender pCmdSender) {
-        if (!inGame(pCmdSender)) {
-            PlayerChatHelper.SendPlain(pCmdSender, "[CFLS] Valid options are: reload");
+    @Override
+    public void processCommand(ICommandSender sender, String[] args) {
+        if (args.length == 0) {
+            throw new WrongUsageException(getCommandUsage(sender));
+        } else if ("reload".equalsIgnoreCase(args[0])) {
+            if (MainRegistry.Module_CustomFuels.ReloadCustomFuels()) {
+                sender.addChatMessage(new ChatComponentTranslation("dreamcraft.command.reload.success"));
+            } else {
+                sender.addChatMessage(new ChatComponentTranslation("dreamcraft.command.reload.failure"));
+            }
         } else {
-            PlayerChatHelper.SendInfo(pCmdSender, "/customfuels reload");
+            throw new WrongUsageException(getCommandUsage(sender));
         }
     }
 
     @Override
-    public boolean canCommandSenderUseCommand(ICommandSender pCommandSender) {
-        if (pCommandSender instanceof EntityPlayerMP tEP) {
-            return MinecraftServer.getServer().getConfigurationManager().func_152596_g(tEP.getGameProfile());
-        } else {
-            return pCommandSender instanceof MinecraftServer;
+    public List<String> addTabCompletionOptions(ICommandSender sender, String[] args) {
+        if (args.length == 1) {
+            return getListOfStringsMatchingLastWord(args, "reload");
         }
+        return null;
     }
 }