Merge pull request #773 from ArikSquad/fix/swofty-ai-slop-sorry

Translation and random fixes

Author: Swofty-Developments

commons/src/generated/java/net/swofty/commons/skyblock/item/ItemType.java

@@ -1,6 +1,8 @@
 // AUTO-GENERATED FILE. DO NOT EDIT.
 package net.swofty.commons.skyblock.item;
 
+import java.lang.Exception;
+import java.lang.String;
 import net.minestom.server.item.Material;
 import net.swofty.commons.StringUtility;
 import org.jetbrains.annotations.Nullable;

commons/src/main/java/net/swofty/commons/config/Settings.java

@@ -26,6 +26,7 @@ public class Settings {
     @Comment("The secret key used to authenticate with Velocity proxy")
     private String velocitySecret = "ixmSUgWOgvs7";
 
+    @Comment("Whether to require player authentication on initial connection")
     private boolean requireAuth = false;
 
     @Comment("Whether to enable sandbox features (such as editing items)")

commons/src/main/java/net/swofty/commons/proxy/FromProxyChannels.java

@@ -6,7 +6,6 @@
 import net.swofty.commons.proxy.requirements.from.GivePlayersOriginTypeRequirements;
 import net.swofty.commons.proxy.requirements.from.PingServerRequirements;
 import net.swofty.commons.proxy.requirements.from.PlayerHasSwitchedFromHereRequirements;
-import net.swofty.commons.proxy.requirements.from.PromptPlayerForAuthenticationRequirements;
 import net.swofty.commons.proxy.requirements.from.RefreshCoopDataOnServerRequirements;
 import net.swofty.commons.proxy.requirements.from.RunEventRequirements;
 import net.swofty.commons.proxy.requirements.from.TeleportRequirements;
@@ -16,7 +15,6 @@
 @Getter
 public enum FromProxyChannels {
     TELEPORT("teleport", new TeleportRequirements()),
-    PROMPT_PLAYER_FOR_AUTHENTICATION("authenticate", new PromptPlayerForAuthenticationRequirements()),
     PLAYER_HAS_SWITCHED_FROM_HERE("player-has-switched-from-here", new PlayerHasSwitchedFromHereRequirements()),
     DOES_SERVER_HAVE_ISLAND("does-server-have-island", new DoesServerHaveIslandRequirements()),
     REFRESH_COOP_DATA_ON_SERVER("refresh-coop-data", new RefreshCoopDataOnServerRequirements()),

configuration/i18n/en_US/commands.properties

@@ -3,8 +3,8 @@
 # ============================================================
 commands.common.separator = <blue><strikethrough>-----------------------------------------------------
 commands.common.player_not_found = <red>Can't find a player by the name of '{player}'
-commands.common.player_not_found_short = <red>Could not find player: {player}
-commands.common.unknown_command_use_help = <red>Unknown command. Use /{command} for help.
+commands.common.player_not_found_short=<red>Could not find player: <arg:0>
+commands.common.unknown_command_use_help=<red>Unknown command. Use /<arg:0> for help.
 commands.common.service_offline_friend = <red>Could not connect to the friend service! Please try again later.
 commands.common.service_offline_party = <red>Could not connect to the party service! Please try again later.
 commands.common.service_offline_party_alt = <red>Couldn't find a party service! Please try again later.
@@ -46,10 +46,10 @@ commands.party.help_demote = <yellow>/p demote <player> <dark_gray>- <gray><ital
 commands.party.help_chat = <yellow>/p chat <dark_gray>- <gray><italic>Sends a chat message to the entire party
 commands.party.help_hijack = <yellow>/p hijack <player> <dark_gray>- <gray><italic>Hijacks a party (Admin only)
 commands.party.not_in_party = <red>You are not in a party!
-commands.party.list_header = <gold>Party Members ({count})
-commands.party.list_leader = <yellow>Party Leader: {leader}
-commands.party.list_moderators = <yellow>Party Moderators: {moderators}
-commands.party.list_members = <yellow>Party Members: {members}
+commands.party.list_header=<gold>Party Members (<arg:0>)
+commands.party.list_leader=<yellow>Party Leader: <arg:0>
+commands.party.list_moderators=<yellow>Party Moderators: <arg:0>
+commands.party.list_members=<yellow>Party Members: <arg:0>
 commands.party.error_not_found = <red>Couldn't find a player with that name!
 commands.party.error_not_online = <red>That player is not online!
 commands.party.error_invite_self = <red>You cannot invite yourself!
@@ -60,27 +60,27 @@ commands.party.error_need_staff = <red>You need STAFF to do this command
 # ============================================================
 # Message Command
 # ============================================================
-commands.message.player_not_found = <red>Can't find a player by the name of '{player}'
-commands.message.player_not_online = <red>The player you tried to message, {player}, is not online.
-commands.message.outgoing = <light_purple>To {target}<gray>: {message}
-commands.message.incoming = <light_purple>From {sender}<gray>: {message}
+commands.message.player_not_found=<red>Can't find a player by the name of '<arg:0>'
+commands.message.player_not_online=<red>The player you tried to message, <arg:0>, is not online.
+commands.message.outgoing=<light_purple>To <arg:0><gray>: <arg:1>
+commands.message.incoming=<light_purple>From <arg:0><gray>: <arg:1>
 
 # ============================================================
 # Mute Command
 # ============================================================
 commands.mute.invalid_reason = <red>Invalid mute reason. Use tab-completion to see valid options.
-commands.mute.success = <green>Successfully muted player <yellow>{player}<green>. <dark_gray>Punishment ID: <gray>{id}
-commands.mute.already_muted = <red>This player already has an active mute. Punishment ID: <gray>{id}
-commands.mute.failed = <red>Failed to mute player: {error}
+commands.mute.success=<green>Successfully muted player <yellow><arg:0><green>. <dark_gray>Punishment ID: <gray><arg:1>
+commands.mute.already_muted=<red>This player already has an active mute. Punishment ID: <gray><arg:0>
+commands.mute.failed=<red>Failed to mute player: <arg:0>
 commands.mute.service_offline = <red>Could not mute this player at this time. The punishment service may be offline.
 
 # ============================================================
 # Ban Command
 # ============================================================
 commands.ban.invalid_reason = <red>Invalid ban reason. Use tab-completion to see valid options.
-commands.ban.success = <green>Successfully banned player <yellow>{player}<green>. <dark_gray>Punishment ID: <gray>{id}
-commands.ban.already_banned = <red>This player is already banned. Use the tag -O to overwrite. Punishment ID: <gray>{id}
-commands.ban.failed = <red>Failed to ban player: {error}
+commands.ban.success=<green>Successfully banned player <yellow><arg:0><green>. <dark_gray>Punishment ID: <gray><arg:1>
+commands.ban.already_banned=<red>This player is already banned. Use the tag -O to overwrite. Punishment ID: <gray><arg:0>
+commands.ban.failed=<red>Failed to ban player: <arg:0>
 commands.ban.service_offline = <red>Could not ban this player at this time. The punishment service may be offline.
 
 # ============================================================
@@ -98,8 +98,8 @@ commands.unban.service_offline = <red>Could not unban this player at this time.
 # ============================================================
 # Rank Command
 # ============================================================
-commands.rank.player_not_found = <red>Couldn't find a player by the name of <yellow>{player}<red>.
-commands.rank.success = <green>Successfully set <yellow>{player}<green>'s rank to <yellow>{rank}<green>.
+commands.rank.player_not_found=<red>Couldn't find a player by the name of <yellow><arg:0><red>.
+commands.rank.success=<green>Successfully set <yellow><arg:0><green>'s rank to <yellow><arg:1><green>.
 
 # ============================================================
 # Chat Command

configuration/i18n/en_US/gui/gui_abiphone.properties

@@ -4,10 +4,24 @@
 
 # --- GUIAbiphone / AbiphoneView ---
 gui_abiphone.sort_button = <green>Sort <aqua>TO-DO
-gui_abiphone.sort_button.lore = \n<gray>  First Added\n<gray>  Alphabetical\n<gray>  Last Called\n<gray>  Most Called\n<gray>  Do Not Disturb First\n\n<aqua>Right-click to go backwards!\n<yellow>Click to switch!
+gui_abiphone.sort_button.lore.1=<gray>
+gui_abiphone.sort_button.lore.2=<gray>  First Added
+gui_abiphone.sort_button.lore.3=<gray>  Alphabetical
+gui_abiphone.sort_button.lore.4=<gray>  Last Called
+gui_abiphone.sort_button.lore.5=<gray>  Most Called
+gui_abiphone.sort_button.lore.6=<gray>  Do Not Disturb First
+gui_abiphone.sort_button.lore.7=<gray>
+gui_abiphone.sort_button.lore.8=<aqua>Right-click to go backwards!
+gui_abiphone.sort_button.lore.9=<yellow>Click to switch!
 
 gui_abiphone.contacts_directory = <green>Contacts Directory <aqua>TO-DO
-gui_abiphone.contacts_directory.lore = <gray>Browse through all NPCs in SkyBlock\n<gray>which both own an Abiphone AND are\n<gray>willing to add you as a contact.\n\n<gray>Your contacts: <green>{contact_count}<aqua>/{total_contacts}\n\n<yellow>Click to view contacts!
+gui_abiphone.contacts_directory.lore.1=<gray>Browse through all NPCs in SkyBlock
+gui_abiphone.contacts_directory.lore.2=<gray>which both own an Abiphone AND are
+gui_abiphone.contacts_directory.lore.3=<gray>willing to add you as a contact.
+gui_abiphone.contacts_directory.lore.4=<gray>
+gui_abiphone.contacts_directory.lore.5=<gray>Your contacts: <green><arg:0><aqua>/<arg:1>
+gui_abiphone.contacts_directory.lore.6=<gray>
+gui_abiphone.contacts_directory.lore.7=<yellow>Click to view contacts!
 
 gui_abiphone.contact_manage_hint = <dark_gray>Right-click to manage!
 gui_abiphone.contact_call_hint = <yellow>Left-click to call!
@@ -19,13 +33,17 @@ gui_abiphone.ring_3 = <yellow>\u2706 RING... RING... RING...
 # --- GUIConfirmAbiphone ---
 gui_abiphone.confirm.title = Confirm
 gui_abiphone.confirm.confirm_button = <green>Confirm
-gui_abiphone.confirm.confirm_button.lore = <yellow>Click to remove {npc_name}\n<yellow>from your\ncontacts!
+gui_abiphone.confirm.confirm_button.lore.1=<yellow>Click to remove <arg:0>
+gui_abiphone.confirm.confirm_button.lore.2=<yellow>from your
+gui_abiphone.confirm.confirm_button.lore.3=contacts!
 gui_abiphone.confirm.cancel_button = <red>Cancel
 
 # --- GUIContactManagement / GUIContactManagementView ---
 gui_abiphone.management.title = Contact Management
 
 gui_abiphone.management.remove_contact = <red>Remove Contact
-gui_abiphone.management.remove_contact.lore = <gray>In case you're no longer friends, or\n<gray>whatever other reason.\n \n<yellow>Click to remove!
-
-gui_abiphone.management.removed_message = <red>\u2706 Removed {npc_name} <red>from your contacts!
+gui_abiphone.management.remove_contact.lore.1=<gray>In case you're no longer friends, or
+gui_abiphone.management.remove_contact.lore.2=<gray>whatever other reason.
+gui_abiphone.management.remove_contact.lore.3=<gray>
+gui_abiphone.management.remove_contact.lore.4=<yellow>Click to remove!
+gui_abiphone.management.removed_message=<red>\u2706 Removed <arg:0> <red>from your contacts!

configuration/i18n/en_US/gui/gui_anvil.properties

@@ -1,26 +1,29 @@
-# =============================================================================
-# Anvil GUI Translations
-# =============================================================================
-
 gui_anvil.title = Anvil
 
 gui_anvil.combine_items = <green>Combine Items
-gui_anvil.combine_items.lore = <gray>Combine the items in the slots to the\n<gray>left and right below.
+gui_anvil.combine_items.lore.1=<gray>Combine the items in the slots to the
+gui_anvil.combine_items.lore.2=<gray>left and right below.
 
 gui_anvil.result_empty = <red>Anvil
-gui_anvil.result_empty.lore = <gray>Place a target item in the left slot\n<gray>and a sacrifice item in the right slot\n<gray>to combine them!
+gui_anvil.result_empty.lore.1=<gray>Place a target item in the left slot
+gui_anvil.result_empty.lore.2=<gray>and a sacrifice item in the right slot
+gui_anvil.result_empty.lore.3=<gray>to combine them!
 
 gui_anvil.result_error = <red>Error!
 gui_anvil.result_error.lore = <gray>You can not combine those Items
 
 gui_anvil.item_to_upgrade = <gold>Item to Upgrade
-gui_anvil.item_to_upgrade.lore = <gray>The item you want to upgrade should\n<gray>be placed in the slot on this side.
+gui_anvil.item_to_upgrade.lore.1=<gray>The item you want to upgrade should
+gui_anvil.item_to_upgrade.lore.2=<gray>be placed in the slot on this side.
 
 gui_anvil.item_to_sacrifice = <gold>Item to Sacrifice
-gui_anvil.item_to_sacrifice.lore = <gray>The item you are sacrificing in order\n<gray>to upgrade the item on the left\n<gray>should be placed in the slot on this\n<gray>side.
+gui_anvil.item_to_sacrifice.lore.1=<gray>The item you are sacrificing in order
+gui_anvil.item_to_sacrifice.lore.2=<gray>to upgrade the item on the left
+gui_anvil.item_to_sacrifice.lore.3=<gray>should be placed in the slot on this
+gui_anvil.item_to_sacrifice.lore.4=<gray>side.
 
 gui_anvil.cost_label = <gray>Cost
-gui_anvil.cost_exp_levels = <blue>{cost} Exp Levels
+gui_anvil.cost_exp_levels=<blue><arg:0> Exp Levels
 gui_anvil.click_to_combine = <yellow>Click to combine!
 
 gui_anvil.claim_result = <green>Anvil