Skip to content

Commit 3e02b9b

Browse files
GrafDimenzioGrafDimenzio
committed
update to Synapse 3 beta 1.1
1 parent 7f3cae1 commit 3e02b9b

File tree

7 files changed

+83
-123
lines changed

7 files changed

+83
-123
lines changed

‎MoreTools/App.config

+8
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,14 @@
99
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
1010
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
1111
</dependentAssembly>
12+
<dependentAssembly>
13+
<assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-0.11.4.0" newVersion="0.11.4.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<assemblyIdentity name="0Harmony" publicKeyToken="null" culture="neutral" />
18+
<bindingRedirect oldVersion="0.0.0.0-2.10.0.0" newVersion="2.10.0.0" />
19+
</dependentAssembly>
1220
</assemblyBinding>
1321
</runtime>
1422
</configuration>

‎MoreTools/Commands/RagDoll.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using Neuron.Core.Meta;
22
using Neuron.Modules.Commands;
33
using Neuron.Modules.Commands.Command;
4+
using PlayerRoles;
45
using Synapse3.SynapseModule.Command;
56
using Synapse3.SynapseModule.Enums;
67
using Synapse3.SynapseModule.Map.Objects;
@@ -67,7 +68,7 @@ public override void Execute(SynapseContext context, ref CommandResult result)
6768

6869
for (int i = 0; i < amount; i++)
6970
{
70-
_ = new SynapseRagdoll((RoleType)role, DamageType.Unknown, pos, ply.Rotation, ply.Scale, name);
71+
_ = new SynapseRagDoll((RoleTypeId)role, pos, ply.Rotation, ply.Scale, ply, DamageType.Unknown, name);
7172
}
7273
}
7374

‎MoreTools/Commands/SprintSpeed.cs

-47
This file was deleted.

‎MoreTools/Commands/WalkSpeed.cs

-47
This file was deleted.

‎MoreTools/MoreTools.csproj

