Skip to content

Commit f551c75

Browse files
committed
Updated to new SL version.
- MER ported to 14.0 - Exiled version bumped to Exiled 9.6. beta 4
1 parent 1dfd607 commit f551c75

File tree

6 files changed

+67
-80
lines changed

6 files changed

+67
-80
lines changed

MyPlugin/App.config

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?><configuration>
2+
<runtime>
3+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
4+
<dependentAssembly>
5+
<assemblyIdentity name="Exiled.API" publicKeyToken="null" culture="neutral" />
6+
<bindingRedirect oldVersion="0.0.0.0-9.6.0.0" newVersion="9.6.0.0" />
7+
</dependentAssembly>
8+
<dependentAssembly>
9+
<assemblyIdentity name="Exiled.CustomItems" publicKeyToken="null" culture="neutral" />
10+
<bindingRedirect oldVersion="0.0.0.0-9.6.0.0" newVersion="9.6.0.0" />
11+
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="Exiled.Events" publicKeyToken="null" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-9.6.0.0" newVersion="9.6.0.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="Exiled.Loader" publicKeyToken="null" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-9.6.0.0" newVersion="9.6.0.0" />
19+
</dependentAssembly>
20+
<dependentAssembly>
21+
<assemblyIdentity name="Exiled.Permissions" publicKeyToken="null" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-9.6.0.0" newVersion="9.6.0.0" />
23+
</dependentAssembly>
24+
<dependentAssembly>
25+
<assemblyIdentity name="NorthwoodLib" publicKeyToken="null" culture="neutral" />
26+
<bindingRedirect oldVersion="0.0.0.0-1.3.1.0" newVersion="1.3.1.0" />
27+
</dependentAssembly>
28+
</assemblyBinding>
29+
</runtime>
30+
</configuration>

MyPlugin/CustomItems/Saskyc.cs

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,9 @@
1-

2-
using System;
3-
using UnityEngine;
1+
using UnityEngine;
42
using System.Collections.Generic;
5-
using System.Linq;
6-
using System.Text;
7-
using System.Threading.Tasks;
83
using Exiled.CustomItems.API.Features;
94
using Exiled.API.Features;
105
using Exiled.API.Features.Attributes;
11-
using UnityStandardAssets.Effects;
126
using Exiled.API.Features.Spawn;
13-
using Exiled.API.Enums;
14-
using InventorySystem.Items.Usables;
15-
using MapEditorReborn;
16-
using MapEditorReborn.API.Features.Objects;
17-
using MapEditorReborn.API.Features;
18-
using MapEditorReborn.Commands.ModifyingCommands.Position;
19-
using MapEditorReborn.Commands.ModifyingCommands.Rotation;
20-
using System.IO;
21-
using Discord;
22-
using Exiled.Events.Commands.Reload;
23-
using MapEditorReborn.Events.Handlers;
24-
using YamlDotNet.Core;
25-
using MapEditorObject = MapEditorReborn.API.Features.Objects.MapEditorObject;
26-
using System.Net;
27-
using YamlDotNet.Serialization;
28-
using MapEditorReborn.API.Features.Serializable;
29-
using NotAnAPI.Features.UI;
30-
//using MyPlugin.CustomThings;
31-
using NorthwoodLib.Pools;
32-
//using NotAnAPI;
33-
//using NotAnAPI.API.Extensions;
34-
using MEC;
357

