From ab30f13071731a1912bb9762241f339300b6a51e Mon Sep 17 00:00:00 2001 From: Anna Date: Fri, 19 Mar 2021 16:09:11 -0400 Subject: [PATCH] fix: ignore bozjan field notes --- .editorconfig | 203 ----------------------------------- GoodMemory/ActionType.cs | 7 +- GoodMemory/GameFunctions.cs | 4 +- GoodMemory/GoodMemory.csproj | 31 +++--- GoodMemory/Plugin.cs | 14 +-- 5 files changed, 28 insertions(+), 231 deletions(-) delete mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 2925ccc..0000000 --- a/.editorconfig +++ /dev/null @@ -1,203 +0,0 @@ -# Remove the line below if you want to inherit .editorconfig settings from higher directories -root = true - -# C# files -[*.{cs,json}] - -#### Core EditorConfig Options #### - -# Indentation and spacing -indent_size = 4 -indent_style = space -tab_width = 4 - -# New line preferences -end_of_line = lf -insert_final_newline = true - -[*.cs] - -#### .NET Coding Conventions #### - -# Organize usings -dotnet_separate_import_directive_groups = false -dotnet_sort_system_directives_first = false -file_header_template = unset - -# this. and Me. preferences -dotnet_style_qualification_for_event = true:silent -dotnet_style_qualification_for_field = true:silent -dotnet_style_qualification_for_method = true:silent -dotnet_style_qualification_for_property = true:silent - -# Language keywords vs BCL types preferences -dotnet_style_predefined_type_for_locals_parameters_members = true:silent -dotnet_style_predefined_type_for_member_access = true:silent - -# Parentheses preferences -dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent -dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent -dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent - -# Modifier preferences -dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent - -# Expression-level preferences -dotnet_style_coalesce_expression = true:suggestion -dotnet_style_collection_initializer = true:suggestion -dotnet_style_explicit_tuple_names = true:suggestion -dotnet_style_null_propagation = true:suggestion -dotnet_style_object_initializer = true:suggestion -dotnet_style_operator_placement_when_wrapping = beginning_of_line -dotnet_style_prefer_auto_properties = true:silent -dotnet_style_prefer_compound_assignment = true:suggestion -dotnet_style_prefer_conditional_expression_over_assignment = true:silent -dotnet_style_prefer_conditional_expression_over_return = true:silent -dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion -dotnet_style_prefer_inferred_tuple_names = true:suggestion -dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion -dotnet_style_prefer_simplified_boolean_expressions = true:suggestion -dotnet_style_prefer_simplified_interpolation = true:suggestion - -# Field preferences -dotnet_style_readonly_field = true:suggestion - -# Parameter preferences -dotnet_code_quality_unused_parameters = all:suggestion - -#### C# Coding Conventions #### - -# var preferences -csharp_style_var_elsewhere = false:silent -csharp_style_var_for_built_in_types = false:silent -csharp_style_var_when_type_is_apparent = false:silent - -# Expression-bodied members -csharp_style_expression_bodied_accessors = true:silent -csharp_style_expression_bodied_constructors = false:silent -csharp_style_expression_bodied_indexers = true:silent -csharp_style_expression_bodied_lambdas = true:silent -csharp_style_expression_bodied_local_functions = false:silent -csharp_style_expression_bodied_methods = false:silent -csharp_style_expression_bodied_operators = false:silent -csharp_style_expression_bodied_properties = true:silent - -# Pattern matching preferences -csharp_style_pattern_matching_over_as_with_null_check = true:suggestion -csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion -csharp_style_prefer_switch_expression = true:suggestion - -# Null-checking preferences -csharp_style_conditional_delegate_call = true:suggestion - -# Modifier preferences -csharp_prefer_static_local_function = true:suggestion -csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:silent - -# Code-block preferences -csharp_prefer_braces = true:error -csharp_prefer_simple_using_statement = true:suggestion - -# Expression-level preferences -csharp_prefer_simple_default_expression = true:suggestion -csharp_style_deconstructed_variable_declaration = true:suggestion -csharp_style_inlined_variable_declaration = true:suggestion -csharp_style_pattern_local_over_anonymous_function = true:suggestion -csharp_style_prefer_index_operator = true:suggestion -csharp_style_prefer_range_operator = true:suggestion -csharp_style_throw_expression = true:suggestion -csharp_style_unused_value_assignment_preference = discard_variable:suggestion -csharp_style_unused_value_expression_statement_preference = discard_variable:silent - -# 'using' directive preferences -csharp_using_directive_placement = outside_namespace:silent - -#### C# Formatting Rules #### - -# New line preferences -csharp_new_line_before_catch = false -csharp_new_line_before_else = false -csharp_new_line_before_finally = false -csharp_new_line_before_members_in_anonymous_types = true -csharp_new_line_before_members_in_object_initializers = true -csharp_new_line_before_open_brace = none -csharp_new_line_between_query_expression_clauses = true - -# Indentation preferences -csharp_indent_block_contents = true -csharp_indent_braces = false -csharp_indent_case_contents = true -csharp_indent_case_contents_when_block = true -csharp_indent_labels = one_less_than_current -csharp_indent_switch_labels = true - -# Space preferences -csharp_space_after_cast = false -csharp_space_after_colon_in_inheritance_clause = true -csharp_space_after_comma = true -csharp_space_after_dot = false -csharp_space_after_keywords_in_control_flow_statements = true -csharp_space_after_semicolon_in_for_statement = true -csharp_space_around_binary_operators = before_and_after -csharp_space_around_declaration_statements = false -csharp_space_before_colon_in_inheritance_clause = true -csharp_space_before_comma = false -csharp_space_before_dot = false -csharp_space_before_open_square_brackets = false -csharp_space_before_semicolon_in_for_statement = false -csharp_space_between_empty_square_brackets = false -csharp_space_between_method_call_empty_parameter_list_parentheses = false -csharp_space_between_method_call_name_and_opening_parenthesis = false -csharp_space_between_method_call_parameter_list_parentheses = false -csharp_space_between_method_declaration_empty_parameter_list_parentheses = false -csharp_space_between_method_declaration_name_and_open_parenthesis = false -csharp_space_between_method_declaration_parameter_list_parentheses = false -csharp_space_between_parentheses = false -csharp_space_between_square_brackets = false - -# Wrapping preferences -csharp_preserve_single_line_blocks = true -csharp_preserve_single_line_statements = true - -#### Naming styles #### - -# Naming rules - -dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion -dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface -dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i - -dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.types_should_be_pascal_case.symbols = types -dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case - -dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion -dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members -dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case - -# Symbol specifications - -dotnet_naming_symbols.interface.applicable_kinds = interface -dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.interface.required_modifiers = - -dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum -dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.types.required_modifiers = - -dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method -dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected -dotnet_naming_symbols.non_field_members.required_modifiers = - -# Naming styles - -dotnet_naming_style.pascal_case.required_prefix = -dotnet_naming_style.pascal_case.required_suffix = -dotnet_naming_style.pascal_case.word_separator = -dotnet_naming_style.pascal_case.capitalization = pascal_case - -dotnet_naming_style.begins_with_i.required_prefix = I -dotnet_naming_style.begins_with_i.required_suffix = -dotnet_naming_style.begins_with_i.word_separator = -dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/GoodMemory/ActionType.cs b/GoodMemory/ActionType.cs index bff2855..a992839 100644 --- a/GoodMemory/ActionType.cs +++ b/GoodMemory/ActionType.cs @@ -4,14 +4,14 @@ using System.Linq; namespace GoodMemory { public static class ActionTypeExt { - private static readonly ActionType[] Valid = (ActionType[])Enum.GetValues(typeof(ActionType)); + private static readonly ActionType[] Valid = (ActionType[]) Enum.GetValues(typeof(ActionType)); public static bool IsValidAction(ItemAction? action) { if (action == null || action.RowId == 0) { return false; } - var type = (ActionType)action.Type; + var type = (ActionType) action.Type; return Valid.Contains(type); } } @@ -25,7 +25,8 @@ namespace GoodMemory { Cards = 3_357, // cards GathererBooks = 4_107, // gatherer books OrchestrionRolls = 5_845, // orchestrion rolls - FieldNotes = 19_743, // bozjan field notes + // these appear to be server-side + // FieldNotes = 19_743, // bozjan field notes FashionAccessories = 20_086, // fashion accessories } } diff --git a/GoodMemory/GameFunctions.cs b/GoodMemory/GameFunctions.cs index dfd409a..d48e38e 100644 --- a/GoodMemory/GameFunctions.cs +++ b/GoodMemory/GameFunctions.cs @@ -38,7 +38,7 @@ namespace GoodMemory { return false; } - var type = (ActionType)action.Type; + var type = (ActionType) action.Type; if (type != ActionType.Cards) { return this.HasItemActionUnlocked(action.RowId); @@ -46,7 +46,7 @@ namespace GoodMemory { var cardId = item.AdditionalData; var card = this.Plugin.Interface.Data.GetExcelSheet().GetRow(cardId); - return card != null && this.HasCard((ushort)card.RowId); + return card != null && this.HasCard((ushort) card.RowId); } private bool HasItemActionUnlocked(long itemActionId) { diff --git a/GoodMemory/GoodMemory.csproj b/GoodMemory/GoodMemory.csproj index 6384bce..00866ea 100644 --- a/GoodMemory/GoodMemory.csproj +++ b/GoodMemory/GoodMemory.csproj @@ -1,28 +1,27 @@  - 8 + latest enable - 1.0.4 - 1.0.4 + 1.0.4 net48 true - - $(AppData)\XIVLauncher\addon\Hooks\Dalamud.dll - false - - - $(AppData)\XIVLauncher\addon\Hooks\Lumina.dll - false - - - $(AppData)\XIVLauncher\addon\Hooks\Lumina.Excel.dll - false - + + $(AppData)\XIVLauncher\addon\Hooks\dev\Dalamud.dll + false + + + $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.dll + false + + + $(AppData)\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll + false + - + diff --git a/GoodMemory/Plugin.cs b/GoodMemory/Plugin.cs index c8b5e71..c8da990 100644 --- a/GoodMemory/Plugin.cs +++ b/GoodMemory/Plugin.cs @@ -41,7 +41,7 @@ namespace GoodMemory { public void Dispose() { // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method - Dispose(true); + this.Dispose(true); GC.SuppressFinalize(this); } @@ -77,7 +77,7 @@ namespace GoodMemory { itemId -= 1_000_000; } - var item = this.Interface.Data.GetExcelSheet().GetRow((uint)itemId); + var item = this.Interface.Data.GetExcelSheet().GetRow((uint) itemId); if (item == null) { return; @@ -89,7 +89,7 @@ namespace GoodMemory { var start = *startPtr; // work around function being called twice - if (start == (byte*)this._alloc) { + if (start == (byte*) this._alloc) { return; } @@ -136,10 +136,10 @@ namespace GoodMemory { } // write our replacement text into our own managed memory (4096 bytes) - WriteString((byte*)this._alloc, overwrite, true); + WriteString((byte*) this._alloc, overwrite, true); // overwrite the original pointer with our own - *startPtr = (byte*)this._alloc; + *startPtr = (byte*) this._alloc; } private unsafe IntPtr OnTooltip(IntPtr a1, uint** a2, byte*** a3) { @@ -200,7 +200,7 @@ namespace GoodMemory { : $"{txt}\n{acquired}{parenL}{name}{parenR}{colon}{has}"; } - private unsafe static string ReadString(byte* ptr) { + private static unsafe string ReadString(byte* ptr) { var offset = 0; while (true) { var b = *(ptr + offset); @@ -214,7 +214,7 @@ namespace GoodMemory { return Encoding.UTF8.GetString(ptr, offset); } - private unsafe static void WriteString(byte* dst, string s, bool finalise = false) { + private static unsafe void WriteString(byte* dst, string s, bool finalise = false) { var bytes = Encoding.UTF8.GetBytes(s); for (var i = 0; i < bytes.Length; i++) { *(dst + i) = bytes[i];