From 961725d459d0ff2d528933f530e956c4f2996209 Mon Sep 17 00:00:00 2001 From: MasterGordon Date: Wed, 16 Nov 2022 15:09:50 +0100 Subject: [PATCH] fixed usings --- Mine2d/backend/interactor/WorldGeneration.cs | 1 - Mine2d/engine/FontManager.cs | 2 - Mine2d/engine/Renderer.cs | 1 - .../system/annotations/EventListener.cs | 2 - Mine2d/engine/utils/Neighbor.cs | 48 ++++++++++--------- Mine2d/frontend/EventPublisher.cs | 1 - Mine2d/frontend/EventService.cs | 2 - Mine2d/frontend/Frontend.cs | 2 - Mine2d/frontend/events/Fullscreen.cs | 1 - Mine2d/frontend/events/PlayerBreakInput.cs | 1 - Mine2d/frontend/events/PlayerInput.cs | 1 - Mine2d/frontend/events/Resize.cs | 1 - Mine2d/frontend/renderer/GameRenderer.cs | 2 - Mine2d/frontend/renderer/PlayerRenderer.cs | 3 -- .../frontend/renderer/WorldCursorRenderer.cs | 2 - Mine2d/network/Converter.cs | 1 - 16 files changed, 25 insertions(+), 46 deletions(-) diff --git a/Mine2d/backend/interactor/WorldGeneration.cs b/Mine2d/backend/interactor/WorldGeneration.cs index 89ec6bb..d1355f2 100644 --- a/Mine2d/backend/interactor/WorldGeneration.cs +++ b/Mine2d/backend/interactor/WorldGeneration.cs @@ -1,4 +1,3 @@ -using Mine2d; using Mine2d.backend.data; using Mine2d.core.data; using Mine2d.core.tiles; diff --git a/Mine2d/engine/FontManager.cs b/Mine2d/engine/FontManager.cs index 887e164..263f854 100644 --- a/Mine2d/engine/FontManager.cs +++ b/Mine2d/engine/FontManager.cs @@ -1,5 +1,3 @@ -using Mine2d.engine; - namespace Mine2d.engine; public class FontManager diff --git a/Mine2d/engine/Renderer.cs b/Mine2d/engine/Renderer.cs index 0d36b65..e7097d1 100644 --- a/Mine2d/engine/Renderer.cs +++ b/Mine2d/engine/Renderer.cs @@ -1,5 +1,4 @@ using Mine2d.engine.utils; -using Mine2d.engine; namespace Mine2d.engine; diff --git a/Mine2d/engine/system/annotations/EventListener.cs b/Mine2d/engine/system/annotations/EventListener.cs index 9280abd..a8db8bc 100644 --- a/Mine2d/engine/system/annotations/EventListener.cs +++ b/Mine2d/engine/system/annotations/EventListener.cs @@ -1,5 +1,3 @@ -using Mine2d.engine.system; - namespace Mine2d.engine.system.annotations; [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)] diff --git a/Mine2d/engine/utils/Neighbor.cs b/Mine2d/engine/utils/Neighbor.cs index daa15ce..21848ba 100644 --- a/Mine2d/engine/utils/Neighbor.cs +++ b/Mine2d/engine/utils/Neighbor.cs @@ -1,43 +1,45 @@ +namespace Mine2d.engine.utils; + public static class Neighbor { public static IEnumerable Get4Neighbors(this Vector2 pos) { return new[] { - new Vector2(pos.X - 1, pos.Y), - new Vector2(pos.X + 1, pos.Y), - new Vector2(pos.X, pos.Y - 1), - new Vector2(pos.X, pos.Y + 1) - }; + new Vector2(pos.X - 1, pos.Y), + new Vector2(pos.X + 1, pos.Y), + new Vector2(pos.X, pos.Y - 1), + new Vector2(pos.X, pos.Y + 1) + }; } public static IEnumerable Get8Neighbors(this Vector2 pos) { return new[] { - new Vector2(pos.X - 1, pos.Y - 1), - new Vector2(pos.X + 1, pos.Y - 1), - new Vector2(pos.X - 1, pos.Y + 1), - new Vector2(pos.X + 1, pos.Y + 1) - }; + new Vector2(pos.X - 1, pos.Y - 1), + new Vector2(pos.X + 1, pos.Y - 1), + new Vector2(pos.X - 1, pos.Y + 1), + new Vector2(pos.X + 1, pos.Y + 1) + }; } public static IEnumerable Get20Neighbors(this Vector2 pos) { return new[] { - new Vector2(pos.X - 2, pos.Y), - new Vector2(pos.X + 2, pos.Y), - new Vector2(pos.X, pos.Y - 2), - new Vector2(pos.X, pos.Y + 2), - new Vector2(pos.X - 2, pos.Y +1), - new Vector2(pos.X + 2, pos.Y +1), - new Vector2(pos.X - 2, pos.Y -1), - new Vector2(pos.X + 2, pos.Y -1), - new Vector2(pos.X - 1, pos.Y +2), - new Vector2(pos.X + 1, pos.Y +2), - new Vector2(pos.X - 1, pos.Y -2), - new Vector2(pos.X + 1, pos.Y -2), - }; + new Vector2(pos.X - 2, pos.Y), + new Vector2(pos.X + 2, pos.Y), + new Vector2(pos.X, pos.Y - 2), + new Vector2(pos.X, pos.Y + 2), + new Vector2(pos.X - 2, pos.Y +1), + new Vector2(pos.X + 2, pos.Y +1), + new Vector2(pos.X - 2, pos.Y -1), + new Vector2(pos.X + 2, pos.Y -1), + new Vector2(pos.X - 1, pos.Y +2), + new Vector2(pos.X + 1, pos.Y +2), + new Vector2(pos.X - 1, pos.Y -2), + new Vector2(pos.X + 1, pos.Y -2), + }; } } diff --git a/Mine2d/frontend/EventPublisher.cs b/Mine2d/frontend/EventPublisher.cs index 8606413..ea01b81 100644 --- a/Mine2d/frontend/EventPublisher.cs +++ b/Mine2d/frontend/EventPublisher.cs @@ -1,6 +1,5 @@ using Mine2d.core.extensions; using Mine2d.engine.system; -using Mine2d.engine.system; using Mine2d.engine.system.annotations; namespace Mine2d.frontend; diff --git a/Mine2d/frontend/EventService.cs b/Mine2d/frontend/EventService.cs index 45bcdf3..7e5b7bd 100644 --- a/Mine2d/frontend/EventService.cs +++ b/Mine2d/frontend/EventService.cs @@ -1,5 +1,3 @@ -using Mine2d; -using Mine2d.backend.data; using Mine2d.engine.system; namespace Mine2d.frontend; diff --git a/Mine2d/frontend/Frontend.cs b/Mine2d/frontend/Frontend.cs index f1bb7dd..7433b69 100644 --- a/Mine2d/frontend/Frontend.cs +++ b/Mine2d/frontend/Frontend.cs @@ -1,7 +1,5 @@ using Mine2d.backend.data; using Mine2d.frontend.renderer; -using Mine2d.frontend; -using Mine2d.frontend.renderer; namespace Mine2d.frontend; diff --git a/Mine2d/frontend/events/Fullscreen.cs b/Mine2d/frontend/events/Fullscreen.cs index 262f5c0..697d51b 100644 --- a/Mine2d/frontend/events/Fullscreen.cs +++ b/Mine2d/frontend/events/Fullscreen.cs @@ -1,4 +1,3 @@ -using Mine2d; using Mine2d.engine.system; using Mine2d.engine.system.annotations; diff --git a/Mine2d/frontend/events/PlayerBreakInput.cs b/Mine2d/frontend/events/PlayerBreakInput.cs index bcc977e..cd9c0ff 100644 --- a/Mine2d/frontend/events/PlayerBreakInput.cs +++ b/Mine2d/frontend/events/PlayerBreakInput.cs @@ -1,4 +1,3 @@ -using Mine2d; using Mine2d.backend.data; using Mine2d.engine.system; using Mine2d.engine.system.annotations; diff --git a/Mine2d/frontend/events/PlayerInput.cs b/Mine2d/frontend/events/PlayerInput.cs index 13843d9..c9e3389 100644 --- a/Mine2d/frontend/events/PlayerInput.cs +++ b/Mine2d/frontend/events/PlayerInput.cs @@ -1,4 +1,3 @@ -using Mine2d; using Mine2d.backend.data; using Mine2d.engine.system; using Mine2d.engine.system.annotations; diff --git a/Mine2d/frontend/events/Resize.cs b/Mine2d/frontend/events/Resize.cs index 15b1035..6abcfdc 100644 --- a/Mine2d/frontend/events/Resize.cs +++ b/Mine2d/frontend/events/Resize.cs @@ -1,4 +1,3 @@ -using Mine2d; using Mine2d.engine.system; using Mine2d.engine.system.annotations; diff --git a/Mine2d/frontend/renderer/GameRenderer.cs b/Mine2d/frontend/renderer/GameRenderer.cs index 2c216d3..37cf3ca 100644 --- a/Mine2d/frontend/renderer/GameRenderer.cs +++ b/Mine2d/frontend/renderer/GameRenderer.cs @@ -1,5 +1,3 @@ -using Mine2d.frontend.renderer; - namespace Mine2d.frontend.renderer; public class GameRenderer : IRenderer diff --git a/Mine2d/frontend/renderer/PlayerRenderer.cs b/Mine2d/frontend/renderer/PlayerRenderer.cs index 056e35c..5748d1f 100644 --- a/Mine2d/frontend/renderer/PlayerRenderer.cs +++ b/Mine2d/frontend/renderer/PlayerRenderer.cs @@ -1,6 +1,3 @@ -using Mine2d; -using Mine2d.frontend.renderer; - namespace Mine2d.frontend.renderer; public class PlayerRenderer : IRenderer diff --git a/Mine2d/frontend/renderer/WorldCursorRenderer.cs b/Mine2d/frontend/renderer/WorldCursorRenderer.cs index 23a7981..facc048 100644 --- a/Mine2d/frontend/renderer/WorldCursorRenderer.cs +++ b/Mine2d/frontend/renderer/WorldCursorRenderer.cs @@ -1,6 +1,4 @@ -using Mine2d; using Mine2d.core; -using Mine2d.frontend.renderer; namespace Mine2d.frontend.renderer; diff --git a/Mine2d/network/Converter.cs b/Mine2d/network/Converter.cs index 47fd989..8f91393 100644 --- a/Mine2d/network/Converter.cs +++ b/Mine2d/network/Converter.cs @@ -1,6 +1,5 @@ using System.Text; using Mine2d.backend.data; -using Mine2d.network; using Newtonsoft.Json; using Newtonsoft.Json.Linq;