Merge branch 'main' into new-index-but-better

loader/include/Geode/loader/Hook.hpp

@@ -188,6 +188,18 @@ namespace geode {
          */
         void setAutoEnable(bool autoEnable);
 
+        /**
+         * Get the bytes of the patch.
+         * @returns Bytes used to patch
+         */
+        ByteVector const& getBytes() const;
+
+        /**
+         * Updates the bytes of the patch, disabling and then re-enabling if needed.
+         * @param bytes Bytes used to patch
+         */
+        Result<> updateBytes(const ByteVector& bytes);
+
         /**
          * Get the address of the patch.
          * @returns Address

loader/src/loader/Patch.cpp

@@ -34,6 +34,14 @@ void Patch::setAutoEnable(bool autoEnable) {
     return m_impl->setAutoEnable(autoEnable);
 }
 
+ByteVector const& Patch::getBytes() const {
+    return m_impl->getBytes();
+}
+
+Result<> Patch::updateBytes(const ByteVector& bytes) {
+    return m_impl->updateBytes(bytes);
+}
+
 uintptr_t Patch::getAddress() const {
     return m_impl->getAddress();
 }

loader/src/loader/PatchImpl.cpp

@@ -75,6 +75,23 @@ Result<> Patch::Impl::disable() {
     return Ok();
 }
 
+ByteVector const& Patch::Impl::getBytes() const {
+    return m_patch;
+}
+
+Result<> Patch::Impl::updateBytes(const ByteVector& bytes) {
+    m_patch = bytes;
+
+    if (m_enabled) {
+        auto res = this->disable();
+        if (!res) return Err("Failed to update patch: {}", res.unwrapErr());
+        res = this->enable();
+        if (!res) return Err("Failed to update patch: {}", res.unwrapErr());
+    }
+
+    return Ok();
+}
+
 uintptr_t Patch::Impl::getAddress() const {
     return reinterpret_cast<uintptr_t>(m_address);
 }

loader/src/loader/PatchImpl.hpp

@@ -24,6 +24,9 @@ public:
     Result<> enable();
     Result<> disable();
 
+    ByteVector const& getBytes() const;
+    Result<> updateBytes(const ByteVector& bytes);
+
     uintptr_t getAddress() const;
     matjson::Value getRuntimeInfo() const;