Skip to content

Commit

Permalink
- Updated game data to 4.0
Browse files Browse the repository at this point in the history 
- Fixed connection issue with nwmarketprices.com
  • Loading branch information
@josdemmers
josdemmers committed Jan 20, 2024
1 parent 79504fb commit 2112988
Show file tree
Hide file tree
Showing 41 changed files with 831,495 additions and 849,133 deletions.
3 changes: 2 additions & 1 deletion NewWorldCompanion.Services/HttpClientHandler.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public HttpClientHandler(IEventAggregator eventAggregator, ILogger<HttpClientHan
_client.DefaultRequestHeaders.CacheControl = new CacheControlHeaderValue
{
NoCache = true
};
};
_client.DefaultRequestHeaders.Add("User-Agent", "NewWorldCompanion");
_client.DefaultRequestHeaders.Add("X-Requested-With", "XMLHttpRequest");
}

Expand Down
250 changes: 246 additions & 4 deletions NewWorldCompanion.Services/NewWorldDataStore.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,15 +257,65 @@ public void UpdateStoreData()
_masterItemDefinitionsJson.AddRange(masterItemDefinitionsJson);
}
}

_loadStatusItemDefinitions = $"ItemDefinitions: {_masterItemDefinitionsJson.Count}";
_loadStatusCraftingRecipes = $"CraftingRecipes: 0. Loading recipes";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json
_craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipes.json";

// CraftingRecipe Json (CraftingRecipesArcana)
var craftingRecipesJson = new List<CraftingRecipeJson>();
resourcePath = @".\Data\CraftingRecipesArcana.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Arcana";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesArmorer)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesArmorer.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Armorer";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesCooking)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesCooking.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
Expand All @@ -279,10 +329,202 @@ public void UpdateStoreData()
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

_craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Cooking";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesDungeon)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesDungeon.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Dungeon";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesEngineer)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesEngineer.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Engineer";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesGypKilm)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesGypKilm.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading GypKilm";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesJeweler)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesJeweler.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Jeweler";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesMisc)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesMisc.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Misc";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesRefining)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesRefining.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Refining";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesSeasons)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesSeasons.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}. Loading Seasons";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Thread.Sleep(50);

// CraftingRecipe Json (CraftingRecipesWeapon)
craftingRecipesJson.Clear();
resourcePath = @".\Data\CraftingRecipesWeapon.json";
using (FileStream? stream = File.OpenRead(resourcePath))
{
if (stream != null)
{
// create the options
var options = new JsonSerializerOptions()
{
WriteIndented = true
};
// register the converter
options.Converters.Add(new BoolConverter());
options.Converters.Add(new IntConverter());

craftingRecipesJson = JsonSerializer.Deserialize<List<CraftingRecipeJson>>(stream, options) ?? new List<CraftingRecipeJson>();
_craftingRecipesJson.AddRange(craftingRecipesJson);
}
}
_loadStatusCraftingRecipes = $"CraftingRecipes: {_craftingRecipesJson.Count}";
_loadStatusHouseItems = $"HouseItems: 0. Loading items";
_eventAggregator.GetEvent<NewWorldDataStoreStatusUpdated>().Publish();
Expand Down
Loading

0 comments on commit 2112988

Please sign in to comment.