v0.7 release, updated to tModLoader 0.11.6.2, new features

JavidPack · JavidPack · commit 540c30dc900e · 2020-04-16T18:14:08.000-06:00
diff --git a/patches/TerraCustom/Terraria.ModLoader/Logging.cs.patch b/patches/TerraCustom/Terraria.ModLoader/Logging.cs.patch
@@ -1,6 +1,6 @@
 --- src/tModLoader\Terraria.ModLoader\Logging.cs
 +++ src/TerraCustom\Terraria.ModLoader\Logging.cs
-@@ -21,7 +_,7 @@
+@@ -22,7 +_,7 @@
  {
  	public static class Logging
  	{
diff --git a/patches/TerraCustom/Terraria.ModLoader/ModLoader.cs.patch b/patches/TerraCustom/Terraria.ModLoader/ModLoader.cs.patch
@@ -1,7 +1,7 @@
 --- src/tModLoader\Terraria.ModLoader\ModLoader.cs
 +++ src/TerraCustom\Terraria.ModLoader\ModLoader.cs
-@@ -135,7 +_,24 @@
- 					OnSuccessfulLoad = null;
+@@ -134,7 +_,24 @@
+ 					OnSuccessfulLoad();
  				}
  				else {
 -					Main.menuMode = 0;
@@ -26,7 +26,7 @@
  				}
  			}
  			catch when (token.IsCancellationRequested) {
-@@ -339,8 +_,10 @@
+@@ -354,8 +_,10 @@
  			if (LastLaunchedTModLoaderVersion < version)
  				ShowWhatsNew = true;
  			*/
diff --git a/patches/TerraCustom/Terraria.csproj.patch b/patches/TerraCustom/Terraria.csproj.patch
@@ -17,7 +17,7 @@
      <Compile Include="Terraria.Localization\GameCulture.cs" />
      <Compile Include="Terraria.Localization\Language.cs" />
      <Compile Include="Terraria.Localization\LanguageChangeCallback.cs" />
-@@ -675,6 +_,10 @@
+@@ -676,6 +_,10 @@
      <Compile Include="Terraria.Social\ISocialModule.cs" />
      <Compile Include="Terraria.Social\SocialAPI.cs" />
      <Compile Include="Terraria.Social\SocialMode.cs" />
@@ -28,7 +28,7 @@
      <Compile Include="Terraria.UI.Chat\ChatLine.cs" />
      <Compile Include="Terraria.UI.Chat\ChatManager.cs" />
      <Compile Include="Terraria.UI.Chat\ITagHandler.cs" />
-@@ -779,6 +_,8 @@
+@@ -780,6 +_,8 @@
      <Compile Include="Terraria\RemoteClient.cs" />
      <Compile Include="Terraria\RemoteServer.cs" />
      <Compile Include="Terraria\ResolutionChangeEvent.cs" />
@@ -37,7 +37,7 @@
      <Compile Include="Terraria\Sign.cs" />
      <Compile Include="Terraria\Star.cs" />
      <Compile Include="Terraria\StrayMethods.cs" />
-@@ -1004,6 +_,10 @@
+@@ -1019,6 +_,10 @@
      <EmbeddedResource Include="Terraria.ModLoader.Default\MysteryItem.png" />
      <EmbeddedResource Include="Terraria.ModLoader.Default\StartBag.png" />
      <EmbeddedResource Include="Terraria.ModLoader.UI\UIModBrowserIcons.png" />
@@ -48,7 +48,7 @@
    </ItemGroup>
    <ItemGroup>
      <EmbeddedResource Include="Terraria.Localization.Content.en-US.tModLoader.json" />
-@@ -1015,6 +_,9 @@
+@@ -1030,6 +_,9 @@
      <EmbeddedResource Include="Terraria.Localization.Content.de-DE.tModLoader.json" />
      <EmbeddedResource Include="Terraria.Localization.Content.it-IT.tModLoader.json" />
      <EmbeddedResource Include="Terraria.Localization.Content.zh-Hans.tModLoader.json" />
diff --git a/patches/TerraCustom/Terraria/Main.cs.patch b/patches/TerraCustom/Terraria/Main.cs.patch
@@ -112,7 +112,7 @@
  			Platform.Current.SetWindowUnicodeTitle(base.Window, Main._cachedTitle);
  #endif
  		}
