Added Furnance and smelting

2026-08-11 17:12:34 +03:00
parent 2a30d4d8cf
commit 67e0bcfaaf
82 changed files with 25148 additions and 7186 deletions
@@ -11,12 +11,23 @@ public sealed class FactoryLobbyCodeView : MonoBehaviour
        GUILayout.BeginArea(new Rect(42, 42, 304, 76));
        if (session.IsHost)
        {
-            GUILayout.Label("LOBBY CODE");
-            GUILayout.Label(string.IsNullOrEmpty(session.JoinCode) ? "Generating..." : session.JoinCode);
+            if (session.ConnectionMode == NetworkConnectionMode.Lan)
+            {
+                GUILayout.Label("LAN HOST");
+                GUILayout.Label($"Same PC: 127.0.0.1:{session.LanPort}");
+            }
+            else
+            {
+                GUILayout.Label("LOBBY CODE");
+                GUILayout.Label(string.IsNullOrEmpty(session.JoinCode) ? "Generating..." : session.JoinCode);
+            }
        }
        else
        {
-            GUILayout.Label("CONNECTED TO FACTORY");
+            string connectionName = session.ConnectionMode == NetworkConnectionMode.Lan
+                ? "LAN"
+                : "RELAY";
+            GUILayout.Label($"CONNECTED VIA {connectionName}");
        }
        GUILayout.EndArea();
    }
@@ -1,9 +1,14 @@
+using System.Collections.Generic;
 using UnityEngine;

+public interface IGlobalUISectionController { }
+
 public sealed class GlobalUIController : MonoBehaviour
 {
    public static GlobalUIController Instance { get; private set; }

+    private readonly HashSet<IGlobalUISectionController> sectionControllers = new();
+
    private void Awake()
    {
        if (Instance != null && Instance != this)
@@ -13,11 +18,43 @@ public sealed class GlobalUIController : MonoBehaviour
        }

        Instance = this;
+
+        foreach (MonoBehaviour behaviour in FindObjectsByType<MonoBehaviour>(
+                     FindObjectsInactive.Include,
+                     FindObjectsSortMode.None))
+        {
+            if (behaviour is IGlobalUISectionController controller)
+                Register(controller);
+        }
+    }
+
+    public void Register(IGlobalUISectionController controller)
+    {
+        if (controller != null)
+            sectionControllers.Add(controller);
+    }
+
+    public void Unregister(IGlobalUISectionController controller)
+    {
+        if (controller != null)
+            sectionControllers.Remove(controller);
+    }
+
+    public IEnumerable<T> GetControllers<T>() where T : class, IGlobalUISectionController
+    {
+        foreach (IGlobalUISectionController controller in sectionControllers)
+        {
+            if (controller is T typedController)
+                yield return typedController;
+        }
    }

    private void OnDestroy()
    {
        if (Instance == this)
+        {
+            sectionControllers.Clear();
            Instance = null;
+        }
    }
 }
@@ -4,14 +4,17 @@ using UnityEngine;
 public sealed class MainMenuController : MonoBehaviour
 {
    private string joinCode = string.Empty;
+    private string lanAddress = "127.0.0.1";
+    private string lanPort = NetworkSessionController.DefaultLanPort.ToString();
    private string playerName = string.Empty;
+    private string lanValidationMessage = string.Empty;
    private Vector2 lobbyScrollPosition;

    private void OnGUI()
    {
        NetworkSessionController session = NetworkSessionController.Instance;
-        GUI.Box(new Rect(24, 24, 480, 620), string.Empty);
-        GUILayout.BeginArea(new Rect(44, 44, 440, 580));
+        GUI.Box(new Rect(24, 24, 480, 700), string.Empty);
+        GUILayout.BeginArea(new Rect(44, 44, 440, 660));
        GUILayout.Label("FRIENDSLOP // MOUNTAIN FACTORY");
        GUILayout.Space(10);

@@ -38,6 +41,27 @@ public sealed class MainMenuController : MonoBehaviour

        GUILayout.Space(10);
        GUI.enabled = !session.IsBusy;
+
+        GUILayout.Label("LAN // DIRECT CONNECTION");
+        GUILayout.BeginHorizontal();
+        GUILayout.Label("IP", GUILayout.Width(24));
+        lanAddress = GUILayout.TextField(lanAddress);
+        GUILayout.Label("Port", GUILayout.Width(32));
+        lanPort = GUILayout.TextField(lanPort, GUILayout.Width(64));
+        GUILayout.EndHorizontal();
+
+        GUILayout.BeginHorizontal();
+        if (GUILayout.Button("Start LAN Host", GUILayout.Height(32)) && TryReadLanPort(out ushort hostPort))
+            session.StartLanHost(hostPort);
+        if (GUILayout.Button("Join LAN", GUILayout.Height(32)) && TryReadLanPort(out ushort clientPort))
+            session.StartLanClient(lanAddress, clientPort);
+        GUILayout.EndHorizontal();
+
+        if (!string.IsNullOrEmpty(lanValidationMessage))
+            GUILayout.Label(lanValidationMessage);
+
+        GUILayout.Space(12);
+        GUILayout.Label("RELAY // ONLINE");
        if (GUILayout.Button("Create Relay Host", GUILayout.Height(34)))
            _ = session.StartHostAsync();

@@ -54,7 +78,7 @@ public sealed class MainMenuController : MonoBehaviour
            _ = session.RefreshPublicLobbiesAsync();
        GUILayout.EndHorizontal();

-        lobbyScrollPosition = GUILayout.BeginScrollView(lobbyScrollPosition, GUILayout.Height(220));
+        lobbyScrollPosition = GUILayout.BeginScrollView(lobbyScrollPosition, GUILayout.Height(160));
        foreach (Lobby lobby in session.PublicLobbies)
        {
            GUILayout.BeginHorizontal(GUI.skin.box);
@@ -72,4 +96,11 @@ public sealed class MainMenuController : MonoBehaviour
        GUI.enabled = true;
        GUILayout.EndArea();
    }
+
+    private bool TryReadLanPort(out ushort port)
+    {
+        bool isValid = ushort.TryParse(lanPort, out port) && port > 0;
+        lanValidationMessage = isValid ? string.Empty : "LAN port must be between 1 and 65535.";
+        return isValid;
+    }
 }