diff --git a/Content/Buildings/ModularPanel/Modules/2PosSwitch/Build_Module2PosSwitch.uasset b/Content/Buildings/ModularPanel/Modules/2PosSwitch/Build_Module2PosSwitch.uasset index 19230db81..4120c5ef5 100644 Binary files a/Content/Buildings/ModularPanel/Modules/2PosSwitch/Build_Module2PosSwitch.uasset and b/Content/Buildings/ModularPanel/Modules/2PosSwitch/Build_Module2PosSwitch.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/3PosSwitch/Build_Module3PosSwitch.uasset b/Content/Buildings/ModularPanel/Modules/3PosSwitch/Build_Module3PosSwitch.uasset index 1aa3b072a..83086a253 100644 Binary files a/Content/Buildings/ModularPanel/Modules/3PosSwitch/Build_Module3PosSwitch.uasset and b/Content/Buildings/ModularPanel/Modules/3PosSwitch/Build_Module3PosSwitch.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/Buzzer/Build_ModuleBuzzer.uasset b/Content/Buildings/ModularPanel/Modules/Buzzer/Build_ModuleBuzzer.uasset index 195f9c6b3..aa3a0d292 100644 Binary files a/Content/Buildings/ModularPanel/Modules/Buzzer/Build_ModuleBuzzer.uasset and b/Content/Buildings/ModularPanel/Modules/Buzzer/Build_ModuleBuzzer.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/Gauge/Build_ModuleGauge.uasset b/Content/Buildings/ModularPanel/Modules/Gauge/Build_ModuleGauge.uasset index 576fd7aa2..b290b2a19 100644 Binary files a/Content/Buildings/ModularPanel/Modules/Gauge/Build_ModuleGauge.uasset and b/Content/Buildings/ModularPanel/Modules/Gauge/Build_ModuleGauge.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay.uasset b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay.uasset index 4e0337ae3..f075c7818 100644 Binary files a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay.uasset and b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Large.uasset b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Large.uasset index 156bf1910..50af2a3fc 100644 Binary files a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Large.uasset and b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Large.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Square.uasset b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Square.uasset index 12637c199..5e17acfa7 100644 Binary files a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Square.uasset and b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Square.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset b/Content/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset index 8613bd77d..3f094711f 100644 Binary files a/Content/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset and b/Content/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer.uasset b/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer.uasset index eae3c645b..490503e6b 100644 Binary files a/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer.uasset and b/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer_WithNumber.uasset b/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer_WithNumber.uasset index d98755645..c5827ebc1 100644 Binary files a/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer_WithNumber.uasset and b/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer_WithNumber.uasset differ diff --git a/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset b/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset index f28d507b5..c0dcf689e 100644 Binary files a/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset and b/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset differ diff --git a/Source/FicsItNetworks/Private/Utils/FINBlueprintParameterHooks.cpp b/Source/FicsItNetworks/Private/Utils/FINBlueprintParameterHooks.cpp index 9341898c0..3c1d9ce22 100644 --- a/Source/FicsItNetworks/Private/Utils/FINBlueprintParameterHooks.cpp +++ b/Source/FicsItNetworks/Private/Utils/FINBlueprintParameterHooks.cpp @@ -6,6 +6,7 @@ #include "FINUtils.h" #include "Components/OverlaySlot.h" #include "UI/FGGameUI.h" +#include "UObject/ConstructorHelpers.h" #include "Widgets/Input/SEditableTextBox.h" const FName AFINBlueprintHologram_List_NameColumn = FName("Name"); @@ -13,7 +14,7 @@ const FName AFINBlueprintHologram_List_ValueColumn = FName("Value"); AFINBlueprintHologram::AFINBlueprintHologram() { PopupClass = ConstructorHelpers::FClassFinder(TEXT("/Game/FactoryGame/Interface/UI/InGame/Widget_Popup.Widget_Popup_C")).Class; - PopupContentClass = ConstructorHelpers::FClassFinder(TEXT("/FicsItNetworks/UI/Widget_FIN_BlueprintParameterPopup.Widget_FIN_BlueprintParameterPopup_C")).Class; + PopupContentClass = ConstructorHelpers::FClassFinder(TEXT("/FicsItNetworks/UI/Misc/BPW_FIN_BlueprintParameterPopup.BPW_FIN_BlueprintParameterPopup_C")).Class; } void AFINBlueprintHologram::ShowPropertyDialog() { diff --git a/Source/FicsItNetworksCircuit/Private/FINMCPAdvConnector.cpp b/Source/FicsItNetworksCircuit/Private/FINMCPAdvConnector.cpp index dcb908d0b..45236c450 100644 --- a/Source/FicsItNetworksCircuit/Private/FINMCPAdvConnector.cpp +++ b/Source/FicsItNetworksCircuit/Private/FINMCPAdvConnector.cpp @@ -3,7 +3,7 @@ #include "ConstructorHelpers.h" UFINMCPAdvConnector::UFINMCPAdvConnector() { - static ConstructorHelpers::FClassFinder ThinNetworkCableClass(TEXT("/FicsItNetworks/Buildings/Network/ThinNetworkCable/BD_ThinNetworkCable.BD_ThinNetworkCable_C")); + static ConstructorHelpers::FClassFinder ThinNetworkCableClass(TEXT("/FicsItNetworks/Buildings/Network/ThinNetworkCable/Desc_ThinNetworkCable.Desc_ThinNetworkCable_C")); AllowedCableConnections.Empty(); AllowedCableConnections.Add(ThinNetworkCableClass.Class); diff --git a/Source/FicsItNetworksCircuit/Private/FINMCPConnector.cpp b/Source/FicsItNetworksCircuit/Private/FINMCPConnector.cpp index 294b74491..84f93c8a6 100644 --- a/Source/FicsItNetworksCircuit/Private/FINMCPConnector.cpp +++ b/Source/FicsItNetworksCircuit/Private/FINMCPConnector.cpp @@ -3,7 +3,7 @@ #include "ConstructorHelpers.h" UFINMCPConnector::UFINMCPConnector() { - static ConstructorHelpers::FClassFinder ThinNetworkCableClass(TEXT("/FicsItNetworks/Buildings/Network/ThinNetworkCable/BD_ThinNetworkCable.BD_ThinNetworkCable_C")); + static ConstructorHelpers::FClassFinder ThinNetworkCableClass(TEXT("/FicsItNetworks/Buildings/Network/ThinNetworkCable/Desc_ThinNetworkCable.Desc_ThinNetworkCable_C")); AllowedCableConnections.Empty(); AllowedCableConnections.Add(ThinNetworkCableClass.Class); diff --git a/Source/FicsItReflection/Private/FIRSubsystem.cpp b/Source/FicsItReflection/Private/FIRSubsystem.cpp index 56e2db490..af99b7212 100644 --- a/Source/FicsItReflection/Private/FIRSubsystem.cpp +++ b/Source/FicsItReflection/Private/FIRSubsystem.cpp @@ -13,7 +13,7 @@ AFIRSubsystem* AFIRSubsystem::GetReflectionSubsystem(UObject* WorldContext) { #endif UWorld* WorldObject = GEngine->GetWorldFromContextObjectChecked(WorldContext); USubsystemActorManager* SubsystemActorManager = WorldObject->GetSubsystem(); - check(SubsystemActorManager); + fgcheck(SubsystemActorManager); return SubsystemActorManager->GetSubsystemActor(); } diff --git a/Source/FicsItReflection/Private/FicsItReflection.cpp b/Source/FicsItReflection/Private/FicsItReflection.cpp index 0fe91995c..0cf96f6b2 100644 --- a/Source/FicsItReflection/Private/FicsItReflection.cpp +++ b/Source/FicsItReflection/Private/FicsItReflection.cpp @@ -120,7 +120,7 @@ void FFicsItReflectionModule::StartupModule() { redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FINArrayProperty"), TEXT("/Script/FicsItReflection.FIRArrayProperty")}); redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FINReflectionSource"), TEXT("/Script/FicsItReflection.FIRSource")}); redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FINStaticReflectionSource"), TEXT("/Script/FicsItReflection.FIRSourceStatic")}); - redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Enum, TEXT("/Script/FicsItNetworks.FINReflectionMetaRuntimeState "), TEXT("/Script/FicsItReflection.FIRMetaRuntimeState")}); + redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Enum, TEXT("/Script/FicsItNetworks.EFINReflectionMetaRuntimeState "), TEXT("/Script/FicsItReflection.EFIRMetaRuntimeState")}); redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Struct, TEXT("/Script/FicsItNetworks.FINReflectionBaseMeta"), TEXT("/Script/FicsItReflection.FIRBaseMeta")}); redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Struct, TEXT("/Script/FicsItNetworks.FINReflectionPropertyMeta"), TEXT("/Script/FicsItReflection.FIRPropertyMeta")}); redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Struct, TEXT("/Script/FicsItNetworks.FINReflectionFunctionParameterMeta"), TEXT("/Script/FicsItReflection.FIRFunctionParameterMeta")}); diff --git a/Source/FicsItReflection/Public/FIRModModule.h b/Source/FicsItReflection/Public/FIRModModule.h index 79812ab98..3f9f645b3 100644 --- a/Source/FicsItReflection/Public/FIRModModule.h +++ b/Source/FicsItReflection/Public/FIRModModule.h @@ -27,10 +27,12 @@ class FICSITREFLECTION_API UFIRGameInstanceModule : public UGameInstanceModule { virtual void DispatchLifecycleEvent(ELifecyclePhase Phase) override { Super::DispatchLifecycleEvent(Phase); - FFIRGlobalRegisterHelper::Register(); + if (Phase == ELifecyclePhase::CONSTRUCTION) { + FFIRGlobalRegisterHelper::Register(); - FFicsItReflectionModule::Get().PopulateSources(); - FFicsItReflectionModule::Get().LoadAllTypes(); + FFicsItReflectionModule::Get().PopulateSources(); + FFicsItReflectionModule::Get().LoadAllTypes(); + } } // End UGameInstanceModule }; \ No newline at end of file