icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 1.17

Browse Source
This commit is contained in:
gnembon committed 2021-04-21 18:42:50 -03:00
2 parents 8870c245ff 8c9dabdbbc
commit cd6827767a
10 files changed
+43 -39
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/script/api/Auxiliary.java
+3 -11
View File
@@ -528,7 +528,7 @@ public class Auxiliary {
targets = playerTargets;
res = lv.get(1).evalValue(c);
}
Text message = (res instanceof FormattedTextValue)?((FormattedTextValue) res).getText():new LiteralText(res.getString());
Text message = FormattedTextValue.getTextByValue(res);
if (targets == null)
{
s.sendFeedback(message, false);
@@ -595,16 +595,8 @@ public class Auxiliary {
if (lv.size() > 2)
{
pVal = lv.get(2).evalValue(c);
if (pVal instanceof FormattedTextValue)
{
title = ((FormattedTextValue) pVal).getText();
soundsTrue = !title.asString().isEmpty();
}
else
{
title = new LiteralText(pVal.getString());
soundsTrue = pVal.getBoolean();
}
title = FormattedTextValue.getTextByValue(pVal);
soundsTrue = pVal.getBoolean();
}
else title = null; // Will never happen, just to make lambda happy
if (packetGetter == null)
src/main/java/carpet/script/api/Scoreboards.java
+5 -21
View File
@@ -195,7 +195,7 @@ public class Scoreboards {
return (_c, _t) -> StringValue.of(objective.getCriterion().getName());
case "display_name":
if(modify) {
Text text = (setValue instanceof FormattedTextValue)?((FormattedTextValue) setValue).getText():new LiteralText(setValue.getString());
Text text = FormattedTextValue.getTextByValue(setValue);
objective.setDisplayName(text);
return LazyValue.TRUE;
}
@@ -408,11 +408,7 @@ public class Scoreboards {
Text displayName;
if(settingVal instanceof FormattedTextValue) {
displayName = ((FormattedTextValue) settingVal).getText();
} else {
displayName = new LiteralText(settingVal.getString());
}
displayName = FormattedTextValue.getTextByValue(settingVal);
team.setDisplayName(displayName);
@@ -451,11 +447,7 @@ public class Scoreboards {
Text prefix;
if(settingVal instanceof FormattedTextValue) {
prefix = ((FormattedTextValue) settingVal).getText();
} else {
prefix = new LiteralText(settingVal.getString());
}
prefix = FormattedTextValue.getTextByValue(settingVal);
team.setPrefix(prefix);
break;
@@ -481,11 +473,7 @@ public class Scoreboards {
Text suffix;
if(settingVal instanceof FormattedTextValue) {
suffix = ((FormattedTextValue) settingVal).getText();
} else {
suffix = new LiteralText(settingVal.getString());
}
suffix = FormattedTextValue.getTextByValue(settingVal);
team.setSuffix(suffix);
break;
@@ -547,11 +535,7 @@ public class Scoreboards {
case "name":
if(propertyValue == null) return (_c, _t) -> new FormattedTextValue(bossBar.getName());
if(propertyValue instanceof FormattedTextValue) {
bossBar.setName(((FormattedTextValue) propertyValue).getText());
} else {
bossBar.setName(new LiteralText(propertyValue.getString()));
}
bossBar.setName(FormattedTextValue.getTextByValue(propertyValue));
return LazyValue.TRUE;
case "add_player":
if(propertyValue == null) throw new InternalExpressionException("Bossbar property " + property + " can't be queried, add a third parameter");