GeyserMC-Mirror/Floodgate
1
0
Fork 0
mirror of https://github.com/GeyserMC/Floodgate.git synced 2025-12-19 14:59:20 +00:00
Code Issues Releases Activity

Bumped some dependencies

Browse Source
This commit is contained in:
Tim203
2021-09-17 12:09:14 +02:00
parent be781c634f
commit 1d7009395d
10 changed files with 129 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/pom.xml
View File

@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId> <artifactId>netty-transport</artifactId>
<version>4.1.49.Final</version> <version>${netty.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

15
bungee/pom.xml
View File

@@ -12,11 +12,17 @@
<artifactId>bungee</artifactId> <artifactId>bungee</artifactId>
<properties>
<bungeecord.commit>bda1605</bungeecord.commit>
<gson.version>2.8.0</gson.version>
<guava.version>21.0</guava.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.github.SpigotMC.BungeeCord</groupId> <groupId>com.github.SpigotMC.BungeeCord</groupId>
<artifactId>bungeecord-proxy</artifactId> <artifactId>bungeecord-proxy</artifactId>
<version>a7c6ede</version> <version>${bungeecord.commit}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@@ -44,19 +50,19 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.5</version> <version>${gson.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>21.0</version> <version>${guava.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.27</version> <version>${snakeyaml.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -112,6 +118,7 @@
<configuration> <configuration>
<finalName>${outputName}</finalName> <finalName>${outputName}</finalName>
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>
<outputDirectory>D:\Intellij\localserver\bungee\plugins</outputDirectory>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

56
common/pom.xml
View File

@@ -12,23 +12,25 @@
<artifactId>common</artifactId> <artifactId>common</artifactId>
<properties>
<java-websocket.version>1.5.2</java-websocket.version>
</properties>
<dependencies> <dependencies>
<dependency>
<groupId>org.geysermc.floodgate</groupId>
<artifactId>api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.geysermc.cumulus</groupId>
<artifactId>cumulus</artifactId>
<version>${cumulus.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.google.inject</groupId> <groupId>com.google.inject</groupId>
<artifactId>guice</artifactId> <artifactId>guice</artifactId>
<version>5.0.0-BETA-1</version> <version>${guice.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.49.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.49.Final</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.nukkitx.fastutil</groupId> <groupId>com.nukkitx.fastutil</groupId>
@@ -43,17 +45,7 @@
<dependency> <dependency>
<groupId>org.java-websocket</groupId> <groupId>org.java-websocket</groupId>
<artifactId>Java-WebSocket</artifactId> <artifactId>Java-WebSocket</artifactId>
<version>1.5.1</version> <version>${java-websocket.version}</version>
</dependency>
<dependency>
<groupId>org.geysermc.floodgate</groupId>
<artifactId>api</artifactId>
<version>${project.parent.version}</version>
</dependency>
<dependency>
<groupId>org.geysermc.cumulus</groupId>
<artifactId>cumulus</artifactId>
<version>${cumulus.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.kyori</groupId> <groupId>net.kyori</groupId>
@@ -68,8 +60,20 @@
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.27</version> <version>${snakeyaml.version}</version>
<scope>compile</scope> </dependency>
<!-- present on all platforms -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
<scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

3
common/src/main/java/org/geysermc/floodgate/command/main/MainCommand.java
View File

@@ -62,8 +62,7 @@ public final class MainCommand implements FloodgateCommand {
@Override @Override
public void execute(CommandContext<UserAudience> context) { public void execute(CommandContext<UserAudience> context) {
StringBuilder helpMessage = new StringBuilder(28) StringBuilder helpMessage = new StringBuilder("Available subcommands are:\n");
.append("Available subcommands are:\n");
for (SubCommand subCommand : SubCommand.VALUES) { for (SubCommand subCommand : SubCommand.VALUES) {
helpMessage.append('\n').append(COLOR_CHAR).append('b') helpMessage.append('\n').append(COLOR_CHAR).append('b')

8
database/mysql/pom.xml
View File

@@ -12,17 +12,21 @@
<artifactId>mysql</artifactId> <artifactId>mysql</artifactId>
<properties>
<mariadb-client.version>2.7.4</mariadb-client.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.mariadb.jdbc</groupId> <groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId> <artifactId>mariadb-java-client</artifactId>
<version>2.7.1</version> <version>${mariadb-client.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geysermc.floodgate</groupId> <groupId>org.geysermc.floodgate</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>2.0-SNAPSHOT</version> <version>${parent.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

8
database/sqlite/pom.xml
View File

@@ -12,17 +12,21 @@
<artifactId>sqlite</artifactId> <artifactId>sqlite</artifactId>
<properties>
<sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.xerial</groupId> <groupId>org.xerial</groupId>
<artifactId>sqlite-jdbc</artifactId> <artifactId>sqlite-jdbc</artifactId>
<version>3.30.1</version> <version>${sqlite-jdbc.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.geysermc.floodgate</groupId> <groupId>org.geysermc.floodgate</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>2.0-SNAPSHOT</version> <version>${parent.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

24
pom.xml
View File

@@ -45,14 +45,18 @@
</issueManagement> </issueManagement>
<properties> <properties>
<geyser.version>1.4.0-SNAPSHOT</geyser.version> <geyser.version>1.4.2-SNAPSHOT</geyser.version>
<cumulus.version>1.0-SNAPSHOT</cumulus.version> <cumulus.version>1.0-SNAPSHOT</cumulus.version>
<spigot.version>1.13-R0.1-SNAPSHOT</spigot.version> <spigot.version>1.13-R0.1-SNAPSHOT</spigot.version>
<velocity.version>1.1.0</velocity.version>
<cloud.version>1.5.0-SNAPSHOT</cloud.version>
<adventure-api.version>4.5.0</adventure-api.version>
<adventure-platform.version>4.0.0-SNAPSHOT</adventure-platform.version>
<fastutil.version>8.5.3</fastutil.version> <fastutil.version>8.5.3</fastutil.version>
<lombok.version>1.18.20</lombok.version>
<guice.version>5.0.1</guice.version>
<netty.version>4.1.49.Final</netty.version>
<snakeyaml.version>1.28</snakeyaml.version>
<cloud.version>1.5.0</cloud.version>
<adventure-api.version>4.9.1</adventure-api.version>
<adventure-platform.version>4.0.0</adventure-platform.version>
<outputName>floodgate-${project.name}</outputName> <outputName>floodgate-${project.name}</outputName>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,19 +69,11 @@
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId> <artifactId>lombok</artifactId>
<version>1.18.20</version> <version>${lombok.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories>
<!-- todo remove once Cloud 1.5.0 has been released-->
<repository>
<id>incendo-snapshots</id>
<url>https://repo.incendo.org/content/repositories/snapshots</url>
</repository>
</repositories>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>

18
spigot/pom.xml
View File

@@ -12,6 +12,12 @@
<artifactId>spigot</artifactId> <artifactId>spigot</artifactId>
<properties>
<authlib.version>1.5.21</authlib.version>
<guava.version>21.0</guava.version>
<gson.version>2.8.5</gson.version>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
@@ -22,26 +28,26 @@
<dependency> <dependency>
<groupId>com.mojang</groupId> <groupId>com.mojang</groupId>
<artifactId>authlib</artifactId> <artifactId>authlib</artifactId>
<version>1.5.21</version> <version>${authlib.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId> <artifactId>netty-transport</artifactId>
<version>4.1.43.Final</version> <version>${netty.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.netty</groupId> <groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId> <artifactId>netty-codec</artifactId>
<version>4.1.43.Final</version> <version>${netty.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- part of a hack to make pre 1.12 work --> <!-- part of a hack to make pre 1.12 work -->
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>21.0</version> <version>${guava.version}</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<!-- end of hack --> <!-- end of hack -->
@@ -70,13 +76,13 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.5</version> <version>${gson.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.27</version> <version>${snakeyaml.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>

65
velocity/pom.xml
View File

@@ -13,34 +13,13 @@
<artifactId>velocity</artifactId> <artifactId>velocity</artifactId>
<properties> <properties>
<velocity.version>3.0.1</velocity.version>
<log4j.version>2.11.2</log4j.version> <log4j.version>2.11.2</log4j.version>
<gson.version>2.8.8</gson.version>
<guava.version>25.1-jre</guava.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-api</artifactId>
<version>${velocity.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>4.1.43.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>4.1.43.Final</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.geysermc.floodgate</groupId> <groupId>org.geysermc.floodgate</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
@@ -61,19 +40,50 @@
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.5</version> <version>${gson.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.guava</groupId> <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId> <artifactId>guava</artifactId>
<version>21.0</version> <version>${guava.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
<scope>provided</scope>
</dependency>
<!-- SnakeYaml is included in Configurate -->
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.27</version> <version>${snakeyaml.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.velocitypowered</groupId>
<artifactId>velocity-api</artifactId>
<version>${velocity.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${netty.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
<version>${netty.version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
@@ -131,6 +141,7 @@
<configuration> <configuration>
<finalName>${outputName}</finalName> <finalName>${outputName}</finalName>
<shadedArtifactAttached>true</shadedArtifactAttached> <shadedArtifactAttached>true</shadedArtifactAttached>
<outputDirectory>D:\Intellij\localserver\velocity\plugins</outputDirectory>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>

20
velocity/src/main/java/org/geysermc/floodgate/player/VelocityUserAudience.java
View File

@@ -72,9 +72,13 @@ public abstract class VelocityUserAudience implements UserAudience, ForwardingAu
} }
@Override @Override
public void sendMessage(@NonNull Identity source, @NonNull Component message, public void sendMessage(
@NonNull MessageType type) { @NonNull Identity source,
this.source.sendMessage(source, message, type); @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 @Override
@@ -111,9 +115,13 @@ public abstract class VelocityUserAudience implements UserAudience, ForwardingAu
implements PlayerAudience { implements PlayerAudience {
private final boolean online; private final boolean online;
public VelocityPlayerAudience(UUID uuid, String username, String locale, public VelocityPlayerAudience(
CommandSource source, boolean online, UUID uuid,
CommandUtil commandUtil) { String username,
String locale,
CommandSource source,
boolean online,
CommandUtil commandUtil) {
super(uuid, username, locale, source, commandUtil); super(uuid, username, locale, source, commandUtil);
this.online = online; this.online = online;
} }