Changeset 354

Timestamp:

Aug 16, 2019, 7:58:34 PM (5 years ago)

Author:

alloc

Message:

A18 preps

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (2 diffs)
• 7dtd-server-fixes/src/API.cs (modified) (1 diff)
• 7dtd-server-fixes/src/JSON/JsonManualBuilder.cs (added)
• 7dtd-server-fixes/src/PersistentData/InvItem.cs (modified) (1 diff)
• AllocsCommands/AllocsCommands.csproj (modified) (1 diff)
• AllocsCommands/Chat.cs (modified) (1 diff)
• MapRendering/Web/Handlers/ItemIconHandler.cs (modified) (5 diffs)
• MapRendering/WebAndMapRendering.csproj (modified) (1 diff)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -10 +10 @@
     <AssemblyName>7dtd-server-fixes</AssemblyName>
     <RootNamespace>AllocsFixes</RootNamespace>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -77 +77 @@
   <ItemGroup>
     <Compile Include="src\AssemblyInfo.cs" />
+    <Compile Include="src\JSON\JsonManualBuilder.cs" />
     <Compile Include="src\LiveData\Animals.cs" />
     <Compile Include="src\LiveData\Hostiles.cs" />

binary-improvements/7dtd-server-fixes/src/API.cs

@@ -89 +89 @@
                         if (_cInfo != null) {
                                 Log.Out ("Sent chat hook reply to {0}", _cInfo.playerId);
-                                _cInfo.SendPackage (new NetPackageChat (EChatType.Whisper, -1, ANSWER, "", false, null));
+                                _cInfo.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, ANSWER, "", false, null));
                         } else {
                                 Log.Error ("ChatHookExample: Argument _cInfo null on message: {0}", _msg);

binary-improvements/7dtd-server-fixes/src/PersistentData/InvItem.cs

@@ -14 +14 @@
                 public int maxUseTimes;
                 [OptionalField]
-                public int useTimes;
+                public float useTimes;
 
-                public InvItem (string _itemName, int _count, int _quality, int _maxUseTimes, int _maxUse) {
+                public InvItem (string _itemName, int _count, int _quality, int _maxUseTimes, float _maxUse) {
                         itemName = _itemName;
                         count = _count;

binary-improvements/AllocsCommands/AllocsCommands.csproj

@@ -10 +10 @@
     <RootNamespace>AllocsCommands</RootNamespace>
     <AssemblyName>AllocsCommands</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

binary-improvements/AllocsCommands/Chat.cs

@@ -10 +10 @@
                         }
 
-                        _receiver.SendPackage (new NetPackageChat(EChatType.Whisper, -1, _message, senderName + " (PM)", false, null));
+                        _receiver.SendPackage (NetPackageManager.GetPackage<NetPackageChat> ().Setup (EChatType.Whisper, -1, _message, senderName + " (PM)", false, null));
                         string receiverName = _receiver.playerName;
                         SdtdConsole.Instance.Output ("Message to player " +

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

@@ -53 +53 @@
 
                 public bool LoadIcons () {
+                        
                         lock (icons) {
                                 if (loaded) {
@@ -59 +60 @@
 
                                 MicroStopwatch microStopwatch = new MicroStopwatch ();
-
-                                GameObject atlasObj = GameObject.Find ("/NGUI Root (2D)/ItemIconAtlas");
-                                if (atlasObj == null) {
-                                        Log.Error ("Web:IconHandler: Atlas object not found");
-                                        loaded = true;
-                                        return false;
-                                }
-
-                                DynamicUIAtlas atlas = atlasObj.GetComponent<DynamicUIAtlas> ();
-                                if (atlas == null) {
-                                        Log.Error ("Web:IconHandler: Atlas component not found");
-                                        loaded = true;
-                                        return false;
-                                }
-
-                                string textureResourceName = atlas.PrebakedAtlas;
-                                List<UISpriteData> sprites;
-                                int elementWidth, elementHeight;
-                                Texture2D atlasTex;
-
-                                if (!DynamicUIAtlasTools.ReadPrebakedAtlasDescriptor (textureResourceName, out sprites,
-                                        out elementWidth, out elementHeight)) {
-                                        SdtdConsole.Instance.Output ("Web:IconHandler: Could not read dynamic atlas descriptor");
-                                        return false;
-                                }
-
-                                if (!DynamicUIAtlasTools.ReadPrebakedAtlasTexture (textureResourceName, out atlasTex)) {
-                                        SdtdConsole.Instance.Output ("Web:IconHandler: Could not read dynamic atlas texture");
-                                        return false;
-                                }
 
                                 // Get list of used tints for all items
@@ -107 +78 @@
                                 }
 
-                                // Load icons from vanilla
-                                foreach (UISpriteData data in sprites) {
-                                        string name = data.name;
-                                        Texture2D tex = new Texture2D (data.width, data.height, TextureFormat.ARGB32, false);
-                                        tex.SetPixels (atlasTex.GetPixels (data.x, atlasTex.height - data.height - data.y, data.width,
-                                                data.height));
-
-                                        AddIcon (name, tex, tintedIcons);
-
-                                        Object.Destroy (tex);
+                                try {
+                                        loadIconsFromFolder (Utils.GetGameDir ("Data/ItemIcons"), tintedIcons);
+                                } catch (Exception e) {
+                                        Log.Error ("Failed loading icons from base game");
+                                        Log.Exception (e);
                                 }
-
-                                Resources.UnloadAsset (atlasTex);
 
                                 // Load icons from mods
@@ -125 +89 @@
                                         try {
                                                 string modIconsPath = mod.Path + "/ItemIcons";
-                                                if (Directory.Exists (modIconsPath)) {
-                                                        foreach (string file in Directory.GetFiles (modIconsPath)) {
-                                                                try {
-                                                                        if (file.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) {
-                                                                                string name = Path.GetFileNameWithoutExtension (file);
-                                                                                Texture2D tex = new Texture2D (1, 1, TextureFormat.ARGB32, false);
-                                                                                if (tex.LoadImage (File.ReadAllBytes (file))) {
-                                                                                        if (tex.width == elementWidth && tex.height == elementHeight) {
-                                                                                                AddIcon (name, tex, tintedIcons);
-                                                                                        }
-
-                                                                                        Object.Destroy (tex);
-                                                                                }
-                                                                        }
-                                                                } catch (Exception e) {
-                                                                        Log.Exception (e);
-                                                                }
-                                                        }
-                                                }
+                                                loadIconsFromFolder (modIconsPath, tintedIcons);
                                         } catch (Exception e) {
+                                                Log.Error ("Failed loading icons from mod " + mod.ModInfo.Name.Value);
                                                 Log.Exception (e);
                                         }
@@ -153 +100 @@
 
                                 return true;
+                        }
+                }
+
+                private void loadIconsFromFolder (string _path, Dictionary<string, List<Color>> _tintedIcons) {
+                        if (Directory.Exists (_path)) {
+                                foreach (string file in Directory.GetFiles (_path)) {
+                                        try {
+                                                if (file.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) {
+                                                        string name = Path.GetFileNameWithoutExtension (file);
+                                                        Texture2D tex = new Texture2D (1, 1, TextureFormat.ARGB32, false);
+                                                        if (tex.LoadImage (File.ReadAllBytes (file))) {
+                                                                AddIcon (name, tex, _tintedIcons);
+
+                                                                Object.Destroy (tex);
+                                                        }
+                                                }
+                                        } catch (Exception e) {
+                                                Log.Exception (e);
+                                        }
+                                }
                         }
                 }

binary-improvements/MapRendering/WebAndMapRendering.csproj

@@ -10 +10 @@
     <RootNamespace>MapRendering</RootNamespace>
     <AssemblyName>MapRendering</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">