Update to 1.4.1.1

Frischifrisch · Oct 15, 2020 · 876f53f · 876f53f
1 parent bf69505
commit 876f53f
Show file tree

Hide file tree

Showing 8 changed files with 149 additions and 149 deletions.
diff --git a/patches/Terraria/Terraria/Terraria.csproj.patch b/patches/Terraria/Terraria/Terraria.csproj.patch
@@ -6,7 +6,7 @@
 +  <Import Project="../../TerrariaSteamPath.targets" />
    <PropertyGroup>
      <OutputType>WinExe</OutputType>
-     <Version>1.4.1.0</Version>
+     <Version>1.4.1.1</Version>
      <Company>Re-Logic</Company>
      <Copyright>Copyright © 2020 Re-Logic</Copyright>
      <RootNamespace>Terraria</RootNamespace>

diff --git a/patches/Terraria/Terraria/UI/FancyErrorPrinter.cs.patch b/patches/Terraria/Terraria/UI/FancyErrorPrinter.cs.patch
@@ -15,7 +15,7 @@
 
  		private static void ShowTheBox(string preparedMessage) {
 +#if WINDOWS && CLIENT
- 			MessageBox.Show(preparedMessage, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+ 			MessageBox.Show(preparedMessage, "Error", MessageBoxButtons.OK, MessageBoxIcon.Hand);
 +#endif
  		}
  	}

diff --git a/patches/tModLoader/Terraria/Main.cs.patch b/patches/tModLoader/Terraria/Main.cs.patch
@@ -36,8 +36,8 @@
  		public delegate void OnPlayerSelected(PlayerFileData player);
 @@ -239,7 +_,7 @@
  		public static NPCHeadRenderer BossNPCHeadRenderer = null;
- 		public static string versionNumber = "v1.4.1";
- 		public static string versionNumber2 = "v1.4.1";
+ 		public static string versionNumber = "v1.4.1.1";
+ 		public static string versionNumber2 = "v1.4.1.1";
 -		public static string SavePath = Program.LaunchParameters.ContainsKey("-savedirectory") ? Program.LaunchParameters["-savedirectory"] : Platform.Get<IPathService>().GetStoragePath("Terraria");
 +		public static string SavePath = Program.SavePath;
  		public static bool AnnouncementBoxDisabled;
@@ -392,8 +392,8 @@
  			mouseColorSlider.SetHSL(mouseColor);
  			mouseBorderColorSlider.SetHSL(MouseBorderColor);
  			mouseBorderColorSlider.Alpha = (float)(int)MouseBorderColor.A / 255f;
--			if (currentValue != 232)
-+			if (currentValue != 232 || ModLoader.ModLoader.LastLaunchedTModLoaderVersion != ModLoader.ModLoader.version)
+-			if (currentValue != 233)
++			if (currentValue != 233 || ModLoader.ModLoader.LastLaunchedTModLoaderVersion != ModLoader.ModLoader.version)
  				SaveSettings();
  		}
 

diff --git a/patches/tModLoader/Terraria/MessageBuffer.cs.patch b/patches/tModLoader/Terraria/MessageBuffer.cs.patch
@@ -46,10 +46,10 @@
  						if (Netplay.Clients[whoAmI].State != 0)
  							break;
 
--						if (reader.ReadString() == "Terraria" + 232) {
+-						if (reader.ReadString() == "Terraria" + 233) {
 +						string clientVersion = reader.ReadString();
 +						ModNet.isModdedClient[whoAmI] = clientVersion == ModLoader.ModLoader.versionedName;
-+						if (ModNet.isModdedClient[whoAmI] || clientVersion == "Terraria" + 232 && ModNet.AllowVanillaClients) {
++						if (ModNet.isModdedClient[whoAmI] || clientVersion == "Terraria" + 233 && ModNet.AllowVanillaClients) {
  							if (string.IsNullOrEmpty(Netplay.ServerPassword)) {
  								Netplay.Clients[whoAmI].State = 1;
 +								if (ModNet.isModdedClient[whoAmI]) {

diff --git a/patches/tModLoader/Terraria/NetMessage.cs.patch b/patches/tModLoader/Terraria/NetMessage.cs.patch
@@ -38,7 +38,7 @@
  				writer.Write((byte)msgType);
  				switch (msgType) {
  					case 1:
--						writer.Write("Terraria" + 232);
+-						writer.Write("Terraria" + 233);
 +						writer.Write(ModLoader.ModLoader.versionedName);
  						break;
  					case 2: