From b356a7670a572d5a98de6866e4f35d5ba74133d2 Mon Sep 17 00:00:00 2001 From: HJfod <60038575+HJfod@users.noreply.github.com> Date: Wed, 28 Feb 2024 00:27:35 +0200 Subject: [PATCH] remove old bad Colors utility --- loader/include/Geode/ui/Colors.hpp | 47 ------------------------------ loader/src/ui/nodes/Colors.cpp | 29 ------------------ 2 files changed, 76 deletions(-) delete mode 100644 loader/include/Geode/ui/Colors.hpp delete mode 100644 loader/src/ui/nodes/Colors.cpp diff --git a/loader/include/Geode/ui/Colors.hpp b/loader/include/Geode/ui/Colors.hpp deleted file mode 100644 index fff2215c..00000000 --- a/loader/include/Geode/ui/Colors.hpp +++ /dev/null @@ -1,47 +0,0 @@ -#pragma once - -#include "../DefaultInclude.hpp" -#include "../loader/Mod.hpp" -#include <cocos2d.h> - -namespace geode { - // Credit to https://github.com/Ikszyon/UI-Recolor for many of these addresses! - - /** - * Hardcoded GD colors - */ - enum class GDColor { - NormalModeProgressBar, - PracticeModeProgressBar, - - ProfilePostBG, - }; - - class GEODE_DLL ColorManager { - protected: - struct Value { - cocos2d::ccColor3B value; - Mod* setter; - }; - - std::unordered_map<GDColor, std::vector<Value>> m_colors; - - ColorManager(); - - public: - static ColorManager* get(); - - cocos2d::ccColor3B getColor(GDColor color) const; - void setColor(GDColor color, Mod* setter, cocos2d::ccColor3B const& value); - void resetColor(GDColor color, Mod* setter); - - template<class = void> - void setColor(GDColor color, cocos2d::ccColor3B const& value) { - this->setColor(color, Mod::get(), value); - } - template<class = void> - void resetColor(GDColor color) { - this->resetColor(color, Mod::get()); - } - }; -} diff --git a/loader/src/ui/nodes/Colors.cpp b/loader/src/ui/nodes/Colors.cpp deleted file mode 100644 index d93a3770..00000000 --- a/loader/src/ui/nodes/Colors.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include <Geode/ui/Colors.hpp> -#include <Geode/utils/ranges.hpp> - -using namespace geode::prelude; - -ColorManager::ColorManager() : m_colors({ - { GDColor::NormalModeProgressBar, {{ ccColor3B { 0, 255, 0 }, Mod::get() }} }, - { GDColor::PracticeModeProgressBar, {{ ccColor3B { 0, 255, 255 }, Mod::get() }} }, - { GDColor::ProfilePostBG, {{ ccColor3B { 191, 114, 62 }, Mod::get() }} }, -}) {} - -ColorManager* ColorManager::get() { - static auto inst = new ColorManager; - return inst; -} - -ccColor3B ColorManager::getColor(GDColor color) const { - return m_colors.at(color).back().value; -} - -void ColorManager::setColor(GDColor color, Mod* setter, ccColor3B const& value) { - m_colors.at(color).push_back({ value, setter }); -} - -void ColorManager::resetColor(GDColor color, Mod* setter) { - ranges::remove(m_colors.at(color), [setter](Value const& value) { - return value.setter == setter; - }); -}