Release 1.1.7 - Added sounds support

Author: SkyWatcher2019

build.gradle

@@ -7,7 +7,7 @@ plugins {
 }
 
 setGroup("net.elytrium")
-setVersion("1.1.6")
+setVersion("1.1.7")
 
 compileJava {
   getOptions().setEncoding("UTF-8")

gradle.properties

@@ -1,4 +1,4 @@
-limboapiVersion=1.1.23
+limboapiVersion=1.1.26
 velocityVersion=3.3.0-SNAPSHOT
-nettyVersion=4.1.106.Final
+nettyVersion=4.1.114.Final
 serializerVersion=1.1.1

src/main/java/net/elytrium/limboreconnect/Config.java

@@ -58,13 +58,15 @@ public class Config extends YamlSerializable {
 
   public World world;
   public Messages messages;
+  public Sounds sounds;
   public boolean debug = false;
 
 
   public Config() {
     super(Config.CONFIG);
     this.world = new World();
     this.messages = new Messages();
+    this.sounds = new Sounds();
   }
 
 
@@ -147,4 +149,24 @@ public Title(String title) {
       }
     }
   }
+
+  public static class Sounds {
+
+    public Sound waiting = new Sound("entity.experience_orb.pickup");
+    public Sound connecting = new Sound("entity.player.levelup");
+
+    public static class Sound {
+
+      public String name;
+      public float volume = 1.0f;
+      public float pitch = 1.0f;
+
+      public Sound() {
+      }
+
+      public Sound(String name) {
+        this.name = name;
+      }
+    }
+  }
 }

src/main/java/net/elytrium/limboreconnect/LimboReconnect.java

@@ -18,8 +18,11 @@
 package net.elytrium.limboreconnect;
 
 import com.google.inject.Inject;
+import com.velocitypowered.api.command.CommandManager;
+import com.velocitypowered.api.command.CommandMeta;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.proxy.ProxyInitializeEvent;
+import com.velocitypowered.api.network.ProtocolVersion;
 import com.velocitypowered.api.plugin.Plugin;
 import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
@@ -44,9 +47,12 @@
 import net.elytrium.limboapi.api.chunk.Dimension;
 import net.elytrium.limboapi.api.chunk.VirtualWorld;
 import net.elytrium.limboapi.api.file.WorldFile;
+import net.elytrium.limboapi.api.protocol.PacketDirection;
+import net.elytrium.limboapi.api.protocol.packets.PacketMapping;
 import net.elytrium.limboreconnect.commands.LimboReconnectCommand;
 import net.elytrium.limboreconnect.handler.ReconnectHandler;
 import net.elytrium.limboreconnect.listener.ReconnectListener;
+import net.elytrium.limboreconnect.protocol.packets.PlaySound;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.ComponentSerializer;
 import net.kyori.adventure.title.Title;
