Some header additions and changes.

Pelayori · Pelayori · commit 2ce6182e6b1d · 2021-12-02T21:40:06.000+01:00
diff --git a/version/Core/Public/API/ARK/Actor.h b/version/Core/Public/API/ARK/Actor.h
@@ -7087,6 +7087,7 @@ struct APrimalDinoCharacter : APrimalCharacter
 	void GetDinoData(FARKDinoData * OutDinoData) { NativeCall<void, FARKDinoData *>(this, "APrimalDinoCharacter.GetDinoData", OutDinoData); }
 	FString* GetColorSetInidcesAsString(FString* result) { return NativeCall<FString*, FString*>(this, "APrimalDinoCharacter.GetColorSetInidcesAsString", result); }
 	TArray<FName>* GetColorSetNamesAsArray(TArray<FName>* result) { return NativeCall<TArray<FName>*, TArray<FName>*>(this, "APrimalDinoCharacter.GetColorSetNamesAsArray", result); }
+	static APrimalDinoCharacter* SpawnFromDinoDataEx(FARKDinoData* InDinoData, UWorld* InWorld, FVector* AtLocation, FRotator* AtRotation, bool* dupedDino, int ForTeam, bool bGenerateNewDinoID, AShooterPlayerController* TamerController, bool beginPlay) { return NativeCall<APrimalDinoCharacter*, FARKDinoData*, UWorld*, FVector*, FRotator*, bool*, int, bool, AShooterPlayerController*, bool>(nullptr, "APrimalDinoCharacter.SpawnFromDinoData", InDinoData, InWorld, AtLocation, AtRotation, dupedDino, ForTeam, bGenerateNewDinoID, TamerController, beginPlay); }
 };
 
 struct AShooterWeapon : AActor
@@ -9272,6 +9273,11 @@ struct UStaticMeshComponent : UMeshComponent
 	bool ShouldRecreateProxyOnUpdateTransform() { return NativeCall<bool>(this, "UStaticMeshComponent.ShouldRecreateProxyOnUpdateTransform"); }
 };
 
