From b84fa7ad3bc4cba1233b0e8bb1b324ac1cfad702 Mon Sep 17 00:00:00 2001 From: Noah Pilarski Date: Sun, 21 Jul 2024 19:28:38 -0400 Subject: [PATCH] Separate into separate namespace --- .../{Serialization/POI/Item => Components}/ParticledItemPOI.cs | 2 +- Winch/Core/AssetLoader.cs | 2 +- .../{Serialization => Data}/Item/AberrationableFishItemData.cs | 2 +- Winch/{Serialization => Data}/Item/CrabPotItemData.cs | 2 +- .../Item/GridConfigDeployableItemData.cs | 2 +- Winch/{Serialization => Data}/Item/ThawableItemData.cs | 2 +- Winch/{Serialization => Data}/Item/TrawlNetItemData.cs | 2 +- .../GridConfig => Data}/UnstructedCellGroupConfiguration.cs | 2 +- Winch/Patches/API/DeployableItemDataGridConfigPatcher.cs | 2 +- Winch/Patches/API/FishItemDataAberrationPatcher.cs | 2 +- Winch/Serialization/DredgeTypeHelpers.cs | 1 + Winch/Serialization/GridConfig/CellGroupConfigConverter.cs | 1 + Winch/Util/GridConfigUtil.cs | 1 + Winch/Util/ItemUtil.cs | 1 + Winch/Util/PoiUtil.cs | 1 + Winch/Util/WinchExtensions.cs | 2 +- 16 files changed, 16 insertions(+), 11 deletions(-) rename Winch/{Serialization/POI/Item => Components}/ParticledItemPOI.cs (96%) rename Winch/{Serialization => Data}/Item/AberrationableFishItemData.cs (90%) rename Winch/{Serialization => Data}/Item/CrabPotItemData.cs (67%) rename Winch/{Serialization => Data}/Item/GridConfigDeployableItemData.cs (88%) rename Winch/{Serialization => Data}/Item/ThawableItemData.cs (86%) rename Winch/{Serialization => Data}/Item/TrawlNetItemData.cs (67%) rename Winch/{Serialization/GridConfig => Data}/UnstructedCellGroupConfiguration.cs (95%) diff --git a/Winch/Serialization/POI/Item/ParticledItemPOI.cs b/Winch/Components/ParticledItemPOI.cs similarity index 96% rename from Winch/Serialization/POI/Item/ParticledItemPOI.cs rename to Winch/Components/ParticledItemPOI.cs index 0100f340..5d82ec17 100644 --- a/Winch/Serialization/POI/Item/ParticledItemPOI.cs +++ b/Winch/Components/ParticledItemPOI.cs @@ -1,6 +1,6 @@ using UnityEngine; -namespace Winch.Serialization.POI.Item; +namespace Winch.Components; public class ParticledItemPOI : ItemPOI { diff --git a/Winch/Core/AssetLoader.cs b/Winch/Core/AssetLoader.cs index 9565ad2b..e834e8f2 100644 --- a/Winch/Core/AssetLoader.cs +++ b/Winch/Core/AssetLoader.cs @@ -6,8 +6,8 @@ using Winch.Serialization.POI; using Winch.Serialization.POI.Harvest; using Winch.Serialization.POI.Item; -using Winch.Serialization.Item; using Winch.Serialization.HarvestZone; +using Winch.Data.Item; namespace Winch.Core { diff --git a/Winch/Serialization/Item/AberrationableFishItemData.cs b/Winch/Data/Item/AberrationableFishItemData.cs similarity index 90% rename from Winch/Serialization/Item/AberrationableFishItemData.cs rename to Winch/Data/Item/AberrationableFishItemData.cs index 795549de..0fc97344 100644 --- a/Winch/Serialization/Item/AberrationableFishItemData.cs +++ b/Winch/Data/Item/AberrationableFishItemData.cs @@ -6,7 +6,7 @@ using UnityEngine; using Winch.Util; -namespace Winch.Serialization.Item +namespace Winch.Data.Item { public class AberrationableFishItemData : FishItemData { diff --git a/Winch/Serialization/Item/CrabPotItemData.cs b/Winch/Data/Item/CrabPotItemData.cs similarity index 67% rename from Winch/Serialization/Item/CrabPotItemData.cs rename to Winch/Data/Item/CrabPotItemData.cs index 58432254..efa8b0d9 100644 --- a/Winch/Serialization/Item/CrabPotItemData.cs +++ b/Winch/Data/Item/CrabPotItemData.cs @@ -1,4 +1,4 @@ -namespace Winch.Serialization.Item +namespace Winch.Data.Item { public class CrabPotItemData : GridConfigDeployableItemData { diff --git a/Winch/Serialization/Item/GridConfigDeployableItemData.cs b/Winch/Data/Item/GridConfigDeployableItemData.cs similarity index 88% rename from Winch/Serialization/Item/GridConfigDeployableItemData.cs rename to Winch/Data/Item/GridConfigDeployableItemData.cs index f73d721b..f9a69133 100644 --- a/Winch/Serialization/Item/GridConfigDeployableItemData.cs +++ b/Winch/Data/Item/GridConfigDeployableItemData.cs @@ -6,7 +6,7 @@ using UnityEngine; using Winch.Util; -namespace Winch.Serialization.Item +namespace Winch.Data.Item { public class GridConfigDeployableItemData : DeployableItemData { diff --git a/Winch/Serialization/Item/ThawableItemData.cs b/Winch/Data/Item/ThawableItemData.cs similarity index 86% rename from Winch/Serialization/Item/ThawableItemData.cs rename to Winch/Data/Item/ThawableItemData.cs index 47ca9089..f5375ba2 100644 --- a/Winch/Serialization/Item/ThawableItemData.cs +++ b/Winch/Data/Item/ThawableItemData.cs @@ -6,7 +6,7 @@ using UnityEngine; using Winch.Util; -namespace Winch.Serialization.Item +namespace Winch.Data.Item { public class ThawableItemData : DurableItemData { diff --git a/Winch/Serialization/Item/TrawlNetItemData.cs b/Winch/Data/Item/TrawlNetItemData.cs similarity index 67% rename from Winch/Serialization/Item/TrawlNetItemData.cs rename to Winch/Data/Item/TrawlNetItemData.cs index d6b172d2..f815aa08 100644 --- a/Winch/Serialization/Item/TrawlNetItemData.cs +++ b/Winch/Data/Item/TrawlNetItemData.cs @@ -1,4 +1,4 @@ -namespace Winch.Serialization.Item +namespace Winch.Data.Item { public class TrawlNetItemData : GridConfigDeployableItemData { diff --git a/Winch/Serialization/GridConfig/UnstructedCellGroupConfiguration.cs b/Winch/Data/UnstructedCellGroupConfiguration.cs similarity index 95% rename from Winch/Serialization/GridConfig/UnstructedCellGroupConfiguration.cs rename to Winch/Data/UnstructedCellGroupConfiguration.cs index 2bf00be6..e4c03f11 100644 --- a/Winch/Serialization/GridConfig/UnstructedCellGroupConfiguration.cs +++ b/Winch/Data/UnstructedCellGroupConfiguration.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using UnityEngine; -namespace Winch.Serialization.GridConfig +namespace Winch.Data { /// /// Need this or else SetValue won't work diff --git a/Winch/Patches/API/DeployableItemDataGridConfigPatcher.cs b/Winch/Patches/API/DeployableItemDataGridConfigPatcher.cs index 50fd51de..aa7ced2b 100644 --- a/Winch/Patches/API/DeployableItemDataGridConfigPatcher.cs +++ b/Winch/Patches/API/DeployableItemDataGridConfigPatcher.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine.ResourceManagement.AsyncOperations; using Winch.Core.API; -using Winch.Serialization.Item; +using Winch.Data.Item; using Winch.Util; namespace Winch.Patches.API diff --git a/Winch/Patches/API/FishItemDataAberrationPatcher.cs b/Winch/Patches/API/FishItemDataAberrationPatcher.cs index f8e6c12a..06850670 100644 --- a/Winch/Patches/API/FishItemDataAberrationPatcher.cs +++ b/Winch/Patches/API/FishItemDataAberrationPatcher.cs @@ -3,7 +3,7 @@ using System.Linq; using UnityEngine.ResourceManagement.AsyncOperations; using Winch.Core.API; -using Winch.Serialization.Item; +using Winch.Data.Item; using Winch.Util; namespace Winch.Patches.API diff --git a/Winch/Serialization/DredgeTypeHelpers.cs b/Winch/Serialization/DredgeTypeHelpers.cs index d30ae36a..fecb2c80 100644 --- a/Winch/Serialization/DredgeTypeHelpers.cs +++ b/Winch/Serialization/DredgeTypeHelpers.cs @@ -6,6 +6,7 @@ using Newtonsoft.Json.Linq; using UnityEngine; using Winch.Core; +using Winch.Data; using Winch.Serialization.GridConfig; using Winch.Util; diff --git a/Winch/Serialization/GridConfig/CellGroupConfigConverter.cs b/Winch/Serialization/GridConfig/CellGroupConfigConverter.cs index 9f60cdd6..6f7ad339 100644 --- a/Winch/Serialization/GridConfig/CellGroupConfigConverter.cs +++ b/Winch/Serialization/GridConfig/CellGroupConfigConverter.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using UnityEngine; using Winch.Core; +using Winch.Data; namespace Winch.Serialization.GridConfig; diff --git a/Winch/Util/GridConfigUtil.cs b/Winch/Util/GridConfigUtil.cs index d3e1a947..f8bc71de 100644 --- a/Winch/Util/GridConfigUtil.cs +++ b/Winch/Util/GridConfigUtil.cs @@ -8,6 +8,7 @@ using UnityEngine.AddressableAssets; using UnityEngine.Audio; using Winch.Core; +using Winch.Data; using Winch.Serialization; using Winch.Serialization.GridConfig; diff --git a/Winch/Util/ItemUtil.cs b/Winch/Util/ItemUtil.cs index 2ad0f2bc..99b79e96 100644 --- a/Winch/Util/ItemUtil.cs +++ b/Winch/Util/ItemUtil.cs @@ -12,6 +12,7 @@ using Winch.Serialization.Item; using System.Text.RegularExpressions; using UnityEngine.UI; +using Winch.Data.Item; namespace Winch.Util; diff --git a/Winch/Util/PoiUtil.cs b/Winch/Util/PoiUtil.cs index 673ebe31..e5dd9c8c 100644 --- a/Winch/Util/PoiUtil.cs +++ b/Winch/Util/PoiUtil.cs @@ -7,6 +7,7 @@ using UnityEngine; using UnityEngine.AddressableAssets; using UnityEngine.Audio; +using Winch.Components; using Winch.Core; using Winch.Serialization; diff --git a/Winch/Util/WinchExtensions.cs b/Winch/Util/WinchExtensions.cs index 080814a0..e3fd4568 100644 --- a/Winch/Util/WinchExtensions.cs +++ b/Winch/Util/WinchExtensions.cs @@ -9,7 +9,7 @@ using UnityEngine.Localization.Settings; using UnityEngine.ResourceManagement.AsyncOperations; using Winch.Core; -using Winch.Serialization.Item; +using Winch.Data.Item; public static class WinchExtensions {