API 3.54. ArkApi plugin reload files

Pelayori · Pelayori · commit 88de52c7c026 · 2021-12-22T20:34:44.000+01:00
diff --git a/out_lib/ArkApi.lib b/out_lib/ArkApi.lib
diff --git a/version/Core/Private/Ark/ArkBaseApi.cpp b/version/Core/Private/Ark/ArkBaseApi.cpp
@@ -16,7 +16,7 @@
 
 namespace API
 {
-	constexpr float api_version = 3.53f;
+	constexpr float api_version = 3.54f;
 
 	ArkBaseApi::ArkBaseApi()
 		: commands_(std::make_unique<ArkApi::Commands>()),
diff --git a/version/Core/Private/Ark/HooksImpl.cpp b/version/Core/Private/Ark/HooksImpl.cpp
@@ -153,6 +153,8 @@ namespace ArkApi
 			command->CheckOnTimerCallbacks();
 		}
 
+		API::PluginManager::DetectPluginChangesTimerCallback(); // We call this here to avoid UnknownModule crashes
+
 		AGameState_DefaultTimer_original(_this);
 	}
 
diff --git a/version/Core/Private/PluginManager/PluginManager.cpp b/version/Core/Private/PluginManager/PluginManager.cpp
@@ -14,7 +14,7 @@ namespace API
 {
 	PluginManager::PluginManager()
 	{
-		ArkApi::GetCommands().AddOnTimerCallback(L"PluginManager.DetectPluginChangesTimerCallback", &DetectPluginChangesTimerCallback);
+		//ArkApi::GetCommands().AddOnTimerCallback(L"PluginManager.DetectPluginChangesTimerCallback", &DetectPluginChangesTimerCallback);
 	}
 
 	PluginManager& PluginManager::Get()
@@ -347,9 +347,10 @@ namespace API
 				// Save the world in case the unload/load procedure causes crash
 				if (save_world)
 				{
-					//Log::GetLog()->info("Saving world before reloading plugins ...");
-					//ArkApi::GetApiUtils().GetShooterGameMode()->SaveWorld();
-					//Log::GetLog()->info("World saved.");
+					Log::GetLog()->info("Saving world before reloading plugins ...");
+					ArkApi::GetApiUtils().GetShooterGameMode()->SaveWorld();
+					Log::GetLog()->info("World saved.");
+
 					save_world = false; // do not save again if multiple plugins are reloaded in this loop
 				}
 
@@ -360,16 +361,43 @@ namespace API
 					copy_file(new_plugin_file_path, plugin_file_path, fs::copy_options::overwrite_existing);
 					fs::remove(new_plugin_file_path);
 
+					// Wait 1 second before loading to let things clean up correctly...
+					// This will load the plugin in the next timer callback
+					//auto_reload_pending_plugins_.emplace_back(filename);
+
 					LoadPlugin(filename);
+
+					Log::GetLog()->info("Reloaded plugin - {}", filename);
 				}
 				catch (const std::exception& error)
 				{
 					Log::GetLog()->warn("({}) {}", __FUNCTION__, error.what());
 					continue;
 				}
+			}
+		}
+	}
+
+	void PluginManager::ProcessPendingAutoReload()
+	{
+		if (auto_reload_pending_plugins_.size() == 0)
+			return;
 
-				Log::GetLog()->info("Reloaded plugin - {}", filename);
+		for (auto it = auto_reload_pending_plugins_.begin(); it != auto_reload_pending_plugins_.end(); it++)
+		{
+			const std::string filename = *it;
+
+			try
+			{
+				
+			}
+			catch (const std::exception& ex)
+			{
+				Log::GetLog()->warn("({}) {}", __FUNCTION__, ex.what());
+				continue;
 			}
 		}
+
+		auto_reload_pending_plugins_.empty();
 	}
 } // namespace API
