mirror of
https://github.com/GeyserMC/Geyser.git
synced 2024-08-14 23:57:35 +00:00
Add a /geyser ping command (#4131)
* Init: Add /geyser ping command * Block just console execution, not everything but console senders * Use RTT as that seems to vary less wildly compared to getPing() * Cleanup, use lang strings * Add ping() method to GeyserConnection in api * Update to cloud changes
This commit is contained in:
parent
87ab51cb28
commit
48311f8771
4 changed files with 64 additions and 0 deletions
|
@ -132,4 +132,9 @@ public interface GeyserConnection extends Connection, CommandSource {
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@NonNull
|
@NonNull
|
||||||
Set<String> fogEffects();
|
Set<String> fogEffects();
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns the current ping of the connection.
|
||||||
|
*/
|
||||||
|
int ping();
|
||||||
}
|
}
|
||||||
|
|
|
@ -43,6 +43,7 @@ import org.geysermc.geyser.command.defaults.ExtensionsCommand;
|
||||||
import org.geysermc.geyser.command.defaults.HelpCommand;
|
import org.geysermc.geyser.command.defaults.HelpCommand;
|
||||||
import org.geysermc.geyser.command.defaults.ListCommand;
|
import org.geysermc.geyser.command.defaults.ListCommand;
|
||||||
import org.geysermc.geyser.command.defaults.OffhandCommand;
|
import org.geysermc.geyser.command.defaults.OffhandCommand;
|
||||||
|
import org.geysermc.geyser.command.defaults.PingCommand;
|
||||||
import org.geysermc.geyser.command.defaults.ReloadCommand;
|
import org.geysermc.geyser.command.defaults.ReloadCommand;
|
||||||
import org.geysermc.geyser.command.defaults.SettingsCommand;
|
import org.geysermc.geyser.command.defaults.SettingsCommand;
|
||||||
import org.geysermc.geyser.command.defaults.StatisticsCommand;
|
import org.geysermc.geyser.command.defaults.StatisticsCommand;
|
||||||
|
@ -139,6 +140,7 @@ public class CommandRegistry implements EventRegistrar {
|
||||||
registerBuiltInCommand(new AdvancementsCommand("advancements", "geyser.commands.advancements.desc", "geyser.command.advancements"));
|
registerBuiltInCommand(new AdvancementsCommand("advancements", "geyser.commands.advancements.desc", "geyser.command.advancements"));
|
||||||
registerBuiltInCommand(new AdvancedTooltipsCommand("tooltips", "geyser.commands.advancedtooltips.desc", "geyser.command.tooltips"));
|
registerBuiltInCommand(new AdvancedTooltipsCommand("tooltips", "geyser.commands.advancedtooltips.desc", "geyser.command.tooltips"));
|
||||||
registerBuiltInCommand(new ConnectionTestCommand(geyser, "connectiontest", "geyser.commands.connectiontest.desc", "geyser.command.connectiontest"));
|
registerBuiltInCommand(new ConnectionTestCommand(geyser, "connectiontest", "geyser.commands.connectiontest.desc", "geyser.command.connectiontest"));
|
||||||
|
registerBuiltInCommand(new PingCommand("ping", "geyser.commands.ping.desc", "geyser.command.ping"));
|
||||||
if (this.geyser.getPlatformType() == PlatformType.STANDALONE) {
|
if (this.geyser.getPlatformType() == PlatformType.STANDALONE) {
|
||||||
registerBuiltInCommand(new StopCommand(geyser, "stop", "geyser.commands.stop.desc", "geyser.command.stop"));
|
registerBuiltInCommand(new StopCommand(geyser, "stop", "geyser.commands.stop.desc", "geyser.command.stop"));
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2019-2023 GeyserMC. http://geysermc.org
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*
|
||||||
|
* @author GeyserMC
|
||||||
|
* @link https://github.com/GeyserMC/Geyser
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.geysermc.geyser.command.defaults;
|
||||||
|
|
||||||
|
import org.geysermc.geyser.api.util.TriState;
|
||||||
|
import org.geysermc.geyser.command.GeyserCommand;
|
||||||
|
import org.geysermc.geyser.command.GeyserCommandSource;
|
||||||
|
import org.geysermc.geyser.session.GeyserSession;
|
||||||
|
import org.geysermc.geyser.text.GeyserLocale;
|
||||||
|
import org.incendo.cloud.context.CommandContext;
|
||||||
|
|
||||||
|
import java.util.Objects;
|
||||||
|
|
||||||
|
public class PingCommand extends GeyserCommand {
|
||||||
|
|
||||||
|
public PingCommand(String name, String description, String permission) {
|
||||||
|
super(name, description, permission, TriState.TRUE, true, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void execute(CommandContext<GeyserCommandSource> context) {
|
||||||
|
GeyserSession session = Objects.requireNonNull(context.sender().connection());
|
||||||
|
session.sendMessage(GeyserLocale.getPlayerLocaleString("geyser.commands.ping.message", session.locale(), session.ping()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -54,6 +54,8 @@ import org.cloudburstmc.math.vector.Vector3d;
|
||||||
import org.cloudburstmc.math.vector.Vector3f;
|
import org.cloudburstmc.math.vector.Vector3f;
|
||||||
import org.cloudburstmc.math.vector.Vector3i;
|
import org.cloudburstmc.math.vector.Vector3i;
|
||||||
import org.cloudburstmc.nbt.NbtMap;
|
import org.cloudburstmc.nbt.NbtMap;
|
||||||
|
import org.cloudburstmc.netty.channel.raknet.RakChildChannel;
|
||||||
|
import org.cloudburstmc.netty.handler.codec.raknet.common.RakSessionCodec;
|
||||||
import org.cloudburstmc.protocol.bedrock.BedrockDisconnectReasons;
|
import org.cloudburstmc.protocol.bedrock.BedrockDisconnectReasons;
|
||||||
import org.cloudburstmc.protocol.bedrock.BedrockServerSession;
|
import org.cloudburstmc.protocol.bedrock.BedrockServerSession;
|
||||||
import org.cloudburstmc.protocol.bedrock.data.Ability;
|
import org.cloudburstmc.protocol.bedrock.data.Ability;
|
||||||
|
@ -2098,6 +2100,12 @@ public class GeyserSession implements GeyserConnection, GeyserCommandSource {
|
||||||
return this.cameraData.fogEffects();
|
return this.cameraData.fogEffects();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int ping() {
|
||||||
|
RakSessionCodec rakSessionCodec = ((RakChildChannel) getUpstream().getSession().getPeer().getChannel()).rakPipeline().get(RakSessionCodec.class);
|
||||||
|
return (int) Math.floor(rakSessionCodec.getPing());
|
||||||
|
}
|
||||||
|
|
||||||
public void addCommandEnum(String name, String enums) {
|
public void addCommandEnum(String name, String enums) {
|
||||||
softEnumPacket(name, SoftEnumUpdateType.ADD, enums);
|
softEnumPacket(name, SoftEnumUpdateType.ADD, enums);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue