update

TheSillyDoggo · Jul 16, 2024 · 02858bb · 02858bb
1 parent 8a8bea5
commit 02858bb
Show file tree

Hide file tree

Showing 54 changed files with 385 additions and 177 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,7 @@ add_library(${PROJECT_NAME} SHARED
     src/Hooks/GlobedChatListPopup.cpp
     src/Hooks/CommentCell.cpp
     src/Hooks/ShareCommentLayer.cpp
+    src/EmojiNode.cpp
     # Add your cpp files here
 )
 

diff --git a/emojis/other/boar.png b/emojis/other/boar.png
diff --git a/emojis/other/casual.png b/emojis/other/casual.png
diff --git a/emojis/other/catbless.png b/emojis/other/catbless.png
diff --git a/emojis/other/catcash.png b/emojis/other/catcash.png
diff --git a/emojis/other/catcomf.png b/emojis/other/catcomf.png
diff --git a/emojis/other/catcool.png b/emojis/other/catcool.png
diff --git a/emojis/other/catcop.png b/emojis/other/catcop.png
diff --git a/emojis/other/catcorn.png b/emojis/other/catcorn.png
diff --git a/emojis/other/catderp.png b/emojis/other/catderp.png
diff --git a/emojis/other/catfacepalm.png b/emojis/other/catfacepalm.png
diff --git a/emojis/other/catfine.png b/emojis/other/catfine.png
diff --git a/emojis/other/catgasm.png b/emojis/other/catgasm.png
diff --git a/emojis/other/catgasp.png b/emojis/other/catgasp.png
diff --git a/emojis/other/catgift.png b/emojis/other/catgift.png
diff --git a/emojis/other/catgrump.png b/emojis/other/catgrump.png
diff --git a/emojis/other/catgun.png b/emojis/other/catgun.png
diff --git a/emojis/other/cathammer.png b/emojis/other/cathammer.png
diff --git a/emojis/other/cathi.png b/emojis/other/cathi.png
diff --git a/emojis/other/cathype.png b/emojis/other/cathype.png
diff --git a/emojis/other/catlaugh.png b/emojis/other/catlaugh.png
diff --git a/emojis/other/catlick.png b/emojis/other/catlick.png
diff --git a/emojis/other/catloser.png b/emojis/other/catloser.png
diff --git a/emojis/other/catlost.png b/emojis/other/catlost.png
diff --git a/emojis/other/catlove.png b/emojis/other/catlove.png
diff --git a/emojis/other/catlul.png b/emojis/other/catlul.png
diff --git a/emojis/other/catlurk.png b/emojis/other/catlurk.png
diff --git a/emojis/other/catmusik.png b/emojis/other/catmusik.png
diff --git a/emojis/other/catok.png b/emojis/other/catok.png
diff --git a/emojis/other/catpat.png b/emojis/other/catpat.png
diff --git a/emojis/other/catpls.png b/emojis/other/catpls.png
diff --git a/emojis/other/catpog.png b/emojis/other/catpog.png
diff --git a/emojis/other/catpout.png b/emojis/other/catpout.png
diff --git a/emojis/other/catree.png b/emojis/other/catree.png
diff --git a/emojis/other/catshrug.png b/emojis/other/catshrug.png
diff --git a/emojis/other/catshy.png b/emojis/other/catshy.png
diff --git a/emojis/other/catsimp.png b/emojis/other/catsimp.png
diff --git a/emojis/other/catsip.png b/emojis/other/catsip.png
diff --git a/emojis/other/catsleep.png b/emojis/other/catsleep.png
diff --git a/emojis/other/catsmart.png b/emojis/other/catsmart.png
diff --git a/emojis/other/catsweat.png b/emojis/other/catsweat.png
diff --git a/emojis/other/catthinking.png b/emojis/other/catthinking.png
diff --git a/emojis/other/creul.png b/emojis/other/creul.png
diff --git a/emojis/other/tough.png b/emojis/other/tough.png
diff --git a/src/CCLabelBMFontExt.cpp b/src/CCLabelBMFontExt.cpp
@@ -1,113 +1,5 @@
 #include "CCLabelBMFontExt.hpp"
 
