Fix more formatting issues

Legacy-Fabric · Nov 28, 2024 · af26809 · af26809
1 parent 9f8bb6e
commit af26809
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 11 deletions.
diff --git a/....2/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/args/CommandFlags.java b/....2/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/args/CommandFlags.java
@@ -183,7 +183,7 @@ public Text getUsage(PermissibleCommandSource src) {
 
 			if (usage.asUnformattedString().trim().length() > 0) {
 				builder.add(" ");
-				builder.add(usage);
+				builder.add(usage.asUnformattedString());
 			}
 
 			builder.add("]");

diff --git a/.../main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PlayerCommandElement.java b/.../main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PlayerCommandElement.java
@@ -95,6 +95,6 @@ private PlayerEntity tryReturnSource(PermissibleCommandSource source, CommandArg
 
 	@Override
 	public Text getUsage(PermissibleCommandSource src) {
-		return src != null && this.returnSource ? new LiteralText("[" + super.getUsage(src) + "]") : super.getUsage(src);
+		return src != null && this.returnSource ? new LiteralText("[" + super.getUsage(src).asUnformattedString() + "]") : super.getUsage(src);
 	}
 }
diff --git a/...10/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/args/CommandFlags.java b/...10/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/args/CommandFlags.java
@@ -183,7 +183,7 @@ public Text getUsage(PermissibleCommandSource src) {
 
 			if (usage.asUnformattedString().trim().length() > 0) {
 				builder.add(" ");
-				builder.add(usage);
+				builder.add(usage.asUnformattedString());
 			}
 
 			builder.add("]");

diff --git a/.../main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PlayerCommandElement.java b/.../main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PlayerCommandElement.java
@@ -77,7 +77,7 @@ protected Iterable<String> getChoices(PermissibleCommandSource source) {
 
 	@Override
 	protected Object getValue(String choice) throws IllegalArgumentException {
-		Optional<PlayerEntity> ret = this.getServer().getPlayerManager().players.stream().findFirst().map(Function.identity());
+		Optional<PlayerEntity> ret = this.getServer().getPlayerManager().players.stream().findFirst();
 
 		if (!ret.isPresent()) {
 			throw new IllegalArgumentException("Input value " + choice + " was not a player");
@@ -96,6 +96,6 @@ private PlayerEntity tryReturnSource(PermissibleCommandSource source, CommandArg
 
 	@Override
 	public Text getUsage(PermissibleCommandSource src) {
-		return src != null && this.returnSource ? new LiteralText("[" + super.getUsage(src) + "]") : super.getUsage(src);
+		return src != null && this.returnSource ? new LiteralText("[" + super.getUsage(src).asUnformattedString() + "]") : super.getUsage(src);
 	}
 }
diff --git a/....9/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/args/CommandFlags.java b/....9/src/main/java/net/legacyfabric/fabric/api/command/v2/lib/sponge/args/CommandFlags.java
@@ -183,7 +183,7 @@ public Text getUsage(PermissibleCommandSource src) {
 
 			if (usage.asUnformattedString().trim().length() > 0) {
 				builder.add(" ");
-				builder.add(usage);
+				builder.add(usage.asUnformattedString());
 			}
 
 			builder.add("]");

diff --git a/.../main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PlayerCommandElement.java b/.../main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PlayerCommandElement.java
@@ -96,6 +96,6 @@ private PlayerEntity tryReturnSource(PermissibleCommandSource source, CommandArg
 
 	@Override
 	public Text getUsage(PermissibleCommandSource src) {
-		return src != null && this.returnSource ? new LiteralText("[" + super.getUsage(src) + "]") : super.getUsage(src);
+		return src != null && this.returnSource ? new LiteralText("[" + super.getUsage(src).asUnformattedString() + "]") : super.getUsage(src);
 	}
 }
diff --git a/...net/legacyfabric/fabric/api/command/v2/lib/sponge/args/PatternMatchingCommandElement.java b/...net/legacyfabric/fabric/api/command/v2/lib/sponge/args/PatternMatchingCommandElement.java
@@ -86,7 +86,7 @@ public Object parseValue(PermissibleCommandSource source, CommandArgs args) thro
 
 		if (!ret.iterator().hasNext()) {
 			throw args.createError(new LiteralText(String.format("No values matching pattern '%s' present for %s!", arg, this.getKey() == null
-					? nullKeyArg : this.getKey())));
+					? nullKeyArg : this.getKey().asUnformattedString())));
 		}
 
 		return ret;

diff --git a/...main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/OnlyOneCommandElement.java b/...main/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/OnlyOneCommandElement.java
@@ -52,7 +52,7 @@ public void parse(PermissibleCommandSource source, CommandArgs args, CommandCont
 
 		if (context.getAll(this.element.getUntranslatedKey()).size() > 1) {
 			Text key = this.element.getKey();
-			throw args.createError(new LiteralText(String.format("Argument %s may have only one value!", key != null ? key : "unknown")));
+			throw args.createError(new LiteralText(String.format("Argument %s may have only one value!", key != null ? key.asUnformattedString() : "unknown")));
 		}
 	}
 

diff --git a/...ain/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/OptionalCommandElement.java b/...ain/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/OptionalCommandElement.java
@@ -98,6 +98,6 @@ public Text getUsage(PermissibleCommandSource src) {
 			return new LiteralText("");
 		}
 
-		return new LiteralText("[" + this.element.getUsage(src) + "]");
+		return new LiteralText("[" + this.element.getUsage(src).asUnformattedString() + "]");
 	}
 }
diff --git a/...n/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PermissionCommandElement.java b/...n/java/net/legacyfabric/fabric/impl/command/lib/sponge/args/PermissionCommandElement.java
@@ -66,7 +66,7 @@ private boolean checkPermission(PermissibleCommandSource source, CommandArgs arg
 
 		if (!hasPermission && !this.isOptional) {
 			Text key = this.getKey();
-			throw args.createError(new LiteralText(String.format("You do not have permission to use the %s argument", key != null ? key : "unknown")));
+			throw args.createError(new LiteralText(String.format("You do not have permission to use the %s argument", key != null ? key.asUnformattedString() : "unknown")));
 		}
 
 		return hasPermission;