packs = ProtocolUtils.newList(packCount);
for (int i = 0; i < packCount; i++) {
- packs[i] = KnownPack.read(buf);
+ packs.add(KnownPack.read(buf));
}
this.packs = packs;
@@ -52,7 +53,7 @@ public class KnownPacksPacket implements MinecraftPacket {
@Override
public void encode(ByteBuf buf, ProtocolUtils.Direction direction,
ProtocolVersion protocolVersion) {
- ProtocolUtils.writeVarInt(buf, packs.length);
+ ProtocolUtils.writeVarInt(buf, packs.size());
for (KnownPack pack : packs) {
pack.write(buf);
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/GenericTitlePacket.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/GenericTitlePacket.java
index d6f5e0e5..8641173e 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/GenericTitlePacket.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/GenericTitlePacket.java
@@ -105,26 +105,14 @@ public abstract class GenericTitlePacket implements MinecraftPacket {
public static GenericTitlePacket constructTitlePacket(ActionType type, ProtocolVersion version) {
GenericTitlePacket packet = null;
if (version.noLessThan(ProtocolVersion.MINECRAFT_1_17)) {
- switch (type) {
- case SET_ACTION_BAR:
- packet = new TitleActionbarPacket();
- break;
- case SET_SUBTITLE:
- packet = new TitleSubtitlePacket();
- break;
- case SET_TIMES:
- packet = new TitleTimesPacket();
- break;
- case SET_TITLE:
- packet = new TitleTextPacket();
- break;
- case HIDE:
- case RESET:
- packet = new TitleClearPacket();
- break;
- default:
- throw new IllegalArgumentException("Invalid ActionType");
- }
+ packet = switch (type) {
+ case SET_ACTION_BAR -> new TitleActionbarPacket();
+ case SET_SUBTITLE -> new TitleSubtitlePacket();
+ case SET_TIMES -> new TitleTimesPacket();
+ case SET_TITLE -> new TitleTextPacket();
+ case HIDE, RESET -> new TitleClearPacket();
+ default -> throw new IllegalArgumentException("Invalid ActionType");
+ };
} else {
packet = new LegacyTitlePacket();
}
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/LegacyTitlePacket.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/LegacyTitlePacket.java
index 0425f2d3..ebae8a9e 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/LegacyTitlePacket.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/packet/title/LegacyTitlePacket.java
@@ -40,24 +40,19 @@ public class LegacyTitlePacket extends GenericTitlePacket {
ProtocolUtils.writeVarInt(buf, getAction().getAction(version));
switch (getAction()) {
- case SET_TITLE:
- case SET_SUBTITLE:
- case SET_ACTION_BAR:
+ case SET_TITLE, SET_SUBTITLE, SET_ACTION_BAR -> {
if (component == null) {
throw new IllegalStateException("No component found for " + getAction());
}
component.write(buf);
- break;
- case SET_TIMES:
+ }
+ case SET_TIMES -> {
buf.writeInt(fadeIn);
buf.writeInt(stay);
buf.writeInt(fadeOut);
- break;
- case HIDE:
- case RESET:
- break;
- default:
- throw new UnsupportedOperationException("Unknown action " + getAction());
+ }
+ case HIDE, RESET -> {}
+ default -> throw new UnsupportedOperationException("Unknown action " + getAction());
}
}
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java b/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java
index 1936eb3f..298e74d4 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/protocol/util/PluginMessageUtil.java
@@ -230,23 +230,20 @@ public final class PluginMessageUtil {
}
// Before falling into the fallback, explicitly rewrite certain messages.
- switch (name) {
- case REGISTER_CHANNEL_LEGACY:
- return REGISTER_CHANNEL;
- case UNREGISTER_CHANNEL_LEGACY:
- return UNREGISTER_CHANNEL;
- case BRAND_CHANNEL_LEGACY:
- return BRAND_CHANNEL;
- case "BungeeCord":
- // This is a special historical case we are compelled to support for the benefit of
- // BungeeQuack.
- return "bungeecord:main";
- default:
+ return switch (name) {
+ case REGISTER_CHANNEL_LEGACY -> REGISTER_CHANNEL;
+ case UNREGISTER_CHANNEL_LEGACY -> UNREGISTER_CHANNEL;
+ case BRAND_CHANNEL_LEGACY -> BRAND_CHANNEL;
+ // This is a special historical case we are compelled to support for the benefit of
+ // BungeeQuack.
+ case "BungeeCord" -> "bungeecord:main";
+ default -> {
// This is very likely a legacy name, so transform it. Velocity uses the same scheme as
// BungeeCord does to transform channels, but also removes clearly invalid characters as
// well.
- String lower = name.toLowerCase(Locale.ROOT);
- return "legacy:" + INVALID_IDENTIFIER_REGEX.matcher(lower).replaceAll("");
- }
+ final String lower = name.toLowerCase(Locale.ROOT);
+ yield "legacy:" + INVALID_IDENTIFIER_REGEX.matcher(lower).replaceAll("");
+ }
+ };
}
}
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/scheduler/ExecutorSchedulerBackend.java b/proxy/src/main/java/com/velocitypowered/proxy/scheduler/ExecutorSchedulerBackend.java
new file mode 100644
index 00000000..d10eab6f
--- /dev/null
+++ b/proxy/src/main/java/com/velocitypowered/proxy/scheduler/ExecutorSchedulerBackend.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2018-2026 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.velocitypowered.proxy.scheduler;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * A {@link SchedulerBackend} backed by a real {@link ScheduledExecutorService}.
+ */
+public class ExecutorSchedulerBackend implements SchedulerBackend {
+
+ private final ScheduledExecutorService executor;
+
+ /**
+ * Creates a ExecutorSchedulerBackend with a default executor.
+ */
+ public ExecutorSchedulerBackend() {
+ this(Executors.newSingleThreadScheduledExecutor(
+ new ThreadFactoryBuilder()
+ .setDaemon(true)
+ .setNameFormat("Velocity Task Scheduler Timer")
+ .build()
+ ));
+ }
+
+ /**
+ * Creates a ExecutorSchedulerBackend with a given executor.
+ *
+ * @param executor The executor to use.
+ */
+ public ExecutorSchedulerBackend(ScheduledExecutorService executor) {
+ this.executor = checkNotNull(executor, "executor");
+ }
+
+ @Override
+ public ScheduledFuture schedule(Runnable task, long delay, TimeUnit unit) {
+ return executor.schedule(task, delay, unit);
+ }
+
+ @Override
+ public ScheduledFuture scheduleAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit) {
+ return executor.scheduleAtFixedRate(task, initialDelay, period, unit);
+ }
+
+ @Override
+ public void shutdown() {
+ executor.shutdown();
+ }
+}
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/scheduler/SchedulerBackend.java b/proxy/src/main/java/com/velocitypowered/proxy/scheduler/SchedulerBackend.java
new file mode 100644
index 00000000..ab251ca2
--- /dev/null
+++ b/proxy/src/main/java/com/velocitypowered/proxy/scheduler/SchedulerBackend.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2018-2026 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.velocitypowered.proxy.scheduler;
+
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Backend interface used by {@link VelocityScheduler} to schedule timer callbacks.
+ *
+ * This is an internal abstraction that allows tests to replace the real-time scheduler
+ * with a deterministic implementation.
+ */
+interface SchedulerBackend {
+
+ /**
+ * Schedules a task to run once after the given delay.
+ *
+ * @param task the task to run
+ * @param delay the delay
+ * @param unit the delay unit
+ * @return a future representing the scheduled task
+ */
+ ScheduledFuture schedule(Runnable task, long delay, TimeUnit unit);
+
+ /**
+ * Schedules a task to run at a fixed rate.
+ *
+ * @param task the task to run
+ * @param initialDelay the initial delay
+ * @param period the period between runs
+ * @param unit the time unit
+ * @return a future representing the scheduled task
+ */
+ ScheduledFuture scheduleAtFixedRate(Runnable task, long initialDelay, long period, TimeUnit unit);
+
+ /**
+ * Shuts down the backend.
+ */
+ void shutdown();
+}
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/scheduler/VelocityScheduler.java b/proxy/src/main/java/com/velocitypowered/proxy/scheduler/VelocityScheduler.java
index 727832bd..0a38582a 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/scheduler/VelocityScheduler.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/scheduler/VelocityScheduler.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018-2023 Velocity Contributors
+ * Copyright (C) 2018-2026 Velocity Contributors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.velocitypowered.api.plugin.PluginContainer;
import com.velocitypowered.api.plugin.PluginManager;
import com.velocitypowered.api.scheduler.ScheduledTask;
@@ -40,7 +39,6 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
@@ -60,20 +58,23 @@ import org.jetbrains.annotations.VisibleForTesting;
public class VelocityScheduler implements Scheduler {
private final PluginManager pluginManager;
- private final ScheduledExecutorService timerExecutionService;
+ private final SchedulerBackend backend;
private final Multimap tasksByPlugin = Multimaps.synchronizedMultimap(
Multimaps.newSetMultimap(new IdentityHashMap<>(), HashSet::new));
/**
- * Initalizes the scheduler.
+ * Initializes the scheduler.
*
* @param pluginManager the Velocity plugin manager
*/
public VelocityScheduler(PluginManager pluginManager) {
+ this(pluginManager, new ExecutorSchedulerBackend());
+ }
+
+ @VisibleForTesting
+ VelocityScheduler(PluginManager pluginManager, SchedulerBackend backend) {
this.pluginManager = pluginManager;
- this.timerExecutionService = Executors
- .newSingleThreadScheduledExecutor(new ThreadFactoryBuilder().setDaemon(true)
- .setNameFormat("Velocity Task Scheduler Timer").build());
+ this.backend = backend;
}
@Override
@@ -118,7 +119,7 @@ public class VelocityScheduler implements Scheduler {
for (ScheduledTask task : terminating) {
task.cancel();
}
- timerExecutionService.shutdown();
+ backend.shutdown();
final List plugins = new ArrayList<>(this.pluginManager.getPlugins());
final Iterator pluginIterator = plugins.iterator();
while (pluginIterator.hasNext()) {
@@ -232,10 +233,9 @@ public class VelocityScheduler implements Scheduler {
void schedule() {
if (repeat == 0) {
- this.future = timerExecutionService.schedule(this, delay, TimeUnit.MILLISECONDS);
+ this.future = backend.schedule(this, delay, TimeUnit.MILLISECONDS);
} else {
- this.future = timerExecutionService
- .scheduleAtFixedRate(this, delay, repeat, TimeUnit.MILLISECONDS);
+ this.future = backend.scheduleAtFixedRate(this, delay, repeat, TimeUnit.MILLISECONDS);
}
}
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabListLegacy.java b/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabListLegacy.java
index a49d24de..037ab262 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabListLegacy.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/tablist/VelocityTabListLegacy.java
@@ -85,7 +85,7 @@ public class VelocityTabListLegacy extends KeyedVelocityTabList {
@Override
public void processLegacy(LegacyPlayerListItemPacket packet) {
- Item item = packet.getItems().get(0); // Only one item per packet in 1.7
+ Item item = packet.getItems().getFirst(); // Only one item per packet in 1.7
switch (packet.getAction()) {
case LegacyPlayerListItemPacket.ADD_PLAYER:
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java b/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java
index d8cdb7c3..59aae3e4 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/util/InformationUtils.java
@@ -145,45 +145,44 @@ public enum InformationUtils {
* @return {@link String} address with public parts redacted
*/
public static String anonymizeInetAddress(InetAddress address) {
- if (address instanceof Inet4Address) {
- Inet4Address v4 = (Inet4Address) address;
- if (v4.isAnyLocalAddress() || v4.isLoopbackAddress()
- || v4.isLinkLocalAddress()
- || v4.isSiteLocalAddress()) {
- return address.getHostAddress();
- } else {
- byte[] addr = v4.getAddress();
- return (addr[0] & 0xff) + "." + (addr[1] & 0xff) + ".XXX.XXX";
- }
- } else if (address instanceof Inet6Address) {
- Inet6Address v6 = (Inet6Address) address;
- if (v6.isAnyLocalAddress() || v6.isLoopbackAddress()
- || v6.isSiteLocalAddress()
- || v6.isSiteLocalAddress()) {
- return address.getHostAddress();
- } else {
- String[] bits = v6.getHostAddress().split(":");
- String ret = "";
- boolean flag = false;
- for (int iter = 0; iter < bits.length; iter++) {
- if (flag) {
- ret += ":X";
- continue;
- }
- if (!bits[iter].equals("0")) {
- if (iter == 0) {
- ret = bits[iter];
- } else {
- ret = "::" + bits[iter];
- }
- flag = true;
- }
+ return switch (address) {
+ case Inet4Address v4 -> {
+ if (v4.isAnyLocalAddress() || v4.isLoopbackAddress()
+ || v4.isLinkLocalAddress()
+ || v4.isSiteLocalAddress()) {
+ yield address.getHostAddress();
+ } else {
+ byte[] addr = v4.getAddress();
+ yield (addr[0] & 0xff) + "." + (addr[1] & 0xff) + ".XXX.XXX";
+ }
+ } case Inet6Address v6 -> {
+ if (v6.isAnyLocalAddress() || v6.isLoopbackAddress()
+ || v6.isSiteLocalAddress()
+ || v6.isSiteLocalAddress()) {
+ yield address.getHostAddress();
+ } else {
+ String[] bits = v6.getHostAddress().split(":");
+ String ret = "";
+ boolean flag = false;
+ for (int iter = 0; iter < bits.length; iter++) {
+ if (flag) {
+ ret += ":X";
+ continue;
+ }
+ if (!bits[iter].equals("0")) {
+ if (iter == 0) {
+ ret = bits[iter];
+ } else {
+ ret = "::" + bits[iter];
+ }
+ flag = true;
+ }
+ }
+ yield ret;
}
- return ret;
}
- } else {
- return address.getHostAddress();
- }
+ default -> address.getHostAddress();
+ };
}
/**
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/IntervalledCounter.java b/proxy/src/main/java/com/velocitypowered/proxy/util/IntervalledCounter.java
new file mode 100644
index 00000000..9b986dca
--- /dev/null
+++ b/proxy/src/main/java/com/velocitypowered/proxy/util/IntervalledCounter.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2025 Velocity Contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.velocitypowered.proxy.util;
+
+/**
+ * IntervalledCounter maintains a rolling sum of values associated with timestamps, keeping
+ * only those entries that fall within a fixed time interval from the most recent timestamp.
+ *
+ * Time values must be provided in the same unit as {@link System#nanoTime()} (nanoseconds),
+ * and the configured interval is also expressed in nanoseconds. Callers are expected to
+ * periodically advance the counter to the current time using {@link #updateCurrentTime()} or
+ * {@link #updateCurrentTime(long)} to evict expired entries before adding new ones via
+ * {@link #addTime(long)} or {@link #addTime(long, long)}.
+ *
+ * This class is not thread-safe. If multiple threads access an instance concurrently,
+ * external synchronization is required.
+ */
+@SuppressWarnings("checkstyle:WhitespaceAfter") // Not our class
+public final class IntervalledCounter {
+
+ private static final int INITIAL_SIZE = 8;
+
+ /**
+ * Ring buffer holding the timestamp (in nanoseconds) for each data point.
+ */
+ protected long[] times;
+ /**
+ * Ring buffer holding the count associated with each timestamp.
+ */
+ protected long[] counts;
+ /**
+ * The sliding window size in nanoseconds. Only entries with time >= (currentTime - interval)
+ * are considered part of the window.
+ */
+ protected final long interval;
+ /**
+ * Cached lower bound of the window (in nanoseconds) after the last update.
+ */
+ protected long minTime;
+ /**
+ * Running sum of all counts currently within the window.
+ */
+ protected long sum;
+ /**
+ * Head index (inclusive) of the ring buffer.
+ */
+ protected int head; // inclusive
+ /**
+ * Tail index (exclusive) of the ring buffer.
+ */
+ protected int tail; // exclusive
+
+ /**
+ * Creates a new counter with the specified interval.
+ *
+ * @param interval the window size in nanoseconds (compatible with {@link System#nanoTime()})
+ */
+ public IntervalledCounter(final long interval) {
+ this.times = new long[INITIAL_SIZE];
+ this.counts = new long[INITIAL_SIZE];
+ this.interval = interval;
+ }
+
+ /**
+ * Advances the window to the current time using {@link System#nanoTime()}, evicting any
+ * data points that have fallen outside of the interval and updating the running sum.
+ */
+ public void updateCurrentTime() {
+ this.updateCurrentTime(System.nanoTime());
+ }
+
+ /**
+ * Advances the window to the provided time, evicting any data points older than
+ * {@code currentTime - interval} and updating the running sum.
+ *
+ * @param currentTime the current time in nanoseconds (as from {@link System#nanoTime()})
+ */
+ public void updateCurrentTime(final long currentTime) {
+ long sum = this.sum;
+ int head = this.head;
+ final int tail = this.tail;
+ final long minTime = currentTime - this.interval;
+
+ final int arrayLen = this.times.length;
+
+ // guard against overflow by using subtraction
+ while (head != tail && this.times[head] - minTime < 0) {
+ sum -= this.counts[head];
+ // there are two ways we can do this:
+ // 1. free the count when adding
+ // 2. free it now
+ // option #2
+ this.counts[head] = 0;
+ if (++head >= arrayLen) {
+ head = 0;
+ }
+ }
+
+ this.sum = sum;
+ this.head = head;
+ this.minTime = minTime;
+ }
+
+ /**
+ * Adds a single unit at the specified timestamp, assuming the timestamp is within the current
+ * window. If the timestamp is older than the current window lower bound, the value is ignored.
+ * This method does not automatically advance the window; callers should invoke
+ * {@link #updateCurrentTime()} or {@link #updateCurrentTime(long)} beforehand.
+ *
+ * @param currTime the timestamp in nanoseconds
+ */
+ public void addTime(final long currTime) {
+ this.addTime(currTime, 1L);
+ }
+
+ /**
+ * Adds {@code count} units at the specified timestamp, assuming the timestamp is within the
+ * current window. If the timestamp is older than {@code minTime}, the value is ignored.
+ * This method does not automatically advance the window; callers should invoke
+ * {@link #updateCurrentTime()} or {@link #updateCurrentTime(long)} beforehand.
+ *
+ * @param currTime the timestamp in nanoseconds
+ * @param count the amount to add (non-negative)
+ */
+ public void addTime(final long currTime, final long count) {
+ // guard against overflow by using subtraction
+ if (currTime - this.minTime < 0) {
+ return;
+ }
+ int nextTail = (this.tail + 1) % this.times.length;
+ if (nextTail == this.head) {
+ this.resize();
+ nextTail = (this.tail + 1) % this.times.length;
+ }
+
+ this.times[this.tail] = currTime;
+ this.counts[this.tail] += count;
+ this.sum += count;
+ this.tail = nextTail;
+ }
+
+ /**
+ * Convenience method that advances the window to the current time and then adds {@code count}
+ * units at that time.
+ *
+ * @param count the amount to add (non-negative)
+ */
+ public void updateAndAdd(final long count) {
+ final long currTime = System.nanoTime();
+ this.updateCurrentTime(currTime);
+ this.addTime(currTime, count);
+ }
+
+ /**
+ * Convenience method that advances the window to {@code currTime} and then adds {@code count}
+ * units at that time.
+ *
+ * @param count the amount to add (non-negative)
+ * @param currTime the timestamp in nanoseconds
+ */
+ public void updateAndAdd(final long count, final long currTime) {
+ this.updateCurrentTime(currTime);
+ this.addTime(currTime, count);
+ }
+
+ /**
+ * Doubles the capacity of the internal ring buffers, preserving the order of existing data.
+ */
+ private void resize() {
+ final long[] oldElements = this.times;
+ final long[] oldCounts = this.counts;
+ final long[] newElements = new long[this.times.length * 2];
+ final long[] newCounts = new long[this.times.length * 2];
+ this.times = newElements;
+ this.counts = newCounts;
+
+ final int head = this.head;
+ final int tail = this.tail;
+ final int size = tail >= head ? (tail - head) : (tail + (oldElements.length - head));
+ this.head = 0;
+ this.tail = size;
+
+ if (tail >= head) {
+ // sequentially ordered from [head, tail)
+ System.arraycopy(oldElements, head, newElements, 0, size);
+ System.arraycopy(oldCounts, head, newCounts, 0, size);
+ } else {
+ // ordered from [head, length)
+ // then followed by [0, tail)
+
+ System.arraycopy(oldElements, head, newElements, 0, oldElements.length - head);
+ System.arraycopy(oldElements, 0, newElements, oldElements.length - head, tail);
+
+ System.arraycopy(oldCounts, head, newCounts, 0, oldCounts.length - head);
+ System.arraycopy(oldCounts, 0, newCounts, oldCounts.length - head, tail);
+ }
+ }
+
+ /**
+ * Returns the current rate in units per second based on the rolling sum and the configured
+ * interval. Specifically: {@code sum / (intervalSeconds)} where {@code intervalSeconds}
+ * equals {@code interval / 1e9}.
+ *
+ * @return the rate in units per second for the current window
+ */
+ public double getRate() {
+ return (double)this.sum / ((double)this.interval * 1.0E-9);
+ }
+
+ /**
+ * Returns the configured interval size in nanoseconds.
+ *
+ * @return the interval size in nanoseconds
+ */
+ public long getInterval() {
+ return this.interval;
+ }
+
+ /**
+ * Returns the rolling sum of all counts currently within the window.
+ *
+ * @return the rolling sum
+ */
+ public long getSum() {
+ return this.sum;
+ }
+
+ /**
+ * Returns the number of data points currently stored in the internal ring buffer. This may be
+ * less than or equal to the number of points added since older entries may have been evicted.
+ *
+ * @return the number of stored data points
+ */
+ public int totalDataPoints() {
+ return this.tail >= this.head ? (this.tail - this.head) : (this.tail + (this.counts.length - this.head));
+ }
+}
diff --git a/proxy/log4j2-plugin/src/main/java/com/velocitypowered/proxy/util/StripAnsiConverter.java b/proxy/src/main/java/com/velocitypowered/proxy/util/StripAnsiConverter.java
similarity index 100%
rename from proxy/log4j2-plugin/src/main/java/com/velocitypowered/proxy/util/StripAnsiConverter.java
rename to proxy/src/main/java/com/velocitypowered/proxy/util/StripAnsiConverter.java
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/util/TranslatableMapper.java b/proxy/src/main/java/com/velocitypowered/proxy/util/TranslatableMapper.java
index 6f30d3d1..20ab4329 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/util/TranslatableMapper.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/util/TranslatableMapper.java
@@ -43,6 +43,12 @@ public enum TranslatableMapper implements BiConsumer:
+velocity.error.connecting-server-error=Unable to connect you to . Please try again later.
+velocity.error.connected-server-error=Your connection to encountered a problem.
velocity.error.internal-server-connection-error=An internal server connection error occurred.
velocity.error.logging-in-too-fast=You are logging in too fast, try again later.
velocity.error.online-mode-only=You are not logged into your Minecraft account. If you are logged into your Minecraft account, try restarting your Minecraft client.
velocity.error.player-connection-error=An internal error occurred in your connection.
velocity.error.modern-forwarding-needs-new-client=This server is only compatible with Minecraft 1.13 and above.
velocity.error.modern-forwarding-failed=Your server did not send a forwarding request to the proxy. Make sure the server is configured for Velocity forwarding.
-velocity.error.moved-to-new-server=You were kicked from {0}: {1}
+velocity.error.moved-to-new-server=You were kicked from :
velocity.error.no-available-servers=There are no available servers to connect you to. Try again later or contact an admin.
velocity.error.illegal-chat-characters=Illegal characters in chat
# Commands
velocity.command.generic-error=An error occurred while running this command.
velocity.command.command-does-not-exist=This command does not exist.
velocity.command.players-only=Only players can run this command.
-velocity.command.server-does-not-exist=The specified server {0} does not exist.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=You are currently connected to {0}.
+velocity.command.server-does-not-exist=The specified server does not exist.
+velocity.command.player-not-found=The specified player does not exist.
+velocity.command.server-current-server=You are currently connected to .
velocity.command.server-too-many=There are too many servers set up. Use tab completion to view all servers available.
velocity.command.server-available=Available servers:
-velocity.command.server-tooltip-player-online={0} player online
-velocity.command.server-tooltip-players-online={0} players online
+velocity.command.server-tooltip-player-online= player online
+velocity.command.server-tooltip-players-online= players online
velocity.command.server-tooltip-current-server=Currently connected to this server
velocity.command.server-tooltip-offer-connect-server=Click to connect to this server
-velocity.command.glist-player-singular={0} player is currently connected to the proxy.
-velocity.command.glist-player-plural={0} players are currently connected to the proxy.
+velocity.command.glist-player-singular= player is currently connected to the proxy.
+velocity.command.glist-player-plural= players are currently connected to the proxy.
velocity.command.glist-view-all=To view all players on servers, use /glist all.
velocity.command.reload-success=Velocity configuration successfully reloaded.
velocity.command.reload-failure=Unable to reload your Velocity configuration. Check the console for more details.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} is licensed under the terms of the GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018- . is licensed under the terms of the GNU General Public License v3.
velocity.command.no-plugins=There are no plugins currently installed.
-velocity.command.plugins-list=Plugins: {0}
-velocity.command.plugin-tooltip-website=Website: {0}
-velocity.command.plugin-tooltip-author=Author: {0}
-velocity.command.plugin-tooltip-authors=Authors: {0}
+velocity.command.plugins-list=Plugins:
+velocity.command.plugin-tooltip-website=Website:
+velocity.command.plugin-tooltip-author=Author:
+velocity.command.plugin-tooltip-authors=Authors:
velocity.command.dump-uploading=Uploading gathered information...
velocity.command.dump-send-error=An error occurred while communicating with the Velocity servers. The servers may be temporarily unavailable or there is an issue with your network settings. You can find more information in the log or console of your Velocity server.
velocity.command.dump-success=Created an anonymised report containing useful information about this proxy. If a developer requested it, you may share the following link with them:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_ar_SA.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_ar_SA.properties
index 8f79f570..c93bbb46 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_ar_SA.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_ar_SA.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=أنت بالفعل متصل بهذا السيرفر\!
velocity.error.already-connected-proxy=أنت بالفعل متصل بهذا الوكيل\!
velocity.error.already-connecting=أنت بالفعل تحاول الاتصال بأحد السيرفرات\!
-velocity.error.cant-connect=فشل الاتصال بـ{0}\: {1}
-velocity.error.connecting-server-error=فشل الاتصال بـ{0}، حاول في وقتٍ لاحق.
-velocity.error.connected-server-error=واجه اتصالك بـ{0} مشكلة.
+velocity.error.cant-connect=فشل الاتصال بـ\:
+velocity.error.connecting-server-error=فشل الاتصال بـ، حاول في وقتٍ لاحق.
+velocity.error.connected-server-error=واجه اتصالك بـ مشكلة.
velocity.error.internal-server-connection-error=حدث خطأ في الاتصال بالسيرفر الداخلي.
velocity.error.logging-in-too-fast=لقد حاولت تسجيل الدخول كثيرًا مؤخرًا، حاول في وقتٍ لاحق.
velocity.error.online-mode-only=لم تقم بتسجيل الدخول بحساب ماينكرافت. إذا كنت مسجل بالفعل جرب إعادة تشغيل اللعبة.
velocity.error.player-connection-error=حدث خطأ داخلي في الاتصال الخاص بك.
velocity.error.modern-forwarding-needs-new-client=هذا السيرفر متوافق فقط مع ماينكرافت 1.13 و ما فوق.
velocity.error.modern-forwarding-failed=السيرفر الخاص بك لم يرسل طلب إعادة توجيه إلى الوكيل. تأكد من إعداد الخادم لإعادة التوجيه بـVelocity.
-velocity.error.moved-to-new-server=لقد تم طردك من {0}\: {1}
+velocity.error.moved-to-new-server=لقد تم طردك من \:
velocity.error.no-available-servers=لا توجد سيرفرات متاحة للاتصال. حاول مرة أخرى أو اتصل بالأدمِن.
velocity.error.illegal-chat-characters=Illegal characters in chat
# Commands
velocity.command.generic-error=حدث خطأ أثناء تنفيذ هذا الأمر.
velocity.command.command-does-not-exist=هذا الأمر غير موجود.
velocity.command.players-only=يمكن للاعبين فقط تشغيل هذا الأمر.
-velocity.command.server-does-not-exist=السيرفر المطلوب {0} غير موجود.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=أنت الآن متصل بـ{0}
+velocity.command.server-does-not-exist=السيرفر المطلوب غير موجود.
+velocity.command.player-not-found=The specified player does not exist.
+velocity.command.server-current-server=أنت الآن متصل بـ
velocity.command.server-too-many=هناك العديد من السيرفرات المتاحة، استخدم البحث بزر tab لتصفح قائمة السيرفرات.
velocity.command.server-available=السيرفرات المتاحة\:
velocity.command.server-tooltip-player-online=لاعب واحد متصل
-velocity.command.server-tooltip-players-online={0} لاعبين متصلون
+velocity.command.server-tooltip-players-online= لاعبين متصلون
velocity.command.server-tooltip-current-server=انت متصل حاليًا بهذا السيرفر
velocity.command.server-tooltip-offer-connect-server=انقر للاتصال بهذا السيرفر
velocity.command.glist-player-singular=هناك لاعب واحد متصل بالوكيل.
-velocity.command.glist-player-plural=هناك {0} لاعبين متصلون بالوكيل.
+velocity.command.glist-player-plural=هناك لاعبين متصلون بالوكيل.
velocity.command.glist-view-all=لعرض اللاعبين على جميع السيرفرات استخدم /glist all
velocity.command.reload-success=تم إعادة تحميل إعدادات Velocity بنجاح.
velocity.command.reload-failure=فشلت إعادة تحميل إعدادات Velocity. تفقد الـconsole للمزيد من التفاصيل.
-velocity.command.version-copyright=حقوق الطبع والنشر 2018-{2} {0}. {1} مرخصة بموجب شروط الإصدار الثالث لرخصة GNU العامة (GPLv3).
+velocity.command.version-copyright=حقوق الطبع والنشر 2018- . مرخصة بموجب شروط الإصدار الثالث لرخصة GNU العامة (GPLv3).
velocity.command.no-plugins=لا توجد إضافات مثبتة على Velocity.
-velocity.command.plugins-list=الإضافات\: {0}
-velocity.command.plugin-tooltip-website=موقعها\: {0}
-velocity.command.plugin-tooltip-author=تصميم\: {0}
-velocity.command.plugin-tooltip-authors=تصميم\: {0}
+velocity.command.plugins-list=الإضافات\:
+velocity.command.plugin-tooltip-website=موقعها\:
+velocity.command.plugin-tooltip-author=تصميم\:
+velocity.command.plugin-tooltip-authors=تصميم\:
velocity.command.dump-uploading=جاري تجميع و رفع معلومات نظامك...
velocity.command.dump-send-error=حدث خطأ أثناء الاتصال بسيرفر Velocity. قد يكون السيرفر غير متاح مؤقتاً أو هناك مشكلة في إعدادات الشبكة الخاصة بك. يمكنك العثور على مزيد من المعلومات في log أو console وكيل Velocity الخاص بك.
velocity.command.dump-success=تم إنشاء تقرير مفصل يحتوي على معلومات مفيدة عن الوكيل الخاص بك. إذا طلبه المطور، يمكنك مشاركة الرابط التالي معه\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_bg_BG.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_bg_BG.properties
index c554fa3d..792065f2 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_bg_BG.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_bg_BG.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=Вече сте свързани към този сървър\!
velocity.error.already-connected-proxy=Вече сте свързани към това прокси\!
velocity.error.already-connecting=Вече се опитвате да се свържете към сървър\!
-velocity.error.cant-connect=Не успяхме да Ви свържем към {0}\: {1}
-velocity.error.connecting-server-error=Не успяхме да Ви свържем към {0}. Моля, опитайте по-късно.
-velocity.error.connected-server-error=Възникна грешка, докато бяхте свързан към {0}.
+velocity.error.cant-connect=Не успяхме да Ви свържем към \:
+velocity.error.connecting-server-error=Не успяхме да Ви свържем към . Моля, опитайте по-късно.
+velocity.error.connected-server-error=Възникна грешка, докато бяхте свързан към .
velocity.error.internal-server-connection-error=Възникна вътрешна грешка със сървърната връзка.
velocity.error.logging-in-too-fast=Опитвате се да влизате твърде бързо - моля, опитайте по-късно.
velocity.error.online-mode-only=Не сте влезли в своя Minecraft акаунт. Ако вече сте го направили, опитайте да рестартирате играта и лаунчера и опитайте отново.
velocity.error.player-connection-error=Възникна грешка с вашата връзка.
velocity.error.modern-forwarding-needs-new-client=Този сървър е съвместим само с Minecraft 1.13 или по-нова версия.
velocity.error.modern-forwarding-failed=Сървъра Ви не изпрати заявка за препращане на информация към проксито. Моля, убедете се, че сървъра Ви е настроен за работа с Velocity.
-velocity.error.moved-to-new-server=Ти беше изхвърлен от {0}\: {1}
+velocity.error.moved-to-new-server=Ти беше изхвърлен от \:
velocity.error.no-available-servers=Няма налични сървъри, км които да Ви свържем. Моля, опитайте по-късно, или се свържете с администратор.
velocity.error.illegal-chat-characters=Неодобрени символи в чата
# Commands
velocity.command.generic-error=Възникна грешка при изпълняването на командата.
velocity.command.command-does-not-exist=Тази команда не съществува.
velocity.command.players-only=Само играчи могат да изпълняват тази команда.
-velocity.command.server-does-not-exist=Сървър с името {0} не съществува.
-velocity.command.player-not-found=Играч с името {0} не съществува.
-velocity.command.server-current-server=В момента сте свързан към {0}.
+velocity.command.server-does-not-exist=Сървър с името не съществува.
+velocity.command.player-not-found=Играч с името не съществува.
+velocity.command.server-current-server=В момента сте свързан към .
velocity.command.server-too-many=Има прекалено много регистрирани сървъри. Използвайте TAB, за да видите всички налични сървъри.
velocity.command.server-available=Налични сървъри\:
-velocity.command.server-tooltip-player-online={0} играч на линия
-velocity.command.server-tooltip-players-online={0} играчи на линия
+velocity.command.server-tooltip-player-online= играч на линия
+velocity.command.server-tooltip-players-online= играчи на линия
velocity.command.server-tooltip-current-server=В момента сте свързани към този сървър
velocity.command.server-tooltip-offer-connect-server=Натиснете тук, за да Ви свържем към този сървър
-velocity.command.glist-player-singular={0} играч е свързан към проксито.
-velocity.command.glist-player-plural={0} играчи са свързани към проксито.
+velocity.command.glist-player-singular= играч е свързан към проксито.
+velocity.command.glist-player-plural= играчи са свързани към проксито.
velocity.command.glist-view-all=За да видите всички играчи, разпределени по сървъри, използвайте /glist all.
velocity.command.reload-success=Настройките на Velocity бяха презаредени успешно.
velocity.command.reload-failure=Не успяхме да презаредим настройките на Velocity. Моля, проверете конзолата за повече информация.
-velocity.command.version-copyright=Авторско право 2018-{2} {0}. {1} е лицензиран под условията на GNU General Public License v3.
+velocity.command.version-copyright=Авторско право 2018- . е лицензиран под условията на GNU General Public License v3.
velocity.command.no-plugins=За момента няма инсталирани добавки.
-velocity.command.plugins-list=Добавки\: {0}
-velocity.command.plugin-tooltip-website=Уебсайт\: {0}
-velocity.command.plugin-tooltip-author=Автор\: {0}
-velocity.command.plugin-tooltip-authors=Автори\: {0}
+velocity.command.plugins-list=Добавки\:
+velocity.command.plugin-tooltip-website=Уебсайт\:
+velocity.command.plugin-tooltip-author=Автор\:
+velocity.command.plugin-tooltip-authors=Автори\:
velocity.command.dump-uploading=Качваме събраната информация...
velocity.command.dump-send-error=Възникна грешка при комуникацията със сървърите на Velocity. Сървърите може временно да не са налични, или да имате проблем с мрежовите настройки. Ще откриете повече информация в логовете или конзолата на Вашето Velocity прокси.
velocity.command.dump-success=Създадохме анонимен доклад, съдържащ полезна информация относно това прокси. Ако разработчик Ви го е поискал, може да споделите този линк с тях\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_cs_CZ.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_cs_CZ.properties
index 980e4591..336211c1 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_cs_CZ.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_cs_CZ.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=K tomuto serveru jsi již připojen\!
velocity.error.already-connected-proxy=K tomuto proxy serveru jsi již připojen\!
velocity.error.already-connecting=Již se pokoušíš o připojení k serveru\!
-velocity.error.cant-connect=Nepodařilo se připojit k serveru {0}\: {1}
-velocity.error.connecting-server-error=Nepodařilo se tě připojit k serveru {0}. Zkus to prosím později.
-velocity.error.connected-server-error=Nastala chyba ve tvém připojení k serveru {0}.
+velocity.error.cant-connect=Nepodařilo se připojit k serveru \:
+velocity.error.connecting-server-error=Nepodařilo se tě připojit k serveru . Zkus to prosím později.
+velocity.error.connected-server-error=Nastala chyba ve tvém připojení k serveru .
velocity.error.internal-server-connection-error=V připojení k serveru se vyskytla interní chyba.
velocity.error.logging-in-too-fast=Přihlašuješ se příliš rychle, počkej chvíli.
velocity.error.online-mode-only=Nejsi připojen ke svému Minecraft účtu. Pokud ano, nastala chyba. Zkus restartovat hru.
velocity.error.player-connection-error=Ve tvém připojení nastala chyba.
velocity.error.modern-forwarding-needs-new-client=Tento server je kompatibilní pouze s verzí Minecraftu 1.13 a vyšší.
velocity.error.modern-forwarding-failed=Tvůj server neodeslal přesměrovávací požadavek na proxy server. Ujisti se, že je server nastaven na Velocity přesměrování.
-velocity.error.moved-to-new-server=Byl jsi vyhozen ze serveru {0}\: {1}
+velocity.error.moved-to-new-server=Byl jsi vyhozen ze serveru \:
velocity.error.no-available-servers=Nejsou k dispozici žádné servery, ke kterým by ses mohl připojit. Zkus to později nebo kontaktuj správce.
velocity.error.illegal-chat-characters=Nepovolené znaky v chatu
# Commands
velocity.command.generic-error=Při vykonávání tohoto příkazu nastala chyba.
velocity.command.command-does-not-exist=Tento příkaz neexistuje.
velocity.command.players-only=Tento příkaz mohou vykonávat pouze hráči.
-velocity.command.server-does-not-exist=Zadaný server {0} neexistuje.
-velocity.command.player-not-found=Zadaný hráč {0} neexistuje.
-velocity.command.server-current-server=Právě jsi připojen k serveru {0}.
+velocity.command.server-does-not-exist=Zadaný server neexistuje.
+velocity.command.player-not-found=Zadaný hráč neexistuje.
+velocity.command.server-current-server=Právě jsi připojen k serveru .
velocity.command.server-too-many=Je nastaveno příliš mnoho serverů. Klávesa tab ukáže všechny dostupné servery.
velocity.command.server-available=Dostupné servery\:
-velocity.command.server-tooltip-player-online={0} hráč online
-velocity.command.server-tooltip-players-online=Počet hráčů online\: {0}
+velocity.command.server-tooltip-player-online= hráč online
+velocity.command.server-tooltip-players-online=Počet hráčů online\:
velocity.command.server-tooltip-current-server=Právě jsi připojen k tomuto serveru
velocity.command.server-tooltip-offer-connect-server=Kliknutím se připojíš k tomuto serveru
-velocity.command.glist-player-singular=K tomuto proxy serveru je připojen {0} hráč.
-velocity.command.glist-player-plural=Počet hráčů připojených k tomuto proxy serveru\: {0}
+velocity.command.glist-player-singular=K tomuto proxy serveru je připojen hráč.
+velocity.command.glist-player-plural=Počet hráčů připojených k tomuto proxy serveru\:
velocity.command.glist-view-all=Ke zobrazení všech hráčů na všech serverech použij /glist all.
velocity.command.reload-success=Konfigurace Velocity úspěšně načtena.
velocity.command.reload-failure=Nebylo možné načíst konfiguraci Velocity. Podrobnosti jsou na konzoli.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} je licencovaný pod podmínkami GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018- . je licencovaný pod podmínkami GNU General Public License v3.
velocity.command.no-plugins=V tuto chvíli nejsou nainstalovány žádné zásuvné moduly.
-velocity.command.plugins-list=Zásuvné moduly\: {0}
-velocity.command.plugin-tooltip-website=Webová stránka\: {0}
-velocity.command.plugin-tooltip-author=Autor\: {0}
-velocity.command.plugin-tooltip-authors=Autoři\: {0}
+velocity.command.plugins-list=Zásuvné moduly\:
+velocity.command.plugin-tooltip-website=Webová stránka\:
+velocity.command.plugin-tooltip-author=Autor\:
+velocity.command.plugin-tooltip-authors=Autoři\:
velocity.command.dump-uploading=Nahrávání získaných informací...
velocity.command.dump-send-error=Nastala chyba při komunikaci s Velocity servery. Servery mohou být dočasně nedostupné nebo je chyba v přístupu na internet. Podrobnosti jsou v logu a na konzoli Velocity serveru.
velocity.command.dump-success=Byla vytvořena anonymizovaná zpráva obsahující užitečné informace o tomto serveru. Vyžádal-li si je vývojář, můžeš mu poslat nasledující odkaz\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_da_DK.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_da_DK.properties
index 1a82cbdf..4d80e07f 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_da_DK.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_da_DK.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=Du er allerede tilsluttet til den server\!
velocity.error.already-connected-proxy=Du er allerede tilsluttet til proxyen\!
velocity.error.already-connecting=Du forsøger allerede at oprette forbindelse til en server\!
-velocity.error.cant-connect=Kan ikke forbinde til {0}\: {1}
-velocity.error.connecting-server-error=Kan ikke forbinde dig til {0}. Prøv igen senere.
-velocity.error.connected-server-error=Din forbindelse til {0} stødte på et problem.
+velocity.error.cant-connect=Kan ikke forbinde til \:
+velocity.error.connecting-server-error=Kan ikke forbinde dig til . Prøv igen senere.
+velocity.error.connected-server-error=Din forbindelse til stødte på et problem.
velocity.error.internal-server-connection-error=Der opstod en intern server forbindelsesfejl.
velocity.error.logging-in-too-fast=Du logger ind for hurtigt, prøv igen senere.
velocity.error.online-mode-only=Du er ikke logget ind på din Minecraft-konto. Hvis du er logget ind på din Minecraft-konto, så prøv at genstarte din Minecraft-klient.
velocity.error.player-connection-error=Der opstod en intern fejl i din forbindelse.
velocity.error.modern-forwarding-needs-new-client=Denne server er kun kompatibel med Minecraft 1.13 og derover.
velocity.error.modern-forwarding-failed=Din server sendte ikke en viderestillingsanmodning til proxyen. Sørg for, at serveren er konfigureret til Velocity forwarding.
-velocity.error.moved-to-new-server=Du blev smidt ud fra {0}\: {1}
+velocity.error.moved-to-new-server=Du blev smidt ud fra \:
velocity.error.no-available-servers=Der er ingen tilgængelige servere at forbinde dig til. Prøv igen senere eller kontakt en administrator.
velocity.error.illegal-chat-characters=Illegal characters in chat
# Commands
velocity.command.generic-error=Der opstod en fejl da du kørte kommandoen.
velocity.command.command-does-not-exist=Denne kommando eksisterer ikke.
velocity.command.players-only=Kun spillere kan køre denne kommando.
-velocity.command.server-does-not-exist=Den angivne server {0} findes ikke.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=Du er i øjeblikket forbundet til {0}.
+velocity.command.server-does-not-exist=Den angivne server findes ikke.
+velocity.command.player-not-found=The specified player does not exist.
+velocity.command.server-current-server=Du er i øjeblikket forbundet til .
velocity.command.server-too-many=Der er sat for mange servere op. Brug tab færdiggørelse til at se alle tilgængelige servere.
velocity.command.server-available=Tilgængelige servere\:
-velocity.command.server-tooltip-player-online={0} spiller online
-velocity.command.server-tooltip-players-online={0} spillere online
+velocity.command.server-tooltip-player-online= spiller online
+velocity.command.server-tooltip-players-online= spillere online
velocity.command.server-tooltip-current-server=I øjeblikket forbundet til serveren
velocity.command.server-tooltip-offer-connect-server=Klik for at forbinde til denne server
-velocity.command.glist-player-singular={0} spiller er i øjeblikket forbundet til proxyen.
-velocity.command.glist-player-plural={0} spillere er i øjeblikket forbundet til proxyen.
+velocity.command.glist-player-singular= spiller er i øjeblikket forbundet til proxyen.
+velocity.command.glist-player-plural= spillere er i øjeblikket forbundet til proxyen.
velocity.command.glist-view-all=For at se alle spillere på servere, brug /glist all.
velocity.command.reload-success=Velocity konfiguration blev genindlæst.
velocity.command.reload-failure=Kan ikke genindlæse din Velocity konfiguration. Tjek konsollen for flere detaljer.
-velocity.command.version-copyright=Ophavsret 2018-{2} {0}. {1} er licenseret under betingelserne i GNU General Public License v3.
+velocity.command.version-copyright=Ophavsret 2018- . er licenseret under betingelserne i GNU General Public License v3.
velocity.command.no-plugins=Der er ingen plugins installeret i øjeblikket.
-velocity.command.plugins-list=Plugins\: {0}
-velocity.command.plugin-tooltip-website=Hjemmeside\: {0}
-velocity.command.plugin-tooltip-author=Forfatter\: {0}
-velocity.command.plugin-tooltip-authors=Skabere\: {0}
+velocity.command.plugins-list=Plugins\:
+velocity.command.plugin-tooltip-website=Hjemmeside\:
+velocity.command.plugin-tooltip-author=Forfatter\:
+velocity.command.plugin-tooltip-authors=Skabere\:
velocity.command.dump-uploading=Uploader indsamlet information...
velocity.command.dump-send-error=Der opstod en fejl under kommunikation med Velocity serverne. Serverne kan være midlertidigt utilgængelige, eller der er et problem med dine netværksindstillinger. Du kan finde mere information i loggen eller konsollen på din Velocity server.
velocity.command.dump-success=Oprettet en anonymiseret rapport med nyttige oplysninger om denne proxy. Hvis en udvikler anmodede om det, kan du dele følgende link med dem\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_de_DE.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_de_DE.properties
index 4de00f9e..65004a1d 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_de_DE.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_de_DE.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=Du bist bereits mit diesem Server verbunden\!
velocity.error.already-connected-proxy=Du bist bereits mit diesem Proxy verbunden\!
velocity.error.already-connecting=Du versuchst dich bereits mit einem Server zu verbinden\!
-velocity.error.cant-connect=Kein Verbindungsaufbau zu {0} möglich\: {1}
-velocity.error.connecting-server-error=Kein Verbindungsaufbau zu {0} möglich. Bitte versuche es später erneut.
-velocity.error.connected-server-error=Bei der Verbindung zu {0} ist ein Problem aufgetreten.
+velocity.error.cant-connect=Kein Verbindungsaufbau zu möglich\:
+velocity.error.connecting-server-error=Kein Verbindungsaufbau zu möglich. Bitte versuche es später erneut.
+velocity.error.connected-server-error=Bei der Verbindung zu ist ein Problem aufgetreten.
velocity.error.internal-server-connection-error=Bei der Verbindung mit dem Server ist ein interner Fehler aufgetreten.
velocity.error.logging-in-too-fast=Du meldest dich zu schnell an, versuche es später noch einmal.
velocity.error.online-mode-only=Du bist nicht in deinem Minecraft Konto eingeloggt. Wenn du in deinem Minecraft Konto eingeloggt bist, versuche deinen Minecraft Client neu zu starten.
velocity.error.player-connection-error=Bei deiner Verbindung ist ein interner Fehler aufgetreten.
velocity.error.modern-forwarding-needs-new-client=Dieser Server ist nur mit der Minecraft Version 1.13 und höher kompatibel.
velocity.error.modern-forwarding-failed=Dein Server hat keine Weiterleitungsanforderung an den Proxy gesendet. Stelle sicher, dass der Server für die Velocity Weiterleitung konfiguriert ist.
-velocity.error.moved-to-new-server=Du wurdest von {0} vom Server geworfen\: {1}
+velocity.error.moved-to-new-server=Du wurdest von vom Server geworfen\:
velocity.error.no-available-servers=Es gibt keine verfügbaren Server mit denen du dich verbinden kannst. Versuche es später erneut oder kontaktiere einen Admin.
velocity.error.illegal-chat-characters=Ungültige Zeichen im Chat
# Commands
velocity.command.generic-error=Beim Ausführen des Befehls ist ein Fehler aufgetreten.
velocity.command.command-does-not-exist=Dieser Befehl existiert nicht.
velocity.command.players-only=Nur Spieler können diesen Befehl ausführen.
-velocity.command.server-does-not-exist=Der angegebene Server {0} existiert nicht.
-velocity.command.player-not-found=Der angegebene Spieler {0} existiert nicht.
-velocity.command.server-current-server=Du bist derzeit mit {0} verbunden.
+velocity.command.server-does-not-exist=Der angegebene Server existiert nicht.
+velocity.command.player-not-found=Der angegebene Spieler existiert nicht.
+velocity.command.server-current-server=Du bist derzeit mit verbunden.
velocity.command.server-too-many=Es sind zu viele Server eingerichtet. Verwende die Tabvervollständigung, um alle verfügbaren Server aufzulisten.
velocity.command.server-available=Verfügbare Server\:
-velocity.command.server-tooltip-player-online={0} Spieler online
-velocity.command.server-tooltip-players-online={0} Spieler online
+velocity.command.server-tooltip-player-online= Spieler online
+velocity.command.server-tooltip-players-online= Spieler online
velocity.command.server-tooltip-current-server=Du bist derzeit mit diesem Server verbunden
velocity.command.server-tooltip-offer-connect-server=Klicke, um dich mit diesem Server zu verbinden
-velocity.command.glist-player-singular={0} Spieler ist derzeit mit dem Proxy verbunden.
-velocity.command.glist-player-plural={0} Spieler sind derzeit mit dem Proxy verbunden.
+velocity.command.glist-player-singular= Spieler ist derzeit mit dem Proxy verbunden.
+velocity.command.glist-player-plural= Spieler sind derzeit mit dem Proxy verbunden.
velocity.command.glist-view-all=Um alle Spieler auf Servern aufzulisten, verwende /glist all.
velocity.command.reload-success=Velocity-Konfiguration erfolgreich neu geladen.
velocity.command.reload-failure=Die Velocity-Konfiguration konnte nicht neu geladen werden. Prüfe die Konsole für weitere Details.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} ist lizenziert unter den Bedingungen der GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018- . ist lizenziert unter den Bedingungen der GNU General Public License v3.
velocity.command.no-plugins=Es sind derzeit keine Plugins installiert.
-velocity.command.plugins-list=Plugins\: {0}
-velocity.command.plugin-tooltip-website=Webseite\: {0}
-velocity.command.plugin-tooltip-author=Entwickler\: {0}
-velocity.command.plugin-tooltip-authors=Entwickler\: {0}
+velocity.command.plugins-list=Plugins\:
+velocity.command.plugin-tooltip-website=Webseite\:
+velocity.command.plugin-tooltip-author=Entwickler\:
+velocity.command.plugin-tooltip-authors=Entwickler\:
velocity.command.dump-uploading=Erfasste Daten werden hochgeladen...
velocity.command.dump-send-error=Bei der Kommunikation mit den Velocity-Servern ist ein Fehler aufgetreten. Diese Server sind möglicherweise vorübergehend nicht verfügbar oder es gibt ein Problem mit deinen Netzwerkeinstellungen. Weitere Informationen findest du in der Log-Datei oder in der Konsole deines Velocity-Servers.
velocity.command.dump-success=Ein anonymisierter Bericht mit nützlichen Informationen über diesen Proxy wurde erstellt. Wenn ein Entwickler den Bericht angefordert hat, kannst du diesen über folgenden Link mit ihm teilen\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_es_ES.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_es_ES.properties
index 0d484bc9..00b0bea5 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_es_ES.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_es_ES.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=¡Ya estás conectado a este servidor\!
velocity.error.already-connected-proxy=¡Ya estás conectado a este proxy\!
velocity.error.already-connecting=¡Ya estás intentando conectarte a un servidor\!
-velocity.error.cant-connect=No se ha podido conectar a {0}\: {1}
-velocity.error.connecting-server-error=No hemos podido conectarte a {0}. Por favor, inténtalo de nuevo más tarde.
-velocity.error.connected-server-error=Tu conexión a {0} ha sufrido un problema.
+velocity.error.cant-connect=No se ha podido conectar a \:
+velocity.error.connecting-server-error=No hemos podido conectarte a . Por favor, inténtalo de nuevo más tarde.
+velocity.error.connected-server-error=Tu conexión a ha sufrido un problema.
velocity.error.internal-server-connection-error=Se ha producido un error interno en la conexión al servidor.
velocity.error.logging-in-too-fast=Estás iniciando sesión demasiado rápido, inténtalo de nuevo más tarde.
velocity.error.online-mode-only=No has iniciado sesión con tu cuenta de Minecraft. Si crees que ya lo estás, intenta reiniciar tu cliente de Minecraft.
velocity.error.player-connection-error=Se ha producido un error interno en tu conexión.
velocity.error.modern-forwarding-needs-new-client=Este servidor solo es compatible con Minecraft 1.13 y superior.
velocity.error.modern-forwarding-failed=El servidor no ha enviado una solicitud de reenvío al proxy. Asegúrate de que tu servidor está configurado para usar el método de reenvío de Velocity.
-velocity.error.moved-to-new-server=Has sido echado de {0}\: {1}
+velocity.error.moved-to-new-server=Has sido echado de \:
velocity.error.no-available-servers=No hay servidores disponibles a los que conectarte. Inténtalo de nuevo más tarde o contacta con un administrador.
velocity.error.illegal-chat-characters=Caracteres no válidos en el chat
# Commands
velocity.command.generic-error=Se ha producido un error al ejecutar este comando.
velocity.command.command-does-not-exist=Este comando no existe.
velocity.command.players-only=Solo los jugadores pueden ejecutar este comando.
-velocity.command.server-does-not-exist=El servidor especificado {0} no existe.
-velocity.command.player-not-found=El jugador especificado {0} no existe.
-velocity.command.server-current-server=Estás conectado a {0}.
+velocity.command.server-does-not-exist=El servidor especificado no existe.
+velocity.command.player-not-found=El jugador especificado no existe.
+velocity.command.server-current-server=Estás conectado a .
velocity.command.server-too-many=Hay demasiados servidores registrados. Usa la finalización con tabulación para ver todos los servidores disponibles.
velocity.command.server-available=Servidores disponibles\:
-velocity.command.server-tooltip-player-online={0} jugador conectado
-velocity.command.server-tooltip-players-online={0} jugadores conectados
+velocity.command.server-tooltip-player-online= jugador conectado
+velocity.command.server-tooltip-players-online= jugadores conectados
velocity.command.server-tooltip-current-server=Estás conectado a este servidor
velocity.command.server-tooltip-offer-connect-server=Haz clic para conectarte a este servidor
-velocity.command.glist-player-singular={0} jugador está conectado al proxy.
-velocity.command.glist-player-plural={0} jugadores están conectados al proxy.
+velocity.command.glist-player-singular= jugador está conectado al proxy.
+velocity.command.glist-player-plural= jugadores están conectados al proxy.
velocity.command.glist-view-all=Para ver todos los jugadores por servidores, usa /glist all.
velocity.command.reload-success=La configuración de Velocity ha sido recargada correctamente.
velocity.command.reload-failure=No ha sido posible recargar la configuración de Velocity. Para obtener más información, revisa la consola.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} está licenciado bajo los términos de la Licencia Pública General de GNU v3.
+velocity.command.version-copyright=Copyright 2018- . está licenciado bajo los términos de la Licencia Pública General de GNU v3.
velocity.command.no-plugins=Actualmente no hay plugins instalados.
-velocity.command.plugins-list=Complementos\: {0}
-velocity.command.plugin-tooltip-website=Página web\: {0}
-velocity.command.plugin-tooltip-author=Autor\: {0}
-velocity.command.plugin-tooltip-authors=Autores\: {0}
+velocity.command.plugins-list=Complementos\:
+velocity.command.plugin-tooltip-website=Página web\:
+velocity.command.plugin-tooltip-author=Autor\:
+velocity.command.plugin-tooltip-authors=Autores\:
velocity.command.dump-uploading=Subiendo la información recopilada...
velocity.command.dump-send-error=Se ha producido un error al comunicarse con los servidores de Velocity. Es posible que los servidores no estén disponibles temporalmente o que exista un problema en tu configuración de red. Puedes encontrar más información en el archivo de registro o la consola de tu servidor Velocity.
velocity.command.dump-success=Se ha creado un informe anónimo que contiene información útil sobre este proxy. Si un desarrollador lo solicita, puedes compartir el siguiente enlace con él\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_et_EE.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_et_EE.properties
index 0e4ea63d..a46fa3e8 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_et_EE.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_et_EE.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=Sa oled juba antud serveriga ühendatud\!
velocity.error.already-connected-proxy=Sa oled juba antud proksiga ühendatud\!
velocity.error.already-connecting=Sa juba ühendad severiga\!
-velocity.error.cant-connect=Unable to connect to {0}\: {1}
-velocity.error.connecting-server-error=Unable to connect you to {0}. Please try again later.
-velocity.error.connected-server-error=Your connection to {0} encountered a problem.
+velocity.error.cant-connect=Unable to connect to \:
+velocity.error.connecting-server-error=Unable to connect you to . Please try again later.
+velocity.error.connected-server-error=Your connection to encountered a problem.
velocity.error.internal-server-connection-error=An internal server connection error occurred.
velocity.error.logging-in-too-fast=Sa logid sisse liiga kiiresti, proovi hiljem uuesti.
velocity.error.online-mode-only=You are not logged into your Minecraft account. If you are logged into your Minecraft account, try restarting your Minecraft client.
velocity.error.player-connection-error=An internal error occurred in your connection.
velocity.error.modern-forwarding-needs-new-client=This server is only compatible with Minecraft 1.13 and above.
velocity.error.modern-forwarding-failed=Your server did not send a forwarding request to the proxy. Make sure the server is configured for Velocity forwarding.
-velocity.error.moved-to-new-server=You were kicked from {0}\: {1}
+velocity.error.moved-to-new-server=You were kicked from \:
velocity.error.no-available-servers=There are no available servers to connect you to. Try again later or contact an admin.
velocity.error.illegal-chat-characters=Illegal characters in chat
# Commands
velocity.command.generic-error=An error occurred while running this command.
velocity.command.command-does-not-exist=Antud käsklust ei eksisteeri.
velocity.command.players-only=Ainult mängijad saavad antud käsklust kasutada.
-velocity.command.server-does-not-exist=Server {0} ei eksisteeri.
-velocity.command.player-not-found=The specified player {0} does not exist.
-velocity.command.server-current-server=Sa oled hetkel ühendatud serveriga {0}.
+velocity.command.server-does-not-exist=Server ei eksisteeri.
+velocity.command.player-not-found=The specified player does not exist.
+velocity.command.server-current-server=Sa oled hetkel ühendatud serveriga .
velocity.command.server-too-many=There are too many servers set up. Use tab completion to view all servers available.
velocity.command.server-available=Saadaolevad serverid\:
-velocity.command.server-tooltip-player-online={0} mängija online
-velocity.command.server-tooltip-players-online={0} mängijat online
+velocity.command.server-tooltip-player-online= mängija online
+velocity.command.server-tooltip-players-online= mängijat online
velocity.command.server-tooltip-current-server=Currently connected to this server
velocity.command.server-tooltip-offer-connect-server=Vajuta, et ühendada antud serveriga
-velocity.command.glist-player-singular={0} player is currently connected to the proxy.
-velocity.command.glist-player-plural={0} players are currently connected to the proxy.
+velocity.command.glist-player-singular= player is currently connected to the proxy.
+velocity.command.glist-player-plural= players are currently connected to the proxy.
velocity.command.glist-view-all=Et näha kõiki mängijaid kõikides serverites, kasuta käsklust /glist all.
velocity.command.reload-success=Velocity seadistus edukalt taaslaetud.
velocity.command.reload-failure=Unable to reload your Velocity configuration. Check the console for more details.
-velocity.command.version-copyright=Copyright 2018-{2} {0}. {1} is licensed under the terms of the GNU General Public License v3.
+velocity.command.version-copyright=Copyright 2018- . is licensed under the terms of the GNU General Public License v3.
velocity.command.no-plugins=There are no plugins currently installed.
-velocity.command.plugins-list=Pluginad\: {0}
-velocity.command.plugin-tooltip-website=Veebileht\: {0}
-velocity.command.plugin-tooltip-author=Autor\: {0}
-velocity.command.plugin-tooltip-authors=Autorid\: {0}
+velocity.command.plugins-list=Pluginad\:
+velocity.command.plugin-tooltip-website=Veebileht\:
+velocity.command.plugin-tooltip-author=Autor\:
+velocity.command.plugin-tooltip-authors=Autorid\:
velocity.command.dump-uploading=Kogutud informatsiooni üleslaadimine...
velocity.command.dump-send-error=An error occurred while communicating with the Velocity servers. The servers may be temporarily unavailable or there is an issue with your network settings. You can find more information in the log or console of your Velocity server.
velocity.command.dump-success=Created an anonymised report containing useful information about this proxy. If a developer requested it, you may share the following link with them\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fi_FI.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fi_FI.properties
index 39c8f374..beb49a4d 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fi_FI.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fi_FI.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=Olet jo yhteydessä tälle palvelimelle\!
velocity.error.already-connected-proxy=Olet jo yhteydessä tälle välityspalvelimelle\!
velocity.error.already-connecting=Yrität jo yhdistää palvelimeen\!
-velocity.error.cant-connect={0} ei saatu yhteyttä\: {1}
-velocity.error.connecting-server-error=Yhteyttä palvelimeen {0} ei voitu muodostaa. Yritä myöhemmin uudelleen.
-velocity.error.connected-server-error=Yhteydessäsi palvelimeen {0} tapahtui virhe.
+velocity.error.cant-connect= ei saatu yhteyttä\:
+velocity.error.connecting-server-error=Yhteyttä palvelimeen ei voitu muodostaa. Yritä myöhemmin uudelleen.
+velocity.error.connected-server-error=Yhteydessäsi palvelimeen tapahtui virhe.
velocity.error.internal-server-connection-error=Tapahtui palvelimen sisäinen yhteysvirhe.
velocity.error.logging-in-too-fast=Kirjaudut sisään liian nopeasti, yritä uudelleen hetken kuluttua.
velocity.error.online-mode-only=Et ole kirjautuneena Minecraft-tilillesi. Jos olet kirjautuneena sisään, yritä pelin uudelleenkäynnistämistä.
velocity.error.player-connection-error=Yhteydessäsi tapahtui sisäinen virhe.
velocity.error.modern-forwarding-needs-new-client=Tämä palvelin on yhteensopiva vain Minecraft 1.13\:n ja sitä uudempien versioiden kanssa.
velocity.error.modern-forwarding-failed=Valitsemasi palvelin ei lähettänyt välityspyyntöä välityspalvelimelle. Tarkista että palvelin on määritetty oikein Velocityä varten.
-velocity.error.moved-to-new-server=Sinut potkittiin pois palvelimelta {0}\: {1}
+velocity.error.moved-to-new-server=Sinut potkittiin pois palvelimelta \:
velocity.error.no-available-servers=Yhtään palvelinta ei ole tällä hetkellä saatavilla. Yritä myöhemmin uudelleen tai ota yhteyttä palvelimen ylläpitäjään.
velocity.error.illegal-chat-characters=Kiellettyjä merkkejä chatissa
# Commands
velocity.command.generic-error=Tämän komennon suorittamisessa tapahtui virhe.
velocity.command.command-does-not-exist=Tuota komentoa ei ole olemassa.
velocity.command.players-only=Vain pelaajat voivat käyttää tuota komentoa.
-velocity.command.server-does-not-exist=Palvelinta {0} ei ole olemassa.
-velocity.command.player-not-found=Annettua pelaajaa {0} ei ole olemassa.
-velocity.command.server-current-server=Olet tällä hetkellä yhdistettynä palvelimeen {0}.
+velocity.command.server-does-not-exist=Palvelinta ei ole olemassa.
+velocity.command.player-not-found=Annettua pelaajaa ei ole olemassa.
+velocity.command.server-current-server=Olet tällä hetkellä yhdistettynä palvelimeen .
velocity.command.server-too-many=Liian monta palvelinta on määritetty. Paina Tab -näppäintä nähdäksesi kaikki saatavilla olevat palvelimet.
velocity.command.server-available=Saatavilla olevat palvelimet\:
-velocity.command.server-tooltip-player-online={0} pelaaja paikalla
-velocity.command.server-tooltip-players-online={0} pelaajaa paikalla
+velocity.command.server-tooltip-player-online= pelaaja paikalla
+velocity.command.server-tooltip-players-online= pelaajaa paikalla
velocity.command.server-tooltip-current-server=Tällä hetkellä yhdistetty tähän palvelimeen
velocity.command.server-tooltip-offer-connect-server=Napsauta yhdistääksesi tähän palvelimeen
-velocity.command.glist-player-singular={0} pelaaja on tällä hetkellä yhdistänyt välityspalvelimelle.
-velocity.command.glist-player-plural={0} pelaajaa on tällä hetkellä yhdistänyt välityspalvelimelle.
+velocity.command.glist-player-singular= pelaaja on tällä hetkellä yhdistänyt välityspalvelimelle.
+velocity.command.glist-player-plural= pelaajaa on tällä hetkellä yhdistänyt välityspalvelimelle.
velocity.command.glist-view-all=Nähdäksesi pelaajat kaikilla palvelimilla, käytä komentoa /glist all.
velocity.command.reload-success=Velocityn konfiguraatio uudelleenladattiin onnistuneesti.
velocity.command.reload-failure=Velocityn konfiguraation uudelleenlataus epäonnistui. Katso tarkemmat lisätiedot konsolista.
-velocity.command.version-copyright=Tekijänoikeus 2018-{2} {0}. {1} on lisensoitu GNU General Public License v3\:n ehtojen mukaisesti.
+velocity.command.version-copyright=Tekijänoikeus 2018- . on lisensoitu GNU General Public License v3\:n ehtojen mukaisesti.
velocity.command.no-plugins=Yhtäkään pluginia ei ole asennettu.
-velocity.command.plugins-list=Pluginit\: {0}
-velocity.command.plugin-tooltip-website=Verkkosivu\: {0}
-velocity.command.plugin-tooltip-author=Tekijä\: {0}
-velocity.command.plugin-tooltip-authors=Tekijät\: {0}
+velocity.command.plugins-list=Pluginit\:
+velocity.command.plugin-tooltip-website=Verkkosivu\:
+velocity.command.plugin-tooltip-author=Tekijä\:
+velocity.command.plugin-tooltip-authors=Tekijät\:
velocity.command.dump-uploading=Lähetetään kerättyjä tietoja...
velocity.command.dump-send-error=Velocity-palvelimien kanssa kommunikoidessa tapahtui virhe. Palvelimet eivät ehkä ole tilapäisesti käytettävissä tai verkkoasetuksissa on ongelma. Löydät lisätietoja Velocity-palvelimesi lokista tai konsolista.
velocity.command.dump-success=Luotiin anonyymi raportti, joka sisältää hyödyllistä tietoa tästä välityspalvelimesta. Jos jokin kehittäjä on pyytänyt sitä, voit jakaa seuraavan linkin heidän kanssaan\:
diff --git a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fr_FR.properties b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fr_FR.properties
index 64fa63ee..50d2a556 100644
--- a/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fr_FR.properties
+++ b/proxy/src/main/resources/com/velocitypowered/proxy/l10n/messages_fr_FR.properties
@@ -18,42 +18,42 @@
velocity.error.already-connected=Vous êtes déjà connecté(e) à ce serveur \!
velocity.error.already-connected-proxy=Vous êtes déjà connecté(e) à ce proxy \!
velocity.error.already-connecting=Vous êtes déjà en train d'essayer de vous connecter à un serveur \!
-velocity.error.cant-connect=Impossible de se connecter à {0} \: {1}
-velocity.error.connecting-server-error=Impossible de vous connecter à {0}. Veuillez réessayer ultérieurement.
-velocity.error.connected-server-error=Votre connexion à {0} a rencontré un problème.
+velocity.error.cant-connect=Impossible de se connecter à