Skip to content
This repository was archived by the owner on Dec 21, 2019. It is now read-only.

Commit 3c0c449

Browse files
fr34kyn01535fr34kyn01535
committed
Minimal rework
1 parent 383b504 commit 3c0c449

File tree

8 files changed

+21
-17
lines changed

8 files changed

+21
-17
lines changed

‎Rocket.Unturned.sln.DotSettings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@
6666
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
6767
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
6868
<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/CustomLocation/@EntryValue">C:\Users\fr34kyn01535\AppData\Local\JetBrains\Transient\ReSharperPlatformVs15\v11_de26377b\SolutionCaches</s:String>
69+
<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=4336D786FB68B645A41959420963CC29/@KeyIndexDefined">True</s:Boolean>
70+
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=4336D786FB68B645A41959420963CC29/AbsolutePath/@EntryValue">C:\Users\fr34kyn01535\GitHub\Rocket.Unturned\Rocket.Unturned.sln.DotSettings</s:String>
71+
<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=4336D786FB68B645A41959420963CC29/RelativePath/@EntryValue"></s:String>
72+
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File4336D786FB68B645A41959420963CC29/@KeyIndexDefined">True</s:Boolean>
73+
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File4336D786FB68B645A41959420963CC29/RelativePriority/@EntryValue">1</s:Double>
6974
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=AutoRecoverer/@EntryIndexedValue">LIVE_MONITOR</s:String>
7075
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Format/@EntryIndexedValue">LIVE_MONITOR</s:String>
7176
<s:String x:Key="/Default/Environment/PerformanceGuide/SwitchBehaviour/=Roslyn_002Dswea/@EntryIndexedValue">DO_NOTHING</s:String>

‎Rocket.Unturned/Chat/UnturnedChatManager.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
using Rocket.Unturned.Events;
2-
using SDG.Unturned;
1+
using SDG.Unturned;
32
using System.Collections.Generic;
43
using Rocket.API;
54
using Rocket.API.Chat;
65
using Rocket.API.DependencyInjection;
76
using Rocket.API.Eventing;
87
using Rocket.API.I18N;
98
using Rocket.API.Player;
10-
using Rocket.Unturned.Events.Player;
119
using Steamworks;
1210
using UnityEngine;
1311
using ILogger = Rocket.API.Logging.ILogger;
12+
using Rocket.Unturned.Player.Events;
1413

1514
namespace Rocket.Unturned.Chat
1615
{
@@ -30,7 +29,7 @@ public UnturnedChatManager(ILogger logger, IImplementation implementation, IEven
3029
this.playerManager = playerManager;
3130

3231
ChatManager.onChatted += HandleChat;
33-
32+
3433
CommandWindow.onCommandWindowOutputted += (text, color)
3534
=> logger.LogInformation(text?.ToString());
3635
}
@@ -71,7 +70,7 @@ private void HandleChat(SteamPlayer player, EChatMode mode, ref Color color, ref
7170
UnturnedPlayerChatEvent @event = new UnturnedPlayerChatEvent(p, mode, color, isRich, message, !isVisible);
7271
eventManager.Emit(implementation, @event);
7372
color = @event.Color;
74-
isRich = @event.IsRich;
73+
isRich = @event.IsRichText;
7574
isVisible = !@event.IsCancelled;
7675
}
7776

Rocket.Unturned/Events/Player/UnturnedPlayerChatEvent.cs renamed to Rocket.Unturned/Player/Events/UnturnedPlayerChatEvent.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
using SDG.Unturned;
55
using UnityEngine;
66

7-
namespace Rocket.Unturned.Events.Player
7+
namespace Rocket.Unturned.Player.Events
88
{
99
public class UnturnedPlayerChatEvent : PlayerChatEvent
1010
{
1111
public EChatMode Mode { get; }
1212
public Color Color { get; set; }
13-
public bool IsRich { get; set; }
13+
public bool IsRichText { get; set; }
1414

15-
public UnturnedPlayerChatEvent(IPlayer player, EChatMode mode, Color color, bool isRich, string message,
15+
public UnturnedPlayerChatEvent(IPlayer player, EChatMode mode, Color color, bool isRichText, string message,
1616
bool cancelled) : base(player, null, message, EventExecutionTargetContext.Sync)
1717
{
1818
Mode = mode;
1919
Color = color;
20-
IsRich = isRich;
20+
IsRichText = isRichText;
2121
IsCancelled = cancelled;
2222
}
2323
}

Rocket.Unturned/Events/Player/UnturnedPlayerDeadEvent.cs renamed to Rocket.Unturned/Player/Events/UnturnedPlayerDeadEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Rocket.Core.Events.Player;
44
using UnityEngine;
55

6-
namespace Rocket.Unturned.Events.Player
6+
namespace Rocket.Unturned.Player.Events
77
{
88
public class UnturnedPlayerDeadEvent : PlayerEvent
99
{

Rocket.Unturned/Events/Player/UnturnedPlayerDeathEvent.cs renamed to Rocket.Unturned/Player/Events/UnturnedPlayerDeathEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Rocket.Core.Events.Player;
44
using SDG.Unturned;
55

6-
namespace Rocket.Unturned.Events.Player
6+
namespace Rocket.Unturned.Player.Events
77
{
88
public class UnturnedPlayerDeathEvent : PlayerDeathEvent
99
{

Rocket.Unturned/Events/Player/UnturnedPlayerPreConnectEvent.cs renamed to Rocket.Unturned/Player/Events/UnturnedPlayerPreConnectEvent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using SDG.Unturned;
55
using Steamworks;
66

7-
namespace Rocket.Unturned.Events.Player
7+
namespace Rocket.Unturned.Player.Events
88
{
99
public class UnturnedPlayerPreConnectEvent : PlayerPreConnectEvent
1010
{

‎Rocket.Unturned/Rocket.Unturned.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,11 +106,11 @@
106106
<Compile Include="Commands\VanillaCommand.cs" />
107107
<Compile Include="Commands\VanillaCommandProvider.cs" />
108108
<Compile Include="Console\ConsoleCaller.cs" />
109-
<Compile Include="Events\Player\UnturnedPlayerDeadEvent.cs" />
110-
<Compile Include="Events\Player\UnturnedPlayerDeathEvent.cs" />
109+
<Compile Include="Player\Events\UnturnedPlayerDeadEvent.cs" />
110+
<Compile Include="Player\Events\UnturnedPlayerDeathEvent.cs" />
111111
<Compile Include="Player\PreConnectUnturnedPlayer.cs" />
112-
<Compile Include="Events\Player\UnturnedPlayerChatEvent.cs" />
113-
<Compile Include="Events\Player\UnturnedPlayerPreConnectEvent.cs" />
112+
<Compile Include="Player\Events\UnturnedPlayerChatEvent.cs" />
113+
<Compile Include="Player\Events\UnturnedPlayerPreConnectEvent.cs" />
114114
<Compile Include="Player\UnturnedPlayerManager.cs" />
115115
<Compile Include="Properties\DependencyRegistrator.cs" />
116116
<Compile Include="Console\UnturnedConsoleWriter.cs" />

‎Rocket.Unturned/UnturnedImplementation.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
using Rocket.Core.Events.Implementation;
1111
using Rocket.Core.Events.Player;
1212
using Rocket.Unturned.Console;
13-
using Rocket.Unturned.Events.Player;
1413
using Rocket.Unturned.Player;
14+
using Rocket.Unturned.Player.Events;
1515
using Rocket.Unturned.Utils;
1616
using SDG.Unturned;
1717
using Steamworks;

0 commit comments

Comments
 (0)