Mirror von
https://github.com/GeyserMC/Geyser.git
synchronisiert 2024-09-08 20:43:04 +02:00
Fix compile errors and cleanups
Dieser Commit ist enthalten in:
Ursprung
c050ae240b
Commit
3d7ee87a58
@ -1,191 +1,97 @@
|
|||||||
package org.geysermc.connector.utils;
|
package org.geysermc.connector.utils;
|
||||||
|
|
||||||
import com.flowpowered.math.vector.Vector2d;
|
|
||||||
import com.flowpowered.math.vector.Vector2i;
|
import com.flowpowered.math.vector.Vector2i;
|
||||||
import com.flowpowered.math.vector.Vector3d;
|
import com.flowpowered.math.vector.Vector3d;
|
||||||
import com.flowpowered.math.vector.Vector3i;
|
import com.flowpowered.math.vector.Vector3i;
|
||||||
import io.netty.buffer.ByteBuf;
|
import io.netty.buffer.ByteBuf;
|
||||||
import protocolsupport.protocol.types.Position;
|
|
||||||
|
|
||||||
public class PositionSerializer {
|
public class PositionSerializer {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void skipPosition(ByteBuf from) {
|
public static void skipPosition(ByteBuf from) {
|
||||||
|
|
||||||
from.skipBytes(Long.BYTES);
|
from.skipBytes(Long.BYTES);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static Vector3d readPosition(ByteBuf from) {
|
public static Vector3d readPosition(ByteBuf from) {
|
||||||
|
|
||||||
long l = from.readLong();
|
long l = from.readLong();
|
||||||
|
|
||||||
return new Vector3d(
|
return new Vector3d(
|
||||||
|
|
||||||
(int) (l >> 38), (int) (l & 0xFFF), (int) ((l << 26) >> 38)
|
(int) (l >> 38), (int) (l & 0xFFF), (int) ((l << 26) >> 38)
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void readPEPosition(ByteBuf from) {
|
public static void readPEPosition(ByteBuf from) {
|
||||||
|
|
||||||
VarNumberSerializer.readSVarInt(from);
|
VarNumberSerializer.readSVarInt(from);
|
||||||
|
|
||||||
VarNumberSerializer.readVarInt(from);
|
VarNumberSerializer.readVarInt(from);
|
||||||
|
|
||||||
VarNumberSerializer.readSVarInt(from);
|
VarNumberSerializer.readSVarInt(from);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static Vector3d readLegacyPositionI(ByteBuf from) {
|
public static Vector3d readLegacyPositionI(ByteBuf from) {
|
||||||
|
|
||||||
return new Vector3d(from.readInt(), from.readInt(), from.readInt());
|
return new Vector3d(from.readInt(), from.readInt(), from.readInt());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void writePosition(ByteBuf to, Vector3i position) {
|
public static void writePosition(ByteBuf to, Vector3i position) {
|
||||||
|
|
||||||
to.writeLong(((position.getX() & 0x3FFFFFFL) << 38) | ((position.getZ() & 0x3FFFFFFL) << 12) | (position.getY() & 0xFFFL));
|
to.writeLong(((position.getX() & 0x3FFFFFFL) << 38) | ((position.getZ() & 0x3FFFFFFL) << 12) | (position.getY() & 0xFFFL));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void writeLegacyPositionL(ByteBuf to, Vector3d position) {
|
||||||
|
to.writeLong((((int) position.getX() & 0x3FFFFFFL) << 38) | (((int) position.getY() & 0xFFFL) << 26) | ((int) position.getZ() & 0x3FFFFFFL));
|
||||||
public static void writeLegacyPositionL(ByteBuf to, Position position) {
|
|
||||||
|
|
||||||
to.writeLong(((position.getX() & 0x3FFFFFFL) << 38) | ((position.getY() & 0xFFFL) << 26) | (position.getZ() & 0x3FFFFFFL));
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void writePEPosition(ByteBuf to, Vector3d position) {
|
||||||
|
VarNumberSerializer.writeSVarInt(to, (int) position.getX());
|
||||||
public static void writePEPosition(ByteBuf to, Position position) {
|
VarNumberSerializer.writeVarInt(to, (int) position.getY());
|
||||||
|
VarNumberSerializer.writeSVarInt(to, (int) position.getZ());
|
||||||
VarNumberSerializer.writeSVarInt(to, position.getX());
|
|
||||||
|
|
||||||
VarNumberSerializer.writeVarInt(to, position.getY());
|
|
||||||
|
|
||||||
VarNumberSerializer.writeSVarInt(to, position.getZ());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void writeLegacyPositionB(ByteBuf to, Vector3d position) {
|
||||||
|
to.writeInt((int) position.getX());
|
||||||
public static void writeLegacyPositionB(ByteBuf to, Position position) {
|
to.writeByte((int) position.getY());
|
||||||
|
to.writeInt((int) position.getZ());
|
||||||
to.writeInt(position.getX());
|
|
||||||
|
|
||||||
to.writeByte(position.getY());
|
|
||||||
|
|
||||||
to.writeInt(position.getZ());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void writeLegacyPositionS(ByteBuf to, Vector3d position) {
|
||||||
|
to.writeInt((int) position.getX());
|
||||||
public static void writeLegacyPositionS(ByteBuf to, Position position) {
|
to.writeShort((int) position.getY());
|
||||||
|
to.writeInt((int) position.getZ());
|
||||||
to.writeInt(position.getX());
|
|
||||||
|
|
||||||
to.writeShort(position.getY());
|
|
||||||
|
|
||||||
to.writeInt(position.getZ());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void writeLegacyPositionI(ByteBuf to, Vector3d position) {
|
||||||
|
to.writeInt((int) position.getX());
|
||||||
public static void writeLegacyPositionI(ByteBuf to, Position position) {
|
to.writeInt((int) position.getY());
|
||||||
|
to.writeInt((int) position.getZ());
|
||||||
to.writeInt(position.getX());
|
|
||||||
|
|
||||||
to.writeInt(position.getY());
|
|
||||||
|
|
||||||
to.writeInt(position.getZ());
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static Vector2i readIntChunkCoord(ByteBuf from) {
|
public static Vector2i readIntChunkCoord(ByteBuf from) {
|
||||||
|
|
||||||
return new Vector2i(from.readInt(), from.readInt());
|
return new Vector2i(from.readInt(), from.readInt());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static Vector2i readVarIntChunkCoord(ByteBuf from) {
|
public static Vector2i readVarIntChunkCoord(ByteBuf from) {
|
||||||
|
|
||||||
return new Vector2i(VarNumberSerializer.readVarInt(from), VarNumberSerializer.readVarInt(from));
|
return new Vector2i(VarNumberSerializer.readVarInt(from), VarNumberSerializer.readVarInt(from));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void writeIntChunkCoord(ByteBuf to, Vector2i chunk) {
|
public static void writeIntChunkCoord(ByteBuf to, Vector2i chunk) {
|
||||||
|
|
||||||
to.writeInt(chunk.getX());
|
to.writeInt(chunk.getX());
|
||||||
|
|
||||||
to.writeInt(chunk.getY());
|
to.writeInt(chunk.getY());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static Vector2i readPEChunkCoord(ByteBuf from) {
|
public static Vector2i readPEChunkCoord(ByteBuf from) {
|
||||||
|
|
||||||
return new Vector2i(VarNumberSerializer.readSVarInt(from), VarNumberSerializer.readSVarInt(from));
|
return new Vector2i(VarNumberSerializer.readSVarInt(from), VarNumberSerializer.readSVarInt(from));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void writePEChunkCoord(ByteBuf to, Vector2i chunk) {
|
public static void writePEChunkCoord(ByteBuf to, Vector2i chunk) {
|
||||||
|
|
||||||
VarNumberSerializer.writeSVarInt(to, chunk.getX());
|
VarNumberSerializer.writeSVarInt(to, chunk.getX());
|
||||||
|
|
||||||
VarNumberSerializer.writeSVarInt(to, chunk.getY());
|
VarNumberSerializer.writeSVarInt(to, chunk.getY());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static int readLocalCoord(ByteBuf from) {
|
public static int readLocalCoord(ByteBuf from) {
|
||||||
|
|
||||||
return from.readUnsignedShort();
|
return from.readUnsignedShort();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void writeLocalCoord(ByteBuf to, int coord) {
|
public static void writeLocalCoord(ByteBuf to, int coord) {
|
||||||
|
|
||||||
to.writeShort(coord);
|
to.writeShort(coord);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public static void writeVarIntChunkCoord(ByteBuf to, Vector2i chunk) {
|
public static void writeVarIntChunkCoord(ByteBuf to, Vector2i chunk) {
|
||||||
|
|
||||||
VarNumberSerializer.writeVarInt(to, chunk.getX());
|
VarNumberSerializer.writeVarInt(to, chunk.getX());
|
||||||
|
|
||||||
VarNumberSerializer.writeVarInt(to, chunk.getY());
|
VarNumberSerializer.writeVarInt(to, chunk.getY());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren