diff --git a/.gitignore b/.gitignore index d462401a..8a30d258 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,398 @@ -/.vs -/x64 +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml diff --git a/Globals.h b/Globals.h index 3627711e..76c7c9d9 100644 --- a/Globals.h +++ b/Globals.h @@ -3,7 +3,7 @@ namespace Globals { - bool bUseBeacons = false; + bool bUseBeacons = true; bool bUseAccountID = false; // backend communication, etc... bool bIsServerListening = false; diff --git a/Logging.h b/Logging.h index f52c0c73..2b7c722b 100644 --- a/Logging.h +++ b/Logging.h @@ -1,77 +1,88 @@ #pragma once #include "framework.h" +#include +#include +#include enum ELogType : uint8_t { - Invalid = 0, - Abilities = 1, - Actor = 2, - Player = 3, - Game = 4, - Inventory = 5, - Kismet = 6, - Hook = 7, - Athena = 8, - ProcessEvent = 9 + Invalid = 0, + Abilities = 1, + Actor = 2, + Player = 3, + Game = 4, + Inventory = 5, + Kismet = 6, + Hook = 7, + Athena = 8, + ProcessEvent = 9 }; enum ELogEvent : uint8_t { - Warning = 1, - Info = 2, - Error = 3 + Warning = 1, + Info = 2, + Error = 3 }; - /* tbh idek what im doing here but itll be better later */ namespace Logging { - string LogTypeToString(ELogType LogType = ELogType::Invalid) - { - if (LogType == ELogType::Abilities) - return "LogAbilities"; - else if (LogType == ELogType::Actor) - return "LogActor"; - else if (LogType == ELogType::Player) - return "LogPlayer"; - else if (LogType == ELogType::Game) - return "LogGame"; - else if (LogType == ELogType::Inventory) - return "LogInventory"; - else if (LogType == ELogType::Kismet) - return "LogKismet"; - else if (LogType == ELogType::Hook) - return "LogHook"; - else if (LogType == ELogType::Athena) - return "LogAthena"; - else if (LogType == ELogType::ProcessEvent) - return "LogProcessEvent"; + std::mutex logMutex; - return "Unknown"; - } + std::string LogTypeToString(ELogType LogType = ELogType::Invalid) + { + switch (LogType) + { + case ELogType::Abilities: return "LogAbilities"; + case ELogType::Actor: return "LogActor"; + case ELogType::Player: return "LogPlayer"; + case ELogType::Game: return "LogGame"; + case ELogType::Inventory: return "LogInventory"; + case ELogType::Kismet: return "LogKismet"; + case ELogType::Hook: return "LogHook"; + case ELogType::Athena: return "LogAthena"; + case ELogType::ProcessEvent: return "LogProcessEvent"; + default: return "Unknown"; + } + } - string LogEventToString(ELogEvent LogEvent) - { - if (LogEvent == ELogEvent::Warning) - return "Warning"; - else if (LogEvent == ELogEvent::Info) - return "Info"; - else if (LogEvent == ELogEvent::Error) - return "Error"; + std::string LogEventToString(ELogEvent LogEvent) + { + switch (LogEvent) + { + case ELogEvent::Warning: return "Warning"; + case ELogEvent::Info: return "Info"; + case ELogEvent::Error: return "Error"; + default: return "Unknown"; + } + } - return "Unknown"; - } + void Log(ELogEvent LogEvent, ELogType LogType, const char* Format, ...) + { + std::string Prefix = LogTypeToString(LogType) + ":" + LogEventToString(LogEvent) + ": "; - void Log(ELogEvent LogEvent, ELogType LogType, const char* Format, ...) - { - std::string Prefix = "" + LogTypeToString(LogType) + ":" + LogEventToString(LogEvent) + ": "; - va_list _ArgList; - va_start(_ArgList, Format); - std::string FullFormat = Prefix + Format + "\n"; - vfprintf(stdout, FullFormat.c_str(), _ArgList); - va_end(_ArgList); - } + char Buffer[1024]; + va_list _ArgList; + va_start(_ArgList, Format); + vsnprintf(Buffer, sizeof(Buffer), Format, _ArgList); + va_end(_ArgList); + + std::string FullMessage = Prefix + Buffer + "\n"; + + fprintf(stdout, "%s", FullMessage.c_str()); + + { + std::lock_guard lock(logMutex); + std::ofstream logFile("Athena.txt", std::ios::app); + if (logFile.is_open()) + { + logFile << FullMessage; + logFile.close(); + } + } + } } \ No newline at end of file diff --git a/Server.h b/Server.h index 03a1ca48..f83ed8bc 100644 --- a/Server.h +++ b/Server.h @@ -17,6 +17,8 @@ namespace Server if (Globals::bIsServerListening) return; + Globals::bIsServerListening = true; + UWorld* World = UWorld::GetWorld(); UNetDriver* NetDriver = nullptr;