Mirrors/Velocity
1
0
Fork 1
mirror of https://github.com/PaperMC/Velocity.git synced 2026-02-17 14:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev/1.1.0' into dev/2.0.0

Browse Source 
# Conflicts:
#	api/build.gradle
#	api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java
#	build.gradle
#	proxy/src/main/java/com/velocitypowered/proxy/command/builtin/VelocityCommand.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/MinecraftConnection.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/StatusSessionHandler.java
#	proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressEncoder.java
#	proxy/src/main/java/com/velocitypowered/proxy/network/pipeline/MinecraftCompressorAndLengthEncoder.java
#	proxy/src/test/java/com/velocitypowered/proxy/command/CommandManagerTests.java
This commit is contained in:
Andrew Steinborn
2021-05-09 03:51:54 -04:00
parent f00b9b73ea 06ecab2627
commit a4e91793ca
11 changed files with 408 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
api/build.gradle
View File

@@ -76,13 +76,13 @@ javadoc {
options.encoding = 'UTF-8'
options.charSet = 'UTF-8'
options.source = '8'
// options.links(
// 'https://www.slf4j.org/apidocs/',
// 'https://guava.dev/releases/30.0-jre/api/docs/',
// 'https://google.github.io/guice/api-docs/4.2/javadoc/',
// 'https://docs.oracle.com/javase/8/docs/api/',
// 'https://jd.adventure.kyori.net/api/4.0.0/'
// )
options.links(
'http://www.slf4j.org/apidocs/',
'https://google.github.io/guava/releases/30.0-jre/api/docs/',
'https://google.github.io/guice/api-docs/4.2/javadoc/',
'https://docs.oracle.com/javase/8/docs/api/',
'https://jd.adventure.kyori.net/api/4.7.0/'
)
// Disable the crazy super-strict doclint tool in Java 8
options.addStringOption('Xdoclint:none', '-quiet')

19
api/src/main/java/com/velocitypowered/api/proxy/connection/Player.java
View File

@@ -8,7 +8,8 @@
package com.velocitypowered.api.proxy.connection;
import com.velocitypowered.api.command.CommandSource;
import com.velocitypowered.api.event.player.PlayerResourcePackStatusEventImpl;
import com.velocitypowered.api.event.player.PlayerResourcePackStatusEvent;
import com.velocitypowered.api.proxy.messages.ChannelIdentifier;
import com.velocitypowered.api.proxy.messages.ChannelMessageSink;
import com.velocitypowered.api.proxy.messages.ChannelMessageSource;
import com.velocitypowered.api.proxy.player.ClientSettings;
@@ -123,7 +124,7 @@ public interface Player extends CommandSource, Identified, InboundConnection,
/**
* Sends the specified resource pack from {@code url} to the user. If at all possible, send the
* resource pack using {@link #sendResourcePack(String, byte[])}. To monitor the status of the
* sent resource pack, subscribe to {@link PlayerResourcePackStatusEventImpl}.
* sent resource pack, subscribe to {@link PlayerResourcePackStatusEvent}.
*
* @param url the URL for the resource pack
*/
@@ -132,10 +133,22 @@ public interface Player extends CommandSource, Identified, InboundConnection,
/**
* Sends the specified resource pack from {@code url} to the user, using the specified 20-byte
* SHA-1 hash. To monitor the status of the sent resource pack, subscribe to
* {@link PlayerResourcePackStatusEventImpl}.
* {@link PlayerResourcePackStatusEvent}.
*
* @param url the URL for the resource pack
* @param hash the SHA-1 hash value for the resource pack
*/
void sendResourcePack(String url, byte[] hash);
/**
* <strong>Note that this method does not send a plugin message to the server the player
* is connected to.</strong> You should only use this method if you are trying to communicate
* with a mod that is installed on the player's client. To send a plugin message to the server
* from the player, you should use the equivalent method on the instance returned by
* {@link #getCurrentServer()}.
*
* @inheritDoc
*/
@Override
boolean sendPluginMessage(ChannelIdentifier identifier, byte[] data);
}