Merge branch 'ui' of https://github.com/geode-sdk/geode into ui

loader/launcher/mac/Bootstrapper.cpp

@@ -40,7 +40,7 @@ __attribute__((constructor)) void _entry() {
 	if (ghc::filesystem::exists(updatesDir / "Geode.dylib", error) && !error) {
         ghc::filesystem::rename(
             updatesDir / "Geode.dylib", 
-            workingDir / "Geode.dylib", error
+            libDir / "Geode.dylib", error
         );
         if (error) {
             displayError(std::string("Couldn't update Geode: ") + error.message());

loader/src/internal/InternalLoader.cpp

@@ -57,7 +57,8 @@ void InternalLoader::executeGDThreadQueue() {
 
 void InternalLoader::logConsoleMessage(std::string const& msg) {
     if (m_platformConsoleOpen) {
-        std::cout << msg;
+        // TODO: make flushing optional
+        std::cout << msg << '\n' << std::flush;
     }
 }
 

loader/src/load/Interface.cpp

@@ -7,22 +7,22 @@
 USE_GEODE_NAMESPACE();
 
 void Interface::init(Mod* mod) {
-	if (!this->m_mod) {
-		this->m_mod = mod;
-		for (auto const& hook : this->m_scheduledHooks) {
-			std::invoke(hook.m_addFunction, this->m_mod, hook.m_displayName, hook.m_address);
+	if (!m_mod) {
+		m_mod = mod;
+		for (auto const& hook : m_scheduledHooks) {
+			std::invoke(hook.m_addFunction, m_mod, hook.m_displayName, hook.m_address);
 		}
-		this->m_scheduledHooks.clear();
+		m_scheduledHooks.clear();
 
-		for (auto const& fn : this->m_scheduledFunctions) {
+		for (auto const& fn : m_scheduledFunctions) {
 			std::invoke(fn);
 		}
-		this->m_scheduledFunctions.clear();
+		m_scheduledFunctions.clear();
 	}
 }
 
 void Interface::scheduleOnLoad(ScheduledFunction function) {
-	this->m_scheduledFunctions.push_back(function);
+	m_scheduledFunctions.push_back(function);
 }
 
 Interface* Interface::create() {

loader/src/load/Loader.cpp

@@ -371,12 +371,12 @@ Loader::~Loader() {
 }
 
 void Loader::pushLog(log::Log&& log) {
-    m_logs.push_back(std::move(log));
-
     std::string logStr = log.toString(true);
 
     InternalLoader::get()->logConsoleMessage(logStr);
     m_logStream << logStr << std::endl;
+
+    m_logs.push_back(std::move(log));
 }
 
 void Loader::popLog(log::Log* log) {

loader/src/load/Log.cpp

@@ -83,7 +83,7 @@ std::string Log::toString(bool logTime) const {
         res += fmt::format("{:%H:%M:%S} ", m_time);
     }
 
-    res += fmt::format("[{}]:", m_sender ? m_sender->getName() : "?");
+    res += fmt::format("[{}]: ", m_sender ? m_sender->getName() : "?");
 
     for (auto& i : m_components) {
         res += i->_toString();