From 940e23fe39d14d4ad2e787d1f5b9876a35df8470 Mon Sep 17 00:00:00 2001 From: Erik Simon Date: Wed, 23 Nov 2022 18:31:47 +0100 Subject: [PATCH] another refactor --- .editorconfig | 37 ++++++--- .idea/.idea.Mine2d/.idea/indexLayout.xml | 8 ++ .../.idea/projectSettingsUpdater.xml | 6 ++ .idea/.idea.Mine2d/.idea/workspace.xml | 83 ++++++++++++++++--- Folder.DotSettings => Mine2d.sln.DotSettings | 2 +- Mine2d/{Import.cs => GlobalUsings.cs} | 0 Mine2d/Program.cs | 4 +- Mine2d/core/tiles/TileRegistry.cs | 29 ------- Mine2d/{frontend => engine}/EventPublisher.cs | 22 ++--- Mine2d/{frontend => engine}/EventService.cs | 18 ++-- .../renderer => engine}/IRenderer.cs | 2 +- Mine2d/{backend => engine}/Publisher.cs | 6 +- Mine2d/engine/Shapes.cs | 13 --- Mine2d/engine/TextureFactory.cs | 12 +-- .../{backend => engine/networking}/Backend.cs | 7 +- .../networking}/Frontend.cs | 7 +- .../networking}/IBackend.cs | 2 +- .../networking}/IFrontend.cs | 2 +- Mine2d/engine/{ => networking}/PacketUtils.cs | 4 +- .../networking}/RemoteBackend.cs | 10 +-- Mine2d/{ => game}/Context.cs | 9 +- Mine2d/{ => game}/Controls.cs | 2 +- Mine2d/{ => game}/Mine2dGame.cs | 9 +- Mine2d/{ => game}/backend/data/Packet.cs | 4 +- .../{ => game}/backend/interactor/Breaking.cs | 8 +- .../{ => game}/backend/interactor/Connect.cs | 6 +- Mine2d/{ => game}/backend/interactor/Move.cs | 6 +- .../backend/interactor/WorldGeneration.cs | 30 ++++--- .../{ => game/backend}/network/Converter.cs | 4 +- .../backend}/network/PacketException.cs | 2 +- Mine2d/{ => game}/core/Bootstrapper.cs | 8 +- Mine2d/{ => game}/core/Camera.cs | 2 +- Mine2d/{ => game}/core/Constants.cs | 2 +- Mine2d/{ => game}/core/PlayerEntity.cs | 4 +- Mine2d/{ => game}/core/data/Chunk.cs | 2 +- Mine2d/{ => game}/core/data/STile.cs | 4 +- Mine2d/{ => game}/core/data/World.cs | 2 +- .../core/extensions/AssemblyExtensions.cs | 2 +- .../core/extensions/TypeExtensions.cs | 2 +- Mine2d/{ => game}/core/tiles/OreTile.cs | 2 +- Mine2d/{ => game}/core/tiles/TextureCache.cs | 0 Mine2d/{ => game}/core/tiles/Tile.cs | 4 +- Mine2d/game/core/tiles/TileRegistry.cs | 29 +++++++ .../{ => game}/core/world/ChunkGenerator.cs | 6 +- Mine2d/{ => game}/frontend/events/Exit.cs | 6 +- .../{ => game}/frontend/events/Fullscreen.cs | 4 +- .../frontend/events/PlayerBreakInput.cs | 10 +-- .../{ => game}/frontend/events/PlayerInput.cs | 20 ++--- Mine2d/{ => game}/frontend/events/Resize.cs | 4 +- .../frontend/renderer/BackgroundRenderer.cs | 4 +- .../frontend/renderer/GameRenderer.cs | 4 +- .../frontend/renderer/PlayerRenderer.cs | 4 +- .../frontend/renderer/WorldCursorRenderer.cs | 5 +- .../frontend/renderer/WorldRenderer.cs | 8 +- Mine2d/{ => game}/state/GameState.cs | 6 +- Mine2d/{ => game}/state/Player.cs | 2 +- 56 files changed, 289 insertions(+), 211 deletions(-) create mode 100644 .idea/.idea.Mine2d/.idea/indexLayout.xml create mode 100644 .idea/.idea.Mine2d/.idea/projectSettingsUpdater.xml rename Folder.DotSettings => Mine2d.sln.DotSettings (67%) rename Mine2d/{Import.cs => GlobalUsings.cs} (100%) delete mode 100644 Mine2d/core/tiles/TileRegistry.cs rename Mine2d/{frontend => engine}/EventPublisher.cs (84%) rename Mine2d/{frontend => engine}/EventService.cs (63%) rename Mine2d/{frontend/renderer => engine}/IRenderer.cs (61%) rename Mine2d/{backend => engine}/Publisher.cs (97%) delete mode 100644 Mine2d/engine/Shapes.cs rename Mine2d/{backend => engine/networking}/Backend.cs (95%) rename Mine2d/{frontend => engine/networking}/Frontend.cs (87%) rename Mine2d/{backend => engine/networking}/IBackend.cs (79%) rename Mine2d/{frontend => engine/networking}/IFrontend.cs (69%) rename Mine2d/engine/{ => networking}/PacketUtils.cs (87%) rename Mine2d/{backend => engine/networking}/RemoteBackend.cs (91%) rename Mine2d/{ => game}/Context.cs (92%) rename Mine2d/{ => game}/Controls.cs (96%) rename Mine2d/{ => game}/Mine2dGame.cs (91%) rename Mine2d/{ => game}/backend/data/Packet.cs (97%) rename Mine2d/{ => game}/backend/interactor/Breaking.cs (93%) rename Mine2d/{ => game}/backend/interactor/Connect.cs (87%) rename Mine2d/{ => game}/backend/interactor/Move.cs (93%) rename Mine2d/{ => game}/backend/interactor/WorldGeneration.cs (59%) rename Mine2d/{ => game/backend}/network/Converter.cs (93%) rename Mine2d/{ => game/backend}/network/PacketException.cs (75%) rename Mine2d/{ => game}/core/Bootstrapper.cs (79%) rename Mine2d/{ => game}/core/Camera.cs (94%) rename Mine2d/{ => game}/core/Constants.cs (87%) rename Mine2d/{ => game}/core/PlayerEntity.cs (98%) rename Mine2d/{ => game}/core/data/Chunk.cs (98%) rename Mine2d/{ => game}/core/data/STile.cs (82%) rename Mine2d/{ => game}/core/data/World.cs (98%) rename Mine2d/{ => game}/core/extensions/AssemblyExtensions.cs (90%) rename Mine2d/{ => game}/core/extensions/TypeExtensions.cs (94%) rename Mine2d/{ => game}/core/tiles/OreTile.cs (85%) rename Mine2d/{ => game}/core/tiles/TextureCache.cs (100%) rename Mine2d/{ => game}/core/tiles/Tile.cs (97%) create mode 100644 Mine2d/game/core/tiles/TileRegistry.cs rename Mine2d/{ => game}/core/world/ChunkGenerator.cs (96%) rename Mine2d/{ => game}/frontend/events/Exit.cs (74%) rename Mine2d/{ => game}/frontend/events/Fullscreen.cs (85%) rename Mine2d/{ => game}/frontend/events/PlayerBreakInput.cs (87%) rename Mine2d/{ => game}/frontend/events/PlayerInput.cs (82%) rename Mine2d/{ => game}/frontend/events/Resize.cs (85%) rename Mine2d/{ => game}/frontend/renderer/BackgroundRenderer.cs (95%) rename Mine2d/{ => game}/frontend/renderer/GameRenderer.cs (88%) rename Mine2d/{ => game}/frontend/renderer/PlayerRenderer.cs (92%) rename Mine2d/{ => game}/frontend/renderer/WorldCursorRenderer.cs (93%) rename Mine2d/{ => game}/frontend/renderer/WorldRenderer.cs (96%) rename Mine2d/{ => game}/state/GameState.cs (90%) rename Mine2d/{ => game}/state/Player.cs (92%) diff --git a/.editorconfig b/.editorconfig index 97f1320..b81ceac 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,4 @@ + [*.{appxmanifest,asax,ascx,aspx,axaml,build,c,c++,cc,cginc,compute,cp,cpp,cs,cshtml,cu,cuh,cxx,dtd,fs,fsi,fsscript,fsx,fx,fxh,h,hh,hlsl,hlsli,hlslinc,hpp,hxx,inc,inl,ino,ipp,master,ml,mli,mpp,mq4,mq5,mqh,nuspec,paml,razor,resw,resx,shader,skin,tpp,usf,ush,vb,xaml,xamlx,xoml,xsd}] indent_style = space indent_size = 4 @@ -21,7 +22,7 @@ dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols dotnet_naming_rule.private_static_fields_rule.import_to_resharper = as_predefined dotnet_naming_rule.private_static_fields_rule.severity = warning -dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style_1 +dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols dotnet_naming_rule.private_static_readonly_rule.import_to_resharper = as_predefined dotnet_naming_rule.private_static_readonly_rule.severity = warning @@ -34,8 +35,6 @@ dotnet_naming_rule.unity_serialized_field_rule.severity = warning dotnet_naming_rule.unity_serialized_field_rule.style = lower_camel_case_style dotnet_naming_rule.unity_serialized_field_rule.symbols = unity_serialized_field_symbols dotnet_naming_style.lower_camel_case_style.capitalization = camel_case -dotnet_naming_style.lower_camel_case_style_1.capitalization = camel_case -dotnet_naming_style.lower_camel_case_style_1.required_prefix = _ dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field @@ -57,16 +56,28 @@ dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:none dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion dotnet_style_predefined_type_for_member_access = true:suggestion -dotnet_style_qualification_for_event = false:suggestion -dotnet_style_qualification_for_field = false:suggestion -dotnet_style_qualification_for_method = false:suggestion -dotnet_style_qualification_for_property = false:suggestion -dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion - +dotnet_style_qualification_for_event = true:warning dotnet_style_qualification_for_field = true:warning dotnet_style_qualification_for_method = true:warning dotnet_style_qualification_for_property = true:warning -dotnet_style_qualification_for_event = true:warning -csharp_style_unused_value_expression_statement_preference = false -csharp_style_namespace_declarations=file_scoped:warning -dotnet_diagnostic.CA1805.severity = none +dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion + +# ReSharper properties +resharper_autodetect_indent_settings = true +resharper_use_indent_from_vs = false + +# ReSharper inspection severities +resharper_arrange_redundant_parentheses_highlighting = hint +resharper_arrange_type_member_modifiers_highlighting = hint +resharper_arrange_type_modifiers_highlighting = hint +resharper_built_in_type_reference_style_for_member_access_highlighting = hint +resharper_built_in_type_reference_style_highlighting = hint +resharper_local_variable_hides_member_highlighting = none +resharper_not_accessed_field_local_highlighting = hint +resharper_parameter_hides_member_highlighting = none +resharper_suggest_var_or_type_built_in_types_highlighting = hint +resharper_suggest_var_or_type_elsewhere_highlighting = hint +resharper_suggest_var_or_type_simple_types_highlighting = hint +resharper_web_config_module_not_resolved_highlighting = warning +resharper_web_config_type_not_resolved_highlighting = warning +resharper_web_config_wrong_module_highlighting = warning diff --git a/.idea/.idea.Mine2d/.idea/indexLayout.xml b/.idea/.idea.Mine2d/.idea/indexLayout.xml new file mode 100644 index 0000000..7b08163 --- /dev/null +++ b/.idea/.idea.Mine2d/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.Mine2d/.idea/projectSettingsUpdater.xml b/.idea/.idea.Mine2d/.idea/projectSettingsUpdater.xml new file mode 100644 index 0000000..4bb9f4d --- /dev/null +++ b/.idea/.idea.Mine2d/.idea/projectSettingsUpdater.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/.idea.Mine2d/.idea/workspace.xml b/.idea/.idea.Mine2d/.idea/workspace.xml index 4aef4eb..0d079f9 100644 --- a/.idea/.idea.Mine2d/.idea/workspace.xml +++ b/.idea/.idea.Mine2d/.idea/workspace.xml @@ -8,16 +8,62 @@ - - - - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + @@ -109,7 +163,10 @@