fix: Fix other stuff related to restructuring

Panakotta00 · Oct 15, 2024 · c0cd6fd · c0cd6fd
1 parent 4ba378a
commit c0cd6fd
Show file tree

Hide file tree

Showing 17 changed files with 11 additions and 8 deletions.
diff --git a/Content/Buildings/ModularPanel/Modules/2PosSwitch/Build_Module2PosSwitch.uasset b/Content/Buildings/ModularPanel/Modules/2PosSwitch/Build_Module2PosSwitch.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/3PosSwitch/Build_Module3PosSwitch.uasset b/Content/Buildings/ModularPanel/Modules/3PosSwitch/Build_Module3PosSwitch.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/Buzzer/Build_ModuleBuzzer.uasset b/Content/Buildings/ModularPanel/Modules/Buzzer/Build_ModuleBuzzer.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/Gauge/Build_ModuleGauge.uasset b/Content/Buildings/ModularPanel/Modules/Gauge/Build_ModuleGauge.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay.uasset b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Large.uasset b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Large.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Square.uasset b/Content/Buildings/ModularPanel/Modules/MicroDisplay/Build_ModuleMicroDisplay_Square.uasset
diff --git a/...t/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset b/...t/Buildings/ModularPanel/Modules/MushroomPushButton/Build_ModuleMushroomPushButton.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer.uasset b/Content/Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer.uasset
diff --git a/.../Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer_WithNumber.uasset b/.../Buildings/ModularPanel/Modules/Potentiometer/Build_ModulePotentiometer_WithNumber.uasset
diff --git a/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset b/Content/Buildings/ModularPanel/Modules/PushButton/Build_ModulesPushButton.uasset
diff --git a/Source/FicsItNetworks/Private/Utils/FINBlueprintParameterHooks.cpp b/Source/FicsItNetworks/Private/Utils/FINBlueprintParameterHooks.cpp
@@ -6,14 +6,15 @@
 #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");	
 const FName AFINBlueprintHologram_List_ValueColumn = FName("Value");
 
 AFINBlueprintHologram::AFINBlueprintHologram() {
 	PopupClass = ConstructorHelpers::FClassFinder<UFGPopupWidget>(TEXT("/Game/FactoryGame/Interface/UI/InGame/Widget_Popup.Widget_Popup_C")).Class;
-	PopupContentClass = ConstructorHelpers::FClassFinder<UFINBlueprintParameterPopup>(TEXT("/FicsItNetworks/UI/Widget_FIN_BlueprintParameterPopup.Widget_FIN_BlueprintParameterPopup_C")).Class;
+	PopupContentClass = ConstructorHelpers::FClassFinder<UFINBlueprintParameterPopup>(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
@@ -3,7 +3,7 @@
 #include "ConstructorHelpers.h"
 
 UFINMCPAdvConnector::UFINMCPAdvConnector() {
-	static ConstructorHelpers::FClassFinder<UFGBuildingDescriptor> ThinNetworkCableClass(TEXT("/FicsItNetworks/Buildings/Network/ThinNetworkCable/BD_ThinNetworkCable.BD_ThinNetworkCable_C"));
+	static ConstructorHelpers::FClassFinder<UFGBuildingDescriptor> 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
@@ -3,7 +3,7 @@
 #include "ConstructorHelpers.h"
 
 UFINMCPConnector::UFINMCPConnector() {
-	static ConstructorHelpers::FClassFinder<UFGBuildingDescriptor> ThinNetworkCableClass(TEXT("/FicsItNetworks/Buildings/Network/ThinNetworkCable/BD_ThinNetworkCable.BD_ThinNetworkCable_C"));
+	static ConstructorHelpers::FClassFinder<UFGBuildingDescriptor> 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
@@ -13,7 +13,7 @@ AFIRSubsystem* AFIRSubsystem::GetReflectionSubsystem(UObject* WorldContext) {
 #endif
 	UWorld* WorldObject = GEngine->GetWorldFromContextObjectChecked(WorldContext);
 	USubsystemActorManager* SubsystemActorManager = WorldObject->GetSubsystem<USubsystemActorManager>();
-	check(SubsystemActorManager);
+	fgcheck(SubsystemActorManager);
 	return SubsystemActorManager->GetSubsystemActor<AFIRSubsystem>();
 }
 

diff --git 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
@@ -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
 };