wed150/GMLIB-LegacyRemoteCallApi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix crash

Browse Source
This commit is contained in:
Tsubasa6848
2024-02-15 16:42:45 +08:00
Unverified
parent 4090dc7025
commit 928c470150
6 changed files with 106 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/LegacyModApi.cpp
+31 -1
View File
@@ -1,7 +1,7 @@
#include "Global.h"
std::unordered_set<std::string> HardCodedKeys = {"AlwaysUnlocked", "PlayerHasManyItems", "PlayerInWater", "None"};
std::unordered_set<int> ExperimentsList = {6, 7, 8, 9, 10, 12, 15, 16};
std::unordered_set<int> ExperimentsList = {6, 7, 8, 9, 10, 13, 16, 17, 18};
std::variant<std::string, std::vector<RecipeIngredient>> makeRecipeUnlockingKey(std::string& key) {
if (HardCodedKeys.count(key)) {
@@ -23,6 +23,9 @@ void Export_Legacy_GMLib_ModAPI() {
std::string result,
int count,
std::string unlock) -> void {
if (!isServerStarted) {
return;
}
std::vector<RecipeIngredient> types;
for (auto ing : ingredients) {
auto key = RecipeIngredient(ing, 0, 1);
@@ -42,6 +45,9 @@ void Export_Legacy_GMLib_ModAPI() {
std::string result,
int count,
std::string unlock) -> void {
if (!isServerStarted) {
return;
}
std::vector<RecipeIngredient> types;
for (auto ing : ingredients) {
auto key = RecipeIngredient(ing, 0, 1);
@@ -56,6 +62,9 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI",
"registerFurnaceRecipe",
[](std::string recipe_id, std::string input, std::string output, std::vector<std::string> tags) -> void {
if (!isServerStarted) {
return;
}
auto inp = RecipeIngredient(input, 0, 1);
auto outp = RecipeIngredient(output, 0, 1);
GMLIB::Mod::CustomRecipe::registerFurnaceRecipe(recipe_id, inp, outp, tags);
@@ -65,6 +74,9 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI",
"registerBrewingMixRecipe",
[](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
if (!isServerStarted) {
return;
}
auto rea = RecipeIngredient(reagent, 0, 1);
GMLIB::Mod::CustomRecipe::registerBrewingMixRecipe(recipe_id, input, output, rea);
}
@@ -73,6 +85,9 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI",
"registerBrewingContainerRecipe",
[](std::string recipe_id, std::string input, std::string output, std::string reagent) -> void {
if (!isServerStarted) {
return;
}
auto inp = RecipeIngredient(input, 0, 1);
auto outp = RecipeIngredient(output, 0, 1);
auto rea = RecipeIngredient(reagent, 0, 1);
@@ -87,6 +102,9 @@ void Export_Legacy_GMLib_ModAPI() {
std::string base,
std::string addition,
std::string result) -> void {
if (!isServerStarted) {
return;
}
GMLIB::Mod::CustomRecipe::registerSmithingTransformRecipe(
recipe_id,
smithing_template,
@@ -100,6 +118,9 @@ void Export_Legacy_GMLib_ModAPI() {
"GMLib_ModAPI",
"registerSmithingTrimRecipe",
[](std::string recipe_id, std::string smithing_template, std::string base, std::string addition) -> void {
if (!isServerStarted) {
return;
}
GMLIB::Mod::CustomRecipe::registerSmithingTrimRecipe(recipe_id, smithing_template, base, addition);
}
);
@@ -112,6 +133,9 @@ void Export_Legacy_GMLib_ModAPI() {
std::string output,
int output_data,
int output_count) -> void {
if (!isServerStarted) {
return;
}
auto inp = RecipeIngredient(input, 0, 1);
auto outp = RecipeIngredient(output, 0, 1);
GMLIB::Mod::CustomRecipe::registerStoneCutterRecipe(recipe_id, inp, outp);
@@ -130,11 +154,17 @@ void Export_Legacy_GMLib_ModAPI() {
}
});
RemoteCall::exportAs("GMLib_ModAPI", "setExperimentEnabled", [](int experiment_id, bool value) -> void {
if (!isServerStarted) {
return;
}
if (ExperimentsList.count(experiment_id)) {
GMLIB_Level::getLevel()->setExperimentEnabled(((AllExperiments)experiment_id), value);
} else ll::Logger("Server").error("Experiment ID '{}' does not exist!", experiment_id);
});
RemoteCall::exportAs("GMLib_ModAPI", "getExperimentEnabled", [](int experiment_id) -> bool {
if (!isServerStarted) {
return false;
}
if (ExperimentsList.count(experiment_id)) {
return GMLIB_Level::getLevel()->getExperimentEnabled(((AllExperiments)experiment_id));
} else {