themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #2733 from KawaiiYuyu/general-devel

Browse source 
Add localization support for console spam reduction
This commit is contained in:
Lucas Nicodemus 2022-10-19 10:10:46 -07:00 • committed by GitHub
commit be4c33cff5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
TShockAPI/Modules/ReduceConsoleSpam.cs
View file

@ -16,6 +16,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using System;
using Terraria.Localization;
namespace TShockAPI.Modules;
@ -32,6 +33,13 @@ public class ReduceConsoleSpam : Module
/// </summary>
private string _lastStatusText = null;
private readonly string _resettingObjectText = LanguageManager.Instance.GetTextValue("LegacyWorldGen.47");
private readonly string _loadingText = LanguageManager.Instance.GetTextValue("LegacyWorldGen.51");
private readonly string _settlingText = LanguageManager.Instance.GetTextValue("LegacyWorldGen.27");
private readonly string _savingText = LanguageManager.Instance.GetTextValue("LegacyWorldGen.49");
private readonly string _validatingText = LanguageManager.Instance.GetTextValue("LegacyWorldGen.73");
private readonly string _finalizingText = LanguageManager.Instance.GetTextValue("LegacyWorldGen.87");
/// <summary>
/// Aims to reduce the amount of console spam by filtering out load/save progress
/// </summary>
@ -59,11 +67,11 @@ public class ReduceConsoleSpam : Module
return false;
}
if (replace("Resetting game objects")
|| replace("Settling liquids")
|| replace("Loading world data")
|| replace("Saving world data")
|| replace("Validating world save"))
if (replace(_resettingObjectText)
|| replace(_settlingText)
|| replace(_loadingText)
|| replace(_savingText)
|| replace(_validatingText))
return;
// try parsing % - [text] - %
@ -84,10 +92,10 @@ public class ReduceConsoleSpam : Module
if (text.Length > 0 && !(
// relogic has made a mess of this
(
_lastStatusText != "Validating world save"
|| _lastStatusText != "Saving world data"
_lastStatusText != _validatingText
|| _lastStatusText != _savingText
)
&& text == "Finalizing world"
&& text == _finalizingText
))
WriteIfChange(text);

1
docs/changelog.md
View file

@ -60,6 +60,7 @@ Use past tense when adding new entries; sign your name off when you add or chang
* Added new tile provider. Use `-constileation` or `-c` to use it. Constileation is an alternative tile provider to Tiled and HeapTile. (@SignatureBeef)
* Fixed an exploit with grass mowing not removing hanging vines. (@punchready)
* Added `-additionalplugins` command line argument to load additional plugins. (@pontaoski)
* Added localization support for console spam reduction. (@KawaiiYuyu)
## TShock 4.5.18
* Fixed `TSPlayer.GiveItem` not working if the player is in lava. (@PotatoCider)