From f9d7c0c2bef35e06329d391a30d88e08ef53357f Mon Sep 17 00:00:00 2001
From: Evil Factory <36804725+evilfactory@users.noreply.github.com>
Date: Fri, 25 Mar 2022 15:06:13 -0300
Subject: [PATCH] All descriptors are now accessible via a global table, for
 easier access

---
 .../BarotraumaShared/Lua/DefaultLib.lua       |  4 +-
 .../BarotraumaShared/Lua/DefaultRegister.lua  | 52 ++++++++++++-------
 2 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua b/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua
index 25b7aced1..5aabdd596 100644
--- a/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua
+++ b/Barotrauma/BarotraumaShared/Lua/DefaultLib.lua
@@ -1,6 +1,6 @@
 local defaultLib = {}
 
-require("DefaultRegister")
+local descriptors = require("DefaultRegister")
 
 local CreateStatic = function (typeName, addCallMethod)
 	local staticUserdata = LuaUserData.CreateStatic(typeName)
@@ -16,6 +16,8 @@ local CreateStatic = function (typeName, addCallMethod)
 	return staticUserdata
 end
 
+defaultLib["Descriptors"] = descriptors
+
 defaultLib["Byte"] = CreateStatic("Barotrauma.LuaByte", true)
 defaultLib["UShort"] = CreateStatic("Barotrauma.LuaUShort", true)
 defaultLib["Float"] = CreateStatic("Barotrauma.LuaFloat", true)
diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
index f608bb955..62cc257e6 100644
--- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
+++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua
@@ -1,8 +1,18 @@
-local function RegisterBarotrauma(typeName)
-    return LuaUserData.RegisterType("Barotrauma." .. typeName)
+local descriptors = {}
+
+local function Register(typeName)
+    local descriptor = LuaUserData.RegisterType(typeName)
+
+    descriptors[typeName] = descriptor
+
+    return descriptor
 end
 
-LuaUserData.RegisterType("System.TimeSpan")
+local function RegisterBarotrauma(typeName)
+    return Register("Barotrauma." .. typeName)
+end
+
+Register("System.TimeSpan")
 
 if SERVER then
     RegisterBarotrauma("Networking.GameServer")
@@ -208,10 +218,10 @@ RegisterBarotrauma("Networking.NetEntityEvent")
 RegisterBarotrauma("Networking.NetEntityEvent+Type")
 RegisterBarotrauma("Networking.INetSerializable")
 RegisterBarotrauma("Networking.DisconnectReason")
-LuaUserData.RegisterType("Lidgren.Network.NetIncomingMessage")
-LuaUserData.RegisterType("Lidgren.Network.NetConnection")
-LuaUserData.RegisterType("System.Net.IPEndPoint")
-LuaUserData.RegisterType("System.Net.IPAddress")
+Register("Lidgren.Network.NetIncomingMessage")
+Register("Lidgren.Network.NetConnection")
+Register("System.Net.IPEndPoint")
+Register("System.Net.IPAddress")
 
 RegisterBarotrauma("Rand+RandSync")
 RegisterBarotrauma("Skill")
@@ -219,9 +229,9 @@ RegisterBarotrauma("SkillPrefab")
 RegisterBarotrauma("TraitorMissionPrefab")
 RegisterBarotrauma("TraitorMissionResult")
 
-LuaUserData.RegisterType("FarseerPhysics.Dynamics.Body")
-LuaUserData.RegisterType("FarseerPhysics.Dynamics.World")
-LuaUserData.RegisterType("FarseerPhysics.Dynamics.Fixture")
+Register("FarseerPhysics.Dynamics.Body")
+Register("FarseerPhysics.Dynamics.World")
+Register("FarseerPhysics.Dynamics.Fixture")
 RegisterBarotrauma("Physics")
 
 RegisterBarotrauma("Camera")
@@ -245,12 +255,12 @@ RegisterBarotrauma("SubmarineInfo")
 RegisterBarotrauma("MapCreatures.Behavior.BallastFloraBehavior")
 RegisterBarotrauma("MapCreatures.Behavior.BallastFloraBranch")
 
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Vector2")
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Vector3")
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Vector4")
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Color")
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Point")
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Rectangle")
+Register("Microsoft.Xna.Framework.Vector2")
+Register("Microsoft.Xna.Framework.Vector3")
+Register("Microsoft.Xna.Framework.Vector4")
+Register("Microsoft.Xna.Framework.Color")
+Register("Microsoft.Xna.Framework.Point")
+Register("Microsoft.Xna.Framework.Rectangle")
 
 if SERVER then
 RegisterBarotrauma("Networking.ServerPeer")
@@ -271,9 +281,9 @@ RegisterBarotrauma("Pivot")
 RegisterBarotrauma("Key")
 RegisterBarotrauma("PlayerInput")
 
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Graphics.Texture2D")
-LuaUserData.RegisterType("EventInput.KeyEventArgs")
-LuaUserData.RegisterType("Microsoft.Xna.Framework.Input.Keys")
+Register("Microsoft.Xna.Framework.Graphics.Texture2D")
+Register("EventInput.KeyEventArgs")
+Register("Microsoft.Xna.Framework.Input.Keys")
 
 RegisterBarotrauma("Sprite")
 RegisterBarotrauma("GUILayoutGroup")
@@ -289,4 +299,6 @@ RegisterBarotrauma("GUIListBox")
 RegisterBarotrauma("GUIScrollBar")
 RegisterBarotrauma("GUIDropDown")
 
-end
\ No newline at end of file
+end
+
+return descriptors
\ No newline at end of file