Merge branch 'dev'

Author: mircearoata

Config/DefaultEngine.ini

@@ -160,6 +160,7 @@ bSmoothFrameRate=False
 +NetDriverDefinitions=(DefName="GameNetDriver",DriverClassName="/Script/SocketSubsystemEOS.NetDriverEOSBase",DriverClassNameFallback="/Script/SocketSubsystemEOS.NetDriverEOSBase")
 +NetDriverDefinitions=(DefName="BeaconNetDriver",DriverClassName="/Script/OnlineSubsystemUtils.IpNetDriver",DriverClassNameFallback="/Script/OnlineSubsystemUtils.IpNetDriver")
 +NetDriverDefinitions=(DefName="DemoNetDriver",DriverClassName="/Script/Engine.DemoNetDriver",DriverClassNameFallback="/Script/Engine.DemoNetDriver")
+WorldSettingsClassName=/Script/FactoryGame.FGWorldSettings
 
 [/Script/HardwareTargeting.HardwareTargetingSettings]
 TargetedHardwareClass=Desktop

Mods/SML/Content/Interface/UI/Menu/Mods/ConfigProperties/Widgets/ValueWidgets/Widget_CP_Class.uasset

@@ -26,12 +26,17 @@ void USMLRemoteCallObject::HandleChatCommand_Implementation(const FString& Comma
 
 void USMLRemoteCallObject::SendChatMessage_Implementation(const FString& Message, const FLinearColor& Color) {
 	AFGChatManager* ChatManager = AFGChatManager::Get(GetWorld());
-	FChatMessageStruct MessageStruct;
-	MessageStruct.MessageString = Message;
-	MessageStruct.MessageType = EFGChatMessageType::CMT_SystemMessage;
-	MessageStruct.ServerTimeStamp = GetWorld()->TimeSeconds;
-	MessageStruct.CachedColor = Color;
-	ChatManager->AddChatMessageToReceived(MessageStruct);
+	if (ChatManager) {
+		FChatMessageStruct MessageStruct;
+		MessageStruct.MessageString = Message;
+		MessageStruct.MessageType = EFGChatMessageType::CMT_SystemMessage;
+		MessageStruct.ServerTimeStamp = GetWorld()->TimeSeconds;
+		MessageStruct.CachedColor = Color;
+		ChatManager->AddChatMessageToReceived(MessageStruct);
+	} else {
+		UE_LOG(LogSatisfactoryModLoader, Error, TEXT("A mod tried to send a chat message before the game's ChatManager was ready! It has been prevented to avoid a crash. The mod developer must fix this by waiting for the chat manager to be valid. The message would have been: %s"), *Message);
+	}
+	
 }
 
 bool USMLRemoteCallObject::HandleChatCommand_Validate(const FString& CommandLine) {

Mods/SML/Source/SML/Private/Player/SMLRemoteCallObject.cpp

@@ -860,13 +860,39 @@ void UModContentRegistry::AutoRegisterRecipeReferences( TSubclassOf<UFGRecipe> R
 	}
 }
 
+static bool IsResourceFormFilteredOut(EResourceForm ResourceForm, EGetObtainableItemDescriptorsFlags Flags)
+{
+	using enum EGetObtainableItemDescriptorsFlags;
+	using enum EResourceForm;
+
+	switch (ResourceForm) {
+	case RF_INVALID:
+		return !EnumHasAnyFlags(Flags, EGetObtainableItemDescriptorsFlags(IncludeBuildings | IncludeCustomizations | IncludeVehicles | IncludeCreatures | IncludeSpecial));
+	case RF_SOLID:
+		return false;
+	case RF_LIQUID:
+	case RF_GAS:
+		return !EnumHasAnyFlags(Flags, EGetObtainableItemDescriptorsFlags(IncludeNonSolid));
+	case RF_HEAT: /* FIXME: Could be omitted, so that the default case handles it */
+		return true;
+	default:
+		return true;
+	}
+}
+
 bool UModContentRegistry::IsDescriptorFilteredOut( const UObject* ItemDescriptor, EGetObtainableItemDescriptorsFlags Flags )
 {
 	if (!ItemDescriptor) {
 		UE_LOG(LogContentRegistry, Warning, TEXT("IsDescriptorFilteredOut called with null ItemDescriptor, returning true (filtering out)"));
 		return true;
 	}
-	const auto descriptorClass = Cast<UClass>(ItemDescriptor);
+	const TSubclassOf<UFGItemDescriptor> descriptorClass = const_cast<UClass*>(Cast<UClass>(ItemDescriptor));
+	if (!descriptorClass) {
+		return true;
+	}
+	if (IsResourceFormFilteredOut(UFGItemDescriptor::GetForm(descriptorClass), Flags)) {
+		return true;
+	}
 
 	if (!EnumHasAnyFlags(Flags, EGetObtainableItemDescriptorsFlags::IncludeBuildings) && descriptorClass->IsChildOf<UFGBuildingDescriptor>()) {
 		return true;

Mods/SML/Source/SML/Private/Registry/ModContentRegistry.cpp

@@ -5,6 +5,7 @@
 #include "FGRecipe.h"
 #include "FGResourceSinkSubsystem.h"
 #include "Engine/DataTable.h"
+#include "Misc/EnumClassFlags.h"
 #include "ModContentRegistry.generated.h"
 
 DECLARE_LOG_CATEGORY_EXTERN(LogContentRegistry, Log, All);
@@ -140,6 +141,8 @@ enum class EGetObtainableItemDescriptorsFlags : uint8
 	Default = None,
 };
 
+ENUM_CLASS_FLAGS(EGetObtainableItemDescriptorsFlags);
+
 /**
  * Manages registration and lifetime of the modded content
  *