368
namespace MyPlugin.CustomItems
379
{

MyPlugin/MyPlugin.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
using CommandSystem;
1111
using Exiled.CustomRoles;
1212
using Exiled.API.Enums;
13-
using PluginAPI.Core.Attributes;
1413
using System.ComponentModel;
1514
using MapEditorReborn.API.Features.Objects;
1615
using System.Runtime.InteropServices;

MyPlugin/MyPlugin.csproj

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -53,50 +53,50 @@
5353
<Reference Include="0Harmony, Version=2.2.2.0, Culture=neutral, processorArchitecture=MSIL">
5454
<HintPath>..\packages\Lib.Harmony.2.2.2\lib\net48\0Harmony.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Assembly-CSharp-firstpass">
57-
<HintPath>..\..\..\..\..\Downloads\References\Assembly-CSharp-firstpass.dll</HintPath>
56+
<Reference Include="Assembly-CSharp">
57+
<HintPath>..\..\..\Downloads\Dev (7)\Assembly-CSharp-Publicized.dll</HintPath>
58+
</Reference>
59+
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Assembly-CSharp-Publicized.dll</HintPath>
5861
</Reference>
59-
<Reference Include="Assembly-CSharp-Publicized">
60-
<HintPath>..\..\..\..\..\Downloads\References\Assembly-CSharp-Publicized.dll</HintPath>
62+
<Reference Include="Assembly-CSharp-firstpass">
63+
<HintPath>..\..\..\Downloads\Dev (7)\Assembly-CSharp-firstpass.dll</HintPath>
6164
</Reference>
6265
<Reference Include="CommandSystem.Core, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
63-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\CommandSystem.Core.dll</HintPath>
66+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\CommandSystem.Core.dll</HintPath>
6467
</Reference>
65-
<Reference Include="Exiled.API, Version=8.11.0.0, Culture=neutral, processorArchitecture=AMD64">
66-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\Exiled.API.dll</HintPath>
68+
<Reference Include="Exiled.API, Version=9.6.0.0, Culture=neutral, processorArchitecture=Amd64">
69+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Exiled.API.dll</HintPath>
6770
</Reference>
68-
<Reference Include="Exiled.CreditTags, Version=8.11.0.0, Culture=neutral, processorArchitecture=AMD64">
69-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\Exiled.CreditTags.dll</HintPath>
71+
<Reference Include="Exiled.CreditTags, Version=9.6.0.0, Culture=neutral, processorArchitecture=Amd64">
72+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Exiled.CreditTags.dll</HintPath>
7073
</Reference>
71-
<Reference Include="Exiled.CustomItems, Version=8.11.0.0, Culture=neutral, processorArchitecture=AMD64">
72-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\Exiled.CustomItems.dll</HintPath>
74+
<Reference Include="Exiled.CustomItems, Version=9.6.0.0, Culture=neutral, processorArchitecture=Amd64">
75+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Exiled.CustomItems.dll</HintPath>
7376
</Reference>
74-
<Reference Include="Exiled.CustomRoles, Version=8.11.0.0, Culture=neutral, processorArchitecture=AMD64">
75-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\Exiled.CustomRoles.dll</HintPath>
77+
<Reference Include="Exiled.CustomRoles, Version=9.6.0.0, Culture=neutral, processorArchitecture=Amd64">
78+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Exiled.CustomRoles.dll</HintPath>
7679
</Reference>
77-
<Reference Include="Exiled.Events, Version=8.11.0.0, Culture=neutral, processorArchitecture=AMD64">
78-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\Exiled.Events.dll</HintPath>
80+
<Reference Include="Exiled.Events, Version=9.6.0.0, Culture=neutral, processorArchitecture=Amd64">
81+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Exiled.Events.dll</HintPath>
7982
</Reference>
80-
<Reference Include="Exiled.Loader, Version=8.11.0.0, Culture=neutral, processorArchitecture=AMD64">
81-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\Exiled.Loader.dll</HintPath>
83+
<Reference Include="Exiled.Loader, Version=9.6.0.0, Culture=neutral, processorArchitecture=Amd64">
84+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Exiled.Loader.dll</HintPath>
8285
</Reference>
83-
<Reference Include="Exiled.Permissions, Version=8.11.0.0, Culture=neutral, processorArchitecture=AMD64">
84-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\Exiled.Permissions.dll</HintPath>
86+
<Reference Include="Exiled.Permissions, Version=9.6.0.0, Culture=neutral, processorArchitecture=Amd64">
87+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\Exiled.Permissions.dll</HintPath>
88+
</Reference>
89+
<Reference Include="LabApi, Version=0.4.0.0, Culture=neutral, processorArchitecture=Amd64">
90+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\LabApi.dll</HintPath>
8591
</Reference>
8692
<Reference Include="MapEditorReborn">
87-
<HintPath>..\..\..\..\..\Downloads\MapEditorReborn.dll</HintPath>
93+
<HintPath>..\..\..\Downloads\MapEditorReborn (3).dll</HintPath>
8894
</Reference>
8995
<Reference Include="Mirror">
90-
<HintPath>..\..\..\..\..\Downloads\References\Mirror.dll</HintPath>
91-
</Reference>
92-
<Reference Include="NorthwoodLib, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
93-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\NorthwoodLib.dll</HintPath>
94-
</Reference>
95-
<Reference Include="NotAnAPI">
96-
<HintPath>..\..\..\..\..\Downloads\NotAnAPI.dll</HintPath>
96+
<HintPath>..\..\..\Downloads\Dev (7)\Mirror.dll</HintPath>
9797
</Reference>
98-
<Reference Include="PluginAPI, Version=13.1.3.0, Culture=neutral, processorArchitecture=AMD64">
99-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\PluginAPI.dll</HintPath>
98+
<Reference Include="NorthwoodLib, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
99+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\NorthwoodLib.dll</HintPath>
100100
</Reference>
101101
<Reference Include="System" />
102102
<Reference Include="System.Core" />
@@ -107,16 +107,16 @@
107107
<Reference Include="System.Net.Http" />
108108
<Reference Include="System.Xml" />
109109
<Reference Include="UnityEngine">
110-
<HintPath>..\..\..\..\..\Downloads\References\UnityEngine.dll</HintPath>
110+
<HintPath>..\..\..\Downloads\Dev (7)\UnityEngine.dll</HintPath>
111111
</Reference>
112112
<Reference Include="UnityEngine.CoreModule">
113-
<HintPath>..\..\..\..\..\Downloads\References\UnityEngine.CoreModule.dll</HintPath>
113+
<HintPath>..\..\..\Downloads\Dev (7)\UnityEngine.CoreModule.dll</HintPath>
114114
</Reference>
115115
<Reference Include="UnityEngine.PhysicsModule">
116-
<HintPath>..\..\..\..\..\Downloads\References\UnityEngine.PhysicsModule.dll</HintPath>
116+
<HintPath>..\..\..\Downloads\Dev (7)\UnityEngine.PhysicsModule.dll</HintPath>
117117
</Reference>
118118
<Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
119-
<HintPath>..\packages\EXILEDOFFICIAL.8.11.0\lib\net48\YamlDotNet.dll</HintPath>
119+
<HintPath>..\packages\ExMod.Exiled.9.6.0-beta4\lib\net48\YamlDotNet.dll</HintPath>
120120
</Reference>
121121
</ItemGroup>
122122
<ItemGroup>
@@ -140,6 +140,7 @@
140140
<Compile Include="Roles\SCP035.cs" />
141141
</ItemGroup>
142142
<ItemGroup>
143+
<None Include="App.config" />
143144
<None Include="packages.config" />
144145
</ItemGroup>
145146
<ItemGroup>

MyPlugin/Roles/SCP035.cs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,12 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
6-
using Exiled.API.Features;
7-
using Exiled.API.Features.Attributes;
1+
using Exiled.API.Features.Attributes;
82
using Exiled.API.Features.Spawn;
93
using Exiled.CustomRoles.API.Features;
10-
using Exiled.Events;
114
using UnityEngine;
125
using MEC;
13-
using Exiled.CustomItems;
146
using PlayerRoles;
157
using Exiled.API.Enums;
168
using MyPlugin.API;
17-
using Exiled.API.Features.Pickups;
18-
using PluginAPI.Commands;
19-
using Mirror;
209
using Exiled.CustomItems.API.Features;
21-
using Exiled.CustomItems.API.EventArgs;
22-
using Exiled.Events.EventArgs.Player;
23-
using Exiled.Events.Handlers;
24-
using PluginAPI.Core;
2510

2611
namespace MyPlugin.Roles
2712
{

MyPlugin/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="EXILEDOFFICIAL" version="8.11.0" targetFramework="net48" />
3+
<package id="ExMod.Exiled" version="9.6.0-beta4" targetFramework="net48" />
44
<package id="Lib.Harmony" version="2.2.2" targetFramework="net48" />
55
<package id="RueI" version="2.1.0" targetFramework="net48" />
66
</packages>

0 commit comments

Comments
 (0)