+struct UInstancedStaticMeshComponent : UStaticMeshComponent
+{
+	void DealDirectDamage(APlayerController* ForPC, float DamageAmount, TSubclassOf<UDamageType> DamageTypeClass, int hitBodyIndex) { NativeCall<void, APlayerController*, float, TSubclassOf<UDamageType>, int>(this, "UInstancedStaticMeshComponent.DealDirectDamage", ForPC, DamageAmount, DamageTypeClass, hitBodyIndex); }
+};
+
 struct UStaticMeshSocket : UObject
 {
 	FName& SocketNameField() { return *GetNativePointerField<FName*>(this, "UStaticMeshSocket.SocketName"); }
@@ -9382,6 +9388,7 @@ struct UPrimalHarvestingComponent : UActorComponent
 	static UClass* GetPrivateStaticClass(const wchar_t* Package) { return NativeCall<UClass*, const wchar_t*>(nullptr, "UPrimalHarvestingComponent.GetPrivateStaticClass", Package); }
 	static void StaticRegisterNativesUPrimalHarvestingComponent() { NativeCall<void>(nullptr, "UPrimalHarvestingComponent.StaticRegisterNativesUPrimalHarvestingComponent"); }
 	bool TemplateCheckForHarvestRepopulation(bool bForceReinit, UWorld* world, FVector* where) { NativeCall<bool, UWorld*, FVector*>(this, "UPrimalHarvestingComponent.TemplateCheckForHarvestRepopulation", world, where); }
+	void DealDirectDamage(APlayerController* ForPC, float DamageAmount, TSubclassOf<UDamageType> DamageTypeClass) { NativeCall<void, APlayerController*, float, TSubclassOf<UDamageType>>(this, "UPrimalHarvestingComponent.DealDirectDamage", ForPC, DamageAmount, DamageTypeClass); }
 
 	TArray<FHarvestResourceEntry>& HarvestResourceEntries() { return *GetNativePointerField<TArray<FHarvestResourceEntry>*>(this, "UPrimalHarvestingComponent.HarvestResourceEntries"); }
 	TArray<FHarvestResourceEntry>& BaseHarvestResourceEntries() { return *GetNativePointerField<TArray<FHarvestResourceEntry>*>(this, "UPrimalHarvestingComponent.BaseHarvestResourceEntries"); }
@@ -9397,6 +9404,8 @@ struct UPrimalHarvestingComponent : UActorComponent
 
 struct AMissionType : AActor
 {
+	FString& MissionDisplayNameField() { return *GetNativePointerField<FString*>(this, "AMissionType.MissionDisplayName"); }
+
 	static void GetNearbyPlayersAndTamedDinos(UObject* WorldContextObject, TArray<APrimalCharacter*>* OutCharacters, FVector* Location, float Radius) { NativeCall<void, UObject*, TArray<APrimalCharacter*>*, FVector*, float>(nullptr, "AMissionType.GetNearbyPlayersAndTamedDinos", WorldContextObject, OutCharacters, Location, Radius); }
 };
 
diff --git a/version/Core/Public/API/ARK/Inventory.h b/version/Core/Public/API/ARK/Inventory.h
@@ -1399,7 +1399,7 @@ struct FItemStatInfo
 
 	// Bit fields
 
-	BitFieldValue<bool, unsigned __int32> bUsed() { return { this, "FItemStatInfo.bUsed" }; }
+	BitFieldValue<bool, unsigned __int32> bUsed() { return {this, "FItemStatInfo.bUsed"}; }
 	BitFieldValue<bool, unsigned __int32> bCalculateAsPercent() { return { this, "FItemStatInfo.bCalculateAsPercent" }; }
 	BitFieldValue<bool, unsigned __int32> bDisplayAsPercent() { return { this, "FItemStatInfo.bDisplayAsPercent" }; }
 	BitFieldValue<bool, unsigned __int32> bRequiresSubmerged() { return { this, "FItemStatInfo.bRequiresSubmerged" }; }
diff --git a/version/Core/Public/API/ARK/Other.h b/version/Core/Public/API/ARK/Other.h
@@ -84,6 +84,35 @@ struct FSocket
 	FString& SocketDescriptionField() { return *GetNativePointerField<FString*>(this, "FSocket.SocketDescription"); }
 };
 
+struct FMultiUseEntry
+{
+	UActorComponent* ForComponent;
+	FString UseString;
+	int UseIndex;
+	int Priority;
+	unsigned __int32 bHideFromUI : 1;
+	unsigned __int32 bDisableUse : 1;
+	unsigned __int32 bHideActivationKey : 1;
+	unsigned __int32 bRepeatMultiUse : 1;
+	unsigned __int32 bDisplayOnInventoryUI : 1;
+	unsigned __int32 bDisplayOnInventoryUISecondary : 1;
+	unsigned __int32 bHarvestable : 1;
+	unsigned __int32 bIsSecondaryUse : 1;
+	unsigned __int32 bPersistWheelOnActivation : 1;
+	unsigned __int32 bOverrideUseTextColor : 1;
+	unsigned __int32 bDisplayOnInventoryUITertiary : 1;
+	unsigned __int32 bClientSideOnly : 1;
+	unsigned __int32 bPersistWheelRequiresDirectActivation : 1;
+	unsigned __int32 bDrawTooltip : 1;
+	int WheelCategory;
+	FColor DisableUseColor;
+	FColor UseTextColor;
+	float EntryActivationTimer;
+	float DefaultEntryActivationTimer;
+	USoundBase* ActivationSound;
+	int UseInventoryButtonStyleOverrideIndex;
+};
+
 struct URCONServer : UObject
 {
 	FSocket& SocketField() { return *GetNativePointerField<FSocket*>(this, "URCONServer.Socket"); }
@@ -333,6 +362,19 @@ struct FOverlapResult
 	static UScriptStruct * StaticStruct() { return NativeCall<UScriptStruct *>(nullptr, "FOverlapResult.StaticStruct"); }
 };
 
