From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com> Date: Sun, 16 Apr 2023 00:55:59 +0000 (+1200) Subject: Rename "Server Info" to ServerInfo (#15436) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=116670ae8a0828e1ba2727f8e85764c7299310a2;p=space-station-14.git Rename "Server Info" to ServerInfo (#15436) --- diff --git a/Content.Client/Info/RulesAndInfoWindow.cs b/Content.Client/Info/RulesAndInfoWindow.cs index d231aeceb1..118a93114a 100644 --- a/Content.Client/Info/RulesAndInfoWindow.cs +++ b/Content.Client/Info/RulesAndInfoWindow.cs @@ -61,7 +61,7 @@ namespace Content.Client.Info private static Control MakeSection(string title, string path, bool markup, IResourceManager res) { - return new InfoSection(title, res.ContentFileReadAllText($"/Server Info/{path}"), markup); + return new InfoSection(title, res.ContentFileReadAllText($"/ServerInfo/{path}"), markup); } } diff --git a/Content.Server/Info/InfoSystem.cs b/Content.Server/Info/InfoSystem.cs index ce021fa430..8fae121bcb 100644 --- a/Content.Server/Info/InfoSystem.cs +++ b/Content.Server/Info/InfoSystem.cs @@ -6,7 +6,7 @@ using Robust.Shared.Log; namespace Content.Server.Info; -public class InfoSystem : EntitySystem +public sealed class InfoSystem : EntitySystem { [Dependency] private readonly IResourceManager _res = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; @@ -24,7 +24,7 @@ public class InfoSystem : EntitySystem var rules = "Server could not read its rules."; try { - rules = _res.ContentFileReadAllText($"/Server Info/{path}"); + rules = _res.ContentFileReadAllText($"/ServerInfo/{path}"); } catch (Exception) { diff --git a/Resources/Prototypes/Guidebook/botany.yml b/Resources/Prototypes/Guidebook/botany.yml index a8795efed0..2f654a81df 100644 --- a/Resources/Prototypes/Guidebook/botany.yml +++ b/Resources/Prototypes/Guidebook/botany.yml @@ -1,4 +1,4 @@ - type: guideEntry id: Botany name: guide-entry-botany - text: "/Server Info/Guidebook/Botany.xml" + text: "/ServerInfo/Guidebook/Botany.xml" diff --git a/Resources/Prototypes/Guidebook/engineering.yml b/Resources/Prototypes/Guidebook/engineering.yml index 491ae0cde4..964dfa6809 100644 --- a/Resources/Prototypes/Guidebook/engineering.yml +++ b/Resources/Prototypes/Guidebook/engineering.yml @@ -1,7 +1,7 @@ - type: guideEntry id: Engineering name: guide-entry-engineering - text: "/Server Info/Guidebook/Engineering.xml" + text: "/ServerInfo/Guidebook/Engineering.xml" children: - Atmospherics - Construction @@ -11,29 +11,29 @@ - type: guideEntry id: Construction name: guide-entry-construction - text: "/Server Info/Guidebook/Construction.xml" + text: "/ServerInfo/Guidebook/Construction.xml" - type: guideEntry id: Atmospherics name: guide-entry-atmospherics - text: "/Server Info/Guidebook/Atmospherics.xml" + text: "/ServerInfo/Guidebook/Atmospherics.xml" children: - Fires - type: guideEntry id: Fires name: guide-entry-fires - text: "/Server Info/Guidebook/Fires.xml" + text: "/ServerInfo/Guidebook/Fires.xml" - type: guideEntry id: ShuttleCraft name: guide-entry-shuttle-craft - text: "/Server Info/Guidebook/Shuttlecraft.xml" + text: "/ServerInfo/Guidebook/Shuttlecraft.xml" - type: guideEntry id: Power name: guide-entry-power - text: "/Server Info/Guidebook/Power.xml" + text: "/ServerInfo/Guidebook/Power.xml" children: - AME - Singularity @@ -41,9 +41,9 @@ - type: guideEntry id: AME name: guide-entry-ame - text: "/Server Info/Guidebook/AME.xml" + text: "/ServerInfo/Guidebook/AME.xml" - type: guideEntry id: Singularity name: guide-entry-singularity - text: "/Server Info/Guidebook/Singularity.xml" + text: "/ServerInfo/Guidebook/Singularity.xml" diff --git a/Resources/Prototypes/Guidebook/meta.yml b/Resources/Prototypes/Guidebook/meta.yml index 1eb579c627..08349f2d0a 100644 --- a/Resources/Prototypes/Guidebook/meta.yml +++ b/Resources/Prototypes/Guidebook/meta.yml @@ -1,6 +1,6 @@ - type: guideEntry id: Controls name: guide-entry-controls - text: "/Server Info/Guidebook/Controls/Controls.xml" + text: "/ServerInfo/Guidebook/Controls/Controls.xml" children: - Radio diff --git a/Resources/Prototypes/Guidebook/radio.yml b/Resources/Prototypes/Guidebook/radio.yml index 67d94b9784..8ed39bf427 100644 --- a/Resources/Prototypes/Guidebook/radio.yml +++ b/Resources/Prototypes/Guidebook/radio.yml @@ -1,4 +1,4 @@ - type: guideEntry id: Radio name: guide-entry-radio - text: "/Server Info/Guidebook/Controls/Radio.xml" + text: "/ServerInfo/Guidebook/Controls/Radio.xml" diff --git a/Resources/Prototypes/Guidebook/science.yml b/Resources/Prototypes/Guidebook/science.yml index 506cb337ab..c9ad623e9c 100644 --- a/Resources/Prototypes/Guidebook/science.yml +++ b/Resources/Prototypes/Guidebook/science.yml @@ -1,7 +1,7 @@ - type: guideEntry id: Science name: guide-entry-science - text: "/Server Info/Guidebook/Science/Science.xml" + text: "/ServerInfo/Guidebook/Science/Science.xml" children: - AnomalousResearch - Xenoarchaeology @@ -10,7 +10,7 @@ - type: guideEntry id: AnomalousResearch name: guide-entry-anomalous-research - text: "/Server Info/Guidebook/Science/AnomalousResearch.xml" + text: "/ServerInfo/Guidebook/Science/AnomalousResearch.xml" children: - APE - ScannersAndVessels @@ -18,17 +18,17 @@ - type: guideEntry id: ScannersAndVessels name: guide-entry-scanners-and-vessels - text: "/Server Info/Guidebook/Science/ScannersAndVessels.xml" + text: "/ServerInfo/Guidebook/Science/ScannersAndVessels.xml" - type: guideEntry id: APE name: guide-entry-ape - text: "/Server Info/Guidebook/Science/APE.xml" + text: "/ServerInfo/Guidebook/Science/APE.xml" - type: guideEntry id: Xenoarchaeology name: guide-entry-xenoarchaeology - text: "/Server Info/Guidebook/Science/Xenoarchaeology.xml" + text: "/ServerInfo/Guidebook/Science/Xenoarchaeology.xml" children: - ArtifactReports - TraversalDistorter @@ -36,14 +36,14 @@ - type: guideEntry id: ArtifactReports name: guide-entry-artifact-reports - text: "/Server Info/Guidebook/Science/ArtifactReports.xml" + text: "/ServerInfo/Guidebook/Science/ArtifactReports.xml" - type: guideEntry id: TraversalDistorter name: guide-entry-traversal-distorter - text: "/Server Info/Guidebook/Science/TraversalDistorter.xml" + text: "/ServerInfo/Guidebook/Science/TraversalDistorter.xml" - type: guideEntry id: MachineUpgrading name: guide-entry-machine-upgrading - text: "/Server Info/Guidebook/Science/MachineUpgrading.xml" \ No newline at end of file + text: "/ServerInfo/Guidebook/Science/MachineUpgrading.xml" \ No newline at end of file diff --git a/Resources/Prototypes/Guidebook/security.yml b/Resources/Prototypes/Guidebook/security.yml index 903cf93690..c5e568ba8c 100644 --- a/Resources/Prototypes/Guidebook/security.yml +++ b/Resources/Prototypes/Guidebook/security.yml @@ -1,11 +1,11 @@ - type: guideEntry id: Security name: guide-entry-security - text: "/Server Info/Guidebook/Security/Security.xml" + text: "/ServerInfo/Guidebook/Security/Security.xml" children: - DNA - type: guideEntry id: DNA name: guide-entry-dna - text: "/Server Info/Guidebook/Security/DNA.xml" + text: "/ServerInfo/Guidebook/Security/DNA.xml" diff --git a/Resources/Prototypes/Guidebook/shiftandcrew.yml b/Resources/Prototypes/Guidebook/shiftandcrew.yml index bfd98014ef..9922f14cb4 100644 --- a/Resources/Prototypes/Guidebook/shiftandcrew.yml +++ b/Resources/Prototypes/Guidebook/shiftandcrew.yml @@ -1,7 +1,7 @@ - type: guideEntry id: Jobs name: guide-entry-jobs - text: "/Server Info/Guidebook/Jobs.xml" + text: "/ServerInfo/Guidebook/Jobs.xml" children: - Botany - Engineering @@ -11,4 +11,4 @@ - type: guideEntry id: Survival name: guide-entry-survival - text: "/Server Info/Guidebook/Survival.xml" + text: "/ServerInfo/Guidebook/Survival.xml" diff --git a/Resources/Prototypes/Guidebook/ss14.yml b/Resources/Prototypes/Guidebook/ss14.yml index 4e7976f03c..bb98b11fcf 100644 --- a/Resources/Prototypes/Guidebook/ss14.yml +++ b/Resources/Prototypes/Guidebook/ss14.yml @@ -1,7 +1,7 @@ - type: guideEntry id: SS14 name: guide-entry-ss14 - text: "/Server Info/Guidebook/Space Station 14.xml" + text: "/ServerInfo/Guidebook/Space Station 14.xml" children: - Controls - Jobs diff --git a/Resources/Server Info/Gameplay.txt b/Resources/ServerInfo/Gameplay.txt similarity index 100% rename from Resources/Server Info/Gameplay.txt rename to Resources/ServerInfo/Gameplay.txt diff --git a/Resources/Server Info/Guidebook/AME.xml b/Resources/ServerInfo/Guidebook/AME.xml similarity index 100% rename from Resources/Server Info/Guidebook/AME.xml rename to Resources/ServerInfo/Guidebook/AME.xml diff --git a/Resources/Server Info/Guidebook/Atmospherics.xml b/Resources/ServerInfo/Guidebook/Atmospherics.xml similarity index 100% rename from Resources/Server Info/Guidebook/Atmospherics.xml rename to Resources/ServerInfo/Guidebook/Atmospherics.xml diff --git a/Resources/Server Info/Guidebook/Botany.xml b/Resources/ServerInfo/Guidebook/Botany.xml similarity index 100% rename from Resources/Server Info/Guidebook/Botany.xml rename to Resources/ServerInfo/Guidebook/Botany.xml diff --git a/Resources/Server Info/Guidebook/Construction.xml b/Resources/ServerInfo/Guidebook/Construction.xml similarity index 100% rename from Resources/Server Info/Guidebook/Construction.xml rename to Resources/ServerInfo/Guidebook/Construction.xml diff --git a/Resources/Server Info/Guidebook/Controls/Controls.xml b/Resources/ServerInfo/Guidebook/Controls/Controls.xml similarity index 100% rename from Resources/Server Info/Guidebook/Controls/Controls.xml rename to Resources/ServerInfo/Guidebook/Controls/Controls.xml diff --git a/Resources/Server Info/Guidebook/Controls/Radio.xml b/Resources/ServerInfo/Guidebook/Controls/Radio.xml similarity index 100% rename from Resources/Server Info/Guidebook/Controls/Radio.xml rename to Resources/ServerInfo/Guidebook/Controls/Radio.xml diff --git a/Resources/Server Info/Guidebook/Engineering.xml b/Resources/ServerInfo/Guidebook/Engineering.xml similarity index 100% rename from Resources/Server Info/Guidebook/Engineering.xml rename to Resources/ServerInfo/Guidebook/Engineering.xml diff --git a/Resources/Server Info/Guidebook/Fires.xml b/Resources/ServerInfo/Guidebook/Fires.xml similarity index 100% rename from Resources/Server Info/Guidebook/Fires.xml rename to Resources/ServerInfo/Guidebook/Fires.xml diff --git a/Resources/Server Info/Guidebook/Jobs.xml b/Resources/ServerInfo/Guidebook/Jobs.xml similarity index 100% rename from Resources/Server Info/Guidebook/Jobs.xml rename to Resources/ServerInfo/Guidebook/Jobs.xml diff --git a/Resources/Server Info/Guidebook/Power.xml b/Resources/ServerInfo/Guidebook/Power.xml similarity index 100% rename from Resources/Server Info/Guidebook/Power.xml rename to Resources/ServerInfo/Guidebook/Power.xml diff --git a/Resources/Server Info/Guidebook/Science/APE.xml b/Resources/ServerInfo/Guidebook/Science/APE.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/APE.xml rename to Resources/ServerInfo/Guidebook/Science/APE.xml diff --git a/Resources/Server Info/Guidebook/Science/AnomalousResearch.xml b/Resources/ServerInfo/Guidebook/Science/AnomalousResearch.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/AnomalousResearch.xml rename to Resources/ServerInfo/Guidebook/Science/AnomalousResearch.xml diff --git a/Resources/Server Info/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/ArtifactReports.xml rename to Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml diff --git a/Resources/Server Info/Guidebook/Science/MachineUpgrading.xml b/Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/MachineUpgrading.xml rename to Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml diff --git a/Resources/Server Info/Guidebook/Science/ScannersAndVessels.xml b/Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/ScannersAndVessels.xml rename to Resources/ServerInfo/Guidebook/Science/ScannersAndVessels.xml diff --git a/Resources/Server Info/Guidebook/Science/Science.xml b/Resources/ServerInfo/Guidebook/Science/Science.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/Science.xml rename to Resources/ServerInfo/Guidebook/Science/Science.xml diff --git a/Resources/Server Info/Guidebook/Science/TraversalDistorter.xml b/Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/TraversalDistorter.xml rename to Resources/ServerInfo/Guidebook/Science/TraversalDistorter.xml diff --git a/Resources/Server Info/Guidebook/Science/Xenoarchaeology.xml b/Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml similarity index 100% rename from Resources/Server Info/Guidebook/Science/Xenoarchaeology.xml rename to Resources/ServerInfo/Guidebook/Science/Xenoarchaeology.xml diff --git a/Resources/Server Info/Guidebook/Security/DNA.xml b/Resources/ServerInfo/Guidebook/Security/DNA.xml similarity index 100% rename from Resources/Server Info/Guidebook/Security/DNA.xml rename to Resources/ServerInfo/Guidebook/Security/DNA.xml diff --git a/Resources/Server Info/Guidebook/Security/Security.xml b/Resources/ServerInfo/Guidebook/Security/Security.xml similarity index 100% rename from Resources/Server Info/Guidebook/Security/Security.xml rename to Resources/ServerInfo/Guidebook/Security/Security.xml diff --git a/Resources/Server Info/Guidebook/Shuttlecraft.xml b/Resources/ServerInfo/Guidebook/Shuttlecraft.xml similarity index 100% rename from Resources/Server Info/Guidebook/Shuttlecraft.xml rename to Resources/ServerInfo/Guidebook/Shuttlecraft.xml diff --git a/Resources/Server Info/Guidebook/Singularity.xml b/Resources/ServerInfo/Guidebook/Singularity.xml similarity index 100% rename from Resources/Server Info/Guidebook/Singularity.xml rename to Resources/ServerInfo/Guidebook/Singularity.xml diff --git a/Resources/Server Info/Guidebook/Space Station 14.xml b/Resources/ServerInfo/Guidebook/Space Station 14.xml similarity index 100% rename from Resources/Server Info/Guidebook/Space Station 14.xml rename to Resources/ServerInfo/Guidebook/Space Station 14.xml diff --git a/Resources/Server Info/Guidebook/Survival.xml b/Resources/ServerInfo/Guidebook/Survival.xml similarity index 100% rename from Resources/Server Info/Guidebook/Survival.xml rename to Resources/ServerInfo/Guidebook/Survival.xml diff --git a/Resources/Server Info/Intro.txt b/Resources/ServerInfo/Intro.txt similarity index 100% rename from Resources/Server Info/Intro.txt rename to Resources/ServerInfo/Intro.txt diff --git a/Resources/Server Info/RP_Rules.txt b/Resources/ServerInfo/RP_Rules.txt similarity index 100% rename from Resources/Server Info/RP_Rules.txt rename to Resources/ServerInfo/RP_Rules.txt diff --git a/Resources/Server Info/Rules.txt b/Resources/ServerInfo/Rules.txt similarity index 100% rename from Resources/Server Info/Rules.txt rename to Resources/ServerInfo/Rules.txt diff --git a/Resources/Server Info/Sandbox.txt b/Resources/ServerInfo/Sandbox.txt similarity index 100% rename from Resources/Server Info/Sandbox.txt rename to Resources/ServerInfo/Sandbox.txt