changelogs and misc refactors

Author: RayDeeUx

changelog.md

@@ -1,4 +1,7 @@
 # EndscreenTweaks Changelog
+## v1.7.0
+- Fixed some string formatting-related issues.
+- Refactored some code here and here.
 ## v1.6.2
 - Experimental iOS support.
 ## v1.6.1
@@ -54,4 +57,4 @@
 - Note that if you have `relative`'s Custom Endscreen Text mod installed, you *will* need to copy and paste your custom end text messages from the txt file you've set for that mod over to this mod's config, as this mod *will* override those messages.
 - *Technically*, this is the initial release for the Geode index, but there have been several notable changes between v1.0.0 and v1.1.0 that it's best to release a new version now to make sure everyone updates to this version.
 ## v1.0.0
-- Initial release (on GitHub).
+- Initial release (on GitHub).

src/CurrencyRewardLayer.cpp

@@ -1,5 +1,7 @@
 #include <Geode/modify/CurrencyRewardLayer.hpp>
 
+#include "Manager.hpp"
+
 using namespace geode::prelude;
 
 class $modify(MyCurrencyRewardLayer, CurrencyRewardLayer) {
@@ -9,9 +11,9 @@ class $modify(MyCurrencyRewardLayer, CurrencyRewardLayer) {
 	what the hell, robtop?
 	*/
 	void update(float p0) {
-		bool isHideEndLevelLayer = Mod::get()->getSettingValue<bool>("hideEndLevelLayer");
-		bool isChildOfEndLevelLayer = typeinfo_cast<EndLevelLayer*>(this->getParent());
-		if (isHideEndLevelLayer && isChildOfEndLevelLayer) this->setVisible(false);
+		const bool isHideEndLevelLayer = Manager::getSharedInstance()->hideEndLevelLayer;
+		const EndLevelLayer* endLevelLayer = typeinfo_cast<EndLevelLayer*>(this->getParent());
+		if (isHideEndLevelLayer && endLevelLayer && endLevelLayer->m_playLayer) this->setVisible(false);
 		CurrencyRewardLayer::update(p0);
 	}
 };

src/EndLevelLayer.cpp

@@ -12,9 +12,6 @@
 using namespace geode::prelude;
 
 class $modify(MyEndLevelLayer, EndLevelLayer) {
-	static void onModify(auto& self) {
-		(void) self.setHookPriorityPost("EndLevelLayer::showLayer", Priority::First);
-	}
 	CCSprite* getHideButtonSprite() {
 		return typeinfo_cast<CCSprite*>(getChildByIDRecursive("hide-button")->getChildren()->objectAtIndex(0));
 	}
@@ -247,4 +244,4 @@ class $modify(MyEndLevelLayer, EndLevelLayer) {
 		if (getModBool("endTexts")) MyEndLevelLayer::applyRandomQuoteAndFont(playLayer, playLayer->m_level);
 		if (getModBool("customLevelCompleteText")) MyEndLevelLayer::applyCustomLevelCompleteText(getModString("alsoReplacePlayLayerLCT"));
 	}
-};
+};

src/Manager.hpp

@@ -14,6 +14,8 @@ class Manager {
 
 	bool calledAlready = false;
 
+	bool hideEndLevelLayer = false;
+
 	std::vector<std::string> quotes;
 	std::vector<std::string> customQuotes;
 	std::vector<std::string> wETMigration;
@@ -133,4 +135,4 @@ class Manager {
 		if (customLCTMode == "Combined") return log::info("something went terribly wrong --- check contents of the `manager->knownCLCTModesBesidesCombined` vector");
 		manager->chosenMode = customLCTMode;
 	}
-};
+};

src/PlayLayer.cpp

@@ -36,13 +36,13 @@ class $modify(MyPlayLayer, PlayLayer) {
 			}
 		}
 		if (!toModify) return;
-		std::string customLCTModePlayLayer = getModString("customLCTMode");
+		const std::string& customLCTModePlayLayer = getModString("customLCTMode");
 		bool lctReplaced = false;
 		manager->generateNewSprites(customLCTModePlayLayer, this);
 		// "omg ery why not just choose a mode first???"
 		// assigning it to manager = easier "shared replacement" with EndLevelLayer later
 		if (getModString("alsoReplacePlayLayerLCT") == "Disabled") return;
-		auto origOpacity = toModify->getOpacity();
+		const auto origOpacity = toModify->getOpacity();
 		toModify->setOpacity(0);
 		if (manager->chosenMode == "Images" && !manager->sharedReplacementSprite.empty() && !lctReplaced) {
 			CCSprite* newSprite = CCSprite::create(manager->sharedReplacementSprite.c_str());
@@ -86,4 +86,4 @@ class $modify(MyPlayLayer, PlayLayer) {
 			return log::info("failed replacing sprite. customLCTMode: {} | manager->chosenMode: {}", customLCTModePlayLayer, manager->chosenMode);
 		}
 	}
-};
+};

src/main.cpp

@@ -7,6 +7,7 @@ using namespace geode::prelude;
 
 $on_mod(Loaded) {
 	Manager* manager = managerMacro;
+	manager->hideEndLevelLayer = Mod::get()->getSettingValue<bool>("hideEndLevelLayer");
 	(void) Mod::get()->registerCustomSettingType("configdir", &MyButtonSettingV3::parse);
 	(void) Mod::get()->registerCustomSettingType("refresh", &MyButtonSettingV3::parse);
 	if (!std::filesystem::exists((configDir / R"(levelCompleteImages)"))) {
@@ -42,7 +43,7 @@ using namespace geode::prelude;
 abc def
 u beat the level
 gg gaming
-[this text file was brought to you by endscreentweaks. to add your own custom messages, simply edit this file.])";
+[make sure to edit this file!])";
 			(void) utils::file::writeString(pathCustom, content);
 		} else if (std::filesystem::exists(oldWETMessages)) {
 			if (!manager->wETMigration.empty()) {
@@ -69,19 +70,23 @@ migration failed, womp womp)";
 
 	addCustomQuotesAndLevelCompleteTests();
 
-	listenForSettingChanges("default", [](bool unusedVar) {
+	listenForSettingChanges("default", [](bool) {
 		managerReset();
 	});
 
-	listenForSettingChanges("technoblade", [](bool unusedVar) {
+	listenForSettingChanges("technoblade", [](bool) {
 		managerReset();
 	});
 
-	listenForSettingChanges("snl50", [](bool unusedVar) {
+	listenForSettingChanges("snl50", [](bool) {
 		managerReset();
 	});
 
-	listenForSettingChanges("custom", [](bool unusedVar) {
+	listenForSettingChanges("custom", [](bool) {
 		managerReset();
 	});
-}
+
+	listenForSettingChanges("hideEndLevelLayer", [](const bool hideEndLevelLayerNew) {
+		Manager::getSharedInstance()->hideEndLevelLayer = hideEndLevelLayerNew;
+	});
+}