+struct FOverlappedFoliageElement
+{
+	AActor* HarvestActor;
+	UInstancedStaticMeshComponent* InstancedStaticMeshComponent;
+	UPrimalHarvestingComponent* HarvestingComponent;
+	FVector HarvestLocation;
+	int HitBodyIndex;
+	float MaxHarvestHealth;
+	float CurrentHarvestHealth;
+	__int8 bIsUnharvestable : 1;
+	__int8 bIsVisibleAndActive : 1;
+};
+
 struct UVictoryCore
 {
 
@@ -487,6 +529,7 @@ struct UVictoryCore
 	static void StaticRegisterNativesUVictoryCore() { NativeCall<void>(nullptr, "UVictoryCore.StaticRegisterNativesUVictoryCore"); }
 	static FString* ClassToStringReference(FString* result, TSubclassOf<UObject> obj) { return NativeCall<FString*, FString*, TSubclassOf<UObject>>(nullptr, "UVictoryCore.ClassToStringReference", result, obj); }
 	static TSubclassOf<UObject>* StringReferenceToClass(TSubclassOf<UObject>* result, FString* StringReference) { return NativeCall<TSubclassOf<UObject>*, TSubclassOf<UObject>*, FString*>(nullptr, "UVictoryCore.StringReferenceToClass", result, StringReference); }
+	static void ServerSearchFoliage(UObject* WorldContextObject, FVector* Origin, float Radius, TArray<FOverlappedFoliageElement>* OutFoliage, bool bVisibleAndActiveOnly, bool bIncludeUsableFoliage, bool bIncludeMeshFoliage, bool bSortByDistance, bool bReverseSort) { NativeCall<void, UObject*, FVector*, float, TArray<FOverlappedFoliageElement>*, bool, bool, bool, bool, bool>(nullptr, "UVictoryCore.ServerSearchFoliage", WorldContextObject, Origin, Radius, OutFoliage, bVisibleAndActiveOnly, bIncludeUsableFoliage, bIncludeMeshFoliage, bSortByDistance, bReverseSort); }
 };
 
 struct UDamageType
diff --git a/version/Core/Public/API/ARK/PrimalStructure.h b/version/Core/Public/API/ARK/PrimalStructure.h
@@ -174,12 +174,12 @@ struct APrimalStructure : APrimalTargetableActor
 	TArray<FVector> & PlacementTraceDirectionsField() { return *GetNativePointerField<TArray<FVector>*>(this, "APrimalStructure.PlacementTraceDirections"); }
 	TArray<APrimalStructure*> LinkedStructuresField() { return *GetNativePointerField<TArray<APrimalStructure*>*>(this, "APrimalStructure.LinkedStructures"); }
 	TArray<unsigned int> & LinkedStructuresIDField() { return *GetNativePointerField<TArray<unsigned int>*>(this, "APrimalStructure.LinkedStructuresID"); }
-	TArray<APrimalStructure*> StructuresPlacedOnFloorField() { return *GetNativePointerField<TArray<APrimalStructure*>*>(this, "APrimalStructure.StructuresPlacedOnFloor"); }
+	TArray<APrimalStructure*>& StructuresPlacedOnFloorField() { return *GetNativePointerField<TArray<APrimalStructure*>*>(this, "APrimalStructure.StructuresPlacedOnFloor"); }
 	TArray<TSubclassOf<APrimalStructure>> & SnapToStructureTypesToExcludeField() { return *GetNativePointerField<TArray<TSubclassOf<APrimalStructure>>*>(this, "APrimalStructure.SnapToStructureTypesToExclude"); }
 	TArray<TSubclassOf<APrimalStructure>> & SnapFromStructureTypesToExcludeField() { return *GetNativePointerField<TArray<TSubclassOf<APrimalStructure>>*>(this, "APrimalStructure.SnapFromStructureTypesToExclude"); }
 	TArray<FName> & SnapToStructureTagsToExcludeField() { return *GetNativePointerField<TArray<FName>*>(this, "APrimalStructure.SnapToStructureTagsToExclude"); }
 	TArray<FName> & SnapFromStructureTagsToExcludeField() { return *GetNativePointerField<TArray<FName>*>(this, "APrimalStructure.SnapFromStructureTagsToExclude"); }
