Skip to content

Commit

Permalink
Updated game data to 1.9
Browse files Browse the repository at this point in the history
  • Loading branch information
josdemmers committed Apr 5, 2023
1 parent 7a918a8 commit 80174af
Show file tree
Hide file tree
Showing 31 changed files with 254,904 additions and 150,405 deletions.
1 change: 1 addition & 0 deletions NewWorldCompanion.Services/ScreenCaptureHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ private void CoordinatesTimer_Tick(object? sender, EventArgs e)
#endregion

// Start of Methods region

#region Methods

private async void StartScreenCapture()
Expand Down
29 changes: 11 additions & 18 deletions NewWorldCompanion/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,18 +1,15 @@
using Emgu.CV.Cuda;
using DryIoc;
using DryIoc.Microsoft.DependencyInjection;
using MahApps.Metro.Controls.Dialogs;
using Microsoft.Extensions.DependencyInjection;
using NewWorldCompanion.Entities;
using NewWorldCompanion.Interfaces;
using NewWorldCompanion.Services;
using NewWorldCompanion.Views;
using NLog.Extensions.Logging;
using Prism.DryIoc;
using Prism.Ioc;
using Prism.Unity;
using System.IO;
using System.Threading;
using System.Windows;
using Unity;
using Unity.Microsoft.DependencyInjection;

namespace NewWorldCompanion
{
Expand All @@ -39,6 +36,12 @@ protected override void OnStartup(StartupEventArgs e)
base.OnStartup(e);
}

protected override Window CreateShell()
{
var w = Container.Resolve<MainWindow>();
return w;
}

protected override void RegisterTypes(IContainerRegistry containerRegistry)
{
// Register services
Expand Down Expand Up @@ -66,17 +69,7 @@ protected override IContainerExtension CreateContainerExtension()
serviceCollection.AddLogging(loggingBuilder =>
loggingBuilder.AddNLog(configFileRelativePath: "Config/NLog.config"));

var container = new UnityContainer();
container.BuildServiceProvider(serviceCollection);

return new UnityContainerExtension(container);
}


protected override Window CreateShell()
{
var w = Container.Resolve<MainWindow>();
return w;
return new DryIocContainerExtension(new Container(CreateContainerRules()).WithDependencyInjectionAdapter(serviceCollection));
}
}
}
}
Loading

0 comments on commit 80174af

Please sign in to comment.