+46-9
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>MoreTools</RootNamespace>
1111
<AssemblyName>MoreTools</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<Deterministic>true</Deterministic>
1515
<LangVersion>10</LangVersion>
@@ -34,8 +34,14 @@
3434
<PlatformTarget>x64</PlatformTarget>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Reference Include="Assembly-CSharp">
38-
<HintPath>..\..\..\..\Synapse-synapse3\Synapse3.SynapseModule\bin\Debug\net472\Assembly-CSharp-Publicized.dll</HintPath>
37+
<Reference Include="0Harmony, Version=2.10.0.0, Culture=neutral, processorArchitecture=MSIL">
38+
<HintPath>..\packages\HarmonyX.2.10.0\lib\net45\0Harmony.dll</HintPath>
39+
</Reference>
40+
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
41+
<HintPath>..\packages\SynapseSL.3.0.0-pre1.1\lib\net48\Assembly-CSharp.dll</HintPath>
42+
</Reference>
43+
<Reference Include="Assembly-CSharp-firstpass, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\packages\SynapseSL.3.0.0-pre1.1\lib\net48\Assembly-CSharp-firstpass.dll</HintPath>
3945
</Reference>
4046
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
4147
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@@ -58,21 +64,48 @@
5864
<Reference Include="Microsoft.Extensions.Primitives, Version=6.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
5965
<HintPath>..\packages\Microsoft.Extensions.Primitives.6.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
6066
</Reference>
67+
<Reference Include="Mirror, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\packages\SynapseSL.3.0.0-pre1.1\lib\net48\Mirror.dll</HintPath>
69+
</Reference>
70+
<Reference Include="Mono.Cecil, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
71+
<HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Mono.Cecil.Mdb, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
74+
<HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
75+
</Reference>
76+
<Reference Include="Mono.Cecil.Pdb, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
77+
<HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
78+
</Reference>
79+
<Reference Include="Mono.Cecil.Rocks, Version=0.11.4.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
80+
<HintPath>..\packages\Mono.Cecil.0.11.4\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
81+
</Reference>
82+
<Reference Include="MonoMod.RuntimeDetour, Version=22.3.23.4, Culture=neutral, processorArchitecture=MSIL">
83+
<HintPath>..\packages\MonoMod.RuntimeDetour.22.3.23.4\lib\net452\MonoMod.RuntimeDetour.dll</HintPath>
84+
</Reference>
85+
<Reference Include="MonoMod.Utils, Version=22.3.23.4, Culture=neutral, processorArchitecture=MSIL">
86+
<HintPath>..\packages\MonoMod.Utils.22.3.23.4\lib\net452\MonoMod.Utils.dll</HintPath>
87+
</Reference>
6188
<Reference Include="mscorlib" />
6289
<Reference Include="Neuron.Core, Version=1.0.0.5, Culture=neutral, processorArchitecture=Amd64">
6390
<HintPath>..\packages\NeuronModding.Core.1.0.0.5\lib\netstandard2.0\Neuron.Core.dll</HintPath>
6491
</Reference>
6592
<Reference Include="Neuron.Modules.Commands, Version=1.0.0.5, Culture=neutral, processorArchitecture=Amd64">
6693
<HintPath>..\packages\NeuronModding.Modules.Commands.1.0.0.5\lib\netstandard2.0\Neuron.Modules.Commands.dll</HintPath>
6794
</Reference>
95+
<Reference Include="Neuron.Modules.Configs, Version=1.0.0.5, Culture=neutral, processorArchitecture=Amd64">
96+
<HintPath>..\packages\NeuronModding.Modules.Configs.1.0.0.5\lib\netstandard2.0\Neuron.Modules.Configs.dll</HintPath>
97+
</Reference>
98+
<Reference Include="Neuron.Modules.Patcher, Version=1.0.0.5, Culture=neutral, processorArchitecture=Amd64">
99+
<HintPath>..\packages\NeuronModding.Modules.Patcher.1.0.0.5\lib\netstandard2.0\Neuron.Modules.Patcher.dll</HintPath>
100+
</Reference>
68101
<Reference Include="Ninject, Version=3.3.6.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
69102
<HintPath>..\packages\Ninject.3.3.6\lib\net45\Ninject.dll</HintPath>
70103
</Reference>
71104
<Reference Include="SYML, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
72105
<HintPath>..\packages\SYML.1.0.2\lib\netstandard2.0\SYML.dll</HintPath>
73106
</Reference>
74-
<Reference Include="Synapse3.SynapseModule">
75-
<HintPath>..\..\..\..\Synapse-synapse3\Synapse3.SynapseModule\bin\Debug\net472\Synapse3.SynapseModule.dll</HintPath>
107+
<Reference Include="Synapse3.SynapseModule, Version=3.0.0.0, Culture=neutral, processorArchitecture=Amd64">
108+
<HintPath>..\packages\SynapseSL.3.0.0-pre1.1\lib\net48\Synapse3.SynapseModule.dll</HintPath>
76109
</Reference>
77110
<Reference Include="System" />
78111
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -100,8 +133,14 @@
100133
<Reference Include="System.Data" />
101134
<Reference Include="System.Net.Http" />
102135
<Reference Include="System.Xml" />
103-
<Reference Include="UnityEngine.CoreModule">
104-
<HintPath>..\..\..\..\Synapse-synapse3\Synapse3.SynapseModule\bin\Debug\net472\UnityEngine.CoreModule.dll</HintPath>
136+
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
137+
<HintPath>..\packages\SynapseSL.3.0.0-pre1.1\lib\net48\UnityEngine.dll</HintPath>
138+
</Reference>
139+
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
140+
<HintPath>..\packages\SynapseSL.3.0.0-pre1.1\lib\net48\UnityEngine.CoreModule.dll</HintPath>
141+
</Reference>
142+
<Reference Include="UnityEngine.PhysicsModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
143+
<HintPath>..\packages\SynapseSL.3.0.0-pre1.1\lib\net48\UnityEngine.PhysicsModule.dll</HintPath>
105144
</Reference>
106145
<Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
107146
<HintPath>..\packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll</HintPath>
@@ -129,8 +168,6 @@
129168
<Compile Include="Commands\Show.cs" />
130169
<Compile Include="Commands\Hide.cs" />
131170
<Compile Include="Commands\Size.cs" />
132-
<Compile Include="Commands\SprintSpeed.cs" />
133-
<Compile Include="Commands\WalkSpeed.cs" />
134171
<Compile Include="MoreToolsConfig.cs" />
135172
<Compile Include="MoreTools.cs" />
136173
<Compile Include="Properties\AssemblyInfo.cs" />

