chore: use American spelling in user-facing text

.changeset/kind-herons-shine.md

@@ -0,0 +1,5 @@
+---
+bump: patch
+---
+
+Corrected the spelling in a few of the messages the plugin sends, so they read the same way as the rest of the plugin. The wording of the teleport and import messages is otherwise unchanged. An existing config.yml is not touched, so any message you have already customized stays exactly as you set it.

README.md

@@ -104,7 +104,7 @@ By default players wait three seconds before a teleport fires, and moving cancel
 
 ![Instant teleport](docs/img/teleport-instant.gif)
 
-Before it drops anyone anywhere, Set Homes checks the destination is safe to stand in. If a home has been built over, flooded with lava, or left hanging above a drop, the player is moved to the nearest safe spot instead, or the teleport is cancelled and they are told why. Turn it off with `teleportSafety: false`.
+Before it drops anyone anywhere, Set Homes checks the destination is safe to stand in. If a home has been built over, flooded with lava, or left hanging above a drop, the player is moved to the nearest safe spot instead, or the teleport is canceled and they are told why. Turn it off with `teleportSafety: false`.
 
 ## Permissions
 
@@ -142,7 +142,7 @@ Two bundles group the nodes, so you can move a whole role in one line:
 | `sh2.update-notify` | OP | Being told on join that a newer release exists |
 | `sh2.bypass-max-homes` | OP | Creating homes past the configured maximum, whether the limit is server-wide or per group |
 | `sh2.bypass-blacklist` | OP | Creating a home in a blacklisted world, moving a home into one, and teleporting to a home already in one |
-| `sh2.bypass-teleport-delay` | OP | Teleporting with no countdown, and not being cancelled by moving |
+| `sh2.bypass-teleport-delay` | OP | Teleporting with no countdown, and not being canceled by moving |
 
 These nodes are granted by the bundles, which is why denying a bundle takes its whole set away at once. Granting or denying an individual node works exactly as the table describes.
 
@@ -314,8 +314,8 @@ Worth knowing before you copy a permissions file across:
 | `tp-delay` | `delay` | direct |
 | `tp-cancelOnMove` | `cancelOnMove` | direct |
 | `max-homes.<group>` | `maxHomes.<group>` | also set `maxHomesType: groups` and `maxHomeEnabled: true`. A v1 value of `0` means unlimited; leave that group out of `maxHomes` in v2 rather than setting it to `0`, which would cap it at zero homes instead. |
-| `max-homes-msg` | `maxHomesReached` | direct. v1's `§` colour codes paste in unchanged |
-| `tp-cancelOnMove-msg` | `movedWhileTeleporting` | direct. v1's `§` colour codes paste in unchanged |
+| `max-homes-msg` | `maxHomesReached` | direct. v1's `§` color codes paste in unchanged |
+| `tp-cancelOnMove-msg` | `movedWhileTeleporting` | direct. v1's `§` color codes paste in unchanged |
 | `tp-cooldown` | none | v2 has no cooldown feature |
 | `tp-cooldown-msg` | none | follows the above |
 

src/main/java/com/samleighton/sethomestwo/SetHomesTwo.java

