Skip to content

Commit

Permalink
feat: bypass preloader plugins
Browse files Browse the repository at this point in the history
  • Loading branch information
OEOTYAN committed Feb 4, 2024
1 parent 85d27dc commit 16a58d2
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/ll/core/plugin/PluginRegistrar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ static std::expected<Manifest, DirState> loadManifest(std::filesystem::path cons
error_utils::printCurrentException(logger);
return std::unexpected{DirState::Error};
}
if (manifest.type == "preload-native" /*NativePluginTypeName*/) {
return std::unexpected{DirState::Empty}; // bypass preloader plugin
}
if (manifest.name != dirName) {
logger.error("Plugin name {} do not match folder {}"_tr(manifest.name, dirName));
return std::unexpected{DirState::Error};
Expand Down
12 changes: 11 additions & 1 deletion src/mc/util/molang/MolangScriptArgType.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,14 @@

#include "mc/_HeaderOutputPredefine.h"

enum class MolangScriptArgType {};
enum class MolangScriptArgType : int {
Unset = -1,
Float = 0,
HashType64 = 1,
MolangLoopBreak = 2,
MolangLoopContinue = 3,
MolangActorPtr = 4,
MolangActorIdPtr = 5,
MolangItemStackBasePtr = 6,
Variant = 7,
};

0 comments on commit 16a58d2

Please sign in to comment.