Upstream
/
addon-challenges
mirror of https://github.com/BentoBoxWorld/Challenges.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Separate singe and multiple listings.

This commit is contained in:
BONNe 2021-09-19 18:41:41 +03:00
parent 6fbc9d0676
commit 89c51211cd
1 changed files with 72 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
src/main/java/world/bentobox/challenges/panel/CommonPanel.java
View File

@ -301,9 +301,18 @@ public abstract class CommonPanel
forEach(entry -> forEach(entry ->
{ {
builder.append("\n"); builder.append("\n");
builder.append(this.user.getTranslationOrNothing(reference + "blocks-value",
Constants.NUMBER, String.valueOf(entry.getValue()), if (entry.getValue() > 1)
Constants.MATERIAL, Utils.prettifyObject(entry.getKey(), this.user))); {
builder.append(this.user.getTranslationOrNothing(reference + "blocks-value",
Constants.NUMBER, String.valueOf(entry.getValue()),
Constants.MATERIAL, Utils.prettifyObject(entry.getKey(), this.user)));
}
else
{
builder.append(this.user.getTranslationOrNothing(reference + "block-value",
Constants.MATERIAL, Utils.prettifyObject(entry.getKey(), this.user)));
}
}); });
blocks = builder.toString(); blocks = builder.toString();
@ -324,9 +333,18 @@ public abstract class CommonPanel
forEach(entry -> forEach(entry ->
{ {
builder.append("\n"); builder.append("\n");
builder.append(this.user.getTranslationOrNothing(reference + "entities-value",
Constants.NUMBER, String.valueOf(entry.getValue()), if (entry.getValue() > 1)
Constants.ENTITY, Utils.prettifyObject(entry.getKey(), this.user))); {
builder.append(this.user.getTranslationOrNothing(reference + "entities-value",
Constants.NUMBER, String.valueOf(entry.getValue()),
Constants.ENTITY, Utils.prettifyObject(entry.getKey(), this.user)));
}
else
{
builder.append(this.user.getTranslationOrNothing(reference + "entity-value",
Constants.ENTITY, Utils.prettifyObject(entry.getKey(), this.user)));
}
}); });
entities = builder.toString(); entities = builder.toString();
@ -373,8 +391,18 @@ public abstract class CommonPanel
forEach(itemStack -> forEach(itemStack ->
{ {
builder.append("\n"); builder.append("\n");
builder.append(this.user.getTranslationOrNothing(reference + "item-list",
"[item]", Utils.prettifyObject(itemStack, this.user))); if (itemStack.getAmount() > 1)
{
builder.append(this.user.getTranslationOrNothing(reference + "items-value",
"[number]", String.valueOf(itemStack.getAmount()),
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
else
{
builder.append(this.user.getTranslationOrNothing(reference + "item-value",
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
}); });
items = builder.toString(); items = builder.toString();
@ -586,8 +614,18 @@ public abstract class CommonPanel
forEach(itemStack -> forEach(itemStack ->
{ {
builder.append("\n"); builder.append("\n");
builder.append(this.user.getTranslationOrNothing(reference + "item-list",
"[item]", Utils.prettifyObject(itemStack, this.user))); if (itemStack.getAmount() > 1)
{
builder.append(this.user.getTranslationOrNothing(reference + "items-value",
"[number]", String.valueOf(itemStack.getAmount()),
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
else
{
builder.append(this.user.getTranslationOrNothing(reference + "item-value",
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
}); });
items = builder.toString(); items = builder.toString();
@ -669,8 +707,18 @@ public abstract class CommonPanel
forEach(itemStack -> forEach(itemStack ->
{ {
builder.append("\n"); builder.append("\n");
builder.append(this.user.getTranslationOrNothing(reference + "item-list",
"[item]", Utils.prettifyObject(itemStack, this.user))); if (itemStack.getAmount() > 1)
{
builder.append(this.user.getTranslationOrNothing(reference + "items-value",
"[number]", String.valueOf(itemStack.getAmount()),
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
else
{
builder.append(this.user.getTranslationOrNothing(reference + "item-value",
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
}); });
items = builder.toString(); items = builder.toString();
@ -854,8 +902,18 @@ public abstract class CommonPanel
forEach(itemStack -> forEach(itemStack ->
{ {
builder.append("\n"); builder.append("\n");
builder.append(this.user.getTranslationOrNothing(reference + "item-list",
"[item]", Utils.prettifyObject(itemStack, this.user))); if (itemStack.getAmount() > 1)
{
builder.append(this.user.getTranslationOrNothing(reference + "items-value",
"[number]", String.valueOf(itemStack.getAmount()),
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
else
{
builder.append(this.user.getTranslationOrNothing(reference + "item-value",
"[item]", Utils.prettifyObject(itemStack, this.user)));
}
}); });
items = builder.toString(); items = builder.toString();