1.1

- removed waste - code cleaned - better practices implemented - /dm alias now works - /dm reload, help & clear added - better error handling
RenderBr · Jun 9, 2023 · 7863f78 · 7863f78
1 parent 0f1355c
commit 7863f78
Show file tree

Hide file tree

Showing 8 changed files with 146 additions and 3,127 deletions.
diff --git a/Api/DiemobApi.cs b/Api/DiemobApi.cs
@@ -1,41 +1,34 @@
 using Auxiliary;
+using Auxiliary.Configuration;
 using MongoDB.Driver;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using TShockAPI;
 
 namespace DieMob.Api
 {
-    public class DiemobApi
-    {
+	public class DiemobApi
+	{
 
-        public void DeleteDiemob(string regionName)
-        {
-            StorageProvider.GetMongoCollection<DieMobRegion>("DieMobRegions").FindOneAndDeleteAsync(x => x.Region == regionName);
-        }
+		public void DeleteDiemob(string regionName) => StorageProvider.GetMongoCollection<DieMobRegion>("DieMobRegions").FindOneAndDeleteAsync(x => x.Region == regionName);
 
-        public List<DieMobRegion> RetrieveAllRegions()
-        {
-            return StorageProvider.GetMongoCollection<DieMobRegion>("DieMobRegions").Find(x => true).ToList();
+		public List<DieMobRegion> RetrieveAllRegions() => StorageProvider.GetMongoCollection<DieMobRegion>("DieMobRegions").Find(x => true).ToList();
 
-        }
+		public async Task<DieMobRegion> RetrieveRegion(string regionName) => await IModel.GetAsync(GetRequest.Bson<DieMobRegion>(x => x.Region == regionName));
 
-        public async Task<DieMobRegion> RetrieveRegion(string regionName)
-        {
-            return await IModel.GetAsync(GetRequest.Bson<DieMobRegion>(x => x.Region == regionName));
-        }
 
+		public async Task<DieMobRegion> CreateDieMobRegion(string regionName)
+			=> await IModel.GetAsync(GetRequest.Bson<DieMobRegion>(x => x.Region == regionName), x =>
+			{
+				x.Region = TShock.Regions.GetRegionByName(regionName).Name;
+				x.AffectFriendlyNPCs = false;
+				x.AffectStatueSpawns = true;
+				x.ReplaceMobs = new();
+				x.Type = RegionType.Kill;
+			});
 
-        public async Task<DieMobRegion> CreateDieMobRegion(string regionName)
-            => await IModel.GetAsync(GetRequest.Bson<DieMobRegion>(x => x.Region == regionName), x =>
-            {
-                x.Region = TShock.Regions.GetRegionByName(regionName).Name;
-                x.AffectFriendlyNPCs = false;
-                x.AffectStatueSpawns = true;
-                x.ReplaceMobs = new();
-                x.Type = RegionType.Kill;
-            });
+		public void ReloadDieMob() => Configuration<DiemobSettings>.Load(nameof(DieMob));
 
 
-    }
+	}
 }
diff --git a/DiemobSettings.cs b/DiemobSettings.cs
@@ -3,15 +3,15 @@
 
 namespace DieMob
 {
-    public class DiemobSettings : ISettings
-    {
-        [JsonPropertyName("UpdateInterval")]
-        public int UpdateInterval { get; set; }
+	public class DiemobSettings : ISettings
+	{
+		[JsonPropertyName("UpdateInterval")]
+		public int UpdateInterval { get; set; }
 
-        [JsonPropertyName("RepelPowerModifier")]
-        public float RepelPowerModifier { get; set; }
+		[JsonPropertyName("RepelPowerModifier")]
+		public float RepelPowerModifier { get; set; }
 
-        [JsonPropertyName("RegionStretch")]
-        public int RegionStretch { get; set; }
-    }
+		[JsonPropertyName("RegionStretch")]
+		public int RegionStretch { get; set; }
+	}
 }
