[Gardening] Fix up code smell, unused headers, and resolve warnings

Author: 0x41c

Client/.idea/workspace.xml

@@ -12,12 +12,11 @@ class MacOSInjector: public Injector {
 public:
 
     MacOSInjector() = default;
-    bool inject(argparse::ArgumentParser parser, int pid) final;
-    int getLunarPID(argparse::ArgumentParser parser) final;
 
-//private:
-//    kern_return_t injectToTask(mach_port_t task, string dllpath);
-//    kern_return_t getThreadPortForTask(mach_port_t task, mach_port_t *thread);
+    bool inject(const argparse::ArgumentParser& parser, int pid) final;
+
+    int getLunarPID(const argparse::ArgumentParser& parser) final;
+
 };
 
 #endif //CEROCLIENT_MINJECTOR_H

ClientInjector/include/macOS/injector.h

@@ -12,9 +12,16 @@
 
 class Injector {
 public:
-    virtual bool inject(argparse::ArgumentParser parser, int pid) = 0;
-    virtual int getLunarPID(argparse::ArgumentParser parser) = 0;
-    string getDLLPath(argparse::ArgumentParser parser);
+
+    Injector() = default;
+    virtual ~Injector() = default;
+
+    virtual bool inject(const argparse::ArgumentParser& parser, int pid) = 0;
+
+    virtual int getLunarPID(const argparse::ArgumentParser& parser) = 0;
+
+    static string getDLLPath(const argparse::ArgumentParser& parser);
+
 };
 
 #endif //CEROCLIENT_INJECTOR_H

ClientInjector/include/macOS/remoteExec/remoteExec.h

@@ -9,9 +9,14 @@
 
 class WindowsInjector: public Injector {
 public:
+
     WindowsInjector() = default;
-    bool inject(argparse::ArgumentParser parser, int pid) final;
-    int getLunarPID(argparse::ArgumentParser parser) final;
+    virtual ~WindowsInjector() = default;
+
+    bool inject(const argparse::ArgumentParser& parser, int pid) final;
+
+    int getLunarPID(const argparse::ArgumentParser& parser) final;
+
 };
 
 #endif //CEROCLIENT_WINJECTOR_H

ClientInjector/include/shared/injector.h

@@ -7,12 +7,11 @@
 
 #include <macOS/injector.h>
 #include <macOS/mip-mini/inject.h>
-#include <macOS/remoteExec/remoteExec.h>
 
 string exec(const string& cmd);
-vector<string> split(string phrase, const string& delimiter);
+vector<string> split(string phrase, string_view delimiter);
 
-bool MacOSInjector::inject(argparse::ArgumentParser parser, int pid) {
+bool MacOSInjector::inject(const argparse::ArgumentParser& parser, int pid) {
 
     string dllPath = getDLLPath(parser);
     mach_port_t task;
@@ -34,7 +33,7 @@ bool MacOSInjector::inject(argparse::ArgumentParser parser, int pid) {
     return !ret;
 }
 
-int MacOSInjector::getLunarPID(argparse::ArgumentParser parser) {
+int MacOSInjector::getLunarPID(const argparse::ArgumentParser& parser) {
     string output = exec("ps aux | grep optifine");
     vector<string> newList;
     double versionIDX = 0.0;
@@ -81,16 +80,16 @@ string exec(const string& cmd) {
     array<char, 128> buffer {};
     string result;
     unique_ptr<FILE, decltype(&pclose)> pipe(popen(cmd.c_str(), "r"), pclose);
-    if (!pipe) {
+    if (!pipe)
         throw std::runtime_error("popen() failed!");
-    }
+
     while (fgets(buffer.data(), buffer.size(), pipe.get()) != nullptr) {
         result += buffer.data();
     }
     return result;
 }
 
-vector<string> split(string phrase, const string& delimiter) {
+vector<string> split(string phrase, string_view delimiter) {
     vector<string> list;
     size_t pos = 0;
     string token;

ClientInjector/include/windows/injector.h

@@ -3,8 +3,10 @@
 //
 
 #include <shared/injector.h>
+#include "macOS/injector.h"
 
-string Injector::getDLLPath(argparse::ArgumentParser parser) {
+
+string Injector::getDLLPath(const argparse::ArgumentParser& parser) {
 
     // The injector binary needs a couple resources to be in certain places.
     // This is what the local structure needs to look like:
@@ -21,40 +23,44 @@ string Injector::getDLLPath(argparse::ArgumentParser parser) {
     // Resources is copied to ~/.ceroclient/resources so that libClientLoader.dylib
     // knows where to look for Client.jar.
 
-    auto currentPath = (string)current_path();
+    path currentPath = current_path();
 
     // ensure ./Resources
-    auto localResourcePath = currentPath + path_sep + HOMEDIR_RESOURCES_NAME;
+    path localResourcePath = currentPath / HOMEDIR_RESOURCES_NAME;
     if (!exists(localResourcePath)) {
         cerr << "Resource path missing from current path." << endl << parser << endl;
         exit(1);
     }
 
     // Ensure ./Resources/libClientLoader.ext
-    auto libClientLoaderPath = localResourcePath + path_sep + RESOURCE_CLIENTLOADER_NAME + DYNAMIC_EXT;
-    if (!exists(libClientLoaderPath)) {
+    if (
+        path libClientLoaderPath = localResourcePath / ((string)RESOURCE_CLIENTLOADER_NAME + DYNAMIC_EXT);
+        !exists(libClientLoaderPath)
+    ) {
         cerr << "Missing libClientLoader." << endl << parser << endl;
         exit(1);
     }
 
     // Ensure ./Resources/Client.jar
-    auto clientPath = localResourcePath + path_sep + RESOURCE_CLIENTJAR_NAME + ".jar";
-    if (!exists(clientPath)) {
+    if (
+        auto clientPath = localResourcePath / ((string)RESOURCE_CLIENTJAR_NAME + ".jar");
+        !exists(clientPath)
+    ) {
         cerr << "Missing client jar." << endl << parser << endl;
         exit(1);
     }
 
-    auto homePath = getHomePath();
+    filesystem::path homePath = getHomePath();
     Ensure(homePath);
     permissions(homePath, perms::all);
 
     // NOTE: Only do this for debug builds
-    auto homeResourcePath = homePath + path_sep + HOMEDIR_RESOURCES_NAME;
+    auto homeResourcePath = homePath / HOMEDIR_RESOURCES_NAME;
 
     using namespace filesystem;
     auto options = copy_options::overwrite_existing | copy_options::recursive;
     copy(localResourcePath.c_str(), homeResourcePath, options); // Weird build glitch when both paths are same type
     permissions(localResourcePath, perms::all);
-    return homeResourcePath + path_sep + RESOURCE_CLIENTLOADER_NAME + DYNAMIC_EXT;
+    return homeResourcePath / ((string)RESOURCE_CLIENTLOADER_NAME + DYNAMIC_EXT);
 
 }