-std::pair<std::string, std::string> _Emoji(const std::string &name) {
-    auto spr = std::string(""_spr);
-    return {name, spr + (name + std::string(".png"))};
-}
-
-std::vector<std::pair<std::string, std::string>> emojis = {
-    std::pair("auto", "diffIcon_auto_btn_001.png"),
-    std::pair("na", "diffIcon_00_btn_001.png"),
-    std::pair("easy", "diffIcon_01_btn_001.png"),
-    std::pair("normal", "diffIcon_02_btn_001.png"),
-    std::pair("hard", "diffIcon_03_btn_001.png"),
-    std::pair("harder", "diffIcon_04_btn_001.png"),
-    std::pair("insane", "diffIcon_05_btn_001.png"),
-    std::pair("easydemon", "diffIcon_07_btn_001.png"),
-    std::pair("mediumdemon", "diffIcon_08_btn_001.png"),
-    std::pair("harddemon", "diffIcon_06_btn_001.png"),
-    std::pair("insanedemon", "diffIcon_09_btn_001.png"),
-    std::pair("extremedemon", "diffIcon_10_btn_001.png"),
-
-    std::pair("star", "GJ_starsIcon_001.png"),
-
-    std::pair("orb", "currencyOrb_001.png"),
-    std::pair("orbs", "currencyOrbIcon_001.png"),
-
-    std::pair("diamond", "diamond_small01_001.png"),
-    std::pair("diamonds", "currencyDiamondIcon_001.png"),
-
-    std::pair("like", "GJ_likesIcon_001.png"),
-    std::pair("dislike", "GJ_dislikesIcon_001.png"_spr), // rob i genuinely hate you for making it this differetn size it is size size different
-
-    std::pair("check", "GJ_completesIcon_001.png"),
-    std::pair("cross", "GJ_deleteIcon_001.png"),
-
-    std::pair("locked", "GJLargeLock_001.png"),
-    std::pair("lockedgray", "GJ_lockGray_001.png"),
-    std::pair("unlocked", "GJ_lock_open_001.png"),
-
-    std::pair("goldcoin", "GJ_coinsIcon_001.png"),
-    std::pair("uncollectedusercoin", "GJ_coinsIcon_gray_001.png"),
-    _Emoji("usercoinunverified"),
-    std::pair("usercoin", "GJ_coinsIcon2_001.png"),
-    std::pair("points", "GJ_pointsIcon_001.png"),
-
-    std::pair("mod", "modBadge_01_001.png"),
-    std::pair("eldermod", "modBadge_02_001.png"),
-    std::pair("leaderboardmod", "modBadge_03_001.png"),
-
-    //other
-    _Emoji("amogus"),
-    _Emoji("bruh"),
-    _Emoji("carlos"),
-    _Emoji("clueless"),
-    _Emoji("despair"),
-    _Emoji("despair2"),
-    _Emoji("ned"),
-    std::pair("pusab?", "pusab.png"_spr),
-    _Emoji("robsmile"),
-    _Emoji("sip"),
-    _Emoji("splat"),
-    _Emoji("teehee"),
-    _Emoji("trollface"),
-    _Emoji("true"),
-    _Emoji("walter"),
-    _Emoji("wha"),
-    _Emoji("whadahell"),
-    _Emoji("youshould"),
-    _Emoji("car"),
-    _Emoji("zoink"),
-    _Emoji("shocked"),
-    _Emoji("poppinbottles"),
-    _Emoji("party"),
-    _Emoji("potbor"),
-    _Emoji("dabmeup"),
-    _Emoji("fireinthehole"),
-    _Emoji("finger"),
-    _Emoji("soggy"),
-    _Emoji("mayo"),
-    _Emoji("divine"),
-    _Emoji("rattledash"),
-    _Emoji("gd"),
-
-    //discord
-    _Emoji("100"),
-    _Emoji("shushing_face"),
-    _Emoji("deaf_person"),
-    _Emoji("deaf_man"),
-    _Emoji("deaf_woman"),
-    _Emoji("bear"),
-    _Emoji("broken_heart"),
-    _Emoji("cat"),
-    _Emoji("dog"),
-    _Emoji("fox"),
-    _Emoji("gun"),
-    _Emoji("face_with_raised_eyebrow"),
-    _Emoji("middle_finger"),
-    _Emoji("moyai"),
-    _Emoji("fire"),
-    _Emoji("nerd"),
-    _Emoji("radioactive"),
-    _Emoji("shocked_face"),
-    _Emoji("skull"),
-    _Emoji("smiling_imp"),
-    _Emoji("speaking_head"),
-    _Emoji("sob"),
-    _Emoji("eggplant"),
-    _Emoji("clown"),
-};
-
 LabelPart::LabelPart(LabelPartType type, std::string ext) {
     this->type = type;
     this->extra = std::move(ext);
@@ -118,12 +10,7 @@ const char* LabelPart::getFileNameForEmoji()
     if (type == LabelPartType::Text)
         return "";
 
-    for (auto emoji : emojis) {
-        if (geode::utils::string::toLower(emoji.first) == geode::utils::string::toLower(extra))
-            return emoji.second.c_str();
-    }
-
-    return "";
+    return EmojiNode::frameForKey(extra);
 }
 
 std::string LabelPart::stringFromVector(std::vector<LabelPart> parts)
