update(src): Some JS Updates

Author: skuzzis

plugin_files/bin/scripting/exports.js

@@ -1,7 +1,7 @@
 function LoadExports(global) {
     let pluginProxyCache = {}
 
-    global.export = (exportName, callback) => {
+    global.exp = (exportName, callback) => {
         AddEventHandler(`export:${GetCurrentPluginName()}:${exportName}`, (event, ...args) => {
             event.SetReturn(callback.apply(global, args))
             return EventResult.Stop

src/plugins/Plugin.cpp

@@ -369,7 +369,7 @@ EValue SerializeData(std::any data, EContext* state)
     std::any value = data;
 
     if (!value.has_value())
-        return EValue(state);
+        return EValue(state, nullptr);
 
     try
     {
@@ -451,7 +451,7 @@ EValue SerializeData(std::any data, EContext* state)
         else if (value.type() == typeid(QAngle))
             return EValue(state, std::any_cast<QAngle>(value));
         else if (value.type() == typeid(std::nullptr_t))
-            return EValue(state);
+            return EValue(state, nullptr);
         else if (value.type() == typeid(std::vector<std::string>))
         {
             if(state->GetKind() == ContextKinds::Lua) {
@@ -488,16 +488,16 @@ EValue SerializeData(std::any data, EContext* state)
         else
         {
             PRINTF("Unknown Data Type: %s\n", value.type().name());
-            return EValue(state);
+            return EValue(state, nullptr);
         }
     }
     catch (std::bad_any_cast& err)
     {
         PRINTF("Invalid casting: %s\n", err.what());
-        return EValue(state);
+        return EValue(state, nullptr);
     }
 
-    return EValue(state);
+    return EValue(state, nullptr);
 }
 
 std::any DeserializeData(EValue ref, EContext* state)

src/plugins/core/scripting/player/player.cpp

@@ -33,47 +33,47 @@ SDKBaseClass* PluginPlayer::GetCBaseEntity()
 {
     Player* player = g_playerManager->GetPlayer(this->playerId);
     if (!player) pCBaseEntity->SetPtr(nullptr);
-    else if(player->GetPlayerPawn() != pCBaseEntity->GetPtr()) pCBaseEntity->SetPtr(player->GetPlayerPawn());
+    else if (player->GetPlayerPawn() != pCBaseEntity->GetPtr()) pCBaseEntity->SetPtr(player->GetPlayerPawn());
     return pCBaseEntity;
 }
 
 SDKBaseClass* PluginPlayer::GetCBasePlayerController()
 {
     Player* player = g_playerManager->GetPlayer(this->playerId);
     if (!player) pCBasePlayerController->SetPtr(nullptr);
-    else if(player->GetController() != pCBasePlayerController->GetPtr()) pCBasePlayerController->SetPtr(player->GetController());
+    else if (player->GetController() != pCBasePlayerController->GetPtr()) pCBasePlayerController->SetPtr(player->GetController());
     return pCBasePlayerController;
 }
 
 SDKBaseClass* PluginPlayer::GetCBasePlayerPawn()
 {
     Player* player = g_playerManager->GetPlayer(this->playerId);
     if (!player) pCBasePlayerPawn->SetPtr(nullptr);
-    else if(player->GetPawn() != pCBasePlayerPawn->GetPtr()) pCBasePlayerPawn->SetPtr(player->GetPawn());
+    else if (player->GetPawn() != pCBasePlayerPawn->GetPtr()) pCBasePlayerPawn->SetPtr(player->GetPawn());
     return pCBasePlayerPawn;
 }
 
 SDKBaseClass* PluginPlayer::GetCCSPlayerController()
 {
     Player* player = g_playerManager->GetPlayer(this->playerId);
     if (!player) pCCSPlayerController->SetPtr(nullptr);
-    else if(player->GetPlayerController() != pCCSPlayerController->GetPtr()) pCCSPlayerController->SetPtr(player->GetPlayerController());
+    else if (player->GetPlayerController() != pCCSPlayerController->GetPtr()) pCCSPlayerController->SetPtr(player->GetPlayerController());
     return pCCSPlayerController;
 }
 
 SDKBaseClass* PluginPlayer::GetCCSPlayerPawn()
 {
     Player* player = g_playerManager->GetPlayer(this->playerId);
     if (!player) pCCSPlayerPawn->SetPtr(nullptr);
-    else if(player->GetPlayerPawn() != pCCSPlayerPawn->GetPtr()) pCCSPlayerPawn->SetPtr(player->GetPlayerPawn());
+    else if (player->GetPlayerPawn() != pCCSPlayerPawn->GetPtr()) pCCSPlayerPawn->SetPtr(player->GetPlayerPawn());
     return pCCSPlayerPawn;
 }
 
 SDKBaseClass* PluginPlayer::GetCCSPlayerPawnBase()
 {
     Player* player = g_playerManager->GetPlayer(this->playerId);
     if (!player) pCCSPlayerPawnBase->SetPtr(nullptr);
-    else if(player->GetPlayerBasePawn() != pCCSPlayerPawnBase->GetPtr()) pCCSPlayerPawnBase->SetPtr(player->GetPlayerBasePawn());
+    else if (player->GetPlayerBasePawn() != pCCSPlayerPawnBase->GetPtr()) pCCSPlayerPawnBase->SetPtr(player->GetPlayerBasePawn());
     return pCCSPlayerPawnBase;
 }
 
@@ -255,7 +255,7 @@ std::string PluginPlayer::GetSteamID2()
         return "STEAM_0:0:000000000";
 
     static const uint64_t base = 76561197960265728;
-    std::string data = string_format("STEAM_0:%d:%llu", (steamid - base) % 2, (steamid - base) / 2);
+    std::string data = string_format("STEAM_0:%d:%llu", (steamid - base) & 1, (steamid - base) / 2);
 
     return data;
 }
@@ -468,13 +468,14 @@ void PluginPlayer::PerformMenuAction(std::string action, int value)
     Player* self = g_playerManager->GetPlayer(this->playerId);
     if (!self) return;
 
-    if(action == "useOption") {
-        while(self->menu_renderer->GetSelection() != value-1)
+    if (action == "useOption") {
+        while (self->menu_renderer->GetSelection() != value - 1)
             self->menu_renderer->MoveSelection();
 
         self->menu_renderer->PerformMenuAction(g_Config->FetchValue<std::string>("core.menu.buttons.use"));
-    } else if(action == "scrollToOption") {
-        while(self->menu_renderer->GetSelection() != value-1)
+    }
+    else if (action == "scrollToOption") {
+        while (self->menu_renderer->GetSelection() != value - 1)
             self->menu_renderer->MoveSelection();
     }
 }

src/plugins/loader/scripting/engine/events.cpp

@@ -56,7 +56,7 @@ void LoadEvent(Plugin* plugin, EContext* state)
         .addFunction("RemoveEventHandlerPlugin", RemoveEventHandlerPlugin)
         .addFunction("TriggerEventInternal", TriggerEventInternal);
 
-    BeginClass<PluginEvent>("Event", state)
+    BeginClass<PluginEvent>(state->GetKind() == ContextKinds::JavaScript ? "PEvent" : "Event", state)
         .addConstructor<std::string, EContext*>()
         .addFunction("GetInvokingPlugin", &PluginEvent::GetInvokingPlugin)
         .addFunction("IsGameEvent", &PluginEvent::IsGameEvent)