Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit b3d6f19

Browse files
rexxar-tcrexxar-tc
committed
Revert "Fix system type keyword use"
This reverts commit 9b3bda6.
1 parent ba3b57d commit b3d6f19

24 files changed

+108
-103
lines changed

‎EssentialsPlugin/ChatHandlers/Admin/HandleAdminVersion.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public override bool HandleCommand( ulong userId, string[] words )
5757
//Version version = typeof( Essentials ).Assembly.GetName( ).Version;
5858
//Communication.SendPrivateInformation( userId, (String)version );
5959

60-
Communication.SendPrivateInformation( userId, string.Format("Plugin '{0}' initialized. (Version: {1} ID: {2})",
60+
Communication.SendPrivateInformation( userId, String.Format("Plugin '{0}' initialized. (Version: {1} ID: {2})",
6161
Essentials.Instance.Name, Essentials.Instance.Version, Essentials.Instance.Id) );
6262

6363
return true;

‎EssentialsPlugin/ChatHandlers/ChatHandlerBase.cs‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public ChatHandlerBase( )
1717
Log.Debug( $"Added chat handler: {GetCommandText()}" );
1818
}
1919

20-
public virtual bool CanHandle(ulong steamId, string[] words, ref int commandCount)
20+
public virtual Boolean CanHandle(ulong steamId, String[] words, ref int commandCount)
2121
{
2222
// Administrator Command
2323
if (IsAdminCommand())
@@ -39,7 +39,7 @@ public virtual bool CanHandle(ulong steamId, string[] words, ref int commandCoun
3939
{
4040
commandCount = GetCommandText().Split(new char[] { ' ' }).Count();
4141
if (words.Length > commandCount - 1)
42-
return string.Join(" ", words).ToLower().StartsWith(GetCommandText());
42+
return String.Join(" ", words).ToLower().StartsWith(GetCommandText());
4343
}
4444
else
4545
{
@@ -49,7 +49,7 @@ public virtual bool CanHandle(ulong steamId, string[] words, ref int commandCoun
4949
commandCount = command.Split(new char[] { ' ' }).Count();
5050
if (words.Length > commandCount - 1)
5151
{
52-
found = string.Join(" ", words).ToLower().StartsWith(command);
52+
found = String.Join(" ", words).ToLower().StartsWith(command);
5353
if (found)
5454
break;
5555
}
@@ -65,16 +65,18 @@ public virtual bool CanHandle(ulong steamId, string[] words, ref int commandCoun
6565

6666
public virtual Communication.ServerDialogItem GetHelpDialog( )
6767
{
68-
return new Communication.ServerDialogItem
69-
{
70-
title = "Help",
71-
header = GetCommandText( ),
72-
content = GetHelp( ),
73-
buttonText = "close"
74-
};
68+
Communication.ServerDialogItem DialogItem = new Communication.ServerDialogItem();
69+
DialogItem.title = "Help";
70+
DialogItem.header = GetCommandText();
71+
DialogItem.content = GetHelp();
72+
DialogItem.buttonText = "close";
73+
return DialogItem;
7574
}
7675

77-
public abstract string GetCommandText( );
76+
public virtual String GetCommandText()
77+
{
78+
return "";
79+
}
7880

7981
public virtual string[] GetMultipleCommandText()
8082
{
@@ -96,7 +98,7 @@ public virtual bool IsClientOnly()
9698
return false;
9799
}
98100

99-
public virtual bool HandleCommand(ulong userId, string[] words)
101+
public virtual bool HandleCommand(ulong userId, String[] words)
100102
{
101103
return false;
102104
}

‎EssentialsPlugin/ChatHandlers/Dock/HandleAdminUndockAll.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public override bool HandleCommand(ulong userId, string[] words)
5757
{
5858
foreach (DockingItem dockingItem in Docking.Instance.DockingItems)
5959
{
60-
string dockedShipFileName = Essentials.PluginPath + string.Format("\\Docking\\docked_{0}_{1}_{2}.sbc", dockingItem.PlayerId, dockingItem.TargetEntityId, dockingItem.DockedEntityId);
60+
string dockedShipFileName = Essentials.PluginPath + String.Format("\\Docking\\docked_{0}_{1}_{2}.sbc", dockingItem.PlayerId, dockingItem.TargetEntityId, dockingItem.DockedEntityId);
6161

6262
DockingItem dockedShip = dockingItem;
6363
IMyEntity entity = MyAPIGateway.Entities.GetEntity(x => x.EntityId == dockedShip.TargetEntityId && x is IMyCubeGrid);

‎EssentialsPlugin/ChatHandlers/Dock/HandleDockDock.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public override bool HandleCommand(ulong userId, string[] words)
7373
m_docking = true;
7474
try
7575
{
76-
string pylonName = string.Join(" ", words);
76+
String pylonName = String.Join(" ", words);
7777

7878
/*
7979
int timeLeft;
@@ -92,7 +92,7 @@ public override bool HandleCommand(ulong userId, string[] words)
9292

9393
long playerId = PlayerMap.Instance.GetPlayerIdsFromSteamId(userId).First();
9494

95-
Dictionary<string, List<IMyCubeBlock>> testList;
95+
Dictionary<String, List<IMyCubeBlock>> testList;
9696
List<IMyCubeBlock> beaconList;
9797
DockingZone.FindByName(pylonName, out testList, out beaconList, playerId);
9898
if (beaconList.Count == 4)

‎EssentialsPlugin/ChatHandlers/Dock/HandleDockList.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public override bool HandleCommand(ulong userId, string[] words)
5151
return true;
5252
}
5353

54-
string pylonName = string.Join(" ", words);
54+
String pylonName = String.Join(" ", words);
5555
if (PlayerMap.Instance.GetPlayerIdsFromSteamId(userId).Count < 1)
5656
{
5757
Communication.SendPrivateInformation(userId, string.Format("Unable to find player Id: {0}", userId));
@@ -60,7 +60,7 @@ public override bool HandleCommand(ulong userId, string[] words)
6060

6161
long playerId = PlayerMap.Instance.GetPlayerIdsFromSteamId(userId).First();
6262

63-
Dictionary<string, List<IMyCubeBlock>> testList;
63+
Dictionary<String, List<IMyCubeBlock>> testList;
6464
List<IMyCubeBlock> beaconList;
6565
DockingZone.FindByName(pylonName, out testList, out beaconList, playerId);
6666

‎EssentialsPlugin/ChatHandlers/Dock/HandleDockUndock.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public override bool HandleCommand(ulong userId, string[] words)
7474
m_undocking = true;
7575
try
7676
{
77-
string pylonName = string.Join( " ", words );
77+
String pylonName = String.Join( " ", words );
7878
if ( PlayerMap.Instance.GetPlayerIdsFromSteamId( userId ).Count < 1 )
7979
{
8080
Communication.SendPrivateInformation( userId, string.Format( "Unable to find player Id: {0}", userId ) );
@@ -83,7 +83,7 @@ public override bool HandleCommand(ulong userId, string[] words)
8383

8484
long playerId = PlayerMap.Instance.GetPlayerIdsFromSteamId( userId ).First( );
8585

86-
Dictionary<string, List<IMyCubeBlock>> testList;
86+
Dictionary<String, List<IMyCubeBlock>> testList;
8787
List<IMyCubeBlock> beaconList;
8888
DockingZone.FindByName( pylonName, out testList, out beaconList, playerId );
8989

@@ -150,7 +150,7 @@ public override bool HandleCommand(ulong userId, string[] words)
150150
}
151151
}
152152

153-
string dockedShipFileName = Essentials.PluginPath + string.Format( "\\Docking\\docked_{0}_{1}_{2}.sbc", ownerId, dockingItem.TargetEntityId, dockingItem.DockedEntityId );
153+
String dockedShipFileName = Essentials.PluginPath + String.Format( "\\Docking\\docked_{0}_{1}_{2}.sbc", ownerId, dockingItem.TargetEntityId, dockingItem.DockedEntityId );
154154

155155
// Load Entity From File and add to game
156156
FileInfo fileInfo = new FileInfo( dockedShipFileName );

‎EssentialsPlugin/ChatHandlers/Dock/HandleDockValidate.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public override bool HandleCommand(ulong userId, string[] words)
5252
}
5353

5454
// Grab shared beacon name and playerId
55-
string pylonName = string.Join(" ", words);
55+
String pylonName = String.Join(" ", words);
5656
if (PlayerMap.Instance.GetPlayerIdsFromSteamId(userId).Count < 1)
5757
{
5858
Communication.SendPrivateInformation(userId, "Failed to retrieve your playerId. Command failed.");
@@ -62,7 +62,7 @@ public override bool HandleCommand(ulong userId, string[] words)
6262
long playerId = PlayerMap.Instance.GetPlayerIdsFromSteamId(userId).First();
6363

6464
// Find shared beacon area
65-
Dictionary<string, List<IMyCubeBlock>> testList;
65+
Dictionary<String, List<IMyCubeBlock>> testList;
6666
List<IMyCubeBlock> beaconList;
6767
DockingZone.FindByName(pylonName, out testList, out beaconList, playerId);
6868
if (beaconList.Count == 4)

‎EssentialsPlugin/ChatHandlers/HandleInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public override bool HandleCommand(ulong userId, string[] words)
7777

7878
private static void ShowTopicList(ulong userId)
7979
{
80-
string noticeList = "";
80+
String noticeList = "";
8181
foreach (InformationItem item in PluginSettings.Instance.InformationItems)
8282
{
8383
if (!item.Enabled)

‎EssentialsPlugin/Essentials.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ public void Init( )
14281428
DoInit( Path.GetDirectoryName( Assembly.GetExecutingAssembly( ).Location ) + "\\" );
14291429
}
14301430

1431-
public void InitWithPath( string modPath )
1431+
public void InitWithPath( String modPath )
14321432
{
14331433
//register object builder assembly
14341434
string path = System.IO.Path.Combine( AppDomain.CurrentDomain.BaseDirectory, "SpaceEngineers.ObjectBuilders.DLL" );
@@ -1613,7 +1613,7 @@ private void HandleHelpCommand( ulong remoteUserId, IReadOnlyCollection<string>
16131613
// Again, we should get handler to just return string[] of command Text
16141614
if ( handler.GetMultipleCommandText( ).Length < 1 )
16151615
{
1616-
if ( string.Equals( handler.GetCommandText( ), helpTarget, StringComparison.CurrentCultureIgnoreCase ) )
1616+
if ( String.Equals( handler.GetCommandText( ), helpTarget, StringComparison.CurrentCultureIgnoreCase ) )
16171617
{
16181618
Communication.SendPrivateInformation( remoteUserId, handler.GetHelp( ) );
16191619
found = true;
@@ -1623,7 +1623,7 @@ private void HandleHelpCommand( ulong remoteUserId, IReadOnlyCollection<string>
16231623
{
16241624
foreach ( string cmd in handler.GetMultipleCommandText( ) )
16251625
{
1626-
if ( string.Equals( cmd, helpTarget, StringComparison.CurrentCultureIgnoreCase ) )
1626+
if ( String.Equals( cmd, helpTarget, StringComparison.CurrentCultureIgnoreCase ) )
16271627
{
16281628
Communication.SendPrivateInformation( remoteUserId, handler.GetHelp( ) );
16291629
found = true;
@@ -1720,7 +1720,7 @@ private void HandleHelpDialog(ulong remoteUserId, IReadOnlyCollection<string> co
17201720
// Again, we should get handler to just return string[] of command Text
17211721
if (handler.GetMultipleCommandText().Length < 1)
17221722
{
1723-
if (string.Equals(handler.GetCommandText(), helpTarget, StringComparison.CurrentCultureIgnoreCase))
1723+
if (String.Equals(handler.GetCommandText(), helpTarget, StringComparison.CurrentCultureIgnoreCase))
17241724
{
17251725
Communication.DisplayDialog(remoteUserId, handler.GetHelpDialog());
17261726
found = true;
@@ -1730,7 +1730,7 @@ private void HandleHelpDialog(ulong remoteUserId, IReadOnlyCollection<string> co
17301730
{
17311731
foreach (string cmd in handler.GetMultipleCommandText())
17321732
{
1733-
if (string.Equals(cmd, helpTarget, StringComparison.CurrentCultureIgnoreCase))
1733+
if (String.Equals(cmd, helpTarget, StringComparison.CurrentCultureIgnoreCase))
17341734
{
17351735
Communication.DisplayDialog(remoteUserId, handler.GetHelpDialog());
17361736
found = true;

‎EssentialsPlugin/GameModes/Conquest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ private static void Load()
161161
{
162162
try
163163
{
164-
string fileName = Essentials.PluginPath + "Essentials-Conquest.xml";
164+
String fileName = Essentials.PluginPath + "Essentials-Conquest.xml";
165165
if (File.Exists(fileName))
166166
{
167167
using (StreamReader reader = new StreamReader(fileName))
@@ -187,7 +187,7 @@ private static void Save()
187187
{
188188
lock (Instance)
189189
{
190-
string fileName = Essentials.PluginPath + "Essentials-Conquest.xml";
190+
String fileName = Essentials.PluginPath + "Essentials-Conquest.xml";
191191
using (StreamWriter writer = new StreamWriter(fileName))
192192
{
193193
XmlSerializer x = new XmlSerializer(typeof(Conquest));

0 commit comments

Comments
 (0)