Update CommonLibF4, Add ToggleGrassCommand Module

Author: TheGamerX20

.Build/F4SE/Plugins/Addictol.toml

@@ -177,6 +177,9 @@ bViewmodelShading = true
 # Fixes the first-person viewmodel getting blurred by depth-of-field (iron-sight ADS, dialogue camera) by re-rasterizing it after the DoF pass.
 bDofFix = true
 
+# Fixes the "ToggleGrass" / "tg" command being a reference function in the AE versions of the game.
+bToggleGrassCommand = true
+
 
 [Warnings]
 

Addictol/Include/Modules/AdModuleToggleGrassCommand.h

@@ -0,0 +1,19 @@
+#pragma once
+
+#include <AdModule.h>
+
+namespace Addictol
+{
+	class ModuleToggleGrassCommand :
+		public Module
+	{
+	public:
+		ModuleToggleGrassCommand();
+		virtual ~ModuleToggleGrassCommand() = default;
+
+		[[nodiscard]] virtual bool DoQuery() const noexcept override;
+		[[nodiscard]] virtual bool DoInstall([[maybe_unused]] F4SE::MessagingInterface::Message* a_msg = nullptr) noexcept override;
+		[[nodiscard]] virtual bool DoListener([[maybe_unused]] F4SE::MessagingInterface::Message* a_msg = nullptr) noexcept override;
+		[[nodiscard]] virtual bool DoPapyrusListener([[maybe_unused]] RE::BSScript::IVirtualMachine* a_vm) noexcept override;
+	};
+}

Addictol/Source/AdConfigValidation.cpp

@@ -31,8 +31,8 @@ namespace Addictol
 			"bCombatMusic", "bWorkbenchSound", "bActorCauseSaveBloat",
 			"bAnimSignedCrash", "bBethesdaNetCrash",
 			"bMuzzleFlashLight", "bAltTabFullscreen", "bPowerGridScrap",
