From 990fc9b450e193bdbd97be4dd6195ff38b5d793a Mon Sep 17 00:00:00 2001 From: Vortrex <3858226+VortrexFTW@users.noreply.github.com> Date: Sun, 9 Jan 2022 05:37:15 -0600 Subject: [PATCH] Add netevent handler native wrap --- scripts/client/gui.js | 30 +++---- scripts/client/native/connected.js | 4 +- scripts/client/server.js | 136 ++++++++++++++--------------- scripts/server/client.js | 66 +++++++------- scripts/server/native/connected.js | 6 ++ 5 files changed, 124 insertions(+), 118 deletions(-) diff --git a/scripts/client/gui.js b/scripts/client/gui.js index 48374425..f73404f4 100644 --- a/scripts/client/gui.js +++ b/scripts/client/gui.js @@ -169,49 +169,49 @@ let isAnyGUIActive = function() { // =========================================================================== -addNetworkHandler("vrr.showCharacterSelect", function(firstName, lastName, cash, clan, lastPlayed, skinId) { +addNetworkEventHandler("vrr.showCharacterSelect", function(firstName, lastName, cash, clan, lastPlayed, skinId) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received request from server to show character selection window`); showCharacterSelectGUI(firstName, lastName, cash, clan, lastPlayed, skinId); }); // =========================================================================== -addNetworkHandler("vrr.switchCharacterSelect", function(firstName, lastName, cash, clan, lastPlayed, skinId) { +addNetworkEventHandler("vrr.switchCharacterSelect", function(firstName, lastName, cash, clan, lastPlayed, skinId) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received request from server to update character selection window with new info`); switchCharacterSelectGUI(firstName, lastName, cash, clan, lastPlayed, skinId); }); // =========================================================================== -addNetworkHandler("vrr.showError", function(errorMessage, errorTitle) { +addNetworkEventHandler("vrr.showError", function(errorMessage, errorTitle) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received request from server to show error window`); showError(errorMessage, errorTitle); }); // =========================================================================== -addNetworkHandler("vrr.showPrompt", function(promptMessage, promptTitle) { +addNetworkEventHandler("vrr.showPrompt", function(promptMessage, promptTitle) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received request from server to show prompt window`); showYesNoPromptGUI(promptMessage, promptTitle); }); // =========================================================================== -addNetworkHandler("vrr.showInfo", function(infoMessage) { +addNetworkEventHandler("vrr.showInfo", function(infoMessage) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received request from server to show info dialog`); showInfo(infoMessage); }); // =========================================================================== -addNetworkHandler("vrr.loginSuccess", function() { +addNetworkEventHandler("vrr.loginSuccess", function() { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal of successful login from server`); loginSuccess(); }); // =========================================================================== -addNetworkHandler("vrr.characterSelectSuccess", function() { +addNetworkEventHandler("vrr.characterSelectSuccess", function() { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal of successful character selection from server`); characterSelectSuccess(); setChatWindowEnabled(true); @@ -219,49 +219,49 @@ addNetworkHandler("vrr.characterSelectSuccess", function() { // =========================================================================== -addNetworkHandler("vrr.loginFailed", function(remainingAttempts) { +addNetworkEventHandler("vrr.loginFailed", function(remainingAttempts) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal of failed login from server`); loginFailed(remainingAttempts); }); // =========================================================================== -addNetworkHandler("vrr.registrationSuccess", function() { +addNetworkEventHandler("vrr.registrationSuccess", function() { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal of successful registration from server`); registrationSuccess(); }); // =========================================================================== -addNetworkHandler("vrr.registrationFailed", function(errorMessage) { +addNetworkEventHandler("vrr.registrationFailed", function(errorMessage) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal of failed registration from server`); registrationFailed(errorMessage); }); // =========================================================================== -addNetworkHandler("vrr.newCharacterFailed", function(errorMessage) { +addNetworkEventHandler("vrr.newCharacterFailed", function(errorMessage) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal of failed registration from server`); newCharacterFailed(errorMessage); }); // =========================================================================== -addNetworkHandler("vrr.changePassword", function() { +addNetworkEventHandler("vrr.changePassword", function() { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal to change password from server`); showChangePasswordGUI(); }); // =========================================================================== -addNetworkHandler("vrr.showResetPasswordCodeInput", function() { +addNetworkEventHandler("vrr.showResetPasswordCodeInput", function() { logToConsole(LOG_DEBUG, `[VRR.GUI] Received signal to input reset password code from server`); resetPasswordCodeInputGUI(); }); // =========================================================================== -addNetworkHandler("vrr.guiColour", function(red1, green1, blue1, red2, green2, blue2, red3, green3, blue3) { +addNetworkEventHandler("vrr.guiColour", function(red1, green1, blue1, red2, green2, blue2, red3, green3, blue3) { logToConsole(LOG_DEBUG, `[VRR.GUI] Received new GUI colours from server: ${red1}, ${green1}, ${blue1} / ${red2}, ${green2}, ${blue2} / ${red3}, ${green3}, ${blue3}`); primaryColour = [red1, green1, blue1]; secondaryColour = [red2, green2, blue2]; @@ -273,7 +273,7 @@ addNetworkHandler("vrr.guiColour", function(red1, green1, blue1, red2, green2, b // =========================================================================== -addNetworkHandler("vrr.guiInit", function() { +addNetworkEventHandler("vrr.guiInit", function() { logToConsole(LOG_DEBUG, `[VRR.GUI] Initializing MexUI app`); //initGUI(); sendNetworkEventToServer("vrr.guiReady", true); diff --git a/scripts/client/native/connected.js b/scripts/client/native/connected.js index dd77dec1..8215fa01 100644 --- a/scripts/client/native/connected.js +++ b/scripts/client/native/connected.js @@ -57,8 +57,8 @@ function createGameVehicle(modelIndex, position, heading) { // =========================================================================== -function addNetworkEventHandler(eventName, ...args) { - addNetworkHandler.apply(null, eventName, args); +function addNetworkEventHandler(eventName, handlerFunction) { + addNetworkHandler(eventName, handlerFunction); } // =========================================================================== diff --git a/scripts/client/server.js b/scripts/client/server.js index ac13f51d..56c55c22 100644 --- a/scripts/client/server.js +++ b/scripts/client/server.js @@ -18,84 +18,84 @@ function initServerScript() { function addAllNetworkHandlers() { logToConsole(LOG_DEBUG, "[VRR.Server]: Adding network handlers ..."); - addNetworkHandler("vrr.smallGameMessage", showSmallGameMessage); - addNetworkHandler("vrr.working", setLocalPlayerWorkingState); - addNetworkHandler("vrr.jobType", setLocalPlayerJobType); - addNetworkHandler("vrr.passenger", enterVehicleAsPassenger); + addNetworkEventHandler("vrr.smallGameMessage", showSmallGameMessage); + addNetworkEventHandler("vrr.working", setLocalPlayerWorkingState); + addNetworkEventHandler("vrr.jobType", setLocalPlayerJobType); + addNetworkEventHandler("vrr.passenger", enterVehicleAsPassenger); - addNetworkHandler("vrr.freeze", setLocalPlayerFrozenState); - addNetworkHandler("vrr.control", setLocalPlayerControlState); - addNetworkHandler("vrr.fadeCamera", fadeLocalCamera); - addNetworkHandler("vrr.removeFromVehicle", removeLocalPlayerFromVehicle); - addNetworkHandler("vrr.clearPeds", clearLocalPlayerOwnedPeds); - addNetworkHandler("vrr.restoreCamera", restoreLocalCamera); - addNetworkHandler("vrr.cameraLookAt", setLocalCameraLookAt); - addNetworkHandler("vrr.logo", setServerLogoRenderState); - addNetworkHandler("vrr.ambience", setCityAmbienceState); - addNetworkHandler("vrr.runCode", runClientCode); - addNetworkHandler("vrr.clearWeapons", clearLocalPlayerWeapons); - addNetworkHandler("vrr.giveWeapon", giveLocalPlayerWeapon); - addNetworkHandler("vrr.position", setLocalPlayerPosition); - addNetworkHandler("vrr.heading", setLocalPlayerHeading); - addNetworkHandler("vrr.interior", setLocalPlayerInterior); - addNetworkHandler("vrr.minuteDuration", setMinuteDuration); - addNetworkHandler("vrr.showJobRouteStop", showJobRouteStop); - addNetworkHandler("vrr.snow", setSnowState); - addNetworkHandler("vrr.health", setLocalPlayerHealth); - addNetworkHandler("vrr.enterPropertyKey", setEnterPropertyKey); - addNetworkHandler("vrr.skinSelect", toggleSkinSelect); - addNetworkHandler("vrr.hotbar", updatePlayerHotBar); - addNetworkHandler("vrr.pedSpeech", playPedSpeech); - addNetworkHandler("vrr.clearPedState", clearLocalPedState); - addNetworkHandler("vrr.drunkEffect", setLocalPlayerDrunkEffect); - addNetworkHandler("vrr.showItemActionDelay", showItemActionDelay); - addNetworkHandler("vrr.set2DRendering", setPlayer2DRendering); - addNetworkHandler("vrr.mouseCursor", toggleMouseCursor); - addNetworkHandler("vrr.mouseCamera", toggleMouseCamera); - addNetworkHandler("vrr.mouseCameraForce", setMouseCameraState); - addNetworkHandler("vrr.weaponDamageEnabled", setPlayerWeaponDamageEnabled); - addNetworkHandler("vrr.weaponDamageEvent", setPlayerWeaponDamageEvent); - addNetworkHandler("vrr.spawned", onServerSpawnedPlayer); - addNetworkHandler("vrr.money", setLocalPlayerCash); - addNetworkHandler("vrr.armour", setLocalPlayerArmour); - addNetworkHandler("vrr.wantedLevel", forceLocalPlayerWantedLevel); + addNetworkEventHandler("vrr.freeze", setLocalPlayerFrozenState); + addNetworkEventHandler("vrr.control", setLocalPlayerControlState); + addNetworkEventHandler("vrr.fadeCamera", fadeLocalCamera); + addNetworkEventHandler("vrr.removeFromVehicle", removeLocalPlayerFromVehicle); + addNetworkEventHandler("vrr.clearPeds", clearLocalPlayerOwnedPeds); + addNetworkEventHandler("vrr.restoreCamera", restoreLocalCamera); + addNetworkEventHandler("vrr.cameraLookAt", setLocalCameraLookAt); + addNetworkEventHandler("vrr.logo", setServerLogoRenderState); + addNetworkEventHandler("vrr.ambience", setCityAmbienceState); + addNetworkEventHandler("vrr.runCode", runClientCode); + addNetworkEventHandler("vrr.clearWeapons", clearLocalPlayerWeapons); + addNetworkEventHandler("vrr.giveWeapon", giveLocalPlayerWeapon); + addNetworkEventHandler("vrr.position", setLocalPlayerPosition); + addNetworkEventHandler("vrr.heading", setLocalPlayerHeading); + addNetworkEventHandler("vrr.interior", setLocalPlayerInterior); + addNetworkEventHandler("vrr.minuteDuration", setMinuteDuration); + addNetworkEventHandler("vrr.showJobRouteStop", showJobRouteStop); + addNetworkEventHandler("vrr.snow", setSnowState); + addNetworkEventHandler("vrr.health", setLocalPlayerHealth); + addNetworkEventHandler("vrr.enterPropertyKey", setEnterPropertyKey); + addNetworkEventHandler("vrr.skinSelect", toggleSkinSelect); + addNetworkEventHandler("vrr.hotbar", updatePlayerHotBar); + addNetworkEventHandler("vrr.pedSpeech", playPedSpeech); + addNetworkEventHandler("vrr.clearPedState", clearLocalPedState); + addNetworkEventHandler("vrr.drunkEffect", setLocalPlayerDrunkEffect); + addNetworkEventHandler("vrr.showItemActionDelay", showItemActionDelay); + addNetworkEventHandler("vrr.set2DRendering", setPlayer2DRendering); + addNetworkEventHandler("vrr.mouseCursor", toggleMouseCursor); + addNetworkEventHandler("vrr.mouseCamera", toggleMouseCamera); + addNetworkEventHandler("vrr.mouseCameraForce", setMouseCameraState); + addNetworkEventHandler("vrr.weaponDamageEnabled", setPlayerWeaponDamageEnabled); + addNetworkEventHandler("vrr.weaponDamageEvent", setPlayerWeaponDamageEvent); + addNetworkEventHandler("vrr.spawned", onServerSpawnedPlayer); + addNetworkEventHandler("vrr.money", setLocalPlayerCash); + addNetworkEventHandler("vrr.armour", setLocalPlayerArmour); + addNetworkEventHandler("vrr.wantedLevel", forceLocalPlayerWantedLevel); - addNetworkHandler("vrr.delKeyBind", unBindAccountKey); - addNetworkHandler("vrr.addKeyBind", bindAccountKey); - addNetworkHandler("vrr.clearKeyBinds", clearKeyBinds); + addNetworkEventHandler("vrr.delKeyBind", unBindAccountKey); + addNetworkEventHandler("vrr.addKeyBind", bindAccountKey); + addNetworkEventHandler("vrr.clearKeyBinds", clearKeyBinds); - addNetworkHandler("vrr.nametag", updatePlayerNameTag); - addNetworkHandler("vrr.ping", updatePlayerPing); + addNetworkEventHandler("vrr.nametag", updatePlayerNameTag); + addNetworkEventHandler("vrr.ping", updatePlayerPing); - addNetworkHandler("vrr.m", receiveChatBoxMessageFromServer); - addNetworkHandler("vrr.chatScrollLines", setChatScrollLines); + addNetworkEventHandler("vrr.m", receiveChatBoxMessageFromServer); + addNetworkEventHandler("vrr.chatScrollLines", setChatScrollLines); - addNetworkHandler("vrr.radioStream", playStreamingRadio); - addNetworkHandler("vrr.audioFileStream", playAudioFile); - addNetworkHandler("vrr.stopRadioStream", stopStreamingRadio); - addNetworkHandler("vrr.radioVolume", setStreamingRadioVolume); + addNetworkEventHandler("vrr.radioStream", playStreamingRadio); + addNetworkEventHandler("vrr.audioFileStream", playAudioFile); + addNetworkEventHandler("vrr.stopRadioStream", stopStreamingRadio); + addNetworkEventHandler("vrr.radioVolume", setStreamingRadioVolume); - addNetworkHandler("vrr.veh.lights", setVehicleLights); - addNetworkHandler("vrr.veh.engine", setVehicleEngine); - addNetworkHandler("vrr.veh.repair", repairVehicle); + addNetworkEventHandler("vrr.veh.lights", setVehicleLights); + addNetworkEventHandler("vrr.veh.engine", setVehicleEngine); + addNetworkEventHandler("vrr.veh.repair", repairVehicle); - addNetworkHandler("vrr.pedAnim", makePedPlayAnimation); - addNetworkHandler("vrr.pedStopAnim", makePedStopAnimation); - addNetworkHandler("vrr.forcePedAnim", forcePedAnimation); - addNetworkHandler("vrr.hideAllGUI", hideAllGUI); - addNetworkHandler("vrr.gameScript", setGameScriptState); - addNetworkHandler("vrr.clientInfo", serverRequestedClientInfo); - addNetworkHandler("vrr.interiorLights", updateInteriorLightsState); + addNetworkEventHandler("vrr.pedAnim", makePedPlayAnimation); + addNetworkEventHandler("vrr.pedStopAnim", makePedStopAnimation); + addNetworkEventHandler("vrr.forcePedAnim", forcePedAnimation); + addNetworkEventHandler("vrr.hideAllGUI", hideAllGUI); + addNetworkEventHandler("vrr.gameScript", setGameScriptState); + addNetworkEventHandler("vrr.clientInfo", serverRequestedClientInfo); + addNetworkEventHandler("vrr.interiorLights", updateInteriorLightsState); - addNetworkHandler("vrr.syncElement", forceSyncElementProperties); - addNetworkHandler("vrr.elementPosition", setElementPosition); - addNetworkHandler("vrr.elementCollisions", setElementCollisionsEnabled); + addNetworkEventHandler("vrr.syncElement", forceSyncElementProperties); + addNetworkEventHandler("vrr.elementPosition", setElementPosition); + addNetworkEventHandler("vrr.elementCollisions", setElementCollisionsEnabled); - addNetworkHandler("vrr.vehBuyState", setVehiclePurchaseState); + addNetworkEventHandler("vrr.vehBuyState", setVehiclePurchaseState); - addNetworkHandler("vrr.showRegistration", showRegistrationGUI); - addNetworkHandler("vrr.showNewCharacter", showNewCharacterGUI); - addNetworkHandler("vrr.showLogin", showLoginGUI); + addNetworkEventHandler("vrr.showRegistration", showRegistrationGUI); + addNetworkEventHandler("vrr.showNewCharacter", showNewCharacterGUI); + addNetworkEventHandler("vrr.showLogin", showLoginGUI); } // =========================================================================== diff --git a/scripts/server/client.js b/scripts/server/client.js index c764dad0..c74dd5ac 100644 --- a/scripts/server/client.js +++ b/scripts/server/client.js @@ -19,61 +19,61 @@ function addAllNetworkHandlers() { logToConsole(LOG_DEBUG, "[VRR.Client]: Adding network handlers ..."); // KeyBind - addNetworkHandler("vrr.useKeyBind", playerUsedKeyBind); + addNetworkEventHandler("vrr.useKeyBind", playerUsedKeyBind); // GUI - addNetworkHandler("vrr.promptAnswerNo", playerPromptAnswerNo); - addNetworkHandler("vrr.promptAnswerYes", playerPromptAnswerYes); - addNetworkHandler("vrr.toggleGUI", playerToggledGUI); + addNetworkEventHandler("vrr.promptAnswerNo", playerPromptAnswerNo); + addNetworkEventHandler("vrr.promptAnswerYes", playerPromptAnswerYes); + addNetworkEventHandler("vrr.toggleGUI", playerToggledGUI); // AFK - addNetworkHandler("vrr.afk", playerChangeAFKState); + addNetworkEventHandler("vrr.afk", playerChangeAFKState); // Event - addNetworkHandler("vrr.pickup", onPlayerNearPickup); - addNetworkHandler("vrr.enteredSphere", onPlayerEnteredSphere); - addNetworkHandler("vrr.exitedSphere", onPlayerExitedSphere); - addNetworkHandler("vrr.playerDeath", onPlayerDeath); - addNetworkHandler("vrr.onPlayerEnterVehicle", onPlayerEnteredVehicle); - addNetworkHandler("vrr.onPlayerExitVehicle", onPlayerExitedVehicle); + addNetworkEventHandler("vrr.pickup", onPlayerNearPickup); + addNetworkEventHandler("vrr.enteredSphere", onPlayerEnteredSphere); + addNetworkEventHandler("vrr.exitedSphere", onPlayerExitedSphere); + addNetworkEventHandler("vrr.playerDeath", onPlayerDeath); + addNetworkEventHandler("vrr.onPlayerEnterVehicle", onPlayerEnteredVehicle); + addNetworkEventHandler("vrr.onPlayerExitVehicle", onPlayerExitedVehicle); // Job - addNetworkHandler("vrr.arrivedAtJobRouteStop", playerArrivedAtJobRouteStop); + addNetworkEventHandler("vrr.arrivedAtJobRouteStop", playerArrivedAtJobRouteStop); // Client - addNetworkHandler("vrr.clientReady", playerClientReady); - addNetworkHandler("vrr.guiReady", playerGUIReady); - addNetworkHandler("vrr.clientStarted", playerClientStarted); - addNetworkHandler("vrr.clientStopped", playerClientStopped); + addNetworkEventHandler("vrr.clientReady", playerClientReady); + addNetworkEventHandler("vrr.guiReady", playerGUIReady); + addNetworkEventHandler("vrr.clientStarted", playerClientStarted); + addNetworkEventHandler("vrr.clientStopped", playerClientStopped); // Account - addNetworkHandler("vrr.checkLogin", checkLogin); - addNetworkHandler("vrr.checkRegistration", checkRegistration); - addNetworkHandler("vrr.checkResetPassword", checkAccountResetPasswordRequest); - addNetworkHandler("vrr.checkChangePassword", checkAccountChangePassword); + addNetworkEventHandler("vrr.checkLogin", checkLogin); + addNetworkEventHandler("vrr.checkRegistration", checkRegistration); + addNetworkEventHandler("vrr.checkResetPassword", checkAccountResetPasswordRequest); + addNetworkEventHandler("vrr.checkChangePassword", checkAccountChangePassword); // Developer - addNetworkHandler("vrr.runCodeSuccess", clientRunCodeSuccess); - addNetworkHandler("vrr.runCodeFail", clientRunCodeFail); + addNetworkEventHandler("vrr.runCodeSuccess", clientRunCodeSuccess); + addNetworkEventHandler("vrr.runCodeFail", clientRunCodeFail); // SubAccount - addNetworkHandler("vrr.checkNewCharacter", checkNewCharacter); - addNetworkHandler("vrr.nextCharacter", checkNextCharacter); - addNetworkHandler("vrr.previousCharacter", checkPreviousCharacter); - addNetworkHandler("vrr.selectCharacter", selectCharacter); + addNetworkEventHandler("vrr.checkNewCharacter", checkNewCharacter); + addNetworkEventHandler("vrr.nextCharacter", checkNextCharacter); + addNetworkEventHandler("vrr.previousCharacter", checkPreviousCharacter); + addNetworkEventHandler("vrr.selectCharacter", selectCharacter); // Item - addNetworkHandler("vrr.itemActionDelayComplete", playerItemActionDelayComplete); + addNetworkEventHandler("vrr.itemActionDelayComplete", playerItemActionDelayComplete); - addNetworkHandler("vrr.weaponDamage", playerDamagedByPlayer); + addNetworkEventHandler("vrr.weaponDamage", playerDamagedByPlayer); - addNetworkHandler("vrr.player.position", updatePositionInPlayerData); - addNetworkHandler("vrr.player.heading", updateHeadingInPlayerData); - addNetworkHandler("vrr.player.lookat", setPlayerHeadLookPosition); + addNetworkEventHandler("vrr.player.position", updatePositionInPlayerData); + addNetworkEventHandler("vrr.player.heading", updateHeadingInPlayerData); + addNetworkEventHandler("vrr.player.lookat", setPlayerHeadLookPosition); - addNetworkHandler("vrr.skinSelected", playerFinishedSkinSelection); + addNetworkEventHandler("vrr.skinSelected", playerFinishedSkinSelection); - addNetworkHandler("vrr.clientInfo", updateConnectionLogOnClientInfoReceive); + addNetworkEventHandler("vrr.clientInfo", updateConnectionLogOnClientInfoReceive); } // =========================================================================== diff --git a/scripts/server/native/connected.js b/scripts/server/native/connected.js index a68c4cff..218dcced 100644 --- a/scripts/server/native/connected.js +++ b/scripts/server/native/connected.js @@ -892,4 +892,10 @@ function sendNetworkEventToPlayer(networkEvent, client, ...args) { triggerNetworkEvent.apply(null, networkEvent, client, args); } +// =========================================================================== + +function addNetworkEventHandler(eventName, handlerFunction) { + addNetworkHandler(eventName, handlerFunction); +} + // =========================================================================== \ No newline at end of file