Update to MCJE 1.20.1 and MCBE 1.20.70

Fix #2
Close #9

README.md

@@ -5,8 +5,8 @@
 ## Requirements
 
 - Java 11
-- Minecraft: Java Edition v1.19.1/1.19.2
-- Bedrock Edition server v1.19.50
+- Minecraft: Java Edition v1.20.1
+- Bedrock Edition server v1.20.70
 
 ## Need implemented
 

dependency-reduced-pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.barrelmc.barrel</groupId>
+ <artifactId>Barrel</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>3.2.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <transformers>
+ <transformer>
+ <mainClass>org.barrelmc.barrel.Barrel</mainClass>
+ </transformer>
+ </transformers>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ <configuration>
+ <release>11</release>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <repositories>
+ <repository>
+ <id>opencollab-repo-release</id>
+ <url>https://repo.opencollab.dev/maven-releases/</url>
+ </repository>
+ <repository>
+ <id>opencollab-repo-snapshot</id>
+ <url>https://repo.opencollab.dev/maven-snapshots/</url>
+ </repository>
+ </repositories>
+</project>

pom.xml

@@ -10,30 +10,26 @@
 
  <repositories>
  <repository>
- <id>nukkitx-repo-release</id>
- <url>https://repo.nukkitx.com/maven-releases/</url>
+ <id>opencollab-repo-release</id>
+ <url>https://repo.opencollab.dev/maven-releases/</url>
  </repository>
  <repository>
- <id>nukkitx-repo-snapshot</id>
- <url>https://repo.nukkitx.com/maven-snapshots/</url>
- </repository>
- <repository>
- <id>opencollab</id>
+ <id>opencollab-repo-snapshot</id>
  <url>https://repo.opencollab.dev/maven-snapshots/</url>
  </repository>
  </repositories>
 
  <dependencies>
  <dependency>
- <groupId>com.nukkitx.protocol</groupId>
- <artifactId>bedrock-v567</artifactId>
- <version>2.9.17-SNAPSHOT</version>
+ <groupId>org.cloudburstmc.protocol</groupId>
+ <artifactId>bedrock-connection</artifactId>
+ <version>3.0.0.Beta1-SNAPSHOT</version>
  <scope>compile</scope>
  </dependency>
  <dependency>
  <groupId>com.github.steveice10</groupId>
  <artifactId>mcprotocollib</artifactId>
- <version>1.19.1-SNAPSHOT</version>
+ <version>1.20-1-SNAPSHOT</version>
  </dependency>
 
  <dependency>

src/main/java/org/barrelmc/barrel/auth/server/AuthServer.java

@@ -20,13 +20,13 @@
 import com.github.steveice10.opennbt.tag.builtin.LongArrayTag;
 import com.github.steveice10.packetlib.Session;
 import com.github.steveice10.packetlib.event.session.SessionAdapter;
-import com.nukkitx.math.vector.Vector3i;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import net.kyori.adventure.text.Component;
 import org.barrelmc.barrel.auth.AuthManager;
 import org.barrelmc.barrel.server.ProxyServer;
 import org.barrelmc.barrel.utils.Utils;
+import org.cloudburstmc.math.vector.Vector3i;
 
 import java.util.BitSet;
 import java.util.Collections;
