Merge https://github.com/Regalis11/Barotrauma into develop

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -54,7 +54,7 @@ body:
       label: Version
       description: Which version of the game did the bug happen in? You can see the current version number in the bottom left corner of your screen in the main menu.
       options:      
-        - v1.0.13.1
+        - v1.0.13.2
         - Other
     validations:
       required: true

Barotrauma/BarotraumaClient/ClientSource/ContentManagement/ContentPackage/ModProject.cs

@@ -86,7 +86,7 @@ namespace Barotrauma
 
         public string ModVersion = ContentPackage.DefaultModVersion;
 
-        public Md5Hash? ExpectedHash { get; private set; }
+        public Md5Hash? ExpectedHash { get; set; }
 
         public bool IsCore = false;
 

Barotrauma/BarotraumaClient/ClientSource/Screens/SubEditorScreen.cs

@@ -3560,6 +3560,7 @@ namespace Barotrauma
                 foreach (var subElement in info.SubmarineElement.Elements())
                 {
                     int id = subElement.GetAttributeInt("ID", -1);
+                    if (id == -1) { continue; }
                     Identifier identifier = subElement.GetAttributeIdentifier("identifier", string.Empty);
                     if (entities.TryGetValue(id, out Identifier duplicateEntity))
                     {

Barotrauma/BarotraumaClient/ClientSource/Steam/Workshop.cs

@@ -163,7 +163,7 @@ namespace Barotrauma.Steam
                 CrossThread.RequestExecutionOnMainThread(() => ContentPackageManager.LocalPackages.Refresh());
             }
             
-            public static async Task CreatePublishStagingCopy(string modVersion, ContentPackage contentPackage)
+            public static async Task CreatePublishStagingCopy(string title, string modVersion, ContentPackage contentPackage)
             {
                 await Task.Yield();
                 
@@ -184,11 +184,12 @@ namespace Barotrauma.Steam
                     throw new Exception("Staging copy could not be loaded",
                         result.TryUnwrapFailure(out var exception) ? exception : null);
                 }
-                
+
-                //Load filelist.xml and write the hash into it so anyone downloading this mod knows what it should be
+                //Load filelist.xml and write the hash into it so anyone downloading this mod knows what it should be                
                 ModProject modProject = new ModProject(tempPkg)
                 {
-                    ModVersion = modVersion
+                    ModVersion = modVersion,
+                    ExpectedHash = tempPkg.CalculateHash(name: title, modVersion: modVersion)
                 };
                 modProject.Save(stagingFileListPath);
             }

Barotrauma/BarotraumaClient/ClientSource/Steam/WorkshopMenu/Mutable/PublishTab.cs

@@ -478,7 +478,7 @@ namespace Barotrauma.Steam
             bool stagingReady = false;
             Exception? stagingException = null;
             TaskPool.Add("CreatePublishStagingCopy",
-                SteamManager.Workshop.CreatePublishStagingCopy(modVersion, localPackage),
+                SteamManager.Workshop.CreatePublishStagingCopy(editor.Title ?? localPackage.Name, modVersion, localPackage),
                 (t) =>
                 {
                     stagingReady = true;

Barotrauma/BarotraumaClient/LinuxClient.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.0.13.1</Version>
+    <Version>1.0.13.2</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/MacClient.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.0.13.1</Version>
+    <Version>1.0.13.2</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaClient/WindowsClient.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma</Product>
-    <Version>1.0.13.1</Version>
+    <Version>1.0.13.2</Version>
     <Copyright>Copyright © FakeFish 2018-2023</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Barotrauma</AssemblyName>

Barotrauma/BarotraumaServer/LinuxServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.0.13.1</Version>
+    <Version>1.0.13.2</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/MacServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.0.13.1</Version>
+    <Version>1.0.13.2</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaServer/WindowsServer.csproj

@@ -11,7 +11,7 @@
     <RootNamespace>Barotrauma</RootNamespace>
     <Authors>FakeFish, Undertow Games</Authors>
     <Product>Barotrauma Dedicated Server</Product>
-    <Version>1.0.13.1</Version>
+    <Version>1.0.13.2</Version>
     <Copyright>Copyright © FakeFish 2018-2022</Copyright>
     <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>DedicatedServer</AssemblyName>

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackage/ContentPackage.cs

@@ -23,7 +23,7 @@ namespace Barotrauma
                        : string.Empty);
         }
 
-        public static readonly Version MinimumHashCompatibleVersion = new Version(1, 0, 11, 0);
+        public static readonly Version MinimumHashCompatibleVersion = new Version(1, 0, 13, 2);
         
         public const string LocalModsDir = "LocalMods";
         public static readonly string WorkshopModsDir = Barotrauma.IO.Path.Combine(
@@ -177,7 +177,7 @@ namespace Barotrauma
             }
         }
 
-        public Md5Hash CalculateHash(bool logging = false)
+        public Md5Hash CalculateHash(bool logging = false, string? name = null, string? modVersion = null)
         {
             using IncrementalHash incrementalHash = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
             
@@ -205,11 +205,12 @@ namespace Barotrauma
                 }             
             }
 
-            if (UgcId.TryUnwrap(out ContentPackageId? id) && id != null)
+            string selectedName = name ?? Name;
+            if (!selectedName.IsNullOrEmpty())
             {
-                incrementalHash.AppendData(Encoding.UTF8.GetBytes(id.StringRepresentation));
+                incrementalHash.AppendData(Encoding.UTF8.GetBytes(selectedName));
             }
-            incrementalHash.AppendData(Encoding.UTF8.GetBytes(ModVersion));
+            incrementalHash.AppendData(Encoding.UTF8.GetBytes(modVersion ?? ModVersion));
 
             var md5Hash = Md5Hash.BytesAsHash(incrementalHash.GetHashAndReset());
             if (logging)

Barotrauma/BarotraumaShared/changelog.txt

@@ -1,3 +1,10 @@
+---------------------------------------------------------------------------------------------------------
+v1.0.13.2
+---------------------------------------------------------------------------------------------------------
+
+- Fixed "hash mismatch" errors when trying to enable a mod that's been updated in the most recent patch.
+- Fixed "the submarine contains entities with duplicate IDs" error message when loading a submarine that contains multiple shuttles/drones.
+
 ---------------------------------------------------------------------------------------------------------
 v1.0.13.1
 ---------------------------------------------------------------------------------------------------------