Skip to content

Commit

Permalink
Merge pull request #306 from Panakotta00/development
Browse files Browse the repository at this point in the history
Merge v0.3.19
  • Loading branch information
Panakotta00 authored Jan 15, 2024
2 parents 0644858 + 3376a34 commit e2fda3b
Show file tree
Hide file tree
Showing 81 changed files with 1,370 additions and 828 deletions.
15 changes: 15 additions & 0 deletions Config/DefaultFicsItNetworks.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[CoreRedirects]
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintPropertyMeta",NewName="/Script/FicsItNetworks.FINReflectionPropertyMeta")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINPropertyMeta",NewName="/Script/FicsItNetworks.FINReflectionPropertyMeta")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintFunctionMetaParameter",NewName="/Script/FicsItNetworks.FINReflectionFunctionParameterMeta")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintFunctionMeta",NewName="/Script/FicsItNetworks.FINReflectionFunctionMeta")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintSignalMeta",NewName="/Script/FicsItNetworks.FINReflectionSignalMeta")
+EnumRedirects=(OldName="/Script/FicsItNetworks.EFINMetaRuntimeState",NewName="/Script/FicsItNetworks.EFINReflectionMetaRuntimeState")
+PropertyRedirects=(OldName="/Script/FicsItNetworks.FINReflectionFunctionMeta.RuntimeState",NewName="/Script/FicsItNetworks.FINReflectionFunctionMeta.Runtime")
+EnumRedirects=(OldName="/Script/FicsItNetworks.EFINMetaRuntimeState",NewName="/Script/FicsItNetworks.EFINReflectionMetaRuntimeState")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintPropertyMeta",NewName="/Script/FicsItNetworks.FINReflectionPropertyMeta")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintFunctionMetaParameter",NewName="/Script/FicsItNetworks.FINReflectionFunctionParameterMeta")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintFunctionMeta",NewName="/Script/FicsItNetworks.FINReflectionFunctionMeta")
+StructRedirects=(OldName="/Script/FicsItNetworks.FINBlueprintSignalMeta",NewName="/Script/FicsItNetworks.FINReflectionSignalMeta")
+EnumRedirects=(OldName="/Script/FicsItNetworks.EFINReflectionRuntimeState",NewName="/Script/FicsItNetworks.EFINReflectionMetaRuntimeState")
+PropertyRedirects=(OldName="/Script/FicsItNetworks.FINGPUT2DC_Box.BorderRadius",NewName="/Script/FicsItNetworks.FINGPUT2DC_Box.BorderRadii")
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Content/Network/NetworkManager/Equip_NetworkManager.uasset
Binary file not shown.
Binary file modified Content/Network/NetworkManager/Widget_ComponentDebugInteract.uasset
Binary file not shown.
Binary file modified Content/Network/Utils/Widget_ComponentDebugInteract.uasset
Binary file not shown.
Binary file modified Content/Schematics/MicroControlPanel.uasset
Binary file not shown.
2 changes: 1 addition & 1 deletion FicsItNetworks.uplugin
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"FileVersion": 3,
"Version": 0,
"VersionName": "0.3",
"SemVersion": "0.3.18",
"SemVersion": "0.3.19",
"FriendlyName": "FicsIt-Networks",
"Description": "Adds a computer network and programmable computers to the Game.",
"Category": "Modding",
Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ we would reccomend you to join the [FicsIt-Networks Discord Server](https://disc
Testing means, it would not be a good idea to use the mod in your normal game state,
testing means testing the mod in its own world to make sure every features works as intended.

You can download the latest build version [here](https://jenkins.massivebytes.net/job/FicsIt-Networks/job/master).
You can download the latest builds:

[ [Latest Stable Version](https://jenkins.massivebytes.net/job/FicsIt-Networks/job/master/) ]
[ [Development Version](https://jenkins.massivebytes.net/job/FicsIt-Networks/job/development/) ]

To install it, simply download the .zip artifact and extract the contents of it into the `<sf installation>/FactoryGame/Mods/FicsItNetworks` folder.
It has to be this exact path and folder name! Extract it in a way, so the `.uplugin`-File is located within this folder.
Expand Down
17 changes: 3 additions & 14 deletions Source/FicsItNetworks/Private/Computer/FINComputerCase.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "Engine/ActorChannel.h"
#include "FicsItKernel/Logging.h"
#include "Net/UnrealNetwork.h"
#include "Utils/FINUtils.h"

class UFINComputerRCO;

Expand Down Expand Up @@ -393,19 +394,7 @@ void AFINComputerCase::netFunc_stopComputer() {
void AFINComputerCase::netFunc_getLog(int64 PageSize, int64 Page, TArray<FFINLogEntry>& OutLog, int64& OutLogSize) {
FScopeLock Lock = Log->Lock();
const TArray<FFINLogEntry>& Entries = Log->GetLogEntries();
PageSize = FMath::Max(0, PageSize);
int64 Offset = Page*PageSize;
if (Offset < 0) Offset = Entries.Num() + Page*PageSize;
int64 Num = FMath::Min(PageSize, Entries.Num() - Offset);
if (Offset < 0) {
Num += Offset;
Offset = 0;
}
if (Offset < 0 || Num < 0) {
OutLog = TArray<FFINLogEntry>();
} else {
OutLog = TArray<FFINLogEntry>(Entries.GetData() + Offset, Num);
if (Page < 0) Algo::Reverse(OutLog);
}
OutLog = UFINUtils::PaginateArray(TArrayView<const FFINLogEntry>(Entries), PageSize, Page);
if (Page < 0) Algo::Reverse(OutLog);
OutLogSize = Entries.Num();
}
11 changes: 5 additions & 6 deletions Source/FicsItNetworks/Private/Computer/FINComputerGPUT1.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -175,22 +175,21 @@ SScreenMonitor::SScreenMonitor() {
}

void AFINComputerGPUT1::Multicast_BeginBackBufferReplication_Implementation(FIntPoint Size) {
if (HasAuthority()) {
if (!HasAuthority()) {
BackBuffer.SetSize(Size.X, Size.Y);
}
}

void AFINComputerGPUT1::Multicast_AddBackBufferChunk_Implementation(int64 InOffset, const TArray<FFINGPUT1BufferPixel>& Chunk) {
if (HasAuthority()) {
TArray<FFINGPUT1BufferPixel>& Buffer = BackBuffer.GetData();
FMemory::Memswap((void*)(Buffer.GetData() + InOffset), (void*)Chunk.GetData(), Chunk.Num() + sizeof(FFINGPUT1BufferPixel));
if (!HasAuthority()) {
BackBuffer.SetChunk(InOffset, Chunk);
}
}

void AFINComputerGPUT1::Multicast_EndBackBufferReplication_Implementation() {
if (HasAuthority()) {
if (!HasAuthority()) {
FrontBuffer = BackBuffer;
CachedInvalidation->InvalidateRootChildOrder();
if (CachedInvalidation) CachedInvalidation->InvalidateRootChildOrder();
}
}

Expand Down
86 changes: 50 additions & 36 deletions Source/FicsItNetworks/Private/Computer/FINComputerGPUT2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "FGPlayerController.h"
#include "Computer/FINComputerRCO.h"
#include "Interfaces/ISlateNullRendererModule.h"
#include "Utils/FINMediaSubsystem.h"

const FName FFINGPUT2WidgetStyle::TypeName(TEXT("FFINGPUT2WidgetStyle"));

Expand Down Expand Up @@ -73,8 +74,27 @@ int32 FFINGPUT2DC_Bezier::OnPaint(FFINGPUT2DrawContext& Context, const FPaintArg

int32 FFINGPUT2DC_Box::OnPaint(FFINGPUT2DrawContext& Context, const FPaintArgs& Args, const FGeometry& AllottedGeometry, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle) const {
FSlateBrush Brush = Context.Style->FilledBox;

if (!Image.IsEmpty()) {
UObject* Texture = AFINMediaSubsystem::GetMediaSubsystem(Context.WorldContext)->GetOrLoadTexture(Image);
if (!Texture) return LayerId;
Brush.SetResourceObject(Texture);
}

if (!ImageSize.IsZero()) {
Brush.ImageSize = ImageSize;
Brush.DrawAs = ESlateBrushDrawType::Image;
}

if (bVerticalTiling) {
if (bHorizontalTiling) Brush.Tiling = ESlateBrushTileType::Both;
else Brush.Tiling = ESlateBrushTileType::Vertical;
} else if (bHorizontalTiling) {
Brush.Tiling = ESlateBrushTileType::Horizontal;
}

if (bIsBorder) {
Brush.Margin = FMargin(MarginLeft, MarginTop, MarginRight, MarginBottom);
Brush.Margin = Margin;
}

if (bIsRounded || bHasOutline) {
Expand All @@ -83,7 +103,7 @@ int32 FFINGPUT2DC_Box::OnPaint(FFINGPUT2DrawContext& Context, const FPaintArgs&
}

if (bIsRounded) {
Brush.OutlineSettings.CornerRadii = FVector4d(RadiusTopLeft, RadiusTopRight, RadiusBottomRight, RadiusBottomLeft);
Brush.OutlineSettings.CornerRadii = BorderRadii;
} else {
Brush.OutlineSettings.CornerRadii = FVector4d(0);
}
Expand Down Expand Up @@ -121,14 +141,16 @@ const FFINGPUT2WidgetStyle& FFINGPUT2WidgetStyle::GetDefault() {
return *Default;
}

void SFINGPUT2Widget::Construct(const FArguments& InArgs) {
void SFINGPUT2Widget::Construct(const FArguments& InArgs, UObject* InWorldContext) {
WorldContext = InWorldContext;
Style = InArgs._Style;
DrawCalls = InArgs._DrawCalls;
OnMouseDownEvent = InArgs._OnMouseDown;
OnMouseUpEvent = InArgs._OnMouseUp;
OnMouseMoveEvent = InArgs._OnMouseMove;
OnMouseEnterEvent = InArgs._OnMouseEnter;
OnMouseLeaveEvent = InArgs._OnMouseLeave;
OnMouseWheelEvent = InArgs._OnMouseWheel;
OnKeyDownEvent = InArgs._OnKeyDown;
OnKeyUpEvent = InArgs._OnKeyUp;
OnKeyCharEvent = InArgs._OnKeyChar;
Expand All @@ -139,7 +161,7 @@ FVector2D SFINGPUT2Widget::ComputeDesiredSize(float LayoutScaleMultiplier) const
}

int32 SFINGPUT2Widget::OnPaint(const FPaintArgs& Args, const FGeometry& AllottedGeometry, const FSlateRect& MyCullingRect, FSlateWindowElementList& OutDrawElements, int32 LayerId, const FWidgetStyle& InWidgetStyle, bool bParentEnabled) const {
FFINGPUT2DrawContext Context(Style);
FFINGPUT2DrawContext Context(WorldContext, Style);
Context.GeometryStack.Add(AllottedGeometry);
for (const FFINDynamicStructHolder& DrawCallBase : DrawCalls.Get()) {
FFINGPUT2DrawCall* DrawCall = DrawCallBase.GetPtr<FFINGPUT2DrawCall>();
Expand Down Expand Up @@ -167,6 +189,12 @@ FReply SFINGPUT2Widget::OnMouseMove(const FGeometry& MyGeometry, const FPointerE
return FReply::Handled();
}

FReply SFINGPUT2Widget::OnMouseWheel(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) {
FVector2D Position = MyGeometry.AbsoluteToLocal(MouseEvent.GetScreenSpacePosition());
OnMouseWheelEvent.ExecuteIfBound(Position, MouseEvent.GetWheelDelta(), AFINComputerGPU::MouseToInt(MouseEvent));
return FReply::Handled().ReleaseMouseCapture();
}

void SFINGPUT2Widget::OnMouseEnter(const FGeometry& MyGeometry, const FPointerEvent& MouseEvent) {
FVector2D Position = MyGeometry.AbsoluteToLocal(MouseEvent.GetScreenSpacePosition());
OnMouseEnterEvent.ExecuteIfBound(Position, AFINComputerGPU::MouseToInt(MouseEvent));
Expand Down Expand Up @@ -220,15 +248,15 @@ void AFINComputerGPUT2::Tick(float DeltaSeconds) {
} else if (bFlushOverNetwork) {
Client_CleanDrawCalls();
bFlushOverNetwork = false;
for (const FFINDynamicStructHolder& DrawCall : FlushedDrawCalls) {
for (const FFINDynamicStructHolder& DrawCall : FrontBufferDrawCalls) {
DrawCalls2Send.Enqueue(DrawCall);
}
}
}

TSharedPtr<SWidget> AFINComputerGPUT2::CreateWidget() {
UFINComputerRCO* RCO = Cast<UFINComputerRCO>(Cast<AFGPlayerController>(GetWorld()->GetFirstPlayerController())->GetRemoteCallObjectOfClass(UFINComputerRCO::StaticClass()));
return SNew(SFINGPUT2Widget)
return SNew(SFINGPUT2Widget, this)
.Style(&Style)
.OnMouseDown_Lambda([this, RCO](FVector2D position, int modifiers) {
RCO->GPUT2MouseEvent(this, 0, position, modifiers);
Expand All @@ -239,6 +267,9 @@ TSharedPtr<SWidget> AFINComputerGPUT2::CreateWidget() {
.OnMouseMove_Lambda([this, RCO](FVector2D position, int modifiers) {
RCO->GPUT2MouseEvent(this, 2, position, modifiers);
})
.OnMouseWheel_Lambda([this, RCO](FVector2D position, float delta, int modifiers) {
RCO->GPUT2MouseWheelEvent(this, position, delta, modifiers);
})
.OnMouseEnter_Lambda([this, RCO](FVector2D position, int modifiers) {
RCO->GPUT2MouseEvent(this, 3, position, modifiers);
})
Expand All @@ -255,18 +286,18 @@ TSharedPtr<SWidget> AFINComputerGPUT2::CreateWidget() {
RCO->GPUT2KeyCharEvent(this, FString::Chr(c), modifiers);
})
.DrawCalls_Lambda([this]() {
return FlushedDrawCalls;
return FrontBufferDrawCalls;
});
}

void AFINComputerGPUT2::FlushDrawCalls() {
FlushedDrawCalls = DrawCalls;
DrawCalls.Empty();
FrontBufferDrawCalls = BackBufferDrawCalls;
BackBufferDrawCalls.Empty();
}

void AFINComputerGPUT2::AddDrawCall(TFINDynamicStruct<FFINGPUT2DrawCall> DrawCall) {
FScopeLock Lock(&DrawingMutex);
DrawCalls.Add(DrawCall);
BackBufferDrawCalls.Add(DrawCall);
}

void AFINComputerGPUT2::netFunc_flush() {
Expand Down Expand Up @@ -314,30 +345,12 @@ void AFINComputerGPUT2::netFunc_drawBezier(FVector2D p1, FVector2D p2, FVector2D
AddDrawCall(FFINGPUT2DC_Bezier(p1, p2, p3, p4, thickness, color.QuantizeRound()));
}

void AFINComputerGPUT2::netFunc_drawBox(FVector2D position, FVector2D size, double rotation, FLinearColor color,
bool hasCenteredOrigin, bool isBorder, double marginLeft, double marginRight, double marginTop,
double marginBottom, bool isRounded, double radiusTopLeft, double radiusTopRight, double radiusBottomRight,
double radiusBottomLeft, bool hasOutline, double outlineThickness, FLinearColor outlineColor) {
FFINGPUT2DC_Box DC(position, size, rotation, color.QuantizeRound());
DC.bHasCenteredOrigin = hasCenteredOrigin;
DC.bIsBorder = isBorder;
DC.MarginLeft = marginLeft;
DC.MarginRight = marginRight;
DC.MarginTop = marginTop;
DC.MarginBottom = marginBottom;
DC.bIsRounded = isRounded;
DC.RadiusTopLeft = radiusTopLeft;
DC.RadiusTopRight = radiusTopRight;
DC.RadiusBottomRight = radiusBottomRight;
DC.RadiusBottomLeft = radiusBottomLeft;
DC.bHasOutline = hasOutline;
DC.OutlineThickness = outlineThickness;
DC.OutlineColor = outlineColor.QuantizeRound();
DrawCalls.Add(DC);
}

void AFINComputerGPUT2::netFunc_drawRect(FVector2D position, FVector2D size, FLinearColor color, double rotation) {
DrawCalls.Add(FFINGPUT2DC_Box(position, size, rotation, color.QuantizeRound()));
void AFINComputerGPUT2::netFunc_drawBox(FFINGPUT2DC_Box BoxSettings) {
BackBufferDrawCalls.Add(BoxSettings);
}

void AFINComputerGPUT2::netFunc_drawRect(FVector2D position, FVector2D size, FLinearColor color, FString image, double rotation) {
BackBufferDrawCalls.Add(FFINGPUT2DC_Box(position, size, rotation, color.QuantizeRound(), image));
}

FVector2D AFINComputerGPUT2::netFunc_measureText(FString text, int64 size, bool bMonospace) {
Expand All @@ -356,6 +369,7 @@ FVector2D AFINComputerGPUT2::netFunc_measureText(FString text, int64 size, bool
void AFINComputerGPUT2::netSig_OnMouseDown_Implementation(FVector2D position, int modifiers) {}
void AFINComputerGPUT2::netSig_OnMouseUp_Implementation(FVector2D position, int modifiers) {}
void AFINComputerGPUT2::netSig_OnMouseMove_Implementation(FVector2D position, int modifiers) {}
void AFINComputerGPUT2::netSig_OnMouseWheel_Implementation(FVector2D position, float wheelDelta, int modifiers) {}
void AFINComputerGPUT2::netSig_OnKeyDown_Implementation(int64 c, int64 code, int modifiers) {}
void AFINComputerGPUT2::netSig_OnKeyUp_Implementation(int64 c, int64 code, int modifiers) {}
void AFINComputerGPUT2::netSig_OnKeyChar_Implementation(const FString& c, int modifiers) {}
Expand All @@ -364,12 +378,12 @@ void AFINComputerGPUT2::netSig_OnMouseLeave_Implementation(FVector2D position, i

void AFINComputerGPUT2::Client_CleanDrawCalls_Implementation() {
if (HasAuthority()) return;
DrawCalls.Empty();
BackBufferDrawCalls.Empty();
}

void AFINComputerGPUT2::Client_AddDrawCallChunk_Implementation(const TArray<FFINDynamicStructHolder>& Chunk) {
if (HasAuthority()) return;
DrawCalls.Append(Chunk);
BackBufferDrawCalls.Append(Chunk);
}

void AFINComputerGPUT2::Client_FlushDrawCalls_Implementation() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ bool AFINComputerNetworkCard::HasNick_Implementation(const FString& nick) {
return HasNickByNick(nick, Execute_GetNick(this));
}

UObject* AFINComputerNetworkCard::GetInstanceRedirect_Implementation() const {
return nullptr;
UObject* AFINComputerNetworkCard::GetInstanceRedirect_Implementation() {
return this;
}

bool AFINComputerNetworkCard::AccessPermitted_Implementation(FGuid NewID) const {
Expand Down
4 changes: 4 additions & 0 deletions Source/FicsItNetworks/Private/Computer/FINComputerRCO.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,3 +179,7 @@ bool UFINComputerRCO::GPUT2KeyCharEvent_Validate(AFINComputerGPUT2* GPU, const F
void UFINComputerRCO::LogRehandleAllEntries_Implementation(UFINLog* Log) {
Log->RehandleAllEntries();
}

void UFINComputerRCO::GPUT2MouseWheelEvent_Implementation(AFINComputerGPUT2* GPU, FVector2D Position, float Delta, int Modifiers) {
GPU->netSig_OnMouseWheel(Position, Delta, Modifiers);
}
2 changes: 2 additions & 0 deletions Source/FicsItNetworks/Private/FINGameWorldModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
#include "Network/Signals/FINSignalSubsystem.h"
#include "Network/Wireless/FINWirelessSubsystem.h"
#include "Utils/FINBlueprintParameterHooks.h"
#include "Utils/FINMediaSubsystem.h"

UFINGameWorldModule::UFINGameWorldModule() {
ModSubsystems.Add(AFINComputerSubsystem::StaticClass());
ModSubsystems.Add(AFINSignalSubsystem::StaticClass());
ModSubsystems.Add(AFINHookSubsystem::StaticClass());
ModSubsystems.Add(AFINWirelessSubsystem::StaticClass());
ModSubsystems.Add(AFINBlueprintParameterHooks::StaticClass());
ModSubsystems.Add(AFINMediaSubsystem::StaticClass());
}
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ CodersFileSystem::Path FFINKernelFSRoot::unpersistPath(std::string path) {
CodersFileSystem::SRef<CodersFileSystem::Device> dev;
if (pos == 0) {
dev = devDev;
} else for (std::pair<const std::string, CodersFileSystem::SRef<CodersFileSystem::Device>>& device : devDev->getDevices()) {
} else if (!devDev) {
throw std::invalid_argument("Invalid mount point. Unable to persist path");
} else for (std::pair<const std::string, CodersFileSystem::SRef<CodersFileSystem::Device>>& device : devDev->getDevices()) {
if (device.first == name) {
dev = device.second;
break;
Expand Down
7 changes: 6 additions & 1 deletion Source/FicsItNetworks/Private/FicsItKernel/FicsItKernel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ bool UFINKernelSystem::ShouldSave_Implementation() const {
}

void UFINKernelSystem::PreSaveGame_Implementation(int32 saveVersion, int32 gameVersion) {
HandleFutures(); // TODO: Add notices and remove serialization for Future Context, to support generic context... solved by handling all futures prior to save game, and the guarantee a future has to be finished using the execution context once called for execution, otherwise it MUST handle serialization
SystemResetTimePoint = (FDateTime::Now() - FFicsItNetworksModule::GameStart).GetTotalMilliseconds() - SystemResetTimePoint;
}

Expand Down Expand Up @@ -202,7 +203,11 @@ void UFINKernelSystem::HandleFutures() {
TSharedPtr<TFINDynamicStruct<FFINFuture>> Future;
FutureQueue.Peek(Future);
FutureQueue.Pop();
(*Future)->Execute();
try {
(*Future)->Execute();
} catch (FFINException e) {
Crash(MakeShared<FFINKernelCrash>(e.GetMessage())); // TODO: Maybe add a way to make these future crashes catchable in f.e. Lua using protected calls
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions Source/FicsItNetworks/Private/FicsItNetworksModule.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,11 @@ void FFicsItNetworksModule::StartupModule(){
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FINComputerProcessorLua"), TEXT("/Script/FicsItNetworksLua.FINComputerProcessorLua")});
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FINLuaProcessor"), TEXT("/Script/FicsItNetworksLua.FINLuaProcessor")});
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FINLuaProcessorStateStorage"), TEXT("/Script/FicsItNetworksLua.FINLuaProcessorStateStorage")});
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.EFINMetaRuntimeState"), TEXT("/Script/FicsItNetworksLua.EFINReflectionMetaRuntimeState")});
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FFINBlueprintPropertyMeta"), TEXT("/Script/FicsItNetworksLua.FFINReflectionPropertyMeta")});
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FFINBlueprintFunctionMetaParameter"), TEXT("/Script/FicsItNetworksLua.FFINReflectionFunctionParameterMeta")});
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FFINBlueprintFunctionMeta"), TEXT("/Script/FicsItNetworksLua.FFINReflectionFunctionMeta")});
redirects.Add(FCoreRedirect{ECoreRedirectFlags::Type_Class, TEXT("/Script/FicsItNetworks.FFINBlueprintSignalMeta"), TEXT("/Script/FicsItNetworksLua.FFINReflectionSignalMeta")});

AddRedirects(TEXT(""), TEXT(""),
{ TEXT("FicsItNetworks/Components/RozeModularSystem"), TEXT("FicsItNetworks/Components/MicroControlPanels"),{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ bool UFINAdvancedNetworkConnectionComponent::HasNick_Implementation(const FStrin
return HasNickByNick(inNick, Execute_GetNick(this));
}

UObject* UFINAdvancedNetworkConnectionComponent::GetInstanceRedirect_Implementation() const {
UObject* UFINAdvancedNetworkConnectionComponent::GetInstanceRedirect_Implementation() {
return RedirectionObject;
}

Expand Down
Loading

0 comments on commit e2fda3b

Please sign in to comment.