-@@ -8142,8 +_,16 @@
+@@ -8144,8 +_,16 @@
  			Main.gridTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Grid");
  			Main.trashTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Trash");
  			Main.cdTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "CoolDown");
@@ -129,7 +129,7 @@
  			Main.dustTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Dust");
  			Main.sunTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Sun");
  			Main.sun2Texture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Sun2");
-@@ -43570,7 +_,8 @@
+@@ -43572,7 +_,8 @@
  			Utils.DrawBorderString(Main.spriteBatch, text, r3.Right() + Vector2.UnitX * num * -22f, Microsoft.Xna.Framework.Color.White * Main.invasionProgressAlpha, num * 0.9f, 1f, 0.4f, -1);
  		}
  
@@ -139,7 +139,7 @@
  		{
  			Main.SaveSettings();
  #if CLIENT
-@@ -43823,13 +_,14 @@
+@@ -43825,13 +_,14 @@
  			{
  				Main.ActiveWorldFileData.SetSeed(text);
  			}
@@ -157,7 +157,7 @@
  			Main.worldName = text.Trim();
  			Main.ActiveWorldFileData = WorldFile.CreateMetadata(Main.worldName, SocialAPI.Cloud != null && SocialAPI.Cloud.EnabledByDefault, Main.expertMode);
  			if (Main.UseSeedUI)
-@@ -43837,7 +_,7 @@
+@@ -43839,7 +_,7 @@
  				Main.menuMode = 5000;
  				return;
  			}
@@ -166,7 +166,7 @@
  		}
  
  		private static Action CreateGoToMenuEvent(int menu)
-@@ -44003,6 +_,10 @@
+@@ -44005,6 +_,10 @@
  			if (Main.menuMode == -1)
  			{
  				Main.menuMode = 0;
@@ -177,7 +177,7 @@
  			}
  			bool loadedEverything = Program.LoadedEverything;
  			if (loadedEverything)
-@@ -45183,7 +_,7 @@
+@@ -45185,7 +_,7 @@
  						Main.MenuUI.SetState(Main._worldSelectMenu);
  						Main.menuMode = 888;
  					}
@@ -186,7 +186,7 @@
  					{
  						num2 = 200;
  						num4 = 60;
-@@ -45215,27 +_,36 @@
+@@ -45217,27 +_,36 @@
  						{
  							Main.expertMode = false;
  							Main.PlaySound(10, -1, -1, 1, 1f, 0f);
@@ -223,7 +223,7 @@
  						}
  						Main.clrInput();
  					}
-@@ -45286,14 +_,14 @@
+@@ -45288,14 +_,14 @@
  						num17++;
  						Main.clrInput();
  					}
@@ -242,15 +242,15 @@
  						Main.menuMode = 888;
  					}
  					else if (Main.menuMode == 8)
-@@ -46635,6 +_,7 @@
+@@ -46637,6 +_,7 @@
  					}
  					else
  					{
 +						TerraCustom.Interface.TerraCustomMenu(this, this.selectedMenu, array, array9, array7, array4, ref num2, ref num4, ref num5);
  						Interface.ModLoaderMenus(this, this.selectedMenu, array9, array7, array4, ref num2, ref num4, ref num5, ref flag5);
  					}
  				}
-@@ -47542,10 +_,10 @@
+@@ -47544,10 +_,10 @@
  				{
  					num111 = 2;
  				}
@@ -261,11 +261,11 @@
 +				string supportMessage = "jopojelly's Pateron - ";
 +				string patreonShortURL = @"patreon.com/jopojelly";
 +				bool showPatreon = Main.menuMode == 5001;
-+				string drawVersion = Main.versionNumber + Environment.NewLine + ModLoader.ModLoader.versionedName + Environment.NewLine + "jopojelly's TerraCustom v0.6.2" + (showPatreon ? Environment.NewLine + supportMessage : "");
++				string drawVersion = Main.versionNumber + Environment.NewLine + ModLoader.ModLoader.versionedName + Environment.NewLine + "jopojelly's TerraCustom v0.7" + (showPatreon ? Environment.NewLine + supportMessage : "");
  				Vector2 origin3 = Main.fontMouseText.MeasureString(drawVersion);
  				origin3.X *= 0.5f;
  				origin3.Y *= 0.5f;
