Changeset 420 for binary-improvements/MapRendering

Timestamp:

Mar 28, 2023, 5:11:02 PM (21 months ago)

Author:

alloc

Message:

A21 preparations.
NOT COMPATIBLE WITH A20 ANYMORE!

Location:

binary-improvements/MapRendering

Files:

• API.cs (modified) (2 diffs)
• Commands/EnableOpenIDDebug.cs (deleted)
• Commands/EnableRendering.cs (deleted)
• Commands/ReloadWebPermissions.cs (modified) (1 diff)
• Commands/RenderMap.cs (deleted)
• Commands/WebPermissionsCmd.cs (modified) (1 diff)
• Commands/WebTokens.cs (modified) (1 diff)
• Commands/webstat.cs (modified) (1 diff)
• MapRendering (deleted)
• Web/API/ExecuteConsoleCommand.cs (modified) (1 diff)
• Web/API/GetAllowedCommands.cs (modified) (1 diff)
• Web/API/GetLandClaims.cs (modified) (1 diff)
• Web/API/GetPlayerList.cs (modified) (1 diff)
• Web/API/GetPlayersLocation.cs (modified) (1 diff)
• Web/Handlers/ItemIconHandler.cs (modified) (1 diff)
• Web/Handlers/StaticHandler.cs (modified) (1 diff)
• Web/OpenID.cs (modified) (1 diff)
• Web/Web.cs (modified) (6 diffs)
• Web/WebPermissions.cs (modified) (1 diff)
• WebAndMapRendering.csproj (modified) (4 diffs)

binary-improvements/MapRendering/API.cs

@@ -9 +9 @@
                         ModEvents.GameStartDone.RegisterHandler (GameStartDone);
                         ModEvents.GameShutdown.RegisterHandler (GameShutdown);
-                        ModEvents.CalcChunkColorsDone.RegisterHandler (CalcChunkColorsDone);
                 }
 
@@ -28 +27 @@
                 private void GameShutdown () {
                         webInstance?.Shutdown ();
-                        MapRendering.MapRendering.Shutdown ();
-                }
-
-                private void CalcChunkColorsDone (Chunk _chunk) {
-                        MapRendering.MapRendering.RenderSingleChunk (_chunk);
                 }
         }

binary-improvements/MapRendering/Commands/ReloadWebPermissions.cs

