Skip to content

Able to set liquid name for condition #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lion8cake merged 2 commits into from
Feb 23, 2026
Merged

Able to set liquid name for condition #9

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88f72a3
Update LiquidLoader.cs
R31v4x-x Feb 22, 2026
01cbef4
Update LiquidLoader.cs
R31v4x-x Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 36 additions & 23 deletions ModLoader/LiquidLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,29 +208,42 @@ public static int LiquidType<T>() where T : ModLiquid
return ModContent.GetInstance<T>()?.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)
{
Expand Down