Merge pull request #46 from DekuDesu/development

Development

Author: artyredd

MiniMapLibrary/Basic/Dimension2D.cs

@@ -16,10 +16,7 @@ public float Width
             set
             {
                 _Width = value;
-                if (OnChanged != null)
-                {
-                    OnChanged(this);
-                }
+                OnChanged?.Invoke(this);
             }
         }
         public float Height
@@ -28,10 +25,7 @@ public float Height
             set
             {
                 _Height = value;
-                if (OnChanged != null)
-                {
-                    OnChanged(this);
-                }
+                OnChanged?.Invoke(this);
             }
         }
 

MiniMapLibrary/Interfaces/IConfig.cs …iMapLibrary/Config/Interfaces/IConfig.csMiniMapLibrary/Interfaces/IConfig.cs renamed to MiniMapLibrary/Config/Interfaces/IConfig.cs MiniMapLibrary/Interfaces/IConfig.cs renamed to MiniMapLibrary/Config/Interfaces/IConfig.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace MiniMapLibrary.Interfaces
+namespace MiniMapLibrary.Config
 {
     public interface IConfig
     {

MiniMapLibrary/Interfaces/IConfigEntry.cs …ibrary/Config/Interfaces/IConfigEntry.csMiniMapLibrary/Interfaces/IConfigEntry.cs renamed to MiniMapLibrary/Config/Interfaces/IConfigEntry.cs MiniMapLibrary/Interfaces/IConfigEntry.cs renamed to MiniMapLibrary/Config/Interfaces/IConfigEntry.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace MiniMapLibrary.Interfaces
+namespace MiniMapLibrary.Config
 {
     public interface IConfigEntry<T>
     {

…nterfaces/wrappers/SettingConfigGroup.cs …Config/Interfaces/ISettingConfigGroup.csMiniMapLibrary/Interfaces/wrappers/SettingConfigGroup.cs renamed to MiniMapLibrary/Config/Interfaces/ISettingConfigGroup.cs MiniMapLibrary/Interfaces/wrappers/SettingConfigGroup.cs renamed to MiniMapLibrary/Config/Interfaces/ISettingConfigGroup.cs

@@ -1,10 +1,9 @@
-using MiniMapLibrary.Interfaces;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
 
-namespace MiniMapMod.wrappers
+namespace MiniMapLibrary.Config
 {
     public interface ISettingConfigGroup
     {

MiniMapLibrary/SettingConfigGroup.cs …iMapLibrary/Config/SettingConfigGroup.csMiniMapLibrary/SettingConfigGroup.cs renamed to MiniMapLibrary/Config/SettingConfigGroup.cs MiniMapLibrary/SettingConfigGroup.cs renamed to MiniMapLibrary/Config/SettingConfigGroup.cs

@@ -1,11 +1,11 @@
 using MiniMapLibrary;
-using MiniMapLibrary.Interfaces;
+using MiniMapLibrary.Config;
 using System;
 using System.Collections.Generic;
 using System.Text;
 using UnityEngine;
 
-namespace MiniMapMod.wrappers
+namespace MiniMapLibrary.Config
 {
     public class SettingConfigGroup : ISettingConfigGroup
     {

MiniMapLibrary/StubConfigEntry.cs …brary/Config/wrappers/StubConfigEntry.csMiniMapLibrary/StubConfigEntry.cs renamed to MiniMapLibrary/Config/wrappers/StubConfigEntry.cs MiniMapLibrary/StubConfigEntry.cs renamed to MiniMapLibrary/Config/wrappers/StubConfigEntry.cs

@@ -1,9 +1,8 @@
-using MiniMapLibrary.Interfaces;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace MiniMapLibrary
+namespace MiniMapLibrary.Config
 {
     public class StubConfigEntry<T> : IConfigEntry<T>
     {

MiniMapLibrary/Interactible/InteractableKind.cs

@@ -11,15 +11,21 @@ public enum InteractableKind
         none = 0,
         Chest = 1 << 0,
         Utility = 1 << 1,
-        Teleporter = 1 << 2,
-        Shrine = 1 << 3,
-        Special = 1 << 4,
-        Player = 1 << 5,
-        Drone = 1 << 6,
-        Barrel = 1 << 7,
-        Enemy = 1 << 8,
-        Printer = 1 << 9,
-        LunarPod = 1 << 10,
-        All = 0b_1111_11
+        Shrine = 1 << 2,
+        Special = 1 << 3,
+        Drone = 1 << 4,
+        Barrel = 1 << 5,
+        Printer = 1 << 6,
+        LunarPod = 1 << 7,
+        Shop = 1 << 8,
+        Equipment =  1 << 9,
+        Teleporter = 1 << 10,
+        EnemyMonster = 1 << 11,
+        EnemyLunar = 1 << 12,
+        EnemyVoid = 1 << 13,
+        Minion = 1 << 14,
+        Player = 1 << 15,
+        Item =  1 << 16,
+        All = 0xFFFF
     }
 }

MiniMapLibrary/Interactible/InteractibleSetting.cs

@@ -1,5 +1,4 @@
-using MiniMapLibrary.Interfaces;
-using MiniMapMod.wrappers;
+using MiniMapLibrary.Config;
 using System;
 using System.Collections.Generic;
 using System.Text;

MiniMapLibrary/Interfaces/ILogger.cs

@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MiniMapLibrary
+{
+    public interface ILogger
+    {
+        void LogDebug(object data);
+        void LogError(object data);
+        void LogFatal(object data);
+        void LogInfo(object data);
+        void LogMessage(object data);
+        void LogWarning(object data);
+        void LogException(Exception head, string message = "");
+    }
+}