From 602d8b8044bc2b1fba3a1ea2ac7bf3ae186d103e Mon Sep 17 00:00:00 2001 From: MapleWheels Date: Tue, 5 Sep 2023 18:49:09 -0400 Subject: [PATCH] Removed generic type args definitions as they are no longer necessary. --- .../Lua/DefaultRegister/RegisterClient.lua | 10 ++---- .../Lua/DefaultRegister/RegisterShared.lua | 31 +++++-------------- 2 files changed, 10 insertions(+), 31 deletions(-) diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua index cc6fa9a2e9..899233462b 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterClient.lua @@ -24,11 +24,8 @@ RegisterBarotrauma("Media.Video") RegisterBarotrauma("SoundsFile") RegisterBarotrauma("SoundPrefab") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.SoundPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.BackgroundMusic]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.GUISound]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.DamageSound]]") -RegisterBarotrauma("PrefabSelector`1[[Barotrauma.SoundPrefab]]") +RegisterBarotrauma("PrefabCollection`1") +RegisterBarotrauma("PrefabSelector`1") RegisterBarotrauma("BackgroundMusic") RegisterBarotrauma("GUISound") RegisterBarotrauma("DamageSound") @@ -57,7 +54,6 @@ RegisterBarotrauma("Particles.Particle") RegisterBarotrauma("Particles.ParticleEmitterProperties") RegisterBarotrauma("Particles.ParticleEmitter") RegisterBarotrauma("Particles.ParticlePrefab") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.Particles.ParticlePrefab]]") RegisterBarotrauma("Lights.LightManager") RegisterBarotrauma("Lights.LightSource") @@ -145,4 +141,4 @@ RegisterBarotrauma("Store") RegisterBarotrauma("UISprite") RegisterBarotrauma("ParamsEditor") -RegisterBarotrauma("Inventory+SlotReference") \ No newline at end of file +RegisterBarotrauma("Inventory+SlotReference") diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua index f8c34e511c..0b643e0314 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister/RegisterShared.lua @@ -6,8 +6,8 @@ Register("System.Exception") Register("System.Console") Register("System.Exception") -RegisterBarotrauma("Success`2[[Barotrauma.ContentPackage],[System.Exception]]") -RegisterBarotrauma("Failure`2[[Barotrauma.ContentPackage],[System.Exception]]") +RegisterBarotrauma("Success`2") +RegisterBarotrauma("Failure`2") RegisterBarotrauma("LuaSByte") RegisterBarotrauma("LuaByte") @@ -24,8 +24,7 @@ RegisterBarotrauma("GameMain") RegisterBarotrauma("Networking.BanList") RegisterBarotrauma("Networking.BannedPlayer") -RegisterBarotrauma("Range`1[System.Single]") -RegisterBarotrauma("Range`1[System.Int32]") +RegisterBarotrauma("Range`1") RegisterBarotrauma("RichString") RegisterBarotrauma("Identifier") @@ -399,27 +398,11 @@ end RegisterBarotrauma("Camera") RegisterBarotrauma("Key") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.ItemPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.JobPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.CharacterPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.AfflictionPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.TalentPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.TalentTree]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.OrderPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.LevelGenerationParams]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.OutpostGenerationParams]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.RuinGeneration.RuinGenerationParams]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.LevelGenerationParams]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.LocationType]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.EventPrefab]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.EventSet]]") -RegisterBarotrauma("PrefabCollection`1[[Barotrauma.EventManagerSettings]]") +RegisterBarotrauma("PrefabCollection`1") -RegisterBarotrauma("PrefabSelector`1[[Barotrauma.SkillSettings]]") +RegisterBarotrauma("PrefabSelector`1") -RegisterBarotrauma("Pair`2[[Barotrauma.JobPrefab],[System.Int32]]") - -RegisterBarotrauma("Range`1[System.Single]") +RegisterBarotrauma("Pair`2") RegisterBarotrauma("Items.Components.Signal") RegisterBarotrauma("SubmarineInfo") @@ -461,4 +444,4 @@ LuaUserData.RemoveMember(workshopItem, "AddFavorite") LuaUserData.RemoveMember(workshopItem, "RemoveFavorite") LuaUserData.RemoveMember(workshopItem, "Vote") LuaUserData.RemoveMember(workshopItem, "GetUserVote") -LuaUserData.RemoveMember(workshopItem, "Edit") \ No newline at end of file +LuaUserData.RemoveMember(workshopItem, "Edit")