@@ -198,7 +85,7 @@ void CCLabelBMFontExt::setString(const char *newString, bool needUpdateLabel)
 
 const char* CCLabelBMFontExt::getString()
 {
-    return string;
+    return string.c_str();
 }
 
 void CCLabelBMFontExt::setFntFile(const char* fntFile)
@@ -209,7 +96,7 @@ void CCLabelBMFontExt::setFntFile(const char* fntFile)
 
 const char* CCLabelBMFontExt::getFntFile()
 {
-    return font;
+    return font.c_str();
 }
 
 void CCLabelBMFontExt::setCString(const char *label)
@@ -339,7 +226,7 @@ void CCLabelBMFontExt::updateLabel()
     CCSize size = CCSizeMake(0, 0);
     bool inEmoji = false;
     std::string cur = "";
-    float h = getOriginalLabel("l", font)->getContentHeight();
+    float h = getOriginalLabel("l", font.c_str())->getContentHeight();
     float x = 2;
 
     for (auto ch : utils::string::split(string))
@@ -415,7 +302,7 @@ void CCLabelBMFontExt::updateLabel()
     {
         if (part.type == LabelPartType::Text)
         {
-            auto lbl = getOriginalLabel(part.extra.c_str(), font);
+            auto lbl = getOriginalLabel(part.extra.c_str(), font.c_str());
             lbl->setAnchorPoint(ccp(0, 0));
             lbl->setColor(colour);
             lbl->setOpacity(opacity);
@@ -432,7 +319,7 @@ void CCLabelBMFontExt::updateLabel()
         }
         else if (part.type == LabelPartType::Emoji)
         {
-            auto spr = CCSprite::createWithSpriteFrameName(part.getFileNameForEmoji());
+            auto spr = EmojiNode::createWithKey(part.extra);
 
             if (!spr)
                 return;

diff --git a/src/CCLabelBMFontExt.hpp b/src/CCLabelBMFontExt.hpp
@@ -3,6 +3,7 @@
 #include <Geode/Geode.hpp>
 #include <Geode/modify/CCNode.hpp>
 #include <Geode/modify/CCLabelBMFont.hpp>
+#include "EmojiNode.hpp"
 
 #include <iostream>
 #include <regex>
@@ -11,6 +12,8 @@
 
 using namespace geode::prelude;
 
+//#define _Emoji(id) std::pair(id, std::string(""_spr) + id + std::string(".png"))
+
 enum LabelPartType {
     Text,
     Emoji,
@@ -34,8 +37,8 @@ struct LabelPart {
 
 class CCLabelBMFontExt : public CCLabelBMFont {
     public:
-        const char* string = "";
-        const char* font = "";
+        std::string string = "";
+        std::string font = "";
         CCTextAlignment alignment;
         ccColor3B colour;
         GLubyte opacity = 255;