onTabComplete(@NotNull CommandSender sender, @NotNull String[] args) {
- return null;
+ return List.of();
}
}
diff --git a/src/main/java/de/greensurvivors/padlock/config/ConfigManager.java b/src/main/java/de/greensurvivors/padlock/config/ConfigManager.java
index 10ee22a..77b276b 100644
--- a/src/main/java/de/greensurvivors/padlock/config/ConfigManager.java
+++ b/src/main/java/de/greensurvivors/padlock/config/ConfigManager.java
@@ -366,7 +366,7 @@ public boolean doLocksExpire() {
return LOCK_EXPIRE_DAYS.getValueOrFallback();
}
- public boolean isLockable(Material material) {
+ public boolean isLockable(@NotNull Material material) {
return LOCKABLES.getValueOrFallback().contains(material);
}
diff --git a/src/main/java/de/greensurvivors/padlock/config/MessageManager.java b/src/main/java/de/greensurvivors/padlock/config/MessageManager.java
index 7077e41..9897704 100644
--- a/src/main/java/de/greensurvivors/padlock/config/MessageManager.java
+++ b/src/main/java/de/greensurvivors/padlock/config/MessageManager.java
@@ -421,6 +421,11 @@ public enum LangPath {
PASSWORD_SAFETY_WARNING("cmd.password.safety-warning", "Warning: never use a password, you are using anywhere else! While I did everything I could for your safety, there ARE ways your password could get leaked!"),
PASSWORD_START_PROCESSING("cmd.password.start-processing"),
PASSWORD_WRONG_PASSWORD("cmd.password.wrong-password"),
+ PASSWORD_DEFAULT_PASSWORD("cmd.password.default"),
+ PASSWORD_INPUT_SET_TITLE("cmd.password.gui-title.set"),
+ PASSWORD_INPUT_REMOVE("cmd.password.gui.remove"),
+ PASSWORD_INPUT_APPLY_TITLE("cmd.password.gui-title.apply"),
+ PASSWORD_ERROR_EMPTY("cmd.password.error.empty"),
//plugin prefix
PLUGIN_PREFIX("prefix", "[Padlock] "),
//
diff --git a/src/main/java/de/greensurvivors/padlock/impl/internal/InputAnvilMenu.java b/src/main/java/de/greensurvivors/padlock/impl/internal/InputAnvilMenu.java
new file mode 100644
index 0000000..810ef74
--- /dev/null
+++ b/src/main/java/de/greensurvivors/padlock/impl/internal/InputAnvilMenu.java
@@ -0,0 +1,13 @@
+package de.greensurvivors.padlock.impl.internal;
+
+import org.jetbrains.annotations.Nullable;
+
+public interface InputAnvilMenu {
+ /**
+ * use {@link #getRenameChars()} instead!
+ */
+ @Deprecated
+ String getRenameText();
+
+ char @Nullable [] getRenameChars();
+}
diff --git a/src/main/java/de/greensurvivors/padlock/impl/internal/NMSAnvilMenu.java b/src/main/java/de/greensurvivors/padlock/impl/internal/NMSAnvilMenu.java
new file mode 100644
index 0000000..bd4e485
--- /dev/null
+++ b/src/main/java/de/greensurvivors/padlock/impl/internal/NMSAnvilMenu.java
@@ -0,0 +1,13 @@
+package de.greensurvivors.padlock.impl.internal;
+
+import org.bukkit.craftbukkit.inventory.view.CraftAnvilView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public interface NMSAnvilMenu {
+
+ @NotNull
+ CraftAnvilView getBukkitView();
+
+ char @Nullable [] getLastInput();
+}
diff --git a/src/main/java/de/greensurvivors/padlock/impl/internal/VersionManager.java b/src/main/java/de/greensurvivors/padlock/impl/internal/VersionManager.java
new file mode 100644
index 0000000..78e1f54
--- /dev/null
+++ b/src/main/java/de/greensurvivors/padlock/impl/internal/VersionManager.java
@@ -0,0 +1,14 @@
+package de.greensurvivors.padlock.impl.internal;
+
+import de.greensurvivors.padlock.impl.internal.v21_7.NMSInputAnvilMenu;
+import net.kyori.adventure.text.Component;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class VersionManager {
+ public static InventoryView openInputAnvil(final @NotNull Player player, @NotNull Component title, @Nullable Component emptyText) {
+ return NMSInputAnvilMenu.openInputAnvil(player, title, emptyText);
+ }
+}
diff --git a/src/main/java/de/greensurvivors/padlock/impl/internal/v21_7/CraftAnvilInventory.java b/src/main/java/de/greensurvivors/padlock/impl/internal/v21_7/CraftAnvilInventory.java
new file mode 100644
index 0000000..8c30e5f
--- /dev/null
+++ b/src/main/java/de/greensurvivors/padlock/impl/internal/v21_7/CraftAnvilInventory.java
@@ -0,0 +1,42 @@
+package de.greensurvivors.padlock.impl.internal.v21_7;
+
+import de.greensurvivors.padlock.impl.internal.InputAnvilMenu;
+import net.minecraft.world.Container;
+import org.bukkit.Location;
+import org.bukkit.craftbukkit.inventory.CraftInventoryAnvil;
+import org.bukkit.craftbukkit.inventory.view.CraftAnvilView;
+import org.bukkit.entity.HumanEntity;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.Nullable;
+
+public final class CraftAnvilInventory extends CraftInventoryAnvil implements InputAnvilMenu {
+
+ public CraftAnvilInventory(Location location, Container inventory, Container resultInventory) {
+ super(location, inventory, resultInventory);
+ }
+
+ /**
+ * use {@link #getRenameChars()} instead!
+ *
+ * @return
+ */
+ @Override
+ @Deprecated
+ public String getRenameText() {
+ return super.getRenameText();
+ }
+
+ public char @Nullable [] getRenameChars() {
+ if (!this.getViewers().isEmpty()) { // pretty much syncWithArbitraryViewValue
+ HumanEntity entity = this.getViewers().getFirst();
+ if (entity != null) {
+ InventoryView var4 = entity.getOpenInventory();
+ if (var4 instanceof CraftAnvilView cav && cav.getHandle() instanceof NMSInputAnvilMenu nmsInputAnvilMenu) {
+ return nmsInputAnvilMenu.getLastInput();
+ }
+ }
+ }
+
+ return null;
+ }
+}
diff --git a/src/main/java/de/greensurvivors/padlock/impl/internal/v21_7/NMSInputAnvilMenu.java b/src/main/java/de/greensurvivors/padlock/impl/internal/v21_7/NMSInputAnvilMenu.java
new file mode 100644
index 0000000..15471b5
--- /dev/null
+++ b/src/main/java/de/greensurvivors/padlock/impl/internal/v21_7/NMSInputAnvilMenu.java
@@ -0,0 +1,152 @@
+package de.greensurvivors.padlock.impl.internal.v21_7;
+
+import de.greensurvivors.padlock.impl.internal.NMSAnvilMenu;
+import io.papermc.paper.adventure.PaperAdventure;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.MenuProvider;
+import net.minecraft.world.SimpleMenuProvider;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.inventory.AnvilMenu;
+import net.minecraft.world.inventory.ContainerLevelAccess;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.state.BlockState;
+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
+import org.bukkit.craftbukkit.inventory.view.CraftAnvilView;
+import org.bukkit.inventory.InventoryView;
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Warning: The code in this class is derived from Paper and therefore a legal grey zone.
+ * Even though I changed it wildly, this will remain legally derived from Mojangs code
+ * as well as the legal hell that bukkit/Spigot/paper is.
+ * I don't claim to own anything of this class. Copyright by mojang (Microsoft) and everybody contributed.
+ *
+ * This is a purely virtual inventory ("menu" in mojang terms)
+ * There is no way to link this to a block somewhere in the world.
+ * This is an overwrite of Server behavior to just act as an Input of text.
+ * This will NOT work as a regular anvil! It will NOT call all Events you would expect of a normal anvil (like PrepareResultEvent)
+ * This is purely intentional as we want to keep the user input as much a secret as possible!
+ */
+// I could use more official Server API,
+// but this would still build onto not API code, never could become 100% clean of mojangs code, complicate much code and slow it down.
+// so until this becomes a hassle to update I believe this should be a better option.
+public final class NMSInputAnvilMenu extends AnvilMenu implements NMSAnvilMenu {
+ private static final String BLURRED = "*****";
+ private final @Nullable Component emptyText;
+
+ private CraftAnvilView bukkitAnvilView;
+ private char @Nullable [] lastInput = null;
+
+ public static InventoryView openInputAnvil(final @NotNull org.bukkit.entity.Player player, @NotNull net.kyori.adventure.text.Component title, @Nullable net.kyori.adventure.text.Component emptyText) {
+ net.minecraft.world.entity.player.Player nmsPlayer = ((CraftHumanEntity) player).getHandle();
+ MenuProvider provider = new SimpleMenuProvider((syncId, inventory, player2) -> new NMSInputAnvilMenu(syncId, inventory, ContainerLevelAccess.create(nmsPlayer.level(), nmsPlayer.blockPosition()), emptyText),
+ PaperAdventure.asVanilla(title));
+
+ nmsPlayer.openMenu(provider);
+ nmsPlayer.containerMenu.checkReachable = false;
+ nmsPlayer.containerMenu.getBukkitView();
+
+ return nmsPlayer.containerMenu.getBukkitView();
+ }
+
+ public NMSInputAnvilMenu(int syncId, @NotNull Inventory inventory, @NotNull ContainerLevelAccess context, @Nullable net.kyori.adventure.text.Component emptyText) {
+ super(syncId, inventory, context);
+
+ if (emptyText == null) {
+ this.emptyText = null;
+ } else {
+ this.emptyText = PaperAdventure.asVanilla(emptyText);
+ }
+
+ itemName = BLURRED;
+ }
+
+ @Contract(pure = true)
+ public char @Nullable [] getLastInput() {
+ return lastInput;
+ }
+
+ @Override
+ protected boolean isValidBlock(@NotNull BlockState state) {
+ return true;
+ }
+
+ @Override
+ protected boolean mayPickup(@NotNull Player player, boolean present) {
+ return present;
+ }
+
+ @Override
+ protected void onTake(@NotNull Player player, @NotNull ItemStack stack) {
+ this.inputSlots.setItem(INPUT_SLOT, ItemStack.EMPTY);
+ this.inputSlots.setItem(ADDITIONAL_SLOT, ItemStack.EMPTY);
+ this.resultSlots.setItem(0, ItemStack.EMPTY);
+ }
+
+ @Override
+ public void createResult() {
+ final ItemStack input = this.inputSlots.getItem(INPUT_SLOT);
+
+ if (!input.isEmpty()) { // sanity check
+ ItemStack result;
+
+ if (lastInput != null && lastInput.length > 0) {
+ result = input.copy();
+ result.set(DataComponents.CUSTOM_NAME, Component.literal(BLURRED));
+ } else if (input.has(DataComponents.CUSTOM_NAME)) {
+ result = input.copy();
+ result.remove(DataComponents.CUSTOM_NAME);
+ } else { // todo this should never happen
+ result = ItemStack.EMPTY;
+ }
+
+ this.resultSlots.setItem(INPUT_SLOT, result);
+ this.sendAllDataToRemote(); // CraftBukkit - SPIGOT-6686: Always send completed inventory to stay in sync with client
+ this.broadcastChanges(); // I don't know what's the differenz between these two methods is
+ }
+ }
+
+ @Override
+ public boolean setItemName(final @Nullable String newInput) {
+ if (newInput != null && newInput.length() <= MAX_NAME_LENGTH) {
+ this.lastInput = newInput.toCharArray();
+ // somehow we have to set the cost everytime either createResult() or setItemName() is called, or else the client will see a 0 and will assume a 1.
+ // (derps out)
+ // so in this case we just set it to number of chars to display something usefully
+ this.cost.set(newInput.length());
+
+ ItemStack resultItem = this.resultSlots.getItem(0);
+ if (!resultItem.isEmpty()) {
+ if (newInput.isBlank()) {
+ if (emptyText == null) {
+ resultItem.remove(DataComponents.CUSTOM_NAME);
+ } else {
+ resultItem.set(DataComponents.CUSTOM_NAME, emptyText);
+ }
+ } else {
+ resultItem.set(DataComponents.CUSTOM_NAME, Component.literal(BLURRED));
+ }
+ }
+
+ this.createResult();
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ @Override
+ public @NotNull CraftAnvilView getBukkitView() {
+ if (this.bukkitAnvilView == null) {
+ final CraftAnvilInventory bukkitInv = new CraftAnvilInventory(this.access.getLocation(), this.inputSlots, this.resultSlots);
+ this.bukkitAnvilView = new CraftAnvilView(this.player.getBukkitEntity(), bukkitInv, this);
+ this.bukkitAnvilView.updateFromLegacy(bukkitInv);
+ }
+
+ return this.bukkitAnvilView;
+ }
+}
diff --git a/src/main/java/de/greensurvivors/padlock/impl/signdata/SignPasswords.java b/src/main/java/de/greensurvivors/padlock/impl/signdata/SignPasswords.java
index 73ed189..515eb77 100644
--- a/src/main/java/de/greensurvivors/padlock/impl/signdata/SignPasswords.java
+++ b/src/main/java/de/greensurvivors/padlock/impl/signdata/SignPasswords.java
@@ -12,7 +12,7 @@
import org.bukkit.Location;
import org.bukkit.NamespacedKey;
import org.bukkit.block.Sign;
-import org.bukkit.entity.Player;
+import org.bukkit.entity.HumanEntity;
import org.bukkit.persistence.PersistentDataContainer;
import org.bukkit.persistence.PersistentDataType;
import org.jetbrains.annotations.NotNull;
@@ -208,7 +208,7 @@ public static boolean needsPasswordAccess(@NotNull Sign sign) {
return (hash != null && !hash.isEmpty());
}
- public static void checkPasswordAndGrandAccess(@NotNull Sign sign, @NotNull Player player, char @NotNull [] password) {
+ public static void checkPasswordAndGrandAccess(@NotNull Sign sign, @NotNull HumanEntity player, char @NotNull [] password) {
final String hash = sign.getPersistentDataContainer().get(passwordHashKey, PersistentDataType.STRING);
if (hash != null) {
@@ -244,7 +244,7 @@ public static void removeAccessOfLoc(@NotNull Location location) {
}
}
- public static void setPassword(final @NotNull Sign sign, final @NotNull Player player, final char @Nullable [] newPassword) {
+ public static void setPassword(final @NotNull Sign sign, final @NotNull HumanEntity player, final char @Nullable [] newPassword) {
PersistentDataContainer dataContainer = sign.getPersistentDataContainer();
if (newPassword == null) {
diff --git a/src/main/java/de/greensurvivors/padlock/listener/ChatPlayerListener.java b/src/main/java/de/greensurvivors/padlock/listener/ChatPlayerListener.java
deleted file mode 100644
index e49ec18..0000000
--- a/src/main/java/de/greensurvivors/padlock/listener/ChatPlayerListener.java
+++ /dev/null
@@ -1,201 +0,0 @@
-package de.greensurvivors.padlock.listener;
-
-import de.greensurvivors.padlock.Padlock;
-import de.greensurvivors.padlock.command.ApplyPassword;
-import de.greensurvivors.padlock.command.SetPassword;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.Level;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.core.filter.AbstractFilter;
-import org.apache.logging.log4j.message.Message;
-import org.bukkit.Bukkit;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerCommandPreprocessEvent;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-public final class ChatPlayerListener implements Listener {
- private static final Set setPwCmdStrings = new HashSet<>();
- private static final Set removePwCmdStrings = new HashSet<>(); // the client doesn't set tailing whitespace
- private static final Set applyPwCmdStrings = new HashSet<>();
- private final Padlock plugin;
-
- public ChatPlayerListener(@NotNull Padlock plugin) {
- this.plugin = plugin;
-
- // get all possible combinations of all command aliases with all subcommand aliases
- final Set cmdAliases = new HashSet<>();
- for (Map.Entry> cmdEntry : plugin.getDescription().getCommands().entrySet()) {
- cmdAliases.add(cmdEntry.getKey().toLowerCase(Locale.ENGLISH));
- Object objectAliases = cmdEntry.getValue().get("aliases");
-
- if (Objects.requireNonNull(objectAliases) instanceof String string) {
- cmdAliases.add(string);
- } else if (objectAliases instanceof List list) {
- for (Object listEntry : list) {
- if (listEntry instanceof String string) {
- cmdAliases.add(string);
- } else {
- plugin.getLogger().warning("Couldn't get alias " + listEntry + " as String. Ignoring. Might risk posting passwords to chat tho");
- }
- }
- } else {
- plugin.getLogger().warning("Couldn't get aliases " + objectAliases + ". Ignoring. Might risk posting passwords to chat tho");
- }
- }
- for (String cmdStr : cmdAliases) {
- for (String subCmdStr : SetPassword.getAliasesStatic()) {
- setPwCmdStrings.add(cmdStr + " " + subCmdStr + " ");
- }
- }
- for (String cmdStr : cmdAliases) {
- for (String subCmdStr : SetPassword.getAliasesStatic()) {
- removePwCmdStrings.add(cmdStr + " " + subCmdStr);
- }
- }
- for (String cmdStr : cmdAliases) {
- for (String subCmdStr : ApplyPassword.getAliasesStatic()) {
- applyPwCmdStrings.add(cmdStr + " " + subCmdStr + " ");
- }
- }
- for (String cmdStr : ApplyPassword.getAliasesStatic()) {
- applyPwCmdStrings.add(cmdStr + " ");
- }
-
- // set our custom filter
- ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger()).addFilter(new CmdFilter());
- }
-
- /**
- * We want to be there if possible as the first, so we can cancel the event as fast as possible,
- * if it could contain a password
- */
- @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = false)
- private void onChat(@NotNull PlayerCommandPreprocessEvent event) {
- final String text = event.getMessage();
-
- for (String cmdToCheck : setPwCmdStrings) {
- if (text.regionMatches(true, 1, cmdToCheck, 0, cmdToCheck.length())) {
- // make room so chat event can roll through, we can wait until next circle
- Bukkit.getScheduler().runTask(plugin, () -> {
- final char @Nullable [] newPassword;
-
- if (text.length() > cmdToCheck.length() + 1) {
- newPassword = text.substring(cmdToCheck.length() + 1).toCharArray();
- } else { // should never happen, since the client doesn't send tailing whitespace
- newPassword = null;
- }
-
- SetPassword.onExternalCommand(newPassword, event.getPlayer());
-
- //invalidate char array
- // yes I know I invalidate the arrays at multiple places, but in terms of password safety it's better to be double and tripple safe then sorry.
- if (newPassword != null) {
- Arrays.fill(newPassword, '*');
- }
- });
-
- event.setMessage(text.substring(0, cmdToCheck.length() + 1) + "**********");
- plugin.getLogger().info(event.getPlayer().getName() + " issued sub command: setpassword.");
- return;
- }
- }
-
- for (String cmdToCheck : removePwCmdStrings) {
- if (text.regionMatches(true, 1, cmdToCheck, 0, cmdToCheck.length())) {
- // make room so chat event can roll through, we can wait until next circle
- Bukkit.getScheduler().runTask(plugin, () -> {
- SetPassword.onExternalCommand(null, event.getPlayer());
- });
-
- plugin.getLogger().info(event.getPlayer().getName() + " issued sub command: setpassword to remove a password.");
- return;
- }
- }
-
- for (String cmdToCheck : applyPwCmdStrings) {
- if (text.regionMatches(true, 1, cmdToCheck, 0, cmdToCheck.length())) {
- // make room so chat event can roll through, we can wait until next circle
- Bukkit.getScheduler().runTask(plugin, () -> {
- final char[] password = text.substring(cmdToCheck.length() + 1).toCharArray();
- ApplyPassword.onExternalCommand(password, event.getPlayer());
-
- //invalidate char array
- // yes I know I invalidate the arrays at multiple places, but in terms of password safety it's better to be double and tripple safe then sorry.
- Arrays.fill(password, '*');
- });
-
- event.setMessage(text.substring(0, cmdToCheck.length() + 1) + "**********");
- plugin.getLogger().info(event.getPlayer().getName() + " issued sub command: password.");
- return;
- }
- }
- }
-
- /**
- * This filters the log of the Server to not write any passwords and accidentally keep them in the logs.
- */
- private static class CmdFilter extends AbstractFilter {
- private CmdFilter() {
- }
-
- @Override
- public Result filter(final LogEvent event) {
- return event == null ? Result.NEUTRAL : logResult(event.getMessage().getFormattedMessage());
- }
-
- @Override
- public Result filter(final Logger logger, final Level level, final Marker marker, final Message msg,
- final Throwable t) {
- Result result = t != null ? logResult(t.getMessage()) : Result.NEUTRAL;
- if (msg != null) {
- if (result == Result.DENY) return result;
- return logResult(msg.getFormattedMessage());
- }
- return Result.NEUTRAL;
- }
-
- public Result filter(final Logger logger, final Level level, final Marker marker, final Object msg,
- final Throwable t) {
- Result result = t != null ? logResult(t.getMessage()) : Result.NEUTRAL;
- if (msg != null) {
- if (result == Result.DENY) return result;
- return logResult(msg.toString());
- }
- return Result.NEUTRAL;
- }
-
- public Result filter(final Logger logger, final Level level, final Marker marker, final String msg,
- final Object... params) {
- return logResult(msg);
- }
-
-
- public Result logResult(String text) {
- for (String cmdToCheck : setPwCmdStrings) {
- int index = StringUtils.indexOfIgnoreCase(text, cmdToCheck);
-
- if (index > 0) {
- return Result.DENY;
- }
- }
-
- for (String cmdToCheck : applyPwCmdStrings) {
- int index = StringUtils.indexOfIgnoreCase(text, cmdToCheck);
-
- if (index > 0) {
- return Result.DENY;
- }
- }
-
- return Result.NEUTRAL;
- }
- }
-}
diff --git a/src/main/resources/lang.properties b/src/main/resources/lang.properties
index 865c623..8dc54d4 100644
--- a/src/main/resources/lang.properties
+++ b/src/main/resources/lang.properties
@@ -41,6 +41,11 @@ cmd.info.owners=owners:
cmd.info.timer=timer:
cmd.not-a-subcommand=The argument "" you provided is not a subcommand.
cmd.password.access-granted=Access granted.
+cmd.password.default=Ch4nge this!
+cmd.password.error.empty=Passwords can't be empty! If no password was set you don't need to use /applypassword
+cmd.password.gui-title.apply=Input password
+cmd.password.gui-title.set=Set new password (empty = remove)
+cmd.password.gui.remove=Remove password!
cmd.password.on-cooldown=You are still on Cooldown. Are you waiting for a cmd or did you mistype your password often?
cmd.password.safety-warning=Warning: never use a password, you are using anywhere else! While I did everything I could for your safety, there ARE ways your password could get leaked!
cmd.password.start-processing=Processing a password may take a while, please stand by!
diff --git a/src/main/resources/lang_de.properties b/src/main/resources/lang_de.properties
index 151596b..e2eaf33 100644
--- a/src/main/resources/lang_de.properties
+++ b/src/main/resources/lang_de.properties
@@ -41,6 +41,10 @@ cmd.info.owners=Besitzer:
cmd.info.timer=Timer:
cmd.not-a-subcommand=Das Argument "" ist kein Subcommand.
cmd.password.access-granted=Zugriff gewährt.
+cmd.password.error.empty=Passwörter können nicht leer sein! Wenn kein Passwort gesetzt ist, ist /applypassword nicht nötig.
+cmd.password.gui-title.apply=Passwort eingeben!
+cmd.password.gui-title.set=Neues Passwort eingeben! (leer = kein Pw)
+cmd.password.gui.remove=Password entfernen!
cmd.password.safety-warning=Warnung: Nutze NIEMALS ein Passwort, was du auch woanders verwendest! Während ich alles in meinen Wissen daran setze deine Sicherheit sicher zu stellen, KANN es vorkommen, dass dieses Password geleakt wird!
cmd.password.start-processing=Bitte warte einen Moment, bis das Passwort verarbeitet wurde.
cmd.password.wrong-password=Falsches Passwort. Bitte versuche es erneut!
diff --git a/src/main/resources/lang_en.properties b/src/main/resources/lang_en.properties
index 81bbf71..ed3db70 100644
--- a/src/main/resources/lang_en.properties
+++ b/src/main/resources/lang_en.properties
@@ -40,6 +40,10 @@ cmd.info.owners=owners:
cmd.info.timer=timer:
cmd.not-a-subcommand=The argument "" you provided is not a subcommand.
cmd.password.access-granted=Access granted.
+cmd.password.error.empty=Passwords can't be empty! If no password was set you don't need to use /applypassword
+cmd.password.gui-title.apply=Input password
+cmd.password.gui-title.set=Set new password (empty = remove)
+cmd.password.gui.remove=Remove password!
cmd.password.safety-warning=Warning: never use a password, you are using anywhere else! While I did everything I could for your safety, there ARE ways your password could get leaked!
cmd.password.start-processing=Processing a password may take a while, please stand by!
cmd.password.wrong-password=You submitted the wrong password. Please try again!