diff --git a/version/Core/Private/PluginManager/PluginManager.h b/version/Core/Private/PluginManager/PluginManager.h
@@ -78,6 +78,10 @@ namespace API
 		*/
 		bool IsPluginLoaded(const std::string& plugin_name);
 
+		/**
+		* \brief Checks for auto plugin reloads
+		*/
+		static void DetectPluginChangesTimerCallback();
 	private:
 		PluginManager();
 		~PluginManager() = default;
@@ -88,8 +92,8 @@ namespace API
 
 		void CheckPluginsDependencies();
 
-		static void DetectPluginChangesTimerCallback();
 		void DetectPluginChanges();
+		void ProcessPendingAutoReload();
 
 		std::vector<std::shared_ptr<Plugin>> loaded_plugins_;
 
@@ -98,5 +102,8 @@ namespace API
 		int reload_sleep_seconds_{5};
 		bool save_world_before_reload_{true};
 		time_t next_reload_check_{5};
+
+		// Auto reload variable to delay auto loading of the plugin
+		std::vector<std::string> auto_reload_pending_plugins_;
 	};
 } // namespace API
diff --git a/version/Core/Public/API/ARK/Actor.h b/version/Core/Public/API/ARK/Actor.h
@@ -1166,7 +1166,7 @@ struct AActor : UObject
 	void K2_OnBecomeViewTarget(APlayerController* PC) { NativeCall<void, APlayerController*>(this, "AActor.K2_OnBecomeViewTarget", PC); }
 	void K2_OnEndViewTarget(APlayerController* PC) { NativeCall<void, APlayerController*>(this, "AActor.K2_OnEndViewTarget", PC); }
 	void ModifyHudMultiUseLoc(FVector2D* theVec, APlayerController* PC, int index) { NativeCall<void, FVector2D*, APlayerController*, int>(this, "AActor.ModifyHudMultiUseLoc", theVec, PC, index); }
-	void MulticastDrawDebugArrow(FVector LineStart, FVector LineEnd, float ArrowSize, FLinearColor LineColor, float Duration) { NativeCall<void, FVector, FVector, float, FLinearColor, float>(this, "AActor.MulticastDrawDebugArrow", LineStart, LineEnd, ArrowSize, LineColor, Duration); }
+	void MulticastDrawDebugArrow(FVector LineStart, FVector LineEnd, float ArrowSize, FLinearColor LineColor, float Duration, bool enableInShipping) { NativeCall<void, FVector, FVector, float, FLinearColor, float, bool>(this, "AActor.MulticastDrawDebugArrow", LineStart, LineEnd, ArrowSize, LineColor, Duration, enableInShipping); }
 	void MulticastDrawDebugBox(FVector Center, FVector Extent, FLinearColor LineColor, FRotator Rotation, float Duration, bool enableInShipping) { NativeCall<void, FVector, FVector, FLinearColor, FRotator, float, bool>(this, "AActor.MulticastDrawDebugBox", Center, Extent, LineColor, Rotation, Duration, enableInShipping); }
 	void MulticastDrawDebugCapsule(FVector Center, float HalfHeight, float Radius, FRotator Rotation, FLinearColor LineColor, float Duration, bool enableInShipping) { NativeCall<void, FVector, float, float, FRotator, FLinearColor, float, bool>(this, "AActor.MulticastDrawDebugCapsule", Center, HalfHeight, Radius, Rotation, LineColor, Duration, enableInShipping); }
 	void MulticastDrawDebugCapsuleWithExtents(FVector Top, FVector Bottom, float Radius, FLinearColor LineColor, float Duration, bool bPersistent) { NativeCall<void, FVector, FVector, float, FLinearColor, float, bool>(this, "AActor.MulticastDrawDebugCapsuleWithExtents", Top, Bottom, Radius, LineColor, Duration, bPersistent); }
