7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

remove rvalue requirement, fix claimHook and claimPatch

Browse source
This commit is contained in:
matcool 2024-01-18 14:36:52 -03:00
parent b909bf69d8
commit 6a617789d2
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
loader/include/Geode/loader/Mod.hpp
View file

@ -271,7 +271,7 @@ namespace geode {
* @returns Returns a pointer to the hook, or an error if the * @returns Returns a pointer to the hook, or an error if the
* hook already has an owner, or was unable to enable the hook. * hook already has an owner, or was unable to enable the hook.
*/ */
Result<Hook*> claimHook(std::shared_ptr<Hook>&& hook); Result<Hook*> claimHook(std::shared_ptr<Hook> hook);
/** /**
* Disowns a hook which this mod owns, making this mod no longer its owner. * Disowns a hook which this mod owns, making this mod no longer its owner.
@ -306,7 +306,7 @@ namespace geode {
* @returns Returns a pointer to the patch, or an error if the * @returns Returns a pointer to the patch, or an error if the
* patch already has an owner, or was unable to enable the patch. * patch already has an owner, or was unable to enable the patch.
*/ */
Result<Patch*> claimPatch(std::shared_ptr<Patch>&& patch); Result<Patch*> claimPatch(std::shared_ptr<Patch> patch);
/** /**
* Disowns a patch which this mod owns, making this mod no longer its owner. * Disowns a patch which this mod owns, making this mod no longer its owner.

2
loader/include/Geode/modify/Modify.hpp
View file

@ -96,7 +96,7 @@ namespace geode::modifier {
ModifyDerived::Derived::onModify(*this); ModifyDerived::Derived::onModify(*this);
std::vector<std::string> added; std::vector<std::string> added;
for (auto& [uuid, hook] : m_hooks) { for (auto& [uuid, hook] : m_hooks) {
auto res = Mod::get()->claimHook(std::move(hook)); auto res = Mod::get()->claimHook(hook);
if (!res) { if (!res) {
log::error("Failed to claim hook {}: {}", hook->getDisplayName(), res.error()); log::error("Failed to claim hook {}: {}", hook->getDisplayName(), res.error());
} }

8
loader/src/loader/Mod.cpp
View file

@ -121,8 +121,8 @@ void Mod::registerCustomSetting(std::string_view const key, std::unique_ptr<Sett
return m_impl->registerCustomSetting(key, std::move(value)); return m_impl->registerCustomSetting(key, std::move(value));
} }
Result<Hook*> Mod::claimHook(std::shared_ptr<Hook>&& hook) { Result<Hook*> Mod::claimHook(std::shared_ptr<Hook> hook) {
return m_impl->claimHook(std::move(hook)); return m_impl->claimHook(hook);
} }
Result<> Mod::disownHook(Hook* hook) { Result<> Mod::disownHook(Hook* hook) {
@ -133,8 +133,8 @@ std::vector<Hook*> Mod::getHooks() const {
return m_impl->getHooks(); return m_impl->getHooks();
} }
Result<Patch*> Mod::claimPatch(std::shared_ptr<Patch>&& patch) { Result<Patch*> Mod::claimPatch(std::shared_ptr<Patch> patch) {
return m_impl->claimPatch(std::move(patch)); return m_impl->claimPatch(patch);
} }
Result<> Mod::disownPatch(Patch* patch) { Result<> Mod::disownPatch(Patch* patch) {

12
loader/src/loader/ModImpl.cpp
View file

@ -454,12 +454,14 @@ bool Mod::Impl::depends(std::string_view const id) const {
// Hooks // Hooks
Result<Hook*> Mod::Impl::claimHook(std::shared_ptr<Hook>&& hook) { Result<Hook*> Mod::Impl::claimHook(std::shared_ptr<Hook> hook) {
auto res1 = hook->m_impl->setOwner(m_self); auto res1 = hook->m_impl->setOwner(m_self);
if (!res1) { if (!res1) {
return Err("Cannot claim hook: {}", res1.unwrapErr()); return Err("Cannot claim hook: {}", res1.unwrapErr());
} }
m_hooks.push_back(hook);
auto ptr = hook.get(); auto ptr = hook.get();
if (this->isEnabled() && hook->getAutoEnable()) { if (this->isEnabled() && hook->getAutoEnable()) {
if (LoaderImpl::get()->isReadyToHook()) { if (LoaderImpl::get()->isReadyToHook()) {
@ -474,8 +476,6 @@ Result<Hook*> Mod::Impl::claimHook(std::shared_ptr<Hook>&& hook) {
} }
} }
m_hooks.push_back(std::move(hook));
return Ok(ptr); return Ok(ptr);
} }
@ -510,12 +510,14 @@ Result<> Mod::Impl::disownHook(Hook* hook) {
// Patches // Patches
Result<Patch*> Mod::Impl::claimPatch(std::shared_ptr<Patch>&& patch) { Result<Patch*> Mod::Impl::claimPatch(std::shared_ptr<Patch> patch) {
auto res1 = patch->m_impl->setOwner(m_self); auto res1 = patch->m_impl->setOwner(m_self);
if (!res1) { if (!res1) {
return Err("Cannot claim patch: {}", res1.unwrapErr()); return Err("Cannot claim patch: {}", res1.unwrapErr());
} }
m_patches.push_back(patch);
auto ptr = patch.get(); auto ptr = patch.get();
if (this->isEnabled() && patch->getAutoEnable()) { if (this->isEnabled() && patch->getAutoEnable()) {
auto res2 = ptr->enable(); auto res2 = ptr->enable();
@ -524,8 +526,6 @@ Result<Patch*> Mod::Impl::claimPatch(std::shared_ptr<Patch>&& patch) {
} }
} }
m_patches.push_back(std::move(patch));
return Ok(ptr); return Ok(ptr);
} }

4
loader/src/loader/ModImpl.hpp
View file

@ -113,11 +113,11 @@ namespace geode {
SettingValue* getSetting(std::string_view const key) const; SettingValue* getSetting(std::string_view const key) const;
void registerCustomSetting(std::string_view const key, std::unique_ptr<SettingValue> value); void registerCustomSetting(std::string_view const key, std::unique_ptr<SettingValue> value);
Result<Hook*> claimHook(std::shared_ptr<Hook>&& hook); Result<Hook*> claimHook(std::shared_ptr<Hook> hook);
Result<> disownHook(Hook* hook); Result<> disownHook(Hook* hook);
[[nodiscard]] std::vector<Hook*> getHooks() const; [[nodiscard]] std::vector<Hook*> getHooks() const;
Result<Patch*> claimPatch(std::shared_ptr<Patch>&& patch); Result<Patch*> claimPatch(std::shared_ptr<Patch> patch);
Result<> disownPatch(Patch* patch); Result<> disownPatch(Patch* patch);
[[nodiscard]] std::vector<Patch*> getPatches() const; [[nodiscard]] std::vector<Patch*> getPatches() const;