-	APrimalStructure * PlacedOnFloorStructureField() { return *GetNativePointerField<APrimalStructure**>(this, "APrimalStructure.PlacedOnFloorStructure"); }
+	APrimalStructure *& PlacedOnFloorStructureField() { return *GetNativePointerField<APrimalStructure**>(this, "APrimalStructure.PlacedOnFloorStructure"); }
 	APrimalStructure * PrimarySnappedStructureChildField() { return *GetNativePointerField<APrimalStructure**>(this, "APrimalStructure.PrimarySnappedStructureChild"); }
 	APrimalStructure * PrimarySnappedStructureParentField() { return *GetNativePointerField<APrimalStructure**>(this, "APrimalStructure.PrimarySnappedStructureParent"); }
 	FString & OwnerNameField() { return *GetNativePointerField<FString*>(this, "APrimalStructure.OwnerName"); }
@@ -622,6 +622,8 @@ struct APrimalStructure : APrimalTargetableActor
 	void NetUpdateTeamAndOwnerName(int NewTeam, FString * NewOwnerName) { NativeCall<void, int, FString*>(this, "APrimalStructure.NetUpdateTeamAndOwnerName", NewTeam, NewOwnerName); }
 	void SetEnabledPrimarySnappedStructureParent(bool bEnabled) { NativeCall<void, bool>(this, "APrimalStructure.SetEnabledPrimarySnappedStructureParent", bEnabled); }
 	void UpdateTribeGroupStructureRank(char NewRank) { NativeCall<void, char>(this, "APrimalStructure.UpdateTribeGroupStructureRank", NewRank); }
+
+	void GetMultiUseEntries(APlayerController* ForPC, TArray<FMultiUseEntry>* MultiUseEntries) { NativeCall<void, APlayerController*, TArray<FMultiUseEntry>*>(this, "APrimalStructure.GetMultiUseEntries", ForPC, MultiUseEntries); }
 };
 
 struct APrimalStructureBed 
@@ -985,6 +987,7 @@ struct APrimalStructureItemContainer : APrimalStructure
 	void NetSetContainerActive(bool bSetActive, TSubclassOf<UPrimalItem> NetReplicatedFuelItemClass, __int16 NetReplicatedFuelItemColorIndex) { NativeCall<void, bool, TSubclassOf<UPrimalItem>, __int16>(this, "APrimalStructureItemContainer.NetSetContainerActive", bSetActive, NetReplicatedFuelItemClass, NetReplicatedFuelItemColorIndex); }
 	void NetUpdateBoxName(FString* NewName) { NativeCall<void, FString*>(this, "APrimalStructureItemContainer.NetUpdateBoxName", NewName); }
 	void PowerGeneratorBuiltNearbyPoweredStructure(APrimalStructureItemContainer* PoweredStructure) { NativeCall<void, APrimalStructureItemContainer*>(this, "APrimalStructureItemContainer.PowerGeneratorBuiltNearbyPoweredStructure", PoweredStructure); }
+	void GetMultiUseEntries(APlayerController* ForPC, TArray<FMultiUseEntry>* MultiUseEntries) { NativeCall<void, APlayerController*, TArray<FMultiUseEntry>*>(this, "APrimalStructureItemContainer.GetMultiUseEntries", ForPC, MultiUseEntries); }
 };
 
 struct APrimalStructureTurret : APrimalStructureItemContainer
@@ -1170,5 +1173,6 @@ struct UPrimalStructureSettings : UObject
 struct APrimalStructureExplosive : APrimalStructure
 {
 	unsigned int& ConstructorPlayerDataIDField() { return *GetNativePointerField<unsigned int*>(this, "APrimalStructureExplosive.ConstructorPlayerDataID"); }
+	AShooterCharacter* ConstructorPawnField() { return *GetNativePointerField<AShooterCharacter**>(this, "APrimalStructureExplosive.ConstructorPawn"); }
 	static UClass* StaticClass() { return NativeCall<UClass*>(nullptr, "APrimalStructureExplosive.StaticClass"); }
 };
