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

Merge branch 'master' of https://github.com/gnembon/fabric-carpet

Browse Source
This commit is contained in:
gnembon committed 2020-11-27 00:34:41 -04:00
2 parents a099ed79e1 db99ed26d8
commit 8d930ac72e
3 files changed
+8 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/scarpet/Full.md
+1 -1
View File
@@ -4217,7 +4217,7 @@ Reads the `property` of the `team` if no `value` is specified. If a `value` is a
* `color` * `color`
* Type: String * Type: String
* Options: See [team command](https://minecraft.gamepedia.com/Commands/team#Arguments) (same strings as `'teamcolor'` [command argument](https://github.com/gnembon/fabric-carpet/blob/master/docs/scarpet/Full.md#command-argument-types] options)) * Options: See [team command](https://minecraft.gamepedia.com/Commands/team#Arguments) (same strings as `'teamcolor'` [command argument](https://github.com/gnembon/fabric-carpet/blob/master/docs/scarpet/Full.md#command-argument-types) options)
* `displayName` * `displayName`
* Type: String or FormattedText, when querying returns FormattedText * Type: String or FormattedText, when querying returns FormattedText
docs/scarpet/api/Scoreboard.md
+1 -1
View File
@@ -69,7 +69,7 @@ Reads the `property` of the `team` if no `value` is specified. If a `value` is a
* `color` * `color`
* Type: String * Type: String
* Options: See [team command](https://minecraft.gamepedia.com/Commands/team#Arguments) (same strings as `'teamcolor'` [command argument](https://github.com/gnembon/fabric-carpet/blob/master/docs/scarpet/Full.md#command-argument-types] options)) * Options: See [team command](https://minecraft.gamepedia.com/Commands/team#Arguments) (same strings as `'teamcolor'` [command argument](https://github.com/gnembon/fabric-carpet/blob/master/docs/scarpet/Full.md#command-argument-types) options)
* `displayName` * `displayName`
* Type: String or FormattedText, when querying returns FormattedText * Type: String or FormattedText, when querying returns FormattedText
src/main/java/carpet/script/api/Scoreboards.java
+6 -6
View File
@@ -262,7 +262,7 @@ public class Scoreboards {
if(!(propertyVal instanceof StringValue)) throw new InternalExpressionException("'team_property' requires a string as the second argument"); if(!(propertyVal instanceof StringValue)) throw new InternalExpressionException("'team_property' requires a string as the second argument");
switch (propertyVal.getString()) { switch (propertyVal.getString()) {
case "collision_rule": case "collisionRule":
if(!modifying) { if(!modifying) {
Value ret = new StringValue(team.getCollisionRule().name); Value ret = new StringValue(team.getCollisionRule().name);
return (_c, _t) -> ret; return (_c, _t) -> ret;
@@ -287,7 +287,7 @@ public class Scoreboards {
team.setColor(color); team.setColor(color);
break; break;
case "death_message_visibility": case "deathMessageVisibility":
if(!modifying) { if(!modifying) {
Value ret = new StringValue(team.getDeathMessageVisibilityRule().name); Value ret = new StringValue(team.getDeathMessageVisibilityRule().name);
return (_c, _t) -> ret; return (_c, _t) -> ret;
@@ -300,7 +300,7 @@ public class Scoreboards {
team.setDeathMessageVisibilityRule(deathMessageVisibility); team.setDeathMessageVisibilityRule(deathMessageVisibility);
break; break;
case "display_name": case "displayName":
if(!modifying) { if(!modifying) {
Value ret = new FormattedTextValue(team.getDisplayName()); Value ret = new FormattedTextValue(team.getDisplayName());
return (_c, _t) -> ret; return (_c, _t) -> ret;
@@ -319,7 +319,7 @@ public class Scoreboards {
team.setDisplayName(displayName); team.setDisplayName(displayName);
break; break;
case "friendly_fire": case "friendlyFire":
if(!modifying) { if(!modifying) {
Value ret = new NumericValue(team.isFriendlyFireAllowed()); Value ret = new NumericValue(team.isFriendlyFireAllowed());
return (_c, _t) -> ret; return (_c, _t) -> ret;
@@ -330,7 +330,7 @@ public class Scoreboards {
boolean friendlyFire = settingVal.getBoolean(); boolean friendlyFire = settingVal.getBoolean();
team.setFriendlyFireAllowed(friendlyFire); team.setFriendlyFireAllowed(friendlyFire);
break; break;
case "nametag_visibility": case "nametagVisibility":
if(!modifying) { if(!modifying) {
Value ret = new StringValue(team.getNameTagVisibilityRule().name); Value ret = new StringValue(team.getNameTagVisibilityRule().name);
return (_c, _t) -> ret; return (_c, _t) -> ret;
@@ -361,7 +361,7 @@ public class Scoreboards {
team.setPrefix(prefix); team.setPrefix(prefix);
break; break;
case "see_friendly_invisibles": case "seeFriendlyInvisibles":
if(!modifying) { if(!modifying) {
Value ret = new NumericValue(team.shouldShowFriendlyInvisibles()); Value ret = new NumericValue(team.shouldShowFriendlyInvisibles());
return (_c, _t) -> ret; return (_c, _t) -> ret;