Skip to content

Update to use the new dependency manager #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jimmacle merged 1 commit into from
Aug 20, 2017
Merged

Update to use the new dependency manager #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Update to use the new dependency manager 
Project file using relative references.
  • Loading branch information
@Equinox-
Equinox- committed Aug 19, 2017
commit 3f2424d68a1861413bbd8642debff0d62467e7eb
3 changes: 2 additions & 1 deletion Essentials/AutoCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Torch;
using Torch.API;
using Torch.Commands;
using Torch.API.Managers;
using Torch.Server;

namespace Essentials
Expand Down Expand Up @@ -39,7 +40,7 @@ private void RunCommand(object state)
var autoCommand = (AutoCommand)state;
TorchBase.Instance.Invoke(() =>
{
var manager = TorchBase.Instance.GetManager<CommandManager>();
var manager = TorchBase.Instance.Managers.GetManager<CommandManager>();
manager?.HandleCommandFromServer(autoCommand.Command);
});
}
Expand Down
3 changes: 2 additions & 1 deletion Essentials/Commands/PlayerModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using VRage.Game;
using VRage.Game.ModAPI;
using VRage.ModAPI;
using Torch.API.Managers;

namespace Essentials
{
Expand All @@ -20,7 +21,7 @@ public class PlayerModule : CommandModule
[Command("say", "Say a message as the server.")]
public void Say(string message)
{
Context.Torch.GetManager<MultiplayerManager>()?.SendMessage(Context.RawArgs);
Context.Torch.Managers.GetManager<MultiplayerManager>()?.SendMessage(Context.RawArgs);
}

[Command("tp", "Teleport one entity to another.")]
Expand Down
63 changes: 22 additions & 41 deletions Essentials/Essentials.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
Expand All @@ -12,23 +10,6 @@
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
Expand All @@ -54,22 +35,22 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Sandbox.Common">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Common.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\Sandbox.Common.dll</HintPath>
</Reference>
<Reference Include="Sandbox.Game">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Game.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\Sandbox.Game.dll</HintPath>
</Reference>
<Reference Include="Sandbox.Graphics">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\Sandbox.Graphics.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\Sandbox.Graphics.dll</HintPath>
</Reference>
<Reference Include="SpaceEngineers.Game">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.Game.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\SpaceEngineers.Game.dll</HintPath>
</Reference>
<Reference Include="SpaceEngineers.ObjectBuilders">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.ObjectBuilders.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\SpaceEngineers.ObjectBuilders.dll</HintPath>
</Reference>
<Reference Include="SpaceEngineers.ObjectBuilders.XmlSerializers">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\SpaceEngineers.ObjectBuilders.XmlSerializers.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -82,52 +63,52 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Torch">
<HintPath>..\..\Torch\Torch.Server\bin\x64\Release\Torch.dll</HintPath>
<HintPath>..\..\Torch\bin\x64\Release\Torch.dll</HintPath>
</Reference>
<Reference Include="Torch.API">
<HintPath>..\..\Torch\Torch.Server\bin\x64\Release\Torch.API.dll</HintPath>
<HintPath>..\..\Torch\bin\x64\Release\Torch.API.dll</HintPath>
</Reference>
<Reference Include="Torch.Server">
<HintPath>..\..\Torch\Torch.Server\bin\x64\Release\Torch.Server.exe</HintPath>
<HintPath>..\..\Torch\bin\x64\Release\Torch.Server.exe</HintPath>
</Reference>
<Reference Include="VRage">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.dll</HintPath>
</Reference>
<Reference Include="VRage.Audio">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Audio.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Audio.dll</HintPath>
</Reference>
<Reference Include="VRage.Dedicated">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Dedicated.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Dedicated.dll</HintPath>
</Reference>
<Reference Include="VRage.Game">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Game.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Game.dll</HintPath>
</Reference>
<Reference Include="VRage.Game.XmlSerializers">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Game.XmlSerializers.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Game.XmlSerializers.dll</HintPath>
</Reference>
<Reference Include="VRage.Input">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Input.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Input.dll</HintPath>
</Reference>
<Reference Include="VRage.Library">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Library.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Library.dll</HintPath>
</Reference>
<Reference Include="VRage.Math">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Math.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Math.dll</HintPath>
</Reference>
<Reference Include="VRage.Native">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Native.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Native.dll</HintPath>
</Reference>
<Reference Include="VRage.OpenVRWrapper">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.OpenVRWrapper.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.OpenVRWrapper.dll</HintPath>
</Reference>
<Reference Include="VRage.Render">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Render.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Render.dll</HintPath>
</Reference>
<Reference Include="VRage.Render11">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Render11.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Render11.dll</HintPath>
</Reference>
<Reference Include="VRage.Scripting">
<HintPath>..\..\..\..\..\..\..\steamcmd\steamapps\common\SpaceEngineersDedicatedServer\DedicatedServer64\VRage.Scripting.dll</HintPath>
<HintPath>..\..\Torch\GameBinaries\VRage.Scripting.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
Expand Down
11 changes: 6 additions & 5 deletions Essentials/Essentials.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.3
VisualStudioVersion = 15.0.26730.8
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Essentials", "Essentials.csproj", "{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}"
EndProject
Expand All @@ -13,16 +13,17 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Debug|Any CPU.ActiveCfg = Debug|x64
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Debug|x64.ActiveCfg = Debug|x64
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Debug|x64.Build.0 = Debug|x64
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Release|Any CPU.Build.0 = Release|Any CPU
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Release|Any CPU.ActiveCfg = Release|x64
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Release|x64.ActiveCfg = Release|x64
{A4C5FC37-5848-4A75-8CDC-4A1ADB2E01A2}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F5A14432-44BA-480B-8B20-1AC78BEF79BC}
EndGlobalSection
EndGlobal