From 21d293dd7fe4adb6e0bcefd61ebdacaa8ea86ac5 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Fri, 20 Oct 2023 17:22:00 +1000 Subject: [PATCH] Rneame CustomByteType -> FixedByteArrayType --- .../viaversion/api/type/PartialType.java | 1 + ...mByteType.java => FixedByteArrayType.java} | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) rename api/src/main/java/com/viaversion/viaversion/api/type/types/{CustomByteType.java => FixedByteArrayType.java} (69%) diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/PartialType.java b/api/src/main/java/com/viaversion/viaversion/api/type/PartialType.java index 226fbddac..fdfea808e 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/PartialType.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/PartialType.java @@ -24,6 +24,7 @@ package com.viaversion.viaversion.api.type; import io.netty.buffer.ByteBuf; +@Deprecated public abstract class PartialType extends Type { private final X param; diff --git a/api/src/main/java/com/viaversion/viaversion/api/type/types/CustomByteType.java b/api/src/main/java/com/viaversion/viaversion/api/type/types/FixedByteArrayType.java similarity index 69% rename from api/src/main/java/com/viaversion/viaversion/api/type/types/CustomByteType.java rename to api/src/main/java/com/viaversion/viaversion/api/type/types/FixedByteArrayType.java index bbfeff66a..42ff99edb 100644 --- a/api/src/main/java/com/viaversion/viaversion/api/type/types/CustomByteType.java +++ b/api/src/main/java/com/viaversion/viaversion/api/type/types/FixedByteArrayType.java @@ -22,27 +22,31 @@ */ package com.viaversion.viaversion.api.type.types; -import com.viaversion.viaversion.api.type.PartialType; +import com.viaversion.viaversion.api.type.Type; import io.netty.buffer.ByteBuf; -public class CustomByteType extends PartialType { +public class FixedByteArrayType extends Type { - public CustomByteType(Integer param) { - super(param, byte[].class); + private final int arrayLength; + + public FixedByteArrayType(final int arrayLength) { + super(byte[].class); + this.arrayLength = arrayLength; } @Override - public byte[] read(ByteBuf byteBuf, Integer integer) throws Exception { - if (byteBuf.readableBytes() < integer) throw new RuntimeException("Readable bytes does not match expected!"); + public byte[] read(final ByteBuf byteBuf) throws Exception { + if (byteBuf.readableBytes() < this.arrayLength) { + throw new RuntimeException("Readable bytes does not match expected!"); + } - byte[] byteArray = new byte[integer]; + final byte[] byteArray = new byte[this.arrayLength]; byteBuf.readBytes(byteArray); - return byteArray; } @Override - public void write(ByteBuf byteBuf, Integer integer, byte[] bytes) throws Exception { + public void write(final ByteBuf byteBuf, final byte[] bytes) throws Exception { byteBuf.writeBytes(bytes); } } \ No newline at end of file