-@@ -47562,7 +_,7 @@
+@@ -47564,7 +_,7 @@
  					if (num109 == 4 && Main.mouseLeftRelease && Main.mouseLeft && new Microsoft.Xna.Framework.Rectangle((int)origin3.X + 10, Main.screenHeight - (int)urlSize.Y - 2, (int)urlSize.X, (int)origin3.Y).Contains(new Microsoft.Xna.Framework.Point(Main.mouseX, Main.mouseY)) && hasFocus)
  					{
  						Main.PlaySound(SoundID.MenuOpen);
diff --git a/patches/TerraCustom/Terraria/WorldGen.cs.patch b/patches/TerraCustom/Terraria/WorldGen.cs.patch
@@ -915,7 +915,7 @@
  					num2 += (int)((float)WorldGen.genRand.Next(20, 40) * num3);
 -					int num4 = num - num2;
 +					int num4 = (int)((num - num2) / (Main.setting.IceBiomeWidth));
-+					if (num4 > (num - num2)) 
++					if (num4 > (num - num2))
 +					{
 +						num4 = num - num2;
 +					}
@@ -1096,7 +1096,7 @@
  								WorldGen.grassSpread = 0;
 -								WorldGen.SpreadGrass(k, l, 59, 60, true, 0);
 +								int GrassID = 60;
-+								if (Main.setting.SwapShroomJungle) 
++								if (Main.setting.SwapShroomJungle)
 +								{
 +									GrassID = 70;
 +								}
@@ -1316,7 +1316,7 @@
  						WorldGen.TileRunner(WorldGen.genRand.Next(0, Main.maxTilesX), WorldGen.genRand.Next(Main.maxTilesY - 140, Main.maxTilesY), (double)WorldGen.genRand.Next(2, 7), WorldGen.genRand.Next(3, 7), 58, false, 0f, 0f, false, true);
  					}
 -					WorldGen.AddHellHouses();
-+					if (Main.setting.UnderworldHouseMult > 0) 
++					if (Main.setting.UnderworldHouseMult > 0)
 +					{
 +						WorldGen.AddHellHouses();
 +					}
@@ -1345,29 +1345,26 @@
  					int x;
  					if (dungeonSide == -1)
  					{
-@@ -6213,17 +_,35 @@
+@@ -6213,17 +_,32 @@
  						dungeonSide = 1;
  					}
  					int y = (int)((Main.worldSurface + Main.rockLayer) / 2.0) + WorldGen.genRand.Next(-200, 200);
 -					WorldGen.MakeDungeon(x, y);
 +					if (!InWorldY(y, 0)) y = (int)((Main.worldSurface + Main.rockLayer) / 2.0);
++					if (!Main.setting.NoDungeon) {
++						WorldGen.MakeDungeon(x, y, progress);
++					}
 +					if (Main.setting.DoubleDungeon == true)
 +					{
-+						x = 0;
 +						if (dungeonSide == 1) {
 +							x = WorldGen.genRand.Next((int)((double)Main.maxTilesX * 0.05), (int)((double)Main.maxTilesX * 0.2));
-+							dungeonSide = 1;
 +						}
 +						else {
 +							x = WorldGen.genRand.Next((int)((double)Main.maxTilesX * 0.8), (int)((double)Main.maxTilesX * 0.95));
-+							dungeonSide = -1;
 +						}
 +						y = (int)((Main.worldSurface + Main.rockLayer) / 2.0) + WorldGen.genRand.Next(-200, 200);
 +						if (!InWorldY(y, 0)) y = (int)((Main.worldSurface + Main.rockLayer) / 2.0);
 +						WorldGen.MakeDungeon(x, y, progress);
-+					}
-+					if (!Main.setting.NoDungeon) {
-+						WorldGen.MakeDungeon(x, y, progress);
 +					}
  				});
  			WorldGen.AddGenerationPass("Corruption", delegate(GenerationProgress progress)
@@ -2444,11 +2441,12 @@
  			num7 *= 1f + (float)WorldGen.genRand.Next(-15, 16) * 0.01f;
  			int contain = 1293;
  			num4 = 0;
-@@ -16043,13 +_,17 @@
+@@ -16043,13 +_,18 @@
  			return false;
  		}
  
 -		public static void MakeDungeon(int x, int y)
