tweak wording on stuff
This commit is contained in:
parent
3d311c6ee3
commit
297abeac00
3 changed files with 20 additions and 16 deletions
|
|
@ -8,7 +8,7 @@ use crate::ui::border_all_color;
|
|||
|
||||
fn providers() -> Vec<(JavaVendor, &'static str)> {
|
||||
vec![
|
||||
(JavaVendor::Microsoft, "Microsoft Build of OpenJDK"),
|
||||
(JavaVendor::Microsoft, "Microsoft JDK (Fastest/Recommended)"),
|
||||
(JavaVendor::Zulu, "Azul Zulu"),
|
||||
(JavaVendor::Adoptium, "Eclipse Temurin"),
|
||||
(JavaVendor::Corretto, "Amazon Corretto"),
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ pub async fn offer_for_pinned_cluster(actions: &Actions, cluster_id: ClusterId)
|
|||
|
||||
fn offer_prompt(installed: bool) -> Prompt<MicrosoftJavaAnswer> {
|
||||
let closing = if installed {
|
||||
"You already have it installed, so this cluster switches over right away."
|
||||
"You already have it installed, so this cluster will switch over immediately."
|
||||
} else {
|
||||
"Minecraft will launch with Microsoft OpenJDK next time."
|
||||
};
|
||||
|
|
@ -233,13 +233,13 @@ async fn unpin_to_automatic(
|
|||
let _ = refresh.send(());
|
||||
let body = if immediate {
|
||||
format!(
|
||||
"This cluster is back on Automatic and runs on Microsoft {major} from now \
|
||||
on."
|
||||
"This cluster is back on Automatic and will run on the optimized Microsoft \
|
||||
{major} JDK from now on."
|
||||
)
|
||||
} else {
|
||||
format!(
|
||||
"This cluster is back on Automatic and picks Microsoft {major} from its next \
|
||||
launch."
|
||||
"This cluster is back on Automatic and will pick the optimized Microsoft \
|
||||
{major} JDK from its next launch."
|
||||
)
|
||||
};
|
||||
events.notify("Java switched").body(body).send();
|
||||
|
|
@ -248,7 +248,8 @@ async fn unpin_to_automatic(
|
|||
Err(err) => events
|
||||
.notify("Cluster not switched")
|
||||
.body(format!(
|
||||
"Microsoft {major} is ready but the cluster still points at its old runtime: {err}"
|
||||
"Optimized Microsoft {major} JDK is ready but the cluster still points at its \
|
||||
old runtime: {err}. Please report to discord.gg/polyfrost"
|
||||
))
|
||||
.error()
|
||||
.send(),
|
||||
|
|
|
|||
|
|
@ -1016,17 +1016,20 @@ async fn ensure_links_note(dir: &Path) {
|
|||
return;
|
||||
}
|
||||
|
||||
let noun = ContentType::Mod.folder_name();
|
||||
|
||||
polyio::write(
|
||||
¬e,
|
||||
"Every folder in here is one of your OneClient clusters.\n\
|
||||
\n\
|
||||
They're shortcuts. Open one and you land in that cluster's own mods \
|
||||
folder, which is where its mods really live. Drop a jar in there and \
|
||||
that cluster will pick it up the next time you play - and only that \
|
||||
cluster.\n\
|
||||
\n\
|
||||
Loose jars sitting directly in this folder aren't read by anything, so \
|
||||
put them inside a cluster's folder instead.\n",
|
||||
format!(
|
||||
"PLEASE READ CAREFULLY!!!!\n\
|
||||
\n\
|
||||
OneClient SPLITS your {noun} folder per version/cluster, so that you can have \
|
||||
separate {noun} in each.\n\
|
||||
\n\
|
||||
Add / remove {noun} IN THESE FOLDERS!!!\n\
|
||||
\n\
|
||||
Also... you can drag your {noun} and stuff straight into the launcher as well...\n"
|
||||
),
|
||||
)
|
||||
.await
|
||||
.ok();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue