From 5fcd5a6a3c61d3ce50c713a7ba2dac88b8034762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Fri, 18 Dec 2020 19:36:42 +0100 Subject: [PATCH] Moved some utilities to Sedna. --- .../serializers/BitSetSerializer.java | 36 ------------------- .../common/util/ByteBufferInputStream.java | 32 ----------------- .../common/util/ByteBufferOutputStream.java | 32 ----------------- 3 files changed, 100 deletions(-) delete mode 100644 src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java delete mode 100644 src/main/java/li/cil/oc2/common/util/ByteBufferInputStream.java delete mode 100644 src/main/java/li/cil/oc2/common/util/ByteBufferOutputStream.java diff --git a/src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java b/src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java deleted file mode 100644 index 03b7e8d0..00000000 --- a/src/main/java/li/cil/oc2/common/serialization/serializers/BitSetSerializer.java +++ /dev/null @@ -1,36 +0,0 @@ -package li.cil.oc2.common.serialization.serializers; - -import li.cil.ceres.api.*; - -import javax.annotation.Nullable; -import java.util.BitSet; - -@RegisterSerializer -public final class BitSetSerializer implements Serializer { - @Override - public void serialize(final SerializationVisitor visitor, final Class type, final Object value) throws SerializationException { - visitor.putObject("value", long[].class, ((BitSet) value).toLongArray()); - } - - @Override - public BitSet deserialize(final DeserializationVisitor visitor, final Class type, @Nullable final Object value) throws SerializationException { - BitSet bitSet = (BitSet) value; - if (!visitor.exists("value")) { - return bitSet; - } - - final long[] longs = (long[]) visitor.getObject("value", long[].class, null); - if (longs == null) { - return null; - } - - if (bitSet == null) { - bitSet = BitSet.valueOf(longs); - } else { - bitSet.clear(); - bitSet.or(BitSet.valueOf(longs)); - } - - return bitSet; - } -} diff --git a/src/main/java/li/cil/oc2/common/util/ByteBufferInputStream.java b/src/main/java/li/cil/oc2/common/util/ByteBufferInputStream.java deleted file mode 100644 index 067438dc..00000000 --- a/src/main/java/li/cil/oc2/common/util/ByteBufferInputStream.java +++ /dev/null @@ -1,32 +0,0 @@ -package li.cil.oc2.common.util; - -import java.io.InputStream; -import java.nio.ByteBuffer; - -public final class ByteBufferInputStream extends InputStream { - private final ByteBuffer buffer; - - public ByteBufferInputStream(final ByteBuffer buffer) { - this.buffer = buffer.slice(); - } - - @Override - public int read() { - if (!buffer.hasRemaining()) { - return -1; - } - return buffer.get(); - } - - @Override - public int read(final byte[] b, final int off, int len) { - len = Math.min(len, buffer.remaining()); - if (len == 0) { - return -1; - } - - buffer.get(b, off, len); - - return len; - } -} diff --git a/src/main/java/li/cil/oc2/common/util/ByteBufferOutputStream.java b/src/main/java/li/cil/oc2/common/util/ByteBufferOutputStream.java deleted file mode 100644 index f0888e1c..00000000 --- a/src/main/java/li/cil/oc2/common/util/ByteBufferOutputStream.java +++ /dev/null @@ -1,32 +0,0 @@ -package li.cil.oc2.common.util; - -import java.io.IOException; -import java.io.OutputStream; -import java.nio.BufferOverflowException; -import java.nio.ByteBuffer; - -public final class ByteBufferOutputStream extends OutputStream { - private final ByteBuffer buffer; - - public ByteBufferOutputStream(final ByteBuffer buffer) { - this.buffer = buffer.slice(); - } - - @Override - public void write(final int b) throws IOException { - try { - buffer.put((byte) b); - } catch (final BufferOverflowException e) { - throw new IOException(e); - } - } - - @Override - public void write(final byte[] b, final int off, final int len) throws IOException { - try { - buffer.put(b, off, len); - } catch (final BufferOverflowException e) { - throw new IOException(e); - } - } -}