@@ -71,12 +77,14 @@ public class LimboReconnect {
   private final Path configPath;
   private final Path dataDirectory;
   private final LimboFactory factory;
+  private final CommandMeta commandMeta;
   private Limbo limbo;
 
   @Inject
   public LimboReconnect(Logger logger, ProxyServer server, @DataDirectory Path dataDirectory) {
     setLogger(logger);
     this.server = server;
+    this.commandMeta = server.getCommandManager().metaBuilder("limboreconnect").plugin(this).build();
 
     this.dataDirectory = dataDirectory;
     this.configPath = dataDirectory.resolve("config.yml");
@@ -138,8 +146,27 @@ public void reload() {
       }
     }
 
-    this.limbo = this.factory.createLimbo(world).setName("LimboReconnect").setShouldRejoin(CONFIG.useLimbo)
-        .setShouldRespawn(CONFIG.useLimbo).setGameMode(CONFIG.world.gamemode);
+    this.limbo = this.factory.createLimbo(world)
+        .setName("LimboReconnect")
+        .setShouldRejoin(CONFIG.useLimbo)
+        .setShouldRespawn(CONFIG.useLimbo)
+        .setGameMode(CONFIG.world.gamemode)
+        .registerPacket(PacketDirection.CLIENTBOUND, PlaySound.class, PlaySound::new, new PacketMapping[] {
+            new PacketMapping(0x29, ProtocolVersion.MINECRAFT_1_7_2, true),
+            new PacketMapping(0x19, ProtocolVersion.MINECRAFT_1_9, true),
+            new PacketMapping(0x1a, ProtocolVersion.MINECRAFT_1_13, true),
+            new PacketMapping(0x19, ProtocolVersion.MINECRAFT_1_14, true),
+            new PacketMapping(0x1a, ProtocolVersion.MINECRAFT_1_15, true),
+            new PacketMapping(0x19, ProtocolVersion.MINECRAFT_1_16, true),
+            new PacketMapping(0x18, ProtocolVersion.MINECRAFT_1_16_2, true),
+            new PacketMapping(0x19, ProtocolVersion.MINECRAFT_1_17, true),
+            new PacketMapping(0x16, ProtocolVersion.MINECRAFT_1_19, true),
+            new PacketMapping(0x17, ProtocolVersion.MINECRAFT_1_19_1, true),
+            new PacketMapping(0x5e, ProtocolVersion.MINECRAFT_1_19_3, true),
+            new PacketMapping(0x62, ProtocolVersion.MINECRAFT_1_19_4, true),
+            new PacketMapping(0x64, ProtocolVersion.MINECRAFT_1_20_2, true),
+            new PacketMapping(0x68, ProtocolVersion.MINECRAFT_1_21, true),
+            });
 
     this.offlineTitles.clear();
     CONFIG.messages.titles.titles.forEach(title -> this.offlineTitles.add(Title.title(
@@ -165,8 +192,9 @@ public void reload() {
 
     this.server.getEventManager().unregisterListeners(this);
     this.server.getEventManager().register(this, new ReconnectListener(this));
-    this.server.getCommandManager().unregister("limboreconnect");
-    this.server.getCommandManager().register("limboreconnect", new LimboReconnectCommand(this));
+    CommandManager commandManager = this.server.getCommandManager();
+    commandManager.unregister("limboreconnect");
+    commandManager.register(this.commandMeta, new LimboReconnectCommand(this));
   }
 
   public void addPlayer(Player player, RegisteredServer server) {

src/main/java/net/elytrium/limboreconnect/handler/ReconnectHandler.java

@@ -26,7 +26,9 @@
 import net.elytrium.limboapi.api.Limbo;
 import net.elytrium.limboapi.api.LimboSessionHandler;
 import net.elytrium.limboapi.api.player.LimboPlayer;
+import net.elytrium.limboreconnect.Config;
 import net.elytrium.limboreconnect.LimboReconnect;
+import net.elytrium.limboreconnect.protocol.packets.PlaySound;
 
 public class ReconnectHandler implements LimboSessionHandler {
 
@@ -37,10 +39,18 @@ public class ReconnectHandler implements LimboSessionHandler {
   private boolean connected = true;
   private boolean connecting = false;
   private int titleIndex = -1;
+  private final PlaySound waitSound;
+  private final PlaySound connectSound;
 
   public ReconnectHandler(LimboReconnect plugin, RegisteredServer server) {
     this.plugin = plugin;
     this.server = server;
+    Config.Sounds sounds = CONFIG.sounds;
+    double playerX = CONFIG.world.playerCoords.x;
+    double playerY = CONFIG.world.playerCoords.y;
+    double playerZ = CONFIG.world.playerCoords.z;
+    this.waitSound = new PlaySound(sounds.waiting.name, playerX, playerY, playerZ, sounds.waiting.volume, sounds.waiting.pitch);
+    this.connectSound = new PlaySound(sounds.connecting.name, playerX, playerY, playerZ, sounds.connecting.volume, sounds.connecting.pitch);
   }
 
   @Override
@@ -57,6 +67,12 @@ public void onDisconnect() {
     this.connected = false;
   }
 
+  @Override
+  public void onMove(double x, double y, double z) {
+    this.waitSound.setPosition(x, y, z);
+    this.connectSound.setPosition(x, y, z);
+  }
+
   private void tick() {
     if (!this.connected) {
       return;
@@ -75,6 +91,7 @@ private void tick() {
           this.connecting = true;
           this.titleIndex = -1;
           this.player.getScheduledExecutor().schedule(() -> {
+            this.player.writePacket(this.connectSound);
             this.player.getProxyPlayer().resetTitle();
             this.player.disconnect(this.server);
           }, CONFIG.joinDelay, TimeUnit.MILLISECONDS);
@@ -95,7 +112,7 @@ private void tickMessages() {
       this.titleIndex = (this.titleIndex + 1) % this.plugin.offlineTitles.size();
       this.player.getProxyPlayer().showTitle(this.plugin.offlineTitles.get(this.titleIndex));
     }
-
+    this.player.writePacket(this.waitSound);
     this.player.getScheduledExecutor().schedule(this::tickMessages, CONFIG.messages.titles.showDelay * 50, TimeUnit.MILLISECONDS);
   }
 }

src/main/java/net/elytrium/limboreconnect/protocol/packets/PlaySound.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2022 - 2024 Elytrium
+ *
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+
+package net.elytrium.limboreconnect.protocol.packets;
+
+import com.velocitypowered.api.network.ProtocolVersion;
+import com.velocitypowered.proxy.connection.MinecraftSessionHandler;
+import com.velocitypowered.proxy.protocol.MinecraftPacket;
+import com.velocitypowered.proxy.protocol.ProtocolUtils;
+import io.netty.buffer.ByteBuf;
+
+public class PlaySound implements MinecraftPacket {
+
+  private final String soundName;
+  private final float volume;
+  private final float pitch;
+  private int playerX;
+  private int playerY;
+  private int playerZ;
+
+  public PlaySound(String soundName, double x, double y, double z, float volume, float pitch) {
+    this.soundName = soundName;
+    this.setPosition(x, y, z);
+    this.volume = volume;
+    this.pitch = pitch;
+  }
+
+  public PlaySound() {
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public void decode(ByteBuf byteBuf, ProtocolUtils.Direction direction, ProtocolVersion protocolVersion) {
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public void encode(ByteBuf byteBuf, ProtocolUtils.Direction direction, ProtocolVersion protocolVersion) {
+    if (protocolVersion.greaterThan(ProtocolVersion.MINECRAFT_1_19_1) && protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_18_2)) {
+      ProtocolUtils.writeVarInt(byteBuf, 0);
+    }
+    ProtocolUtils.writeString(byteBuf, this.soundName);
+    if (protocolVersion.greaterThan(ProtocolVersion.MINECRAFT_1_19_1) && protocolVersion.lessThan(ProtocolVersion.MINECRAFT_1_18_2)) {
+      byteBuf.writeBoolean(false);
+    }
+    ProtocolUtils.writeVarInt(byteBuf, 0);
+    byteBuf.writeInt(this.playerX);
+    byteBuf.writeInt(this.playerY);
+    byteBuf.writeInt(this.playerZ);
+    byteBuf.writeFloat(this.volume);
+    byteBuf.writeFloat(this.pitch);
+    if (protocolVersion.greaterThan(ProtocolVersion.MINECRAFT_1_18_2)) {
+      byteBuf.writeLong(0);
+    }
+  }
+
+  @Override
+  public boolean handle(MinecraftSessionHandler minecraftSessionHandler) {
+    return false;
+  }
+
+  public void setPosition(double x, double y, double z) {
+    this.playerX = (int) (x * 8);
+    this.playerY = (int) (y * 8);
+    this.playerZ = (int) (z * 8);
+  }
+}