Merge pull request #3 from 5Dev24/develop

Author: 5Dev24

README.md

@@ -4,13 +4,13 @@
 
 ## Permissions
 
-* `recycle.use` -- Allows players to use `/recycle` chat command and `recycle` console command
+* `recycle.use` -- Allows players to use the recycler
 * `recycle.admin` -- Allows players to destroy all recyclers or dropped bags currently created by **Recycle**
 * `recycle.bypass` -- Allows players to bypass the cooldown of recycling
 
 ## Commands
 
-* `/recycle` and `recycle` -- Opens a recycler
+* `/recycle` and `recycle` -- Opens a recycler, can be configured
 * `/purgerecyclers` -- Destroys all recyclers and drops their contents to a locked bag at the owner's position
 * `/purgebags` -- Destroys all bags created by **Recycle**
 
@@ -25,6 +25,7 @@
     "NPCs Only": false,
     "Allowed In Safe Zones": true,
     "Instant Recycling": false,
+    "Command To Open Recycler": "recycle",
     "NPC Ids": [],
     "Recyclable Types": [
       "Ammunition",
@@ -43,7 +44,7 @@
     ],
     "Blacklisted Items": []
   },
-  "VERSION": "3.0.0"
+  "VERSION": "3.0.1"
 }
 ```
 

Recycle.cs

@@ -1,3 +1,4 @@
+using Oxide.Core.Libraries.Covalence;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using UnityEngine;
@@ -7,7 +8,7 @@
 
 namespace Oxide.Plugins {
 
-	[Info("Recycle", "5Dev24", "3.0.0")]
+	[Info("Recycle", "5Dev24", "3.0.1")]
 	[Description("Recycle items into their resources")]
 	public class Recycle : RustPlugin {
 
@@ -29,6 +30,8 @@ private void Loaded() {
 			this.ValidateConfig();
 			this.Data = Config.ReadObject<ConfigData>();
 
+			this.AddCovalenceCommand(this.Data?.Settings?.RecycleCommand ?? "recycle", "RecycleCommand", null);
+
 			permission.RegisterPermission(Recycle.AdminPermission, this);
 			permission.RegisterPermission(Recycle.RecyclerPermission, this);
 			permission.RegisterPermission(Recycle.CooldownBypassPermission, this);
@@ -55,41 +58,25 @@ private object CanAcceptItem(ItemContainer con, Item i, int target) {
 				Recycler r = con.entityOwner as Recycler;
 				if (this.IsRecycleBox(r)) {
 					BasePlayer p = this.PlayerFromRecycler(r.net.ID);
-					if (target < 6 && (!this.Data.Settings.RecyclableTypes.Contains(Enum.GetName(typeof(ItemCategory), i.info.category)) ||
-						this.Data.Settings.Blacklist.Contains(i.info.shortname))) {
-						if (p != null) this.PrintToChat(p, this.GetMessage("Recycle", "Invalid", p));
-						return ItemContainer.CanAcceptResult.CannotAcceptRightNow;
+					if (target < 6) {
+						if (!this.Data.Settings.RecyclableTypes.Contains(Enum.GetName(typeof(ItemCategory), i.info.category)) ||
+							this.Data.Settings.Blacklist.Contains(i.info.shortname)) {
+							if (p != null) this.PrintToChat(p, this.GetMessage("Recycle", "Invalid", p));
+							return ItemContainer.CanAcceptResult.CannotAcceptRightNow;
+						} else if (this.Data.Settings.InstantRecycling) {
+							if (!r.IsOn()) {
+								r.InvokeRepeating(new Action(r.RecycleThink), 0, 0);
+								Effect.server.Run(r.startSound.resourcePath, r, 0U, Vector3.zero, Vector3.zero, null, false);
+								r.SetFlag(BaseEntity.Flags.On, true, false, true);
+								r.SendNetworkUpdateImmediate();
+							}
+						} else r.StartRecycling();
 					}
 				}
 			}
 			return null;
 		}
 
-		private void OnItemAddedToContainer(ItemContainer con, Item i) {
-			if (con.entityOwner is Recycler) {
-				Recycler r = con.entityOwner as Recycler;
-				if (this.IsRecycleBox(r)) {
-					BasePlayer p = this.PlayerFromRecycler(r.net.ID);
-					if (i == null || p == null || i.position >= 6) return;
-					else if (!this.Data.Settings.RecyclableTypes.Contains(Enum.GetName(typeof(ItemCategory), i.info.category)) ||
-						this.Data.Settings.Blacklist.Contains(i.info.shortname)) {
-						this.PrintToChat(p, this.GetMessage("Recycle", "Invalid", p));
-						return;
-					}
-
-					if (this.Data.Settings.InstantRecycling) {
-						if (!r.IsOn()) {
-							r.InvokeRepeating(new Action(r.RecycleThink), 0, 0);
-							Effect.server.Run(r.startSound.resourcePath, r, 0U, Vector3.zero, Vector3.zero, null, false);
-							r.SetFlag(BaseEntity.Flags.On, true, false, true);
-							r.SendNetworkUpdateImmediate();
-						}
-					} else
-						r.StartRecycling();
-				}
-			}
-		}
-
 		private object OnRecycleItem(Recycler r, Item i) {
 			if (this.IsRecycleBox(r)) {
 				BasePlayer p = this.PlayerFromRecycler(r.net.ID);
@@ -167,12 +154,9 @@ private void OnUseNPC(BasePlayer npc, BasePlayer p) {
 
 		#region Commands
 
-		[ConsoleCommand("recycle")]
-		private void RecycleConsoleCommand(ConsoleSystem.Arg arg) =>
-			this.RecycleChatCommand(arg.Connection.player as BasePlayer, arg.cmd.Name, arg.Args);
-
-		[ChatCommand("recycle")]
-		private void RecycleChatCommand(BasePlayer p, string cmd, string[] args) {
+		private void RecycleCommand(IPlayer iP, string cmd, string[] args) {
+			BasePlayer p = iP.Object as BasePlayer;
+			if (p == null) return;
 			if (!this.Data.Settings.NPCOnly && this.CanPlayerOpenRecycler(p)) {
 				this.OpenRecycler(p);
 				if (this.Data.Settings.Cooldown > 0) {
@@ -211,6 +195,8 @@ public struct EntityAndPlayer {
 
 		public class ConfigData {
 			public class SettingsWrapper {
+				[JsonProperty("Command To Open Recycler")]
+				public string RecycleCommand = "recycle";
 				[JsonProperty("Cooldown (in minutes)")]
 				public float Cooldown = 5.0f;
 				[JsonProperty("Maximum Radiation")]
@@ -231,7 +217,7 @@ public class SettingsWrapper {
 				public List<string> Blacklist = new List<string>();
 			}
 			public SettingsWrapper Settings = new SettingsWrapper();
-			public string VERSION = "3.0.0";
+			public string VERSION = "3.0.1";
 		}
 
 		#endregion
@@ -244,6 +230,7 @@ protected override void LoadDefaultConfig() {
 				"Ammunition", "Attire", "Common", "Component", "Construction", "Electrical",
 				"Fun", "Items", "Medical", "Misc", "Tool", "Traps", "Weapon" };
 			Config.WriteObject(tmp, true);
+			this.Data = tmp;
 		}
 
 		private T GetSetting<T>(string val, T defaultVal) {
@@ -286,6 +273,16 @@ private void ValidateConfig() {
 					Config.Clear();
 					Config.WriteObject(this.Data, true);
 					Config.Save();
+				} else if (version.Equals("3.0.0")) {
+					this.Data = Config.ReadObject<ConfigData>();
+					if (this.Data == null) this.LoadDefaultConfig();
+					else {
+						this.Data.VERSION = Version.ToString();
+						this.Data.Settings.RecycleCommand = "recycle";
+						Config.Clear();
+						Config.WriteObject(this.Data, true);
+						Config.Save();
+					}
 				}
 			} catch (NullReferenceException) {}
 		}
@@ -477,4 +474,4 @@ public void RemoveNPC(string id) {
 
 	}
 
-}
+}