Update to Rocket 4.2.0.0

Zamirathe · Zamirathe · commit 50f65c65559f · 2015-05-26T12:29:24.000-06:00
diff --git a/Zamirathe_HomeCommand/CommandHome.cs b/Zamirathe_HomeCommand/CommandHome.cs
@@ -1,4 +1,6 @@
-﻿using Rocket.RocketAPI;
+﻿using Rocket.API;
+using Rocket.Unturned.Commands;
+using Rocket.Unturned.Player;
 using SDG;
 using Steamworks;
 using UnityEngine;
@@ -29,6 +31,13 @@ public string Help
                 return "Teleports you to your bed if you have one.";
             }
         }
+        public string Syntax
+        {
+            get
+            {
+                return "";
+            }
+        }
         public void Execute(RocketPlayer playerid, string[] bed)
         {
             HomePlayer homeplayer = playerid.Player.transform.GetComponent<HomePlayer>();
diff --git a/Zamirathe_HomeCommand/HomeCommand.cs b/Zamirathe_HomeCommand/HomeCommand.cs
@@ -1,6 +1,9 @@
 ﻿using System;
 using System.Collections.Generic;
-using Rocket.RocketAPI;
+using Rocket.API;
+using Rocket.Unturned;
+using Rocket.Unturned.Plugins;
+using Rocket.Unturned.Player;
 using SDG;
 using UnityEngine;
 using Steamworks;
@@ -34,14 +37,14 @@ public static object[] CheckConfig(RocketPlayer player)
             if (!HomeCommand.Instance.Configuration.Enabled)
             {
                 // Command disabled.
-                RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.DisabledMsg, player.CharacterName));
+                RocketChat.Say(player, String.Format(HomeCommand.Instance.Configuration.DisabledMsg, player.CharacterName));
                 return returnv;
             }
             // It is enabled, but are they in a vehicle?
             if (player.Stance == EPlayerStance.DRIVING || player.Stance == EPlayerStance.SITTING)
             {
                 // They are in a vehicle.
-                RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.NoVehicleMsg, player.CharacterName));
+                RocketChat.Say(player, String.Format(HomeCommand.Instance.Configuration.NoVehicleMsg, player.CharacterName));
                 return returnv;
             }
             // They aren't in a vehicle, so check if they have a bed.    
@@ -50,7 +53,7 @@ public static object[] CheckConfig(RocketPlayer player)
             if (!BarricadeManager.tryGetBed(player.CSteamID, out bedPos, out bedRot))
             {
                 // Bed not found.
-                RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.NoBedMsg, player.CharacterName));
+                RocketChat.Say(player, String.Format(HomeCommand.Instance.Configuration.NoBedMsg, player.CharacterName));
                 return returnv;
             }
             object[] returnv2 = { true, bedPos, bedRot };
diff --git a/Zamirathe_HomeCommand/HomeCommandConfiguration.cs b/Zamirathe_HomeCommand/HomeCommandConfiguration.cs
@@ -1,10 +1,11 @@
-﻿using Rocket.RocketAPI;
+﻿using Rocket.API;
+using Rocket.Core;
 using System;
 using System.Collections.Generic;
 
 namespace Zamirathe_HomeCommand
 {
-    public class HomeCommandConfiguration : IRocketConfiguration
+    public class HomeCommandConfiguration : IRocketPluginConfiguration
     {
         public bool Enabled;
         public string DisabledMsg;
@@ -19,7 +20,7 @@ public class HomeCommandConfiguration : IRocketConfiguration
         public string UnableMoveSinceMoveMsg;
         public string NoTeleportDiedMsg;
 
-        public IRocketConfiguration DefaultConfiguration
+        public IRocketPluginConfiguration DefaultConfiguration
         {
             get
             {
diff --git a/Zamirathe_HomeCommand/HomePlayer.cs b/Zamirathe_HomeCommand/HomePlayer.cs
@@ -1,6 +1,7 @@
-﻿using Rocket.Components;
-using Rocket.RocketAPI;
-using Rocket.Logging;
+﻿using Rocket.API;
+using Rocket.Unturned;
+using Rocket.Unturned.Logging;
+using Rocket.Unturned.Player;
 using SDG;
 using Steamworks;
 using UnityEngine;
@@ -52,17 +53,15 @@ public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)
                     else
                     {
                         // Either not an admin or they don't get special wait restrictions.
-                        List<Group> hg = player.Groups;
+                        List<Rocket.Core.Permissions.Group> hg = player.GetGroups(true);
                         if (hg.Count <= 0)
                         {
-                            Group group = new Group();
-                            group.Id = "default";
-                            hg.Add(group);
+                            Logger.Log("There was an error as a player has no groups!");
                         }
                         byte[] time2 = new byte[hg.Count];
                         for (byte g=0;g<hg.Count;g++)
                         {
-                            Group hgr = hg[g];
+                            Rocket.Core.Permissions.Group hgr = hg[g];
                             HomeCommand.Instance.WaitGroups.TryGetValue(hgr.Id, out time2[g]);
                             if (time2[g] <= 0)
                             {
@@ -77,11 +76,11 @@ public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)
                 if (this.movementrestricted)
                 {
                     this.LastCalledHomePos = this.transform.position;
-                    RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.CharacterName, this.waittime));
+                    RocketChat.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.CharacterName, this.waittime));
                 }
                 else
                 {
-                    RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.CharacterName, this.waittime));
+                    RocketChat.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.CharacterName, this.waittime));
                 }
             }
             else