@@ -1175,7 +1175,7 @@ struct AActor : UObject
 	void MulticastDrawDebugLine(FVector LineStart, FVector LineEnd, FLinearColor LineColor, float Duration, float Thickness, bool enableInShipping) { NativeCall<void, FVector, FVector, FLinearColor, float, float, bool>(this, "AActor.MulticastDrawDebugLine", LineStart, LineEnd, LineColor, Duration, Thickness, enableInShipping); }
 	void MulticastDrawDebugPoint(FVector Position, float Size, FLinearColor PointColor, float Duration, bool enableInShipping) { NativeCall<void, FVector, float, FLinearColor, float, bool>(this, "AActor.MulticastDrawDebugPoint", Position, Size, PointColor, Duration, enableInShipping); }
 	void MulticastDrawDebugSphere(FVector Center, float Radius, int Segments, FLinearColor LineColor, float Duration, bool enableInShipping) { NativeCall<void, FVector, float, int, FLinearColor, float, bool>(this, "AActor.MulticastDrawDebugSphere", Center, Radius, Segments, LineColor, Duration, enableInShipping); }
-	void MulticastDrawDebugString(FVector TextLocation, FString* Text, AActor* TestBaseActor, FLinearColor TextColor, float Duration) { NativeCall<void, FVector, FString*, AActor*, FLinearColor, float>(this, "AActor.MulticastDrawDebugString", TextLocation, Text, TestBaseActor, TextColor, Duration); }
+	void MulticastDrawDebugString(FVector TextLocation, FString* Text, AActor* TestBaseActor, FLinearColor TextColor, float Duration, bool enableInShipping) { NativeCall<void, FVector, FString*, AActor*, FLinearColor, float, bool>(this, "AActor.MulticastDrawDebugString", TextLocation, Text, TestBaseActor, TextColor, Duration, enableInShipping); }
 	void NetAttachRootComponentTo(USceneComponent* InParent, FName InSocketName, FVector RelativeLocation, FRotator RelativeRotation) { NativeCall<void, USceneComponent*, FName, FVector, FRotator>(this, "AActor.NetAttachRootComponentTo", InParent, InSocketName, RelativeLocation, RelativeRotation); }
 	void OnInventoryItemGrind() { NativeCall<void>(this, "AActor.OnInventoryItemGrind"); }
 	void PerformanceThrottledTick() { NativeCall<void>(this, "AActor.PerformanceThrottledTick"); }
@@ -8594,6 +8594,9 @@ struct ANPCZoneManager
 
 struct AShooterProjectile : AActor
 {
+	TWeakObjectPtr<AActor>& DamageCauserField() { return *GetNativePointerField<TWeakObjectPtr<AActor>*>(this, "AShooterProjectile.DamageCauser"); }
+	// Functions 
+
 	static UClass* GetPrivateStaticClass() { return NativeCall<UClass*>(nullptr, "AShooterProjectile.GetPrivateStaticClass"); }
 };
 
@@ -8877,7 +8880,11 @@ struct APrimalBuff : AActor
 
 struct APrimalBuff_Grappled : APrimalBuff
 {
+	TArray<FGrappleTether>& CurrentGrappleTethersField() { return *GetNativePointerField<TArray<FGrappleTether>*>(this, "APrimalBuff_Grappled.CurrentGrappleTethers"); }
+
+	// Functions
 
+	void BreakAllTethers() { NativeCall<void>(this, "APrimalBuff_Grappled.BreakAllTethers"); }
 };
 
 struct FHarvestResourceEntry
diff --git a/version/Core/Public/API/ARK/PrimalStructure.h b/version/Core/Public/API/ARK/PrimalStructure.h
@@ -92,7 +92,7 @@ struct APrimalTargetableActor : AActor
 	bool IsInvincible() { return NativeCall<bool>(this, "APrimalTargetableActor.IsInvincible"); }
 	void HarvestingDepleted(UPrimalHarvestingComponent* fromComponent) { NativeCall<void, UPrimalHarvestingComponent*>(this, "APrimalTargetableActor.HarvestingDepleted", fromComponent); }
 	static void StaticRegisterNativesAPrimalTargetableActor() { NativeCall<void>(nullptr, "APrimalTargetableActor.StaticRegisterNativesAPrimalTargetableActor"); }
