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 @@
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -25,9 +71,16 @@
-
-
+
+
+
+
+
+
+
+
+
@@ -49,13 +102,14 @@
"ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
"WebServerToolWindowFactoryState": "false",
+ "XThreadsFramesViewSplitterKey": "0.5005688",
"last_opened_file_path": "/mnt/storage_01/data/Dev/repos/Mine2d/Mine2d/Mine2d.csproj",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.tslint": "(autodetect)",
+ "settings.editor.selected.configurable": "preferences.sourceCode.C#",
"vue.rearranger.settings.migration": "true"
}
}]]>
@@ -109,7 +163,10 @@
1668298144432
-
+
+
+
+
diff --git a/Folder.DotSettings b/Mine2d.sln.DotSettings
similarity index 67%
rename from Folder.DotSettings
rename to Mine2d.sln.DotSettings
index 4d5bb0f..8d8ab74 100644
--- a/Folder.DotSettings
+++ b/Mine2d.sln.DotSettings
@@ -1,2 +1,2 @@
- True
\ No newline at end of file
+ SDL
\ No newline at end of file
diff --git a/Mine2d/Import.cs b/Mine2d/GlobalUsings.cs
similarity index 100%
rename from Mine2d/Import.cs
rename to Mine2d/GlobalUsings.cs
diff --git a/Mine2d/Program.cs b/Mine2d/Program.cs
index d455dc2..c2da08f 100644
--- a/Mine2d/Program.cs
+++ b/Mine2d/Program.cs
@@ -1,4 +1,6 @@
-namespace Mine2d;
+using Mine2d.game;
+
+namespace Mine2d;
public class Program
{
diff --git a/Mine2d/core/tiles/TileRegistry.cs b/Mine2d/core/tiles/TileRegistry.cs
deleted file mode 100644
index 6152657..0000000
--- a/Mine2d/core/tiles/TileRegistry.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace Mine2d.core.tiles;
-
-public enum Tiles
-{
- Stone = 1,
- Ore1 = 2,
- Ore2 = 3,
- Ore3 = 4,
- Ore4 = 5,
-}
-
-public class TileRegistry
-{
- public Dictionary Tiles { get; set; } = new();
-
- public void RegisterTile()
- {
- this.Tiles.Add(1, new Tile("stone", "stone", 5));
- this.Tiles.Add(2, new OreTile("ore1", new string[] { "stone", "ore1" }, 5));
- this.Tiles.Add(3, new OreTile("ore2", new string[] { "stone", "ore2" }, 7));
- this.Tiles.Add(4, new OreTile("ore3", new string[] { "stone", "ore3" }, 8));
- this.Tiles.Add(5, new OreTile("ore4", new string[] { "stone", "ore4" }, 10));
- }
-
- public Tile GetTile(int id)
- {
- return this.Tiles[id];
- }
-}
diff --git a/Mine2d/frontend/EventPublisher.cs b/Mine2d/engine/EventPublisher.cs
similarity index 84%
rename from Mine2d/frontend/EventPublisher.cs
rename to Mine2d/engine/EventPublisher.cs
index ea01b81..af843aa 100644
--- a/Mine2d/frontend/EventPublisher.cs
+++ b/Mine2d/engine/EventPublisher.cs
@@ -1,13 +1,13 @@
-using Mine2d.core.extensions;
using Mine2d.engine.system;
using Mine2d.engine.system.annotations;
+using Mine2d.game.core.extensions;
-namespace Mine2d.frontend;
+namespace Mine2d.engine;
internal struct EventAction
{
- public EventPriority priority;
- public Delegate del;
+ public EventPriority Priority;
+ public Delegate Del;
}
public class EventPublisher
@@ -48,8 +48,8 @@ public class EventPublisher
);
this.eventListeners[eventType].Add(new EventAction
{
- priority = ((EventListenerAttribute)attributes[0]).Priority,
- del = del
+ Priority = ((EventListenerAttribute)attributes[0]).Priority,
+ Del = del
});
}
}
@@ -57,7 +57,7 @@ public class EventPublisher
foreach (var (_, value) in this.eventListeners)
{
- value.Sort((a, b) => a.priority.CompareTo(b.priority));
+ value.Sort((a, b) => a.Priority.CompareTo(b.Priority));
}
}
@@ -68,7 +68,7 @@ public class EventPublisher
Console.WriteLine(eventType);
foreach (var action in this.eventListeners[eventType])
{
- Console.WriteLine(action.del.Method.Name);
+ Console.WriteLine(action.Del.Method.Name);
}
}
}
@@ -81,13 +81,13 @@ public class EventPublisher
{
foreach (var action in this.eventListeners[eventType])
{
- if (action.del.Method.GetParameters().Length == 0)
+ if (action.Del.Method.GetParameters().Length == 0)
{
- action.del.DynamicInvoke();
+ action.Del.DynamicInvoke();
}
else
{
- action.del.DynamicInvoke(e);
+ action.Del.DynamicInvoke(e);
}
}
}
diff --git a/Mine2d/frontend/EventService.cs b/Mine2d/engine/EventService.cs
similarity index 63%
rename from Mine2d/frontend/EventService.cs
rename to Mine2d/engine/EventService.cs
index 7e5b7bd..8a77635 100644
--- a/Mine2d/frontend/EventService.cs
+++ b/Mine2d/engine/EventService.cs
@@ -1,10 +1,10 @@
using Mine2d.engine.system;
-namespace Mine2d.frontend;
+namespace Mine2d.engine;
public class EventService
{
- private static readonly EventPublisher eventPublisher = new();
+ private static readonly EventPublisher EventPublisher = new();
public static void PollEvents()
{
@@ -12,31 +12,31 @@ public class EventService
{
if (e.type == SDL_EventType.SDL_QUIT)
{
- eventPublisher.Publish(EventType.Quit, e);
+ EventPublisher.Publish(EventType.Quit, e);
}
if (e.type == SDL_EventType.SDL_WINDOWEVENT && e.window.windowEvent == SDL_WindowEventID.SDL_WINDOWEVENT_RESIZED)
{
- eventPublisher.Publish(EventType.WindowResize, e);
+ EventPublisher.Publish(EventType.WindowResize, e);
}
if (e.type == SDL_EventType.SDL_MOUSEMOTION)
{
- eventPublisher.Publish(EventType.MouseMotion, e);
+ EventPublisher.Publish(EventType.MouseMotion, e);
}
if (e.type == SDL_EventType.SDL_MOUSEBUTTONDOWN && e.button.button == SDL_BUTTON_LEFT)
{
- eventPublisher.Publish(EventType.MouseButtonDown, e);
+ EventPublisher.Publish(EventType.MouseButtonDown, e);
}
if (e.type == SDL_EventType.SDL_MOUSEBUTTONUP && e.button.button == SDL_BUTTON_LEFT)
{
- eventPublisher.Publish(EventType.MouseButtonUp, e);
+ EventPublisher.Publish(EventType.MouseButtonUp, e);
}
if (e.type == SDL_EventType.SDL_KEYDOWN)
{
- eventPublisher.Publish(EventType.KeyDown, e);
+ EventPublisher.Publish(EventType.KeyDown, e);
}
if (e.type == SDL_EventType.SDL_KEYUP)
{
- eventPublisher.Publish(EventType.KeyUp, e);
+ EventPublisher.Publish(EventType.KeyUp, e);
}
}
}
diff --git a/Mine2d/frontend/renderer/IRenderer.cs b/Mine2d/engine/IRenderer.cs
similarity index 61%
rename from Mine2d/frontend/renderer/IRenderer.cs
rename to Mine2d/engine/IRenderer.cs
index a0ddda0..1e23371 100644
--- a/Mine2d/frontend/renderer/IRenderer.cs
+++ b/Mine2d/engine/IRenderer.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.frontend.renderer;
+namespace Mine2d.engine;
public interface IRenderer
{
diff --git a/Mine2d/backend/Publisher.cs b/Mine2d/engine/Publisher.cs
similarity index 97%
rename from Mine2d/backend/Publisher.cs
rename to Mine2d/engine/Publisher.cs
index 02686c0..d43da77 100644
--- a/Mine2d/backend/Publisher.cs
+++ b/Mine2d/engine/Publisher.cs
@@ -1,9 +1,9 @@
using System.Reflection;
-using Mine2d.core.extensions;
-using Mine2d.engine;
+using Mine2d.engine.networking;
using Mine2d.engine.system.annotations;
+using Mine2d.game.core.extensions;
-namespace Mine2d.backend;
+namespace Mine2d.engine;
public class Publisher
{
diff --git a/Mine2d/engine/Shapes.cs b/Mine2d/engine/Shapes.cs
deleted file mode 100644
index b1a3dfe..0000000
--- a/Mine2d/engine/Shapes.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Mine2d.engine;
-
-public struct Line
-{
- public Vector2 Start { get; set; }
- public Vector2 End { get; set; }
-
- public Line(Vector2 start, Vector2 end)
- {
- this.Start = start;
- this.End = end;
- }
-}
diff --git a/Mine2d/engine/TextureFactory.cs b/Mine2d/engine/TextureFactory.cs
index b7aefd1..d9aae71 100644
--- a/Mine2d/engine/TextureFactory.cs
+++ b/Mine2d/engine/TextureFactory.cs
@@ -1,3 +1,5 @@
+using Mine2d.game;
+
namespace Mine2d.engine;
public class TextureFactory
@@ -14,16 +16,16 @@ public class TextureFactory
public IntPtr CreateTexture(string[] path)
{
- var target = this.loadTexture(path[0]);
+ var target = this.LoadTexture(path[0]);
for (var i = 1; i < path.Length; i++)
{
- var t = this.loadTexture(path[i]);
- target = this.mergeTextures(target, t);
+ var t = this.LoadTexture(path[i]);
+ target = this.MergeTextures(target, t);
}
return target;
}
- private IntPtr mergeTextures(IntPtr t1, IntPtr t2)
+ private IntPtr MergeTextures(IntPtr t1, IntPtr t2)
{
var (w, h) = this.renderer.GetTextureSize(t1);
var target = SDL_CreateTexture(this.renderer.GetRaw(), SDL_PIXELFORMAT_RGBA8888, (int)SDL_TextureAccess.SDL_TEXTUREACCESS_TARGET, w, h);
@@ -35,7 +37,7 @@ public class TextureFactory
return target;
}
- private IntPtr loadTexture(string path)
+ private IntPtr LoadTexture(string path)
{
if (this.textureCache.TryGetValue(path, out var value))
{
diff --git a/Mine2d/backend/Backend.cs b/Mine2d/engine/networking/Backend.cs
similarity index 95%
rename from Mine2d/backend/Backend.cs
rename to Mine2d/engine/networking/Backend.cs
index 6d222d7..35ed60d 100644
--- a/Mine2d/backend/Backend.cs
+++ b/Mine2d/engine/networking/Backend.cs
@@ -1,11 +1,12 @@
using System.Text;
-using Mine2d.backend.data;
using Mine2d.engine.system.annotations;
-using Mine2d.network;
+using Mine2d.game;
+using Mine2d.game.backend.data;
+using Mine2d.game.backend.network;
using Newtonsoft.Json;
using WatsonTcp;
-namespace Mine2d.backend;
+namespace Mine2d.engine.networking;
public class Backend : IBackend
{
diff --git a/Mine2d/frontend/Frontend.cs b/Mine2d/engine/networking/Frontend.cs
similarity index 87%
rename from Mine2d/frontend/Frontend.cs
rename to Mine2d/engine/networking/Frontend.cs
index 7433b69..b257087 100644
--- a/Mine2d/frontend/Frontend.cs
+++ b/Mine2d/engine/networking/Frontend.cs
@@ -1,7 +1,8 @@
-using Mine2d.backend.data;
-using Mine2d.frontend.renderer;
+using Mine2d.game;
+using Mine2d.game.backend.data;
+using Mine2d.game.frontend.renderer;
-namespace Mine2d.frontend;
+namespace Mine2d.engine.networking;
public class Frontend : IFrontend
{
diff --git a/Mine2d/backend/IBackend.cs b/Mine2d/engine/networking/IBackend.cs
similarity index 79%
rename from Mine2d/backend/IBackend.cs
rename to Mine2d/engine/networking/IBackend.cs
index 2e60c88..9718ae2 100644
--- a/Mine2d/backend/IBackend.cs
+++ b/Mine2d/engine/networking/IBackend.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.backend;
+namespace Mine2d.engine.networking;
public interface IBackend
{
diff --git a/Mine2d/frontend/IFrontend.cs b/Mine2d/engine/networking/IFrontend.cs
similarity index 69%
rename from Mine2d/frontend/IFrontend.cs
rename to Mine2d/engine/networking/IFrontend.cs
index 3807e09..4378b2b 100644
--- a/Mine2d/frontend/IFrontend.cs
+++ b/Mine2d/engine/networking/IFrontend.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.frontend;
+namespace Mine2d.engine.networking;
public interface IFrontend
{
diff --git a/Mine2d/engine/PacketUtils.cs b/Mine2d/engine/networking/PacketUtils.cs
similarity index 87%
rename from Mine2d/engine/PacketUtils.cs
rename to Mine2d/engine/networking/PacketUtils.cs
index 5252bbb..585702a 100644
--- a/Mine2d/engine/PacketUtils.cs
+++ b/Mine2d/engine/networking/PacketUtils.cs
@@ -1,6 +1,6 @@
-using Mine2d.backend.data;
+using Mine2d.game.backend.data;
-namespace Mine2d.engine;
+namespace Mine2d.engine.networking;
public static class PacketUtils
{
diff --git a/Mine2d/backend/RemoteBackend.cs b/Mine2d/engine/networking/RemoteBackend.cs
similarity index 91%
rename from Mine2d/backend/RemoteBackend.cs
rename to Mine2d/engine/networking/RemoteBackend.cs
index 8d9ec78..9177c8d 100644
--- a/Mine2d/backend/RemoteBackend.cs
+++ b/Mine2d/engine/networking/RemoteBackend.cs
@@ -1,19 +1,19 @@
using System.Text;
-using Mine2d.backend.data;
-using Mine2d.engine;
using Mine2d.engine.system.annotations;
-using Mine2d.state;
+using Mine2d.game;
+using Mine2d.game.backend.data;
+using Mine2d.game.state;
using Newtonsoft.Json;
using WatsonTcp;
-namespace Mine2d.backend;
+namespace Mine2d.engine.networking;
public class RemoteBackend : IBackend
{
private WatsonTcpClient client;
private Publisher publisher;
private readonly Queue pendingPackets = new();
- private uint tick = 0;
+ private uint tick;
public void Process(double dt)
{
diff --git a/Mine2d/Context.cs b/Mine2d/game/Context.cs
similarity index 92%
rename from Mine2d/Context.cs
rename to Mine2d/game/Context.cs
index dfdab34..2b0ce7f 100644
--- a/Mine2d/Context.cs
+++ b/Mine2d/game/Context.cs
@@ -1,10 +1,9 @@
-using Mine2d.backend;
-using Mine2d.core.tiles;
using Mine2d.engine;
-using Mine2d.frontend;
-using Mine2d.state;
+using Mine2d.engine.networking;
+using Mine2d.game.core.tiles;
+using Mine2d.game.state;
-namespace Mine2d;
+namespace Mine2d.game;
public class Context
{
diff --git a/Mine2d/Controls.cs b/Mine2d/game/Controls.cs
similarity index 96%
rename from Mine2d/Controls.cs
rename to Mine2d/game/Controls.cs
index 3240308..2955781 100644
--- a/Mine2d/Controls.cs
+++ b/Mine2d/game/Controls.cs
@@ -1,4 +1,4 @@
-namespace Mine2d;
+namespace Mine2d.game;
public enum Control
{
diff --git a/Mine2d/Mine2dGame.cs b/Mine2d/game/Mine2dGame.cs
similarity index 91%
rename from Mine2d/Mine2dGame.cs
rename to Mine2d/game/Mine2dGame.cs
index 7c19918..84a6f8b 100644
--- a/Mine2d/Mine2dGame.cs
+++ b/Mine2d/game/Mine2dGame.cs
@@ -1,10 +1,9 @@
-using Mine2d.backend;
-using Mine2d.core;
using Mine2d.engine;
-using Mine2d.frontend;
-using Mine2d.state;
+using Mine2d.engine.networking;
+using Mine2d.game.core;
+using Mine2d.game.state;
-namespace Mine2d;
+namespace Mine2d.game;
public class Mine2dGame : Game
{
diff --git a/Mine2d/backend/data/Packet.cs b/Mine2d/game/backend/data/Packet.cs
similarity index 97%
rename from Mine2d/backend/data/Packet.cs
rename to Mine2d/game/backend/data/Packet.cs
index d8098d5..2b79525 100644
--- a/Mine2d/backend/data/Packet.cs
+++ b/Mine2d/game/backend/data/Packet.cs
@@ -1,6 +1,6 @@
-using Mine2d.core.data;
+using Mine2d.game.core.data;
-namespace Mine2d.backend.data;
+namespace Mine2d.game.backend.data;
public interface IPacket
{
diff --git a/Mine2d/backend/interactor/Breaking.cs b/Mine2d/game/backend/interactor/Breaking.cs
similarity index 93%
rename from Mine2d/backend/interactor/Breaking.cs
rename to Mine2d/game/backend/interactor/Breaking.cs
index ab0af49..a2b8639 100644
--- a/Mine2d/backend/interactor/Breaking.cs
+++ b/Mine2d/game/backend/interactor/Breaking.cs
@@ -1,9 +1,9 @@
-using Mine2d.backend.data;
-using Mine2d.core;
-using Mine2d.core.data;
using Mine2d.engine.system.annotations;
+using Mine2d.game.backend.data;
+using Mine2d.game.core;
+using Mine2d.game.core.data;
-namespace Mine2d.backend.interactor;
+namespace Mine2d.game.backend.interactor;
[Interactor]
public class Breaking
diff --git a/Mine2d/backend/interactor/Connect.cs b/Mine2d/game/backend/interactor/Connect.cs
similarity index 87%
rename from Mine2d/backend/interactor/Connect.cs
rename to Mine2d/game/backend/interactor/Connect.cs
index c549ecb..7e46436 100644
--- a/Mine2d/backend/interactor/Connect.cs
+++ b/Mine2d/game/backend/interactor/Connect.cs
@@ -1,8 +1,8 @@
-using Mine2d.backend.data;
using Mine2d.engine.system.annotations;
-using Mine2d.state;
+using Mine2d.game.backend.data;
+using Mine2d.game.state;
-namespace Mine2d.backend.interactor;
+namespace Mine2d.game.backend.interactor;
[Interactor]
public class Connect
diff --git a/Mine2d/backend/interactor/Move.cs b/Mine2d/game/backend/interactor/Move.cs
similarity index 93%
rename from Mine2d/backend/interactor/Move.cs
rename to Mine2d/game/backend/interactor/Move.cs
index 0c17290..4e67f42 100644
--- a/Mine2d/backend/interactor/Move.cs
+++ b/Mine2d/game/backend/interactor/Move.cs
@@ -1,8 +1,8 @@
-using Mine2d.backend.data;
-using Mine2d.core;
using Mine2d.engine.system.annotations;
+using Mine2d.game.backend.data;
+using Mine2d.game.core;
-namespace Mine2d.backend.interactor;
+namespace Mine2d.game.backend.interactor;
[Interactor]
public class Move
diff --git a/Mine2d/backend/interactor/WorldGeneration.cs b/Mine2d/game/backend/interactor/WorldGeneration.cs
similarity index 59%
rename from Mine2d/backend/interactor/WorldGeneration.cs
rename to Mine2d/game/backend/interactor/WorldGeneration.cs
index d095b5d..2f76edf 100644
--- a/Mine2d/backend/interactor/WorldGeneration.cs
+++ b/Mine2d/game/backend/interactor/WorldGeneration.cs
@@ -1,24 +1,22 @@
-using Mine2d.backend.data;
-using Mine2d.core.data;
-using Mine2d.core.tiles;
-using Mine2d.core.world;
using Mine2d.engine.system.annotations;
+using Mine2d.game.backend.data;
+using Mine2d.game.core.data;
+using Mine2d.game.core.world;
-namespace Mine2d.backend.interactor;
+namespace Mine2d.game.backend.interactor;
[Interactor]
public class WorldGeneration
{
- private static Vector2[] directions = new Vector2[]
- {
- new Vector2(0, 1),
- new Vector2(1, 0),
- new Vector2(0, -1),
- new Vector2(-1, 0),
- new Vector2(1, 1),
- new Vector2(1, -1),
- new Vector2(-1, -1),
- new Vector2(-1, 1)
+ private static readonly Vector2[] Directions = {
+ new(0, 1),
+ new(1, 0),
+ new(0, -1),
+ new(-1, 0),
+ new(1, 1),
+ new(1, -1),
+ new(-1, -1),
+ new(-1, 1)
};
[Interaction(InteractorKind.Server, "playerMoved")]
@@ -26,7 +24,7 @@ public class WorldGeneration
{
var ctx = Context.Get();
var world = ctx.GameState.World;
- foreach (var direction in directions)
+ foreach (var direction in Directions)
{
var generationTarget = packet.Target + direction * 16 * 32;
var hasChunkGenerated = world.HasChunkAt(generationTarget);
diff --git a/Mine2d/network/Converter.cs b/Mine2d/game/backend/network/Converter.cs
similarity index 93%
rename from Mine2d/network/Converter.cs
rename to Mine2d/game/backend/network/Converter.cs
index 8f91393..665f502 100644
--- a/Mine2d/network/Converter.cs
+++ b/Mine2d/game/backend/network/Converter.cs
@@ -1,9 +1,9 @@
using System.Text;
-using Mine2d.backend.data;
+using Mine2d.game.backend.data;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-namespace Mine2d.network;
+namespace Mine2d.game.backend.network;
public class Converter
{
diff --git a/Mine2d/network/PacketException.cs b/Mine2d/game/backend/network/PacketException.cs
similarity index 75%
rename from Mine2d/network/PacketException.cs
rename to Mine2d/game/backend/network/PacketException.cs
index 938cf99..a7a87cd 100644
--- a/Mine2d/network/PacketException.cs
+++ b/Mine2d/game/backend/network/PacketException.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.network;
+namespace Mine2d.game.backend.network;
public class PacketException : Exception
{
diff --git a/Mine2d/core/Bootstrapper.cs b/Mine2d/game/core/Bootstrapper.cs
similarity index 79%
rename from Mine2d/core/Bootstrapper.cs
rename to Mine2d/game/core/Bootstrapper.cs
index 33d8eab..3a8fc3f 100644
--- a/Mine2d/core/Bootstrapper.cs
+++ b/Mine2d/game/core/Bootstrapper.cs
@@ -1,8 +1,8 @@
-using Mine2d.core.data;
-using Mine2d.core.tiles;
-using Mine2d.core.world;
+using Mine2d.game.core.data;
+using Mine2d.game.core.tiles;
+using Mine2d.game.core.world;
-namespace Mine2d.core;
+namespace Mine2d.game.core;
public class Bootstrapper
{
diff --git a/Mine2d/core/Camera.cs b/Mine2d/game/core/Camera.cs
similarity index 94%
rename from Mine2d/core/Camera.cs
rename to Mine2d/game/core/Camera.cs
index a3533e2..a9b5fcb 100644
--- a/Mine2d/core/Camera.cs
+++ b/Mine2d/game/core/Camera.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.core;
+namespace Mine2d.game.core;
public class Camera
{
diff --git a/Mine2d/core/Constants.cs b/Mine2d/game/core/Constants.cs
similarity index 87%
rename from Mine2d/core/Constants.cs
rename to Mine2d/game/core/Constants.cs
index 51d6927..5546eb5 100644
--- a/Mine2d/core/Constants.cs
+++ b/Mine2d/game/core/Constants.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.core;
+namespace Mine2d.game.core;
public class Constants
{
diff --git a/Mine2d/core/PlayerEntity.cs b/Mine2d/game/core/PlayerEntity.cs
similarity index 98%
rename from Mine2d/core/PlayerEntity.cs
rename to Mine2d/game/core/PlayerEntity.cs
index b6890c9..7d1a3cb 100644
--- a/Mine2d/core/PlayerEntity.cs
+++ b/Mine2d/game/core/PlayerEntity.cs
@@ -1,6 +1,6 @@
-using Mine2d.state;
+using Mine2d.game.state;
-namespace Mine2d.core;
+namespace Mine2d.game.core;
public class PlayerEntity
{
diff --git a/Mine2d/core/data/Chunk.cs b/Mine2d/game/core/data/Chunk.cs
similarity index 98%
rename from Mine2d/core/data/Chunk.cs
rename to Mine2d/game/core/data/Chunk.cs
index eb1d677..d3ad1d9 100644
--- a/Mine2d/core/data/Chunk.cs
+++ b/Mine2d/game/core/data/Chunk.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.core.data;
+namespace Mine2d.game.core.data;
public class Chunk
{
diff --git a/Mine2d/core/data/STile.cs b/Mine2d/game/core/data/STile.cs
similarity index 82%
rename from Mine2d/core/data/STile.cs
rename to Mine2d/game/core/data/STile.cs
index 52dc5c4..596be96 100644
--- a/Mine2d/core/data/STile.cs
+++ b/Mine2d/game/core/data/STile.cs
@@ -1,6 +1,6 @@
-using Mine2d.core.tiles;
+using Mine2d.game.core.tiles;
-namespace Mine2d.core.data;
+namespace Mine2d.game.core.data;
public struct STile
{
diff --git a/Mine2d/core/data/World.cs b/Mine2d/game/core/data/World.cs
similarity index 98%
rename from Mine2d/core/data/World.cs
rename to Mine2d/game/core/data/World.cs
index 69da80b..ef09d6b 100644
--- a/Mine2d/core/data/World.cs
+++ b/Mine2d/game/core/data/World.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.core.data;
+namespace Mine2d.game.core.data;
public class World
{
diff --git a/Mine2d/core/extensions/AssemblyExtensions.cs b/Mine2d/game/core/extensions/AssemblyExtensions.cs
similarity index 90%
rename from Mine2d/core/extensions/AssemblyExtensions.cs
rename to Mine2d/game/core/extensions/AssemblyExtensions.cs
index 70ed01c..1df9028 100644
--- a/Mine2d/core/extensions/AssemblyExtensions.cs
+++ b/Mine2d/game/core/extensions/AssemblyExtensions.cs
@@ -1,6 +1,6 @@
using System.Reflection;
-namespace Mine2d.core.extensions;
+namespace Mine2d.game.core.extensions;
public static class AssemblyExtensions
{
diff --git a/Mine2d/core/extensions/TypeExtensions.cs b/Mine2d/game/core/extensions/TypeExtensions.cs
similarity index 94%
rename from Mine2d/core/extensions/TypeExtensions.cs
rename to Mine2d/game/core/extensions/TypeExtensions.cs
index d083d32..d274291 100644
--- a/Mine2d/core/extensions/TypeExtensions.cs
+++ b/Mine2d/game/core/extensions/TypeExtensions.cs
@@ -1,6 +1,6 @@
using System.Reflection;
-namespace Mine2d.core.extensions;
+namespace Mine2d.game.core.extensions;
public static class TypeExtensions
{
diff --git a/Mine2d/core/tiles/OreTile.cs b/Mine2d/game/core/tiles/OreTile.cs
similarity index 85%
rename from Mine2d/core/tiles/OreTile.cs
rename to Mine2d/game/core/tiles/OreTile.cs
index 7a4063c..7c776cb 100644
--- a/Mine2d/core/tiles/OreTile.cs
+++ b/Mine2d/game/core/tiles/OreTile.cs
@@ -1,6 +1,6 @@
using Mine2d.engine;
-namespace Mine2d.core.tiles;
+namespace Mine2d.game.core.tiles;
public class OreTile : Tile
{
diff --git a/Mine2d/core/tiles/TextureCache.cs b/Mine2d/game/core/tiles/TextureCache.cs
similarity index 100%
rename from Mine2d/core/tiles/TextureCache.cs
rename to Mine2d/game/core/tiles/TextureCache.cs
diff --git a/Mine2d/core/tiles/Tile.cs b/Mine2d/game/core/tiles/Tile.cs
similarity index 97%
rename from Mine2d/core/tiles/Tile.cs
rename to Mine2d/game/core/tiles/Tile.cs
index 8f20f36..258fe2d 100644
--- a/Mine2d/core/tiles/Tile.cs
+++ b/Mine2d/game/core/tiles/Tile.cs
@@ -1,7 +1,7 @@
-using Mine2d.core.data;
using Mine2d.engine;
+using Mine2d.game.core.data;
-namespace Mine2d.core.tiles;
+namespace Mine2d.game.core.tiles;
public class Tile
{
diff --git a/Mine2d/game/core/tiles/TileRegistry.cs b/Mine2d/game/core/tiles/TileRegistry.cs
new file mode 100644
index 0000000..72eef52
--- /dev/null
+++ b/Mine2d/game/core/tiles/TileRegistry.cs
@@ -0,0 +1,29 @@
+namespace Mine2d.game.core.tiles;
+
+public enum Tiles
+{
+ Stone = 1,
+ Ore1 = 2,
+ Ore2 = 3,
+ Ore3 = 4,
+ Ore4 = 5,
+}
+
+public class TileRegistry
+{
+ public Dictionary Tiles { get; set; } = new();
+
+ public void RegisterTile()
+ {
+ this.Tiles.Add(1, new Tile("stone", "stone", 5));
+ this.Tiles.Add(2, new OreTile("ore1", new[] { "stone", "ore1" }, 5));
+ this.Tiles.Add(3, new OreTile("ore2", new[] { "stone", "ore2" }, 7));
+ this.Tiles.Add(4, new OreTile("ore3", new[] { "stone", "ore3" }, 8));
+ this.Tiles.Add(5, new OreTile("ore4", new[] { "stone", "ore4" }, 10));
+ }
+
+ public Tile GetTile(int id)
+ {
+ return this.Tiles[id];
+ }
+}
diff --git a/Mine2d/core/world/ChunkGenerator.cs b/Mine2d/game/core/world/ChunkGenerator.cs
similarity index 96%
rename from Mine2d/core/world/ChunkGenerator.cs
rename to Mine2d/game/core/world/ChunkGenerator.cs
index c1b91f5..56e4dec 100644
--- a/Mine2d/core/world/ChunkGenerator.cs
+++ b/Mine2d/game/core/world/ChunkGenerator.cs
@@ -1,7 +1,7 @@
-using Mine2d.core.data;
-using Mine2d.core.tiles;
+using Mine2d.game.core.data;
+using Mine2d.game.core.tiles;
-namespace Mine2d.core.world;
+namespace Mine2d.game.core.world;
public class ChunkGenerator
{
diff --git a/Mine2d/frontend/events/Exit.cs b/Mine2d/game/frontend/events/Exit.cs
similarity index 74%
rename from Mine2d/frontend/events/Exit.cs
rename to Mine2d/game/frontend/events/Exit.cs
index 9b24108..4a84a10 100644
--- a/Mine2d/frontend/events/Exit.cs
+++ b/Mine2d/game/frontend/events/Exit.cs
@@ -1,18 +1,18 @@
using Mine2d.engine.system;
using Mine2d.engine.system.annotations;
-namespace Mine2d.frontend.events;
+namespace Mine2d.game.frontend.events;
public class Exit
{
[EventListener(EventType.Quit)]
- public static void onExit()
+ public static void OnExit()
{
Environment.Exit(0);
}
[EventListener(EventType.KeyDown)]
- public static void onKeyDown(SDL_Event e)
+ public static void OnKeyDown(SDL_Event e)
{
if (e.key.keysym.scancode == SDL_Scancode.SDL_SCANCODE_ESCAPE)
{
diff --git a/Mine2d/frontend/events/Fullscreen.cs b/Mine2d/game/frontend/events/Fullscreen.cs
similarity index 85%
rename from Mine2d/frontend/events/Fullscreen.cs
rename to Mine2d/game/frontend/events/Fullscreen.cs
index 697d51b..76d4a12 100644
--- a/Mine2d/frontend/events/Fullscreen.cs
+++ b/Mine2d/game/frontend/events/Fullscreen.cs
@@ -1,12 +1,12 @@
using Mine2d.engine.system;
using Mine2d.engine.system.annotations;
-namespace Mine2d.frontend.events;
+namespace Mine2d.game.frontend.events;
public class Fullscreen
{
[EventListener(EventType.KeyDown)]
- public static void onToggleFullscreen(SDL_Event e)
+ public static void OnToggleFullscreen(SDL_Event e)
{
if (e.key.keysym.scancode != SDL_Scancode.SDL_SCANCODE_F11)
{
diff --git a/Mine2d/frontend/events/PlayerBreakInput.cs b/Mine2d/game/frontend/events/PlayerBreakInput.cs
similarity index 87%
rename from Mine2d/frontend/events/PlayerBreakInput.cs
rename to Mine2d/game/frontend/events/PlayerBreakInput.cs
index cd9c0ff..63825e7 100644
--- a/Mine2d/frontend/events/PlayerBreakInput.cs
+++ b/Mine2d/game/frontend/events/PlayerBreakInput.cs
@@ -1,13 +1,13 @@
-using Mine2d.backend.data;
using Mine2d.engine.system;
using Mine2d.engine.system.annotations;
+using Mine2d.game.backend.data;
-namespace Mine2d.frontend.events;
+namespace Mine2d.game.frontend.events;
public class PlayerBreakInput
{
[EventListener(EventType.MouseMotion)]
- public static void onBreak(SDL_Event e)
+ public static void OnBreak(SDL_Event e)
{
var ctx = Context.Get();
var mousePos = new Vector2(e.motion.x, e.motion.y);
@@ -23,7 +23,7 @@ public class PlayerBreakInput
}
[EventListener(EventType.MouseButtonDown)]
- public static void onMouseDown(SDL_Event e)
+ public static void OnMouseDown(SDL_Event e)
{
if (e.button.button != SDL_BUTTON_LEFT)
{
@@ -36,7 +36,7 @@ public class PlayerBreakInput
}
[EventListener(EventType.MouseButtonUp)]
- public static void onMouseUp(SDL_Event e)
+ public static void OnMouseUp(SDL_Event e)
{
if (e.button.button != SDL_BUTTON_LEFT)
{
diff --git a/Mine2d/frontend/events/PlayerInput.cs b/Mine2d/game/frontend/events/PlayerInput.cs
similarity index 82%
rename from Mine2d/frontend/events/PlayerInput.cs
rename to Mine2d/game/frontend/events/PlayerInput.cs
index c9e3389..ab178c5 100644
--- a/Mine2d/frontend/events/PlayerInput.cs
+++ b/Mine2d/game/frontend/events/PlayerInput.cs
@@ -1,16 +1,16 @@
-using Mine2d.backend.data;
using Mine2d.engine.system;
using Mine2d.engine.system.annotations;
+using Mine2d.game.backend.data;
-namespace Mine2d.frontend.events;
+namespace Mine2d.game.frontend.events;
public class PlayerInput
{
[EventListener(EventType.KeyDown)]
- public static void move(SDL_Event e)
+ public static void Move(SDL_Event e)
{
var ctx = Context.Get();
- if (!isMovementKey(e.key.keysym.scancode) || e.key.repeat == 1)
+ if (!IsMovementKey(e.key.keysym.scancode) || e.key.repeat == 1)
{
return;
}
@@ -32,14 +32,14 @@ public class PlayerInput
movementInput.Y += 1;
}
ctx.FrontendGameState.MovementInput = movementInput;
- sendMovement();
+ SendMovement();
}
[EventListener(EventType.KeyUp)]
- public static void stopMove(SDL_Event e)
+ public static void StopMove(SDL_Event e)
{
var ctx = Context.Get();
- if (!isMovementKey(e.key.keysym.scancode) || e.key.repeat == 1)
+ if (!IsMovementKey(e.key.keysym.scancode) || e.key.repeat == 1)
{
return;
}
@@ -61,10 +61,10 @@ public class PlayerInput
movementInput.Y -= 1;
}
ctx.FrontendGameState.MovementInput = movementInput;
- sendMovement();
+ SendMovement();
}
- private static bool isMovementKey(SDL_Scancode scancode)
+ private static bool IsMovementKey(SDL_Scancode scancode)
{
return scancode is SDL_Scancode.SDL_SCANCODE_A
or SDL_Scancode.SDL_SCANCODE_D
@@ -72,7 +72,7 @@ public class PlayerInput
or SDL_Scancode.SDL_SCANCODE_S;
}
- private static void sendMovement()
+ private static void SendMovement()
{
var ctx = Context.Get();
var movement = ctx.FrontendGameState.MovementInput;
diff --git a/Mine2d/frontend/events/Resize.cs b/Mine2d/game/frontend/events/Resize.cs
similarity index 85%
rename from Mine2d/frontend/events/Resize.cs
rename to Mine2d/game/frontend/events/Resize.cs
index 6abcfdc..e82d54e 100644
--- a/Mine2d/frontend/events/Resize.cs
+++ b/Mine2d/game/frontend/events/Resize.cs
@@ -1,12 +1,12 @@
using Mine2d.engine.system;
using Mine2d.engine.system.annotations;
-namespace Mine2d.frontend.events;
+namespace Mine2d.game.frontend.events;
public class Resize
{
[EventListener(EventType.WindowResize)]
- public static void onResize(SDL_Event e)
+ public static void OnResize(SDL_Event e)
{
var ctx = Context.Get();
ctx.FrontendGameState.WindowWidth = e.window.data1;
diff --git a/Mine2d/frontend/renderer/BackgroundRenderer.cs b/Mine2d/game/frontend/renderer/BackgroundRenderer.cs
similarity index 95%
rename from Mine2d/frontend/renderer/BackgroundRenderer.cs
rename to Mine2d/game/frontend/renderer/BackgroundRenderer.cs
index 04ef8a4..be569ed 100644
--- a/Mine2d/frontend/renderer/BackgroundRenderer.cs
+++ b/Mine2d/game/frontend/renderer/BackgroundRenderer.cs
@@ -1,4 +1,6 @@
-namespace Mine2d.frontend.renderer;
+using Mine2d.engine;
+
+namespace Mine2d.game.frontend.renderer;
public class BackgroundRenderer : IRenderer
{
diff --git a/Mine2d/frontend/renderer/GameRenderer.cs b/Mine2d/game/frontend/renderer/GameRenderer.cs
similarity index 88%
rename from Mine2d/frontend/renderer/GameRenderer.cs
rename to Mine2d/game/frontend/renderer/GameRenderer.cs
index 517ff23..11903e0 100644
--- a/Mine2d/frontend/renderer/GameRenderer.cs
+++ b/Mine2d/game/frontend/renderer/GameRenderer.cs
@@ -1,4 +1,6 @@
-namespace Mine2d.frontend.renderer;
+using Mine2d.engine;
+
+namespace Mine2d.game.frontend.renderer;
public class GameRenderer : IRenderer
{
diff --git a/Mine2d/frontend/renderer/PlayerRenderer.cs b/Mine2d/game/frontend/renderer/PlayerRenderer.cs
similarity index 92%
rename from Mine2d/frontend/renderer/PlayerRenderer.cs
rename to Mine2d/game/frontend/renderer/PlayerRenderer.cs
index da6b10d..2f8209d 100644
--- a/Mine2d/frontend/renderer/PlayerRenderer.cs
+++ b/Mine2d/game/frontend/renderer/PlayerRenderer.cs
@@ -1,4 +1,6 @@
-namespace Mine2d.frontend.renderer;
+using Mine2d.engine;
+
+namespace Mine2d.game.frontend.renderer;
public class PlayerRenderer : IRenderer
{
diff --git a/Mine2d/frontend/renderer/WorldCursorRenderer.cs b/Mine2d/game/frontend/renderer/WorldCursorRenderer.cs
similarity index 93%
rename from Mine2d/frontend/renderer/WorldCursorRenderer.cs
rename to Mine2d/game/frontend/renderer/WorldCursorRenderer.cs
index 978c8af..f21869f 100644
--- a/Mine2d/frontend/renderer/WorldCursorRenderer.cs
+++ b/Mine2d/game/frontend/renderer/WorldCursorRenderer.cs
@@ -1,6 +1,7 @@
-using Mine2d.core;
+using Mine2d.engine;
+using Mine2d.game.core;
-namespace Mine2d.frontend.renderer;
+namespace Mine2d.game.frontend.renderer;
public class WorldCursorRenderer : IRenderer
{
diff --git a/Mine2d/frontend/renderer/WorldRenderer.cs b/Mine2d/game/frontend/renderer/WorldRenderer.cs
similarity index 96%
rename from Mine2d/frontend/renderer/WorldRenderer.cs
rename to Mine2d/game/frontend/renderer/WorldRenderer.cs
index 3a7d481..4f89922 100644
--- a/Mine2d/frontend/renderer/WorldRenderer.cs
+++ b/Mine2d/game/frontend/renderer/WorldRenderer.cs
@@ -1,7 +1,7 @@
-using Mine2d.core;
using Mine2d.engine;
+using Mine2d.game.core;
-namespace Mine2d.frontend.renderer;
+namespace Mine2d.game.frontend.renderer;
public class WorldRenderer : IRenderer
{
@@ -36,7 +36,7 @@ public class WorldRenderer : IRenderer
this.overlayHeight = wh;
}
- clearTexture(this.overlay);
+ ClearTexture(this.overlay);
var renderer = Context.Get().Renderer;
var scale = ctx.FrontendGameState.Settings.GameScale;
var camera = Context.Get().FrontendGameState.Camera;
@@ -80,7 +80,7 @@ public class WorldRenderer : IRenderer
Renderer.ProcessStatus(SDL_SetRenderTarget(ctx.Renderer.GetRaw(), IntPtr.Zero));
}
- public static void clearTexture(IntPtr texture)
+ public static void ClearTexture(IntPtr texture)
{
var ctx = Context.Get();
var renderer = ctx.Renderer;
diff --git a/Mine2d/state/GameState.cs b/Mine2d/game/state/GameState.cs
similarity index 90%
rename from Mine2d/state/GameState.cs
rename to Mine2d/game/state/GameState.cs
index fd3f92c..befc7bc 100644
--- a/Mine2d/state/GameState.cs
+++ b/Mine2d/game/state/GameState.cs
@@ -1,7 +1,7 @@
-using Mine2d.core;
-using Mine2d.core.data;
+using Mine2d.game.core;
+using Mine2d.game.core.data;
-namespace Mine2d.state;
+namespace Mine2d.game.state;
public class FrontendGameState
{
diff --git a/Mine2d/state/Player.cs b/Mine2d/game/state/Player.cs
similarity index 92%
rename from Mine2d/state/Player.cs
rename to Mine2d/game/state/Player.cs
index f001424..d1f4b18 100644
--- a/Mine2d/state/Player.cs
+++ b/Mine2d/game/state/Player.cs
@@ -1,4 +1,4 @@
-namespace Mine2d.state;
+namespace Mine2d.game.state;
public class Player
{