From f1d6d247db4d3ea82147cfc5aa2a3bbb042c62e9 Mon Sep 17 00:00:00 2001 From: NotAKidoS <37721153+NotAKidOnSteam@users.noreply.github.com> Date: Tue, 25 Apr 2023 15:13:21 -0500 Subject: [PATCH] NAK namespace prefix, remove Melons --- DesktopVRIK/DesktopVRIKSystem.cs | 2 +- DesktopVRIK/HarmonyPatches.cs | 2 +- DesktopVRIK/Integrations/BTKUIAddon.cs | 2 +- DesktopVRIK/Main.cs | 2 +- DesktopVRIK/Properties/AssemblyInfo.cs | 12 ++++++------ DesktopVRIK/VRIKUtils.cs | 2 +- MenuScalePatch/Properties/AssemblyInfo.cs | 1 - ThirdPerson/CameraLogic.cs | 2 +- ThirdPerson/Patches.cs | 7 ++----- ThirdPerson/ThirdPerson.cs | 8 ++++---- 10 files changed, 18 insertions(+), 22 deletions(-) diff --git a/DesktopVRIK/DesktopVRIKSystem.cs b/DesktopVRIK/DesktopVRIKSystem.cs index 25ae996..8d561c5 100644 --- a/DesktopVRIK/DesktopVRIKSystem.cs +++ b/DesktopVRIK/DesktopVRIKSystem.cs @@ -8,7 +8,7 @@ using RootMotion.FinalIK; using UnityEngine; using UnityEngine.Events; -namespace NAK.Melons.DesktopVRIK; +namespace NAK.DesktopVRIK; internal class DesktopVRIKSystem : MonoBehaviour { diff --git a/DesktopVRIK/HarmonyPatches.cs b/DesktopVRIK/HarmonyPatches.cs index d66c1b7..3feeb70 100644 --- a/DesktopVRIK/HarmonyPatches.cs +++ b/DesktopVRIK/HarmonyPatches.cs @@ -24,7 +24,7 @@ using ABI.CCK.Components; **/ -namespace NAK.Melons.DesktopVRIK.HarmonyPatches; +namespace NAK.DesktopVRIK.HarmonyPatches; class PlayerSetupPatches { diff --git a/DesktopVRIK/Integrations/BTKUIAddon.cs b/DesktopVRIK/Integrations/BTKUIAddon.cs index 5c25427..98212a7 100644 --- a/DesktopVRIK/Integrations/BTKUIAddon.cs +++ b/DesktopVRIK/Integrations/BTKUIAddon.cs @@ -2,7 +2,7 @@ using BTKUILib.UIObjects; using System.Runtime.CompilerServices; -namespace NAK.Melons.DesktopVRIK; +namespace NAK.DesktopVRIK; public static class BTKUIAddon { diff --git a/DesktopVRIK/Main.cs b/DesktopVRIK/Main.cs index c7739b4..a14d5cb 100644 --- a/DesktopVRIK/Main.cs +++ b/DesktopVRIK/Main.cs @@ -1,7 +1,7 @@ using MelonLoader; using UnityEngine; -namespace NAK.Melons.DesktopVRIK; +namespace NAK.DesktopVRIK; public class DesktopVRIKMod : MelonMod { diff --git a/DesktopVRIK/Properties/AssemblyInfo.cs b/DesktopVRIK/Properties/AssemblyInfo.cs index 8c203c9..de5bf05 100644 --- a/DesktopVRIK/Properties/AssemblyInfo.cs +++ b/DesktopVRIK/Properties/AssemblyInfo.cs @@ -1,17 +1,17 @@ using MelonLoader; -using NAK.Melons.DesktopVRIK.Properties; +using NAK.DesktopVRIK.Properties; using System.Reflection; [assembly: AssemblyVersion(AssemblyInfoParams.Version)] [assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] [assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] -[assembly: AssemblyTitle(nameof(NAK.Melons.DesktopVRIK))] +[assembly: AssemblyTitle(nameof(NAK.DesktopVRIK))] [assembly: AssemblyCompany(AssemblyInfoParams.Author)] -[assembly: AssemblyProduct(nameof(NAK.Melons.DesktopVRIK))] +[assembly: AssemblyProduct(nameof(NAK.DesktopVRIK))] [assembly: MelonInfo( - typeof(NAK.Melons.DesktopVRIK.DesktopVRIKMod), - nameof(NAK.Melons.DesktopVRIK), + typeof(NAK.DesktopVRIK.DesktopVRIKMod), + nameof(NAK.DesktopVRIK), AssemblyInfoParams.Version, AssemblyInfoParams.Author, downloadLink: "https://github.com/NotAKidOnSteam/DesktopVRIK" @@ -23,7 +23,7 @@ using System.Reflection; [assembly: MelonOptionalDependencies("BTKUILib")] [assembly: HarmonyDontPatchAll] -namespace NAK.Melons.DesktopVRIK.Properties; +namespace NAK.DesktopVRIK.Properties; internal static class AssemblyInfoParams { public const string Version = "4.1.8"; diff --git a/DesktopVRIK/VRIKUtils.cs b/DesktopVRIK/VRIKUtils.cs index 21c36c3..f52245a 100644 --- a/DesktopVRIK/VRIKUtils.cs +++ b/DesktopVRIK/VRIKUtils.cs @@ -1,7 +1,7 @@ using RootMotion.FinalIK; using UnityEngine; -namespace NAK.Melons.DesktopVRIK; +namespace NAK.DesktopVRIK; public static class VRIKUtils { diff --git a/MenuScalePatch/Properties/AssemblyInfo.cs b/MenuScalePatch/Properties/AssemblyInfo.cs index ada3637..2062346 100644 --- a/MenuScalePatch/Properties/AssemblyInfo.cs +++ b/MenuScalePatch/Properties/AssemblyInfo.cs @@ -2,7 +2,6 @@ using NAK.MenuScalePatch.Properties; using System.Reflection; - [assembly: AssemblyVersion(AssemblyInfoParams.Version)] [assembly: AssemblyFileVersion(AssemblyInfoParams.Version)] [assembly: AssemblyInformationalVersion(AssemblyInfoParams.Version)] diff --git a/ThirdPerson/CameraLogic.cs b/ThirdPerson/CameraLogic.cs index 776d7f1..1f68417 100644 --- a/ThirdPerson/CameraLogic.cs +++ b/ThirdPerson/CameraLogic.cs @@ -9,7 +9,7 @@ using UnityEngine; using UnityEngine.AzureSky; using UnityEngine.Rendering.PostProcessing; -namespace ThirdPerson; +namespace NAK.ThirdPerson; internal static class CameraLogic { diff --git a/ThirdPerson/Patches.cs b/ThirdPerson/Patches.cs index 82c1e40..1a66882 100644 --- a/ThirdPerson/Patches.cs +++ b/ThirdPerson/Patches.cs @@ -1,12 +1,9 @@ using ABI.CCK.Components; -using ABI_RC.Core.InteractionSystem; -using ABI_RC.Core.Player; using MelonLoader; -using System.Linq; using System.Reflection; -using static ThirdPerson.CameraLogic; +using static NAK.ThirdPerson.CameraLogic; -namespace ThirdPerson; +namespace NAK.ThirdPerson; internal static class Patches { diff --git a/ThirdPerson/ThirdPerson.cs b/ThirdPerson/ThirdPerson.cs index 2fcb1bb..4500130 100644 --- a/ThirdPerson/ThirdPerson.cs +++ b/ThirdPerson/ThirdPerson.cs @@ -2,15 +2,15 @@ using System; using System.Reflection; using UnityEngine; -using static ThirdPerson.CameraLogic; -using BuildInfo = ThirdPerson.BuildInfo; +using static NAK.ThirdPerson.CameraLogic; +using BuildInfo = NAK.ThirdPerson.BuildInfo; [assembly: AssemblyCopyright("Created by " + BuildInfo.Author)] -[assembly: MelonInfo(typeof(ThirdPerson.ThirdPerson), BuildInfo.Name, BuildInfo.Version, BuildInfo.Author)] +[assembly: MelonInfo(typeof(NAK.ThirdPerson.ThirdPerson), BuildInfo.Name, BuildInfo.Version, BuildInfo.Author)] [assembly: MelonGame("Alpha Blend Interactive", "ChilloutVR")] [assembly: MelonColor(ConsoleColor.DarkMagenta)] -namespace ThirdPerson; +namespace NAK.ThirdPerson; public static class BuildInfo {