diff --git a/Models/DieMobRegion.cs b/Models/DieMobRegion.cs
@@ -4,77 +4,77 @@
 
 namespace DieMob
 {
-    public class DieMobRegion : BsonModel
-    {
-        private string _region;
-        public string Region
-        {
-            get
-              => _region;
-            set
-            {
-                _ = this.SaveAsync(x => x.Region, value);
-                _region = value;
-            }
-        }
+	public class DieMobRegion : BsonModel
+	{
+		private string _region;
+		public string Region
+		{
+			get
+			  => _region;
+			set
+			{
+				_ = this.SaveAsync(x => x.Region, value);
+				_region = value;
+			}
+		}
 
-        private RegionType _type;
-        public RegionType Type
-        {
-            get
-              => _type;
-            set
-            {
-                _ = this.SaveAsync(x => x.Type, value);
-                _type = value;
-            }
-        }
+		private RegionType _type;
+		public RegionType Type
+		{
+			get
+			  => _type;
+			set
+			{
+				_ = this.SaveAsync(x => x.Type, value);
+				_type = value;
+			}
+		}
 
-        private Dictionary<int, int> _replaceMobs;
-        public Dictionary<int, int> ReplaceMobs
-        {
-            get
-              => _replaceMobs;
-            set
-            {
-                _ = this.SaveAsync(x => x.ReplaceMobs, value);
-                _replaceMobs = value;
-            }
-        }
+		private Dictionary<int, int> _replaceMobs;
+		public Dictionary<int, int> ReplaceMobs
+		{
+			get
+			  => _replaceMobs;
+			set
+			{
+				_ = this.SaveAsync(x => x.ReplaceMobs, value);
+				_replaceMobs = value;
+			}
+		}
 
-        private bool _affectFriendlyNPCS;
-        public bool AffectFriendlyNPCs
-        {
-            get
-              => _affectFriendlyNPCS;
-            set
-            {
-                _ = this.SaveAsync(x => x.AffectFriendlyNPCs, value);
-                _affectFriendlyNPCS = value;
-            }
-        }
+		private bool _affectFriendlyNPCS;
+		public bool AffectFriendlyNPCs
+		{
+			get
+			  => _affectFriendlyNPCS;
+			set
+			{
+				_ = this.SaveAsync(x => x.AffectFriendlyNPCs, value);
+				_affectFriendlyNPCS = value;
+			}
+		}
 
-        private bool _affectStatueSpawns;
-        public bool AffectStatueSpawns
-        {
-            get
-              => _affectStatueSpawns;
-            set
-            {
-                _ = this.SaveAsync(x => x.AffectStatueSpawns, value);
-                _affectStatueSpawns = value;
-            }
-        }
+		private bool _affectStatueSpawns;
+		public bool AffectStatueSpawns
+		{
+			get
+			  => _affectStatueSpawns;
+			set
+			{
+				_ = this.SaveAsync(x => x.AffectStatueSpawns, value);
+				_affectStatueSpawns = value;
+			}
+		}
 
-        public DieMobRegion() { }
+		public DieMobRegion() { }
 
-        public DieMobRegion(Region _reg)
-        {
-            Region = _reg.Name;
-            Type = RegionType.Kill;
-            ReplaceMobs = new Dictionary<int, int>();
-            AffectFriendlyNPCs = false;
-            AffectStatueSpawns = false;
-        }
-    }
+		public DieMobRegion(Region _reg)
+		{
+			Region = _reg.Name;
+			Type = RegionType.Kill;
+			ReplaceMobs = new Dictionary<int, int>();
+			AffectFriendlyNPCs = false;
+			AffectStatueSpawns = false;
+		}
+	}
 }
diff --git a/Models/RegionType.cs b/Models/RegionType.cs
@@ -1,9 +1,9 @@
 namespace DieMob
 {
-    public enum RegionType
-    {
-        Kill = 0,
-        Repel = 1,
-        Passive = 2
-    }
+	public enum RegionType
+	{
+		Kill = 0,
+		Repel = 1,
+		Passive = 2
+	}
 }
diff --git a/Plugin.cs b/Plugin.cs
@@ -6,6 +6,7 @@
 using MongoDB.Driver;
 using System;
 using System.Collections.Generic;
+using System.Reflection;
 using Terraria;
 using Terraria.Localization;
 using TerrariaApi.Server;
@@ -14,8 +15,6 @@
 
 namespace DieMob
 {
-
-
     [ApiVersion(2, 1)]
     public class Plugin : TerrariaPlugin
     {
@@ -30,12 +29,12 @@ public override string Description
             => "Removes any entities that decide to enter a region";
 
         public override Version Version
-            => new(1, 0);
+            => new Version(1, 1);
 
-        #endregion
+		#endregion
 
-        #region Plugin Initialization
-        public Plugin(Main game)
+		#region Plugin Initialization
+		public Plugin(Main game)
             : base(game)
         {
             Order = 1;