-			"bViewmodelShading", "bDofFix",
-			"bUtilityShader", "bPipBoyCursorConstraints"
+			"bViewmodelShading", "bDofFix", "bUtilityShader",
+			"bPipBoyCursorConstraints", "bToggleGrassCommand"
 		}},
 		{ "Warnings", {
 			"bImageSpaceAdapter", "bDuplicateAddonNodeIndex", "bReferenceHandleLimit"

Addictol/Source/AdRegisterModules.cpp

@@ -62,6 +62,7 @@
 #include <Modules/AdModuleUtilityShader.h>
 #include <Modules/AdModulePipBoyCursorConstraints.h>
 #include <Modules/AdModuleReferenceHandleLimitWarning.h>
+#include <Modules/AdModuleToggleGrassCommand.h>
 
 // Create patches
 static auto sModuleThreads							= std::make_shared<Addictol::ModuleThreads>();
@@ -126,6 +127,7 @@ static auto sModuleDofFix							= std::make_shared<Addictol::ModuleDofFix>();
 static auto sModuleUtilityShader					= std::make_shared<Addictol::ModuleUtilityShader>();
 static auto sModulePipBoyCursorConstraints			= std::make_shared<Addictol::ModulePipBoyCursorConstraints>();
 static auto sModuleReferenceHandleLimitWarning		= std::make_shared<Addictol::ModuleReferenceHandleLimitWarning>();
+static auto sModuleToggleGrassCommand				= std::make_shared<Addictol::ModuleToggleGrassCommand>();
 
 void AdRegisterPreloadModules()
 {
@@ -202,6 +204,7 @@ void AdRegisterModules()
 	modules.Register(sModuleViewmodelShading);
 	modules.Register(sModuleDofFix);
 	modules.Register(sModuleReferenceHandleLimitWarning);
+	modules.Register(sModuleToggleGrassCommand);
 
 	// Registers other patches
 	modules.Register(sModuleThreads,						kGameDataReady);

Addictol/Source/Modules/AdModuleToggleGrassCommand.cpp

@@ -0,0 +1,41 @@
+#include <Modules/AdModuleToggleGrassCommand.h>
+#include <AdUtils.h>
+
+#include <RE/S/SCRIPT_FUNCTION.h>
+
+namespace Addictol
+{
+	static REX::TOML::Bool<> bFixesToggleGrassCommand{ "Fixes"sv, "bToggleGrassCommand"sv, true };
+
+	ModuleToggleGrassCommand::ModuleToggleGrassCommand() :
+		Module("Toggle Grass Command", &bFixesToggleGrassCommand)
+	{}
+
+	bool ModuleToggleGrassCommand::DoQuery() const noexcept
+	{
+		// Only needed on AE
+		return RELEX::IsRuntimeAE();
+	}
+
+	bool ModuleToggleGrassCommand::DoInstall([[maybe_unused]] F4SE::MessagingInterface::Message* a_msg) noexcept
+	{
+		RE::SCRIPT_FUNCTION* consoleCommand = RE::SCRIPT_FUNCTION::LocateConsoleCommand("ToggleGrass");
+		if (consoleCommand)
+		{
+			bool isReferenceFunction = false;
+			REL::WriteSafe(reinterpret_cast<std::uintptr_t>(&consoleCommand->referenceFunction), &isReferenceFunction, sizeof(isReferenceFunction));
+		}
+
+		return true;
+	}
+
+	bool ModuleToggleGrassCommand::DoListener([[maybe_unused]] F4SE::MessagingInterface::Message* a_msg) noexcept
+	{
+		return true;
+	}
+
+	bool ModuleToggleGrassCommand::DoPapyrusListener([[maybe_unused]] RE::BSScript::IVirtualMachine* a_vm) noexcept
+	{
+		return true;
+	}
+}

Depends/commonlibf4

@@ -29,6 +29,7 @@
     <ClCompile Include="..\Addictol\Source\Modules\AdModuleAltTabFullscreen.cpp" />
     <ClCompile Include="..\Addictol\Source\Modules\AdModuleDofFix.cpp" />
     <ClCompile Include="..\Addictol\Source\Modules\AdModuleDpiScaling.cpp" />
+    <ClCompile Include="..\Addictol\Source\Modules\AdModuleToggleGrassCommand.cpp" />
     <ClCompile Include="..\Addictol\Source\Modules\AdModuleViewmodelShading.cpp" />
     <ClCompile Include="..\Addictol\Source\Modules\AdModuleActorCauseSaveBloat.cpp" />
     <ClCompile Include="..\Addictol\Source\Modules\AdModuleActorIsHostileToActor.cpp" />
@@ -108,6 +109,7 @@
     <ClInclude Include="..\Addictol\Include\Modules\AdModuleAltTabFullscreen.h" />
     <ClInclude Include="..\Addictol\Include\Modules\AdModuleDofFix.h" />
     <ClInclude Include="..\Addictol\Include\Modules\AdModuleDpiScaling.h" />
+    <ClInclude Include="..\Addictol\Include\Modules\AdModuleToggleGrassCommand.h" />
     <ClInclude Include="..\Addictol\Include\Modules\AdModuleViewmodelShading.h" />
     <ClInclude Include="..\Addictol\Include\Modules\AdModuleActorCauseSaveBloat.h" />
     <ClInclude Include="..\Addictol\Include\Modules\AdModuleActorIsHostileToActor.h" />

VC/Addictol.vcxproj

@@ -241,6 +241,9 @@
     <ClCompile Include="..\Addictol\Source\Modules\AdModuleReferenceHandleLimitWarning.cpp">
       <Filter>Source\Modules</Filter>
     </ClCompile>
+    <ClCompile Include="..\Addictol\Source\Modules\AdModuleToggleGrassCommand.cpp">
+      <Filter>Source\Modules</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Version\resource_version2.h" />
@@ -475,6 +478,9 @@
     <ClInclude Include="..\Addictol\Include\Modules\AdModuleReferenceHandleLimitWarning.h">
       <Filter>Include\Modules</Filter>
     </ClInclude>
+    <ClInclude Include="..\Addictol\Include\Modules\AdModuleToggleGrassCommand.h">
+      <Filter>Include\Modules</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\Version\resource_version.rc" />