T get(String key)
- {
- return get(key, (T) null);
- }
-
-
- public void put(String key, IonObjBinary value)
- {
- if (key == null || value == null) return;
- backingMap.put(key, value);
- }
-
-
- public void put(String key, boolean value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, byte value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, char value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, short value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, int value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, long value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, double value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, float value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, String value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, boolean[] value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, char[] value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, short[] value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, int[] value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, long[] value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, double[] value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, float[] value)
- {
- backingMap.put(key, value);
- }
-
-
- public void put(String key, String[] value)
- {
- backingMap.put(key, value);
- }
-
-
- @SuppressWarnings("rawtypes")
- public void putSequence(String key, Collection c)
- {
- backingMap.put(key, new IonSequenceWrapper(c));
- }
-
-
- @SuppressWarnings("rawtypes")
- public void putMap(String key, Map m)
- {
- backingMap.put(key, new IonMapWrapper(m));
- }
-
-
- @Override
- public short getIonMark()
- {
- return Ion.DATA_BUNDLE;
- }
-
-
- @Override
- public void load(IonInput in) throws IOException
- {
- in.readMap(backingMap);
- }
-
-
- @Override
- public void save(IonOutput out) throws IOException
- {
- out.writeMap(backingMap);
- }
-
-
- public int size()
- {
- return backingMap.size();
- }
-
-
- public boolean isEmpty()
- {
- return backingMap.isEmpty();
- }
-
-
- public void clear()
- {
- backingMap.clear();
- }
-
-
- public Object remove(Object key)
- {
- return backingMap.remove(key);
- }
-
-
- public void putAll(IonBundle otherBundle)
- {
- backingMap.putAll(otherBundle.backingMap);
- }
-
-
- @Override
- public String toString()
- {
- return backingMap.toString();
- }
-
-
- @Override
- public boolean equals(Object o)
- {
- return backingMap.equals(o);
- }
-
-
- @Override
- public int hashCode()
- {
- return 47 ^ backingMap.hashCode();
- }
-}
diff --git a/src/mightypork/gamecore/util/ion/IonInput.java b/src/mightypork/gamecore/util/ion/IonInput.java
deleted file mode 100644
index c4eef32..0000000
--- a/src/mightypork/gamecore/util/ion/IonInput.java
+++ /dev/null
@@ -1,454 +0,0 @@
-package mightypork.gamecore.util.ion;
-
-
-import java.io.DataInput;
-import java.io.DataInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import mightypork.gamecore.util.error.CorruptDataException;
-
-
-/**
- * Ion input stream
- *
- * @author MightyPork
- */
-public class IonInput {
-
- private final DataInput in;
-
-
- public IonInput(InputStream in)
- {
- this.in = new DataInputStream(in);
- }
-
-
- /**
- * Read int 0-255. Suitable when the int was written using
- * writeIntByte() method.
- *
- * @return int
- * @throws IOException
- */
- public int readIntByte() throws IOException
- {
- return in.readUnsignedByte();
- }
-
-
- /**
- * Read an int 0-65535. Suitable when the int was written using
- * writeIntShort() method.
- *
- * @return int
- * @throws IOException
- */
- public int readIntShort() throws IOException
- {
- return in.readUnsignedShort();
- }
-
-
- public boolean readBoolean() throws IOException
- {
- return in.readBoolean();
- }
-
-
- public byte readByte() throws IOException
- {
- return in.readByte();
- }
-
-
- public short readShort() throws IOException
- {
- return in.readShort();
- }
-
-
- public char readChar() throws IOException
- {
- return in.readChar();
- }
-
-
- public int readInt() throws IOException
- {
- return in.readInt();
- }
-
-
- public long readLong() throws IOException
- {
- return in.readLong();
- }
-
-
- public float readFloat() throws IOException
- {
- return in.readFloat();
- }
-
-
- public double readDouble() throws IOException
- {
- return in.readDouble();
- }
-
-
- public String readString() throws IOException
- {
- return in.readUTF();
- }
-
-
- public boolean[] readBooleans() throws IOException
- {
- final int length = readLength();
- final boolean[] arr = new boolean[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readBoolean();
- }
- return arr;
- }
-
-
- public byte[] readBytes() throws IOException
- {
- final int length = readLength();
- final byte[] arr = new byte[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readByte();
- }
- return arr;
- }
-
-
- public char[] readChars() throws IOException
- {
- final int length = readLength();
- final char[] arr = new char[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readChar();
- }
- return arr;
- }
-
-
- public short[] readShorts() throws IOException
- {
- final int length = readLength();
- final short[] arr = new short[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readShort();
- }
- return arr;
- }
-
-
- public int[] readInts() throws IOException
- {
- final int length = readLength();
- final int[] arr = new int[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readInt();
- }
- return arr;
- }
-
-
- public long[] readLongs() throws IOException
- {
- final int length = readLength();
- final long[] arr = new long[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readLong();
- }
- return arr;
- }
-
-
- public float[] readFloats() throws IOException
- {
- final int length = readLength();
- final float[] arr = new float[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readFloat();
- }
- return arr;
- }
-
-
- public double[] readDoubles() throws IOException
- {
- final int length = readLength();
- final double[] arr = new double[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readDouble();
- }
- return arr;
- }
-
-
- public String[] readStrings() throws IOException
- {
- final int length = readLength();
- final String[] arr = new String[length];
- for (int i = 0; i < length; i++) {
- arr[i] = in.readUTF();
- }
- return arr;
- }
-
-
- public Object[] readObjects() throws IOException
- {
- final int length = readLength();
- final Object[] arr = new Object[length];
- for (int i = 0; i < length; i++) {
- arr[i] = readObject();
- }
- return arr;
- }
-
-
- /**
- * Read bundle without a mark
- */
- public IonBundle readBundle() throws IOException
- {
- final IonBundle ib = new IonBundle();
- ib.load(this);
- return ib;
- }
-
-
- /**
- * Read bundle without a mark, load into a provided one
- */
- public void readBundle(IonBundle filled) throws IOException
- {
- filled.clear();
- filled.load(this);
- }
-
-
- private int readMark() throws IOException
- {
- return readIntByte();
- }
-
-
- private int readLength() throws IOException
- {
- return readIntShort();
- }
-
-
- /**
- *
- * Read object based on mark; if null mark is found, returns default value.
- *
- *
- * If, however, an object of invalid or different type is found, an
- * exception will be thrown.
- *
- *
- * @param def default value.
- * @return the loaded object
- * @throws IOException
- */
- @SuppressWarnings("unchecked")
- public T readObject(T def) throws IOException
- {
- try {
- final Object o = readObject();
- return (T) (o == null ? def : o);
- } catch (final Exception e) {
- throw new IOException("Could not load object.", e);
- }
- }
-
-
- /**
- * Read single object, preceded by a mark.
- *
- * @return the loaded object
- * @throws IOException
- */
- public Object readObject() throws IOException
- {
- final int mark = readMark();
- if (Ion.isMarkForBinary(mark)) {
- IonObjBinary loaded;
-
- try {
-
- loaded = Ion.getClassForMark(mark).newInstance();
-
- } catch (InstantiationException | IllegalAccessException e) {
- throw new RuntimeException("Couldn not load object with mark: " + mark, e);
- }
-
- loaded.load(this);
- return loaded;
- }
-
- switch (mark) {
- case Ion.NULL:
- return null;
-
- case Ion.BOOLEAN:
- return readBoolean();
-
- case Ion.BYTE:
- return readByte();
-
- case Ion.CHAR:
- return readChar();
-
- case Ion.SHORT:
- return readShort();
-
- case Ion.INT:
- return readInt();
-
- case Ion.LONG:
- return readLong();
-
- case Ion.FLOAT:
- return readFloat();
-
- case Ion.DOUBLE:
- return readDouble();
-
- case Ion.STRING:
- return readString();
-
- case Ion.BOOLEAN_ARRAY:
- return readBooleans();
-
- case Ion.BYTE_ARRAY:
- return readBytes();
-
- case Ion.CHAR_ARRAY:
- return readChars();
-
- case Ion.SHORT_ARRAY:
- return readShorts();
-
- case Ion.INT_ARRAY:
- return readInts();
-
- case Ion.LONG_ARRAY:
- return readLongs();
-
- case Ion.FLOAT_ARRAY:
- return readFloats();
-
- case Ion.DOUBLE_ARRAY:
- return readDoubles();
-
- case Ion.STRING_ARRAY:
- return readStrings();
-
- default:
- throw new CorruptDataException("Invalid mark: " + mark);
- }
- }
-
-
- /**
- * Reads mark and returns true if the mark is ENTRY, false if the mark is
- * END. Throws an exception otherwise.
- *
- * @return mark was ENTRY
- * @throws IOException when the mark is neither ENTRY or END.
- */
- public boolean hasNextEntry() throws IOException
- {
- final int mark = readMark();
- if (mark == Ion.ENTRY) return true;
- if (mark == Ion.END) return false;
-
- throw new CorruptDataException("Unexpected mark in sequence: " + mark);
- }
-
-
- /**
- * Read a sequence of elements into an ArrayList
- *
- * @return the collection
- * @throws IOException
- */
- public Collection readSequence() throws IOException
- {
- return readSequence(new ArrayList());
- }
-
-
- /**
- * Load entries into a collection. The collection is cleaned first.
- *
- * @param filled collection to populate
- * @return the collection
- * @throws IOException
- */
- @SuppressWarnings("unchecked")
- public Collection readSequence(Collection filled) throws IOException
- {
- try {
- filled.clear();
- while (hasNextEntry()) {
- filled.add((T) readObject());
- }
- return filled;
- } catch (final ClassCastException e) {
- throw new CorruptDataException("Unexpected element type in sequence.", e);
- }
- }
-
-
- /**
- * Read element pairs into a HashMap
- *
- * @return the map
- * @throws IOException
- */
- public Map readMap() throws IOException
- {
- return readMap(new HashMap());
- }
-
-
- /**
- * Load data into a map. The map is cleaned first.
- *
- * @param filled filled map
- * @return the map
- * @throws IOException
- */
- @SuppressWarnings("unchecked")
- public Map readMap(Map filled) throws IOException
- {
- try {
- filled.clear();
- while (hasNextEntry()) {
- final K key = (K) readObject();
- final V value = (V) readObject();
-
- filled.put(key, value);
- }
- return filled;
- } catch (final ClassCastException e) {
- throw new CorruptDataException("Unexpected element type in map.", e);
- }
- }
-}
diff --git a/src/mightypork/gamecore/util/ion/IonMapWrapper.java b/src/mightypork/gamecore/util/ion/IonMapWrapper.java
deleted file mode 100644
index ec505b5..0000000
--- a/src/mightypork/gamecore/util/ion/IonMapWrapper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package mightypork.gamecore.util.ion;
-
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-
-@SuppressWarnings({ "rawtypes", "unchecked" })
-public class IonMapWrapper implements IonObjBinary {
-
- private final Map map;
-
-
- public IonMapWrapper()
- {
- map = new HashMap();
- }
-
-
- public IonMapWrapper(Map saved)
- {
- map = saved;
- }
-
-
- @Override
- public void load(IonInput in) throws IOException
- {
- map.clear();
- in.readMap(map);
- }
-
-
- @Override
- public void save(IonOutput out) throws IOException
- {
- out.writeMap(map);
- }
-
-
- public void fill(Map o)
- {
- o.clear();
- o.putAll(map);
- }
-
-
- @Override
- public short getIonMark()
- {
- return Ion.MAP_WRAPPER;
- }
-
-}
diff --git a/src/mightypork/gamecore/util/ion/IonObjBinary.java b/src/mightypork/gamecore/util/ion/IonObjBinary.java
deleted file mode 100644
index 8240dd8..0000000
--- a/src/mightypork/gamecore/util/ion/IonObjBinary.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package mightypork.gamecore.util.ion;
-
-
-/**
- * Binary ion object, with a mark = saveable / loadable on it's own
- *
- * @author MightyPork
- */
-public interface IonObjBinary extends IonObjBlob {
-
- /**
- * Get Ion mark byte.
- *
- * @return Ion mark byte.
- */
- public short getIonMark();
-}
diff --git a/src/mightypork/gamecore/util/ion/IonObjBlob.java b/src/mightypork/gamecore/util/ion/IonObjBlob.java
deleted file mode 100644
index 834974a..0000000
--- a/src/mightypork/gamecore/util/ion/IonObjBlob.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package mightypork.gamecore.util.ion;
-
-
-import java.io.IOException;
-
-
-/**
- * Binary ion object, with no mark = cannot be loaded on it's own
- *
- * @author MightyPork
- */
-public interface IonObjBlob {
-
- /**
- * Load data from the input stream.
- *
- * @param in input stream
- * @throws IOException
- */
- void load(IonInput in) throws IOException;
-
-
- /**
- * Store data to output stream (in such way that the load method will later
- * be able to read it).
- *
- * @param out Output stream
- * @throws IOException
- */
- void save(IonOutput out) throws IOException;
-}
diff --git a/src/mightypork/gamecore/util/ion/IonObjBundled.java b/src/mightypork/gamecore/util/ion/IonObjBundled.java
deleted file mode 100644
index 4d5a462..0000000
--- a/src/mightypork/gamecore/util/ion/IonObjBundled.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package mightypork.gamecore.util.ion;
-
-
-import java.io.IOException;
-
-
-/**
- * Bundled ion object
- *
- * @author MightyPork
- */
-public interface IonObjBundled {
-
- void load(IonBundle bundle) throws IOException;
-
-
- void save(IonBundle bundle) throws IOException;
-}
diff --git a/src/mightypork/gamecore/util/ion/IonOutput.java b/src/mightypork/gamecore/util/ion/IonOutput.java
deleted file mode 100644
index 60a20d4..0000000
--- a/src/mightypork/gamecore/util/ion/IonOutput.java
+++ /dev/null
@@ -1,398 +0,0 @@
-package mightypork.gamecore.util.ion;
-
-
-import java.io.DataOutput;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import mightypork.gamecore.logging.Log;
-
-
-/**
- * Ion output stream
- *
- * @author MightyPork
- */
-public class IonOutput {
-
- private final DataOutput out;
-
-
- public IonOutput(OutputStream out)
- {
- this.out = new DataOutputStream(out);
- }
-
-
- public void writeBoolean(boolean a) throws IOException
- {
- out.writeBoolean(a);
- }
-
-
- public void writeByte(int a) throws IOException
- {
- out.writeByte(a);
- }
-
-
- public void writeShort(int a) throws IOException
- {
- out.writeShort(a);
- }
-
-
- public void writeChar(int a) throws IOException
- {
- out.writeChar(a);
- }
-
-
- public void writeInt(int a) throws IOException
- {
- out.writeInt(a);
- }
-
-
- public void writeIntShort(int a) throws IOException
- {
- out.writeShort(a);
- }
-
-
- public void writeIntByte(int a) throws IOException
- {
- out.writeByte(a);
- }
-
-
- public void writeLong(long a) throws IOException
- {
- out.writeLong(a);
- }
-
-
- public void writeFloat(float a) throws IOException
- {
- out.writeFloat(a);
- }
-
-
- public void writeDouble(double a) throws IOException
- {
- out.writeDouble(a);
- }
-
-
- public void writeBytes(String a) throws IOException
- {
- out.writeBytes(a);
- }
-
-
- public void writeString(String a) throws IOException
- {
- out.writeUTF(a);
- }
-
-
- public void writeBooleans(boolean[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final boolean a : arr) {
- out.writeBoolean(a);
- }
- }
-
-
- public void writeBytes(byte[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final byte a : arr) {
- out.writeByte(a);
- }
- }
-
-
- public void writeChars(char[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final char a : arr) {
- out.writeChar(a);
- }
- }
-
-
- public void writeShorts(short[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final short a : arr) {
- out.writeShort(a);
- }
- }
-
-
- public void writeInts(int[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final int a : arr) {
- out.writeInt(a);
- }
- }
-
-
- public void writeLongs(long[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final long a : arr) {
- out.writeLong(a);
- }
- }
-
-
- public void writeFloats(float[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final float a : arr) {
- out.writeFloat(a);
- }
- }
-
-
- public void writeDoubles(double[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final double a : arr) {
- out.writeDouble(a);
- }
- }
-
-
- public void writeStrings(String[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final String a : arr) {
- out.writeUTF(a);
- }
- }
-
-
- /**
- * Write a bundle without a mark
- */
- public void writeBundle(IonBundle bundle) throws IOException
- {
- bundle.save(this);
- }
-
-
- /**
- * Write array of objects. Supported are Ionizables, primitive types,
- * String, and their arrays.
- *
- * @param arr array to write
- * @throws IOException on IO error or on invalid object type.
- */
- public void writeObjects(Object[] arr) throws IOException
- {
- writeLength(arr.length);
- for (final Object a : arr) {
- writeObject(a);
- }
- }
-
-
- public void writeSequence(Collection sequence) throws IOException
- {
- for (final T element : sequence) {
- startEntry();
- writeObject(element);
- }
- endSequence();
- }
-
-
- public void writeMap(Map map) throws IOException
- {
- for (final Entry e : map.entrySet()) {
- if (e.getValue() == null) {
- continue;
- }
-
- startEntry();
- writeObject(e.getKey());
- writeObject(e.getValue());
- }
- endSequence();
- }
-
-
- public void endSequence() throws IOException
- {
- writeMark(Ion.END);
- }
-
-
- public void startEntry() throws IOException
- {
- writeMark(Ion.ENTRY);
- }
-
-
- private void writeMark(int mark) throws IOException
- {
- writeIntByte(mark);
- }
-
-
- private void writeLength(int length) throws IOException
- {
- writeIntShort(length);
- }
-
-
- /**
- * Write an object. Supported are Ionizable, primitive types, String, and
- * their arrays.
- *
- * @param obj obj to write
- * @throws IOException on IO error or invalid object type.
- */
- public void writeObject(Object obj) throws IOException
- {
- if (obj == null) {
- writeMark(Ion.NULL);
- return;
- }
-
- if (obj instanceof IonObjBinary) {
-
- final IonObjBinary ionObject = (IonObjBinary) obj;
-
- Ion.assertRegistered(ionObject);
-
- writeMark(ionObject.getIonMark());
- ionObject.save(this);
-
- return;
- }
-
- if (obj instanceof IonObjBundled) {
- throw new IOException("Bundled objects cannot be written to ION stream directly at " + obj);
- }
-
- if (obj instanceof Boolean) {
- writeMark(Ion.BOOLEAN);
- writeBoolean((Boolean) obj);
- return;
- }
-
- if (obj instanceof Byte) {
- writeMark(Ion.BYTE);
- writeByte((Byte) obj);
- return;
- }
-
- if (obj instanceof Character) {
- writeMark(Ion.CHAR);
- writeChar((Character) obj);
- return;
- }
-
- if (obj instanceof Short) {
- writeMark(Ion.SHORT);
- writeShort((Short) obj);
- return;
- }
-
- if (obj instanceof Integer) {
- writeMark(Ion.INT);
- writeInt((Integer) obj);
- return;
- }
-
- if (obj instanceof Long) {
- writeMark(Ion.LONG);
- writeLong((Long) obj);
- return;
- }
-
- if (obj instanceof Float) {
- writeMark(Ion.FLOAT);
- writeFloat((Float) obj);
- return;
- }
-
- if (obj instanceof Double) {
- writeMark(Ion.DOUBLE);
- writeDouble((Double) obj);
- return;
- }
-
- if (obj instanceof String) {
- writeMark(Ion.STRING);
- writeString((String) obj);
- return;
- }
-
- if (obj instanceof boolean[]) {
- writeMark(Ion.BOOLEAN_ARRAY);
- writeBooleans((boolean[]) obj);
- return;
- }
-
- if (obj instanceof byte[]) {
- writeMark(Ion.BYTE_ARRAY);
- writeBytes((byte[]) obj);
- return;
- }
-
- if (obj instanceof char[]) {
- writeMark(Ion.CHAR_ARRAY);
- writeChars((char[]) obj);
- return;
- }
-
- if (obj instanceof short[]) {
- writeMark(Ion.SHORT_ARRAY);
- writeShorts((short[]) obj);
- return;
- }
-
- if (obj instanceof int[]) {
- writeMark(Ion.INT_ARRAY);
- writeInts((int[]) obj);
- return;
- }
-
- if (obj instanceof long[]) {
- writeMark(Ion.LONG_ARRAY);
- writeLongs((long[]) obj);
- return;
- }
-
- if (obj instanceof float[]) {
- writeMark(Ion.FLOAT_ARRAY);
- writeFloats((float[]) obj);
- return;
- }
-
- if (obj instanceof double[]) {
- writeMark(Ion.DOUBLE_ARRAY);
- writeDoubles((double[]) obj);
- return;
- }
-
- if (obj instanceof String[]) {
- writeMark(Ion.STRING_ARRAY);
- writeStrings((String[]) obj);
- return;
- }
-
- throw new IOException("Object " + Log.str(obj) + " could not be be written to stream.");
- }
-}
diff --git a/src/mightypork/gamecore/util/ion/IonSequenceWrapper.java b/src/mightypork/gamecore/util/ion/IonSequenceWrapper.java
deleted file mode 100644
index 5396f39..0000000
--- a/src/mightypork/gamecore/util/ion/IonSequenceWrapper.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package mightypork.gamecore.util.ion;
-
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-
-
-@SuppressWarnings({ "rawtypes", "unchecked" })
-public class IonSequenceWrapper implements IonObjBinary {
-
- private Collection collection = new ArrayList();
-
-
- public IonSequenceWrapper()
- {
- collection = new ArrayList();
- }
-
-
- public IonSequenceWrapper(Collection saved)
- {
- collection = saved;
- }
-
-
- @Override
- public void load(IonInput in) throws IOException
- {
- collection.clear();
- in.readSequence(collection);
- }
-
-
- @Override
- public void save(IonOutput out) throws IOException
- {
- out.writeSequence(collection);
- }
-
-
- public void fill(Collection o)
- {
- o.clear();
- o.addAll(collection);
- }
-
-
- @Override
- public short getIonMark()
- {
- return Ion.SEQUENCE_WRAPPER;
- }
-
-}
diff --git a/src/mightypork/gamecore/util/math/Calc.java b/src/mightypork/gamecore/util/math/Calc.java
index 1d40931..f46874c 100644
--- a/src/mightypork/gamecore/util/math/Calc.java
+++ b/src/mightypork/gamecore/util/math/Calc.java
@@ -14,7 +14,7 @@ import org.lwjgl.BufferUtils;
/**
* Math utils
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class Calc {
@@ -75,7 +75,7 @@ public class Calc {
/**
* Calc subclass with buffer utils.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public static class Buffers {
@@ -120,7 +120,7 @@ public class Calc {
/**
* Angle calculations for degrees.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public static class Deg {
@@ -280,7 +280,7 @@ public class Calc {
/**
* Angle calculations for radians.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public static class Rad {
diff --git a/src/mightypork/gamecore/util/math/Easing.java b/src/mightypork/gamecore/util/math/Easing.java
index 24737be..48a9fe5 100644
--- a/src/mightypork/gamecore/util/math/Easing.java
+++ b/src/mightypork/gamecore/util/math/Easing.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.annot.FactoryMethod;
/**
* EasingFunction function.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class Easing {
@@ -62,7 +62,7 @@ public abstract class Easing {
/**
* Reverse EasingFunction
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
private static class Reverse extends Easing {
@@ -88,7 +88,7 @@ public abstract class Easing {
/**
* Composite EasingFunction (0-0.5 EasingFunction A, 0.5-1 EasingFunction B)
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
private static class Composite extends Easing {
diff --git a/src/mightypork/gamecore/util/math/Polar.java b/src/mightypork/gamecore/util/math/Polar.java
index 7f2c24a..d57a33d 100644
--- a/src/mightypork/gamecore/util/math/Polar.java
+++ b/src/mightypork/gamecore/util/math/Polar.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Polar coordinate
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class Polar {
diff --git a/src/mightypork/gamecore/util/math/Range.java b/src/mightypork/gamecore/util/math/Range.java
index 70318a4..e4c3d59 100644
--- a/src/mightypork/gamecore/util/math/Range.java
+++ b/src/mightypork/gamecore/util/math/Range.java
@@ -7,7 +7,7 @@ import java.util.Random;
/**
* Numeric range, able to generate random numbers and give min/max values.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class Range {
diff --git a/src/mightypork/gamecore/util/math/algo/Coord.java b/src/mightypork/gamecore/util/math/algo/Coord.java
index 7c53a8b..4f03161 100644
--- a/src/mightypork/gamecore/util/math/algo/Coord.java
+++ b/src/mightypork/gamecore/util/math/algo/Coord.java
@@ -4,24 +4,24 @@ package mightypork.gamecore.util.math.algo;
import java.io.IOException;
import mightypork.gamecore.util.annot.FactoryMethod;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonObjBinary;
-import mightypork.gamecore.util.ion.IonObjBundled;
-import mightypork.gamecore.util.ion.IonOutput;
import mightypork.gamecore.util.math.Calc;
import mightypork.gamecore.util.math.constraints.vect.Vect;
import mightypork.gamecore.util.math.constraints.vect.VectConst;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonObjBinary;
+import mightypork.ion.IonObjBundled;
+import mightypork.ion.IonOutput;
/**
* Very simple integer coordinate
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
-public class Coord implements IonObjBundled, IonObjBinary {
+public class Coord implements IonObjBinary, IonObjBundled {
- public static final short ION_MARK = 255;
+ public static final int ION_MARK = 255;
public int x;
public int y;
@@ -180,31 +180,24 @@ public class Coord implements IonObjBundled, IonObjBinary {
}
- @Override
- public void load(IonBundle bundle) throws IOException
+ public static Coord fromVect(Vect vect)
{
- x = bundle.get("x", 0);
- y = bundle.get("y", 0);
+ return make((int) Math.floor(vect.x()), (int) Math.floor(vect.y()));
}
@Override
- public void save(IonBundle bundle) throws IOException
+ public void load(IonBundle in)
{
- bundle.put("x", x);
- bundle.put("y", y);
+ x = in.get("x", x);
+ y = in.get("y", y);
}
@Override
- public short getIonMark()
+ public void save(IonBundle out)
{
- return ION_MARK;
- }
-
-
- public static Coord fromVect(Vect vect)
- {
- return make((int) Math.floor(vect.x()), (int) Math.floor(vect.y()));
+ out.put("x", x);
+ out.put("y", y);
}
}
diff --git a/src/mightypork/gamecore/util/math/algo/Move.java b/src/mightypork/gamecore/util/math/algo/Move.java
index d78535b..246aa3f 100644
--- a/src/mightypork/gamecore/util/math/algo/Move.java
+++ b/src/mightypork/gamecore/util/math/algo/Move.java
@@ -3,20 +3,18 @@ package mightypork.gamecore.util.math.algo;
import java.io.IOException;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonObjBinary;
-import mightypork.gamecore.util.ion.IonObjBundled;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonObjBinary;
+import mightypork.ion.IonOutput;
/**
* Path step.
* Must be binary in order to be saveable in lists.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
-public class Move implements IonObjBinary, IonObjBundled {
+public class Move implements IonObjBinary {
public static final int ION_MARK = 254;
@@ -76,13 +74,6 @@ public class Move implements IonObjBinary, IonObjBundled {
}
- @Override
- public short getIonMark()
- {
- return ION_MARK;
- }
-
-
@Override
public String toString()
{
@@ -104,21 +95,4 @@ public class Move implements IonObjBinary, IonObjBundled {
out.writeByte(x);
out.writeByte(y);
}
-
-
- @Override
- public void load(IonBundle bundle) throws IOException
- {
- x = bundle.get("x", x);
- y = bundle.get("y", y);
- }
-
-
- @Override
- public void save(IonBundle bundle) throws IOException
- {
- bundle.put("x", x);
- bundle.put("y", y);
- }
-
}
diff --git a/src/mightypork/gamecore/util/math/algo/Moves.java b/src/mightypork/gamecore/util/math/algo/Moves.java
index 08f1911..3167a09 100644
--- a/src/mightypork/gamecore/util/math/algo/Moves.java
+++ b/src/mightypork/gamecore/util/math/algo/Moves.java
@@ -12,7 +12,7 @@ import mightypork.gamecore.util.math.Calc;
/**
* Move lists, bit masks and other utilities
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class Moves {
diff --git a/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinder.java b/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinder.java
index 8173d06..c23cb66 100644
--- a/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinder.java
+++ b/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinder.java
@@ -16,7 +16,7 @@ import mightypork.gamecore.util.math.algo.pathfinding.heuristics.ManhattanHeuris
/**
* A* pathfinder
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class PathFinder {
diff --git a/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinderProxy.java b/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinderProxy.java
index 163966b..49f44cc 100644
--- a/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinderProxy.java
+++ b/src/mightypork/gamecore/util/math/algo/pathfinding/PathFinderProxy.java
@@ -11,7 +11,7 @@ import mightypork.gamecore.util.math.algo.Move;
* Pathfinder proxy. Can be used to override individual methods but keep the
* rest as is.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class PathFinderProxy extends PathFinder {
diff --git a/src/mightypork/gamecore/util/math/color/Color.java b/src/mightypork/gamecore/util/math/color/Color.java
index c439f36..29404b3 100644
--- a/src/mightypork/gamecore/util/math/color/Color.java
+++ b/src/mightypork/gamecore/util/math/color/Color.java
@@ -13,7 +13,7 @@ import mightypork.gamecore.util.math.constraints.num.Num;
* Color.
* All values are 0-1
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class Color {
diff --git a/src/mightypork/gamecore/util/math/color/pal/CGA.java b/src/mightypork/gamecore/util/math/color/pal/CGA.java
index aa525a9..6e2cc56 100644
--- a/src/mightypork/gamecore/util/math/color/pal/CGA.java
+++ b/src/mightypork/gamecore/util/math/color/pal/CGA.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.color.Color;
/**
* CGA palette
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface CGA {
diff --git a/src/mightypork/gamecore/util/math/color/pal/CMDR.java b/src/mightypork/gamecore/util/math/color/pal/CMDR.java
index 63a8833..f03b238 100644
--- a/src/mightypork/gamecore/util/math/color/pal/CMDR.java
+++ b/src/mightypork/gamecore/util/math/color/pal/CMDR.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.color.Color;
/**
* COMMODORE palette
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface CMDR {
diff --git a/src/mightypork/gamecore/util/math/color/pal/PAL16.java b/src/mightypork/gamecore/util/math/color/pal/PAL16.java
index 08d500c..9f075ce 100644
--- a/src/mightypork/gamecore/util/math/color/pal/PAL16.java
+++ b/src/mightypork/gamecore/util/math/color/pal/PAL16.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.color.Color;
/**
* PAL16 palette via http://androidarts.com/palette/16pal.htm
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface PAL16 {
diff --git a/src/mightypork/gamecore/util/math/color/pal/RGB.java b/src/mightypork/gamecore/util/math/color/pal/RGB.java
index cdbdaf5..e278ab0 100644
--- a/src/mightypork/gamecore/util/math/color/pal/RGB.java
+++ b/src/mightypork/gamecore/util/math/color/pal/RGB.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.color.Color;
/**
* Basic RGB palette
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class RGB {
diff --git a/src/mightypork/gamecore/util/math/color/pal/ZX.java b/src/mightypork/gamecore/util/math/color/pal/ZX.java
index 5ed4ca2..50a7617 100644
--- a/src/mightypork/gamecore/util/math/color/pal/ZX.java
+++ b/src/mightypork/gamecore/util/math/color/pal/ZX.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.color.Color;
/**
* ZX Spectrum palette
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface ZX {
diff --git a/src/mightypork/gamecore/util/math/constraints/ConstraintCache.java b/src/mightypork/gamecore/util/math/constraints/ConstraintCache.java
index 024589a..212ee4e 100644
--- a/src/mightypork/gamecore/util/math/constraints/ConstraintCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/ConstraintCache.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.constraints;
/**
* Constraint cache
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @param constraint type
*/
public interface ConstraintCache extends Pollable {
diff --git a/src/mightypork/gamecore/util/math/constraints/DigestCache.java b/src/mightypork/gamecore/util/math/constraints/DigestCache.java
index ea427db..937a940 100644
--- a/src/mightypork/gamecore/util/math/constraints/DigestCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/DigestCache.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.constraints;
/**
* Parametrized implementation of a {@link Digestable}
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @param digest class
*/
public abstract class DigestCache implements Digestable {
diff --git a/src/mightypork/gamecore/util/math/constraints/Digestable.java b/src/mightypork/gamecore/util/math/constraints/Digestable.java
index 287b594..5d3bcb1 100644
--- a/src/mightypork/gamecore/util/math/constraints/Digestable.java
+++ b/src/mightypork/gamecore/util/math/constraints/Digestable.java
@@ -18,7 +18,7 @@ package mightypork.gamecore.util.math.constraints;
* that digest caching is enabled, and a flag that a digest is dirty.
*
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @param digest class
*/
public interface Digestable {
diff --git a/src/mightypork/gamecore/util/math/constraints/Pollable.java b/src/mightypork/gamecore/util/math/constraints/Pollable.java
index c2b98b1..4fca35c 100644
--- a/src/mightypork/gamecore/util/math/constraints/Pollable.java
+++ b/src/mightypork/gamecore/util/math/constraints/Pollable.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.constraints;
/**
* Can be asked to update it's state
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface Pollable {
diff --git a/src/mightypork/gamecore/util/math/constraints/Poller.java b/src/mightypork/gamecore/util/math/constraints/Poller.java
index 3b40238..12c6db5 100644
--- a/src/mightypork/gamecore/util/math/constraints/Poller.java
+++ b/src/mightypork/gamecore/util/math/constraints/Poller.java
@@ -8,7 +8,7 @@ import java.util.Set;
/**
* Used to poll a number of {@link Pollable}s
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class Poller implements Pollable {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/NumConst.java b/src/mightypork/gamecore/util/math/constraints/num/NumConst.java
index 7eb42aa..fa31fa9 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/NumConst.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/NumConst.java
@@ -9,7 +9,7 @@ import mightypork.gamecore.util.math.constraints.num.caching.NumDigest;
* It's arranged so that operations with constant arguments yield constant
* results.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NumConst extends Num {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/NumSum.java b/src/mightypork/gamecore/util/math/constraints/num/NumSum.java
index 2262896..7dbaad6 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/NumSum.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/NumSum.java
@@ -8,7 +8,7 @@ import java.util.List;
/**
* Expandable sum of multiple numbers
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NumSum extends Num {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/caching/AbstractNumCache.java b/src/mightypork/gamecore/util/math/constraints/num/caching/AbstractNumCache.java
index d5799a3..085cca2 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/caching/AbstractNumCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/caching/AbstractNumCache.java
@@ -16,7 +16,7 @@ import mightypork.gamecore.util.math.constraints.num.proxy.NumAdapter;
* default.
*
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class AbstractNumCache extends NumAdapter implements ConstraintCache {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/caching/NumCache.java b/src/mightypork/gamecore/util/math/constraints/num/caching/NumCache.java
index f1f70db..4ed9cf4 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/caching/NumCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/caching/NumCache.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.num.Num;
/**
* Num cache implementation
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NumCache extends AbstractNumCache {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimated.java b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimated.java
index 5c5ba23..41220e7 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimated.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimated.java
@@ -12,7 +12,7 @@ import mightypork.gamecore.util.math.timing.Pauseable;
* When both in and out easings are set differently, then they'll be used for
* fade-in and fade-out respectively. Otherwise both use the same.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NumAnimated extends NumMutable implements Updateable, Pauseable {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedDeg.java b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedDeg.java
index b49b65d..6c7d60c 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedDeg.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedDeg.java
@@ -9,7 +9,7 @@ import mightypork.gamecore.util.math.Easing;
/**
* Degree animator
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NumAnimatedDeg extends NumAnimated {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedRad.java b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedRad.java
index cbc6bd5..43474ad 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedRad.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumAnimatedRad.java
@@ -9,7 +9,7 @@ import mightypork.gamecore.util.math.Easing;
/**
* Radians animator
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NumAnimatedRad extends NumAnimated {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumMutable.java b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumMutable.java
index a3331e1..d9daeee 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumMutable.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumMutable.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.num.Num;
/**
* Mutable numeric variable
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class NumMutable extends Num {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumVar.java b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumVar.java
index 4878bd2..997b465 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/mutable/NumVar.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/mutable/NumVar.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.num.Num;
/**
* Mutable numeric variable.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NumVar extends NumMutable {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/proxy/NumBound.java b/src/mightypork/gamecore/util/math/constraints/num/proxy/NumBound.java
index 90952fa..dc6aaff 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/proxy/NumBound.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/proxy/NumBound.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.num.Num;
/**
* Numeric constraint
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface NumBound {
diff --git a/src/mightypork/gamecore/util/math/constraints/num/proxy/PluggableNumBound.java b/src/mightypork/gamecore/util/math/constraints/num/proxy/PluggableNumBound.java
index 8006718..494143d 100644
--- a/src/mightypork/gamecore/util/math/constraints/num/proxy/PluggableNumBound.java
+++ b/src/mightypork/gamecore/util/math/constraints/num/proxy/PluggableNumBound.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.constraints.num.proxy;
/**
* Pluggable numeric constraint
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface PluggableNumBound extends NumBound {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/Rect.java b/src/mightypork/gamecore/util/math/constraints/rect/Rect.java
index 8b7ad8f..169bd21 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/Rect.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/Rect.java
@@ -20,7 +20,7 @@ import mightypork.gamecore.util.math.constraints.vect.VectConst;
/**
* Common methods for all kinds of Rects
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class Rect implements RectBound, Digestable {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/RectConst.java b/src/mightypork/gamecore/util/math/constraints/rect/RectConst.java
index 613ac94..578bca7 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/RectConst.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/RectConst.java
@@ -12,7 +12,7 @@ import mightypork.gamecore.util.math.constraints.vect.VectConst;
* It's arranged so that operations with constant arguments yield constant
* results.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class RectConst extends Rect {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/builders/TiledRect.java b/src/mightypork/gamecore/util/math/constraints/rect/builders/TiledRect.java
index 6256314..92b7d5b 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/builders/TiledRect.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/builders/TiledRect.java
@@ -11,7 +11,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Utility for cutting rect into evenly sized cells.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class TiledRect extends RectProxy {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/caching/AbstractRectCache.java b/src/mightypork/gamecore/util/math/constraints/rect/caching/AbstractRectCache.java
index 1a8993e..6379b2b 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/caching/AbstractRectCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/caching/AbstractRectCache.java
@@ -16,7 +16,7 @@ import mightypork.gamecore.util.math.constraints.rect.proxy.RectAdapter;
* default.
*
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class AbstractRectCache extends RectAdapter implements ConstraintCache {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/caching/RectCache.java b/src/mightypork/gamecore/util/math/constraints/rect/caching/RectCache.java
index 6ebd964..64cb056 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/caching/RectCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/caching/RectCache.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.rect.Rect;
/**
* Rect cache implementation
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class RectCache extends AbstractRectCache {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/mutable/RectMutable.java b/src/mightypork/gamecore/util/math/constraints/rect/mutable/RectMutable.java
index 9557538..9ee0c02 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/mutable/RectMutable.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/mutable/RectMutable.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Mutable rectangle; operations change it's state.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class RectMutable extends Rect {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/proxy/PluggableRectBound.java b/src/mightypork/gamecore/util/math/constraints/rect/proxy/PluggableRectBound.java
index 58e3bd0..dd273e8 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/proxy/PluggableRectBound.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/proxy/PluggableRectBound.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.constraints.rect.proxy;
/**
* Pluggable rect bound
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface PluggableRectBound extends RectBound {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectAdapter.java b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectAdapter.java
index 9b8af19..57ff634 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectAdapter.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectAdapter.java
@@ -10,7 +10,7 @@ import mightypork.gamecore.util.math.constraints.vect.proxy.VectAdapter;
* Rect proxy with abstract method for plugging in / generating rect
* dynamically.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class RectAdapter extends Rect {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBound.java b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBound.java
index 4f2d410..de737a7 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBound.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBound.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.rect.Rect;
/**
* Rect constraint (ie. region)
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface RectBound {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBoundAdapter.java b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBoundAdapter.java
index 1001624..827cedd 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBoundAdapter.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectBoundAdapter.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.rect.Rect;
/**
* Pluggable rect bound adapter
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class RectBoundAdapter extends RectAdapter implements PluggableRectBound {
diff --git a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectVectAdapter.java b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectVectAdapter.java
index dc2ee86..e6d6645 100644
--- a/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectVectAdapter.java
+++ b/src/mightypork/gamecore/util/math/constraints/rect/proxy/RectVectAdapter.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Rect made of two {@link Vect}s
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class RectVectAdapter extends Rect {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/Vect.java b/src/mightypork/gamecore/util/math/constraints/vect/Vect.java
index 769d962..320c0b1 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/Vect.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/Vect.java
@@ -19,7 +19,7 @@ import mightypork.gamecore.util.math.constraints.vect.proxy.VectNumAdapter;
/**
* The most basic Vec methods
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class Vect implements VectBound, Digestable {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/VectConst.java b/src/mightypork/gamecore/util/math/constraints/vect/VectConst.java
index 7b1634d..89fc1e3 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/VectConst.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/VectConst.java
@@ -13,7 +13,7 @@ import mightypork.gamecore.util.math.constraints.vect.caching.VectDigest;
* It's arranged so that operations with constant arguments yield constant
* results.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class VectConst extends Vect {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/caching/AbstractVectCache.java b/src/mightypork/gamecore/util/math/constraints/vect/caching/AbstractVectCache.java
index da41ac9..389c133 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/caching/AbstractVectCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/caching/AbstractVectCache.java
@@ -16,7 +16,7 @@ import mightypork.gamecore.util.math.constraints.vect.proxy.VectAdapter;
* default.
*
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class AbstractVectCache extends VectAdapter implements ConstraintCache {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/caching/VectCache.java b/src/mightypork/gamecore/util/math/constraints/vect/caching/VectCache.java
index 2b45b22..5c9322f 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/caching/VectCache.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/caching/VectCache.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Vect cache implementation
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class VectCache extends AbstractVectCache {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectAnimated.java b/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectAnimated.java
index 6bdb914..7ba82e8 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectAnimated.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectAnimated.java
@@ -12,7 +12,7 @@ import mightypork.gamecore.util.math.timing.Pauseable;
/**
* 3D coordinated with support for transitions, mutable.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class VectAnimated extends VectMutable implements Pauseable, Updateable {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectMutable.java b/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectMutable.java
index 52c076e..36f2a08 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectMutable.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectMutable.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Mutable coord
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
abstract class VectMutable extends Vect {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectVar.java b/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectVar.java
index 598b55a..04afa14 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectVar.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/mutable/VectVar.java
@@ -5,7 +5,7 @@ package mightypork.gamecore.util.math.constraints.vect.mutable;
* Mutable coordinate.
* All Vec methods (except copy) alter data values and return this instance.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class VectVar extends VectMutable {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/proxy/PluggableVectBound.java b/src/mightypork/gamecore/util/math/constraints/vect/proxy/PluggableVectBound.java
index 0a5b49e..9b71394 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/proxy/PluggableVectBound.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/proxy/PluggableVectBound.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.constraints.vect.proxy;
/**
* Pluggable vector constraint
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface PluggableVectBound extends VectBound {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectAdapter.java b/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectAdapter.java
index 4a5de20..1fff05a 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectAdapter.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectAdapter.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
* Vect proxy with abstract method for plugging in / generating coordinates
* dynamically.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class VectAdapter extends Vect {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectBound.java b/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectBound.java
index 686fc69..1300cbe 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectBound.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectBound.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Element holding a vector, used for constraint building.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface VectBound {
diff --git a/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectNumAdapter.java b/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectNumAdapter.java
index b08f4ba..b05de90 100644
--- a/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectNumAdapter.java
+++ b/src/mightypork/gamecore/util/math/constraints/vect/proxy/VectNumAdapter.java
@@ -9,7 +9,7 @@ import mightypork.gamecore.util.math.constraints.vect.Vect;
/**
* Coord view composed of given {@link NumBound}s, using their current values.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class VectNumAdapter extends Vect {
diff --git a/src/mightypork/gamecore/util/math/noise/NoiseGen.java b/src/mightypork/gamecore/util/math/noise/NoiseGen.java
index 5a813bb..038cfed 100644
--- a/src/mightypork/gamecore/util/math/noise/NoiseGen.java
+++ b/src/mightypork/gamecore/util/math/noise/NoiseGen.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.noise;
/**
* 2D Perlin noise generator
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NoiseGen {
diff --git a/src/mightypork/gamecore/util/math/noise/PerlinNoiseGenerator.java b/src/mightypork/gamecore/util/math/noise/PerlinNoiseGenerator.java
index b13ec98..3ab40fa 100644
--- a/src/mightypork/gamecore/util/math/noise/PerlinNoiseGenerator.java
+++ b/src/mightypork/gamecore/util/math/noise/PerlinNoiseGenerator.java
@@ -27,7 +27,7 @@ import java.util.Random;
* space by just setting the un-needed dimensions to a fixed value.
*
* @author Justin Couch
- * @edited by MightyPork
+ * @edited by Ondřej Hruška
* @version $Revision: 1.4 $
* @source http://code.j3d.org/download.html
*/
diff --git a/src/mightypork/gamecore/util/math/timing/AnimatorBounce.java b/src/mightypork/gamecore/util/math/timing/AnimatorBounce.java
index 12d6b0a..d04a37a 100644
--- a/src/mightypork/gamecore/util/math/timing/AnimatorBounce.java
+++ b/src/mightypork/gamecore/util/math/timing/AnimatorBounce.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.num.mutable.NumAnimated;
/**
* Animator that upon reaching max, animates back down and then up again
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class AnimatorBounce extends Animator {
diff --git a/src/mightypork/gamecore/util/math/timing/AnimatorRewind.java b/src/mightypork/gamecore/util/math/timing/AnimatorRewind.java
index 6ca0299..fa84529 100644
--- a/src/mightypork/gamecore/util/math/timing/AnimatorRewind.java
+++ b/src/mightypork/gamecore/util/math/timing/AnimatorRewind.java
@@ -9,7 +9,7 @@ import mightypork.gamecore.util.math.constraints.num.mutable.NumAnimated;
* Animator that upon reaching top, jumps straight to zero and continues another
* cycle.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class AnimatorRewind extends Animator {
diff --git a/src/mightypork/gamecore/util/math/timing/FpsMeter.java b/src/mightypork/gamecore/util/math/timing/FpsMeter.java
index 2d04222..16fc927 100644
--- a/src/mightypork/gamecore/util/math/timing/FpsMeter.java
+++ b/src/mightypork/gamecore/util/math/timing/FpsMeter.java
@@ -5,7 +5,7 @@ package mightypork.gamecore.util.math.timing;
* Class for counting FPS in games.
* This class can be used also as a simple frequency meter - output is in Hz.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class FpsMeter {
diff --git a/src/mightypork/gamecore/util/math/timing/Pauseable.java b/src/mightypork/gamecore/util/math/timing/Pauseable.java
index 007cb6d..cfe7003 100644
--- a/src/mightypork/gamecore/util/math/timing/Pauseable.java
+++ b/src/mightypork/gamecore/util/math/timing/Pauseable.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.timing;
/**
* Can be paused & resumed
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface Pauseable {
diff --git a/src/mightypork/gamecore/util/math/timing/TimedTask.java b/src/mightypork/gamecore/util/math/timing/TimedTask.java
index 4c295f1..cb5aeae 100644
--- a/src/mightypork/gamecore/util/math/timing/TimedTask.java
+++ b/src/mightypork/gamecore/util/math/timing/TimedTask.java
@@ -8,7 +8,7 @@ import mightypork.gamecore.util.math.constraints.num.mutable.NumAnimated;
/**
* Delayed runnable controlled by delta timing.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class TimedTask implements Runnable, Updateable {
diff --git a/src/mightypork/gamecore/util/math/timing/TimerDelta.java b/src/mightypork/gamecore/util/math/timing/TimerDelta.java
index 015275c..85c1600 100644
--- a/src/mightypork/gamecore/util/math/timing/TimerDelta.java
+++ b/src/mightypork/gamecore/util/math/timing/TimerDelta.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.timing;
/**
* Timer for delta timing
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class TimerDelta {
diff --git a/src/mightypork/gamecore/util/math/timing/TimerFps.java b/src/mightypork/gamecore/util/math/timing/TimerFps.java
index becdf0a..b167b53 100644
--- a/src/mightypork/gamecore/util/math/timing/TimerFps.java
+++ b/src/mightypork/gamecore/util/math/timing/TimerFps.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.math.timing;
/**
* Timer for interpolated timing
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class TimerFps {
diff --git a/src/mightypork/gamecore/util/objects/Convert.java b/src/mightypork/gamecore/util/objects/Convert.java
index 4df136a..a4ad81b 100644
--- a/src/mightypork/gamecore/util/objects/Convert.java
+++ b/src/mightypork/gamecore/util/objects/Convert.java
@@ -12,7 +12,7 @@ import mightypork.gamecore.util.math.constraints.vect.VectConst;
* Utility for converting Object to data types; Can also convert strings to data
* types.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class Convert {
diff --git a/src/mightypork/gamecore/util/objects/EnumerationIterator.java b/src/mightypork/gamecore/util/objects/EnumerationIterator.java
index 82714dd..75e08a1 100644
--- a/src/mightypork/gamecore/util/objects/EnumerationIterator.java
+++ b/src/mightypork/gamecore/util/objects/EnumerationIterator.java
@@ -8,7 +8,7 @@ import java.util.Iterator;
/**
* Helper class for iterationg over an {@link Enumeration}
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @param target element type (will be cast)
*/
public class EnumerationIterator implements Iterable {
diff --git a/src/mightypork/gamecore/util/objects/MapSort.java b/src/mightypork/gamecore/util/objects/MapSort.java
index 73667c5..cc9fb04 100644
--- a/src/mightypork/gamecore/util/objects/MapSort.java
+++ b/src/mightypork/gamecore/util/objects/MapSort.java
@@ -8,7 +8,7 @@ import java.util.Map.Entry;
/**
* Map sorting utils
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class MapSort {
diff --git a/src/mightypork/gamecore/util/objects/Mutable.java b/src/mightypork/gamecore/util/objects/Mutable.java
index 41a3eb1..1039348 100644
--- a/src/mightypork/gamecore/util/objects/Mutable.java
+++ b/src/mightypork/gamecore/util/objects/Mutable.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.objects;
/**
* Mutable object
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @param type
*/
public class Mutable {
diff --git a/src/mightypork/gamecore/util/objects/Pair.java b/src/mightypork/gamecore/util/objects/Pair.java
index 8eff987..a5c78fe 100644
--- a/src/mightypork/gamecore/util/objects/Pair.java
+++ b/src/mightypork/gamecore/util/objects/Pair.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.Calc;
/**
* Structure of 2 objects.
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @copy (c) 2012
* @param 1st object class
* @param 2nd object class
diff --git a/src/mightypork/gamecore/util/objects/Triad.java b/src/mightypork/gamecore/util/objects/Triad.java
index a242331..fd14003 100644
--- a/src/mightypork/gamecore/util/objects/Triad.java
+++ b/src/mightypork/gamecore/util/objects/Triad.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.Calc;
/**
* Structure of 3 objects.
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @copy (c) 2012
* @param 1st object class
* @param 2nd object class
diff --git a/src/mightypork/gamecore/util/objects/VarargsParser.java b/src/mightypork/gamecore/util/objects/VarargsParser.java
index c5fb12f..c7eaea2 100644
--- a/src/mightypork/gamecore/util/objects/VarargsParser.java
+++ b/src/mightypork/gamecore/util/objects/VarargsParser.java
@@ -15,7 +15,7 @@ import java.util.Map;
* Map<String, Integer> args = new VarargsParser<String, Integer>().parse(array);
*
*
- * @author MightyPork
+ * @author Ondřej Hruška
* @param Type for Map keys
* @param Type for Map values
*/
diff --git a/src/mightypork/gamecore/util/strings/AlphanumComparator.java b/src/mightypork/gamecore/util/strings/AlphanumComparator.java
index 7c3d87e..0fa5f3b 100644
--- a/src/mightypork/gamecore/util/strings/AlphanumComparator.java
+++ b/src/mightypork/gamecore/util/strings/AlphanumComparator.java
@@ -34,7 +34,7 @@ import java.util.Comparator;
* @author Daniel Migowski
* @author Andre Bogus
* @author David Koelle
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class AlphanumComparator implements Comparator {
diff --git a/src/mightypork/gamecore/util/strings/StringProvider.java b/src/mightypork/gamecore/util/strings/StringProvider.java
index b658076..7b70da0 100644
--- a/src/mightypork/gamecore/util/strings/StringProvider.java
+++ b/src/mightypork/gamecore/util/strings/StringProvider.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.strings;
/**
* Can be used for dynamic string generating
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface StringProvider {
diff --git a/src/mightypork/gamecore/util/strings/StringUtils.java b/src/mightypork/gamecore/util/strings/StringUtils.java
index 26c7e70..22e5933 100644
--- a/src/mightypork/gamecore/util/strings/StringUtils.java
+++ b/src/mightypork/gamecore/util/strings/StringUtils.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.strings;
/**
* General purpose string utilities
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class StringUtils {
diff --git a/src/mightypork/gamecore/util/strings/StringWrapper.java b/src/mightypork/gamecore/util/strings/StringWrapper.java
index 8c01d68..b7cc4e4 100644
--- a/src/mightypork/gamecore/util/strings/StringWrapper.java
+++ b/src/mightypork/gamecore/util/strings/StringWrapper.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.strings;
/**
* String provider with constant string
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class StringWrapper implements StringProvider {
diff --git a/src/mightypork/gamecore/util/strings/filtering/StringFilter.java b/src/mightypork/gamecore/util/strings/filtering/StringFilter.java
index 6baf3e1..52d44f9 100644
--- a/src/mightypork/gamecore/util/strings/filtering/StringFilter.java
+++ b/src/mightypork/gamecore/util/strings/filtering/StringFilter.java
@@ -4,7 +4,7 @@ package mightypork.gamecore.util.strings.filtering;
/**
* Utility interface for string filters (accepting filepaths and similar)
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface StringFilter {
diff --git a/src/mightypork/rogue/Const.java b/src/mightypork/rogue/Const.java
index 92d8aaf..594de3e 100644
--- a/src/mightypork/rogue/Const.java
+++ b/src/mightypork/rogue/Const.java
@@ -4,7 +4,7 @@ package mightypork.rogue;
/**
* Application constants
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class Const {
diff --git a/src/mightypork/rogue/RogueApp.java b/src/mightypork/rogue/RogueApp.java
index 349ce38..c127952 100644
--- a/src/mightypork/rogue/RogueApp.java
+++ b/src/mightypork/rogue/RogueApp.java
@@ -20,7 +20,7 @@ import mightypork.gamecore.render.events.ScreenshotRequestListener;
import mightypork.gamecore.render.events.ViewportChangeEvent;
import mightypork.gamecore.render.events.ViewportChangeListener;
import mightypork.gamecore.resources.Res;
-import mightypork.gamecore.util.ion.Ion;
+import mightypork.ion.Ion;
import mightypork.rogue.RogueStateManager.RogueState;
import mightypork.rogue.events.RogueStateRequest;
import mightypork.rogue.screens.FpsOverlay;
@@ -37,7 +37,7 @@ import mightypork.rogue.world.level.Level;
/**
* Main class
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class RogueApp extends BaseApp implements ViewportChangeListener, ScreenshotRequestListener {
@@ -61,8 +61,8 @@ public final class RogueApp extends BaseApp implements ViewportChangeListener, S
{
super.registerIonizables();
- Ion.registerType(Level.ION_MARK, Level.class);
- Ion.registerType(Inventory.ION_MARK, Inventory.class);
+ Ion.register(Level.class);
+ Ion.register(Inventory.class);
}
diff --git a/src/mightypork/rogue/events/LoadingOverlayRequest.java b/src/mightypork/rogue/events/LoadingOverlayRequest.java
index a42d5c8..46d70ec 100644
--- a/src/mightypork/rogue/events/LoadingOverlayRequest.java
+++ b/src/mightypork/rogue/events/LoadingOverlayRequest.java
@@ -9,7 +9,7 @@ import mightypork.rogue.screens.LoadingOverlay;
/**
* Request to execute a given task in a loading overlay
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
@SingleReceiverEvent
public class LoadingOverlayRequest extends BusEvent {
diff --git a/src/mightypork/rogue/events/RogueStateRequest.java b/src/mightypork/rogue/events/RogueStateRequest.java
index 666b41f..d0733c9 100644
--- a/src/mightypork/rogue/events/RogueStateRequest.java
+++ b/src/mightypork/rogue/events/RogueStateRequest.java
@@ -9,7 +9,7 @@ import mightypork.rogue.RogueStateManager.RogueState;
/**
* Request for a game state change
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class RogueStateRequest extends BusEvent {
diff --git a/src/mightypork/rogue/screens/FpsOverlay.java b/src/mightypork/rogue/screens/FpsOverlay.java
index b338a48..937f55b 100644
--- a/src/mightypork/rogue/screens/FpsOverlay.java
+++ b/src/mightypork/rogue/screens/FpsOverlay.java
@@ -20,7 +20,7 @@ import mightypork.gamecore.util.strings.StringProvider;
/**
* FPS indicator overlay
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class FpsOverlay extends Overlay {
diff --git a/src/mightypork/rogue/screens/LoadingOverlay.java b/src/mightypork/rogue/screens/LoadingOverlay.java
index 25f43b7..ee3e796 100644
--- a/src/mightypork/rogue/screens/LoadingOverlay.java
+++ b/src/mightypork/rogue/screens/LoadingOverlay.java
@@ -22,7 +22,7 @@ import mightypork.gamecore.util.strings.StringProvider;
* Overlay with blue background and loading-info text, that accompanies an async
* task.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class LoadingOverlay extends Overlay {
diff --git a/src/mightypork/rogue/screens/game/InvSlot.java b/src/mightypork/rogue/screens/game/InvSlot.java
index b498692..8246c82 100644
--- a/src/mightypork/rogue/screens/game/InvSlot.java
+++ b/src/mightypork/rogue/screens/game/InvSlot.java
@@ -23,7 +23,7 @@ import mightypork.rogue.world.item.ItemType;
/**
* Button in the ingame nav
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class InvSlot extends ClickableComponent {
diff --git a/src/mightypork/rogue/screens/game/LayerWin.java b/src/mightypork/rogue/screens/game/LayerWin.java
index 10d2388..e7b486f 100644
--- a/src/mightypork/rogue/screens/game/LayerWin.java
+++ b/src/mightypork/rogue/screens/game/LayerWin.java
@@ -15,7 +15,6 @@ import mightypork.gamecore.gui.components.painters.TextPainter;
import mightypork.gamecore.gui.screens.impl.FadingLayer;
import mightypork.gamecore.input.KeyStroke.Edge;
import mightypork.gamecore.resources.Res;
-import mightypork.gamecore.resources.audio.SoundSystem;
import mightypork.gamecore.resources.fonts.GLFont;
import mightypork.gamecore.util.math.color.pal.RGB;
import mightypork.gamecore.util.math.constraints.num.Num;
@@ -82,6 +81,7 @@ public class LayerWin extends FadingLayer {
return 300;
}
+
@Override
protected void onShowFinished()
{
diff --git a/src/mightypork/rogue/screens/game/NavButton.java b/src/mightypork/rogue/screens/game/NavButton.java
index add7c4b..d877b15 100644
--- a/src/mightypork/rogue/screens/game/NavButton.java
+++ b/src/mightypork/rogue/screens/game/NavButton.java
@@ -10,7 +10,7 @@ import mightypork.gamecore.resources.textures.TxQuad;
/**
* Button in the ingame nav
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NavButton extends ClickableComponent {
diff --git a/src/mightypork/rogue/screens/game/ScreenGame.java b/src/mightypork/rogue/screens/game/ScreenGame.java
index 294cbf3..cb32fda 100644
--- a/src/mightypork/rogue/screens/game/ScreenGame.java
+++ b/src/mightypork/rogue/screens/game/ScreenGame.java
@@ -8,12 +8,9 @@ import mightypork.gamecore.core.events.UserQuitRequest;
import mightypork.gamecore.core.modules.AppAccess;
import mightypork.gamecore.gui.Action;
import mightypork.gamecore.gui.ActionGroup;
-import mightypork.gamecore.input.KeyStroke;
import mightypork.gamecore.input.KeyStroke.Edge;
-import mightypork.gamecore.input.Keys;
import mightypork.gamecore.logging.Log;
import mightypork.gamecore.resources.Res;
-import mightypork.gamecore.resources.audio.SoundSystem;
import mightypork.gamecore.util.math.color.Color;
import mightypork.rogue.Const;
import mightypork.rogue.RogueStateManager.RogueState;
@@ -36,7 +33,7 @@ public class ScreenGame extends RogueScreen implements PlayerDeathHandler, GameW
/**
* Game gui state.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public enum GScrState
{
@@ -311,7 +308,7 @@ public class ScreenGame extends RogueScreen implements PlayerDeathHandler, GameW
setState(GScrState.WORLD);
hideAllPopups();
- getSoundSystem().fadeOutAllLoops();
+ getSoundSystem().fadeOutAllLoops();
Res.getSoundLoop("music.dungeon").fadeIn();
}
diff --git a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java b/src/mightypork/rogue/screens/menu/ScreenMainMenu.java
index abaabab..8f5d63a 100644
--- a/src/mightypork/rogue/screens/menu/ScreenMainMenu.java
+++ b/src/mightypork/rogue/screens/menu/ScreenMainMenu.java
@@ -28,7 +28,7 @@ import mightypork.rogue.screens.RogueScreen;
/**
* Main menu screen
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class ScreenMainMenu extends RogueScreen {
@@ -36,7 +36,7 @@ public class ScreenMainMenu extends RogueScreen {
/**
* The layer
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
class MenuLayer extends ScreenLayer {
@@ -127,7 +127,7 @@ public class ScreenMainMenu extends RogueScreen {
}
}
-
+
public ScreenMainMenu(AppAccess app)
{
@@ -136,11 +136,12 @@ public class ScreenMainMenu extends RogueScreen {
addLayer(new MenuLayer(this));
}
+
@Override
protected void onScreenEnter()
{
super.onScreenEnter();
-
+
getSoundSystem().fadeOutAllLoops();
Res.getSoundLoop("music.menu").fadeIn();
}
diff --git a/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java b/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java
index 182c8c7..b5ce2ed 100644
--- a/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java
+++ b/src/mightypork/rogue/screens/select_world/ScreenSelectWorld.java
@@ -25,7 +25,7 @@ import mightypork.rogue.screens.RogueScreen;
/**
* Main menu screen
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class ScreenSelectWorld extends RogueScreen {
diff --git a/src/mightypork/rogue/screens/select_world/WorldSlot.java b/src/mightypork/rogue/screens/select_world/WorldSlot.java
index a4ef9b8..0872fef 100644
--- a/src/mightypork/rogue/screens/select_world/WorldSlot.java
+++ b/src/mightypork/rogue/screens/select_world/WorldSlot.java
@@ -2,7 +2,6 @@ package mightypork.rogue.screens.select_world;
import java.io.File;
-import java.io.IOException;
import mightypork.gamecore.core.modules.AppAccess;
import mightypork.gamecore.gui.Action;
@@ -15,12 +14,12 @@ import mightypork.gamecore.gui.events.ScreenRequest;
import mightypork.gamecore.logging.Log;
import mightypork.gamecore.resources.Res;
import mightypork.gamecore.resources.fonts.GLFont;
-import mightypork.gamecore.util.ion.Ion;
-import mightypork.gamecore.util.ion.IonBundle;
import mightypork.gamecore.util.math.color.pal.RGB;
import mightypork.gamecore.util.math.constraints.num.Num;
import mightypork.gamecore.util.math.constraints.rect.Rect;
import mightypork.gamecore.util.strings.StringProvider;
+import mightypork.ion.Ion;
+import mightypork.ion.IonBundle;
import mightypork.rogue.events.LoadingOverlayRequest;
import mightypork.rogue.world.World;
import mightypork.rogue.world.WorldProvider;
@@ -111,7 +110,7 @@ public class WorldSlot extends ConstraintLayout {
getEventBus().send(new ScreenRequest("game"));
- } catch (final IOException t) {
+ } catch (final Exception t) {
Log.e("Could not create & save the world.", t);
}
@@ -120,12 +119,12 @@ public class WorldSlot extends ConstraintLayout {
try {
w = new World();
w.setSaveFile(file);
- w.load(worldBundle);
+ w.load((IonBundle) worldBundle.get("world"));
WorldProvider.get().setWorld(w);
getEventBus().send(new ScreenRequest("game"));
- } catch (final IOException e) {
+ } catch (final Exception e) {
Log.e("Could not load the world.", e);
}
}
@@ -171,7 +170,7 @@ public class WorldSlot extends ConstraintLayout {
try {
worldBundle = Ion.fromFile(file);
- final int lvl = worldBundle.get("meta.last_level", -1);
+ final int lvl = worldBundle.get("level", -1);
if (lvl == -1) throw new RuntimeException("Invalid save format."); // let the catch block handle it
diff --git a/src/mightypork/rogue/world/Inventory.java b/src/mightypork/rogue/world/Inventory.java
index 4f21302..7e3751c 100644
--- a/src/mightypork/rogue/world/Inventory.java
+++ b/src/mightypork/rogue/world/Inventory.java
@@ -3,9 +3,9 @@ package mightypork.rogue.world;
import java.io.IOException;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonObjBinary;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonObjBinary;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.item.Item;
import mightypork.rogue.world.item.Items;
@@ -73,13 +73,6 @@ public class Inventory implements IonObjBinary {
}
- @Override
- public short getIonMark()
- {
- return ION_MARK;
- }
-
-
/**
* Get item in a slot
*
diff --git a/src/mightypork/rogue/world/PlayerData.java b/src/mightypork/rogue/world/PlayerData.java
index 6c4a93e..e9e0f11 100644
--- a/src/mightypork/rogue/world/PlayerData.java
+++ b/src/mightypork/rogue/world/PlayerData.java
@@ -1,17 +1,15 @@
package mightypork.rogue.world;
-import java.io.IOException;
-
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonObjBundled;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonObjBundled;
import mightypork.rogue.world.item.Item;
/**
* Player information stored in world.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class PlayerData implements IonObjBundled {
@@ -31,7 +29,7 @@ public class PlayerData implements IonObjBundled {
@Override
- public void load(IonBundle bundle) throws IOException
+ public void load(IonBundle bundle)
{
eid = bundle.get("eid", -1);
level = bundle.get("floor", -1);
@@ -42,7 +40,7 @@ public class PlayerData implements IonObjBundled {
@Override
- public void save(IonBundle bundle) throws IOException
+ public void save(IonBundle bundle)
{
bundle.put("eid", eid);
bundle.put("floor", level);
diff --git a/src/mightypork/rogue/world/PlayerFacade.java b/src/mightypork/rogue/world/PlayerFacade.java
index 7c48313..54c41c3 100644
--- a/src/mightypork/rogue/world/PlayerFacade.java
+++ b/src/mightypork/rogue/world/PlayerFacade.java
@@ -18,7 +18,7 @@ import mightypork.rogue.world.level.Level;
/**
* Convenient access to player-related methods and data in world.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class PlayerFacade {
diff --git a/src/mightypork/rogue/world/World.java b/src/mightypork/rogue/world/World.java
index 9a67a3a..0409dfc 100644
--- a/src/mightypork/rogue/world/World.java
+++ b/src/mightypork/rogue/world/World.java
@@ -2,7 +2,6 @@ package mightypork.rogue.world;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Random;
@@ -13,10 +12,10 @@ import mightypork.gamecore.eventbus.clients.DelegatingClient;
import mightypork.gamecore.eventbus.events.Updateable;
import mightypork.gamecore.logging.Log;
import mightypork.gamecore.util.error.CorruptDataException;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonObjBundled;
import mightypork.gamecore.util.math.algo.Coord;
import mightypork.gamecore.util.math.timing.Pauseable;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonObjBundled;
import mightypork.rogue.world.entity.Entities;
import mightypork.rogue.world.entity.Entity;
import mightypork.rogue.world.events.GameWinHandler;
@@ -27,7 +26,7 @@ import mightypork.rogue.world.level.Level;
/**
* World object.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class World implements DelegatingClient, BusAccess, IonObjBundled, Pauseable, Updateable, PlayerDeathHandler, GameWinHandler {
@@ -71,7 +70,7 @@ public class World implements DelegatingClient, BusAccess, IonObjBundled, Pausea
@Override
- public void load(IonBundle in) throws IOException
+ public void load(IonBundle in)
{
seed = in.get("seed", seed);
eid = in.get("next_eid", eid);
@@ -106,7 +105,7 @@ public class World implements DelegatingClient, BusAccess, IonObjBundled, Pausea
@Override
- public void save(IonBundle out) throws IOException
+ public void save(IonBundle out)
{
out.put("seed", seed);
out.put("next_eid", eid);
diff --git a/src/mightypork/rogue/world/WorldConsole.java b/src/mightypork/rogue/world/WorldConsole.java
index 73903a2..1491725 100644
--- a/src/mightypork/rogue/world/WorldConsole.java
+++ b/src/mightypork/rogue/world/WorldConsole.java
@@ -16,7 +16,7 @@ import mightypork.rogue.world.item.Item;
/**
* Message log in world view
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class WorldConsole implements Updateable {
diff --git a/src/mightypork/rogue/world/WorldProvider.java b/src/mightypork/rogue/world/WorldProvider.java
index fab61cb..e09e4a0 100644
--- a/src/mightypork/rogue/world/WorldProvider.java
+++ b/src/mightypork/rogue/world/WorldProvider.java
@@ -7,7 +7,8 @@ import java.io.IOException;
import mightypork.gamecore.eventbus.BusAccess;
import mightypork.gamecore.eventbus.clients.RootBusNode;
import mightypork.gamecore.logging.Log;
-import mightypork.gamecore.util.ion.Ion;
+import mightypork.ion.Ion;
+import mightypork.ion.IonBundle;
import mightypork.rogue.world.gen.WorldCreator;
import mightypork.rogue.world.level.Level;
@@ -15,7 +16,7 @@ import mightypork.rogue.world.level.Level;
/**
* Global singleton world holder and storage
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class WorldProvider extends RootBusNode {
@@ -92,7 +93,9 @@ public class WorldProvider extends RootBusNode {
public void loadWorld(File file) throws IOException
{
Log.f2("Loading world from: " + file);
- setWorld(Ion.fromFile(file, World.class));
+
+ final IonBundle bu = Ion.fromFile(file);
+ setWorld(bu.loadBundled("world", new World()));
world.setSaveFile(file);
}
@@ -111,7 +114,12 @@ public class WorldProvider extends RootBusNode {
}
Log.f2("Saving world to: " + file);
- Ion.toFile(file, world);
+
+ final IonBundle bu = new IonBundle();
+ bu.put("level", world.getPlayer().getLevelNumber());
+ bu.putBundled("world", world);
+
+ Ion.toFile(file, bu);
}
diff --git a/src/mightypork/rogue/world/WorldRenderer.java b/src/mightypork/rogue/world/WorldRenderer.java
index eaad2ac..f11acda 100644
--- a/src/mightypork/rogue/world/WorldRenderer.java
+++ b/src/mightypork/rogue/world/WorldRenderer.java
@@ -20,7 +20,7 @@ import mightypork.rogue.world.level.render.TileRenderContext;
/**
* World rendering untility
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class WorldRenderer extends RectProxy {
diff --git a/src/mightypork/rogue/world/entity/AiTimer.java b/src/mightypork/rogue/world/entity/AiTimer.java
index 0099fb0..0f1c2b1 100644
--- a/src/mightypork/rogue/world/entity/AiTimer.java
+++ b/src/mightypork/rogue/world/entity/AiTimer.java
@@ -1,11 +1,9 @@
package mightypork.rogue.world.entity;
-import java.io.IOException;
-
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonObjBundled;
import mightypork.gamecore.util.math.timing.TaskRepeater;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonObjBundled;
public abstract class AiTimer extends TaskRepeater implements IonObjBundled {
@@ -21,7 +19,7 @@ public abstract class AiTimer extends TaskRepeater implements IonObjBundled {
@Override
- public void load(IonBundle bundle) throws IOException
+ public void load(IonBundle bundle)
{
final boolean wasPaused = bundle.get("paused", isPaused());
if (wasPaused) {
@@ -36,7 +34,7 @@ public abstract class AiTimer extends TaskRepeater implements IonObjBundled {
@Override
- public void save(IonBundle bundle) throws IOException
+ public void save(IonBundle bundle)
{
bundle.put("paused", isPaused());
bundle.put("progress", getProgress());
diff --git a/src/mightypork/rogue/world/entity/Entities.java b/src/mightypork/rogue/world/entity/Entities.java
index 847b62a..11b050b 100644
--- a/src/mightypork/rogue/world/entity/Entities.java
+++ b/src/mightypork/rogue/world/entity/Entities.java
@@ -4,8 +4,8 @@ package mightypork.rogue.world.entity;
import java.io.IOException;
import java.util.Collection;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.entity.impl.EntityBossRat;
import mightypork.rogue.world.entity.impl.EntityBrownRat;
import mightypork.rogue.world.entity.impl.EntityGrayRat;
@@ -15,7 +15,7 @@ import mightypork.rogue.world.entity.impl.EntityPlayer;
/**
* Entity registry
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class Entities {
diff --git a/src/mightypork/rogue/world/entity/Entity.java b/src/mightypork/rogue/world/entity/Entity.java
index 2a8e59e..ffbd83d 100644
--- a/src/mightypork/rogue/world/entity/Entity.java
+++ b/src/mightypork/rogue/world/entity/Entity.java
@@ -1,7 +1,6 @@
package mightypork.rogue.world.entity;
-import java.io.IOException;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -11,10 +10,10 @@ import mightypork.gamecore.eventbus.clients.DelegatingClient;
import mightypork.gamecore.eventbus.events.Updateable;
import mightypork.gamecore.util.annot.DefaultImpl;
import mightypork.gamecore.util.error.IllegalValueException;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonObjBundled;
import mightypork.gamecore.util.math.algo.Coord;
import mightypork.gamecore.util.math.algo.pathfinding.PathFinder;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonObjBundled;
import mightypork.rogue.world.World;
import mightypork.rogue.world.entity.modules.EntityModuleHealth;
import mightypork.rogue.world.entity.modules.EntityModulePosition;
@@ -25,7 +24,7 @@ import mightypork.rogue.world.level.render.MapRenderContext;
/**
* World entity (mob or player). Entities are attached to the event bus.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class Entity implements IonObjBundled, Updateable, DelegatingClient {
@@ -57,7 +56,7 @@ public abstract class Entity implements IonObjBundled, Updateable, DelegatingCli
@Override
- public final void save(IonBundle bundle) throws IOException
+ public final void save(IonBundle bundle)
{
bundle.put("eid", entityId);
@@ -80,7 +79,7 @@ public abstract class Entity implements IonObjBundled, Updateable, DelegatingCli
@Override
- public final void load(IonBundle bundle) throws IOException
+ public final void load(IonBundle bundle)
{
entityId = bundle.get("eid", -1);
if (entityId < 0) throw new IllegalValueException("Bad entity id: " + entityId);
diff --git a/src/mightypork/rogue/world/entity/EntityModel.java b/src/mightypork/rogue/world/entity/EntityModel.java
index 008159d..5580220 100644
--- a/src/mightypork/rogue/world/entity/EntityModel.java
+++ b/src/mightypork/rogue/world/entity/EntityModel.java
@@ -3,16 +3,16 @@ package mightypork.rogue.world.entity;
import java.io.IOException;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.World;
/**
* Entity model - builder
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class EntityModel {
diff --git a/src/mightypork/rogue/world/entity/EntityModule.java b/src/mightypork/rogue/world/entity/EntityModule.java
index ae37587..e2cd86e 100644
--- a/src/mightypork/rogue/world/entity/EntityModule.java
+++ b/src/mightypork/rogue/world/entity/EntityModule.java
@@ -1,19 +1,17 @@
package mightypork.rogue.world.entity;
-import java.io.IOException;
-
import mightypork.gamecore.eventbus.events.Updateable;
import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonObjBundled;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonObjBundled;
/**
* Abstract entity module
* Modules make up an entity AI and behavior.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class EntityModule implements IonObjBundled, Updateable {
@@ -34,14 +32,14 @@ public abstract class EntityModule implements IonObjBundled, Updateable {
@Override
@DefaultImpl
- public void load(IonBundle bundle) throws IOException
+ public void load(IonBundle bundle)
{
}
@Override
@DefaultImpl
- public void save(IonBundle bundle) throws IOException
+ public void save(IonBundle bundle)
{
}
diff --git a/src/mightypork/rogue/world/entity/EntityPathFinder.java b/src/mightypork/rogue/world/entity/EntityPathFinder.java
index af456c4..c961d74 100644
--- a/src/mightypork/rogue/world/entity/EntityPathFinder.java
+++ b/src/mightypork/rogue/world/entity/EntityPathFinder.java
@@ -13,7 +13,7 @@ import mightypork.gamecore.util.math.algo.pathfinding.PathFinder;
/**
* Basic Pathfinder implementation for entities
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class EntityPathFinder extends PathFinder {
diff --git a/src/mightypork/rogue/world/entity/EntityRenderer.java b/src/mightypork/rogue/world/entity/EntityRenderer.java
index deb464c..9fbb43c 100644
--- a/src/mightypork/rogue/world/entity/EntityRenderer.java
+++ b/src/mightypork/rogue/world/entity/EntityRenderer.java
@@ -7,7 +7,7 @@ import mightypork.rogue.world.level.render.MapRenderContext;
/**
* Entity renderer
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class EntityRenderer {
diff --git a/src/mightypork/rogue/world/entity/EntityType.java b/src/mightypork/rogue/world/entity/EntityType.java
index 5375bfd..4427325 100644
--- a/src/mightypork/rogue/world/entity/EntityType.java
+++ b/src/mightypork/rogue/world/entity/EntityType.java
@@ -4,7 +4,7 @@ package mightypork.rogue.world.entity;
/**
* Type of an entity
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public enum EntityType
{
diff --git a/src/mightypork/rogue/world/entity/impl/MonsterAi.java b/src/mightypork/rogue/world/entity/impl/MonsterAi.java
index 27d6402..3ddf5b8 100644
--- a/src/mightypork/rogue/world/entity/impl/MonsterAi.java
+++ b/src/mightypork/rogue/world/entity/impl/MonsterAi.java
@@ -1,17 +1,16 @@
package mightypork.rogue.world.entity.impl;
-import java.io.IOException;
import java.util.List;
import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.gamecore.util.ion.IonBundle;
import mightypork.gamecore.util.math.Calc;
import mightypork.gamecore.util.math.algo.Coord;
import mightypork.gamecore.util.math.algo.Move;
import mightypork.gamecore.util.math.algo.Moves;
import mightypork.gamecore.util.math.algo.pathfinding.PathFinder;
import mightypork.gamecore.util.math.algo.pathfinding.PathFinderProxy;
+import mightypork.ion.IonBundle;
import mightypork.rogue.world.entity.AiTimer;
import mightypork.rogue.world.entity.Entity;
import mightypork.rogue.world.entity.EntityModule;
@@ -132,7 +131,7 @@ public class MonsterAi extends EntityModule implements EntityMoveListener {
@Override
- public void save(IonBundle bundle) throws IOException
+ public void save(IonBundle bundle)
{
bundle.putBundled("tscan", timerFindPrey);
bundle.putBundled("tattack", timerAttack);
@@ -144,7 +143,7 @@ public class MonsterAi extends EntityModule implements EntityMoveListener {
@Override
- public void load(IonBundle bundle) throws IOException
+ public void load(IonBundle bundle)
{
bundle.loadBundled("tscan", timerFindPrey);
bundle.loadBundled("tattack", timerAttack);
diff --git a/src/mightypork/rogue/world/entity/modules/EntityModuleHealth.java b/src/mightypork/rogue/world/entity/modules/EntityModuleHealth.java
index 8ea07ad..d3b1e05 100644
--- a/src/mightypork/rogue/world/entity/modules/EntityModuleHealth.java
+++ b/src/mightypork/rogue/world/entity/modules/EntityModuleHealth.java
@@ -1,11 +1,9 @@
package mightypork.rogue.world.entity.modules;
-import java.io.IOException;
-
import mightypork.gamecore.util.error.IllegalValueException;
-import mightypork.gamecore.util.ion.IonBundle;
import mightypork.gamecore.util.math.Calc;
+import mightypork.ion.IonBundle;
import mightypork.rogue.world.entity.Entity;
import mightypork.rogue.world.entity.EntityModule;
@@ -26,7 +24,7 @@ public class EntityModuleHealth extends EntityModule {
@Override
- public void load(IonBundle bundle) throws IOException
+ public void load(IonBundle bundle)
{
health = bundle.get("health", health);
maxHealth = bundle.get("max_health", maxHealth);
@@ -35,7 +33,7 @@ public class EntityModuleHealth extends EntityModule {
@Override
- public void save(IonBundle bundle) throws IOException
+ public void save(IonBundle bundle)
{
bundle.put("health", health);
bundle.put("max_health", maxHealth);
diff --git a/src/mightypork/rogue/world/entity/modules/EntityModulePosition.java b/src/mightypork/rogue/world/entity/modules/EntityModulePosition.java
index 1b396e5..ab6236d 100644
--- a/src/mightypork/rogue/world/entity/modules/EntityModulePosition.java
+++ b/src/mightypork/rogue/world/entity/modules/EntityModulePosition.java
@@ -1,17 +1,16 @@
package mightypork.rogue.world.entity.modules;
-import java.io.IOException;
import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Queue;
import java.util.Set;
-import mightypork.gamecore.util.ion.IonBundle;
import mightypork.gamecore.util.math.algo.Coord;
import mightypork.gamecore.util.math.algo.Move;
import mightypork.gamecore.util.math.constraints.vect.VectConst;
+import mightypork.ion.IonBundle;
import mightypork.rogue.world.entity.Entity;
import mightypork.rogue.world.entity.EntityModule;
@@ -40,7 +39,7 @@ public class EntityModulePosition extends EntityModule {
@Override
- public void save(IonBundle bundle) throws IOException
+ public void save(IonBundle bundle)
{
bundle.putSequence("path", path);
bundle.putBundled("lpos", lastPos);
@@ -50,7 +49,7 @@ public class EntityModulePosition extends EntityModule {
@Override
- public void load(IonBundle bundle) throws IOException
+ public void load(IonBundle bundle)
{
bundle.loadSequence("path", path);
bundle.loadBundled("lpos", lastPos);
diff --git a/src/mightypork/rogue/world/entity/modules/EntityPos.java b/src/mightypork/rogue/world/entity/modules/EntityPos.java
index 140cbf9..1837034 100644
--- a/src/mightypork/rogue/world/entity/modules/EntityPos.java
+++ b/src/mightypork/rogue/world/entity/modules/EntityPos.java
@@ -1,23 +1,21 @@
package mightypork.rogue.world.entity.modules;
-import java.io.IOException;
-
import mightypork.gamecore.eventbus.events.Updateable;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonObjBundled;
import mightypork.gamecore.util.math.Easing;
import mightypork.gamecore.util.math.algo.Coord;
import mightypork.gamecore.util.math.algo.Move;
import mightypork.gamecore.util.math.constraints.vect.Vect;
import mightypork.gamecore.util.math.constraints.vect.VectConst;
import mightypork.gamecore.util.math.constraints.vect.mutable.VectAnimated;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonObjBundled;
/**
* Entity position
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
class EntityPos implements IonObjBundled, Updateable {
@@ -49,7 +47,7 @@ class EntityPos implements IonObjBundled, Updateable {
@Override
- public void load(IonBundle in) throws IOException
+ public void load(IonBundle in)
{
in.loadBundled("pos", coord);
walkOffset.reset();
@@ -57,7 +55,7 @@ class EntityPos implements IonObjBundled, Updateable {
@Override
- public void save(IonBundle out) throws IOException
+ public void save(IonBundle out)
{
out.putBundled("pos", coord);
}
diff --git a/src/mightypork/rogue/world/entity/render/EntityRendererMobLR.java b/src/mightypork/rogue/world/entity/render/EntityRendererMobLR.java
index 431f91e..c00ba0c 100644
--- a/src/mightypork/rogue/world/entity/render/EntityRendererMobLR.java
+++ b/src/mightypork/rogue/world/entity/render/EntityRendererMobLR.java
@@ -21,7 +21,7 @@ import mightypork.rogue.world.level.render.MapRenderContext;
* Renderer for a walking mob with only one strip (right sided), which is
* flipped for walking left.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class EntityRendererMobLR extends EntityRenderer {
diff --git a/src/mightypork/rogue/world/events/WorldAscendRequest.java b/src/mightypork/rogue/world/events/WorldAscendRequest.java
index eecfc1c..6ad4c9b 100644
--- a/src/mightypork/rogue/world/events/WorldAscendRequest.java
+++ b/src/mightypork/rogue/world/events/WorldAscendRequest.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.eventbus.BusEvent;
/**
* Player wants to go up
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class WorldAscendRequest extends BusEvent {
diff --git a/src/mightypork/rogue/world/events/WorldPauseRequest.java b/src/mightypork/rogue/world/events/WorldPauseRequest.java
index d2ffa94..8b96c31 100644
--- a/src/mightypork/rogue/world/events/WorldPauseRequest.java
+++ b/src/mightypork/rogue/world/events/WorldPauseRequest.java
@@ -8,7 +8,7 @@ import mightypork.rogue.world.World;
/**
* Toggle world pause state
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class WorldPauseRequest extends BusEvent {
diff --git a/src/mightypork/rogue/world/gen/MapTheme.java b/src/mightypork/rogue/world/gen/MapTheme.java
index 22fbf0b..4967692 100644
--- a/src/mightypork/rogue/world/gen/MapTheme.java
+++ b/src/mightypork/rogue/world/gen/MapTheme.java
@@ -7,7 +7,7 @@ import mightypork.rogue.world.tile.TileModel;
/**
* Map theme to use for building
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface MapTheme {
diff --git a/src/mightypork/rogue/world/gen/RoomBuilder.java b/src/mightypork/rogue/world/gen/RoomBuilder.java
index 7da8a82..c3fbd13 100644
--- a/src/mightypork/rogue/world/gen/RoomBuilder.java
+++ b/src/mightypork/rogue/world/gen/RoomBuilder.java
@@ -9,7 +9,7 @@ import mightypork.gamecore.util.math.algo.Coord;
/**
* Room model
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public interface RoomBuilder {
diff --git a/src/mightypork/rogue/world/gen/RoomEntry.java b/src/mightypork/rogue/world/gen/RoomEntry.java
index 56a43fc..8f75567 100644
--- a/src/mightypork/rogue/world/gen/RoomEntry.java
+++ b/src/mightypork/rogue/world/gen/RoomEntry.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.algo.Coord;
/**
* Room description entry for {@link ScratchMap}
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class RoomEntry {
diff --git a/src/mightypork/rogue/world/gen/ScratchMap.java b/src/mightypork/rogue/world/gen/ScratchMap.java
index f4c3fb7..bb29c24 100644
--- a/src/mightypork/rogue/world/gen/ScratchMap.java
+++ b/src/mightypork/rogue/world/gen/ScratchMap.java
@@ -25,7 +25,7 @@ import mightypork.rogue.world.tile.Tiles;
/**
* Temporary tile map used for level generation.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class ScratchMap {
diff --git a/src/mightypork/rogue/world/gen/WorldGenError.java b/src/mightypork/rogue/world/gen/WorldGenError.java
index 82d3b9a..5ecc284 100644
--- a/src/mightypork/rogue/world/gen/WorldGenError.java
+++ b/src/mightypork/rogue/world/gen/WorldGenError.java
@@ -4,7 +4,7 @@ package mightypork.rogue.world.gen;
/**
* Error in world generation
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class WorldGenError extends RuntimeException {
diff --git a/src/mightypork/rogue/world/gen/rooms/StorageRoom.java b/src/mightypork/rogue/world/gen/rooms/StorageRoom.java
index 5c40fa2..9515808 100644
--- a/src/mightypork/rogue/world/gen/rooms/StorageRoom.java
+++ b/src/mightypork/rogue/world/gen/rooms/StorageRoom.java
@@ -18,7 +18,7 @@ public class StorageRoom extends SecretRoom {
int maxStuff = Calc.randInt(rand, 3, 5);
// at least one meat or cheese.
- boolean oneMeat = rand.nextBoolean();
+ final boolean oneMeat = rand.nextBoolean();
for (int i = 0; i < Calc.randInt(rand, oneMeat ? 1 : 0, 3); i++) {
map.addItemInArea(Items.MEAT.createItem(), min, max, 50);
diff --git a/src/mightypork/rogue/world/gui/MapView.java b/src/mightypork/rogue/world/gui/MapView.java
index a441459..494599f 100644
--- a/src/mightypork/rogue/world/gui/MapView.java
+++ b/src/mightypork/rogue/world/gui/MapView.java
@@ -30,7 +30,7 @@ import mightypork.rogue.world.gui.interaction.MapInteractionPlugin;
/**
* Level display component
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class MapView extends InputComponent implements DelegatingClient, MouseButtonHandler, Updateable, WorldAscendRequestListener,
WorldDescendRequestListener {
diff --git a/src/mightypork/rogue/world/item/Item.java b/src/mightypork/rogue/world/item/Item.java
index 8d3881b..502bd84 100644
--- a/src/mightypork/rogue/world/item/Item.java
+++ b/src/mightypork/rogue/world/item/Item.java
@@ -1,17 +1,12 @@
package mightypork.rogue.world.item;
-import java.io.IOException;
-
import mightypork.gamecore.logging.Log;
import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonObjBlob;
-import mightypork.gamecore.util.ion.IonObjBundled;
-import mightypork.gamecore.util.ion.IonOutput;
import mightypork.gamecore.util.math.Calc;
import mightypork.gamecore.util.math.constraints.rect.Rect;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonObjBundled;
import mightypork.rogue.world.PlayerFacade;
@@ -44,7 +39,7 @@ public abstract class Item implements IonObjBundled {
@Override
@DefaultImpl
- public void save(IonBundle out) throws IOException
+ public void save(IonBundle out)
{
out.put("c", amount);
out.put("u", uses);
@@ -53,7 +48,7 @@ public abstract class Item implements IonObjBundled {
@Override
@DefaultImpl
- public void load(IonBundle in) throws IOException
+ public void load(IonBundle in)
{
amount = in.get("c", amount);
uses = in.get("u", uses);
diff --git a/src/mightypork/rogue/world/item/ItemModel.java b/src/mightypork/rogue/world/item/ItemModel.java
index 23d5921..c299aaa 100644
--- a/src/mightypork/rogue/world/item/ItemModel.java
+++ b/src/mightypork/rogue/world/item/ItemModel.java
@@ -3,17 +3,14 @@ package mightypork.rogue.world.item;
import java.io.IOException;
-import mightypork.gamecore.util.ion.Ion;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
import mightypork.gamecore.util.math.Calc;
+import mightypork.ion.IonBundle;
/**
* Item model (builder)
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class ItemModel {
diff --git a/src/mightypork/rogue/world/item/Items.java b/src/mightypork/rogue/world/item/Items.java
index f981d39..63e5927 100644
--- a/src/mightypork/rogue/world/item/Items.java
+++ b/src/mightypork/rogue/world/item/Items.java
@@ -4,9 +4,9 @@ package mightypork.rogue.world.item;
import java.io.IOException;
import java.util.Collection;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.item.impl.active.ItemHeartPiece;
import mightypork.rogue.world.item.impl.food.ItemCheese;
import mightypork.rogue.world.item.impl.food.ItemMeat;
@@ -17,7 +17,7 @@ import mightypork.rogue.world.item.impl.weapons.*;
/**
* Item registry
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class Items {
@@ -76,7 +76,7 @@ public final class Items {
out.writeIntByte(model.id);
- IonBundle ib = new IonBundle();
+ final IonBundle ib = new IonBundle();
model.saveItem(ib, item);
out.writeBundle(ib);
}
diff --git a/src/mightypork/rogue/world/level/Level.java b/src/mightypork/rogue/world/level/Level.java
index 3d242b4..93ed129 100644
--- a/src/mightypork/rogue/world/level/Level.java
+++ b/src/mightypork/rogue/world/level/Level.java
@@ -10,10 +10,6 @@ import mightypork.gamecore.eventbus.clients.DelegatingClient;
import mightypork.gamecore.eventbus.clients.ToggleableClient;
import mightypork.gamecore.eventbus.events.Updateable;
import mightypork.gamecore.logging.Log;
-import mightypork.gamecore.util.ion.IonBundle;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonObjBinary;
-import mightypork.gamecore.util.ion.IonOutput;
import mightypork.gamecore.util.math.Calc;
import mightypork.gamecore.util.math.algo.Coord;
import mightypork.gamecore.util.math.algo.Move;
@@ -21,6 +17,10 @@ import mightypork.gamecore.util.math.algo.Moves;
import mightypork.gamecore.util.math.algo.floodfill.FloodFill;
import mightypork.gamecore.util.math.constraints.vect.Vect;
import mightypork.gamecore.util.math.noise.NoiseGen;
+import mightypork.ion.IonBundle;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonObjBinary;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.World;
import mightypork.rogue.world.entity.Entities;
import mightypork.rogue.world.entity.Entity;
@@ -35,7 +35,7 @@ import mightypork.rogue.world.tile.Tiles;
/**
* One level of the dungeon
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class Level implements BusAccess, Updateable, DelegatingClient, ToggleableClient, IonObjBinary {
@@ -288,13 +288,6 @@ public class Level implements BusAccess, Updateable, DelegatingClient, Toggleabl
}
- @Override
- public short getIonMark()
- {
- return ION_MARK;
- }
-
-
@Override
public void update(double delta)
{
diff --git a/src/mightypork/rogue/world/level/render/TileRenderContext.java b/src/mightypork/rogue/world/level/render/TileRenderContext.java
index 0072355..0220c01 100644
--- a/src/mightypork/rogue/world/level/render/TileRenderContext.java
+++ b/src/mightypork/rogue/world/level/render/TileRenderContext.java
@@ -13,7 +13,7 @@ import mightypork.rogue.world.tile.Tile;
/**
* Context for tile rendering.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class TileRenderContext extends MapRenderContext implements RectBound {
diff --git a/src/mightypork/rogue/world/tile/Tile.java b/src/mightypork/rogue/world/tile/Tile.java
index 6deea12..5a9b3e5 100644
--- a/src/mightypork/rogue/world/tile/Tile.java
+++ b/src/mightypork/rogue/world/tile/Tile.java
@@ -7,10 +7,10 @@ import mightypork.gamecore.eventbus.BusAccess;
import mightypork.gamecore.eventbus.EventBus;
import mightypork.gamecore.logging.Log;
import mightypork.gamecore.util.annot.DefaultImpl;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonObjBlob;
-import mightypork.gamecore.util.ion.IonOutput;
import mightypork.gamecore.util.math.color.Color;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonObjBinary;
+import mightypork.ion.IonOutput;
import mightypork.rogue.Const;
import mightypork.rogue.world.World;
import mightypork.rogue.world.item.Item;
@@ -21,9 +21,9 @@ import mightypork.rogue.world.level.render.TileRenderContext;
/**
* Tile data bundle. Client only renders.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
-public abstract class Tile implements BusAccess, IonObjBlob {
+public abstract class Tile implements BusAccess, IonObjBinary {
// tmp extras
public final TileGenData genData = new TileGenData();
diff --git a/src/mightypork/rogue/world/tile/TileGenData.java b/src/mightypork/rogue/world/tile/TileGenData.java
index 1270596..ec8be4c 100644
--- a/src/mightypork/rogue/world/tile/TileGenData.java
+++ b/src/mightypork/rogue/world/tile/TileGenData.java
@@ -7,7 +7,7 @@ import mightypork.rogue.world.gen.TileProtectLevel;
/**
* Data storage for world generator
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class TileGenData {
diff --git a/src/mightypork/rogue/world/tile/TileModel.java b/src/mightypork/rogue/world/tile/TileModel.java
index 8821f48..1b85969 100644
--- a/src/mightypork/rogue/world/tile/TileModel.java
+++ b/src/mightypork/rogue/world/tile/TileModel.java
@@ -3,14 +3,14 @@ package mightypork.rogue.world.tile;
import java.io.IOException;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
/**
* Tile model (builder)
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class TileModel {
diff --git a/src/mightypork/rogue/world/tile/TileRenderer.java b/src/mightypork/rogue/world/tile/TileRenderer.java
index d3dd987..392d5f1 100644
--- a/src/mightypork/rogue/world/tile/TileRenderer.java
+++ b/src/mightypork/rogue/world/tile/TileRenderer.java
@@ -15,7 +15,7 @@ import mightypork.rogue.world.tile.render.NullTileRenderer;
/**
* Renderer for a tile; each tile has own renderer.
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class TileRenderer implements Updateable {
diff --git a/src/mightypork/rogue/world/tile/TileType.java b/src/mightypork/rogue/world/tile/TileType.java
index 4528b51..3bf119f 100644
--- a/src/mightypork/rogue/world/tile/TileType.java
+++ b/src/mightypork/rogue/world/tile/TileType.java
@@ -7,7 +7,7 @@ import mightypork.gamecore.util.math.color.Color;
/**
* Kinds of tiles
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public enum TileType
{
diff --git a/src/mightypork/rogue/world/tile/Tiles.java b/src/mightypork/rogue/world/tile/Tiles.java
index bf3fcf5..16b12a0 100644
--- a/src/mightypork/rogue/world/tile/Tiles.java
+++ b/src/mightypork/rogue/world/tile/Tiles.java
@@ -3,8 +3,8 @@ package mightypork.rogue.world.tile;
import java.io.IOException;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.tile.impl.NullTile;
import mightypork.rogue.world.tile.impl.brick.*;
@@ -12,7 +12,7 @@ import mightypork.rogue.world.tile.impl.brick.*;
/**
* Tile registry
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public final class Tiles {
diff --git a/src/mightypork/rogue/world/tile/impl/TileBaseChest.java b/src/mightypork/rogue/world/tile/impl/TileBaseChest.java
index fb12d29..eafbf6e 100644
--- a/src/mightypork/rogue/world/tile/impl/TileBaseChest.java
+++ b/src/mightypork/rogue/world/tile/impl/TileBaseChest.java
@@ -3,8 +3,8 @@ package mightypork.rogue.world.tile.impl;
import java.io.IOException;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.tile.TileModel;
import mightypork.rogue.world.tile.TileType;
diff --git a/src/mightypork/rogue/world/tile/impl/TileBaseDoor.java b/src/mightypork/rogue/world/tile/impl/TileBaseDoor.java
index 98eb8e6..b887c7a 100644
--- a/src/mightypork/rogue/world/tile/impl/TileBaseDoor.java
+++ b/src/mightypork/rogue/world/tile/impl/TileBaseDoor.java
@@ -4,8 +4,8 @@ package mightypork.rogue.world.tile.impl;
import java.io.IOException;
import mightypork.gamecore.resources.textures.TxSheet;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.tile.TileModel;
import mightypork.rogue.world.tile.TileRenderer;
import mightypork.rogue.world.tile.TileType;
diff --git a/src/mightypork/rogue/world/tile/impl/TileBasePassage.java b/src/mightypork/rogue/world/tile/impl/TileBasePassage.java
index 23f38b4..cdfdef5 100644
--- a/src/mightypork/rogue/world/tile/impl/TileBasePassage.java
+++ b/src/mightypork/rogue/world/tile/impl/TileBasePassage.java
@@ -11,7 +11,7 @@ import mightypork.rogue.world.tile.render.BasicTileRenderer;
/**
* Collapsed wall that's walk-through
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public abstract class TileBasePassage extends TileSolid {
diff --git a/src/mightypork/rogue/world/tile/impl/TileBaseSecretDoor.java b/src/mightypork/rogue/world/tile/impl/TileBaseSecretDoor.java
index c626b44..ae5b9ef 100644
--- a/src/mightypork/rogue/world/tile/impl/TileBaseSecretDoor.java
+++ b/src/mightypork/rogue/world/tile/impl/TileBaseSecretDoor.java
@@ -4,9 +4,9 @@ package mightypork.rogue.world.tile.impl;
import java.io.IOException;
import mightypork.gamecore.resources.textures.TxSheet;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
import mightypork.gamecore.util.math.color.Color;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.world.tile.TileColors;
import mightypork.rogue.world.tile.TileModel;
diff --git a/src/mightypork/rogue/world/tile/impl/TileWithItems.java b/src/mightypork/rogue/world/tile/impl/TileWithItems.java
index a19fb62..54a4051 100644
--- a/src/mightypork/rogue/world/tile/impl/TileWithItems.java
+++ b/src/mightypork/rogue/world/tile/impl/TileWithItems.java
@@ -4,8 +4,8 @@ package mightypork.rogue.world.tile.impl;
import java.io.IOException;
import java.util.Stack;
-import mightypork.gamecore.util.ion.IonInput;
-import mightypork.gamecore.util.ion.IonOutput;
+import mightypork.ion.IonInput;
+import mightypork.ion.IonOutput;
import mightypork.rogue.Const;
import mightypork.rogue.world.item.Item;
import mightypork.rogue.world.item.Items;
diff --git a/src/mightypork/rogue/world/tile/render/NullTileRenderer.java b/src/mightypork/rogue/world/tile/render/NullTileRenderer.java
index 5aa7d56..c14dfa9 100644
--- a/src/mightypork/rogue/world/tile/render/NullTileRenderer.java
+++ b/src/mightypork/rogue/world/tile/render/NullTileRenderer.java
@@ -8,7 +8,7 @@ import mightypork.rogue.world.tile.TileRenderer;
/**
* Do-nothing tile renderer
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class NullTileRenderer extends TileRenderer {
diff --git a/src/mightypork/rogue/world/tile/render/OneFrameTileRenderer.java b/src/mightypork/rogue/world/tile/render/OneFrameTileRenderer.java
index b9d1547..72a524f 100644
--- a/src/mightypork/rogue/world/tile/render/OneFrameTileRenderer.java
+++ b/src/mightypork/rogue/world/tile/render/OneFrameTileRenderer.java
@@ -11,7 +11,7 @@ import mightypork.rogue.world.tile.TileRenderer;
/**
* Tile that spans across two tiles visually (two-high)
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class OneFrameTileRenderer extends TileRenderer {
diff --git a/src/mightypork/rogue/world/tile/render/TwoHighTileRenderer.java b/src/mightypork/rogue/world/tile/render/TwoHighTileRenderer.java
index 32b4b32..de48cce 100644
--- a/src/mightypork/rogue/world/tile/render/TwoHighTileRenderer.java
+++ b/src/mightypork/rogue/world/tile/render/TwoHighTileRenderer.java
@@ -12,7 +12,7 @@ import mightypork.rogue.world.tile.TileRenderer;
/**
* Tile that spans across two tiles visually (two-high)
*
- * @author MightyPork
+ * @author Ondřej Hruška
*/
public class TwoHighTileRenderer extends TileRenderer {