From bdac2d03342327a4dca941c4f7334afe2ddd32e7 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Sun, 22 Mar 2026 00:41:08 -0400 Subject: [PATCH] "Tool" naming was annoying me --- NDecrypt.Core/{DSTool.cs => DSProcessor.cs} | 2 +- NDecrypt.Core/{ITool.cs => ICartProcessor.cs} | 2 +- NDecrypt.Core/{ThreeDSTool.cs => ThreeDSProcessor.cs} | 4 ++-- NDecrypt/Features/BaseFeature.cs | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) rename NDecrypt.Core/{DSTool.cs => DSProcessor.cs} (99%) rename NDecrypt.Core/{ITool.cs => ICartProcessor.cs} (97%) rename NDecrypt.Core/{ThreeDSTool.cs => ThreeDSProcessor.cs} (99%) diff --git a/NDecrypt.Core/DSTool.cs b/NDecrypt.Core/DSProcessor.cs similarity index 99% rename from NDecrypt.Core/DSTool.cs rename to NDecrypt.Core/DSProcessor.cs index b9c948d..0379521 100644 --- a/NDecrypt.Core/DSTool.cs +++ b/NDecrypt.Core/DSProcessor.cs @@ -7,7 +7,7 @@ using SabreTools.Serialization.Wrappers; namespace NDecrypt.Core { - public class DSTool : ITool + public class DSProcessor : ICartProcessor { #region Properties diff --git a/NDecrypt.Core/ITool.cs b/NDecrypt.Core/ICartProcessor.cs similarity index 97% rename from NDecrypt.Core/ITool.cs rename to NDecrypt.Core/ICartProcessor.cs index 9f14a80..d98e9b3 100644 --- a/NDecrypt.Core/ITool.cs +++ b/NDecrypt.Core/ICartProcessor.cs @@ -1,6 +1,6 @@ namespace NDecrypt.Core { - public interface ITool + public interface ICartProcessor { /// /// Attempts to encrypt an input file diff --git a/NDecrypt.Core/ThreeDSTool.cs b/NDecrypt.Core/ThreeDSProcessor.cs similarity index 99% rename from NDecrypt.Core/ThreeDSTool.cs rename to NDecrypt.Core/ThreeDSProcessor.cs index 641d8f9..419f8cf 100644 --- a/NDecrypt.Core/ThreeDSTool.cs +++ b/NDecrypt.Core/ThreeDSProcessor.cs @@ -9,7 +9,7 @@ using static SabreTools.Data.Models.N3DS.Constants; namespace NDecrypt.Core { - public class ThreeDSTool : ITool + public class ThreeDSProcessor : ICartProcessor { /// /// AES Hardware Constant @@ -359,7 +359,7 @@ namespace NDecrypt.Core #endregion - public ThreeDSTool(bool development) + public ThreeDSProcessor(bool development) { _development = development; } diff --git a/NDecrypt/Features/BaseFeature.cs b/NDecrypt/Features/BaseFeature.cs index d69dd0a..c6444c7 100644 --- a/NDecrypt/Features/BaseFeature.cs +++ b/NDecrypt/Features/BaseFeature.cs @@ -32,7 +32,7 @@ namespace NDecrypt.Features /// /// Mapping of reusable tools /// - private readonly Dictionary _tools = []; + private readonly Dictionary _tools = []; protected BaseFeature(string name, string[] flags, string description, string? detailed = null) : base(name, flags, description, detailed) @@ -96,14 +96,14 @@ namespace NDecrypt.Features return; // Create the DS tool - _tools[FileType.NDS] = new DSTool + _tools[FileType.NDS] = new DSProcessor { BlowfishTable = config.NitroEncryptionData.FromHexString() ?? [], }; // Create the 3DS tool bool development = GetBoolean(DevelopmentName); - _tools[FileType.N3DS] = new ThreeDSTool(development) + _tools[FileType.N3DS] = new ThreeDSProcessor(development) { AESHardwareConstant = config.AESHardwareConstant.FromHexString() ?? [], KeyX0x18 = config.KeyX0x18.FromHexString() ?? [], @@ -121,7 +121,7 @@ namespace NDecrypt.Features /// Derive the encryption tool to be used for the given file /// /// Filename to derive the tool from - protected ITool? DeriveTool(string filename) + protected ICartProcessor? DeriveTool(string filename) { if (!File.Exists(filename)) {