diff --git a/version/Core/Public/API/Atlas/Actor.h b/version/Core/Public/API/Atlas/Actor.h
@@ -5965,7 +5965,7 @@ struct UShooterDamageType : UDamageType
 
 	float BPAdjustDamage(AActor* Victim, float IncomingDamage, FDamageEvent* TheDamageEvent, AController* EventInstigator, AActor* DamageCauser) { return NativeCall<float, AActor*, float, FDamageEvent*, AController*, AActor*>(this, "UShooterDamageType.BPAdjustDamage", Victim, IncomingDamage, TheDamageEvent, EventInstigator, DamageCauser); }
 	float BPAdjustHarvestingDamage(AActor* Victim, float IncomingDamage, FDamageEvent* TheDamageEvent, AController* EventInstigator, AActor* DamageCauser) { return NativeCall<float, AActor*, float, FDamageEvent*, AController*, AActor*>(this, "UShooterDamageType.BPAdjustHarvestingDamage", Victim, IncomingDamage, TheDamageEvent, EventInstigator, DamageCauser); }
-	static UClass* GetPrivateStaticClass(const wchar_t* Package) { return NativeCall<UClass*, const wchar_t*>(nullptr, "UShooterDamageType.GetPrivateStaticClass", Package); }
+	static UClass* GetPrivateStaticClass() { return NativeCall<UClass*, const wchar_t*>(nullptr, "UShooterDamageType.GetPrivateStaticClass"); }
 	TSubclassOf<APrimalBuff>* OverrideBuffToGiveVictimCharacter(TSubclassOf<APrimalBuff>* result, APrimalCharacter* Victim, float IncomingDamage, FDamageEvent* TheDamageEvent, AController* EventInstigator, AActor* DamageCauser) { return NativeCall<TSubclassOf<APrimalBuff>*, TSubclassOf<APrimalBuff>*, APrimalCharacter*, float, FDamageEvent*, AController*, AActor*>(this, "UShooterDamageType.OverrideBuffToGiveVictimCharacter", result, Victim, IncomingDamage, TheDamageEvent, EventInstigator, DamageCauser); }
 	static void StaticRegisterNativesUShooterDamageType() { NativeCall<void>(nullptr, "UShooterDamageType.StaticRegisterNativesUShooterDamageType"); }
 };
diff --git a/version/Core/Public/API/Base.h b/version/Core/Public/API/Base.h
@@ -225,6 +225,7 @@ struct UPrimalWorldSettingsEventOverrides {};
 struct FCropItemPhaseData {};
 struct FStructureVariant {};
 struct AMissionType;
+struct FMultiUseEntry;
 
 template <typename T>
 struct FDataStore;
@@ -664,6 +665,8 @@ struct UBehaviorTree;
 struct FSeamlessIslandInfo;
 struct AInfo;
 
+struct UInstancedStaticMeshComponent;
+
 struct BitField
 {
 	DWORD64 offset;
diff --git a/version/Core/Public/API/UE/Templates/UnrealTemplate.h b/version/Core/Public/API/UE/Templates/UnrealTemplate.h
@@ -441,7 +441,7 @@ struct TUseBitwiseSwap
 template <typename T>
 inline typename TEnableIf<TUseBitwiseSwap<T>::Value>::Type Swap(T& A, T& B)
 {
-	if (LIKELY(&A != &B))
+	if (&A != &B)
 	{
 		TTypeCompatibleBytes<T> Temp;
 		FMemory::Memcpy(&Temp, &A, sizeof(T));
@@ -450,6 +450,9 @@ inline typename TEnableIf<TUseBitwiseSwap<T>::Value>::Type Swap(T& A, T& B)
 	}
 }
 
+/**
+ * Swap two values.  Assumes the types are trivially relocatable.
+ */
 template <typename T>
 inline typename TEnableIf<!TUseBitwiseSwap<T>::Value>::Type Swap(T& A, T& B)
 {
diff --git a/version/Core/Public/API/UE/UE.h b/version/Core/Public/API/UE/UE.h
@@ -40,12 +40,15 @@ struct FName
 	}
 
 	bool operator==(const wchar_t* Other) { return NativeCall<bool, const wchar_t*>(this, "FName.operator==", Other); }
+	
 	int Compare(FName* Other) { return NativeCall<int, FName*>(this, "FName.Compare", Other); }
 	void ToString(FString* Out) { NativeCall<void, FString*>(this, "FName.ToString", Out); }
-	FString ToString()
+	FString ToString() const
 	{
 		FString out;
-		this->ToString(&out);
+		FName tmp = *this;
+
+		tmp.ToString(&out);
 
 		return out;
 	}
@@ -54,8 +57,16 @@ struct FName
 	bool IsValidXName(FString InvalidChars, FText* Reason) { return NativeCall<bool, FString, FText*>(this, "FName.IsValidXName", InvalidChars, Reason); }
 	void Init(const char* InName, int InNumber, EFindName FindType, bool bSplitName, int HardcodeIndex) { NativeCall<void, const char*, int, EFindName, bool, int>(this, "FName.Init", InName, InNumber, FindType, bSplitName, HardcodeIndex); }
 	FString* GetPlainNameString(FString* result) { return NativeCall<FString*, FString*>(this, "FName.GetPlainNameString", result); }
+
+	bool operator==(const FName& Other) const { return Other.ToString() == this->ToString(); }
 };
 
