Use more formatting

AlexProgrammerDE · Apr 25, 2024 · a64b111 · a64b111
1 parent 2a19c39
commit a64b111
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 19 deletions.
diff --git a/buildSrc/src/main/kotlin/sf-checkstyle-conventions.gradle.kts b/buildSrc/src/main/kotlin/sf-checkstyle-conventions.gradle.kts
@@ -11,6 +11,6 @@ checkstyle {
 // To fix a conflict in checkstyle dependencies
 configurations.checkstyle {
   resolutionStrategy.capabilitiesResolution.withCapability("com.google.collections:google-collections") {
-    select("com.google.guava:guava:" + libs.guava.get().version)
+    select("com.google.guava:guava:${libs.guava.get().version}")
   }
 }
diff --git a/client/src/main/java/com/soulfiremc/client/gui/libs/MessageLogPanel.java b/client/src/main/java/com/soulfiremc/client/gui/libs/MessageLogPanel.java
@@ -257,7 +257,7 @@ private void updatePopup() {
           var url = LogsUploadService.upload(textComponent.getText()).url();
           JOptionPane.showMessageDialog(
             this,
-            SFSwingUtils.createHtmlPane("Uploaded to: <a href='" + url + "'>" + url + "</a>"),
+            SFSwingUtils.createHtmlPane("Uploaded to: <a href='%s'>%s</a>".formatted(url, url)),
             "Success",
             JOptionPane.INFORMATION_MESSAGE);
         } catch (Exception e) {

diff --git a/client/src/main/java/com/soulfiremc/client/gui/libs/SFSwingUtils.java b/client/src/main/java/com/soulfiremc/client/gui/libs/SFSwingUtils.java
@@ -65,11 +65,11 @@ public static JTextPane createHtmlPane(@Language("html") String text) {
   }
 
   public static String htmlCenterText(String text) {
-    return htmlText("<center>" + text + "</center>");
+    return htmlText("<center>%s</center>".formatted(text));
   }
 
   public static String htmlText(String text) {
-    return "<html>" + text + "</html>";
+    return "<html>%s</html>".formatted(text);
   }
 
   public static UndoManager addUndoRedo(JTextComponent textComponent) {

diff --git a/client/src/main/java/com/soulfiremc/client/gui/navigation/GeneratedPanel.java b/client/src/main/java/com/soulfiremc/client/gui/navigation/GeneratedPanel.java
@@ -174,7 +174,7 @@ public static void addComponents(
                 yield comboBox;
               }
               case VALUE_NOT_SET -> throw new IllegalStateException(
-                "Unexpected value: " + settingType.getValueCase());
+                "Unexpected value: %s".formatted(settingType.getValueCase()));
             };
           GBC.create(panel)
             .grid(1, row++)

diff --git a/client/src/main/java/com/soulfiremc/client/gui/popups/AboutPopup.java b/client/src/main/java/com/soulfiremc/client/gui/popups/AboutPopup.java
@@ -34,7 +34,7 @@ public AboutPopup(JFrame parent) {
 
     content.add(SFSwingUtils.createHtmlPane("<b>SoulFire</b>"));
     content.add(
-      SFSwingUtils.createHtmlPane("Version: <b><code>" + BuildData.VERSION + "</code></b>"));
+      SFSwingUtils.createHtmlPane("Version: <b><code>%s</code></b>".formatted(BuildData.VERSION)));
     content.add(
       SFSwingUtils.createHtmlPane(
         "Author: <b><a href='https://github.com/AlexProgrammerDE'>AlexProgrammerDE</a></b>"));

diff --git a/common/src/main/java/com/soulfiremc/settings/account/service/OfflineJavaData.java b/common/src/main/java/com/soulfiremc/settings/account/service/OfflineJavaData.java
@@ -27,7 +27,7 @@ public static OfflineJavaData fromProto(MinecraftAccountProto.OfflineJavaData da
   }
 
   public static UUID getOfflineUUID(String username) {
-    return UUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(StandardCharsets.UTF_8));
+    return UUID.nameUUIDFromBytes(("OfflinePlayer:%s".formatted(username)).getBytes(StandardCharsets.UTF_8));
   }
 
   public MinecraftAccountProto.OfflineJavaData toProto() {

diff --git a/server/src/main/java/com/soulfiremc/server/brigadier/TagBasedArgumentType.java b/server/src/main/java/com/soulfiremc/server/brigadier/TagBasedArgumentType.java
@@ -77,7 +77,6 @@ public static String readStringCustom(StringReader stringReader) throws CommandS
   public R parse(StringReader stringReader) throws CommandSyntaxException {
     final var start = stringReader.getCursor();
     var string = readStringCustom(stringReader);
-    System.out.println("string = " + string);
 
     var currentKeys = directKeys;
     var currentSupplier = directSupplier;

diff --git a/server/src/main/java/com/soulfiremc/server/data/GsonDataHelper.java b/server/src/main/java/com/soulfiremc/server/data/GsonDataHelper.java
@@ -81,6 +81,6 @@ public static <T> T fromJson(String dataFile, String dataKey, Class<T> clazz,
       }
     }
 
-    throw new RuntimeException("Failed to find data key " + dataKey + " in file " + dataFile);
+    throw new RuntimeException("Failed to find data key %s in file %s".formatted(dataKey, dataFile));
   }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/data/ResourceKey.java b/server/src/main/java/com/soulfiremc/server/data/ResourceKey.java
