Add DenyOwnershipHand translation and refactor few MBs namespaces (Su…

…bnauticaNitrox#2105) * Moving CinematicController MBs to right folder/namespace * Moving HUD MBs to right folder/namespace * Add translation for DenyOwnershipHand
moarsmokes · Jan 11, 2024 · 06e114e · 06e114e
1 parent 9c5cd40
commit 06e114e
Show file tree

Hide file tree

Showing 26 changed files with 51 additions and 52 deletions.
diff --git a/NitroxClient/Communication/NetworkingLayer/LiteNetLib/LiteNetLibClient.cs b/NitroxClient/Communication/NetworkingLayer/LiteNetLib/LiteNetLibClient.cs
@@ -6,7 +6,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Debuggers;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.MonoBehaviours.Gui.InGame;
+using NitroxClient.MonoBehaviours.Gui.Modals;
 using NitroxModel.Networking;
 using NitroxModel.Packets;
 

diff --git a/NitroxClient/Communication/Packets/Processors/PlayerCinematicControllerCallProcessor.cs b/NitroxClient/Communication/Packets/Processors/PlayerCinematicControllerCallProcessor.cs
@@ -1,7 +1,7 @@
-using NitroxClient.Communication.Packets.Processors.Abstract;
+using NitroxClient.Communication.Packets.Processors.Abstract;
 using NitroxClient.GameLogic;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.MonoBehaviours.Overrides;
+using NitroxClient.MonoBehaviours.CinematicController;
 using NitroxModel.DataStructures.Util;
 using NitroxModel.Helper;
 using NitroxModel.Packets;

diff --git a/NitroxClient/Communication/Packets/Processors/PlayerKickedProcessor.cs b/NitroxClient/Communication/Packets/Processors/PlayerKickedProcessor.cs
@@ -1,6 +1,6 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.MonoBehaviours.Gui.InGame;
+using NitroxClient.MonoBehaviours.Gui.Modals;
 using NitroxModel.Packets;
 
 namespace NitroxClient.Communication.Packets.Processors

diff --git a/NitroxClient/Communication/Packets/Processors/ServerStoppedProcessor.cs b/NitroxClient/Communication/Packets/Processors/ServerStoppedProcessor.cs
@@ -1,6 +1,6 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors.Abstract;
-using NitroxClient.MonoBehaviours.Gui.InGame;
+using NitroxClient.MonoBehaviours.Gui.Modals;
 using NitroxModel.Packets;
 
 namespace NitroxClient.Communication.Packets.Processors;

diff --git a/NitroxClient/GameLogic/HUD/Components/DenyOwnershipHand.cs b/NitroxClient/GameLogic/HUD/Components/DenyOwnershipHand.cs
diff --git a/...ic/HUD/Components/uGUI_PlayerPingEntry.cs → ...Logic/HUD/PdaTabs/uGUI_PlayerPingEntry.cs b/...ic/HUD/Components/uGUI_PlayerPingEntry.cs → ...Logic/HUD/PdaTabs/uGUI_PlayerPingEntry.cs
@@ -2,18 +2,18 @@
 using System.Collections.Generic;
 using NitroxClient.Communication.Abstract;
 using NitroxClient.Communication.Packets.Processors;
-using NitroxClient.GameLogic.HUD.PdaTabs;
+using NitroxClient.GameLogic.HUD.Components;
 using NitroxClient.GameLogic.PlayerLogic.PlayerModel.Abstract;
-using NitroxClient.MonoBehaviours.Gui.InGame;
+using NitroxClient.MonoBehaviours.Gui.Modals;
+using NitroxModel_Subnautica.DataStructures;
 using NitroxModel.Core;
 using NitroxModel.DataStructures.GameLogic;
 using NitroxModel.Packets;
-using NitroxModel_Subnautica.DataStructures;
 using UnityEngine;
 using UnityEngine.UI;
 using UWE;
 
-namespace NitroxClient.GameLogic.HUD.Components;
+namespace NitroxClient.GameLogic.HUD.PdaTabs;
 
 public class uGUI_PlayerPingEntry : uGUI_PingEntry
 {
@@ -195,7 +195,7 @@ private void ClearButtonListeners()
     private IEnumerator AssignSprites()
     {
         yield return new WaitUntil(() => parent.FinishedLoadingAssets);
-        
+
         // NB: Those textures MUST be exported with a Texture Type of "Sprite (2D and UI)", else they will look blurry not matter what
         // NB 2: Those textures for the buttons are scaled 68x61 but the image inside but not hit the borders to have a better render
         MutedSprite = parent.GetSprite("muted@3x");
@@ -220,7 +220,7 @@ private void RefreshMuteButton()
     private void RefreshButtonsVisibility()
     {
         LocalPlayer localPlayer = NitroxServiceLocator.LocateService<LocalPlayer>();
-        
+
         bool isNotLocalPlayer = !IsLocalPlayer;
         // We don't want any control buttons to appear for the local player
         ShowObject.SetActive(isNotLocalPlayer);

diff --git a/NitroxClient/GameLogic/Spawning/WorldEntities/EscapePodWorldEntitySpawner.cs b/NitroxClient/GameLogic/Spawning/WorldEntities/EscapePodWorldEntitySpawner.cs
@@ -1,7 +1,7 @@
 using System.Collections;
 using NitroxClient.GameLogic.Spawning.Metadata;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.MonoBehaviours.Overrides;
+using NitroxClient.MonoBehaviours.CinematicController;
 using NitroxModel.DataStructures.GameLogic.Entities;
 using NitroxModel.DataStructures.Util;
 using NitroxModel_Subnautica.DataStructures;

diff --git a/NitroxClient/GameLogic/Spawning/WorldEntities/VehicleWorldEntitySpawner.cs b/NitroxClient/GameLogic/Spawning/WorldEntities/VehicleWorldEntitySpawner.cs
@@ -1,6 +1,6 @@
 using System.Collections;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.MonoBehaviours.Overrides;
+using NitroxClient.MonoBehaviours.CinematicController;
 using NitroxClient.Unity.Helper;
 using NitroxModel.DataStructures.GameLogic.Entities;
 using NitroxModel.DataStructures.Util;

diff --git a/NitroxClient/MonoBehaviours/CinematicController/MultiplayerCinematicController.cs b/NitroxClient/MonoBehaviours/CinematicController/MultiplayerCinematicController.cs
@@ -2,7 +2,7 @@
 using NitroxClient.GameLogic;
 using UnityEngine;
 
-namespace NitroxClient.MonoBehaviours.Overrides;
+namespace NitroxClient.MonoBehaviours.CinematicController;
 
 public class MultiplayerCinematicController : MonoBehaviour
 {

diff --git a/NitroxClient/MonoBehaviours/CinematicController/MultiplayerCinematicReference.cs b/NitroxClient/MonoBehaviours/CinematicController/MultiplayerCinematicReference.cs
@@ -4,7 +4,7 @@
 using NitroxClient.Unity.Helper;
 using UnityEngine;
 
-namespace NitroxClient.MonoBehaviours.Overrides;
+namespace NitroxClient.MonoBehaviours.CinematicController;
 
 public class MultiplayerCinematicReference : MonoBehaviour
 {
@@ -59,7 +59,7 @@ public void AddController(PlayerCinematicController playerController)
         {
             return;
         }
-        
+
         MultiplayerCinematicController controller = MultiplayerCinematicController.Initialize(playerController);
         controller.AddOtherControllers(allControllers);
         allControllers.ForEach(x => x.AddOtherControllers(new[] { controller }));

diff --git a/...rrides/RemotePlayerCinematicController.cs → ...roller/RemotePlayerCinematicController.cs b/...rrides/RemotePlayerCinematicController.cs → ...roller/RemotePlayerCinematicController.cs
@@ -3,7 +3,7 @@
 using UnityEngine;
 using static PlayerCinematicController;
 
-namespace NitroxClient.MonoBehaviours.Overrides;
+namespace NitroxClient.MonoBehaviours.CinematicController;
 
 /// <summary>
 /// Override for <see cref="PlayerCinematicController"/>

diff --git a/NitroxClient/MonoBehaviours/Gui/HUD/DenyOwnershipHand.cs b/NitroxClient/MonoBehaviours/Gui/HUD/DenyOwnershipHand.cs
@@ -0,0 +1,20 @@
+using UnityEngine;
+
+namespace NitroxClient.MonoBehaviours.Gui.HUD;
+
+public class DenyOwnershipHand : MonoBehaviour
+{
+    private void Start()
+    {
+        // Forces the message to go away after a few seconds.
+        Destroy(this, 2);
+    }
+
+    private void Update()
+    {
+        //TODO: Check if this should be Hand
+        HandReticle.main.SetText(HandReticle.TextType.Hand, "Nitrox_DenyOwnershipHand", true);
+        HandReticle.main.SetText(HandReticle.TextType.HandSubscript, string.Empty, false);
+        HandReticle.main.SetIcon(HandReticle.IconType.HandDeny);
+    }
+}
diff --git a/...nt/MonoBehaviours/Gui/PDA/ConfirmModal.cs → ...MonoBehaviours/Gui/Modals/ConfirmModal.cs b/...nt/MonoBehaviours/Gui/PDA/ConfirmModal.cs → ...MonoBehaviours/Gui/Modals/ConfirmModal.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace NitroxClient.MonoBehaviours.Gui.InGame;
+namespace NitroxClient.MonoBehaviours.Gui.Modals;
 
 public class ConfirmModal : Modal
 {

diff --git a/.../MonoBehaviours/Gui/InGame/KickedModal.cs → .../MonoBehaviours/Gui/Modals/KickedModal.cs b/.../MonoBehaviours/Gui/InGame/KickedModal.cs → .../MonoBehaviours/Gui/Modals/KickedModal.cs
@@ -1,4 +1,4 @@
-namespace NitroxClient.MonoBehaviours.Gui.InGame;
+namespace NitroxClient.MonoBehaviours.Gui.Modals;
 
 public class KickedModal : Modal
 {

diff --git a/...aviours/Gui/InGame/LostConnectionModal.cs → ...aviours/Gui/Modals/LostConnectionModal.cs b/...aviours/Gui/InGame/LostConnectionModal.cs → ...aviours/Gui/Modals/LostConnectionModal.cs
@@ -1,4 +1,4 @@
-namespace NitroxClient.MonoBehaviours.Gui.InGame;
+namespace NitroxClient.MonoBehaviours.Gui.Modals;
 
 /// <summary>
 ///     Extends the IngameMenu with a disconnect popup.

diff --git a/...Client/MonoBehaviours/Gui/InGame/Modal.cs → ...Client/MonoBehaviours/Gui/Modals/Modal.cs b/...Client/MonoBehaviours/Gui/InGame/Modal.cs → ...Client/MonoBehaviours/Gui/Modals/Modal.cs
@@ -6,7 +6,7 @@
 using UnityEngine.UI;
 using UWE;
 
-namespace NitroxClient.MonoBehaviours.Gui.InGame;
+namespace NitroxClient.MonoBehaviours.Gui.Modals;
 
 /// <summary>
 /// Base class for Modal components, which are dialog boxes that appear in the middle of the screen

diff --git a/...haviours/Gui/InGame/ServerStoppedModal.cs → ...haviours/Gui/Modals/ServerStoppedModal.cs b/...haviours/Gui/InGame/ServerStoppedModal.cs → ...haviours/Gui/Modals/ServerStoppedModal.cs
@@ -1,4 +1,4 @@
-namespace NitroxClient.MonoBehaviours.Gui.InGame;
+namespace NitroxClient.MonoBehaviours.Gui.Modals;
 
 public class ServerStoppedModal : Modal
 {

diff --git a/NitroxPatcher/Patches/Dynamic/Bench_OnHandClick_Patch.cs b/NitroxPatcher/Patches/Dynamic/Bench_OnHandClick_Patch.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.HUD.Components;
 using NitroxClient.GameLogic.Simulation;
 using NitroxClient.MonoBehaviours;
+using NitroxClient.MonoBehaviours.Gui.HUD;
 using NitroxModel.DataStructures;
 using NitroxModel.Helper;
 

diff --git a/NitroxPatcher/Patches/Dynamic/Incubator_OnHandClick_Patch.cs b/NitroxPatcher/Patches/Dynamic/Incubator_OnHandClick_Patch.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.HUD.Components;
 using NitroxClient.GameLogic.Simulation;
+using NitroxClient.MonoBehaviours.Gui.HUD;
 using NitroxModel.Core;
 using NitroxModel.DataStructures;
 using NitroxModel.DataStructures.GameLogic.Entities.Metadata;

diff --git a/NitroxPatcher/Patches/Dynamic/IngameMenu_OnDeselect_Patch.cs b/NitroxPatcher/Patches/Dynamic/IngameMenu_OnDeselect_Patch.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
-using NitroxClient.MonoBehaviours.Gui.InGame;
+using NitroxClient.MonoBehaviours.Gui.Modals;
 using NitroxModel.Helper;
 
 namespace NitroxPatcher.Patches.Dynamic;

diff --git a/NitroxPatcher/Patches/Dynamic/PilotingChair_OnHandClick_Patch.cs b/NitroxPatcher/Patches/Dynamic/PilotingChair_OnHandClick_Patch.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.HUD.Components;
 using NitroxClient.GameLogic.Simulation;
+using NitroxClient.MonoBehaviours.Gui.HUD;
 using NitroxModel.DataStructures;
 using NitroxModel.Helper;
 

diff --git a/NitroxPatcher/Patches/Dynamic/PlayerCinematicController_OnPlayerCinematicModeEnd_Patch.cs b/NitroxPatcher/Patches/Dynamic/PlayerCinematicController_OnPlayerCinematicModeEnd_Patch.cs
@@ -2,7 +2,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.GameLogic.PlayerLogic;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.MonoBehaviours.Overrides;
+using NitroxClient.MonoBehaviours.CinematicController;
 using NitroxClient.Unity.Helper;
 using NitroxModel.Helper;
 

diff --git a/NitroxPatcher/Patches/Dynamic/PlayerCinematicController_StartCinematicMode_Patch.cs b/NitroxPatcher/Patches/Dynamic/PlayerCinematicController_StartCinematicMode_Patch.cs
@@ -2,7 +2,7 @@
 using NitroxClient.Communication.Abstract;
 using NitroxClient.GameLogic.PlayerLogic;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.MonoBehaviours.Overrides;
+using NitroxClient.MonoBehaviours.CinematicController;
 using NitroxClient.Unity.Helper;
 using NitroxModel.Helper;
 

diff --git a/NitroxPatcher/Patches/Dynamic/PlayerCinematicController_Start_Patch.cs b/NitroxPatcher/Patches/Dynamic/PlayerCinematicController_Start_Patch.cs
@@ -1,6 +1,6 @@
 using System.Reflection;
 using NitroxClient.MonoBehaviours;
-using NitroxClient.MonoBehaviours.Overrides;
+using NitroxClient.MonoBehaviours.CinematicController;
 using NitroxClient.Unity.Helper;
 using NitroxModel.Helper;
 

diff --git a/NitroxPatcher/Patches/Dynamic/PropulsionCannon_GrabObject_Patch.cs b/NitroxPatcher/Patches/Dynamic/PropulsionCannon_GrabObject_Patch.cs
@@ -1,8 +1,8 @@
 using System.Reflection;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.HUD.Components;
 using NitroxClient.GameLogic.Simulation;
 using NitroxClient.MonoBehaviours;
+using NitroxClient.MonoBehaviours.Gui.HUD;
 using NitroxModel.DataStructures;
 using NitroxModel.Helper;
 using UnityEngine;

diff --git a/NitroxPatcher/Patches/Dynamic/Vehicle_OnHandClick_Patch.cs b/NitroxPatcher/Patches/Dynamic/Vehicle_OnHandClick_Patch.cs
@@ -1,7 +1,7 @@
 using System.Reflection;
 using NitroxClient.GameLogic;
-using NitroxClient.GameLogic.HUD.Components;
 using NitroxClient.GameLogic.Simulation;
+using NitroxClient.MonoBehaviours.Gui.HUD;
 using NitroxModel.DataStructures;
 using NitroxModel.Helper;