@@ -94,7 +93,7 @@ public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)
         private void DoGoHome()
         {
             if (!this.cangohome) return;
-            RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.CharacterName));
+            RocketChat.Say(this.p, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.CharacterName));
             this.p.Teleport(this.bedPos, this.bedRot);
             this.cangohome = false;
             this.GoingHome = false;
@@ -105,7 +104,7 @@ public void FixedUpdate()
             if (this.p.Dead)
             {
                 // Abort teleport, they died.
-                RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.CharacterName));
+                RocketChat.Say(this.p, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.CharacterName));
                 this.GoingHome = false;
                 this.cangohome = false;
                 return;
@@ -115,7 +114,7 @@ public void FixedUpdate()
                 if (Vector3.Distance(this.p.Position, this.LastCalledHomePos) > 0.1)
                 {
                     // Abort teleport, they moved.
-                    RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.CharacterName));
+                    RocketChat.Say(this.p, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.CharacterName));
                     this.GoingHome = false;
                     this.cangohome = false;
                     return;
diff --git a/Zamirathe_HomeCommand/Properties/AssemblyInfo.cs b/Zamirathe_HomeCommand/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.4")]
-[assembly: AssemblyFileVersion("2.1.0.4")]
+[assembly: AssemblyVersion("2.1.1.0")]
+[assembly: AssemblyFileVersion("2.1.1.0")]
diff --git a/Zamirathe_HomeCommand/Zamirathe_HomeCommand.csproj b/Zamirathe_HomeCommand/Zamirathe_HomeCommand.csproj
@@ -38,9 +38,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\..\steamcmd\unturnedtesting13\Unturned_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
-    <Reference Include="RocketAPI, Version=3.8.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\steamcmd\unturnedtesting13\Unturned_Data\Managed\RocketAPI.dll</HintPath>
+    <Reference Include="Rocket.API">
+      <HintPath>..\..\..\..\..\..\..\steamcmd\unturnedtesting13\Unturned_Data\Managed\Rocket.API.dll</HintPath>
+    </Reference>
+    <Reference Include="Rocket.Core">
+      <HintPath>..\..\..\..\..\..\..\steamcmd\unturnedtesting13\Unturned_Data\Managed\Rocket.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="Rocket.Unturned">
+      <HintPath>..\..\..\..\..\..\..\steamcmd\unturnedtesting13\Unturned_Data\Managed\Rocket.Unturned.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,11 @@`
`1`		`-using Rocket.RocketAPI;`
	`1`	`+using Rocket.API;`
	`2`	`+using Rocket.Core;`
`2`	`3`	`using System;`
`3`	`4`	`using System.Collections.Generic;`
`4`	`5`
`5`	`6`	`namespace Zamirathe_HomeCommand`
`6`	`7`	`{`
`7`		`- public class HomeCommandConfiguration : IRocketConfiguration`
	`8`	`+ public class HomeCommandConfiguration : IRocketPluginConfiguration`
`8`	`9`	`{`
`9`	`10`	`public bool Enabled;`
`10`	`11`	`public string DisabledMsg;`
`@@ -19,7 +20,7 @@ public class HomeCommandConfiguration : IRocketConfiguration`
`19`	`20`	`public string UnableMoveSinceMoveMsg;`
`20`	`21`	`public string NoTeleportDiedMsg;`
`21`	`22`
`22`		`- public IRocketConfiguration DefaultConfiguration`
	`23`	`+ public IRocketPluginConfiguration DefaultConfiguration`
`23`	`24`	`{`
`24`	`25`	`get`
`25`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`		`-using Rocket.Components;`
`2`		`-using Rocket.RocketAPI;`
`3`		`-using Rocket.Logging;`
	`1`	`+using Rocket.API;`
	`2`	`+using Rocket.Unturned;`
	`3`	`+using Rocket.Unturned.Logging;`
	`4`	`+using Rocket.Unturned.Player;`
`4`	`5`	`using SDG;`
`5`	`6`	`using Steamworks;`
`6`	`7`	`using UnityEngine;`
`@@ -52,17 +53,15 @@ public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)`
`52`	`53`	`else`
`53`	`54`	`{`
`54`	`55`	`// Either not an admin or they don't get special wait restrictions.`
`55`		`- List<Group> hg = player.Groups;`
	`56`	`+ List<Rocket.Core.Permissions.Group> hg = player.GetGroups(true);`
`56`	`57`	`if (hg.Count <= 0)`
`57`	`58`	`{`
`58`		`- Group group = new Group();`
`59`		`- group.Id = "default";`
`60`		`- hg.Add(group);`
	`59`	`+ Logger.Log("There was an error as a player has no groups!");`
`61`	`60`	`}`
`62`	`61`	`byte[] time2 = new byte[hg.Count];`
`63`	`62`	`for (byte g=0;g<hg.Count;g++)`
`64`	`63`	`{`
`65`		`- Group hgr = hg[g];`
	`64`	`+ Rocket.Core.Permissions.Group hgr = hg[g];`
`66`	`65`	`HomeCommand.Instance.WaitGroups.TryGetValue(hgr.Id, out time2[g]);`
`67`	`66`	`if (time2[g] <= 0)`
`68`	`67`	`{`
`@@ -77,11 +76,11 @@ public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)`
`77`	`76`	`if (this.movementrestricted)`
`78`	`77`	`{`
`79`	`78`	`this.LastCalledHomePos = this.transform.position;`
`80`		`- RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.CharacterName, this.waittime));`
	`79`	`+ RocketChat.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedWaitNoMoveMsg, player.CharacterName, this.waittime));`
`81`	`80`	`}`
`82`	`81`	`else`
`83`	`82`	`{`
`84`		`- RocketChatManager.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.CharacterName, this.waittime));`
	`83`	`+ RocketChat.Say(player, String.Format(HomeCommand.Instance.Configuration.FoundBedNowWaitMsg, player.CharacterName, this.waittime));`
`85`	`84`	`}`
`86`	`85`	`}`
`87`	`86`	`else`
`@@ -94,7 +93,7 @@ public void GoHome(Vector3 bedPos, byte bedRot, RocketPlayer player)`
`94`	`93`	`private void DoGoHome()`
`95`	`94`	`{`
`96`	`95`	`if (!this.cangohome) return;`
`97`		`- RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.CharacterName));`
	`96`	`+ RocketChat.Say(this.p, String.Format(HomeCommand.Instance.Configuration.TeleportMsg, this.p.CharacterName));`
`98`	`97`	`this.p.Teleport(this.bedPos, this.bedRot);`
`99`	`98`	`this.cangohome = false;`
`100`	`99`	`this.GoingHome = false;`
`@@ -105,7 +104,7 @@ public void FixedUpdate()`
`105`	`104`	`if (this.p.Dead)`
`106`	`105`	`{`
`107`	`106`	`// Abort teleport, they died.`
`108`		`- RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.CharacterName));`
	`107`	`+ RocketChat.Say(this.p, String.Format(HomeCommand.Instance.Configuration.NoTeleportDiedMsg, this.p.CharacterName));`
`109`	`108`	`this.GoingHome = false;`
`110`	`109`	`this.cangohome = false;`
`111`	`110`	`return;`
`@@ -115,7 +114,7 @@ public void FixedUpdate()`
`115`	`114`	`if (Vector3.Distance(this.p.Position, this.LastCalledHomePos) > 0.1)`
`116`	`115`	`{`
`117`	`116`	`// Abort teleport, they moved.`
`118`		`- RocketChatManager.Say(this.p, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.CharacterName));`
	`117`	`+ RocketChat.Say(this.p, String.Format(HomeCommand.Instance.Configuration.UnableMoveSinceMoveMsg, this.p.CharacterName));`
`119`	`118`	`this.GoingHome = false;`
`120`	`119`	`this.cangohome = false;`
`121`	`120`	`return;`