Skip to content

Commit

Permalink
it runs
Browse files Browse the repository at this point in the history
  • Loading branch information
@JaanDev
JaanDev committed Jan 5, 2025
1 parent 2c0c9a9 commit 8dac8a0
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 170 deletions.
2 changes: 1 addition & 1 deletion api/api.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace gdl {
static std::unordered_map<std::string, std::unordered_map<Language, std::string>> apiStrings;

Language getCurrentLanguage() {
return (Language)Mod::get()->getSavedValue<int>("language-id");
return (Language)Mod::get()->getSavedValue<int>("language-id", Language::GDL_RUSSIAN);
}

const char* getLanguageName(Language language) {
Expand Down
2 changes: 1 addition & 1 deletion libs/utf8
Submodule utf8 updated 6 files
+1 −1 .github/workflows/cmake-multi-platform.yml
+3 −2 CMakeLists.txt
+7 −7 README.md
+4 −4 source/utf8/core.h
+3 −3 source/utf8/unchecked.h
+8 −6 tests/CMakeLists.txt
2 changes: 1 addition & 1 deletion libs/zydis
Submodule zydis updated 17 files
+61 −8 .github/workflows/main.yml
+0 −2 CMakeLists.txt
+25 −0 Doxyfile.meson.in
+1 −0 assets/version-bump-checklist.txt
+1 −1 dependencies/zycore
+10 −0 dependencies/zycore.wrap
+2 −2 examples/ZydisPerfTest.c
+28 −0 examples/meson.build
+25 −0 man/meson.build
+339 −0 meson.build
+87 −0 meson_options.txt
+1 −1 resources/VersionInfo.rc
+20 −7 src/Utils.c
+1 −0 subprojects
+34 −0 tests/meson.build
+42 −0 tests/zydis_encoder_types.py
+85 −0 tools/meson.build
245 changes: 124 additions & 121 deletions src/hooks.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,121 +16,121 @@

using namespace geode::prelude;

class $modify(MultilineBitmapFont) {
struct Fields {
float m_textScale;
std::string m_fontName;
float m_maxWidth;
};

gd::string readColorInfo(gd::string s) {
std::string str = s;

std::string str2;
for (auto it = str.begin(); it != str.end();) {
auto cp = utf8::next(it, str.end());
str2 += __isascii(cp) ? (char)cp : 'W';
}

return MultilineBitmapFont::readColorInfo(str2);
}

// bool initWithFont(const char* p0, gd::string p1, float p2, float p3, cocos2d::CCPoint p4, int p5, bool colorsDisabled) {
// log::debug("string!!! {} {} {}", p1.size(), p1.capacity(), p1.c_str());
// m_fields->m_textScale = p2;
// m_fields->m_fontName = p0;
// m_fields->m_maxWidth = p3;
// // log::debug("MBF;{};{};{};{}", m_fields->m_textScale, m_fields->m_fontName, (std::string)p1, p3);

// auto notags = std::regex_replace((std::string)p1, std::regex("(<c.>)|(<\\/c>)|(<d...>)|(<s...>)|(<\\/s>)|(<i...>)|(<\\/i>)"), "");
// if (!MultilineBitmapFont::initWithFont(p0, notags, p2, p3, p4, p5, true))
// return false;

// if (!colorsDisabled) {
// m_tagsArray = CCArray::create();
// m_tagsArray->retain();

// MultilineBitmapFont::readColorInfo(p1);

// for (auto i = 0u; i < m_tagsArray->count(); i++) {
// auto tag = (TextStyleSection*)(m_tagsArray->objectAtIndex(i));

// if (tag->m_end == -1 && tag->m_type == 4) {
// auto child = (CCFontSprite*)m_lettersArray->objectAtIndex(tag->m_start);
// if (child) {
// child->m_delayTime = tag->m_delayTime;
// }
// } else {
// for (auto i = tag->m_start; i <= tag->m_end; i++) {
// auto child = (CCFontSprite*)(m_lettersArray->objectAtIndex(i));
// if (!child)
// continue;

// switch (tag->m_type) {
// case 1: {
// child->setColor(tag->m_col);
// } break;
// case 2: {
// child->m_isInstant = true;
// child->m_instantValue = tag->m_instantNum;
// } break;
// case 3: {
// child->m_thisTagNumber = i;
// child->m_shakeVal1 = (float)tag->m_shakeNum1;
// child->m_shakeVal2 = tag->m_shakeNum2 <= 0 ? 0.0f : 1.0f / tag->m_shakeNum2;
// } break;
// default:
// break;
// }
// }
// }
// }

// m_tagsArray->release();
// m_tagsArray = nullptr;
// }

// return true;
// }

gd::string stringWithMaxWidth(gd::string p0, float scale, float scaledW) {
auto width = m_fields->m_maxWidth;

std::string str = p0;
if (auto pos = str.find('\n'); pos != std::string::npos) {
str = str.substr(0, pos);
}

auto lbl = CCLabelBMFont::create("", m_fields->m_fontName.c_str());
lbl->setScale(m_fields->m_textScale);

bool overflown = false;
std::string current;
for (auto it = str.begin(); it < str.end();) {
auto cp = utf8::next(it, str.end());
utf8::append(cp, current);

// auto x = cocos2d::FNTConfigLoadFile("chatFont.fnt");
// auto y = x->m_pFontDefDictionary;

lbl->setString(current.c_str());
if (lbl->getScaledContentSize().width > width) {
overflown = true;
break;
}
}

if (overflown) {
if (auto pos = current.rfind(' '); pos != std::string::npos) {
current.erase(current.begin() + pos, current.end());
}
} else {
current += " ";
}

return current;
}
};
// class $modify(MultilineBitmapFont) {
// struct Fields {
// float m_textScale;
// std::string m_fontName;
// float m_maxWidth;
// };

// gd::string readColorInfo(gd::string s) {
// std::string str = s;

// std::string str2;
// for (auto it = str.begin(); it != str.end();) {
// auto cp = utf8::next(it, str.end());
// str2 += __isascii(cp) ? (char)cp : 'W';
// }

// return MultilineBitmapFont::readColorInfo(str2);
// }

// // bool initWithFont(const char* p0, gd::string p1, float p2, float p3, cocos2d::CCPoint p4, int p5, bool colorsDisabled) {
// // log::debug("string!!! {} {} {}", p1.size(), p1.capacity(), p1.c_str());
// // m_fields->m_textScale = p2;
// // m_fields->m_fontName = p0;
// // m_fields->m_maxWidth = p3;
// // // log::debug("MBF;{};{};{};{}", m_fields->m_textScale, m_fields->m_fontName, (std::string)p1, p3);

// // auto notags = std::regex_replace((std::string)p1, std::regex("(<c.>)|(<\\/c>)|(<d...>)|(<s...>)|(<\\/s>)|(<i...>)|(<\\/i>)"), "");
// // if (!MultilineBitmapFont::initWithFont(p0, notags, p2, p3, p4, p5, true))
// // return false;

// // if (!colorsDisabled) {
// // m_tagsArray = CCArray::create();
// // m_tagsArray->retain();

// // MultilineBitmapFont::readColorInfo(p1);

// // for (auto i = 0u; i < m_tagsArray->count(); i++) {
// // auto tag = (TextStyleSection*)(m_tagsArray->objectAtIndex(i));

// // if (tag->m_end == -1 && tag->m_type == 4) {
// // auto child = (CCFontSprite*)m_lettersArray->objectAtIndex(tag->m_start);
// // if (child) {
// // child->m_delayTime = tag->m_delayTime;
// // }
// // } else {
// // for (auto i = tag->m_start; i <= tag->m_end; i++) {
// // auto child = (CCFontSprite*)(m_lettersArray->objectAtIndex(i));
// // if (!child)
// // continue;

// // switch (tag->m_type) {
// // case 1: {
// // child->setColor(tag->m_col);
// // } break;
// // case 2: {
// // child->m_isInstant = true;
// // child->m_instantValue = tag->m_instantNum;
// // } break;
// // case 3: {
// // child->m_thisTagNumber = i;
// // child->m_shakeVal1 = (float)tag->m_shakeNum1;
// // child->m_shakeVal2 = tag->m_shakeNum2 <= 0 ? 0.0f : 1.0f / tag->m_shakeNum2;
// // } break;
// // default:
// // break;
// // }
// // }
// // }
// // }

// // m_tagsArray->release();
// // m_tagsArray = nullptr;
// // }

// // return true;
// // }

// gd::string stringWithMaxWidth(gd::string p0, float scale, float scaledW) {
// auto width = m_fields->m_maxWidth;

// std::string str = p0;
// if (auto pos = str.find('\n'); pos != std::string::npos) {
// str = str.substr(0, pos);
// }

// auto lbl = CCLabelBMFont::create("", m_fields->m_fontName.c_str());
// lbl->setScale(m_fields->m_textScale);

// bool overflown = false;
// std::string current;
// for (auto it = str.begin(); it < str.end();) {
// auto cp = utf8::next(it, str.end());
// utf8::append(cp, current);

// // auto x = cocos2d::FNTConfigLoadFile("chatFont.fnt");
// // auto y = x->m_pFontDefDictionary;

// lbl->setString(current.c_str());
// if (lbl->getScaledContentSize().width > width) {
// overflown = true;
// break;
// }
// }

// if (overflown) {
// if (auto pos = current.rfind(' '); pos != std::string::npos) {
// current.erase(current.begin() + pos, current.end());
// }
// } else {
// current += " ";
// }

// return current;
// }
// };

class $modify(CCTextureCache) {
cocos2d::CCTexture2D* addImage(const char* name, bool idk) {
Expand Down Expand Up @@ -166,7 +166,9 @@ class $modify(CCLabelBMFont) {

class $modify(LoadingLayer){
void loadAssets(){
log::debug("load step {}", this->m_loadStep);
if(this->m_loadStep == 11 && gdl::getCurrentLanguage() != gdl::GDL_ENGLISH){
log::error("hiii");
auto plist = Mod::get()->getResourcesDir() / fmt::format("GDL_TranslatedFrames-{}.plist", gdl::getLanguageCodename(gdl::getCurrentLanguage()));
auto png = Mod::get()->getResourcesDir() / fmt::format("GDL_TranslatedFrames-{}.png", gdl::getLanguageCodename(gdl::getCurrentLanguage()));

Expand Down Expand Up @@ -211,12 +213,13 @@ void gd_string_assign_hk(void* self, char* src, size_t len) {

$execute {
#ifdef GEODE_IS_WINDOWS
constexpr auto GD_STR_ASSIGN_ADDR = 0x3BE50;
gd_string_assign_o = reinterpret_cast<void (__thiscall*)(void* self, char* src, size_t len)>(base::get() + GD_STR_ASSIGN_ADDR);
auto res2 = Mod::get()->hook((void*)(base::get() + GD_STR_ASSIGN_ADDR), gd_string_assign_hk, "gd::string::assign", tulip::hook::TulipConvention::Thiscall).err();
if (res2 != std::nullopt) {
log::error("Failed to hook gd::string::assign because of: {}", res2);
}
// constexpr auto GD_STR_ASSIGN_ADDR = 0x3BE50; // OLD (2.206?)
// constexpr auto GD_STR_ASSIGN_ADDR = 0x3cca0;
// gd_string_assign_o = reinterpret_cast<void (__thiscall*)(void* self, char* src, size_t len)>(base::get() + GD_STR_ASSIGN_ADDR);
// auto res2 = Mod::get()->hook((void*)(base::get() + GD_STR_ASSIGN_ADDR), gd_string_assign_hk, "gd::string::assign", tulip::hook::TulipConvention::Thiscall).err();
// if (res2 != std::nullopt) {
// log::error("Failed to hook gd::string::assign because of: {}", res2);
// }

// constexpr auto GD_STR_APPEND_ADDR = 0x21DE0;
// gd_string_append_o = reinterpret_cast<void (__thiscall*)(void*, char*, size_t)>(base::get() + GD_STR_APPEND_ADDR);
Expand Down
4 changes: 2 additions & 2 deletions src/main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@ using namespace geode::prelude;
// #endif
patches::patchStrings();

gdl::addTranslations("language", {{gdl::GDL_ENGLISH, "Language"}, {gdl::GDL_RUSSIAN, "Язык"}});
gdl::addTranslations("apply", {{gdl::GDL_ENGLISH, "Apply"}, {gdl::GDL_RUSSIAN, "Применить"}});
// gdl::addTranslations("language", {{gdl::GDL_ENGLISH, "Language"}, {gdl::GDL_RUSSIAN, "Язык"}});
// gdl::addTranslations("apply", {{gdl::GDL_ENGLISH, "Apply"}, {gdl::GDL_RUSSIAN, "Применить"}});
};
68 changes: 34 additions & 34 deletions src/menu.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@

using namespace geode::prelude;

class $modify(GDLOptionsLayer, OptionsLayer) {
struct Fields {
bool m_clickedLanguage = false;
};

void onLanguage(CCObject* sender) {
m_fields->m_clickedLanguage = true;
this->hideLayer(false);
}

virtual void customSetup() {
OptionsLayer::customSetup();

auto buttonsMenu = (CCMenu*)this->m_mainLayer->getChildren()->objectAtIndex(4);
if(!buttonsMenu)
return;

auto languageBtn = CCMenuItemSpriteExtra::create(ButtonSprite::create("language"_gdl, "goldFont.fnt", "GJ_button_01.png"), this, SEL_MenuHandler(&GDLOptionsLayer::onLanguage));
languageBtn->setPosition(0, -115);
buttonsMenu->addChild(languageBtn);
}

virtual void layerHidden() {
if(m_fields->m_clickedLanguage) {
auto languageLayer = LanguageLayer::create();
this->getParent()->addChild(languageLayer);
languageLayer->setZOrder(100);
languageLayer->showLayer(false);
m_fields->m_clickedLanguage = false;
}

OptionsLayer::layerHidden();
}
};
// class $modify(GDLOptionsLayer, OptionsLayer) {
// struct Fields {
// bool m_clickedLanguage = false;
// };

// void onLanguage(CCObject* sender) {
// m_fields->m_clickedLanguage = true;
// this->hideLayer(false);
// }

// virtual void customSetup() {
// OptionsLayer::customSetup();

// auto buttonsMenu = (CCMenu*)this->m_mainLayer->getChildren()->objectAtIndex(4);
// if(!buttonsMenu)
// return;

// auto languageBtn = CCMenuItemSpriteExtra::create(ButtonSprite::create("language"_gdl, "goldFont.fnt", "GJ_button_01.png"), this, SEL_MenuHandler(&GDLOptionsLayer::onLanguage));
// languageBtn->setPosition(0, -115);
// buttonsMenu->addChild(languageBtn);
// }

// virtual void layerHidden() {
// if(m_fields->m_clickedLanguage) {
// auto languageLayer = LanguageLayer::create();
// this->getParent()->addChild(languageLayer);
// languageLayer->setZOrder(100);
// languageLayer->showLayer(false);
// m_fields->m_clickedLanguage = false;
// }

// OptionsLayer::layerHidden();
// }
// };
Loading

0 comments on commit 8dac8a0

Please sign in to comment.