diff --git a/api/pom.xml b/api/pom.xml
index 983ef45e..122aed64 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -16,7 +16,7 @@
io.netty
netty-transport
- 4.1.49.Final
+ ${netty.version}
provided
diff --git a/bungee/pom.xml b/bungee/pom.xml
index e7e6885c..2fef754d 100644
--- a/bungee/pom.xml
+++ b/bungee/pom.xml
@@ -12,11 +12,17 @@
bungee
+
+ bda1605
+ 2.8.0
+ 21.0
+
+
com.github.SpigotMC.BungeeCord
bungeecord-proxy
- a7c6ede
+ ${bungeecord.commit}
provided
@@ -44,19 +50,19 @@
com.google.code.gson
gson
- 2.8.5
+ ${gson.version}
provided
com.google.guava
guava
- 21.0
+ ${guava.version}
provided
org.yaml
snakeyaml
- 1.27
+ ${snakeyaml.version}
provided
@@ -112,6 +118,7 @@
${outputName}
true
+ D:\Intellij\localserver\bungee\plugins
diff --git a/common/pom.xml b/common/pom.xml
index f3e2e5d8..2ede5f9c 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -12,23 +12,25 @@
common
+
+ 1.5.2
+
+
+
+ org.geysermc.floodgate
+ api
+ ${project.parent.version}
+
+
+ org.geysermc.cumulus
+ cumulus
+ ${cumulus.version}
+
com.google.inject
guice
- 5.0.0-BETA-1
-
-
- io.netty
- netty-transport
- 4.1.49.Final
- provided
-
-
- io.netty
- netty-codec
- 4.1.49.Final
- provided
+ ${guice.version}
com.nukkitx.fastutil
@@ -43,17 +45,7 @@
org.java-websocket
Java-WebSocket
- 1.5.1
-
-
- org.geysermc.floodgate
- api
- ${project.parent.version}
-
-
- org.geysermc.cumulus
- cumulus
- ${cumulus.version}
+ ${java-websocket.version}
net.kyori
@@ -68,8 +60,20 @@
org.yaml
snakeyaml
- 1.27
- compile
+ ${snakeyaml.version}
+
+
+
+ io.netty
+ netty-transport
+ ${netty.version}
+ provided
+
+
+ io.netty
+ netty-codec
+ ${netty.version}
+ provided
diff --git a/common/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java b/common/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java
index 1fae9275..94cb200c 100644
--- a/common/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java
+++ b/common/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java
@@ -62,8 +62,7 @@ public final class MainCommand implements FloodgateCommand {
@Override
public void execute(CommandContext context) {
- StringBuilder helpMessage = new StringBuilder(28)
- .append("Available subcommands are:\n");
+ StringBuilder helpMessage = new StringBuilder("Available subcommands are:\n");
for (SubCommand subCommand : SubCommand.VALUES) {
helpMessage.append('\n').append(COLOR_CHAR).append('b')
diff --git a/database/mysql/pom.xml b/database/mysql/pom.xml
index 8aa08b14..93410f1c 100644
--- a/database/mysql/pom.xml
+++ b/database/mysql/pom.xml
@@ -12,17 +12,21 @@
mysql
+
+ 2.7.4
+
+
org.mariadb.jdbc
mariadb-java-client
- 2.7.1
+ ${mariadb-client.version}
compile
org.geysermc.floodgate
common
- 2.0-SNAPSHOT
+ ${parent.version}
provided
diff --git a/database/sqlite/pom.xml b/database/sqlite/pom.xml
index e8031a6d..a418fa6e 100644
--- a/database/sqlite/pom.xml
+++ b/database/sqlite/pom.xml
@@ -12,17 +12,21 @@
sqlite
+
+ 3.36.0.3
+
+
org.xerial
sqlite-jdbc
- 3.30.1
+ ${sqlite-jdbc.version}
compile
org.geysermc.floodgate
common
- 2.0-SNAPSHOT
+ ${parent.version}
provided
diff --git a/pom.xml b/pom.xml
index d9d43a1d..800c94a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,14 +45,18 @@
- 1.4.0-SNAPSHOT
+ 1.4.2-SNAPSHOT
1.0-SNAPSHOT
1.13-R0.1-SNAPSHOT
- 1.1.0
- 1.5.0-SNAPSHOT
- 4.5.0
- 4.0.0-SNAPSHOT
8.5.3
+ 1.18.20
+ 5.0.1
+
+ 4.1.49.Final
+ 1.28
+ 1.5.0
+ 4.9.1
+ 4.0.0
floodgate-${project.name}
UTF-8
@@ -65,19 +69,11 @@
org.projectlombok
lombok
- 1.18.20
+ ${lombok.version}
provided
-
-
-
- incendo-snapshots
- https://repo.incendo.org/content/repositories/snapshots
-
-
-
diff --git a/spigot/pom.xml b/spigot/pom.xml
index b83020f6..30ba5c91 100644
--- a/spigot/pom.xml
+++ b/spigot/pom.xml
@@ -12,6 +12,12 @@
spigot
+
+ 1.5.21
+ 21.0
+ 2.8.5
+
+
org.spigotmc
@@ -22,26 +28,26 @@
com.mojang
authlib
- 1.5.21
+ ${authlib.version}
provided
io.netty
netty-transport
- 4.1.43.Final
+ ${netty.version}
provided
io.netty
netty-codec
- 4.1.43.Final
+ ${netty.version}
provided
com.google.guava
guava
- 21.0
+ ${guava.version}
compile
@@ -70,13 +76,13 @@
com.google.code.gson
gson
- 2.8.5
+ ${gson.version}
provided
org.yaml
snakeyaml
- 1.27
+ ${snakeyaml.version}
provided
diff --git a/velocity/pom.xml b/velocity/pom.xml
index b7fa6b98..c93f97d3 100644
--- a/velocity/pom.xml
+++ b/velocity/pom.xml
@@ -13,34 +13,13 @@
velocity
+ 3.0.1
2.11.2
+ 2.8.8
+ 25.1-jre
-
- com.velocitypowered
- velocity-api
- ${velocity.version}
- provided
-
-
- org.apache.logging.log4j
- log4j-core
- ${log4j.version}
- provided
-
-
- io.netty
- netty-transport
- 4.1.43.Final
- provided
-
-
- io.netty
- netty-codec
- 4.1.43.Final
- provided
-
org.geysermc.floodgate
common
@@ -61,19 +40,50 @@
com.google.code.gson
gson
- 2.8.5
+ ${gson.version}
provided
com.google.guava
guava
- 21.0
+ ${guava.version}
provided
+
+ com.google.inject
+ guice
+ ${guice.version}
+ provided
+
+
org.yaml
snakeyaml
- 1.27
+ ${snakeyaml.version}
+ provided
+
+
+ com.velocitypowered
+ velocity-api
+ ${velocity.version}
+ provided
+
+
+ org.apache.logging.log4j
+ log4j-core
+ ${log4j.version}
+ provided
+
+
+ io.netty
+ netty-transport
+ ${netty.version}
+ provided
+
+
+ io.netty
+ netty-codec
+ ${netty.version}
provided
@@ -131,6 +141,7 @@
${outputName}
true
+ D:\Intellij\localserver\velocity\plugins
diff --git a/velocity/src/main/java/org/geysermc/floodgate/player/VelocityUserAudience.java b/velocity/src/main/java/org/geysermc/floodgate/player/VelocityUserAudience.java
index 4e0b4313..29384737 100644
--- a/velocity/src/main/java/org/geysermc/floodgate/player/VelocityUserAudience.java
+++ b/velocity/src/main/java/org/geysermc/floodgate/player/VelocityUserAudience.java
@@ -72,9 +72,13 @@ public abstract class VelocityUserAudience implements UserAudience, ForwardingAu
}
@Override
- public void sendMessage(@NonNull Identity source, @NonNull Component message,
- @NonNull MessageType type) {
- this.source.sendMessage(source, message, type);
+ public void sendMessage(
+ @NonNull Identity source,
+ @NonNull Component message,
+ @NonNull MessageType type) {
+ // apparently the console doesn't implement sendMessage with MessageType,
+ // so we'll just ignore it
+ this.source.sendMessage(source, message);
}
@Override
@@ -111,9 +115,13 @@ public abstract class VelocityUserAudience implements UserAudience, ForwardingAu
implements PlayerAudience {
private final boolean online;
- public VelocityPlayerAudience(UUID uuid, String username, String locale,
- CommandSource source, boolean online,
- CommandUtil commandUtil) {
+ public VelocityPlayerAudience(
+ UUID uuid,
+ String username,
+ String locale,
+ CommandSource source,
+ boolean online,
+ CommandUtil commandUtil) {
super(uuid, username, locale, source, commandUtil);
this.online = online;
}