Skip to content

Commit

Permalink
v0.8.1 release, updated to tModLoader v0.11.8.1 patches
Browse files Browse the repository at this point in the history
  • Loading branch information
JavidPack committed Feb 21, 2021
1 parent d558a0e commit 03156a3
Show file tree
Hide file tree
Showing 83 changed files with 746 additions and 161 deletions.
4 changes: 2 additions & 2 deletions patches/TerraCustom/Terraria.ModLoader.UI/Interface.cs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
caption = caption ?? "Terraria: Error" + $" ({ModLoader.versionedName})";
- string message = Language.GetTextValue("tModLoader.ClientLogHint", text, Path.Combine(Main.SavePath, "Logs"));
+ string message = Language.GetTextValue("tModLoader.ClientLogHint", text, Logging.LogDir);
if(Language.ActiveCulture == null) // Simple backup approach in case error happens before localization is loaded
message = string.Format("{0}\n\nA client.log file containing error information has been generated in\n{1}\n(You will need to share this file if asking for help)", text, Path.Combine(Main.SavePath, "Logs"));
#if !MAC
System.Windows.Forms.MessageBox.Show(message, caption);
#else
24 changes: 12 additions & 12 deletions patches/TerraCustom/Terraria/Main.cs.patch
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
if (FileUtilities.GetFullPath(text2 + Path.DirectorySeparatorChar + text + ".wld", cloudSave).StartsWith("\\\\.\\", StringComparison.Ordinal))
text += "_";

@@ -4224,18 +_,19 @@
@@ -4232,18 +_,19 @@
Logging.Terraria.Info($"Steam Cloud Quota: {UIMemoryBar.SizeSuffix((long)ModLoader.Engine.Steam.lastAvailableSteamCloudStorage)} available");
}
if (!Directory.Exists(vanillaContentFolder)) {
Expand All @@ -124,7 +124,7 @@
Platform.Current.SetWindowUnicodeTitle(base.Window, _cachedTitle);
#endif
}
@@ -7137,8 +_,16 @@
@@ -7145,8 +_,16 @@
gridTexture = OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Grid");
trashTexture = OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Trash");
cdTexture = OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "CoolDown");
Expand All @@ -141,7 +141,7 @@
dustTexture = OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Dust");
sunTexture = OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Sun");
sun2Texture = OurLoad<Texture2D>("Images" + Path.DirectorySeparatorChar + "Sun2");
@@ -35780,7 +_,7 @@
@@ -35794,7 +_,7 @@
Utils.DrawBorderString(spriteBatch, text, r3.Right() + Vector2.UnitX * num * -22f, Microsoft.Xna.Framework.Color.White * invasionProgressAlpha, num * 0.9f, 1f, 0.4f);
}

Expand All @@ -150,7 +150,7 @@
SaveSettings();
#if CLIENT
SocialAPI.Shutdown();
@@ -35993,18 +_,19 @@
@@ -36007,18 +_,19 @@
else
ActiveWorldFileData.SetSeed(text);

Expand All @@ -175,7 +175,7 @@
}

private static Action CreateGoToMenuEvent(int menu) {
@@ -36140,6 +_,8 @@
@@ -36154,6 +_,8 @@
string[] array9 = new string[maxMenuItems];
if (menuMode == -1)
menuMode = 0;
Expand All @@ -184,7 +184,7 @@

bool loadedEverything = Program.LoadedEverything;
if (loadedEverything)
@@ -37154,7 +_,7 @@
@@ -37168,7 +_,7 @@
MenuUI.SetState(_worldSelectMenu);
menuMode = 888;
}
Expand All @@ -193,7 +193,7 @@
num2 = 200;
num4 = 60;
array4[2] = 30;
@@ -37182,21 +_,27 @@
@@ -37196,21 +_,27 @@
if (selectedMenu == 2) {
expertMode = false;
PlaySound(10);
Expand Down Expand Up @@ -222,7 +222,7 @@
}

clrInput();
@@ -37247,12 +_,12 @@
@@ -37261,12 +_,12 @@
num17++;
clrInput();
}
Expand All @@ -238,15 +238,15 @@
menuMode = 888;
}
else if (menuMode == 8) {
@@ -38401,6 +_,7 @@
@@ -38415,6 +_,7 @@
}
}
else {
+ TerraCustom.Interface.TerraCustomMenu(this, this.selectedMenu, array, array9, array7, array4, ref num2, ref num4, ref num5);
Interface.ModLoaderMenus(this, selectedMenu, array9, array7, array4, ref num2, ref num4, ref num5, ref flag5);
}
}
@@ -39180,10 +_,10 @@
@@ -39194,10 +_,10 @@
if (num108 == 3)
num110 = 2;

