From 88f72a39d4b6d6148d9725d931298da72c353cc1 Mon Sep 17 00:00:00 2001 From: R31v4x-x Date: Sun, 22 Feb 2026 05:25:12 -0500 Subject: [PATCH 1/2] Update LiquidLoader.cs --- ModLoader/LiquidLoader.cs | 60 +++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 24 deletions(-) diff --git a/ModLoader/LiquidLoader.cs b/ModLoader/LiquidLoader.cs index b96e50e..e3118fe 100644 --- a/ModLoader/LiquidLoader.cs +++ b/ModLoader/LiquidLoader.cs @@ -207,30 +207,42 @@ public static int LiquidType() where T : ModLiquid { return ModContent.GetInstance()?.Type ?? 0; } - - public static Condition NearLiquid(int liquidID) - { - string liquidMapName = ""; - if (liquidID < MapLiquidLoader.liquidLookup.Length) - { - liquidMapName = Lang.GetMapObjectName(MapLiquidLoader.liquidLookup[liquidID]); - } - LocalizedText text; - if (liquidID == LiquidID.Water) - text = Language.GetText("Conditions.NearWater"); - else if (liquidID == LiquidID.Lava) - text = Language.GetText("Conditions.NearLava"); - else if (liquidID == LiquidID.Honey) - text = Language.GetText("Conditions.NearHoney"); - else if (liquidID == LiquidID.Shimmer) - text = Language.GetText("Conditions.NearShimmer"); - else - text = Language.GetText("Mods.ModLiquidLib.Conditions.NearLiquid").WithFormatArgs(liquidMapName == "" ? LiquidLoader.GetLiquid(liquidID).Name : liquidMapName); - - return new Condition(text, () => Main.LocalPlayer.GetAdjLiquids(liquidID)); - } - - internal static void ResizeArrays(bool unloading = false) + public static Condition NearLiquid(int liquidID) + { + string liquidMapName = ""; + if (liquidID < MapLiquidLoader.liquidLookup.Length) + { + liquidMapName = Lang.GetMapObjectName(MapLiquidLoader.liquidLookup[liquidID]); + } + if (string.IsNullOrEmpty(liquidMapName)) + { + ModLiquid liquid = LiquidLoader.GetLiquid(liquidID); + string key = $"Mods.{liquid.Mod.Name}.Liquids.{liquid.Name}.MapEntry"; // this is it's own separate property for readability + liquidMapName = Language.GetOrRegister(key, liquid.PrettyPrintName).Value; + } + LocalizedText text; + switch (liquidID) + { + case LiquidID.Water: + text = Language.GetText("Conditions.NearWater"); + break; + case LiquidID.Lava: + text = Language.GetText("Conditions.NearLava"); + break; + case LiquidID.Honey: + text = Language.GetText("Conditions.NearHoney"); + break; + case LiquidID.Shimmer: + text = Language.GetText("Conditions.NearShimmer"); + break; + default: + text = Language.GetText("Mods.ModLiquidLib.Conditions.NearLiquid").WithFormatArgs(liquidMapName); + break; + } + return new Condition(text, () => Main.LocalPlayer.GetAdjLiquids(liquidID)); + } + + internal static void ResizeArrays(bool unloading = false) { if (!Main.dedServ) { From 01cbef4140c668599c862680ac8a87969013e654 Mon Sep 17 00:00:00 2001 From: R31v4x-x Date: Sun, 22 Feb 2026 05:26:16 -0500 Subject: [PATCH 2/2] Update LiquidLoader.cs --- ModLoader/LiquidLoader.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ModLoader/LiquidLoader.cs b/ModLoader/LiquidLoader.cs index e3118fe..4ec0452 100644 --- a/ModLoader/LiquidLoader.cs +++ b/ModLoader/LiquidLoader.cs @@ -207,6 +207,7 @@ public static int LiquidType() where T : ModLiquid { return ModContent.GetInstance()?.Type ?? 0; } + public static Condition NearLiquid(int liquidID) { string liquidMapName = "";