Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-05 23:11:36 +01:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
themode 2020-11-18 06:39:20 +01:00
parent 2a1a1cdcbc
commit 40d6a71697
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/storage/StorageLocation.java
View File

@ -93,9 +93,9 @@ public class StorageLocation {
Check.notNull(dataType, "You can only save registered DataType type!"); Check.notNull(dataType, "You can only save registered DataType type!");
// Encode the data // Encode the data
BinaryWriter binaryWriter = new BinaryWriter(); BinaryWriter writer = new BinaryWriter();
dataType.encode(binaryWriter, object); // Encode dataType.encode(writer, object); // Encode
final byte[] encodedValue = binaryWriter.toByteArray(); // Retrieve bytes final byte[] encodedValue = writer.toByteArray(); // Retrieve bytes
// Write it // Write it
set(key, encodedValue); set(key, encodedValue);

1
src/main/java/net/minestom/server/utils/PacketUtils.java
View File

@ -74,6 +74,7 @@ public final class PacketUtils {
private static void writePacket(@NotNull ByteBuf buf, @NotNull ByteBuf packetBuffer, int packetId) { private static void writePacket(@NotNull ByteBuf buf, @NotNull ByteBuf packetBuffer, int packetId) {
Utils.writeVarIntBuf(buf, packetId); Utils.writeVarIntBuf(buf, packetId);
buf.writeBytes(packetBuffer); buf.writeBytes(packetBuffer);
packetBuffer.release();
} }
/** /**

12
src/main/java/net/minestom/server/utils/binary/BinaryWriter.java
View File

@ -7,6 +7,7 @@ import net.minestom.server.utils.BlockPosition;
import net.minestom.server.utils.NBTUtils; import net.minestom.server.utils.NBTUtils;
import net.minestom.server.utils.SerializerUtils; import net.minestom.server.utils.SerializerUtils;
import net.minestom.server.utils.Utils; import net.minestom.server.utils.Utils;
import org.jetbrains.annotations.NotNull;
import org.jglrxavpok.hephaistos.nbt.NBT; import org.jglrxavpok.hephaistos.nbt.NBT;
import org.jglrxavpok.hephaistos.nbt.NBTWriter; import org.jglrxavpok.hephaistos.nbt.NBTWriter;
@ -34,12 +35,21 @@ public class BinaryWriter extends OutputStream {
this.buffer = Unpooled.buffer(initialCapacity); this.buffer = Unpooled.buffer(initialCapacity);
} }
/**
* Creates a {@link BinaryWriter} from multiple a single buffer.
*
* @param buffer the writer buffer
*/
public BinaryWriter(@NotNull ByteBuf buffer) {
this.buffer = buffer;
}
/** /**
* Creates a {@link BinaryWriter} from multiple buffers. * Creates a {@link BinaryWriter} from multiple buffers.
* *
* @param buffers the buffers making this * @param buffers the buffers making this
*/ */
public BinaryWriter(ByteBuf... buffers) { public BinaryWriter(@NotNull ByteBuf... buffers) {
this.buffer = Unpooled.wrappedBuffer(buffers); this.buffer = Unpooled.wrappedBuffer(buffers);
} }