Expand All @@ -257,11 +257,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.8.1" + (showPatreon ? Environment.NewLine + supportMessage : "");
+ string drawVersion = Main.versionNumber + Environment.NewLine + ModLoader.ModLoader.versionedName + Environment.NewLine + "jopojelly's TerraCustom v0.8.1.1" + (showPatreon ? Environment.NewLine + supportMessage : "");
Vector2 origin3 = fontMouseText.MeasureString(drawVersion);
origin3.X *= 0.5f;
origin3.Y *= 0.5f;
@@ -39197,7 +_,7 @@
@@ -39211,7 +_,7 @@
spriteBatch.DrawString(fontMouseText, patreonShortURL, new Vector2(origin3.X + num109 + 10f, screenHeight - origin3.Y + num110 - 2f), color13, 0f, Vector2.Zero, 1f, SpriteEffects.None, 0f);
if (num108 == 4 && mouseLeftRelease && mouseLeft && new Microsoft.Xna.Framework.Rectangle((int)origin3.X + 10, screenHeight - (int)urlSize.Y - 2, (int)urlSize.X, (int)origin3.Y).Contains(new Microsoft.Xna.Framework.Point(mouseX, mouseY)) && hasFocus) {
PlaySound(SoundID.MenuOpen);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
// "ModsOpenConfig": "Click to open config",
"ModOldWarning": "Mod veraltet. Benutzung auf eigene Gefahr!",
"ModDependencyClickTooltip": "Diese Mod benötigt: {0}\n (Klicken zum aktivieren)",
// "ModDependencyClickTooltipMore": "This mod depends on: {0}\n...and {1} more mods\n (click to enable)",
"ModDependencyModsNotFound": "Folgende Mods konnten nicht gefunden werden: {0}",
// "ModDidNotFullyUnloadWarning": "This mod did not fully unload during last unload.\n(This is a message for the mod creator)",
"BetaModCantPublish": "Diese Mod wurde in einer Beta-Version erstellt und kann nicht veröffentlicht werden.",
Expand All @@ -47,6 +48,10 @@
"ModsXWalls": "{0} Wände",
"ModsXBuffs": "{0} Buffs",
"ModsXMounts": "{0} Reittiere",
// "ModsReloadAndReturn": "Reload and return to world menu",
// "ModsNotFoundServer": "No mods were found in: \"{0}\"\nIf you are running a dedicated server, you may wish to use the 'modpath' command line switch or server config setting to specify a custom mods directory.\n",
// "AskForModIndex": "Type a number to switch between enabled/disabled",
// "AskForCommand": "Type a command: ",

// Mod Errors
"LoadError": "Beim laden ist etwas schiefgelaufen {0}",
Expand Down Expand Up @@ -193,6 +198,9 @@
"XMonthsAgo": " vor {0} Monaten",
"1YearAgo": "vor einem Jahr",
"XYearsAgo": "vor {0} Jahren",
// "MBServerReturnToMenu": "Return to world menu",
// "MBServerAskForModName": "Type an exact ModName to download: ",
// "MBServerDownloadError": "Error: Could not download {0} -- {1}",

// Mod Publishing
"MBPublishEnterPassphrase": "Bitte gib deinen Passcode ein",
Expand Down Expand Up @@ -248,6 +256,7 @@
"NewModsListing": "Neue Mods::\n{0}",
"PlayerCustomDataFail": "Ein Problem beim laden der benutzerdefinierten Daten eines Charakters ist aufgetreten",
"PlayerLoadWorldFail": "Ein problem ist beim Laden einer Welt aufgetreten",
// "CloudWarning": "Cloud storage limit reached, unable to move to cloud",

// Mod Sources
"MSBuild": "Erstellen",
Expand Down Expand Up @@ -338,6 +347,27 @@
"WorldGenError": "Ein Problem ist beim Erstellen der Welt aufgetreten",
"WorldIODataException": "Das Spiel hat ein Mod-Datei Problem bei dieser Welt festgestellt.",
"ServerCrash": "Server crash: {0}\n{1}\n\nBitte checke server.log um festzustellen ob eine Mod daran schuld ist, ansonsten gehe in den #support Kanal im tModLoader Discord!"

// MessageBox
// "ContentFolderNotFound": "Terraria Content folder not found. If you installed tModLoader through Steam, make sure that Terraria is installed. If not, make sure to install tModLoader in a folder nested within the Terraria install directory or a folder next to the Terraria install directory.",
// "MissingServerExecutable": "Looks like you didn't do a complete install. You are missing tModLoaderServer.exe. Check your install directory and read the install directions.",
// "GraphicsEngineFailure": "Graphics Engine Failure",
// "GraphicsEngineReportUnknown": "Unknown",
// "GraphicsEngineReportFailure": "Failure",
// "GraphicsEngineFailureMessage": "tML encountered a crash when testing some experimental graphics features. If this issue persists consistently, you may have to edit config.json and set the Support4K setting to false. \nPlease restart your game.\nReport Status: {0}",
// "OutOfMemory": "Game ran out of memory. You'll have to find which mod is consuming lots of memory, and contact the devs or remove it.",
// "ContentFolderNotFoundInstallCheck": "{0} directory could not be found.\r\n\r\nDid you forget to extract tModLoader's Content directory into the tModLoader folder?\r\n\r\nEnsure tModLoader is installed in a separate folder from Terraria.",
// "VanillaSteamInstallationNotFound": "Terraria Steam installation or Terraria Content directory not found.\r\n\r\nPlease ensure Terraria 1.4 is installed through Steam.",
// "SteamAPIHashMismatch": "Steam API hash mismatch, assumed pirated.\n\ntModLoader requires a legitimate Terraria install to work.",
// "VanillaGOGNotFound": "{0} could not be found.\r\n\r\nGOG installs must have the unmodified Terraria executable to function. This version of tModLoader expects the {1} version of Terraria, you may need to downgrade or upgrade Terraria via GOG Galaxy, or wait for tModLoader to update.",
// "GOGHashMismatch": "{0} is not the unmodified Terraria executable.\r\n\r\nGOG installs must have the unmodified Terraria executable to function.\r\n\r\nIf you patched the .exe, you can create a copy of the original exe and name it \"Terraria_v<VERSION>.exe\"",
// "DefaultExtraMessage": "Please restore your Terraria install, then install tModLoader on Steam or by following the README.txt instructions for manual installation.",
// "ClientLogHint": "{0}\n\nA client.log file containing error information has been generated in\n{1}\n(You will need to share this file if asking for help)",
// "OutOfMemoryHint": "\n\nTip: Try running less mods at once, or determine if a mod is taking up too much memory. Optionally, install 64-bit tModLoader",
// "ModExceptionHint": "\n\nTip: This is likely a mod's fault. Disable mods one by one and check if the issue persists",
// "OneDriveHint": "\n\nTip: Try installing/enabling OneDrive. Right click your Documents folder and enable \"Always save on this device\"",
// "AntivirusHint": "\n\nTip: If you have an antivirus, try adding Terraria to its whitelist/exclusion list",
// "TypeInitializationHint": "\n\nTip: Restart the game. If this issue persists, try uninstalling Terraria completely, then reinstalling through Steam, and then reinstalling tModLoader"
},
"CommonItemTooltip": {
"PercentIncreasedDamage": "Um {0}% erhöhter Schaden"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"ModsOpenConfig": "Click to open config",
"ModOldWarning": "Old mod, enable at own risk",
"ModDependencyClickTooltip": "This mod depends on: {0}\n (click to enable)",
"ModDependencyClickTooltipMore": "This mod depends on: {0}\n...and {1} more mods\n (click to enable)",
"ModDependencyModsNotFound": "The following mods were not found: {0}",
"ModDidNotFullyUnloadWarning": "This mod did not fully unload during last unload.\n(This is a message for the mod creator)",
"BetaModCantPublish": "This mod was built on beta version and can't be published",
Expand Down Expand Up @@ -358,7 +359,7 @@
"ContentFolderNotFoundInstallCheck": "{0} directory could not be found.\r\n\r\nDid you forget to extract tModLoader's Content directory into the tModLoader folder?\r\n\r\nEnsure tModLoader is installed in a separate folder from Terraria.",
"VanillaSteamInstallationNotFound": "Terraria Steam installation or Terraria Content directory not found.\r\n\r\nPlease ensure Terraria 1.4 is installed through Steam.",
"SteamAPIHashMismatch": "Steam API hash mismatch, assumed pirated.\n\ntModLoader requires a legitimate Terraria install to work.",
"VanillaGOGNotFound": "{0} could not be found.\r\n\r\nGOG installs must have the unmodified Terraria executable to function.",
"VanillaGOGNotFound": "{0} could not be found.\r\n\r\nGOG installs must have the unmodified Terraria executable to function. This version of tModLoader expects the {1} version of Terraria, you may need to downgrade or upgrade Terraria via GOG Galaxy, or wait for tModLoader to update.",
"GOGHashMismatch": "{0} is not the unmodified Terraria executable.\r\n\r\nGOG installs must have the unmodified Terraria executable to function.\r\n\r\nIf you patched the .exe, you can create a copy of the original exe and name it \"Terraria_v<VERSION>.exe\"",
"DefaultExtraMessage": "Please restore your Terraria install, then install tModLoader on Steam or by following the README.txt instructions for manual installation.",
"ClientLogHint": "{0}\n\nA client.log file containing error information has been generated in\n{1}\n(You will need to share this file if asking for help)",
Expand Down
Loading

0 comments on commit 03156a3

Please sign in to comment.