Skip to content

Commit 0cd7af3

Browse files
committed
Cgsrl > CGSrl
1 parent 59231ab commit 0cd7af3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+78
-78
lines changed

Cgsrl/Cgsrl.csproj CGSrl.Client/CGSrl.Client.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<ProjectReference Include="..\Cgsrl.Shared\Cgsrl.Shared.csproj" />
12+
<ProjectReference Include="..\CGSrl.Shared\CGSrl.Shared.csproj" />
1313
<ProjectReference Include="..\PER\PER.Audio\PER.Audio.csproj" />
1414
<ProjectReference Include="..\PER\PER\PER.csproj" />
1515
<ProjectReference Include="..\PER\PRR.UI\PRR.UI.csproj" />
File renamed without changes.

Cgsrl/src/Core.cs CGSrl.Client/src/Core.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using PRR.Sfml;
1010
using PRR.UI;
1111

12-
namespace Cgsrl;
12+
namespace CGSrl.Client;
1313

1414
public static class Core {
1515
public static readonly string version = Helper.GetVersion();

Cgsrl/src/Game.cs CGSrl.Client/src/Game.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22

3-
using Cgsrl.Resources;
4-
using Cgsrl.Screens;
3+
using CGSrl.Client.Resources;
4+
using CGSrl.Client.Screens;
55

66
using PER.Abstractions;
77
using PER.Abstractions.Rendering;
@@ -14,7 +14,7 @@
1414
using PRR.Resources;
1515
using PRR.UI.Resources;
1616

17-
namespace Cgsrl;
17+
namespace CGSrl.Client;
1818

1919
public class Game : IGame, ISetupable, IUpdatable {
2020
private const string SettingsPath = "config.json";

Cgsrl/src/Networking/ChatMessage.cs CGSrl.Client/src/Networking/ChatMessage.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22

3-
using Cgsrl.Shared.Environment;
3+
using CGSrl.Shared.Environment;
44

55
using PRR.UI;
66

7-
namespace Cgsrl.Networking;
7+
namespace CGSrl.Client.Networking;
88

99
public class ChatMessage {
1010
public ChatMessage(PlayerObject? player, double time, string text) {

Cgsrl/src/Networking/GameClient.cs CGSrl.Client/src/Networking/GameClient.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22

3-
using Cgsrl.Shared.Environment;
4-
using Cgsrl.Shared.Networking;
3+
using CGSrl.Shared.Environment;
4+
using CGSrl.Shared.Networking;
55

66
using Lidgren.Network;
77

@@ -11,7 +11,7 @@
1111

1212
using PRR.UI;
1313

14-
namespace Cgsrl.Networking;
14+
namespace CGSrl.Client.Networking;
1515

1616
public class GameClient {
1717
private static readonly Logger logger = LogManager.GetCurrentClassLogger();

Cgsrl/src/Resources/AudioResources.cs CGSrl.Client/src/Resources/AudioResources.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
using PRR.UI;
88

9-
namespace Cgsrl.Resources;
9+
namespace CGSrl.Client.Resources;
1010

1111
public class AudioResources : AudioResourcesLoader {
1212
public const string GlobalId = "audio";

Cgsrl/src/Screens/ConnectionErrorDialogBoxScreen.cs CGSrl.Client/src/Screens/ConnectionErrorDialogBoxScreen.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
using PRR.UI;
1010
using PRR.UI.Screens;
1111

12-
namespace Cgsrl.Screens;
12+
namespace CGSrl.Client.Screens;
1313

1414
public class ConnectionErrorDialogBoxScreen : DialogBoxScreenResource {
1515
public const string GlobalId = "layouts/connectionErrorDialog";

Cgsrl/src/Screens/GameScreen.cs CGSrl.Client/src/Screens/GameScreen.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using System;
22
using System.Collections.Generic;
33

4-
using Cgsrl.Networking;
5-
using Cgsrl.Screens.Templates;
6-
using Cgsrl.Shared.Environment;
7-
using Cgsrl.Shared.Networking;
4+
using CGSrl.Client.Networking;
5+
using CGSrl.Client.Screens.Templates;
6+
using CGSrl.Shared.Environment;
7+
using CGSrl.Shared.Networking;
88

99
using Lidgren.Network;
1010

@@ -22,7 +22,7 @@
2222
using PRR.UI;
2323
using PRR.UI.Resources;
2424

25-
namespace Cgsrl.Screens;
25+
namespace CGSrl.Client.Screens;
2626

2727
public class GameScreen : LayoutResource, IScreen, IUpdatable {
2828
public const string GlobalId = "layouts/game";

Cgsrl/src/Screens/MainMenuScreen.cs CGSrl.Client/src/Screens/MainMenuScreen.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using PRR.UI;
1111
using PRR.UI.Resources;
1212

13-
namespace Cgsrl.Screens;
13+
namespace CGSrl.Client.Screens;
1414

1515
public class MainMenuScreen : LayoutResource, IScreen, IUpdatable {
1616
public const string GlobalId = "layouts/mainMenu";
@@ -85,7 +85,7 @@ public override void Load(string id) {
8585
};
8686

8787
GetElement<Button>("github").onClick += (_, _) => {
88-
Helper.OpenUrl("https://github.com/cgytrus/Cgsrl");
88+
Helper.OpenUrl("https://github.com/cgytrus/CGSrl");
8989
};
9090

9191
GetElement<Button>("discord").onClick += (_, _) => {

Cgsrl/src/Screens/SettingsScreen.cs CGSrl.Client/src/Screens/SettingsScreen.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using System.Globalization;
44
using System.Linq;
55

6-
using Cgsrl.Screens.Templates;
6+
using CGSrl.Client.Screens.Templates;
77

88
using PER.Abstractions;
99
using PER.Abstractions.Audio;
@@ -15,7 +15,7 @@
1515
using PRR.UI;
1616
using PRR.UI.Resources;
1717

18-
namespace Cgsrl.Screens;
18+
namespace CGSrl.Client.Screens;
1919

2020
public class SettingsScreen : LayoutResource, IScreen, IUpdatable {
2121
public const string GlobalId = "layouts/settings";

Cgsrl/src/Screens/Templates/ChatMessageListTemplate.cs CGSrl.Client/src/Screens/Templates/ChatMessageListTemplate.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Collections.Immutable;
22

3-
using Cgsrl.Networking;
3+
using CGSrl.Client.Networking;
44

55
using PER.Abstractions.Audio;
66
using PER.Abstractions.Input;
@@ -12,7 +12,7 @@
1212
using PRR.UI;
1313
using PRR.UI.Resources;
1414

15-
namespace Cgsrl.Screens.Templates;
15+
namespace CGSrl.Client.Screens.Templates;
1616

1717
public class ChatMessageListTemplate : ListBoxTemplateResource<ChatMessage> {
1818
public const string GlobalId = "layouts/templates/chatItem";

Cgsrl/src/Screens/Templates/PlayerListTemplate.cs CGSrl.Client/src/Screens/Templates/PlayerListTemplate.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Globalization;
33

4-
using Cgsrl.Shared.Environment;
4+
using CGSrl.Shared.Environment;
55

66
using PER.Abstractions.Audio;
77
using PER.Abstractions.Input;
@@ -10,7 +10,7 @@
1010
using PRR.UI;
1111
using PRR.UI.Resources;
1212

13-
namespace Cgsrl.Screens.Templates;
13+
namespace CGSrl.Client.Screens.Templates;
1414

1515
public class PlayerListTemplate : ListBoxTemplateResource<PlayerObject> {
1616
public const string GlobalId = "layouts/templates/playerItem";

Cgsrl/src/Screens/Templates/ResourcePackSelectorTemplate.cs CGSrl.Client/src/Screens/Templates/ResourcePackSelectorTemplate.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
using PRR.UI;
1111
using PRR.UI.Resources;
1212

13-
namespace Cgsrl.Screens.Templates;
13+
namespace CGSrl.Client.Screens.Templates;
1414

1515
public class ResourcePackSelectorTemplate : ListBoxTemplateResource<ResourcePackData> {
1616
public const string GlobalId = "layouts/templates/resourcePackItem";

Cgsrl/src/Settings.cs CGSrl.Client/src/Settings.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using PER.Abstractions.Audio;
55

6-
namespace Cgsrl;
6+
namespace CGSrl.Client;
77

88
public class Settings {
99
public string address { get; set; } = "";

Cgsrl.Server/Cgsrl.Server.csproj CGSrl.Server/CGSrl.Server.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\Cgsrl.Shared\Cgsrl.Shared.csproj" />
11+
<ProjectReference Include="..\CGSrl.Shared\CGSrl.Shared.csproj" />
1212
<ProjectReference Include="..\PER\PER.Common\PER.Common.csproj" />
1313
<ProjectReference Include="..\PER\PER\PER.csproj" />
1414
</ItemGroup>
File renamed without changes.

Cgsrl.Server/src/Arguments/CoordinateArgument.cs CGSrl.Server/src/Arguments/CoordinateArgument.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using StringReader = NBrigadier.StringReader;
55

6-
namespace Cgsrl.Server.Arguments;
6+
namespace CGSrl.Server.Arguments;
77

88
public class CoordinateArgument {
99
private static readonly SimpleCommandExceptionType missingCoordinate =

Cgsrl.Server/src/Arguments/DefaultPosArgument.cs CGSrl.Server/src/Arguments/DefaultPosArgument.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using Cgsrl.Shared.Environment;
1+
using CGSrl.Shared.Environment;
22

33
using PER.Util;
44

5-
namespace Cgsrl.Server.Arguments;
5+
namespace CGSrl.Server.Arguments;
66

77
public class DefaultPosArgument : IPosArgument {
88
public bool xRelative => _x.relative;

Cgsrl.Server/src/Arguments/IPosArgument.cs CGSrl.Server/src/Arguments/IPosArgument.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using Cgsrl.Shared.Environment;
1+
using CGSrl.Shared.Environment;
22

33
using PER.Util;
44

5-
namespace Cgsrl.Server.Arguments;
5+
namespace CGSrl.Server.Arguments;
66

77
public interface IPosArgument {
88
public bool xRelative { get; }

Cgsrl.Server/src/Arguments/Vector2IntArgumentType.cs CGSrl.Server/src/Arguments/Vector2IntArgumentType.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Collections.ObjectModel;
22
using System.Net.Mime;
33

4-
using Cgsrl.Shared.Environment;
4+
using CGSrl.Shared.Environment;
55

66
using NBrigadier;
77
using NBrigadier.Arguments;
@@ -13,7 +13,7 @@
1313

1414
using StringReader = NBrigadier.StringReader;
1515

16-
namespace Cgsrl.Server.Arguments;
16+
namespace CGSrl.Server.Arguments;
1717

1818
public class Vector2IntArgumentType : IArgumentType<IPosArgument> {
1919
private static readonly SimpleCommandExceptionType incompleteException =

Cgsrl.Server/src/Core.cs CGSrl.Server/src/Core.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using PER.Common.Resources;
33
using PER.Util;
44

5-
namespace Cgsrl.Server;
5+
namespace CGSrl.Server;
66

77
public static class Core {
88
public static readonly string version = Helper.GetVersion();

Cgsrl.Server/src/Game.cs CGSrl.Server/src/Game.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using Cgsrl.Server.Networking;
2-
using Cgsrl.Shared.Environment;
3-
using Cgsrl.Shared.Networking;
1+
using CGSrl.Server.Networking;
2+
using CGSrl.Shared.Environment;
3+
using CGSrl.Shared.Networking;
44

55
using Lidgren.Network;
66

@@ -10,7 +10,7 @@
1010
using PER.Abstractions.Rendering;
1111
using PER.Util;
1212

13-
namespace Cgsrl.Server;
13+
namespace CGSrl.Server;
1414

1515
public class Game : IGame, ISetupable, ITickable {
1616
private static readonly Logger logger = LogManager.GetCurrentClassLogger();

Cgsrl.Server/src/Networking/Commands.cs CGSrl.Server/src/Networking/Commands.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
using System.Globalization;
22
using System.Net;
33

4-
using Cgsrl.Server.Arguments;
5-
using Cgsrl.Shared.Environment;
6-
using Cgsrl.Shared.Networking;
4+
using CGSrl.Server.Arguments;
5+
using CGSrl.Shared.Environment;
6+
using CGSrl.Shared.Networking;
77

88
using NBrigadier;
99
using NBrigadier.Arguments;
@@ -13,7 +13,7 @@
1313

1414
using PER.Util;
1515

16-
namespace Cgsrl.Server.Networking;
16+
namespace CGSrl.Server.Networking;
1717

1818
public class Commands {
1919
public CommandDispatcher<PlayerObject?> dispatcher { get; } = new();

Cgsrl.Server/src/Networking/GameServer.cs CGSrl.Server/src/Networking/GameServer.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
using System.Net;
22

3-
using Cgsrl.Shared.Environment;
4-
using Cgsrl.Shared.Networking;
3+
using CGSrl.Shared.Environment;
4+
using CGSrl.Shared.Networking;
55

66
using Lidgren.Network;
77

88
using NLog;
99

1010
using PER.Util;
1111

12-
namespace Cgsrl.Server.Networking;
12+
namespace CGSrl.Server.Networking;
1313

1414
public class GameServer {
1515
private static readonly Logger logger = LogManager.GetCurrentClassLogger();
File renamed without changes.

Cgsrl.Shared/src/Environment/BombObject.cs CGSrl.Shared/src/Environment/BombObject.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using PER.Abstractions.Rendering;
44
using PER.Util;
55

6-
namespace Cgsrl.Shared.Environment;
6+
namespace CGSrl.Shared.Environment;
77

88
public class BombObject : InteractableObject {
99
private const float Range = 10f;

Cgsrl.Shared/src/Environment/BoxObject.cs CGSrl.Shared/src/Environment/BoxObject.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using PER.Abstractions.Rendering;
22
using PER.Util;
33

4-
namespace Cgsrl.Shared.Environment;
4+
namespace CGSrl.Shared.Environment;
55

66
public class BoxObject : MovableObject {
77
protected override bool canPush => true;

Cgsrl.Shared/src/Environment/CorruptedObject.cs CGSrl.Shared/src/Environment/CorruptedObject.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using Cgsrl.Shared.Networking;
1+
using CGSrl.Shared.Networking;
22

33
using PER.Abstractions.Rendering;
44
using PER.Util;
55

6-
namespace Cgsrl.Shared.Environment;
6+
namespace CGSrl.Shared.Environment;
77

88
// use only when something really really really really really really bad happens
99
public class CorruptedObject : SyncedLevelObject {

Cgsrl.Shared/src/Environment/EffectObject.cs CGSrl.Shared/src/Environment/EffectObject.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Cgsrl.Shared.Networking;
1+
using CGSrl.Shared.Networking;
22

33
using Lidgren.Network;
44

55
using PER.Abstractions.Rendering;
66
using PER.Util;
77

8-
namespace Cgsrl.Shared.Environment;
8+
namespace CGSrl.Shared.Environment;
99

1010
public class EffectObject : SyncedLevelObject {
1111
public string effect { get; set; } = "none";

Cgsrl.Shared/src/Environment/FloorObject.cs CGSrl.Shared/src/Environment/FloorObject.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using Cgsrl.Shared.Networking;
1+
using CGSrl.Shared.Networking;
22

33
using PER.Abstractions.Environment;
44
using PER.Abstractions.Rendering;
55
using PER.Util;
66

7-
namespace Cgsrl.Shared.Environment;
7+
namespace CGSrl.Shared.Environment;
88

99
public class FloorObject : SyncedLevelObject, IAddable {
1010
private const float PerlinValue = 0.05f;

Cgsrl.Shared/src/Environment/GrassObject.cs CGSrl.Shared/src/Environment/GrassObject.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using Cgsrl.Shared.Networking;
1+
using CGSrl.Shared.Networking;
22

33
using Lidgren.Network;
44

55
using PER.Abstractions.Rendering;
66
using PER.Util;
77

8-
namespace Cgsrl.Shared.Environment;
8+
namespace CGSrl.Shared.Environment;
99

1010
public class GrassObject : InteractableObject {
1111
public override string prompt => "touch";

0 commit comments

Comments
 (0)