Updated to Version 1.19.4

anegostudios · Feb 28, 2024 · f979d49 · f979d49
1 parent d7fa849
commit f979d49
Show file tree

Hide file tree

Showing 996 changed files with 25,030 additions and 24,853 deletions.
diff --git a/Common/Collectible/Block/BlockSchematic.cs b/Common/Collectible/Block/BlockSchematic.cs
@@ -103,6 +103,7 @@ public class BlockSchematic
 
         /// <summary>
         /// Set by the RemapperAssistant in OnFinalizeAssets
+        /// <br/>Heads up!:  This is unordered, it will iterate through the different game versions' remaps not necessarily in the order they originally appear in remaps.json config.  If any block remaps over the years have duplicate original block names, behavior for those ones may be unpredictable
         /// </summary>
         public static Dictionary<string, Dictionary<string, string>> BlockRemaps { get; set; }
 
@@ -1042,8 +1043,19 @@ public void PlaceEntitiesAndBlockEntities(IBlockAccessor blockAccessor, IWorldAc
                         Block encodedBlock = worldForCollectibleResolve.GetBlock(new AssetLocation(treeBlockCode));
                         if (encodedBlock != null && encodedBlock.GetType() != be.Block.GetType())   // It should be the same type at least, though it might have been rotated or had some other state change eg. snow to free or vice-versa
                         {
-                            worldForCollectibleResolve.Logger.Warning("Could not import block entity data for schematic at {0}. There is already {1}, expected {2}. Probably overlapping ruins.", curPos, be.Block, treeBlockCode);
-                            continue;
+                            foreach (var map in BlockRemaps)
+                            {
+                                if (map.Value.TryGetValue(treeBlockCode, out var newBlockCode))
+                                {
+                                    encodedBlock = worldForCollectibleResolve.GetBlock(new AssetLocation(newBlockCode));
+                                    break;
+                                }
+                            }
+                            if (encodedBlock != null && encodedBlock.GetType() != be.Block.GetType())   // Sanity check again, after the remapping
+                            {
+                                worldForCollectibleResolve.Logger.Warning("Could not import block entity data for schematic at {0}. There is already {1}, expected {2}. Possibly overlapping ruins, or is this schematic from an old game version?", curPos, be.Block, treeBlockCode);
+                                continue;
+                            }
                         }
                     }
 

diff --git a/Config/GameVersion.cs b/Config/GameVersion.cs
@@ -36,12 +36,12 @@ public static class GameVersion
         /// <summary>
         /// Whether this is a stable or unstable version
         /// </summary>
-        public const EnumGameBranch Branch = EnumGameBranch.Unstable;
+        public const EnumGameBranch Branch = EnumGameBranch.Stable;
 
         /// <summary>
         /// Version number in the format: major.minor.revision[appendix]
         /// </summary>
-        public const string ShortGameVersion = OverallVersion + "-rc.3";
+        public const string ShortGameVersion = OverallVersion + "";
 
         public static EnumReleaseType ReleaseType => GetReleaseType(ShortGameVersion);
 

diff --git a/Math/Matrix/Matrix.cs b/Math/Matrix/Matrix.cs
@@ -20,6 +20,12 @@ public Matrixf()
             Values = Mat4f.Create();
         }
 
+        public Matrixf(float[] values)
+        {
+            Values = Mat4f.Create();
+            Set(values);
+        }
+
         public static Matrixf Create()
         {
             return new Matrixf();
@@ -179,6 +185,12 @@ public Matrixf Mul(float[] matrix)
             return this;
         }
 
+        public Matrixf Mul(Matrixf matrix)
+        {
+            Mat4f.Mul(Values, Values, matrix.Values);
+            return this;
+        }
+
         public Matrixf ReverseMul(float[] matrix)
         {
             Mat4f.Mul(Values, matrix, Values);

diff --git a/api/.manifest b/api/.manifest
@@ -3312,13 +3312,15 @@
   "Vintagestory.API.Client.MatrixToolsd.Project(Vintagestory.API.MathTools.Vec3d,System.Double[],System.Double[],System.Int32,System.Int32)": "Vintagestory.API.Client.MatrixToolsd.yml",
   "Vintagestory.API.Client.Matrixf": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.#ctor": "Vintagestory.API.Client.Matrixf.yml",
+  "Vintagestory.API.Client.Matrixf.#ctor(System.Single[])": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.Clone": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.Create": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.FollowPlayer": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.FollowPlayerXZ": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.Identity": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.Invert": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.Mul(System.Single[])": "Vintagestory.API.Client.Matrixf.yml",
+  "Vintagestory.API.Client.Matrixf.Mul(Vintagestory.API.Client.Matrixf)": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.ReverseMul(System.Single[])": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.Rotate(System.Single,System.Single,System.Single)": "Vintagestory.API.Client.Matrixf.yml",
   "Vintagestory.API.Client.Matrixf.Rotate(Vintagestory.API.MathTools.Vec3f)": "Vintagestory.API.Client.Matrixf.yml",

diff --git a/api/CompactExifLib.ExifByteOrder.yml b/api/CompactExifLib.ExifByteOrder.yml
@@ -17,8 +17,8 @@ items:
   source:
     remote:
       path: VintagestoryApi/Util/ExifData.cs
-      branch: d6806ed2527579840d2aaf86b17f0c5078d743b1
-      repo: https://gitlab-ci-token:64_N9Sxr9MX2YqsptD_Zy3q@git.striver.net/vintagecraft/game.git
+      branch: e450abe5fddf2a92d3eff652939a6754393473f6
+      repo: https://gitlab-ci-token:64_PX7i2ftgqxEk4RiTaS8x@git.striver.net/vintagecraft/game.git
     id: ExifByteOrder
     path: Util/ExifData.cs
     startLine: 4417
@@ -42,8 +42,8 @@ items:
   source:
     remote:
       path: VintagestoryApi/Util/ExifData.cs
-      branch: d6806ed2527579840d2aaf86b17f0c5078d743b1
-      repo: https://gitlab-ci-token:64_N9Sxr9MX2YqsptD_Zy3q@git.striver.net/vintagecraft/game.git
+      branch: e450abe5fddf2a92d3eff652939a6754393473f6
+      repo: https://gitlab-ci-token:64_PX7i2ftgqxEk4RiTaS8x@git.striver.net/vintagecraft/game.git
     id: LittleEndian
     path: Util/ExifData.cs
     startLine: 4417
@@ -68,8 +68,8 @@ items:
   source:
     remote:
       path: VintagestoryApi/Util/ExifData.cs
-      branch: d6806ed2527579840d2aaf86b17f0c5078d743b1
-      repo: https://gitlab-ci-token:64_N9Sxr9MX2YqsptD_Zy3q@git.striver.net/vintagecraft/game.git
+      branch: e450abe5fddf2a92d3eff652939a6754393473f6
+      repo: https://gitlab-ci-token:64_PX7i2ftgqxEk4RiTaS8x@git.striver.net/vintagecraft/game.git
     id: BigEndian
     path: Util/ExifData.cs
     startLine: 4417