++		public static void MakeDungeon(int x, int y) { } // Empty method for IL compatibility
 +		public static void MakeDungeon(int x, int y, GenerationProgress progress)
  		{
 -			int num = WorldGen.genRand.Next(3);
diff --git a/setup/bin/setup.exe b/setup/bin/setup.exe
diff --git a/setup/bin/setup.pdb b/setup/bin/setup.pdb
diff --git a/solutions/CompleteRelease.bat b/solutions/CompleteRelease.bat
@@ -4,7 +4,7 @@
 @ECHO off
 :: Compile/Build exe 
 echo "Building Release"
-set version=v0.6.2
+set version=v0.7
 call buildRelease.bat
 set exeFile=TerraCustom %version%.exe
 set exeFileMacLinux=TerraCustom.exe

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`--- src/tModLoader\Terraria.ModLoader\Logging.cs`
`2`	`2`	`+++ src/TerraCustom\Terraria.ModLoader\Logging.cs`
`3`		`-@@ -21,7 +_,7 @@`
	`3`	`+@@ -22,7 +_,7 @@`
`4`	`4`	`{`
`5`	`5`	`public static class Logging`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`--- src/tModLoader\Terraria.ModLoader\ModLoader.cs`
`2`	`2`	`+++ src/TerraCustom\Terraria.ModLoader\ModLoader.cs`
`3`		`-@@ -135,7 +_,24 @@`
`4`		`- OnSuccessfulLoad = null;`
	`3`	`+@@ -134,7 +_,24 @@`
	`4`	`+ OnSuccessfulLoad();`
`5`	`5`	`}`
`6`	`6`	`else {`
`7`	`7`	`- Main.menuMode = 0;`
`@@ -26,7 +26,7 @@`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`catch when (token.IsCancellationRequested) {`
`29`		`-@@ -339,8 +_,10 @@`
	`29`	`+@@ -354,8 +_,10 @@`
`30`	`30`	`if (LastLaunchedTModLoaderVersion < version)`
`31`	`31`	`ShowWhatsNew = true;`
`32`	`32`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@`
`112`	`112`	`Platform.Current.SetWindowUnicodeTitle(base.Window, Main._cachedTitle);`
`113`	`113`	`#endif`
`114`	`114`	`}`
`115`		`-@@ -8142,8 +_,16 @@`
	`115`	`+@@ -8144,8 +_,16 @@`
`116`	`116`	`Main.gridTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Grid");`
`117`	`117`	`Main.trashTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Trash");`
`118`	`118`	`Main.cdTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "CoolDown");`
`@@ -129,7 +129,7 @@`
`129`	`129`	`Main.dustTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Dust");`
`130`	`130`	`Main.sunTexture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Sun");`
`131`	`131`	`Main.sun2Texture = this.OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Sun2");`
`132`		`-@@ -43570,7 +_,8 @@`
	`132`	`+@@ -43572,7 +_,8 @@`
`133`	`133`	`Utils.DrawBorderString(Main.spriteBatch, text, r3.Right() + Vector2.UnitX * num * -22f, Microsoft.Xna.Framework.Color.White * Main.invasionProgressAlpha, num * 0.9f, 1f, 0.4f, -1);`
`134`	`134`	`}`
`135`	`135`
`@@ -139,7 +139,7 @@`
`139`	`139`	`{`
`140`	`140`	`Main.SaveSettings();`
`141`	`141`	`#if CLIENT`
`142`		`-@@ -43823,13 +_,14 @@`
	`142`	`+@@ -43825,13 +_,14 @@`
`143`	`143`	`{`
`144`	`144`	`Main.ActiveWorldFileData.SetSeed(text);`
`145`	`145`	`}`
`@@ -157,7 +157,7 @@`
`157`	`157`	`Main.worldName = text.Trim();`
`158`	`158`	`Main.ActiveWorldFileData = WorldFile.CreateMetadata(Main.worldName, SocialAPI.Cloud != null && SocialAPI.Cloud.EnabledByDefault, Main.expertMode);`
`159`	`159`	`if (Main.UseSeedUI)`
`160`		`-@@ -43837,7 +_,7 @@`
	`160`	`+@@ -43839,7 +_,7 @@`
`161`	`161`	`Main.menuMode = 5000;`
`162`	`162`	`return;`
`163`	`163`	`}`
`@@ -166,7 +166,7 @@`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`private static Action CreateGoToMenuEvent(int menu)`
`169`		`-@@ -44003,6 +_,10 @@`
	`169`	`+@@ -44005,6 +_,10 @@`
`170`	`170`	`if (Main.menuMode == -1)`
`171`	`171`	`{`
`172`	`172`	`Main.menuMode = 0;`
`@@ -177,7 +177,7 @@`
`177`	`177`	`}`
`178`	`178`	`bool loadedEverything = Program.LoadedEverything;`
`179`	`179`	`if (loadedEverything)`
`180`		`-@@ -45183,7 +_,7 @@`
	`180`	`+@@ -45185,7 +_,7 @@`
`181`	`181`	`Main.MenuUI.SetState(Main._worldSelectMenu);`
`182`	`182`	`Main.menuMode = 888;`
`183`	`183`	`}`
`@@ -186,7 +186,7 @@`
`186`	`186`	`{`
`187`	`187`	`num2 = 200;`
`188`	`188`	`num4 = 60;`
`189`		`-@@ -45215,27 +_,36 @@`
	`189`	`+@@ -45217,27 +_,36 @@`
`190`	`190`	`{`
`191`	`191`	`Main.expertMode = false;`
`192`	`192`	`Main.PlaySound(10, -1, -1, 1, 1f, 0f);`
`@@ -223,7 +223,7 @@`
`223`	`223`	`}`
`224`	`224`	`Main.clrInput();`
`225`	`225`	`}`
`226`		`-@@ -45286,14 +_,14 @@`
	`226`	`+@@ -45288,14 +_,14 @@`
`227`	`227`	`num17++;`
`228`	`228`	`Main.clrInput();`
`229`	`229`	`}`
`@@ -242,15 +242,15 @@`
`242`	`242`	`Main.menuMode = 888;`
`243`	`243`	`}`
`244`	`244`	`else if (Main.menuMode == 8)`
`245`		`-@@ -46635,6 +_,7 @@`
	`245`	`+@@ -46637,6 +_,7 @@`
`246`	`246`	`}`
`247`	`247`	`else`
`248`	`248`	`{`
`249`	`249`	`+ TerraCustom.Interface.TerraCustomMenu(this, this.selectedMenu, array, array9, array7, array4, ref num2, ref num4, ref num5);`
`250`	`250`	`Interface.ModLoaderMenus(this, this.selectedMenu, array9, array7, array4, ref num2, ref num4, ref num5, ref flag5);`
`251`	`251`	`}`
`252`	`252`	`}`
`253`		`-@@ -47542,10 +_,10 @@`
	`253`	`+@@ -47544,10 +_,10 @@`
`254`	`254`	`{`
`255`	`255`	`num111 = 2;`
`256`	`256`	`}`
`@@ -261,11 +261,11 @@`
`261`	`261`	`+ string supportMessage = "jopojelly's Pateron - ";`
`262`	`262`	`+ string patreonShortURL = @"patreon.com/jopojelly";`
`263`	`263`	`+ bool showPatreon = Main.menuMode == 5001;`
`264`		`-+ string drawVersion = Main.versionNumber + Environment.NewLine + ModLoader.ModLoader.versionedName + Environment.NewLine + "jopojelly's TerraCustom v0.6.2" + (showPatreon ? Environment.NewLine + supportMessage : "");`
	`264`	`++ string drawVersion = Main.versionNumber + Environment.NewLine + ModLoader.ModLoader.versionedName + Environment.NewLine + "jopojelly's TerraCustom v0.7" + (showPatreon ? Environment.NewLine + supportMessage : "");`
`265`	`265`	`Vector2 origin3 = Main.fontMouseText.MeasureString(drawVersion);`
`266`	`266`	`origin3.X *= 0.5f;`
`267`	`267`	`origin3.Y *= 0.5f;`
`268`		`-@@ -47562,7 +_,7 @@`
	`268`	`+@@ -47564,7 +_,7 @@`
`269`	`269`	`if (num109 == 4 && Main.mouseLeftRelease && Main.mouseLeft && new Microsoft.Xna.Framework.Rectangle((int)origin3.X + 10, Main.screenHeight - (int)urlSize.Y - 2, (int)urlSize.X, (int)origin3.Y).Contains(new Microsoft.Xna.Framework.Point(Main.mouseX, Main.mouseY)) && hasFocus)`
`270`	`270`	`{`
`271`	`271`	`Main.PlaySound(SoundID.MenuOpen);`