@@ -5 +5 @@
 namespace AllocsFixes.CustomCommands {
         public class ReloadWebPermissions : ConsoleCmdAbstract {
-                public override string GetDescription () {
+                protected override string getDescription () {
                         return "force reload of web permissions file";
                 }
 
-                public override string[] GetCommands () {
-                        return new[] {"reloadwebpermissions"};
+                protected override string[] getCommands () {
+                        return new[] {"reloadwebpermissions_legacy"};
                 }
 

binary-improvements/MapRendering/Commands/WebPermissionsCmd.cs

@@ -4 +4 @@
 namespace AllocsFixes.CustomCommands {
         public class WebPermissionsCmd : ConsoleCmdAbstract {
-                public override string[] GetCommands () {
-                        return new[] {"webpermission"};
+                protected override string[] getCommands () {
+                        return new[] {"webpermission_legacy"};
                 }
 
-                public override string GetDescription () {
+                protected override string getDescription () {
                         return "Manage web permission levels";
                 }
 
-                public override string GetHelp () {
+                protected override string getHelp () {
                         return "Set/get permission levels required to access a given web functionality. Default\n" +
                                "level required for functions that are not explicitly specified is 0.\n" +
                                "Usage:\n" +
-                               "   webpermission add <webfunction> <level>\n" +
-                               "   webpermission remove <webfunction>\n" +
-                               "   webpermission list";
+                               "   webpermission_legacy add <webfunction> <level>\n" +
+                               "   webpermission_legacy remove <webfunction>\n" +
+                               "   webpermission_legacy list";
                 }
 

binary-improvements/MapRendering/Commands/WebTokens.cs

@@ -7 +7 @@
                 private static readonly Regex validNameTokenMatcher = new Regex (@"^\w+$");
 
-                public override string[] GetCommands () {
-                        return new[] {"webtokens"};
+                protected override string[] getCommands () {
+                        return new[] {"webtokens_legacy"};
                 }
 
-                public override string GetDescription () {
+                protected override string getDescription () {
                         return "Manage web tokens";
                 }
 
-                public override string GetHelp () {
+                protected override string getHelp () {
                         return "Set/get webtoken permission levels. A level of 0 is maximum permission.\n" +
                                "Usage:\n" +
-                               "   webtokens add <username> <usertoken> <level>\n" +
-                               "   webtokens remove <username>\n" +
-                               "   webtokens list";
+                               "   webtokens_legacy add <username> <usertoken> <level>\n" +
+                               "   webtokens_legacy remove <username>\n" +
+                               "   webtokens_legacy list";
                 }
 

binary-improvements/MapRendering/Commands/webstat.cs

@@ -5 +5 @@
 namespace AllocsFixes.CustomCommands {
         public class webstat : ConsoleCmdAbstract {
-                public override string GetDescription () {
+                protected override string getDescription () {
                         return "DEBUG PURPOSES ONLY";
                 }
 
-                public override string[] GetCommands () {
-                        return new[] {"webstat"};
+                protected override string[] getCommands () {
+                        return new[] {"webstat_legacy"};
                 }
 

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

@@ -31 +31 @@
                         }
 
-                        int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (command.GetCommands ());
+                        int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (command.GetCommands ());
 
                         if (_permissionLevel > commandPermissionLevel) {

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

@@ -9 +9 @@
                         JSONArray entries = new JSONArray ();
                         foreach (IConsoleCommand cc in SdtdConsole.Instance.GetCommands ()) {
-                                int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (cc.GetCommands ());
+                                int commandPermissionLevel = GameManager.Instance.adminTools.Commands.GetCommandPermissionLevel (cc.GetCommands ());
                                 if (_permissionLevel <= commandPermissionLevel) {
                                         string cmd = string.Empty;

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

@@ -23 +23 @@
 
                         JSONObject result = new JSONObject ();
-                        result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> ("LandClaimSize"))));
+                        result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> (nameof(EnumGamePrefs.LandClaimSize)))));
 
                         JSONArray claimOwners = new JSONArray ();

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

@@ -68 +68 @@
                                         pJson.Add ("ping", new JSONNumber (p.IsOnline ? p.ClientInfo.ping : -1));
 
-                                        JSONBoolean banned = admTools != null ? new JSONBoolean (admTools.IsBanned (kvp.Key, out _, out _)) : new JSONBoolean (false);
+                                        JSONBoolean banned = admTools != null ? new JSONBoolean (admTools.Blacklist.IsBanned (kvp.Key, out _, out _)) : new JSONBoolean (false);
 
                                         pJson.Add ("banned", banned);

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

@@ -24 +24 @@
                         foreach (KeyValuePair<PlatformUserIdentifierAbs, Player> kvp in playersList.Dict) {
                                 if (admTools != null) {
-                                        if (admTools.IsBanned (kvp.Key, out _, out _)) {
+                                        if (admTools.Blacklist.IsBanned (kvp.Key, out _, out _)) {
                                                 continue;
                                         }

binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs

@@ -89 +89 @@
                                                 loadIconsFromFolder (modIconsPath, tintedIcons);
                                         } catch (Exception e) {
-                                                Log.Error ("Failed loading icons from mod " + mod.ModInfo.Name.Value);
+                                                Log.Error ("Failed loading icons from mod " + mod.Name);
                                                 Log.Exception (e);
                                         }

binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs

@@ -1 +1 @@
 using System.IO;
 using System.Net;
-using AllocsFixes.FileCache;
+using Webserver.FileCache;
 
 namespace AllocsFixes.NetConnections.Servers.Web.Handlers {

binary-improvements/MapRendering/Web/OpenID.cs

@@ -26 +26 @@
 
                 private const bool verboseSsl = false;
-                public static bool debugOpenId;
+                private static bool debugOpenId => Webserver.OpenID.debugOpenId;
 
                 static OpenID () {
-                        for (int i = 0; i < Environment.GetCommandLineArgs ().Length; i++) {
-                                if (Environment.GetCommandLineArgs () [i].EqualsCaseInsensitive ("-debugopenid")) {
-                                        debugOpenId = true;
-                                }
-                        }
-
                         ServicePointManager.ServerCertificateValidationCallback = (_srvPoint, _certificate, _chain, _errors) => {
                                 if (_errors == SslPolicyErrors.None) {

binary-improvements/MapRendering/Web/Web.cs

@@ -7 +7 @@
 using System.Text;
 using System.Threading;
-using AllocsFixes.FileCache;
 using AllocsFixes.NetConnections.Servers.Web.Handlers;
 using AllocsFixes.NetConnections.Servers.Web.SSE;
 using UnityEngine;
+using Webserver.FileCache;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -25 +25 @@
                 public Web () {
                         try {
-                                int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> ("ControlPanelPort"));
+                                int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> (nameof(EnumGamePrefs.WebDashboardPort)));
                                 if (webPort < 1 || webPort > 65533) {
-                                        Log.Out ("Webserver not started (ControlPanelPort not within 1-65533)");
+                                        Log.Out ("Webserver not started (WebDashboardPort not within 1-65533)");
                                         return;
                                 }
 
                                 if (!Directory.Exists (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) +
-                                                       "/webserver")) {
-                                        Log.Out ("Webserver not started (folder \"webserver\" not found in WebInterface mod folder)");
+                                                       "/webserver_legacy")) {
+                                        Log.Out ("Webserver not started (folder \"webserver_legacy\" not found in WebInterface mod folder)");
                                         return;
                                 }
@@ -40 +40 @@
                                 bool useStaticCache = false;
 
-                                string dataFolder = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) + "/webserver";
+                                string dataFolder = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) + "/webserver_legacy";
 
                                 if (!HttpListener.IsSupported) {
@@ -60 +60 @@
                                 RegisterPathHandler ("/map/", new StaticHandler (
                                                 GameIO.GetSaveGameDir () + "/map",
-                                                MapRendering.MapRendering.GetTileCache (),
+                                                MapRendering.MapRenderer.GetTileCache (),
                                                 false,
                                                 "web.map")
@@ -248 +248 @@
                                 if (con != null) {
                                         _con = con;
-                                        return GameManager.Instance.adminTools.GetUserPermissionLevel (_con.UserId);
+                                        return GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_con.UserId);
                                 }
                         }
@@ -270 +270 @@
                                                 WebConnection con = connectionHandler.LogIn (id, _req.RemoteEndPoint.Address);
                                                 _con = con;
-                                                int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
+                                                int level = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (con.UserId);
                                                 Log.Out ("Steam OpenID login from {0} with ID {1}, permission level {2}",
                                                         remoteEndpointString, con.UserId, level);

binary-improvements/MapRendering/Web/WebPermissions.cs

@@ -171 +171 @@
 
                 private string GetFilePath () {
-                        return GamePrefs.GetString (EnumUtils.Parse<EnumGamePrefs> ("SaveGameFolder"));
+                        return GamePrefs.GetString (EnumUtils.Parse<EnumGamePrefs> (nameof(EnumGamePrefs.SaveGameFolder)));
                 }
 

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -9 +9 @@
     <OutputType>Library</OutputType>
     <RootNamespace>MapRendering</RootNamespace>
-    <AssemblyName>MapRendering</AssemblyName>
+    <AssemblyName>AllocsWeb</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
   </PropertyGroup>
@@ -39 +39 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="com.rlabrecque.steamworks.net, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\7dtd-binaries\com.rlabrecque.steamworks.net.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="LogLibrary">
       <HintPath>..\7dtd-binaries\LogLibrary.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="MapRendering, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\7dtd-binaries\MapRendering.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -75 +83 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="WebServer, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
+      <HintPath>..\7dtd-binaries\WebServer.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs" />
-    <Compile Include="MapRendering\MapRendering.cs" />
-    <Compile Include="MapRendering\MapRenderBlockBuffer.cs" />
-    <Compile Include="MapRendering\Constants.cs" />
-    <Compile Include="Commands\RenderMap.cs" />
-    <Compile Include="Commands\EnableRendering.cs" />
     <Compile Include="API.cs" />
     <Compile Include="Web\API\GetAnimalsLocation.cs" />
@@ -121 +128 @@
     <Compile Include="Web\WebCommandResult.cs" />
     <Compile Include="Web\API\GetAllowedCommands.cs" />
-    <Compile Include="Commands\EnableOpenIDDebug.cs" />
     <Compile Include="Web\API\GetPlayerInventories.cs" />
   </ItemGroup>