‎MoreTools/MoreToolsConfig.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Collections.Generic;
22
using Neuron.Core.Meta;
3+
using PlayerRoles;
34
using Syml;
45
using Synapse3.SynapseModule.Config;
56
using Synapse3.SynapseModule.Map.Rooms;
@@ -16,8 +17,8 @@ public class MoreToolsConfig : IDocumentSection
1617
new SerializedPlayerState()
1718
{
1819
Position = new RoomPoint("Surface", new Vector3(53.68f, 19.42f, -44.23f), Vector3.zero),
19-
RoleType = RoleType.Tutorial,
20-
RoleID = (uint)RoleType.Tutorial
20+
RoleType = RoleTypeId.Tutorial,
21+
RoleID = (uint)RoleTypeId.Tutorial
2122
}
2223
};
2324
}

‎MoreTools/packages.config

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,27 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net472" />
4-
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net472" />
5-
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.1" targetFramework="net472" />
6-
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net472" />
7-
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net472" />
8-
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net472" />
9-
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net472" />
10-
<package id="NeuronModding.Core" version="1.0.0.5" targetFramework="net472" />
11-
<package id="NeuronModding.Modules.Commands" version="1.0.0.5" targetFramework="net472" />
12-
<package id="SYML" version="1.0.2" targetFramework="net472" />
13-
<package id="System.Memory" version="4.5.4" targetFramework="net472" />
14-
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
15-
<package id="Ninject" version="3.3.6" targetFramework="net472" />
16-
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
17-
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
18-
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
19-
<package id="YamlDotNet" version="11.2.1" targetFramework="net472" />
3+
<package id="HarmonyX" version="2.10.0" targetFramework="net48" />
4+
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net48" />
5+
<package id="Microsoft.Extensions.Caching.Abstractions" version="6.0.0" targetFramework="net48" />
6+
<package id="Microsoft.Extensions.Caching.Memory" version="6.0.1" targetFramework="net48" />
7+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="6.0.0" targetFramework="net48" />
8+
<package id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" targetFramework="net48" />
9+
<package id="Microsoft.Extensions.Options" version="6.0.0" targetFramework="net48" />
10+
<package id="Microsoft.Extensions.Primitives" version="6.0.0" targetFramework="net48" />
11+
<package id="Mono.Cecil" version="0.11.4" targetFramework="net48" />
12+
<package id="MonoMod.RuntimeDetour" version="22.3.23.4" targetFramework="net48" />
13+
<package id="MonoMod.Utils" version="22.3.23.4" targetFramework="net48" />
14+
<package id="NeuronModding.Core" version="1.0.0.5" targetFramework="net48" />
15+
<package id="NeuronModding.Modules.Commands" version="1.0.0.5" targetFramework="net48" />
16+
<package id="NeuronModding.Modules.Configs" version="1.0.0.5" targetFramework="net48" />
17+
<package id="NeuronModding.Modules.Patcher" version="1.0.0.5" targetFramework="net48" />
18+
<package id="Ninject" version="3.3.6" targetFramework="net48" />
19+
<package id="SYML" version="1.0.2" targetFramework="net48" />
20+
<package id="SynapseSL" version="3.0.0-pre1.1" targetFramework="net48" />
21+
<package id="System.Buffers" version="4.5.1" targetFramework="net48" />
22+
<package id="System.Memory" version="4.5.4" targetFramework="net48" />
23+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net48" />
24+
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net48" />
25+
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
26+
<package id="YamlDotNet" version="11.2.1" targetFramework="net48" />
2027
</packages>

0 commit comments

Comments
 (0)