From 1e71687a5fc34ee48c9d3682ad4d7dff52dae7ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20Vilas-B=C3=B4as?= Date: Mon, 14 Nov 2022 11:09:23 -0300 Subject: [PATCH] v1.1.2 (#10) * Optimize includes * Include module manager * Set internal log as Verbose by default * Adjusting log: Set default verbosity as Log * Add plugin info to allow publishing on marketplace #7 * Update README.md * Adjust folders #9 * Adjust log default verbosity * Update file ver. --- ElementusInventory.uplugin | 4 ++-- .../Private/{ => Actors}/ElementusInventoryPackage.cpp | 8 ++++---- .../{ => Components}/ElementusInventoryComponent.cpp | 4 ++-- .../Private/{ => Management}/ElementusInventoryData.cpp | 2 +- .../{ => Management}/ElementusInventoryFunctions.cpp | 6 +++--- .../Public/{ => Actors}/ElementusInventoryPackage.h | 0 .../Public/{ => Components}/ElementusInventoryComponent.h | 2 +- Source/ElementusInventory/Public/LogElementusInventory.h | 4 ++-- .../Public/{ => Management}/ElementusInventoryData.h | 0 .../Public/{ => Management}/ElementusInventoryFunctions.h | 0 .../Private/SElementusDetailsPanel.cpp | 2 +- .../Private/SElementusItemCreator.cpp | 2 +- .../ElementusInventoryEditor/Private/SElementusSearch.cpp | 2 +- .../ElementusInventoryEditor/Private/SElementusTable.cpp | 2 +- Source/ElementusInventoryEditor/Private/SElementusTable.h | 2 +- 15 files changed, 20 insertions(+), 20 deletions(-) rename Source/ElementusInventory/Private/{ => Actors}/ElementusInventoryPackage.cpp (93%) rename Source/ElementusInventory/Private/{ => Components}/ElementusInventoryComponent.cpp (99%) rename Source/ElementusInventory/Private/{ => Management}/ElementusInventoryData.cpp (82%) rename Source/ElementusInventory/Private/{ => Management}/ElementusInventoryFunctions.cpp (97%) rename Source/ElementusInventory/Public/{ => Actors}/ElementusInventoryPackage.h (100%) rename Source/ElementusInventory/Public/{ => Components}/ElementusInventoryComponent.h (99%) rename Source/ElementusInventory/Public/{ => Management}/ElementusInventoryData.h (100%) rename Source/ElementusInventory/Public/{ => Management}/ElementusInventoryFunctions.h (100%) diff --git a/ElementusInventory.uplugin b/ElementusInventory.uplugin index 7305421..806c2ce 100644 --- a/ElementusInventory.uplugin +++ b/ElementusInventory.uplugin @@ -1,7 +1,7 @@ { "FileVersion": 3, - "Version": 1, - "VersionName": "1.1.1", + "Version": 2, + "VersionName": "1.1.2", "FriendlyName": "Elementus Inventory", "Description": "Plugin that provides a Data-Driven Inventory & Items system based on FPrimaryAssetIds and the Asset Manager.", "Category": "Game Features", diff --git a/Source/ElementusInventory/Private/ElementusInventoryPackage.cpp b/Source/ElementusInventory/Private/Actors/ElementusInventoryPackage.cpp similarity index 93% rename from Source/ElementusInventory/Private/ElementusInventoryPackage.cpp rename to Source/ElementusInventory/Private/Actors/ElementusInventoryPackage.cpp index a814538..c5c60e3 100644 --- a/Source/ElementusInventory/Private/ElementusInventoryPackage.cpp +++ b/Source/ElementusInventory/Private/Actors/ElementusInventoryPackage.cpp @@ -2,10 +2,10 @@ // Year: 2022 // Repo: https://github.com/lucoiso/UEElementusInventory -#include "ElementusInventoryPackage.h" -#include "ElementusInventoryComponent.h" -#include "ElementusInventoryFunctions.h" -#include "ElementusInventoryData.h" +#include "Actors/ElementusInventoryPackage.h" +#include "Components/ElementusInventoryComponent.h" +#include "Management/ElementusInventoryFunctions.h" +#include "Management/ElementusInventoryData.h" #include "Net/UnrealNetwork.h" #include "LogElementusInventory.h" diff --git a/Source/ElementusInventory/Private/ElementusInventoryComponent.cpp b/Source/ElementusInventory/Private/Components/ElementusInventoryComponent.cpp similarity index 99% rename from Source/ElementusInventory/Private/ElementusInventoryComponent.cpp rename to Source/ElementusInventory/Private/Components/ElementusInventoryComponent.cpp index d4523ab..7c83578 100644 --- a/Source/ElementusInventory/Private/ElementusInventoryComponent.cpp +++ b/Source/ElementusInventory/Private/Components/ElementusInventoryComponent.cpp @@ -2,8 +2,8 @@ // Year: 2022 // Repo: https://github.com/lucoiso/UEElementusInventory -#include "ElementusInventoryComponent.h" -#include "ElementusInventoryFunctions.h" +#include "Components/ElementusInventoryComponent.h" +#include "Management/ElementusInventoryFunctions.h" #include "Engine/AssetManager.h" #include "GameFramework/Actor.h" #include "Net/UnrealNetwork.h" diff --git a/Source/ElementusInventory/Private/ElementusInventoryData.cpp b/Source/ElementusInventory/Private/Management/ElementusInventoryData.cpp similarity index 82% rename from Source/ElementusInventory/Private/ElementusInventoryData.cpp rename to Source/ElementusInventory/Private/Management/ElementusInventoryData.cpp index df12125..3586945 100644 --- a/Source/ElementusInventory/Private/ElementusInventoryData.cpp +++ b/Source/ElementusInventory/Private/Management/ElementusInventoryData.cpp @@ -2,7 +2,7 @@ // Year: 2022 // Repo: https://github.com/lucoiso/UEElementusInventory -#include "ElementusInventoryData.h" +#include "Management/ElementusInventoryData.h" UElementusItemData::UElementusItemData(const FObjectInitializer& ObjectInitializer) : Super(ObjectInitializer) { diff --git a/Source/ElementusInventory/Private/ElementusInventoryFunctions.cpp b/Source/ElementusInventory/Private/Management/ElementusInventoryFunctions.cpp similarity index 97% rename from Source/ElementusInventory/Private/ElementusInventoryFunctions.cpp rename to Source/ElementusInventory/Private/Management/ElementusInventoryFunctions.cpp index be2825b..9f41dbe 100644 --- a/Source/ElementusInventory/Private/ElementusInventoryFunctions.cpp +++ b/Source/ElementusInventory/Private/Management/ElementusInventoryFunctions.cpp @@ -2,10 +2,10 @@ // Year: 2022 // Repo: https://github.com/lucoiso/UEElementusInventory -#include "ElementusInventoryFunctions.h" -#include "ElementusInventoryComponent.h" +#include "Management/ElementusInventoryFunctions.h" +#include "Components/ElementusInventoryComponent.h" #include "Engine/AssetManager.h" -#include "ElementusInventoryData.h" +#include "Management/ElementusInventoryData.h" #include "LogElementusInventory.h" void UElementusInventoryFunctions::UnloadAllElementusItems() diff --git a/Source/ElementusInventory/Public/ElementusInventoryPackage.h b/Source/ElementusInventory/Public/Actors/ElementusInventoryPackage.h similarity index 100% rename from Source/ElementusInventory/Public/ElementusInventoryPackage.h rename to Source/ElementusInventory/Public/Actors/ElementusInventoryPackage.h diff --git a/Source/ElementusInventory/Public/ElementusInventoryComponent.h b/Source/ElementusInventory/Public/Components/ElementusInventoryComponent.h similarity index 99% rename from Source/ElementusInventory/Public/ElementusInventoryComponent.h rename to Source/ElementusInventory/Public/Components/ElementusInventoryComponent.h index beff560..cccd317 100644 --- a/Source/ElementusInventory/Public/ElementusInventoryComponent.h +++ b/Source/ElementusInventory/Public/Components/ElementusInventoryComponent.h @@ -5,7 +5,7 @@ #pragma once #include "CoreMinimal.h" -#include "ElementusInventoryData.h" +#include "Management/ElementusInventoryData.h" #include "Components/ActorComponent.h" #include "ElementusInventoryComponent.generated.h" diff --git a/Source/ElementusInventory/Public/LogElementusInventory.h b/Source/ElementusInventory/Public/LogElementusInventory.h index f3052a8..6671626 100644 --- a/Source/ElementusInventory/Public/LogElementusInventory.h +++ b/Source/ElementusInventory/Public/LogElementusInventory.h @@ -10,5 +10,5 @@ * */ -DECLARE_LOG_CATEGORY_EXTERN(LogElementusInventory, Display, Verbose); -DECLARE_LOG_CATEGORY_EXTERN(LogElementusInventory_Internal, Log, Verbose); \ No newline at end of file +DECLARE_LOG_CATEGORY_EXTERN(LogElementusInventory, Display, All); +DECLARE_LOG_CATEGORY_EXTERN(LogElementusInventory_Internal, NoLogging, All); \ No newline at end of file diff --git a/Source/ElementusInventory/Public/ElementusInventoryData.h b/Source/ElementusInventory/Public/Management/ElementusInventoryData.h similarity index 100% rename from Source/ElementusInventory/Public/ElementusInventoryData.h rename to Source/ElementusInventory/Public/Management/ElementusInventoryData.h diff --git a/Source/ElementusInventory/Public/ElementusInventoryFunctions.h b/Source/ElementusInventory/Public/Management/ElementusInventoryFunctions.h similarity index 100% rename from Source/ElementusInventory/Public/ElementusInventoryFunctions.h rename to Source/ElementusInventory/Public/Management/ElementusInventoryFunctions.h diff --git a/Source/ElementusInventoryEditor/Private/SElementusDetailsPanel.cpp b/Source/ElementusInventoryEditor/Private/SElementusDetailsPanel.cpp index ed3ceb2..2eb1ecd 100644 --- a/Source/ElementusInventoryEditor/Private/SElementusDetailsPanel.cpp +++ b/Source/ElementusInventoryEditor/Private/SElementusDetailsPanel.cpp @@ -3,7 +3,7 @@ // Repo: https://github.com/lucoiso/UEElementusInventory #include "SElementusDetailsPanel.h" -#include "ElementusInventoryData.h" +#include "Management/ElementusInventoryData.h" #include "Engine/AssetManager.h" void SElementusDetailsPanel::CustomizeHeader(const TSharedRef PropertyHandle, FDetailWidgetRow& HeaderRow, IPropertyTypeCustomizationUtils& CustomizationUtils) diff --git a/Source/ElementusInventoryEditor/Private/SElementusItemCreator.cpp b/Source/ElementusInventoryEditor/Private/SElementusItemCreator.cpp index 936dfb3..af9c3a0 100644 --- a/Source/ElementusInventoryEditor/Private/SElementusItemCreator.cpp +++ b/Source/ElementusInventoryEditor/Private/SElementusItemCreator.cpp @@ -6,7 +6,7 @@ #include "PropertyCustomizationHelpers.h" #include "AssetThumbnail.h" #include "AssetToolsModule.h" -#include "ElementusInventoryData.h" +#include "Management/ElementusInventoryData.h" #include "ElementusInventoryEditorFunctions.h" #include "Engine/AssetManager.h" #include "Widgets/Input/SNumericEntryBox.h" diff --git a/Source/ElementusInventoryEditor/Private/SElementusSearch.cpp b/Source/ElementusInventoryEditor/Private/SElementusSearch.cpp index 3c435cd..1a1cba6 100644 --- a/Source/ElementusInventoryEditor/Private/SElementusSearch.cpp +++ b/Source/ElementusInventoryEditor/Private/SElementusSearch.cpp @@ -3,7 +3,7 @@ // Repo: https://github.com/lucoiso/UEElementusInventory #include "SElementusSearch.h" -#include "ElementusInventoryData.h" +#include "Management/ElementusInventoryData.h" #include "ElementusInventoryEditorFunctions.h" #include "Widgets/Input/SSearchBox.h" #include "Widgets/Layout/SUniformGridPanel.h" diff --git a/Source/ElementusInventoryEditor/Private/SElementusTable.cpp b/Source/ElementusInventoryEditor/Private/SElementusTable.cpp index a5c8372..4ae133e 100644 --- a/Source/ElementusInventoryEditor/Private/SElementusTable.cpp +++ b/Source/ElementusInventoryEditor/Private/SElementusTable.cpp @@ -4,7 +4,7 @@ #include "SElementusTable.h" #include "ElementusInventoryEditorFunctions.h" -#include "ElementusInventoryData.h" +#include "Management/ElementusInventoryData.h" #include "Engine/AssetManager.h" #include "Subsystems/AssetEditorSubsystem.h" diff --git a/Source/ElementusInventoryEditor/Private/SElementusTable.h b/Source/ElementusInventoryEditor/Private/SElementusTable.h index 847b1fa..940adc6 100644 --- a/Source/ElementusInventoryEditor/Private/SElementusTable.h +++ b/Source/ElementusInventoryEditor/Private/SElementusTable.h @@ -5,7 +5,7 @@ #pragma once #include "CoreMinimal.h" -#include "ElementusInventoryFunctions.h" +#include "Management/ElementusInventoryFunctions.h" struct FElementusItemRowData {