+FORCEINLINE uint32 GetTypeHash(const FName& name)
+{
+	return FCrc::MemCrc32(&name, sizeof(FName));
+}
+
+
 struct FTransform
 {
 	__m128 Rotation;
@@ -174,6 +185,12 @@ struct TWeakObjectPtr
 		return Get();
 	}
 
+	FORCEINLINE bool operator==(const TWeakObjectPtr<T>& __that)
+	{
+		return this->ObjectIndex == __that.ObjectIndex
+			&& this->ObjectSerialNumber == __that.ObjectSerialNumber;
+	}
+
 	TWeakObjectPtr()
 	{}
 
@@ -390,7 +407,7 @@ struct UClass : UStruct
 	TArray<UField*> NetFieldsField() { return *GetNativePointerField<TArray<UField*>*>(this, "UClass.NetFields"); }
 	UObject* ClassDefaultObjectField() { return *GetNativePointerField<UObject**>(this, "UClass.ClassDefaultObject"); }
 	bool& bCookedField() { return *GetNativePointerField<bool*>(this, "UClass.bCooked"); }
-	TMap<DWORD64, UFunction*> FuncMapField() { return *GetNativePointerField<TMap<DWORD64, UFunction*>*>(this, "UClass.FuncMap"); }
+	TMap<FName, UFunction*> FuncMapField() { return *GetNativePointerField<TMap<FName, UFunction*>*>(this, "UClass.FuncMap"); }
 	TArray<FNativeFunctionLookup>& NativeFunctionLookupTableField() { return *GetNativePointerField<TArray<FNativeFunctionLookup>*>(this, "UClass.NativeFunctionLookupTable"); }
 
 	// Functions

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ struct TUseBitwiseSwap`
`441`	`441`	`template <typename T>`
`442`	`442`	`inline typename TEnableIf<TUseBitwiseSwap<T>::Value>::Type Swap(T& A, T& B)`
`443`	`443`	`{`
`444`		`- if (LIKELY(&A != &B))`
	`444`	`+ if (&A != &B)`
`445`	`445`	`{`
`446`	`446`	`TTypeCompatibleBytes<T> Temp;`
`447`	`447`	`FMemory::Memcpy(&Temp, &A, sizeof(T));`
`@@ -450,6 +450,9 @@ inline typename TEnableIf<TUseBitwiseSwap<T>::Value>::Type Swap(T& A, T& B)`
`450`	`450`	`}`
`451`	`451`	`}`
`452`	`452`
	`453`	`+/**`
	`454`	`+ * Swap two values. Assumes the types are trivially relocatable.`
	`455`	`+ */`
`453`	`456`	`template <typename T>`
`454`	`457`	`inline typename TEnableIf<!TUseBitwiseSwap<T>::Value>::Type Swap(T& A, T& B)`
`455`	`458`	`{`