@@ -162,7 +162,7 @@ private void refuseToRunAlongsideV1() {
         log.severe("     until you have migrated to v2.");
         log.severe("     It is how you roll back if you change your mind.");
         log.severe("  3. Leave plugins/SetHomes/ folder where it is. Nothing ever");
-        log.severe("     writes to it, but is needed for migrating homes to v2.");
+        log.severe("     writes to it, but it is needed for migrating homes to v2.");
         log.severe("  4. Start the server, then run /import-homes sethomes.");
         log.severe("");
         log.severe("Set Homes v1 is still running, exactly as it was.");

src/main/java/com/samleighton/sethomestwo/enums/UserError.java

@@ -12,9 +12,9 @@ public enum UserError {
     /** Teleport restriction */
     TELEPORT_IS_BLACKLISTED("You cannot teleport to this home because the dimension it is in has been blacklisted."),
     DIMENSION_IS_BLACKLISTED("You cannot set a home in this dimension because it has been blacklisted."),
-    MOVED_WHILE_TELEPORTING("Your teleport has been cancelled because you have moved."),
+    MOVED_WHILE_TELEPORTING("Your teleport has been canceled because you have moved."),
     ALREADY_TELEPORTING("You cannot teleport while already teleporting."),
-    UNSAFE_HOME("Teleport cancelled: this home is not safe to stand in and no safe spot was found nearby."),
+    UNSAFE_HOME("Teleport canceled: this home is not safe to stand in and no safe spot was found nearby."),
 
     /** Command Input Errors */
     DIMENSION_IS_NOT_BLACKLISTED("The %s dimension has not been blacklisted yet therefore you cannot remove it."),

src/main/java/com/samleighton/sethomestwo/gui/HomesGui.java

@@ -231,7 +231,7 @@ public void onClick(InventoryClickEvent event, GuiSession session) {
 
         // Right-click opens management, left-click teleports. Management is only
         // offered on the viewer's own list; the admin view of another player's
-        // homes falls through to teleport behaviour on any click.
+        // homes falls through to teleport behavior on any click.
         if (event.isRightClick() && isOwnList) {
             if (!player.hasPermission("sh2.manage-homes")) return;
 

src/main/java/com/samleighton/sethomestwo/importers/SetHomesV1Importer.java

@@ -93,7 +93,7 @@ private void importOne(HomesDao homesDao, NameLedger ledger, ImportReport report
             if (!storedName.equals(homeName)) {
                 report.renamed++;
                 String note = String.format(
-                        "Home '%s' for player %s differs only in capitalisation from another of that player's homes, which Set Homes v1 allowed. It takes the name '%s' here, so both locations are kept.",
+                        "Home '%s' for player %s differs only in capitalization from another of that player's homes, which Set Homes v1 allowed. It takes the name '%s' here, so both locations are kept.",
                         homeName, playerUUID, storedName);
                 report.warnings.add(note);
                 if (!dryRun) Bukkit.getLogger().warning(note);
@@ -272,13 +272,13 @@ private void reportConfig(File pluginsDir, ImportReport report) {
         }
     }
 
-    // A v1 message may carry section-sign colour codes, which chat would apply
+    // A v1 message may carry section-sign color codes, which chat would apply
     // to the rest of the line. Show them as & so the note stays legible.
     private static String messageNote(String v1Key, String v2Key, String value) {
         String shown = value.replace(ChatColor.COLOR_CHAR, '&');
         String note = String.format("v1 %s -> set %s: '%s' in config.yml", v1Key, v2Key, shown);
         if (!shown.equals(value)) {
-            note += " (colour codes shown as &; copy the original from plugins/SetHomes/config.yml to keep them)";
+            note += " (color codes shown as &; copy the original from plugins/SetHomes/config.yml to keep them)";
         }
         return note;
     }

src/main/resources/default-config.yml

@@ -88,7 +88,7 @@ v1ImportPending: "Set Homes v1 has %s home(s) waiting to be imported. Run /impor
 invalidHomeItem: "The material you entered is not valid, please try a different one."
 falseHomeItem: "This home item does not belong to you."
 teleportedWhileTeleporting: "You cannot teleport while already teleporting."
-movedWhileTeleporting: "Your teleport has been cancelled because you have moved."
+movedWhileTeleporting: "Your teleport has been canceled because you have moved."
 noHomes: "You have not created any homes yet. Use /create-home to make your first one."
 teleportToBlacklistedDimension: "You cannot teleport to this home because the dimension it is in has been blacklisted."
 maxHomesReached: "You have reached the maximum number of homes allowed."
@@ -101,7 +101,7 @@ homeDoesNotExist: "The home '%s' does not exist."
 
 # Shown when a player name matches nobody online and nobody with saved homes.
 playerNotFound: "No player by that name is online or has any saved homes."
-unsafeHome: "Teleport cancelled: this home is not safe to stand in and no safe spot was found nearby."
+unsafeHome: "Teleport canceled: this home is not safe to stand in and no safe spot was found nearby."
 movedToSafeSpot: "Your home was not safe to stand in, so you were moved to the nearest safe spot."
 
 # -- DEBUGGING --
@@ -117,15 +117,15 @@ renamePromptTitle: "New home name"
 
 # Hint shown on each home in the homes list, below the description.
 # Only shown to players who can actually manage the home (sh2.manage-homes)
-# and never on another player's homes. Supports '&' colour codes.
+# and never on another player's homes. Supports '&' color codes.
 # Set to "" to hide it.
 manageHomeHint: "&7Right click to edit home"
 
 # Maximum number of characters allowed in a home name.
 maxHomeNameLength: 32
 
 # Buttons in the management menu.
-# Button names support '&' colour codes (e.g. &c for red).
+# Button names support '&' color codes (e.g. &c for red).
 renameButtonItem: "name_tag"
 renameButtonName: "Rename"
 moveHomeButtonItem: "ender_pearl"