-	static UClass* GetPrivateStaticClass(const wchar_t* Package) { return NativeCall<UClass*, const wchar_t*>(nullptr, "APrimalTargetableActor.GetPrivateStaticClass", Package); }
+	static UClass* GetPrivateStaticClass() { return NativeCall<UClass*>(nullptr, "APrimalTargetableActor.GetPrivateStaticClass"); }
 	void BPDied(float KillingDamage, FDamageEvent* DamageEvent, AController* Killer, AActor* DamageCauser) { NativeCall<void, float, FDamageEvent*, AController*, AActor*>(this, "APrimalTargetableActor.BPDied", KillingDamage, DamageEvent, Killer, DamageCauser); }
 	void BPHitEffect(float DamageTaken, FDamageEvent* DamageEvent, APawn* PawnInstigator, AActor* DamageCauser, bool bIsLocalPath, UPrimitiveComponent* HitComponent, FVector DamageLoc, FRotator HitNormal) { NativeCall<void, float, FDamageEvent*, APawn*, AActor*, bool, UPrimitiveComponent*, FVector, FRotator>(this, "APrimalTargetableActor.BPHitEffect", DamageTaken, DamageEvent, PawnInstigator, DamageCauser, bIsLocalPath, HitComponent, DamageLoc, HitNormal); }
 	bool BPSupressImpactEffects(float DamageTaken, FDamageEvent* DamageEvent, APawn* PawnInstigator, AActor* DamageCauser, bool bIsLocalPath, UPrimitiveComponent* HitComponent) { return NativeCall<bool, float, FDamageEvent*, APawn*, AActor*, bool, UPrimitiveComponent*>(this, "APrimalTargetableActor.BPSupressImpactEffects", DamageTaken, DamageEvent, PawnInstigator, DamageCauser, bIsLocalPath, HitComponent); }
diff --git a/version/Core/Public/API/UE/Math/Vector.h b/version/Core/Public/API/UE/Math/Vector.h
@@ -1528,7 +1528,7 @@ FORCEINLINE FVector FVector::GetSafeNormal(float Tolerance) const
 	}		
 	else if(SquareSum < Tolerance)
 	{
-		return FVector::ZeroVector;
+		return FVector(0);
 	}
 	const float Scale = FMath::InvSqrt(SquareSum);
 	return FVector(X*Scale, Y*Scale, Z*Scale);

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`namespace API`
`18`	`18`	`{`
`19`		`- constexpr float api_version = 3.53f;`
	`19`	`+ constexpr float api_version = 3.54f;`
`20`	`20`
`21`	`21`	`ArkBaseApi::ArkBaseApi()`
`22`	`22`	`: commands_(std::make_unique<ArkApi::Commands>()),`
Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,8 @@ namespace ArkApi`
`153`	`153`	`command->CheckOnTimerCallbacks();`
`154`	`154`	`}`
`155`	`155`
	`156`	`+ API::PluginManager::DetectPluginChangesTimerCallback(); // We call this here to avoid UnknownModule crashes`
	`157`	`+`
`156`	`158`	`AGameState_DefaultTimer_original(_this);`
`157`	`159`	`}`
`158`	`160`
Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,7 @@ FORCEINLINE FVector FVector::GetSafeNormal(float Tolerance) const`
`1528`	`1528`	`}`
`1529`	`1529`	`else if(SquareSum < Tolerance)`
`1530`	`1530`	`{`
`1531`		`- return FVector::ZeroVector;`
	`1531`	`+ return FVector(0);`
`1532`	`1532`	`}`
`1533`	`1533`	`const float Scale = FMath::InvSqrt(SquareSum);`
`1534`	`1534`	`return FVector(XScale, YScale, Z*Scale);`