Changeset 324 for binary-improvements/MapRendering

Timestamp:

Sep 3, 2018, 7:11:10 PM (6 years ago)

Author:

alloc

Message:

A17 compatibility changes

Location:

binary-improvements/MapRendering

Files:

• API.cs (modified) (2 diffs)
• Web/API/GetPlayerList.cs (modified) (1 diff)
• Web/API/GetPlayersOnline.cs (modified) (2 diffs)
• WebAndMapRendering.csproj (modified) (1 diff)

binary-improvements/MapRendering/API.cs

@@ -3 +3 @@
 namespace MapRendering
 {
-        public class API : ModApiAbstract {
-
-                public override void GameAwake () {
+        public class API : IModApi {
+                private void GameAwake () {
+                        // ReSharper disable once ObjectCreationAsStatement
                         new AllocsFixes.NetConnections.Servers.Web.Web ();
                         AllocsFixes.NetConnections.Servers.Web.LogBuffer.Instance.GetType ();
                 }
 
-                public override void GameStartDone () {
+                private void GameStartDone () {
                         if (AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance != null) {
                                 AllocsFixes.NetConnections.Servers.Web.Handlers.ItemIconHandler.Instance.LoadIcons ();
@@ -16 +16 @@
                 }
 
-                public override void GameShutdown () {
+                private void GameShutdown () {
                         AllocsFixes.MapRendering.MapRendering.Shutdown ();
                 }
 
-                public override void CalcChunkColorsDone (Chunk _chunk) {
+                private void CalcChunkColorsDone (Chunk _chunk) {
                         AllocsFixes.MapRendering.MapRendering.RenderSingleChunk (_chunk);
                 }
 
+                public void InitMod () {
+                        ModEvents.GameAwake.RegisterHandler (GameAwake);
+                        ModEvents.GameStartDone.RegisterHandler (GameStartDone);
+                        ModEvents.GameShutdown.RegisterHandler (GameShutdown);
+                        ModEvents.CalcChunkColorsDone.RegisterHandler (CalcChunkColorsDone);
+                }
         }
 }

binary-improvements/MapRendering/Web/API/GetPlayerList.cs

@@ -153 +153 @@
                         Match filterMatch = numberFilterMatcher.Match (_filterVal);
                         if (filterMatch.Success) {
-                                double value = Utils.ParseDouble (filterMatch.Groups [2].Value);
+                                double value = StringParsers.ParseDouble (filterMatch.Groups [2].Value);
                                 NumberMatchType matchType;
                                 double epsilon = value / 100000;

binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs

@@ -15 +15 @@
                         World w = GameManager.Instance.World;
                         foreach (KeyValuePair<int, EntityPlayer> current in w.Players.dict) {
-                                ClientInfo ci = ConnectionManager.Instance.GetClientInfoForEntityId (current.Key);
+                                ClientInfo ci = ConnectionManager.Instance.Clients.ForEntityId (current.Key);
                                 Player player = PersistentContainer.Instance.Players [ci.playerId, false];
 
@@ -32 +32 @@
 
                                 // Deprecated!
-                                p.Add ("experience", new JSONNumber (player != null ? player.Experience : 0));
+                                p.Add ("experience", new JSONNumber (-1));
 
                                 p.Add ("level", new JSONNumber (player != null ? player.Level : -1));

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -44 +44 @@
     <Reference Include="System">
       <HintPath>..\7dtd-binaries\System.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\7dtd-binaries\UnityEngine.CoreModule.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="UnityEngine.ImageConversionModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\7dtd-binaries\UnityEngine.ImageConversionModule.dll</HintPath>
       <Private>False</Private>
     </Reference>