-
-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- The craft overlay has arrived, this collapsable overlay will show y…
…ou the next steps in your current craft project. - Has a menu for each item for buying/gathering/crafting - Is retainer aware, so it'll only show you what you need to extract from each retainer while it's open - Provides quick switching between active craft list - Item icons within the AT interface can now be hovered and a tooltip will show, this can be configured to show never/on icon hover/row hover - Right clicking on any item within AT will now provide a Gather/Buy/Craft menu with the ability to teleport to specific nodes/shops - Fishing/Spearfishing items should show more accurate locations - New filter called "Glamour Ready Combined", shows if an item is part of a set that gets combined in the glamour chest - Certain vendors were not showing due to having no name will now show their NPCs name instead - Extra vendors have been included - Housing vendors have been de-deduplicated - The item window will show if an item has been combined into a glamour ready set - Initial 7.11 data
- Loading branch information
1 parent
131e700
commit 9e68e4d
Showing
78 changed files
with
2,532 additions
and
703 deletions.
There are no files selected for viewing
Submodule CriticalCommonLib
updated
9 files
+107 −0 | Crafting/CraftList.cs | |
+22 −0 | Crafting/NextCraftStep.cs | |
+1 −1 | CriticalCommonLib.csproj | |
+2 −0 | Interfaces/ITeleporterIpc.cs | |
+29 −1 | Services/ChatUtilities.cs | |
+5 −0 | Services/IChatUtilities.cs | |
+20 −20 | Services/InventoryMonitor.cs | |
+55 −1 | Services/InventoryScanner.cs | |
+9 −9 | packages.lock.json |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using Newtonsoft.Json; | ||
using Newtonsoft.Json.Linq; | ||
|
||
namespace InventoryTools.Converters; | ||
|
||
public class EnumDictionaryConverter : JsonConverter<Dictionary<string, Enum>> | ||
{ | ||
public override void WriteJson(JsonWriter writer, Dictionary<string, Enum> value, JsonSerializer serializer) | ||
{ | ||
writer.WriteStartObject(); | ||
foreach (var kvp in value) | ||
{ | ||
writer.WritePropertyName(kvp.Key); | ||
writer.WriteStartObject(); | ||
writer.WritePropertyName("Type"); | ||
writer.WriteValue(kvp.Value.GetType().FullName); | ||
writer.WritePropertyName("Assembly"); | ||
writer.WriteValue(kvp.Value.GetType().Assembly.GetName().Name); | ||
writer.WritePropertyName("Value"); | ||
writer.WriteValue(kvp.Value.ToString()); | ||
writer.WriteEndObject(); | ||
} | ||
writer.WriteEndObject(); | ||
} | ||
|
||
public override Dictionary<string, Enum> ReadJson(JsonReader reader, Type objectType, Dictionary<string, Enum> existingValue, bool hasExistingValue, JsonSerializer serializer) | ||
{ | ||
var result = new Dictionary<string, Enum>(); | ||
var jsonObject = JObject.Load(reader); | ||
|
||
foreach (var property in jsonObject.Properties()) | ||
{ | ||
string key = property.Name; | ||
var typeString = property.Value["Type"]?.ToString(); | ||
var assemblyString = property.Value["Assembly"]?.ToString(); | ||
var valueString = property.Value["Value"]?.ToString(); | ||
|
||
Type enumType = AppDomain.CurrentDomain.GetAssemblies().First(c => c.GetName().Name == assemblyString).GetType(typeString); | ||
if (enumType == null) | ||
{ | ||
throw new JsonSerializationException($"Unknown type: {typeString}"); | ||
} | ||
|
||
var enumValue = Enum.Parse(enumType, valueString); | ||
result[key] = (Enum)enumValue; | ||
} | ||
|
||
return result; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.