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

remove gd mod.json shorthand, per platform is now required

Browse source 
closes #471
This commit is contained in:
matcool 2024-06-03 10:15:26 -03:00
parent 6b52da266c
commit 9a9f63a82f
4 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
loader/resources/mod.json.in
View file

@ -1,6 +1,10 @@
{
"geode": "@PROJECT_VERSION@@PROJECT_VERSION_SUFFIX@",
"gd": "*",
"gd": {
"win": "*",
"mac": "*",
"android": "*"
},
"id": "geode.loader",
"version": "@PROJECT_VERSION@@PROJECT_VERSION_SUFFIX@",
"name": "Geode",

4
loader/src/loader/ModMetadataImpl.cpp
View file

@ -134,9 +134,7 @@ Result<ModMetadata> ModMetadata::Impl::createFromSchemaV010(ModJson const& rawJs
// (use rawJson because i dont like JsonMaybeValue)
if (rawJson.contains("gd")) {
std::string ver;
if (rawJson["gd"].is_string()) {
ver = rawJson["gd"].as_string();
} else if (rawJson["gd"].is_object()) {
if (rawJson["gd"].is_object()) {
auto key = PlatformID::toShortString(GEODE_PLATFORM_TARGET, true);
if (rawJson["gd"].contains(key) && rawJson["gd"][key].is_string())
ver = rawJson["gd"][key].as_string();

6
loader/test/dependency/mod.json.in
View file

@ -1,6 +1,10 @@
{
"geode": "@GEODE_VERSION_FULL@",
"gd": "*",
"gd": {
"win": "*",
"mac": "*",
"android": "*"
},
"version": "1.0.0",
"id": "geode.testdep",
"name": "Geode Test Dependency",

6
loader/test/main/mod.json.in
View file

@ -1,6 +1,10 @@
{
"geode": "@GEODE_VERSION_FULL@",
"gd": "*",
"gd": {
"win": "*",
"mac": "*",
"android": "*"
},
"version": "1.0.0",
"id": "geode.test",
"name": "Geode Test",