feature/cleanup #2

Merged
manuel merged 4 commits from feature/cleanup into master 2023-04-04 02:11:10 +02:00
5 changed files with 17 additions and 5 deletions
Showing only changes of commit e1781dbdc4 - Show all commits

View file

@ -2,7 +2,11 @@ package ch.fritteli.labyrinth.generator.model;
import io.vavr.collection.Stream; import io.vavr.collection.Stream;
import io.vavr.control.Option; import io.vavr.control.Option;
import lombok.*; import lombok.AccessLevel;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NonNull;
import lombok.ToString;
import lombok.experimental.FieldDefaults; import lombok.experimental.FieldDefaults;
import java.util.EnumSet; import java.util.EnumSet;

View file

@ -5,7 +5,11 @@ import lombok.EqualsAndHashCode;
import lombok.NonNull; import lombok.NonNull;
import lombok.ToString; import lombok.ToString;
import java.util.*; import java.util.EnumSet;
import java.util.HashSet;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@EqualsAndHashCode @EqualsAndHashCode
@ToString @ToString

View file

@ -6,7 +6,9 @@ import lombok.NonNull;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.*; import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.MAGIC_BYTE_1;
import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.MAGIC_BYTE_2;
import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.VERSION_BYTE;
public class LabyrinthInputStream extends ByteArrayInputStream { public class LabyrinthInputStream extends ByteArrayInputStream {
public LabyrinthInputStream(@NonNull final byte[] buf) { public LabyrinthInputStream(@NonNull final byte[] buf) {

View file

@ -6,7 +6,9 @@ import lombok.NonNull;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.*; import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.MAGIC_BYTE_1;
import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.MAGIC_BYTE_2;
import static ch.fritteli.labyrinth.generator.serialization.SerializerDeserializer.VERSION_BYTE;
public class LabyrinthOutputStream extends ByteArrayOutputStream { public class LabyrinthOutputStream extends ByteArrayOutputStream {
public void writeHeader() { public void writeHeader() {

View file

@ -128,7 +128,7 @@ public class SerializerDeserializer {
} }
@NonNull @NonNull
Tile getTileForBitmask(final byte bitmask) { Tile getTileForBitmask(final byte bitmask) {
final EnumSet<Direction> walls = EnumSet.noneOf(Direction.class); final EnumSet<Direction> walls = EnumSet.noneOf(Direction.class);
if ((bitmask & TOP_BIT) == TOP_BIT) { if ((bitmask & TOP_BIT) == TOP_BIT) {
walls.add(Direction.TOP); walls.add(Direction.TOP);