@@ -37,15 +37,15 @@ public class AuthServer extends SessionAdapter {
  public AuthServer(Session session, String username) {
  session.send(new ClientboundLoginPacket(
  0, false, GameMode.ADVENTURE, GameMode.ADVENTURE,
- 1, new String[]{"minecraft:overworld"}, ProxyServer.getInstance().getDimensionTag(),
+ new String[]{"minecraft:overworld"}, ProxyServer.getInstance().getDimensionTag(),
  "minecraft:overworld", "minecraft:overworld", 100,
- 10, 6, 6, false, true, false, false, null
+ 10, 6, 6, false, true, false, false, null, 0
  ));
 
  this.generateWorld(session);
 
  session.send(new ClientboundSetDefaultSpawnPositionPacket(Vector3i.from(8, 82, 8), 0));
- session.send(new ClientboundPlayerPositionPacket(8, 82, 8, 0, 0, 0, false));
+ session.send(new ClientboundPlayerPositionPacket(8, 82, 8, 0, 0, 0));
 
  session.send(new ClientboundSystemChatPacket(Component.text("§cPlease login with your Xbox account"), false));
  try {
@@ -87,7 +87,7 @@ private void generateWorld(Session session) {
  session.send(new ClientboundLevelChunkWithLightPacket(
  0, 0, bytebuf.array(), heightMaps,
  new BlockEntityInfo[0],
- new LightUpdateData(new BitSet(), new BitSet(), new BitSet(), new BitSet(), Collections.emptyList(), Collections.emptyList(), true)
+ new LightUpdateData(new BitSet(), new BitSet(), new BitSet(), new BitSet(), Collections.emptyList(), Collections.emptyList())
  ));
  bytebuf.release();
  }

src/main/java/org/barrelmc/barrel/math/Vector3.java

@@ -1,9 +1,9 @@
 package org.barrelmc.barrel.math;
 
-import com.nukkitx.math.GenericMath;
-import com.nukkitx.math.vector.Vector3f;
 import lombok.Getter;
 import lombok.Setter;
+import org.cloudburstmc.math.GenericMath;
+import org.cloudburstmc.math.vector.Vector3f;
 
 public class Vector3 {
 

src/main/java/org/barrelmc/barrel/network/BedrockBatchHandler.java

@@ -5,15 +5,12 @@
 
 package org.barrelmc.barrel.network;
 
-import com.nukkitx.protocol.bedrock.BedrockPacket;
-import com.nukkitx.protocol.bedrock.BedrockSession;
-import com.nukkitx.protocol.bedrock.handler.BatchHandler;
-import io.netty.buffer.ByteBuf;
 import org.barrelmc.barrel.player.Player;
+import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
+import org.cloudburstmc.protocol.bedrock.packet.BedrockPacketHandler;
+import org.cloudburstmc.protocol.common.PacketSignal;
 
-import java.util.Collection;
-
-public class BedrockBatchHandler implements BatchHandler {
+public class BedrockBatchHandler implements BedrockPacketHandler {
 
  private final Player player;
 
@@ -22,10 +19,9 @@ public BedrockBatchHandler(Player player) {
  }
 
  @Override
- public void handle(BedrockSession bedrockSession, ByteBuf byteBuf, Collection<BedrockPacket> collection) {
- for (BedrockPacket packet : collection) {
- //System.out.println("Received Bedrock " + packet.toString());
- player.getPacketTranslatorManager().translate(packet);
- }
+ public PacketSignal handlePacket(BedrockPacket packet) {
+ //System.out.println("Received Bedrock " + packet.toString());
+ player.getPacketTranslatorManager().translate(packet);
+ return PacketSignal.HANDLED;
  }
 }

src/main/java/org/barrelmc/barrel/network/JavaPacketHandler.java

@@ -34,7 +34,7 @@ public void packetReceived(Session session, Packet packet) {
  if (packet instanceof ServerboundHelloPacket) {
  ServerboundHelloPacket loginPacket = (ServerboundHelloPacket) packet;
 
- if (!ProxyServer.getInstance().getConfig().getAuth().equals("offline") && AuthManager.getInstance().getAccessTokens().containsKey(loginPacket.getUsername())) {
+ if (ProxyServer.getInstance().getConfig().getAuth().equals("offline") || AuthManager.getInstance().getAccessTokens().containsKey(loginPacket.getUsername())) {
  new Player(loginPacket, session);
 
  UUID uuid = UUID.nameUUIDFromBytes((loginPacket.getUsername()).getBytes());

src/main/java/org/barrelmc/barrel/network/translator/PacketTranslatorManager.java

@@ -7,14 +7,13 @@
 import com.github.steveice10.mc.protocol.packet.ingame.serverbound.inventory.ServerboundSeenAdvancementsPacket;
 import com.github.steveice10.mc.protocol.packet.ingame.serverbound.player.*;
 import com.github.steveice10.packetlib.packet.Packet;
-import com.nukkitx.protocol.bedrock.BedrockPacket;
-import com.nukkitx.protocol.bedrock.packet.*;
 import lombok.Getter;
 import org.barrelmc.barrel.network.translator.interfaces.BedrockPacketTranslator;
 import org.barrelmc.barrel.network.translator.interfaces.JavaPacketTranslator;
 import org.barrelmc.barrel.network.translator.java.*;
 import org.barrelmc.barrel.network.translator.java.PlayerActionPacket;
 import org.barrelmc.barrel.player.Player;
+import org.cloudburstmc.protocol.bedrock.packet.*;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/org/barrelmc/barrel/network/translator/TranslatorUtils.java

@@ -6,7 +6,7 @@
 package org.barrelmc.barrel.network.translator;
 
 import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
-import com.nukkitx.protocol.bedrock.data.GameType;
+import org.cloudburstmc.protocol.bedrock.data.GameType;
 
 public class TranslatorUtils {
 

src/main/java/org/barrelmc/barrel/network/translator/bedrock/AddPlayerPacket.java

@@ -4,28 +4,31 @@
 import com.github.steveice10.mc.protocol.data.game.PlayerListEntry;
 import com.github.steveice10.mc.protocol.data.game.PlayerListEntryAction;
 import com.github.steveice10.mc.protocol.data.game.entity.player.GameMode;
-import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPlayerInfoPacket;
+import com.github.steveice10.mc.protocol.packet.ingame.clientbound.ClientboundPlayerInfoUpdatePacket;
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.spawn.ClientboundAddPlayerPacket;
-import com.nukkitx.math.vector.Vector3f;
-import com.nukkitx.protocol.bedrock.BedrockPacket;
-import com.nukkitx.protocol.bedrock.data.entity.EntityData;
 import net.kyori.adventure.text.Component;
 import org.barrelmc.barrel.network.translator.interfaces.BedrockPacketTranslator;
 import org.barrelmc.barrel.player.Player;
 import org.barrelmc.barrel.utils.Utils;
+import org.cloudburstmc.math.vector.Vector3f;
+import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
+import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
+
+import java.util.EnumSet;
+import java.util.UUID;
 
 public class AddPlayerPacket implements BedrockPacketTranslator {
 
  @Override
  public void translate(BedrockPacket pk, Player player) {
- com.nukkitx.protocol.bedrock.packet.AddPlayerPacket packet = (com.nukkitx.protocol.bedrock.packet.AddPlayerPacket) pk;
+ org.cloudburstmc.protocol.bedrock.packet.AddPlayerPacket packet = (org.cloudburstmc.protocol.bedrock.packet.AddPlayerPacket) pk;
 
  Vector3f position = packet.getPosition();
  Vector3f rotation = packet.getRotation();
 
  GameProfile gameProfile = new GameProfile(packet.getUuid(), Utils.lengthCutter(packet.getUsername(), 16));
 
- player.getJavaSession().send(new ClientboundPlayerInfoPacket(PlayerListEntryAction.ADD_PLAYER, new PlayerListEntry[]{new PlayerListEntry(gameProfile, GameMode.SURVIVAL, 10, Component.text(Utils.lengthCutter(packet.getMetadata().getString(EntityData.NAMETAG), 16)), 0L, null, null)}));
+ player.getJavaSession().send(new ClientboundPlayerInfoUpdatePacket(EnumSet.of(PlayerListEntryAction.ADD_PLAYER), new PlayerListEntry[]{new PlayerListEntry(packet.getUuid(), gameProfile, true, 0, GameMode.SURVIVAL, Component.text(Utils.lengthCutter(packet.getMetadata().get(EntityDataTypes.NAME), 16)), UUID.randomUUID(), 0L, null, null)}));
  player.getJavaSession().send(new ClientboundAddPlayerPacket((int) packet.getRuntimeEntityId(), packet.getUuid(), position.getX(), position.getY(), position.getZ(), rotation.getY(), rotation.getX()));
  }
 }

src/main/java/org/barrelmc/barrel/network/translator/bedrock/AnimatePacket.java

@@ -2,15 +2,15 @@
 
 import com.github.steveice10.mc.protocol.data.game.entity.player.Animation;
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.entity.ClientboundAnimatePacket;
-import com.nukkitx.protocol.bedrock.BedrockPacket;
 import org.barrelmc.barrel.network.translator.interfaces.BedrockPacketTranslator;
 import org.barrelmc.barrel.player.Player;
+import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 
 public class AnimatePacket implements BedrockPacketTranslator {
 
  @Override
  public void translate(BedrockPacket pk, Player player) {
- com.nukkitx.protocol.bedrock.packet.AnimatePacket packet = (com.nukkitx.protocol.bedrock.packet.AnimatePacket) pk;
+ org.cloudburstmc.protocol.bedrock.packet.AnimatePacket packet = (org.cloudburstmc.protocol.bedrock.packet.AnimatePacket) pk;
 
  switch (packet.getAction()) {
  case SWING_ARM: {

src/main/java/org/barrelmc/barrel/network/translator/bedrock/BlockEventPacket.java

@@ -3,16 +3,16 @@
 import com.github.steveice10.mc.protocol.data.game.level.block.value.ChestValue;
 import com.github.steveice10.mc.protocol.data.game.level.block.value.ChestValueType;
 import com.github.steveice10.mc.protocol.packet.ingame.clientbound.level.ClientboundBlockEventPacket;
-import com.nukkitx.math.vector.Vector3i;
-import com.nukkitx.protocol.bedrock.BedrockPacket;
 import org.barrelmc.barrel.network.translator.interfaces.BedrockPacketTranslator;
 import org.barrelmc.barrel.player.Player;
+import org.cloudburstmc.math.vector.Vector3i;
+import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 
 public class BlockEventPacket implements BedrockPacketTranslator {
 
  @Override
  public void translate(BedrockPacket pk, Player player) {
- com.nukkitx.protocol.bedrock.packet.BlockEventPacket packet = (com.nukkitx.protocol.bedrock.packet.BlockEventPacket) pk;
+ org.cloudburstmc.protocol.bedrock.packet.BlockEventPacket packet = (org.cloudburstmc.protocol.bedrock.packet.BlockEventPacket) pk;
 
  if (packet.getEventType() == 1) {
  Vector3i pos = packet.getBlockPosition();

src/main/java/org/barrelmc/barrel/network/translator/bedrock/ChangeDimensionPacket.java

@@ -1,11 +1,11 @@
 package org.barrelmc.barrel.network.translator.bedrock;
 
-import com.nukkitx.math.vector.Vector3i;
-import com.nukkitx.protocol.bedrock.BedrockPacket;
-import com.nukkitx.protocol.bedrock.data.PlayerActionType;
-import com.nukkitx.protocol.bedrock.packet.PlayerActionPacket;
 import org.barrelmc.barrel.network.translator.interfaces.BedrockPacketTranslator;
 import org.barrelmc.barrel.player.Player;
+import org.cloudburstmc.math.vector.Vector3i;
+import org.cloudburstmc.protocol.bedrock.data.PlayerActionType;
+import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
+import org.cloudburstmc.protocol.bedrock.packet.PlayerActionPacket;
 
 public class ChangeDimensionPacket implements BedrockPacketTranslator {
 
@@ -17,6 +17,6 @@ public void translate(BedrockPacket pk, Player player) {
  playerActionPacket.setResultPosition(Vector3i.ZERO);
  playerActionPacket.setFace(0);
  playerActionPacket.setRuntimeEntityId(player.getRuntimeEntityId());
- player.getBedrockClient().getSession().sendPacket(playerActionPacket);
+ player.getBedrockClientSession().sendPacket(playerActionPacket);
  }
 }

src/main/java/org/barrelmc/barrel/network/translator/bedrock/DisconnectPacket.java

@@ -1,14 +1,14 @@
 package org.barrelmc.barrel.network.translator.bedrock;
 
-import com.nukkitx.protocol.bedrock.BedrockPacket;
 import org.barrelmc.barrel.network.translator.interfaces.BedrockPacketTranslator;
 import org.barrelmc.barrel.player.Player;
+import org.cloudburstmc.protocol.bedrock.packet.BedrockPacket;
 
 public class DisconnectPacket implements BedrockPacketTranslator {
 
  @Override
  public void translate(BedrockPacket pk, Player player) {
- com.nukkitx.protocol.bedrock.packet.DisconnectPacket packet = (com.nukkitx.protocol.bedrock.packet.DisconnectPacket) pk;
+ org.cloudburstmc.protocol.bedrock.packet.DisconnectPacket packet = (org.cloudburstmc.protocol.bedrock.packet.DisconnectPacket) pk;
 
  player.disconnect(packet.getKickMessage());
  }