@@ -25,6 +25,6 @@ public static ResourceKey fromString(String formatted) {
 
   @Override
   public String toString() {
-    return namespace + ":" + path;
+    return "%s:%s".formatted(namespace, path);
   }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/SFVec3i.java b/server/src/main/java/com/soulfiremc/server/pathfinding/SFVec3i.java
@@ -99,11 +99,11 @@ public Vector3d toVector3d() {
 
   @Override
   public String toString() {
-    return "SFVec3i(" + x + ", " + y + ", " + z + ")";
+    return "SFVec3i(%d, %d, %d)".formatted(x, y, z);
   }
 
   public String formatXYZ() {
-    return "[" + x + ", " + y + ", " + z + "]";
+    return "[%d, %d, %d]".formatted(x, y, z);
   }
 
   public double distance(SFVec3i goal) {

diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/ItemPlaceHelper.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/ItemPlaceHelper.java
@@ -86,7 +86,7 @@ public static boolean placeBestToolInHand(SessionDataManager dataManager, SFVec3
 
       var optionalBlockType = dataManager.currentLevel().getBlockState(blockPosition).blockType();
       if (optionalBlockType == BlockType.VOID_AIR) {
-        throw new IllegalStateException("Block at " + blockPosition + " is not in view range");
+        throw new IllegalStateException("Block at %s is not in view range".formatted(blockPosition));
       }
 
       var cost =

diff --git a/server/src/main/java/com/soulfiremc/server/plugins/ChatControl.java b/server/src/main/java/com/soulfiremc/server/plugins/ChatControl.java
@@ -51,7 +51,7 @@ public static void onChat(ChatMessageReceiveEvent event) {
         .getSingleton(ServerCommandManager.class)
         .execute(command, new LocalConsole());
 
-      connection.botControl().sendMessage("Command \"" + command + "\" executed! (Code: " + code + ")");
+      connection.botControl().sendMessage("Command \"%s\" executed! (Code: %d)".formatted(command, code));
     }
   }
 

diff --git a/server/src/main/java/com/soulfiremc/server/plugins/ChatMessageLogger.java b/server/src/main/java/com/soulfiremc/server/plugins/ChatMessageLogger.java
@@ -60,7 +60,7 @@ public static void onMessage(ChatMessageReceiveEvent event) {
       Optional.ofNullable(event.sender())
         .map(ChatMessageReceiveEvent.ChatMessageSender::senderName)
         .orElse("Server");
-    var message = Component.text("<" + sender + "> ").append(event.message());
+    var message = Component.text("<%s> ".formatted(sender)).append(event.message());
 
     var ansiMessage = ANSI_MESSAGE_SERIALIZER.serialize(message);
 

diff --git a/server/src/main/java/com/soulfiremc/server/plugins/POVServer.java b/server/src/main/java/com/soulfiremc/server/plugins/POVServer.java
@@ -210,7 +210,7 @@ public POVServerInstance(int port, AttackManager attackManager) {
             MinecraftCodec.CODEC.getMinecraftVersion(),
             MinecraftCodec.CODEC.getProtocolVersion()),
           new PlayerInfo(100, 0, new ArrayList<>()),
-          Component.text("Attack POV server for attack " + attackManager.id() + "!")
+          Component.text("Attack POV server for attack %d!".formatted(attackManager.id()))
             .color(NamedTextColor.GREEN)
             .decorate(TextDecoration.BOLD),
           null,

diff --git a/server/src/main/java/com/soulfiremc/server/protocol/bot/container/ContainerSlot.java b/server/src/main/java/com/soulfiremc/server/protocol/bot/container/ContainerSlot.java
@@ -57,6 +57,6 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return "ContainerSlot[" + "slot=" + slot + ", " + "item=" + item + ']';
+    return "ContainerSlot[slot=%d, item=%s]".formatted(slot, item);
   }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/protocol/netty/SFTcpPacketCodec.java b/server/src/main/java/com/soulfiremc/server/protocol/netty/SFTcpPacketCodec.java
@@ -88,7 +88,7 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buf, List<Object> out)
 
       if (buf.readableBytes() > 0) {
         throw new IllegalStateException(
-          "Packet \"" + packet.getClass().getSimpleName() + "\" not fully read.");
+          "Packet \"%s\" not fully read.".formatted(packet.getClass().getSimpleName()));
       }
 
       out.add(packet);

diff --git a/server/src/main/java/com/soulfiremc/server/viaversion/platform/SFViaPlatform.java b/server/src/main/java/com/soulfiremc/server/viaversion/platform/SFViaPlatform.java
@@ -215,7 +215,7 @@ public void sendMessage(UUID uuid, String message) {
     if (uuid == null) {
       this.getLogger().info(message);
     } else {
-      this.getLogger().info("[" + uuid + "] " + message);
+      this.getLogger().info("[%s] %s".formatted(uuid, message));
     }
   }