From 795018e24313296602886e8912a9afdf0092acf9 Mon Sep 17 00:00:00 2001 From: CloneTrooper1019 Date: Fri, 1 Feb 2019 11:19:20 -0600 Subject: [PATCH] Switch root namespace to "RobloxFiles" In case there are any future libraries written for Roblox in C#, I want to avoid running into any namespace collisions. Its best to keep everything pertaining to this project nested in its own unique namespace. --- BinaryFormat/BinaryChunk.cs | 2 +- BinaryFormat/BinaryReader.cs | 2 +- BinaryFormat/BinaryRobloxFile.cs | 5 +-- BinaryFormat/ChunkTypes/INST.cs | 2 +- BinaryFormat/ChunkTypes/META.cs | 2 +- BinaryFormat/ChunkTypes/PRNT.cs | 2 +- BinaryFormat/ChunkTypes/PROP.cs | 8 ++--- Core/Enums.cs | 2 +- Core/Instance.cs | 2 +- Core/Property.cs | 2 +- Core/RobloxFile.cs | 7 ++-- DataTypes/Axes.cs | 4 +-- DataTypes/BrickColor.cs | 4 +-- DataTypes/CFrame.cs | 4 +-- DataTypes/Color3.cs | 2 +- DataTypes/ColorSequence.cs | 2 +- DataTypes/ColorSequenceKeypoint.cs | 2 +- DataTypes/Faces.cs | 4 +-- DataTypes/NumberRange.cs | 2 +- DataTypes/NumberSequence.cs | 2 +- DataTypes/NumberSequenceKeypoint.cs | 2 +- DataTypes/PhysicalProperties.cs | 6 ++-- DataTypes/Ray.cs | 2 +- DataTypes/Rect.cs | 2 +- DataTypes/Region3.cs | 2 +- DataTypes/Region3int16.cs | 2 +- DataTypes/UDim.cs | 2 +- DataTypes/UDim2.cs | 2 +- DataTypes/Utility/BrickColors.cs | 4 +-- DataTypes/Utility/MaterialInfo.cs | 4 +-- DataTypes/Utility/Quaternion.cs | 2 +- DataTypes/Vector2.cs | 2 +- DataTypes/Vector3.cs | 4 +-- DataTypes/Vector3int16.cs | 2 +- Properties/AssemblyInfo.cs | 4 +-- RobloxFileFormat.csproj | 33 +++++++++++++++++-- UnitTest.cs | 9 ++--- XmlFormat/PropertyTokens/Axes.cs | 4 +-- XmlFormat/PropertyTokens/BinaryString.cs | 2 +- XmlFormat/PropertyTokens/Boolean.cs | 2 +- XmlFormat/PropertyTokens/BrickColor.cs | 4 +-- XmlFormat/PropertyTokens/CFrame.cs | 4 +-- XmlFormat/PropertyTokens/Color3.cs | 4 +-- XmlFormat/PropertyTokens/Color3uint8.cs | 4 +-- XmlFormat/PropertyTokens/ColorSequence.cs | 4 +-- XmlFormat/PropertyTokens/Content.cs | 2 +- XmlFormat/PropertyTokens/Double.cs | 2 +- XmlFormat/PropertyTokens/Enum.cs | 2 +- XmlFormat/PropertyTokens/Faces.cs | 4 +-- XmlFormat/PropertyTokens/Float.cs | 2 +- XmlFormat/PropertyTokens/Int.cs | 2 +- XmlFormat/PropertyTokens/Int64.cs | 2 +- XmlFormat/PropertyTokens/NumberRange.cs | 4 +-- XmlFormat/PropertyTokens/NumberSequence.cs | 4 +-- .../PropertyTokens/PhysicalProperties.cs | 4 +-- XmlFormat/PropertyTokens/Ray.cs | 4 +-- XmlFormat/PropertyTokens/Rect.cs | 4 +-- XmlFormat/PropertyTokens/Ref.cs | 2 +- XmlFormat/PropertyTokens/String.cs | 2 +- XmlFormat/PropertyTokens/UDim.cs | 4 +-- XmlFormat/PropertyTokens/UDim2.cs | 4 +-- XmlFormat/PropertyTokens/Vector2.cs | 4 +-- XmlFormat/PropertyTokens/Vector3.cs | 4 +-- XmlFormat/XmlDataReader.cs | 5 +-- XmlFormat/XmlPropertyTokens.cs | 2 +- XmlFormat/XmlRobloxFile.cs | 2 +- 66 files changed, 134 insertions(+), 105 deletions(-) diff --git a/BinaryFormat/BinaryChunk.cs b/BinaryFormat/BinaryChunk.cs index 1627430..da682e2 100644 --- a/BinaryFormat/BinaryChunk.cs +++ b/BinaryFormat/BinaryChunk.cs @@ -3,7 +3,7 @@ using System.IO; using System.Text; using LZ4; -namespace Roblox.BinaryFormat +namespace RobloxFiles.BinaryFormat { public class RobloxBinaryChunk { diff --git a/BinaryFormat/BinaryReader.cs b/BinaryFormat/BinaryReader.cs index e2d43f5..d594935 100644 --- a/BinaryFormat/BinaryReader.cs +++ b/BinaryFormat/BinaryReader.cs @@ -3,7 +3,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Text; -namespace Roblox.BinaryFormat +namespace RobloxFiles.BinaryFormat { public class RobloxBinaryReader : BinaryReader { diff --git a/BinaryFormat/BinaryRobloxFile.cs b/BinaryFormat/BinaryRobloxFile.cs index 075cd24..fa31771 100644 --- a/BinaryFormat/BinaryRobloxFile.cs +++ b/BinaryFormat/BinaryRobloxFile.cs @@ -2,9 +2,10 @@ using System.Collections.Generic; using System.IO; using System.Text; -using Roblox.BinaryFormat.Chunks; -namespace Roblox.BinaryFormat +using RobloxFiles.BinaryFormat.Chunks; + +namespace RobloxFiles.BinaryFormat { public class BinaryRobloxFile : IRobloxFile { diff --git a/BinaryFormat/ChunkTypes/INST.cs b/BinaryFormat/ChunkTypes/INST.cs index 699b34b..f42d941 100644 --- a/BinaryFormat/ChunkTypes/INST.cs +++ b/BinaryFormat/ChunkTypes/INST.cs @@ -1,4 +1,4 @@ -namespace Roblox.BinaryFormat.Chunks +namespace RobloxFiles.BinaryFormat.Chunks { public class INST { diff --git a/BinaryFormat/ChunkTypes/META.cs b/BinaryFormat/ChunkTypes/META.cs index 890f64d..e07cc04 100644 --- a/BinaryFormat/ChunkTypes/META.cs +++ b/BinaryFormat/ChunkTypes/META.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Roblox.BinaryFormat.Chunks +namespace RobloxFiles.BinaryFormat.Chunks { public class META { diff --git a/BinaryFormat/ChunkTypes/PRNT.cs b/BinaryFormat/ChunkTypes/PRNT.cs index 9851e49..15ef4ec 100644 --- a/BinaryFormat/ChunkTypes/PRNT.cs +++ b/BinaryFormat/ChunkTypes/PRNT.cs @@ -1,4 +1,4 @@ -namespace Roblox.BinaryFormat.Chunks +namespace RobloxFiles.BinaryFormat.Chunks { public class PRNT { diff --git a/BinaryFormat/ChunkTypes/PROP.cs b/BinaryFormat/ChunkTypes/PROP.cs index 6fb77b2..1b5fb3d 100644 --- a/BinaryFormat/ChunkTypes/PROP.cs +++ b/BinaryFormat/ChunkTypes/PROP.cs @@ -1,11 +1,11 @@ using System; using System.Linq; -using Roblox.Enums; -using Roblox.DataTypes; -using Roblox.DataTypes.Utility; +using RobloxFiles.Enums; +using RobloxFiles.DataTypes; +using RobloxFiles.DataTypes.Utility; -namespace Roblox.BinaryFormat.Chunks +namespace RobloxFiles.BinaryFormat.Chunks { public class PROP { diff --git a/Core/Enums.cs b/Core/Enums.cs index 5ffe581..3d1edd7 100644 --- a/Core/Enums.cs +++ b/Core/Enums.cs @@ -1,7 +1,7 @@ // This is an auto-generated list of all available enums on Roblox! // Updated as of 0.369.1.273919 -namespace Roblox.Enums +namespace RobloxFiles.Enums { public enum ActionType { diff --git a/Core/Instance.cs b/Core/Instance.cs index aa8d505..f03cdc2 100644 --- a/Core/Instance.cs +++ b/Core/Instance.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Roblox +namespace RobloxFiles { /// /// Describes an object in Roblox's DataModel hierarchy. diff --git a/Core/Property.cs b/Core/Property.cs index bc47a57..2046d18 100644 --- a/Core/Property.cs +++ b/Core/Property.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox +namespace RobloxFiles { public enum PropertyType { diff --git a/Core/RobloxFile.cs b/Core/RobloxFile.cs index 4ae7062..0b866bc 100644 --- a/Core/RobloxFile.cs +++ b/Core/RobloxFile.cs @@ -1,12 +1,11 @@ using System; -using System.Collections.Generic; using System.IO; using System.Text; -using Roblox.BinaryFormat; -using Roblox.XmlFormat; +using RobloxFiles.BinaryFormat; +using RobloxFiles.XmlFormat; -namespace Roblox +namespace RobloxFiles { /// /// Interface which represents a RobloxFile implementation. diff --git a/DataTypes/Axes.cs b/DataTypes/Axes.cs index 94ae401..a486e7f 100644 --- a/DataTypes/Axes.cs +++ b/DataTypes/Axes.cs @@ -1,7 +1,7 @@ using System; -using Roblox.Enums; +using RobloxFiles.Enums; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { [Flags] public enum Axes diff --git a/DataTypes/BrickColor.cs b/DataTypes/BrickColor.cs index 42caf19..ad668eb 100644 --- a/DataTypes/BrickColor.cs +++ b/DataTypes/BrickColor.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Linq; -using Roblox.DataTypes.Utility; +using RobloxFiles.DataTypes.Utility; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public class BrickColor { diff --git a/DataTypes/CFrame.cs b/DataTypes/CFrame.cs index ec1b2ba..1c6559b 100644 --- a/DataTypes/CFrame.cs +++ b/DataTypes/CFrame.cs @@ -1,7 +1,7 @@ using System; -using Roblox.DataTypes.Utility; +using RobloxFiles.DataTypes.Utility; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public class CFrame { diff --git a/DataTypes/Color3.cs b/DataTypes/Color3.cs index d157f98..9af1da7 100644 --- a/DataTypes/Color3.cs +++ b/DataTypes/Color3.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Color3 { diff --git a/DataTypes/ColorSequence.cs b/DataTypes/ColorSequence.cs index 0271be4..74eadf3 100644 --- a/DataTypes/ColorSequence.cs +++ b/DataTypes/ColorSequence.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct ColorSequence { diff --git a/DataTypes/ColorSequenceKeypoint.cs b/DataTypes/ColorSequenceKeypoint.cs index 65a668f..30e03fa 100644 --- a/DataTypes/ColorSequenceKeypoint.cs +++ b/DataTypes/ColorSequenceKeypoint.cs @@ -1,4 +1,4 @@ -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct ColorSequenceKeypoint { diff --git a/DataTypes/Faces.cs b/DataTypes/Faces.cs index 56e1b20..01ea9c7 100644 --- a/DataTypes/Faces.cs +++ b/DataTypes/Faces.cs @@ -1,7 +1,7 @@ using System; -using Roblox.Enums; +using RobloxFiles.Enums; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { [Flags] public enum Faces diff --git a/DataTypes/NumberRange.cs b/DataTypes/NumberRange.cs index 49c7a39..468ea1f 100644 --- a/DataTypes/NumberRange.cs +++ b/DataTypes/NumberRange.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct NumberRange { diff --git a/DataTypes/NumberSequence.cs b/DataTypes/NumberSequence.cs index e8ccf51..edbb6ed 100644 --- a/DataTypes/NumberSequence.cs +++ b/DataTypes/NumberSequence.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct NumberSequence { diff --git a/DataTypes/NumberSequenceKeypoint.cs b/DataTypes/NumberSequenceKeypoint.cs index f16ffa1..78ed77f 100644 --- a/DataTypes/NumberSequenceKeypoint.cs +++ b/DataTypes/NumberSequenceKeypoint.cs @@ -1,4 +1,4 @@ -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct NumberSequenceKeypoint { diff --git a/DataTypes/PhysicalProperties.cs b/DataTypes/PhysicalProperties.cs index d8d8aed..7964332 100644 --- a/DataTypes/PhysicalProperties.cs +++ b/DataTypes/PhysicalProperties.cs @@ -1,7 +1,7 @@ -using Roblox.Enums; -using Roblox.DataTypes.Utility; +using RobloxFiles.Enums; +using RobloxFiles.DataTypes.Utility; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct PhysicalProperties { diff --git a/DataTypes/Ray.cs b/DataTypes/Ray.cs index 2979681..0cbf237 100644 --- a/DataTypes/Ray.cs +++ b/DataTypes/Ray.cs @@ -1,4 +1,4 @@ -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Ray { diff --git a/DataTypes/Rect.cs b/DataTypes/Rect.cs index 382bf22..426a4c2 100644 --- a/DataTypes/Rect.cs +++ b/DataTypes/Rect.cs @@ -1,4 +1,4 @@ -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Rect { diff --git a/DataTypes/Region3.cs b/DataTypes/Region3.cs index 32e2bbd..30e2779 100644 --- a/DataTypes/Region3.cs +++ b/DataTypes/Region3.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Region3 { diff --git a/DataTypes/Region3int16.cs b/DataTypes/Region3int16.cs index e3eb36f..7ab407a 100644 --- a/DataTypes/Region3int16.cs +++ b/DataTypes/Region3int16.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Region3int16 { diff --git a/DataTypes/UDim.cs b/DataTypes/UDim.cs index 8f64237..290a3c8 100644 --- a/DataTypes/UDim.cs +++ b/DataTypes/UDim.cs @@ -1,4 +1,4 @@ -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct UDim { diff --git a/DataTypes/UDim2.cs b/DataTypes/UDim2.cs index 2ed5f09..16ccb5b 100644 --- a/DataTypes/UDim2.cs +++ b/DataTypes/UDim2.cs @@ -1,4 +1,4 @@ -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct UDim2 { diff --git a/DataTypes/Utility/BrickColors.cs b/DataTypes/Utility/BrickColors.cs index 5e033c3..9e60f3d 100644 --- a/DataTypes/Utility/BrickColors.cs +++ b/DataTypes/Utility/BrickColors.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.DataTypes.Utility +namespace RobloxFiles.DataTypes.Utility { public static class BrickColors { diff --git a/DataTypes/Utility/MaterialInfo.cs b/DataTypes/Utility/MaterialInfo.cs index 97d1512..5641fb3 100644 --- a/DataTypes/Utility/MaterialInfo.cs +++ b/DataTypes/Utility/MaterialInfo.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; -using Roblox.Enums; +using RobloxFiles.Enums; -namespace Roblox.DataTypes.Utility +namespace RobloxFiles.DataTypes.Utility { public static class MaterialInfo { diff --git a/DataTypes/Utility/Quaternion.cs b/DataTypes/Utility/Quaternion.cs index a70e6e5..0591661 100644 --- a/DataTypes/Utility/Quaternion.cs +++ b/DataTypes/Utility/Quaternion.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes.Utility +namespace RobloxFiles.DataTypes.Utility { public class Quaternion { diff --git a/DataTypes/Vector2.cs b/DataTypes/Vector2.cs index 3542e26..ab9c928 100644 --- a/DataTypes/Vector2.cs +++ b/DataTypes/Vector2.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Vector2 { diff --git a/DataTypes/Vector3.cs b/DataTypes/Vector3.cs index fc83724..a7250b4 100644 --- a/DataTypes/Vector3.cs +++ b/DataTypes/Vector3.cs @@ -1,7 +1,7 @@ using System; -using Roblox.Enums; +using RobloxFiles.Enums; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Vector3 { diff --git a/DataTypes/Vector3int16.cs b/DataTypes/Vector3int16.cs index 265bfbb..011755c 100644 --- a/DataTypes/Vector3int16.cs +++ b/DataTypes/Vector3int16.cs @@ -1,6 +1,6 @@ using System; -namespace Roblox.DataTypes +namespace RobloxFiles.DataTypes { public struct Vector3int16 { diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 72eb01e..225e9c8 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("RobloxFileFormat")] +[assembly: AssemblyTitle("RobloxFiles")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("RobloxFileFormat")] +[assembly: AssemblyProduct("RobloxFiles")] [assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/RobloxFileFormat.csproj b/RobloxFileFormat.csproj index d9379b6..1c9054e 100644 --- a/RobloxFileFormat.csproj +++ b/RobloxFileFormat.csproj @@ -5,12 +5,27 @@ Debug AnyCPU {CF50C0E2-23A7-4DC1-B4B2-E60CDE716253} - WinExe + Library Properties - Roblox + RobloxFiles RobloxFileFormat v4.5.2 512 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -102,7 +117,7 @@ - + @@ -116,5 +131,17 @@ + + + False + Microsoft .NET Framework 4.5.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + \ No newline at end of file diff --git a/UnitTest.cs b/UnitTest.cs index 157468b..963be86 100644 --- a/UnitTest.cs +++ b/UnitTest.cs @@ -1,9 +1,9 @@ -using System.Diagnostics; +#if DEBUG +using System.Diagnostics; -namespace Roblox +namespace RobloxFiles { // This is a placeholder. - internal class UnitTest { public static void Main(string[] args) @@ -15,4 +15,5 @@ namespace Roblox } } } -} \ No newline at end of file +} +#endif \ No newline at end of file diff --git a/XmlFormat/PropertyTokens/Axes.cs b/XmlFormat/PropertyTokens/Axes.cs index 3249c8e..521f14b 100644 --- a/XmlFormat/PropertyTokens/Axes.cs +++ b/XmlFormat/PropertyTokens/Axes.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class AxesToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/BinaryString.cs b/XmlFormat/PropertyTokens/BinaryString.cs index e0d5cd4..380c668 100644 --- a/XmlFormat/PropertyTokens/BinaryString.cs +++ b/XmlFormat/PropertyTokens/BinaryString.cs @@ -1,7 +1,7 @@ using System; using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class BinaryStringToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Boolean.cs b/XmlFormat/PropertyTokens/Boolean.cs index d12ca1d..5bc9067 100644 --- a/XmlFormat/PropertyTokens/Boolean.cs +++ b/XmlFormat/PropertyTokens/Boolean.cs @@ -1,6 +1,6 @@ using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class BoolToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/BrickColor.cs b/XmlFormat/PropertyTokens/BrickColor.cs index b1a57d8..8af2c4b 100644 --- a/XmlFormat/PropertyTokens/BrickColor.cs +++ b/XmlFormat/PropertyTokens/BrickColor.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class BrickColorToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/CFrame.cs b/XmlFormat/PropertyTokens/CFrame.cs index 803cb0d..9dbd500 100644 --- a/XmlFormat/PropertyTokens/CFrame.cs +++ b/XmlFormat/PropertyTokens/CFrame.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class CFrameToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Color3.cs b/XmlFormat/PropertyTokens/Color3.cs index 4bebb30..8ba18a6 100644 --- a/XmlFormat/PropertyTokens/Color3.cs +++ b/XmlFormat/PropertyTokens/Color3.cs @@ -1,8 +1,8 @@ using System; using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class Color3Token : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Color3uint8.cs b/XmlFormat/PropertyTokens/Color3uint8.cs index dff9a0f..e8287f0 100644 --- a/XmlFormat/PropertyTokens/Color3uint8.cs +++ b/XmlFormat/PropertyTokens/Color3uint8.cs @@ -1,8 +1,8 @@ using System; using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class Color3uint8Token : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/ColorSequence.cs b/XmlFormat/PropertyTokens/ColorSequence.cs index 2f4b22b..a1e96e5 100644 --- a/XmlFormat/PropertyTokens/ColorSequence.cs +++ b/XmlFormat/PropertyTokens/ColorSequence.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class ColorSequenceToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Content.cs b/XmlFormat/PropertyTokens/Content.cs index 9ed3e87..6ccecbd 100644 --- a/XmlFormat/PropertyTokens/Content.cs +++ b/XmlFormat/PropertyTokens/Content.cs @@ -1,7 +1,7 @@ using System; using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class ContentToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Double.cs b/XmlFormat/PropertyTokens/Double.cs index 8eaddfa..572dfe9 100644 --- a/XmlFormat/PropertyTokens/Double.cs +++ b/XmlFormat/PropertyTokens/Double.cs @@ -1,6 +1,6 @@ using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class DoubleToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Enum.cs b/XmlFormat/PropertyTokens/Enum.cs index 27ef518..dbe4224 100644 --- a/XmlFormat/PropertyTokens/Enum.cs +++ b/XmlFormat/PropertyTokens/Enum.cs @@ -1,6 +1,6 @@ using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class EnumToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Faces.cs b/XmlFormat/PropertyTokens/Faces.cs index ee756c1..426c054 100644 --- a/XmlFormat/PropertyTokens/Faces.cs +++ b/XmlFormat/PropertyTokens/Faces.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class FacesToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Float.cs b/XmlFormat/PropertyTokens/Float.cs index 68941c2..045cbf7 100644 --- a/XmlFormat/PropertyTokens/Float.cs +++ b/XmlFormat/PropertyTokens/Float.cs @@ -1,6 +1,6 @@ using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class FloatToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Int.cs b/XmlFormat/PropertyTokens/Int.cs index 8b91b2c..fdb86d2 100644 --- a/XmlFormat/PropertyTokens/Int.cs +++ b/XmlFormat/PropertyTokens/Int.cs @@ -1,6 +1,6 @@ using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class IntToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Int64.cs b/XmlFormat/PropertyTokens/Int64.cs index 1949500..28672fa 100644 --- a/XmlFormat/PropertyTokens/Int64.cs +++ b/XmlFormat/PropertyTokens/Int64.cs @@ -1,6 +1,6 @@ using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class Int64Token : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/NumberRange.cs b/XmlFormat/PropertyTokens/NumberRange.cs index f48bbd6..ff524b1 100644 --- a/XmlFormat/PropertyTokens/NumberRange.cs +++ b/XmlFormat/PropertyTokens/NumberRange.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class NumberRangeToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/NumberSequence.cs b/XmlFormat/PropertyTokens/NumberSequence.cs index 68f6399..aa50d69 100644 --- a/XmlFormat/PropertyTokens/NumberSequence.cs +++ b/XmlFormat/PropertyTokens/NumberSequence.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class NumberSequenceToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/PhysicalProperties.cs b/XmlFormat/PropertyTokens/PhysicalProperties.cs index 5afd9de..d992886 100644 --- a/XmlFormat/PropertyTokens/PhysicalProperties.cs +++ b/XmlFormat/PropertyTokens/PhysicalProperties.cs @@ -1,8 +1,8 @@ using System; using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class PhysicalPropertiesToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Ray.cs b/XmlFormat/PropertyTokens/Ray.cs index f38b990..e9cce47 100644 --- a/XmlFormat/PropertyTokens/Ray.cs +++ b/XmlFormat/PropertyTokens/Ray.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class RayToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Rect.cs b/XmlFormat/PropertyTokens/Rect.cs index 6ce5b33..8c97a9e 100644 --- a/XmlFormat/PropertyTokens/Rect.cs +++ b/XmlFormat/PropertyTokens/Rect.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class RectToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Ref.cs b/XmlFormat/PropertyTokens/Ref.cs index e1a843f..09229f8 100644 --- a/XmlFormat/PropertyTokens/Ref.cs +++ b/XmlFormat/PropertyTokens/Ref.cs @@ -1,6 +1,6 @@ using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class RefToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/String.cs b/XmlFormat/PropertyTokens/String.cs index ae553c4..c2ee170 100644 --- a/XmlFormat/PropertyTokens/String.cs +++ b/XmlFormat/PropertyTokens/String.cs @@ -1,7 +1,7 @@ using System.Text; using System.Xml; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class StringToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/UDim.cs b/XmlFormat/PropertyTokens/UDim.cs index 80e2646..dde22b8 100644 --- a/XmlFormat/PropertyTokens/UDim.cs +++ b/XmlFormat/PropertyTokens/UDim.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class UDimToken : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/UDim2.cs b/XmlFormat/PropertyTokens/UDim2.cs index 5f9bf5d..35aa1cd 100644 --- a/XmlFormat/PropertyTokens/UDim2.cs +++ b/XmlFormat/PropertyTokens/UDim2.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class UDim2Token : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Vector2.cs b/XmlFormat/PropertyTokens/Vector2.cs index a2995a9..2fb0e18 100644 --- a/XmlFormat/PropertyTokens/Vector2.cs +++ b/XmlFormat/PropertyTokens/Vector2.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class Vector2Token : IXmlPropertyToken { diff --git a/XmlFormat/PropertyTokens/Vector3.cs b/XmlFormat/PropertyTokens/Vector3.cs index 76bd704..5081998 100644 --- a/XmlFormat/PropertyTokens/Vector3.cs +++ b/XmlFormat/PropertyTokens/Vector3.cs @@ -1,7 +1,7 @@ using System.Xml; -using Roblox.DataTypes; +using RobloxFiles.DataTypes; -namespace Roblox.XmlFormat.PropertyTokens +namespace RobloxFiles.XmlFormat.PropertyTokens { public class Vector3Token : IXmlPropertyToken { diff --git a/XmlFormat/XmlDataReader.cs b/XmlFormat/XmlDataReader.cs index 96fd93e..fc1396c 100644 --- a/XmlFormat/XmlDataReader.cs +++ b/XmlFormat/XmlDataReader.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Xml; -namespace Roblox.XmlFormat +namespace RobloxFiles.XmlFormat { static class XmlDataReader { @@ -51,12 +51,13 @@ namespace Roblox.XmlFormat Instance inst = new Instance(classToken.InnerText); - // The 'reference' attribute is optional, but should be defined if a Ref property needs to link to this Instance. + // The 'referent' attribute is optional, but should be defined if a Ref property needs to link to this Instance. XmlNode refToken = instNode.Attributes.GetNamedItem("referent"); if (refToken != null && instances != null) { string refId = refToken.InnerText; + if (instances.ContainsKey(refId)) throw new Exception("XmlDataReader.ReadItem: Got an Item with a duplicate 'referent' attribute!"); diff --git a/XmlFormat/XmlPropertyTokens.cs b/XmlFormat/XmlPropertyTokens.cs index 139a6e4..92bd54f 100644 --- a/XmlFormat/XmlPropertyTokens.cs +++ b/XmlFormat/XmlPropertyTokens.cs @@ -4,7 +4,7 @@ using System.ComponentModel; using System.Linq; using System.Xml; -namespace Roblox.XmlFormat +namespace RobloxFiles.XmlFormat { public interface IXmlPropertyToken { diff --git a/XmlFormat/XmlRobloxFile.cs b/XmlFormat/XmlRobloxFile.cs index b9a14ac..2f41d3b 100644 --- a/XmlFormat/XmlRobloxFile.cs +++ b/XmlFormat/XmlRobloxFile.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Text; using System.Xml; -namespace Roblox.XmlFormat +namespace RobloxFiles.XmlFormat { public class XmlRobloxFile : IRobloxFile {