Skip to content

Commit 56bcf46

Browse files
TrojanerTrojaner
committed
Update csproj
1 parent 56f423c commit 56bcf46

31 files changed

+2966
-123
lines changed

‎.vs/SimpleDeathMessages/v15/.suo‎

13.5 KB
Binary file not shown.

‎.vs/SimpleDeathMessages/v15/Server/sqlite3/db.lock‎

Whitespace-only changes.

‎.vs/SimpleDeathMessages/v15/Server/sqlite3/storage.ide‎

944 KB
Binary file not shown.

‎Main.cs‎

Lines changed: 107 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,129 +1,139 @@
1+
using System.Collections.Generic;
2+
using System.Drawing;
3+
using Rocket.API.DependencyInjection;
4+
using Rocket.API.Eventing;
5+
using Rocket.API.User;
6+
using Rocket.Core.I18N;
7+
using Rocket.Core.Logging;
18
using Rocket.Unturned.Player;
2-
using UnityEngine;
39
using SDG.Unturned;
410
using Rocket.Core.Plugins;
5-
using Rocket.API.Collections;
6-
using Rocket.Unturned.Chat;
7-
using Rocket.Unturned.Events;
11+
using Rocket.Unturned.Player.Events;
812

913
namespace coolpuppy24.simpledeathmessages
1014
{
11-
public class Main : RocketPlugin<Configuration>
15+
public class Main : Plugin<SimpleDeathMessagesConfiguration>, IEventListener<UnturnedPlayerDeathEvent>
1216
{
13-
public static Main Instance = null;
17+
private readonly IUserManager _userManager;
1418

15-
protected override void Load()
19+
protected override void OnLoad(bool isFromReload)
1620
{
17-
Instance = this;
18-
UnturnedPlayerEvents.OnPlayerDeath += OnPlayerDeath;
19-
Rocket.Core.Logging.Logger.LogWarning("[SimpleDeathMessages] Made by: Coolpuppy24");
20-
Rocket.Core.Logging.Logger.LogWarning("------------------------------------------------------");
21-
Rocket.Core.Logging.Logger.LogWarning("[SimpleDeathMessages] Death Message Color: " + Configuration.Instance.DeathMessagesColor);
22-
Rocket.Core.Logging.Logger.LogWarning("[SimpleDeathMessages] Show Suicide Messages: " + Configuration.Instance.ShowSuicideMSG);
23-
Rocket.Core.Logging.Logger.Log("Successfully Loaded!");
21+
Logger.LogInformation("Successfully Loaded!");
2422
}
2523

26-
27-
protected override void Unload()
24+
protected override void OnUnload()
2825
{
29-
Instance = null;
30-
UnturnedPlayerEvents.OnPlayerDeath -= OnPlayerDeath;
31-
Rocket.Core.Logging.Logger.Log("Unload");
26+
Logger.LogInformation("Unloaded!");
3227
}
3328

34-
public override TranslationList DefaultTranslations
29+
public override Dictionary<string, string> DefaultTranslations => new Dictionary<string, string>
3530
{
36-
get
37-
{
38-
return new TranslationList()
39-
{
40-
{"gun_headshot","{0} [GUN - {3}] {2} {1}"},
41-
{"gun","{0} [GUN - {2}] {1}"},
42-
{"food","[FOOD] {0}"},
43-
{"arena","[ARENA] {0}"},
44-
{"shred","[SHRED] {0}"},
45-
{"punch_headshot","{0} [PUNCH] {2} {1}"},
46-
{"punch","{0} [PUNCH] {1}"},
47-
{"bones","[BONES] {0}"},
48-
{"melee_headshot","{0} [MELEE - {3}] {2} {1}"},
49-
{"melee","{0} [MELEE- {2}] {1}"},
50-
{"water","[WATER] {0}"},
51-
{"breath","[BREATH] {0}"},
52-
{"zombie","[ZOMBIE] {0}"},
53-
{"animal","[ANIMAL] {0}"},
54-
{"grenade","[GRENADE] {0}"},
55-
{"vehicle","[VEHICLE] {0}"},
56-
{"suicide","[SUICIDE] {0}"},
57-
{"burning","[BURNING] {0}"},
58-
{"headshot","+ [HEADSHOT]" },
59-
{"landmine","[LANDMINE] {0}"},
60-
{"roadkill","{0} [ROADKILL] {1}"},
61-
{"bleeding","[BLEEDING] {0}"},
62-
{"freezing","[FREEZING] {0}"},
63-
{"sentry","[SENTRY] {0}"},
64-
{"charge","[CHARGE] {0}"},
65-
{"missile","[MISSILE] {0}"},
66-
{"splash","[SPLASH] {0}"},
67-
{"acid","[ACID] {0}"},
68-
{"spark", "[SPARK] {0}"},
69-
{"infection", "[INFECTION] {0}"},
70-
{"spit","[SPIT] {0}"},
71-
{"kill","[ADMIN KILL] {0}"},
72-
{"boulder","[BOULDER] {0}"},
73-
};
74-
}
75-
}
31+
{"gun_headshot","{0} [GUN - {3}] {2} {1}"},
32+
{"gun","{0} [GUN - {2}] {1}"},
33+
{"food","[FOOD] {0}"},
34+
{"arena","[ARENA] {0}"},
35+
{"shred","[SHRED] {0}"},
36+
{"punch_headshot","{0} [PUNCH] {2} {1}"},
37+
{"punch","{0} [PUNCH] {1}"},
38+
{"bones","[BONES] {0}"},
39+
{"melee_headshot","{0} [MELEE - {3}] {2} {1}"},
40+
{"melee","{0} [MELEE- {2}] {1}"},
41+
{"water","[WATER] {0}"},
42+
{"breath","[BREATH] {0}"},
43+
{"zombie","[ZOMBIE] {0}"},
44+
{"animal","[ANIMAL] {0}"},
45+
{"grenade","[GRENADE] {0}"},
46+
{"vehicle","[VEHICLE] {0}"},
47+
{"suicide","[SUICIDE] {0}"},
48+
{"burning","[BURNING] {0}"},
49+
{"headshot","+ [HEADSHOT]" },
50+
{"landmine","[LANDMINE] {0}"},
51+
{"roadkill","{0} [ROADKILL] {1}"},
52+
{"bleeding","[BLEEDING] {0}"},
53+
{"freezing","[FREEZING] {0}"},
54+
{"sentry","[SENTRY] {0}"},
55+
{"charge","[CHARGE] {0}"},
56+
{"missile","[MISSILE] {0}"},
57+
{"splash","[SPLASH] {0}"},
58+
{"acid","[ACID] {0}"},
59+
{"spark", "[SPARK] {0}"},
60+
{"infection", "[INFECTION] {0}"},
61+
{"spit","[SPIT] {0}"},
62+
{"kill","[ADMIN KILL] {0}"},
63+
{"boulder","[BOULDER] {0}"},
64+
};
7665

66+
public Main(IDependencyContainer container, IEventManager eventManager, IUserManager userManager) : base("SimpleDeathMessages", container)
67+
{
68+
_userManager = userManager;
69+
eventManager.AddEventListener(this, this);
70+
}
7771

78-
private void OnPlayerDeath(UnturnedPlayer player, EDeathCause cause, ELimb limb, Steamworks.CSteamID murderer)
72+
public void HandleEvent(IEventEmitter emitter, UnturnedPlayerDeathEvent @event)
7973
{
80-
UnturnedPlayer killer = UnturnedPlayer.FromCSteamID(murderer);
74+
var player = (UnturnedPlayer)@event.Player;
75+
76+
UnturnedPlayer killer = ((UnturnedPlayerEntity)@event.Killer).UnturnedPlayer;
77+
var cause = @event.DeathCause;
78+
var limb = @event.Limb;
8179

82-
string headshot = Translate("headshot");
80+
var deathmessageColor = Color.Green; //ConfigurationInstance.DeathMessagesColor;
81+
82+
83+
string headshot = Translations.Get("headshot");
84+
if (cause.ToString() == "SHRED" || cause.ToString() == "ZOMBIE" || cause.ToString() == "ANIMAL" ||
85+
cause.ToString() == "SPARK" || cause.ToString() == "VEHICLE" || cause.ToString() == "FOOD" ||
86+
cause.ToString() == "WATER" || cause.ToString() == "INFECTION" || cause.ToString() == "BLEEDING" ||
87+
cause.ToString() == "LANDMINE" || cause.ToString() == "BREATH" || cause.ToString() == "KILL" ||
88+
cause.ToString() == "FREEZING" || cause.ToString() == "SENTRY" || cause.ToString() == "CHARGE" ||
89+
cause.ToString() == "MISSILE" || cause.ToString() == "BONES" || cause.ToString() == "SPLASH" ||
90+
cause.ToString() == "ACID" || cause.ToString() == "SPIT" || cause.ToString() == "BURNING" ||
91+
cause.ToString() == "BURNER" || cause.ToString() == "BOULDER" || cause.ToString() == "ARENA" ||
92+
cause.ToString() == "GRENADE" ||
93+
(ConfigurationInstance.ShowSuicideMSG && cause.ToString() == "SUICIDE") ||
94+
cause.ToString() == "ROADKILL" || cause.ToString() == "MELEE" || cause.ToString() == "GUN" ||
95+
cause.ToString() == "PUNCH")
8396
{
84-
if (cause.ToString() == "SHRED" || cause.ToString() == "ZOMBIE" || cause.ToString() == "ANIMAL" || cause.ToString() == "SPARK" || cause.ToString() == "VEHICLE" || cause.ToString() == "FOOD" || cause.ToString() == "WATER" || cause.ToString() == "INFECTION" || cause.ToString() == "BLEEDING" || cause.ToString() == "LANDMINE" || cause.ToString() == "BREATH" || cause.ToString() == "KILL" || cause.ToString() == "FREEZING" || cause.ToString() == "SENTRY" || cause.ToString() == "CHARGE" || cause.ToString() == "MISSILE" || cause.ToString() == "BONES" || cause.ToString() == "SPLASH" || cause.ToString() == "ACID" || cause.ToString() == "SPIT" || cause.ToString() == "BURNING" || cause.ToString() == "BURNER" || cause.ToString() == "BOULDER" || cause.ToString() == "ARENA" || cause.ToString() == "GRENADE" || (Configuration.Instance.ShowSuicideMSG == true && cause.ToString() == "SUICIDE") || cause.ToString() == "ROADKILL" || cause.ToString() == "MELEE" || cause.ToString() == "GUN" || cause.ToString() == "PUNCH")
97+
if (cause.ToString() != "ROADKILL" && cause.ToString() != "MELEE" && cause.ToString() != "GUN" &&
98+
cause.ToString() != "PUNCH")
8599
{
86-
if (cause.ToString() != "ROADKILL" && cause.ToString() != "MELEE" && cause.ToString() != "GUN" && cause.ToString() != "PUNCH")
87-
{
88-
UnturnedChat.Say(Translate(cause.ToString().ToLower(), player.DisplayName), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
89-
}
90-
else if (cause.ToString() == "ROADKILL")
91-
{
92-
UnturnedChat.Say(Translate("roadkill", killer.DisplayName, player.DisplayName), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
93-
}
94-
else if (cause.ToString() == "MELEE" || cause.ToString() == "GUN")
95-
{
96-
if (limb == ELimb.SKULL)
97-
UnturnedChat.Say(Translate(cause.ToString().ToLower() + "_headshot", killer.DisplayName, player.DisplayName, headshot, Rocket.Unturned.Player.UnturnedPlayer.FromCSteamID(murderer).Player.equipment.asset.itemName.ToString()), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
98-
else
99-
UnturnedChat.Say(Translate(cause.ToString().ToLower(), killer.DisplayName, player.DisplayName, Rocket.Unturned.Player.UnturnedPlayer.FromCSteamID(murderer).Player.equipment.asset.itemName.ToString()), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
100-
}
101-
else if (cause.ToString() == "PUNCH")
102-
{
103-
if (limb == ELimb.SKULL)
104-
UnturnedChat.Say(Translate("punch_headshot", killer.DisplayName, player.DisplayName, headshot), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
105-
else
106-
UnturnedChat.Say(Translate("punch", killer.DisplayName, player.DisplayName), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
107-
}
100+
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName);
101+
}
102+
else if (cause.ToString() == "ROADKILL")
103+
{
104+
_userManager.BroadcastLocalized(Translations, "roadkill", deathmessageColor, player.DisplayName, killer.DisplayName);
105+
}
106+
else if (cause.ToString() == "MELEE" || cause.ToString() == "GUN")
107+
{
108+
if (limb == ELimb.SKULL)
109+
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower() + "_headshot", deathmessageColor, player.DisplayName, killer.DisplayName, headshot, killer.Player.equipment.asset.itemName);
110+
else
111+
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName, killer.DisplayName, headshot, killer.Player.equipment.asset.itemName);
108112
}
109-
else //No need to update the plugin later! (Just add the translation)
113+
else if (cause.ToString() == "PUNCH")
110114
{
111-
if (Translate(cause.ToString().ToLower()) != null)
115+
_userManager.BroadcastLocalized(Translations,
116+
limb == ELimb.SKULL ? "punch_headshot" : "punch", deathmessageColor, player.DisplayName, killer.DisplayName, headshot);
117+
}
118+
}
119+
else //No need to update the plugin later! (Just add the translation)
120+
{
121+
if (Translations.Get(cause.ToString().ToLower()) != null)
122+
{
123+
if (Translations.Get(cause.ToString().ToLower()).Contains("{1}"))
112124
{
113-
if (Translate(cause.ToString().ToLower()).Contains("{1}"))
114-
{
115-
UnturnedChat.Say(Translate(cause.ToString().ToLower(), player.DisplayName , killer.DisplayName), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
116-
}
117-
else
118-
{
119-
UnturnedChat.Say(Translate(cause.ToString().ToLower(), player.DisplayName), UnturnedChat.GetColorFromName(Configuration.Instance.DeathMessagesColor, Color.green));
120-
}
125+
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName, killer.DisplayName, headshot);
121126
}
122127
else
123128
{
124-
Rocket.Core.Logging.Logger.LogError("Please add translation for " + cause.ToString() + " | Parameters for custom translation: {0} = Player , {1} = Killer");
129+
_userManager.BroadcastLocalized(Translations, cause.ToString().ToLower(), deathmessageColor, player.DisplayName, headshot);
125130
}
126131
}
132+
else
133+
{
134+
Logger.LogError("Please add translation for " + cause +
135+
" | Parameters for custom translation: {0} = Player , {1} = Killer");
136+
}
127137
}
128138
}
129139
}

‎SimpleDeathMessages.csproj‎

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,25 @@
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>lib\Assembly-CSharp.dll</HintPath>
45-
<Private>False</Private>
43+
<HintPath>packages\Rocket.Unturned.5.0.0.126\lib\net35\Assembly-CSharp.dll</HintPath>
4644
</Reference>
4745
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
48-
<SpecificVersion>False</SpecificVersion>
49-
<HintPath>lib\Assembly-CSharp-firstpass.dll</HintPath>
50-
<Private>False</Private>
46+
<HintPath>packages\Rocket.Unturned.5.0.0.126\lib\net35\Assembly-CSharp-firstpass.dll</HintPath>
5147
</Reference>
52-
<Reference Include="Rocket.API, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
53-
<SpecificVersion>False</SpecificVersion>
54-
<HintPath>lib\Rocket.API.dll</HintPath>
55-
<Private>False</Private>
48+
<Reference Include="Rocket.API, Version=5.0.0.459, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>packages\Rocket.API.5.0.0.459\lib\net35\Rocket.API.dll</HintPath>
5650
</Reference>
57-
<Reference Include="Rocket.Core, Version=1.2.2.0, Culture=neutral, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
59-
<HintPath>lib\Rocket.Core.dll</HintPath>
60-
<Private>False</Private>
51+
<Reference Include="Rocket.Compatibility, Version=5.0.0.459, Culture=neutral, processorArchitecture=MSIL">
52+
<HintPath>packages\Rocket.Compatibility.5.0.0.459\lib\net35\Rocket.Compatibility.dll</HintPath>
6153
</Reference>
62-
<Reference Include="Rocket.Unturned, Version=4.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63-
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>lib\Rocket.Unturned.dll</HintPath>
65-
<Private>False</Private>
54+
<Reference Include="Rocket.Core, Version=5.0.0.459, Culture=neutral, processorArchitecture=MSIL">
55+
<HintPath>packages\Rocket.Core.5.0.0.459\lib\net35\Rocket.Core.dll</HintPath>
56+
</Reference>
57+
<Reference Include="Rocket.UnityEngine, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
58+
<HintPath>packages\Rocket.UnityEngine.5.0.0.29\lib\net35\Rocket.UnityEngine.dll</HintPath>
59+
</Reference>
60+
<Reference Include="Rocket.Unturned, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
61+
<HintPath>packages\Rocket.Unturned.5.0.0.126\lib\net35\Rocket.Unturned.dll</HintPath>
6662
</Reference>
6763
<Reference Include="System" />
6864
<Reference Include="System.Core" />
@@ -77,19 +73,16 @@
7773
</Reference>
7874
</ItemGroup>
7975
<ItemGroup>
80-
<Compile Include="Configuration.cs" />
76+
<Compile Include="SimpleDeathMessagesConfiguration.cs" />
8177
<Compile Include="Main.cs" />
8278
<Compile Include="Properties\AssemblyInfo.cs" />
8379
</ItemGroup>
8480
<ItemGroup>
85-
<Content Include="lib\Assembly-CSharp-firstpass.dll" />
86-
<Content Include="lib\Assembly-CSharp.dll" />
87-
<Content Include="lib\Rocket.API.dll" />
88-
<Content Include="lib\Rocket.Core.dll" />
89-
<Content Include="lib\Rocket.Unturned.dll" />
90-
<Content Include="lib\Uconomy.dll" />
9181
<Content Include="lib\UnityEngine.dll" />
9282
</ItemGroup>
83+
<ItemGroup>
84+
<None Include="packages.config" />
85+
</ItemGroup>
9386
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9487
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9588
Other similar extension points exist, see Microsoft.Common.targets.

Configuration.cs renamed to SimpleDeathMessagesConfiguration.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace coolpuppy24.simpledeathmessages
88
{
9-
public class Configuration : IRocketPluginConfiguration
9+
public class SimpleDeathMessagesConfiguration : IRocketPluginConfiguration
1010
{
1111
public string DeathMessagesColor;
1212
public bool ShowSuicideMSG;

‎lib/Assembly-CSharp-firstpass.dll‎

-951 KB
Binary file not shown.

‎lib/Assembly-CSharp.dll‎

-2.02 MB
Binary file not shown.

‎lib/Rocket.API.dll‎

-16 KB
Binary file not shown.

‎lib/Rocket.Core.dll‎

-70 KB
Binary file not shown.

0 commit comments

Comments
 (0)