From c60d05afd6b6068ffb1cb8474e6d574247fa8488 Mon Sep 17 00:00:00 2001 From: Erik Simon Date: Sun, 13 Nov 2022 01:14:32 +0100 Subject: [PATCH 1/3] added solution --- .idea/.idea.Mine2d/.idea/vcs.xml | 6 + .idea/.idea.Mine2d/.idea/workspace.xml | 116 ++++++++++++++++++ Mine2d.sln | 16 +++ {src => Mine2d}/Context.cs | 0 {src => Mine2d}/Controls.cs | 0 {src => Mine2d}/Import.cs | 0 {src => Mine2d}/Mine2d.cs | 0 mine2d.csproj => Mine2d/Mine2d.csproj | 0 Program.cs => Mine2d/Program.cs | 0 {src => Mine2d}/backend/Backend.cs | 0 {src => Mine2d}/backend/IBackend.cs | 0 {src => Mine2d}/backend/Publisher.cs | 0 {src => Mine2d}/backend/RemoteBackend.cs | 0 {src => Mine2d}/backend/data/Packet.cs | 0 .../backend/interactor/Breaking.cs | 0 {src => Mine2d}/backend/interactor/Connect.cs | 0 {src => Mine2d}/backend/interactor/Move.cs | 0 {src => Mine2d}/core/Bootstrapper.cs | 0 {src => Mine2d}/core/Camera.cs | 0 {src => Mine2d}/core/Constants.cs | 0 {src => Mine2d}/core/PlayerEntity.cs | 0 {src => Mine2d}/core/data/Chunk.cs | 0 {src => Mine2d}/core/data/STile.cs | 0 {src => Mine2d}/core/data/World.cs | 0 .../core/extensions/AssemblyExtensions.cs | 0 .../core/extensions/TypeExtensions.cs | 0 {src => Mine2d}/core/tiles/TextureCache.cs | 0 {src => Mine2d}/core/tiles/Tile.cs | 0 {src => Mine2d}/core/tiles/TileRegistry.cs | 0 {src => Mine2d}/core/world/ChunkGenerator.cs | 0 {src => Mine2d}/engine/AudioPlayer.cs | 0 {src => Mine2d}/engine/FontManager.cs | 0 {src => Mine2d}/engine/Game.cs | 0 {src => Mine2d}/engine/PacketUtils.cs | 0 {src => Mine2d}/engine/Renderer.cs | 0 {src => Mine2d}/engine/ResourceLoader.cs | 0 {src => Mine2d}/engine/Shapes.cs | 0 {src => Mine2d}/engine/Window.cs | 0 .../engine/system/EventPriority.cs | 0 .../engine/system/annotations/Interactor.cs | 0 {src => Mine2d}/engine/utils/Color.cs | 0 {src => Mine2d}/engine/utils/Point.cs | 0 {src => Mine2d}/frontend/Frontend.cs | 0 {src => Mine2d}/frontend/IFrontend.cs | 0 .../frontend/renderer/IRenderer.cs | 0 .../frontend/renderer/WorldRenderer.cs | 0 {src => Mine2d}/network/Converter.cs | 0 {src => Mine2d}/state/GameState.cs | 0 {src => Mine2d}/state/Player.cs | 0 49 files changed, 138 insertions(+) create mode 100644 .idea/.idea.Mine2d/.idea/vcs.xml create mode 100644 .idea/.idea.Mine2d/.idea/workspace.xml create mode 100644 Mine2d.sln rename {src => Mine2d}/Context.cs (100%) rename {src => Mine2d}/Controls.cs (100%) rename {src => Mine2d}/Import.cs (100%) rename {src => Mine2d}/Mine2d.cs (100%) rename mine2d.csproj => Mine2d/Mine2d.csproj (100%) rename Program.cs => Mine2d/Program.cs (100%) rename {src => Mine2d}/backend/Backend.cs (100%) rename {src => Mine2d}/backend/IBackend.cs (100%) rename {src => Mine2d}/backend/Publisher.cs (100%) rename {src => Mine2d}/backend/RemoteBackend.cs (100%) rename {src => Mine2d}/backend/data/Packet.cs (100%) rename {src => Mine2d}/backend/interactor/Breaking.cs (100%) rename {src => Mine2d}/backend/interactor/Connect.cs (100%) rename {src => Mine2d}/backend/interactor/Move.cs (100%) rename {src => Mine2d}/core/Bootstrapper.cs (100%) rename {src => Mine2d}/core/Camera.cs (100%) rename {src => Mine2d}/core/Constants.cs (100%) rename {src => Mine2d}/core/PlayerEntity.cs (100%) rename {src => Mine2d}/core/data/Chunk.cs (100%) rename {src => Mine2d}/core/data/STile.cs (100%) rename {src => Mine2d}/core/data/World.cs (100%) rename {src => Mine2d}/core/extensions/AssemblyExtensions.cs (100%) rename {src => Mine2d}/core/extensions/TypeExtensions.cs (100%) rename {src => Mine2d}/core/tiles/TextureCache.cs (100%) rename {src => Mine2d}/core/tiles/Tile.cs (100%) rename {src => Mine2d}/core/tiles/TileRegistry.cs (100%) rename {src => Mine2d}/core/world/ChunkGenerator.cs (100%) rename {src => Mine2d}/engine/AudioPlayer.cs (100%) rename {src => Mine2d}/engine/FontManager.cs (100%) rename {src => Mine2d}/engine/Game.cs (100%) rename {src => Mine2d}/engine/PacketUtils.cs (100%) rename {src => Mine2d}/engine/Renderer.cs (100%) rename {src => Mine2d}/engine/ResourceLoader.cs (100%) rename {src => Mine2d}/engine/Shapes.cs (100%) rename {src => Mine2d}/engine/Window.cs (100%) rename {src => Mine2d}/engine/system/EventPriority.cs (100%) rename {src => Mine2d}/engine/system/annotations/Interactor.cs (100%) rename {src => Mine2d}/engine/utils/Color.cs (100%) rename {src => Mine2d}/engine/utils/Point.cs (100%) rename {src => Mine2d}/frontend/Frontend.cs (100%) rename {src => Mine2d}/frontend/IFrontend.cs (100%) rename {src => Mine2d}/frontend/renderer/IRenderer.cs (100%) rename {src => Mine2d}/frontend/renderer/WorldRenderer.cs (100%) rename {src => Mine2d}/network/Converter.cs (100%) rename {src => Mine2d}/state/GameState.cs (100%) rename {src => Mine2d}/state/Player.cs (100%) diff --git a/.idea/.idea.Mine2d/.idea/vcs.xml b/.idea/.idea.Mine2d/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/.idea.Mine2d/.idea/vcs.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 new file mode 100644 index 0000000..0bd5277 --- /dev/null +++ b/.idea/.idea.Mine2d/.idea/workspace.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Mine2d.sln b/Mine2d.sln new file mode 100644 index 0000000..8417ced --- /dev/null +++ b/Mine2d.sln @@ -0,0 +1,16 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mine2d", "Mine2d\Mine2d.csproj", "{45B0BA23-41E9-4EBC-92F5-0D62FC274AE4}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {45B0BA23-41E9-4EBC-92F5-0D62FC274AE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {45B0BA23-41E9-4EBC-92F5-0D62FC274AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {45B0BA23-41E9-4EBC-92F5-0D62FC274AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {45B0BA23-41E9-4EBC-92F5-0D62FC274AE4}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/src/Context.cs b/Mine2d/Context.cs similarity index 100% rename from src/Context.cs rename to Mine2d/Context.cs diff --git a/src/Controls.cs b/Mine2d/Controls.cs similarity index 100% rename from src/Controls.cs rename to Mine2d/Controls.cs diff --git a/src/Import.cs b/Mine2d/Import.cs similarity index 100% rename from src/Import.cs rename to Mine2d/Import.cs diff --git a/src/Mine2d.cs b/Mine2d/Mine2d.cs similarity index 100% rename from src/Mine2d.cs rename to Mine2d/Mine2d.cs diff --git a/mine2d.csproj b/Mine2d/Mine2d.csproj similarity index 100% rename from mine2d.csproj rename to Mine2d/Mine2d.csproj diff --git a/Program.cs b/Mine2d/Program.cs similarity index 100% rename from Program.cs rename to Mine2d/Program.cs diff --git a/src/backend/Backend.cs b/Mine2d/backend/Backend.cs similarity index 100% rename from src/backend/Backend.cs rename to Mine2d/backend/Backend.cs diff --git a/src/backend/IBackend.cs b/Mine2d/backend/IBackend.cs similarity index 100% rename from src/backend/IBackend.cs rename to Mine2d/backend/IBackend.cs diff --git a/src/backend/Publisher.cs b/Mine2d/backend/Publisher.cs similarity index 100% rename from src/backend/Publisher.cs rename to Mine2d/backend/Publisher.cs diff --git a/src/backend/RemoteBackend.cs b/Mine2d/backend/RemoteBackend.cs similarity index 100% rename from src/backend/RemoteBackend.cs rename to Mine2d/backend/RemoteBackend.cs diff --git a/src/backend/data/Packet.cs b/Mine2d/backend/data/Packet.cs similarity index 100% rename from src/backend/data/Packet.cs rename to Mine2d/backend/data/Packet.cs diff --git a/src/backend/interactor/Breaking.cs b/Mine2d/backend/interactor/Breaking.cs similarity index 100% rename from src/backend/interactor/Breaking.cs rename to Mine2d/backend/interactor/Breaking.cs diff --git a/src/backend/interactor/Connect.cs b/Mine2d/backend/interactor/Connect.cs similarity index 100% rename from src/backend/interactor/Connect.cs rename to Mine2d/backend/interactor/Connect.cs diff --git a/src/backend/interactor/Move.cs b/Mine2d/backend/interactor/Move.cs similarity index 100% rename from src/backend/interactor/Move.cs rename to Mine2d/backend/interactor/Move.cs diff --git a/src/core/Bootstrapper.cs b/Mine2d/core/Bootstrapper.cs similarity index 100% rename from src/core/Bootstrapper.cs rename to Mine2d/core/Bootstrapper.cs diff --git a/src/core/Camera.cs b/Mine2d/core/Camera.cs similarity index 100% rename from src/core/Camera.cs rename to Mine2d/core/Camera.cs diff --git a/src/core/Constants.cs b/Mine2d/core/Constants.cs similarity index 100% rename from src/core/Constants.cs rename to Mine2d/core/Constants.cs diff --git a/src/core/PlayerEntity.cs b/Mine2d/core/PlayerEntity.cs similarity index 100% rename from src/core/PlayerEntity.cs rename to Mine2d/core/PlayerEntity.cs diff --git a/src/core/data/Chunk.cs b/Mine2d/core/data/Chunk.cs similarity index 100% rename from src/core/data/Chunk.cs rename to Mine2d/core/data/Chunk.cs diff --git a/src/core/data/STile.cs b/Mine2d/core/data/STile.cs similarity index 100% rename from src/core/data/STile.cs rename to Mine2d/core/data/STile.cs diff --git a/src/core/data/World.cs b/Mine2d/core/data/World.cs similarity index 100% rename from src/core/data/World.cs rename to Mine2d/core/data/World.cs diff --git a/src/core/extensions/AssemblyExtensions.cs b/Mine2d/core/extensions/AssemblyExtensions.cs similarity index 100% rename from src/core/extensions/AssemblyExtensions.cs rename to Mine2d/core/extensions/AssemblyExtensions.cs diff --git a/src/core/extensions/TypeExtensions.cs b/Mine2d/core/extensions/TypeExtensions.cs similarity index 100% rename from src/core/extensions/TypeExtensions.cs rename to Mine2d/core/extensions/TypeExtensions.cs diff --git a/src/core/tiles/TextureCache.cs b/Mine2d/core/tiles/TextureCache.cs similarity index 100% rename from src/core/tiles/TextureCache.cs rename to Mine2d/core/tiles/TextureCache.cs diff --git a/src/core/tiles/Tile.cs b/Mine2d/core/tiles/Tile.cs similarity index 100% rename from src/core/tiles/Tile.cs rename to Mine2d/core/tiles/Tile.cs diff --git a/src/core/tiles/TileRegistry.cs b/Mine2d/core/tiles/TileRegistry.cs similarity index 100% rename from src/core/tiles/TileRegistry.cs rename to Mine2d/core/tiles/TileRegistry.cs diff --git a/src/core/world/ChunkGenerator.cs b/Mine2d/core/world/ChunkGenerator.cs similarity index 100% rename from src/core/world/ChunkGenerator.cs rename to Mine2d/core/world/ChunkGenerator.cs diff --git a/src/engine/AudioPlayer.cs b/Mine2d/engine/AudioPlayer.cs similarity index 100% rename from src/engine/AudioPlayer.cs rename to Mine2d/engine/AudioPlayer.cs diff --git a/src/engine/FontManager.cs b/Mine2d/engine/FontManager.cs similarity index 100% rename from src/engine/FontManager.cs rename to Mine2d/engine/FontManager.cs diff --git a/src/engine/Game.cs b/Mine2d/engine/Game.cs similarity index 100% rename from src/engine/Game.cs rename to Mine2d/engine/Game.cs diff --git a/src/engine/PacketUtils.cs b/Mine2d/engine/PacketUtils.cs similarity index 100% rename from src/engine/PacketUtils.cs rename to Mine2d/engine/PacketUtils.cs diff --git a/src/engine/Renderer.cs b/Mine2d/engine/Renderer.cs similarity index 100% rename from src/engine/Renderer.cs rename to Mine2d/engine/Renderer.cs diff --git a/src/engine/ResourceLoader.cs b/Mine2d/engine/ResourceLoader.cs similarity index 100% rename from src/engine/ResourceLoader.cs rename to Mine2d/engine/ResourceLoader.cs diff --git a/src/engine/Shapes.cs b/Mine2d/engine/Shapes.cs similarity index 100% rename from src/engine/Shapes.cs rename to Mine2d/engine/Shapes.cs diff --git a/src/engine/Window.cs b/Mine2d/engine/Window.cs similarity index 100% rename from src/engine/Window.cs rename to Mine2d/engine/Window.cs diff --git a/src/engine/system/EventPriority.cs b/Mine2d/engine/system/EventPriority.cs similarity index 100% rename from src/engine/system/EventPriority.cs rename to Mine2d/engine/system/EventPriority.cs diff --git a/src/engine/system/annotations/Interactor.cs b/Mine2d/engine/system/annotations/Interactor.cs similarity index 100% rename from src/engine/system/annotations/Interactor.cs rename to Mine2d/engine/system/annotations/Interactor.cs diff --git a/src/engine/utils/Color.cs b/Mine2d/engine/utils/Color.cs similarity index 100% rename from src/engine/utils/Color.cs rename to Mine2d/engine/utils/Color.cs diff --git a/src/engine/utils/Point.cs b/Mine2d/engine/utils/Point.cs similarity index 100% rename from src/engine/utils/Point.cs rename to Mine2d/engine/utils/Point.cs diff --git a/src/frontend/Frontend.cs b/Mine2d/frontend/Frontend.cs similarity index 100% rename from src/frontend/Frontend.cs rename to Mine2d/frontend/Frontend.cs diff --git a/src/frontend/IFrontend.cs b/Mine2d/frontend/IFrontend.cs similarity index 100% rename from src/frontend/IFrontend.cs rename to Mine2d/frontend/IFrontend.cs diff --git a/src/frontend/renderer/IRenderer.cs b/Mine2d/frontend/renderer/IRenderer.cs similarity index 100% rename from src/frontend/renderer/IRenderer.cs rename to Mine2d/frontend/renderer/IRenderer.cs diff --git a/src/frontend/renderer/WorldRenderer.cs b/Mine2d/frontend/renderer/WorldRenderer.cs similarity index 100% rename from src/frontend/renderer/WorldRenderer.cs rename to Mine2d/frontend/renderer/WorldRenderer.cs diff --git a/src/network/Converter.cs b/Mine2d/network/Converter.cs similarity index 100% rename from src/network/Converter.cs rename to Mine2d/network/Converter.cs diff --git a/src/state/GameState.cs b/Mine2d/state/GameState.cs similarity index 100% rename from src/state/GameState.cs rename to Mine2d/state/GameState.cs diff --git a/src/state/Player.cs b/Mine2d/state/Player.cs similarity index 100% rename from src/state/Player.cs rename to Mine2d/state/Player.cs From f0a02696a007cd9c5618559420022a9cb9579f90 Mon Sep 17 00:00:00 2001 From: Erik Simon Date: Sun, 13 Nov 2022 01:25:38 +0100 Subject: [PATCH 2/3] moved assets in project --- Mine2d/Mine2d.csproj | 2 +- {assets => Mine2d/assets}/breaking.ase | Bin {assets => Mine2d/assets}/breaking.png | Bin {assets => Mine2d/assets}/font.ttf | Bin {assets => Mine2d/assets}/stone.png | Bin 5 files changed, 1 insertion(+), 1 deletion(-) rename {assets => Mine2d/assets}/breaking.ase (100%) rename {assets => Mine2d/assets}/breaking.png (100%) rename {assets => Mine2d/assets}/font.ttf (100%) rename {assets => Mine2d/assets}/stone.png (100%) diff --git a/Mine2d/Mine2d.csproj b/Mine2d/Mine2d.csproj index e88a42c..6efd177 100644 --- a/Mine2d/Mine2d.csproj +++ b/Mine2d/Mine2d.csproj @@ -3,7 +3,6 @@ Exe net6.0 - mine2d enable true link @@ -17,6 +16,7 @@ + diff --git a/assets/breaking.ase b/Mine2d/assets/breaking.ase similarity index 100% rename from assets/breaking.ase rename to Mine2d/assets/breaking.ase diff --git a/assets/breaking.png b/Mine2d/assets/breaking.png similarity index 100% rename from assets/breaking.png rename to Mine2d/assets/breaking.png diff --git a/assets/font.ttf b/Mine2d/assets/font.ttf similarity index 100% rename from assets/font.ttf rename to Mine2d/assets/font.ttf diff --git a/assets/stone.png b/Mine2d/assets/stone.png similarity index 100% rename from assets/stone.png rename to Mine2d/assets/stone.png From 3e1fd1e801b8d742f87dd2d970681de2ec2692fa Mon Sep 17 00:00:00 2001 From: Erik Simon Date: Sun, 13 Nov 2022 01:25:51 +0100 Subject: [PATCH 3/3] .idea changes --- .idea/.idea.Mine2d/.idea/workspace.xml | 129 +++++++++++++++---------- 1 file changed, 78 insertions(+), 51 deletions(-) diff --git a/.idea/.idea.Mine2d/.idea/workspace.xml b/.idea/.idea.Mine2d/.idea/workspace.xml index 0bd5277..4aef4eb 100644 --- a/.idea/.idea.Mine2d/.idea/workspace.xml +++ b/.idea/.idea.Mine2d/.idea/workspace.xml @@ -1,66 +1,48 @@ + + Mine2d/Mine2d.csproj + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file