Some refactoring and cleaning, string utils.

src/mightypork/utils/Convert.java

@@ -8,7 +8,7 @@ package mightypork.utils;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Convert {
-
+	
 	/**
 	 * Get INTEGER
 	 *
@@ -26,8 +26,8 @@ public class Convert {
 		} catch (final NumberFormatException e) {}
 		return def;
 	}
-
+	
-
+	
 	/**
 	 * Get DOUBLE
 	 *
@@ -45,8 +45,8 @@ public class Convert {
 		} catch (final NumberFormatException e) {}
 		return def;
 	}
-
+	
-
+	
 	/**
 	 * Get FLOAT
 	 *
@@ -62,8 +62,8 @@ public class Convert {
 		} catch (final NumberFormatException e) {}
 		return def;
 	}
-
+	
-
+	
 	/**
 	 * Get BOOLEAN
 	 *
@@ -76,7 +76,7 @@ public class Convert {
 		if (o == null) return def;
 		if (o instanceof Boolean) return ((Boolean) o).booleanValue();
 		if (o instanceof Number) return ((Number) o).intValue() != 0;
-
+		
 		if (o instanceof String) {
 			final String s = ((String) o).trim().toLowerCase();
 			if (s.equals("0")) return false;
@@ -85,23 +85,23 @@ public class Convert {
 				final double n = Double.parseDouble(s);
 				return n != 0;
 			} catch (final NumberFormatException e) {}
-
+			
 			if (s.equals("true")) return true;
 			if (s.equals("yes")) return true;
 			if (s.equals("y")) return true;
 			if (s.equals("a")) return true;
 			if (s.equals("enabled")) return true;
-
+			
 			if (s.equals("false")) return false;
 			if (s.equals("no")) return false;
 			if (s.equals("n")) return false;
 			if (s.equals("disabled")) return true;
 		}
-
+		
 		return def;
 	}
-
+	
-
+	
 	/**
 	 * Get STRING
 	 *
@@ -113,19 +113,19 @@ public class Convert {
 	{
 		if (o == null) return def;
 		if (o instanceof String) return ((String) o);
-
+		
-		if (o instanceof Float) return Support.str((float) o);
+		if (o instanceof Float) return Str.val((float) o);
-
+		
-		if (o instanceof Double) return Support.str((double) o);
+		if (o instanceof Double) return Str.val((double) o);
-
+		
 		if (o instanceof Class<?>) {
-			return Support.str(o);
+			return Str.val(o);
 		}
-
+		
 		return o.toString();
 	}
-
+	
-
+	
 	/**
 	 * Get INTEGER
 	 *
@@ -136,8 +136,8 @@ public class Convert {
 	{
 		return toInteger(o, 0);
 	}
-
+	
-
+	
 	/**
 	 * Get DOUBLE
 	 *
@@ -148,8 +148,8 @@ public class Convert {
 	{
 		return toDouble(o, 0d);
 	}
-
+	
-
+	
 	/**
 	 * Get FLOAT
 	 *
@@ -160,8 +160,8 @@ public class Convert {
 	{
 		return toFloat(o, 0f);
 	}
-
+	
-
+	
 	/**
 	 * Get BOOLEAN
 	 *
@@ -172,8 +172,8 @@ public class Convert {
 	{
 		return toBoolean(o, false);
 	}
-
+	
-
+	
 	/**
 	 * Get STRING
 	 *

src/mightypork/utils/MapSort.java

@@ -16,7 +16,7 @@ import java.util.Map.Entry;
  * @author Ondřej Hruška (MightyPork)
  */
 public class MapSort {
-	
+
 	/**
 	 * Sort a map by keys, maintaining key-value pairs, using natural order.
 	 *
@@ -28,8 +28,8 @@ public class MapSort {
 	{
 		return byKeys(map, null);
 	}
-	
+
-	
+
 	/**
 	 * Sort a map by keys, maintaining key-value pairs.
 	 *
@@ -41,10 +41,10 @@ public class MapSort {
 	public static <K, V> LinkedHashMap<K, V> byKeys(Map<K, V> map, Comparator<K> comparator)
 	{
 		final List<K> keys = new LinkedList<>(map.keySet());
-		
+
 		if (comparator == null) {
 			comparator = new Comparator<K>() {
-				
+
 				@Override
 				public int compare(K arg0, K arg1)
 				{
@@ -52,18 +52,18 @@ public class MapSort {
 				}
 			};
 		}
-		
+
 		Collections.sort(keys, comparator);
-		
+
 		final LinkedHashMap<K, V> sortedMap = new LinkedHashMap<>();
 		for (final K key : keys) {
 			sortedMap.put(key, map.get(key));
 		}
-		
+
 		return sortedMap;
 	}
-	
+
-	
+
 	/**
 	 * Sort a map by values, maintaining key-value pairs, using natural order.
 	 *
@@ -75,8 +75,8 @@ public class MapSort {
 	{
 		return byValues(map, null);
 	}
-	
+
-	
+
 	/**
 	 * Sort a map by values, maintaining key-value pairs.
 	 *
@@ -87,9 +87,9 @@ public class MapSort {
 	public static <K, V> LinkedHashMap<K, V> byValues(Map<K, V> map, final Comparator<V> comparator)
 	{
 		final List<Map.Entry<K, V>> entries = new LinkedList<>(map.entrySet());
-		
+
 		Collections.sort(entries, new Comparator<Map.Entry<K, V>>() {
-			
+
 			@SuppressWarnings("unchecked")
 			@Override
 			public int compare(Entry<K, V> o1, Entry<K, V> o2)
@@ -98,13 +98,13 @@ public class MapSort {
 				return comparator.compare(o1.getValue(), o2.getValue());
 			}
 		});
-		
+
 		final LinkedHashMap<K, V> sortedMap = new LinkedHashMap<>();
-		
+
 		for (final Map.Entry<K, V> entry : entries) {
 			sortedMap.put(entry.getKey(), entry.getValue());
 		}
-		
+
 		return sortedMap;
 	}
 }

src/mightypork/utils/Reflect.java

@@ -14,7 +14,7 @@ import java.lang.reflect.Type;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Reflect {
-
+	
 	/**
 	 * Get annotation of given type from an object
 	 *
@@ -26,8 +26,8 @@ public class Reflect {
 	{
 		return tested.getClass().getAnnotation(annotation);
 	}
-
+	
-
+	
 	/**
 	 * Check if an object has an annotation of given trype
 	 *
@@ -39,8 +39,8 @@ public class Reflect {
 	{
 		return tested.getClass().isAnnotationPresent(annotation);
 	}
-
+	
-
+	
 	/**
 	 * Get generic parameters of a class
 	 *
@@ -50,25 +50,25 @@ public class Reflect {
 	public static Class<?>[] getGenericParameters(Class<?> clazz)
 	{
 		// BEHOLD, MAGIC!
-
+		
 		final Type evtc = clazz.getGenericSuperclass();
-
+		
 		if (evtc instanceof ParameterizedType) {
 			final Type[] types = ((ParameterizedType) evtc).getActualTypeArguments();
-
+			
 			final Class<?>[] classes = new Class<?>[types.length];
-
+			
 			for (int i = 0; i < types.length; i++) {
 				classes[i] = (Class<?>) types[i];
 			}
-
+			
 			return classes;
 		}
-
+		
-		throw new RuntimeException(Support.str(clazz) + " is not generic.");
+		throw new RuntimeException(Str.val(clazz) + " is not generic.");
 	}
-
+	
-
+	
 	/**
 	 * Get value of a public static final field. If the modifiers don't match,
 	 * an exception is thrown.
@@ -82,15 +82,15 @@ public class Reflect {
 	public static Object getConstantFieldValue(Class<?> objClass, String fieldName) throws ReflectiveOperationException
 	{
 		final Field fld = objClass.getDeclaredField(fieldName);
-
+		
 		final int modif = fld.getModifiers();
-
+		
 		if (!Modifier.isFinal(modif) || !Modifier.isStatic(modif)) {
-			throw new ReflectiveOperationException("The " + fieldName + " field of " + Support.str(objClass) + " must be static and final!");
+			throw new ReflectiveOperationException("The " + fieldName + " field of " + Str.val(objClass) + " must be static and final!");
 		}
-
+		
 		fld.setAccessible(true);
 		return fld.get(null);
 	}
-
+	
 }

src/mightypork/utils/Str.java

@@ -0,0 +1,231 @@
+package mightypork.utils;
+
+
+import mightypork.utils.annotations.Alias;
+import mightypork.utils.math.AlignX;
+
+
+/**
+ * General purpose string utilities
+ *
+ * @author Ondřej Hruška (MightyPork)
+ */
+public class Str {
+	
+	public static String fromLastDot(String s)
+	{
+		return fromLast(s, '.');
+	}
+	
+	
+	public static String toLastDot(String s)
+	{
+		return toLast(s, '.');
+	}
+	
+	
+	public static String fromLast(String s, char c)
+	{
+		if (s == null) return null;
+		if (s.lastIndexOf(c) == -1) return "";
+		return s.substring(s.lastIndexOf(c) + 1, s.length());
+	}
+	
+	
+	public static String toLast(String s, char c)
+	{
+		if (s == null) return null;
+		if (s.lastIndexOf(c) == -1) return s;
+		return s.substring(0, s.lastIndexOf(c));
+	}
+	
+	
+	public static String fromFirst(String s, char c)
+	{
+		if (s == null) return null;
+		if (s.indexOf(c) == -1) return "";
+		return s.substring(s.indexOf(c) + 1, s.length());
+	}
+	
+	
+	public static String toFirst(String s, char c)
+	{
+		if (s == null) return null;
+		if (s.indexOf(c) == -1) return s;
+		return s.substring(0, s.indexOf(c));
+	}
+
+
+	public static String fromEnd(String s, int chars)
+	{
+		return s.substring(s.length() - chars, s.length());
+	}
+
+
+	public static String fromStart(String s, int chars)
+	{
+		return s.substring(0, chars);
+	}
+	
+	
+	public static String pad(String s, int length)
+	{
+		return pad(s, length, AlignX.LEFT);
+	}
+	
+	
+	public static String pad(String s, int length, AlignX align)
+	{
+		return pad(s, length, align, ' ');
+	}
+	
+	
+	public static String pad(String s, int length, AlignX align, char fill)
+	{
+		final String filling = repeat("" + fill, length);
+		
+		switch (align) {
+			case LEFT:
+				s += filling;
+				return fromStart(s, length);
+
+			case RIGHT:
+				s += filling;
+				return fromEnd(s, length);
+
+			case CENTER:
+				
+				if (s.length() >= length) return s;
+				
+				s = filling + s + filling;
+				
+				final int cut = (int) (s.length() / 2D - length / 2D);
+				return s.substring(cut, s.length() - cut);
+		}
+
+		throw new IllegalArgumentException("Impossible error.");
+	}
+	
+	
+	/**
+	 * Repeat a string
+	 *
+	 * @param repeated string
+	 * @param count
+	 * @return output
+	 */
+	public static String repeat(String repeated, int count)
+	{
+		String s = "";
+		for (int i = 0; i < count; i++)
+			s += repeated;
+		return s;
+	}
+	
+	
+	public static boolean isValidFilenameChar(char ch)
+	{
+		return isValidFilenameString(Character.toString(ch));
+	}
+	
+	
+	public static boolean isValidFilenameString(String filename)
+	{
+		return filename.matches("[a-zA-Z0-9 +\\-.,_%@#!]+");
+	}
+	
+	
+	public static String ellipsisStart(String orig, int length)
+	{
+		if (orig.length() > length) {
+			orig = "\u2026" + orig.substring(length, orig.length());
+		}
+		return orig;
+	}
+	
+	
+	public static String ellipsisEnd(String orig, int length)
+	{
+		if (orig.length() > length) {
+			orig = orig.substring(0, length - 1) + "\u2026";
+		}
+		return orig;
+	}
+	
+	
+	/**
+	 * Convert a class to string, preserving name and outer class, but excluding
+	 * path.
+	 *
+	 * @param cls the class
+	 * @return class name
+	 */
+	public static String val(Class<?> cls)
+	{
+		final Alias ln = cls.getAnnotation(Alias.class);
+		if (ln != null) {
+			return ln.name();
+		}
+
+		String name = cls.getName();
+
+		String sep = "";
+
+		if (name.contains("$")) {
+			name = name.substring(name.lastIndexOf("$") + 1);
+			sep = "$";
+		} else {
+			name = name.substring(name.lastIndexOf(".") + 1);
+			sep = ".";
+		}
+
+		final Class<?> enclosing = cls.getEnclosingClass();
+
+		return (enclosing == null ? "" : Str.val(enclosing) + sep) + name;
+	}
+	
+	
+	/**
+	 * Convert double to string, remove the mess at the end.
+	 *
+	 * @param d double
+	 * @return string
+	 */
+	public static String val(Double d)
+	{
+		String s = d.toString();
+		s = s.replace(',', '.');
+		s = s.replaceAll("([0-9]+\\.[0-9]+)00+[0-9]+", "$1");
+		s = s.replaceAll("0+$", "");
+		s = s.replaceAll("\\.$", "");
+		return s;
+	}
+	
+	
+	/**
+	 * Convert object to string. If the object overrides toString(), it is
+	 * caled. Otherwise it's class name is converted to string.
+	 *
+	 * @param o object
+	 * @return string representation
+	 */
+	public static String val(Object o)
+	{
+		if (o == null) return "<null>";
+
+		boolean hasToString = false;
+
+		try {
+			hasToString = (o.getClass().getMethod("toString").getDeclaringClass() != Object.class);
+		} catch (final Throwable t) {
+			// oh well..
+		}
+
+		if (hasToString) {
+			return o.toString();
+		} else {
+
+			return val(o.getClass());
+		}
+	}
+}

src/mightypork/utils/Support.java

@@ -9,8 +9,6 @@ import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import mightypork.utils.annotations.Alias;
-
 
 /**
  * Miscelanous utilities
@@ -18,7 +16,7 @@ import mightypork.utils.annotations.Alias;
  * @author Ondřej Hruška (MightyPork)
  */
 public final class Support {
-	
+
 	/**
 	 * Create a new thread of the runnable, and start it.
 	 *
@@ -31,8 +29,8 @@ public final class Support {
 		t.start();
 		return t;
 	}
-	
+
-	
+
 	/**
 	 * Pick first non-null option
 	 *
@@ -44,11 +42,11 @@ public final class Support {
 		for (final Object o : options) {
 			if (o != null) return o;
 		}
-		
+
 		return null; // all null
 	}
-	
+
-	
+
 	/**
 	 * Get current time/date for given format.
 	 *
@@ -59,8 +57,8 @@ public final class Support {
 	{
 		return (new SimpleDateFormat(format)).format(new Date());
 	}
-	
+
-	
+
 	/**
 	 * Parse array of vararg key, value pairs to a LinkedHashMap.<br>
 	 * Example:
@@ -85,11 +83,11 @@ public final class Support {
 	public static <K, V> Map<K, V> parseVarArgs(Object... args) throws ClassCastException, IllegalArgumentException
 	{
 		final LinkedHashMap<K, V> attrs = new LinkedHashMap<>();
-		
+
 		if (args.length % 2 != 0) {
 			throw new IllegalArgumentException("Odd number of elements in varargs map!");
 		}
-		
+
 		K key = null;
 		for (final Object o : args) {
 			if (key == null) {
@@ -100,11 +98,11 @@ public final class Support {
 				key = null;
 			}
 		}
-		
+
 		return attrs;
 	}
-	
+
-	
+
 	/**
 	 * Get if an Object is in array (using equals)
 	 *
@@ -119,8 +117,8 @@ public final class Support {
 		}
 		return false;
 	}
-	
+
-	
+
 	/**
 	 * Get if string is in array
 	 *
@@ -140,8 +138,8 @@ public final class Support {
 			return false;
 		}
 	}
-	
+
-	
+
 	/**
 	 * Make enumeration iterable
 	 *
@@ -152,7 +150,7 @@ public final class Support {
 	{
 		return new IterableEnumerationWrapper<>(enumeration);
 	}
-	
+
 	/**
 	 * Helper class for iterationg over an {@link Enumeration}
 	 *
@@ -160,10 +158,10 @@ public final class Support {
 	 * @param <T> target element type (will be cast)
 	 */
 	private static class IterableEnumerationWrapper<T> implements Iterable<T> {
-		
+
 		private final Enumeration<? extends T> enumeration;
-		
+
-		
+
 		/**
 		 * @param enumeration the iterated enumeration
 		 */
@@ -171,27 +169,27 @@ public final class Support {
 		{
 			this.enumeration = enumeration;
 		}
-		
+
-		
+
 		@Override
 		public Iterator<T> iterator()
 		{
 			return new Iterator<T>() {
-				
+
 				@Override
 				public boolean hasNext()
 				{
 					return enumeration.hasMoreElements();
 				}
-				
+
-				
+
 				@Override
 				public T next()
 				{
 					return enumeration.nextElement();
 				}
-				
+
-				
+
 				@Override
 				public void remove()
 				{
@@ -199,99 +197,6 @@ public final class Support {
 				}
 			};
 		}
-		
+
-	}
-	
-	
-	/**
-	 * Convert a class to string, preserving name and outer class, but excluding
-	 * path.
-	 *
-	 * @param cls the class
-	 * @return class name
-	 */
-	public static String str(Class<?> cls)
-	{
-		final Alias ln = cls.getAnnotation(Alias.class);
-		if (ln != null) {
-			return ln.name();
-		}
-		
-		String name = cls.getName();
-		
-		String sep = "";
-		
-		if (name.contains("$")) {
-			name = name.substring(name.lastIndexOf("$") + 1);
-			sep = "$";
-		} else {
-			name = name.substring(name.lastIndexOf(".") + 1);
-			sep = ".";
-		}
-		
-		final Class<?> enclosing = cls.getEnclosingClass();
-		
-		return (enclosing == null ? "" : Support.str(enclosing) + sep) + name;
-	}
-	
-	
-	/**
-	 * Convert double to string, remove the mess at the end.
-	 *
-	 * @param d double
-	 * @return string
-	 */
-	public static String str(Double d)
-	{
-		String s = d.toString();
-		s = s.replace(',', '.');
-		s = s.replaceAll("([0-9]+\\.[0-9]+)00+[0-9]+", "$1");
-		s = s.replaceAll("0+$", "");
-		s = s.replaceAll("\\.$", "");
-		return s;
-	}
-	
-	
-	/**
-	 * Convert float to string, remove the mess at the end.
-	 *
-	 * @param f float
-	 * @return string
-	 */
-	public static String str(Float f)
-	{
-		String s = f.toString();
-		s = s.replaceAll("([0-9]+\\.[0-9]+)00+[0-9]+", "$1");
-		s = s.replaceAll("0+$", "");
-		s = s.replaceAll("\\.$", "");
-		return s;
-	}
-	
-	
-	/**
-	 * Convert object to string. If the object overrides toString(), it is
-	 * caled. Otherwise it's class name is converted to string.
-	 *
-	 * @param o object
-	 * @return string representation
-	 */
-	public static String str(Object o)
-	{
-		if (o == null) return "<null>";
-		
-		boolean hasToString = false;
-		
-		try {
-			hasToString = (o.getClass().getMethod("toString").getDeclaringClass() != Object.class);
-		} catch (final Throwable t) {
-			// oh well..
-		}
-		
-		if (hasToString) {
-			return o.toString();
-		} else {
-			
-			return str(o.getClass());
-		}
 	}
 }

src/mightypork/utils/annotations/Alias.java

@@ -20,6 +20,6 @@ import java.lang.annotation.Target;
 @Documented
 @Target(ElementType.TYPE)
 public @interface Alias {
-
+	
 	String name();
 }

src/mightypork/utils/annotations/FactoryMethod.java

@@ -18,5 +18,5 @@ import java.lang.annotation.Target;
 @Target(ElementType.METHOD)
 @Documented
 public @interface FactoryMethod {
-
+	
 }

src/mightypork/utils/config/SimpleConfig.java

@@ -23,7 +23,7 @@ import mightypork.utils.logging.Log;
  * @author Ondřej Hruška (MightyPork)
  */
 public class SimpleConfig {
-
+	
 	/**
 	 * Load list from file
 	 *
@@ -34,11 +34,11 @@ public class SimpleConfig {
 	public static List<String> listFromFile(File file) throws IOException
 	{
 		final String fileText = FileUtil.fileToString(file);
-
+		
 		return listFromString(fileText);
 	}
-
+	
-
+	
 	/**
 	 * Load map from file
 	 *
@@ -49,11 +49,11 @@ public class SimpleConfig {
 	public static Map<String, String> mapFromFile(File file) throws IOException
 	{
 		final String fileText = FileUtil.fileToString(file);
-
+		
 		return mapFromString(fileText);
 	}
-
+	
-
+	
 	/**
 	 * Load list from string
 	 *
@@ -63,27 +63,27 @@ public class SimpleConfig {
 	public static List<String> listFromString(String text)
 	{
 		final List<String> list = new ArrayList<>();
-
+		
 		final String[] groupsLines = text.split("\n");
-
+		
 		for (String s : groupsLines) {
 			// ignore invalid lines
 			if (s.length() == 0) continue;
 			if (s.startsWith("#") || s.startsWith("//")) continue;
-
+			
 			// NULL value
 			if (s.equalsIgnoreCase("NULL")) s = null;
-
+			
 			if (s != null) s = s.replace("\\n", "\n");
-
+			
 			// save extracted key-value pair
 			list.add(s);
 		}
-
+		
 		return list;
 	}
-
+	
-
+	
 	/**
 	 * Load map from string
 	 *
@@ -93,51 +93,51 @@ public class SimpleConfig {
 	public static Map<String, String> mapFromString(String text)
 	{
 		final LinkedHashMap<String, String> pairs = new LinkedHashMap<>();
-
+		
 		final String[] groupsLines = text.split("\n");
-
+		
 		for (final String s : groupsLines) {
 			// ignore invalid lines
 			if (s.length() == 0) continue;
 			if (s.startsWith("#") || s.startsWith("//")) continue;
 			if (!s.contains("=")) continue;
-
+			
 			// split and trim
 			String[] parts = s.split("=");
 			for (int i = 0; i < parts.length; i++) {
 				parts[i] = parts[i].trim();
 			}
-
+			
 			// check if both parts are valid
 			if (parts.length == 0) {
 				Log.w("Bad line in config file: " + s);
 				continue;
 			}
-
+			
 			if (parts.length == 1) {
 				parts = new String[] { parts[0], "" };
 			}
-
+			
 			if (parts.length != 2) {
 				Log.w("Bad line in config file: " + s);
 				continue;
 			}
-
+			
 			// NULL value
 			if (parts[0].equalsIgnoreCase("NULL")) parts[0] = null;
 			if (parts[1].equalsIgnoreCase("NULL")) parts[1] = null;
-
+			
 			if (parts[0] != null) parts[0] = parts[0].replace("\\n", "\n");
 			if (parts[1] != null) parts[1] = parts[1].replace("\\n", "\n");
-
+			
 			// save extracted key-value pair
 			pairs.put(parts[0], parts[1]);
 		}
-
+		
 		return pairs;
 	}
-
+	
-
+	
 	/**
 	 * Save map to file
 	 *
@@ -149,35 +149,35 @@ public class SimpleConfig {
 	public static void mapToFile(File target, Map<String, String> data, boolean allowNulls) throws IOException
 	{
 		final List<String> lines = new ArrayList<>();
-
+		
 		for (final Entry<String, String> e : data.entrySet()) {
 			String key = e.getKey();
 			String value = e.getValue();
-
+			
 			if (!allowNulls && (key == null || value == null || key.length() == 0 || value.length() == 0)) continue;
-
+			
 			if (key == null) key = "NULL";
 			if (value == null) value = "NULL";
-
+			
 			key = key.replace("\n", "\\n");
 			value = value.replace("\n", "\\n");
-
+			
 			lines.add(key + " = " + value);
 		}
-
+		
 		String text = ""; // # File written by SimpleConfig
-
+		
 		for (final String s : lines) {
 			if (text.length() > 0) text += "\n";
-
+			
 			text += s;
 		}
-
+		
 		FileUtil.stringToFile(target, text);
-
+		
 	}
-
+	
-
+	
 	/**
 	 * Save list to file
 	 *
@@ -188,18 +188,18 @@ public class SimpleConfig {
 	public static void listToFile(File target, List<String> data) throws IOException
 	{
 		String text = ""; // # File written by SimpleConfig
-
+		
 		for (String s : data) {
 			if (text.length() > 0) text += "\n";
-
+			
 			if (s == null) s = "NULL";
-
+			
 			s = s.replace("\n", "\\n");
-
+			
 			text += s;
 		}
-
+		
 		FileUtil.stringToFile(target, text);
-
+		
 	}
 }

src/mightypork/utils/config/propmgr/Property.java

@@ -14,14 +14,14 @@ import mightypork.utils.annotations.Stub;
  * @param <T> property type
  */
 public abstract class Property<T> {
-	
+
 	protected final String comment;
 	protected final String key;
-	
+
 	protected T value;
 	protected final T defaultValue;
-	
+
-	
+
 	/**
 	 * Create a property without comment
 	 *
@@ -33,8 +33,8 @@ public abstract class Property<T> {
 	{
 		this(key, defaultValue, null);
 	}
-	
+
-	
+
 	/**
 	 * Create a property with a comment
 	 *
@@ -51,8 +51,8 @@ public abstract class Property<T> {
 		this.value = defaultValue;
 		this.defaultValue = defaultValue;
 	}
-	
+
-	
+
 	/**
 	 * Parse a string representation of the value into this property. If the
 	 * value cannot be decoded, use the default value instead.
@@ -60,8 +60,8 @@ public abstract class Property<T> {
 	 * @param string property value as string
 	 */
 	public abstract void fromString(String string);
-	
+
-	
+
 	/**
 	 * Get property value as string (compatible with `fromString())
 	 *
@@ -73,8 +73,8 @@ public abstract class Property<T> {
 	{
 		return Convert.toString(value, Convert.toString(defaultValue));
 	}
-	
+
-	
+
 	/**
 	 * Get the current property value
 	 *
@@ -84,8 +84,8 @@ public abstract class Property<T> {
 	{
 		return value;
 	}
-	
+
-	
+
 	/**
 	 * Set property value.<br>
 	 * Uses Object to allow setValue(Object) method in {@link PropertyManager}
@@ -98,8 +98,8 @@ public abstract class Property<T> {
 	{
 		this.value = (T) value;
 	}
-	
+
-	
+
 	/**
 	 * Get property comment.
 	 *
@@ -109,8 +109,8 @@ public abstract class Property<T> {
 	{
 		return comment;
 	}
-	
+
-	
+
 	/**
 	 * Get property key
 	 *

src/mightypork/utils/config/propmgr/PropertyManager.java

@@ -22,12 +22,12 @@ import mightypork.utils.logging.Log;
  * @author Ondřej Hruška (MightyPork)
  */
 public class PropertyManager {
-
+	
 	private final TreeMap<String, Property<?>> entries = new TreeMap<>();
 	private final TreeMap<String, String> renameTable = new TreeMap<>();
 	private final PropertyStore props;
-
+	
-
+	
 	/**
 	 * Create property manager from file path and a header comment.<br>
 	 * This is the same as using a {@link PropertyFile} store.
@@ -39,8 +39,8 @@ public class PropertyManager {
 	{
 		this(new PropertyFile(file, comment));
 	}
-
+	
-
+	
 	/**
 	 * Create property manager based on provided {@link PropertyStore}
 	 *
@@ -51,61 +51,61 @@ public class PropertyManager {
 	{
 		this.props = props;
 	}
-
+	
-
+	
 	/**
 	 * Load from file
 	 */
 	public void load()
 	{
 		props.load();
-
+		
 		// rename keys (useful if keys change but value is to be kept)
 		for (final Entry<String, String> entry : renameTable.entrySet()) {
-
+			
 			final String value = props.getProperty(entry.getKey());
-
+			
 			if (value == null) continue;
-
+			
 			final String oldKey = entry.getKey();
 			final String newKey = entry.getValue();
-
+			
 			props.removeProperty(oldKey);
 			props.setProperty(newKey, value, entries.get(newKey).getComment());
 		}
-
+		
 		for (final Property<?> entry : entries.values()) {
 			entry.fromString(props.getProperty(entry.getKey()));
 		}
 	}
-
+	
-
+	
 	public void save()
 	{
 		try {
 			final ArrayList<String> keyList = new ArrayList<>();
-
+			
 			// validate entries one by one, replace with default when needed
 			for (final Property<?> entry : entries.values()) {
 				keyList.add(entry.getKey());
-
+				
 				props.setProperty(entry.getKey(), entry.toString(), entry.getComment());
 			}
-
+			
 			// removed unused props
 			for (final String key : props.keys()) {
 				if (!keyList.contains(key)) {
 					props.removeProperty(key);
 				}
 			}
-
+			
 			props.save();
 		} catch (final IOException ioe) {
 			ioe.printStackTrace();
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get a property entry (rarely used)
 	 *
@@ -121,8 +121,8 @@ public class PropertyManager {
 			return null;
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get boolean property
 	 *
@@ -133,8 +133,8 @@ public class PropertyManager {
 	{
 		return Convert.toBoolean(getProperty(k).getValue());
 	}
-
+	
-
+	
 	/**
 	 * Get numeric property
 	 *
@@ -145,8 +145,8 @@ public class PropertyManager {
 	{
 		return Convert.toInteger(getProperty(k).getValue());
 	}
-
+	
-
+	
 	/**
 	 * Get numeric property as double
 	 *
@@ -157,8 +157,8 @@ public class PropertyManager {
 	{
 		return Convert.toDouble(getProperty(k).getValue());
 	}
-
+	
-
+	
 	/**
 	 * Get string property
 	 *
@@ -169,8 +169,8 @@ public class PropertyManager {
 	{
 		return Convert.toString(getProperty(k).getValue());
 	}
-
+	
-
+	
 	/**
 	 * Get arbitrary property. Make sure it's of the right type!
 	 *
@@ -186,8 +186,8 @@ public class PropertyManager {
 			return null;
 		}
 	}
-
+	
-
+	
 	/**
 	 * Add a boolean property
 	 *
@@ -199,8 +199,8 @@ public class PropertyManager {
 	{
 		addProperty(new BooleanProperty(k, d, comment));
 	}
-
+	
-
+	
 	/**
 	 * Add a numeric property (double)
 	 *
@@ -212,8 +212,8 @@ public class PropertyManager {
 	{
 		addProperty(new DoubleProperty(k, d, comment));
 	}
-
+	
-
+	
 	/**
 	 * Add a numeric property
 	 *
@@ -225,8 +225,8 @@ public class PropertyManager {
 	{
 		addProperty(new IntegerProperty(k, d, comment));
 	}
-
+	
-
+	
 	/**
 	 * Add a string property
 	 *
@@ -238,8 +238,8 @@ public class PropertyManager {
 	{
 		addProperty(new StringProperty(k, d, comment));
 	}
-
+	
-
+	
 	/**
 	 * Add a generic property (can be used with custom property types)
 	 *
@@ -249,8 +249,8 @@ public class PropertyManager {
 	{
 		entries.put(prop.getKey(), prop);
 	}
-
+	
-
+	
 	/**
 	 * Rename key before loading; value is preserved
 	 *
@@ -262,8 +262,8 @@ public class PropertyManager {
 		renameTable.put(oldKey, newKey);
 		return;
 	}
-
+	
-
+	
 	/**
 	 * Set value saved to certain key.
 	 *
@@ -274,8 +274,8 @@ public class PropertyManager {
 	{
 		getProperty(key).setValue(value);
 	}
-
+	
-
+	
 	/**
 	 * Set heading comment of the property store.
 	 *
@@ -285,5 +285,5 @@ public class PropertyManager {
 	{
 		props.setComment(fileComment);
 	}
-
+	
 }

src/mightypork/utils/config/propmgr/PropertyStore.java

@@ -13,30 +13,30 @@ import java.util.Collection;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface PropertyStore {
-
+	
 	/**
 	 * Set a header comment
 	 *
 	 * @param comment the comment text (can be multi-line)
 	 */
 	void setComment(String comment);
-
+	
-
+	
 	/**
 	 * Load properties from the file / store. If the file does not exist or is
 	 * inaccessible, nothing is loaded.
 	 */
 	void load();
-
+	
-
+	
 	/**
 	 * Save properties to the file / store.
 	 *
 	 * @throws IOException if the file cannot be created or written.
 	 */
 	void save() throws IOException;
-
+	
-
+	
 	/**
 	 * Get a property value
 	 *
@@ -44,8 +44,8 @@ public interface PropertyStore {
 	 * @return value retrieved from the file, or null if none found.
 	 */
 	String getProperty(String key);
-
+	
-
+	
 	/**
 	 * Set a property value
 	 *
@@ -54,22 +54,22 @@ public interface PropertyStore {
 	 * @param comment property comment. Can be null.
 	 */
 	void setProperty(String key, String value, String comment);
-
+	
-
+	
 	/**
 	 * Remove a property from the list.
 	 *
 	 * @param key property key to remove
 	 */
 	void removeProperty(String key);
-
+	
-
+	
 	/**
 	 * Clear the property list
 	 */
 	void clear();
-
+	
-
+	
 	/**
 	 * Get keys collection (can be used for iterating)
 	 *

src/mightypork/utils/config/propmgr/properties/BooleanProperty.java

@@ -11,19 +11,19 @@ import mightypork.utils.config.propmgr.Property;
  * @author Ondřej Hruška (MightyPork)
  */
 public class BooleanProperty extends Property<Boolean> {
-
+	
 	public BooleanProperty(String key, Boolean defaultValue)
 	{
 		super(key, defaultValue);
 	}
-
+	
-
+	
 	public BooleanProperty(String key, Boolean defaultValue, String comment)
 	{
 		super(key, defaultValue, comment);
 	}
-
+	
-
+	
 	@Override
 	public void fromString(String string)
 	{

src/mightypork/utils/config/propmgr/properties/DoubleProperty.java

@@ -11,19 +11,19 @@ import mightypork.utils.config.propmgr.Property;
  * @author Ondřej Hruška (MightyPork)
  */
 public class DoubleProperty extends Property<Double> {
-
+	
 	public DoubleProperty(String key, Double defaultValue)
 	{
 		super(key, defaultValue);
 	}
-
+	
-
+	
 	public DoubleProperty(String key, Double defaultValue, String comment)
 	{
 		super(key, defaultValue, comment);
 	}
-
+	
-
+	
 	@Override
 	public void fromString(String string)
 	{

src/mightypork/utils/config/propmgr/properties/IntegerProperty.java

@@ -11,19 +11,19 @@ import mightypork.utils.config.propmgr.Property;
  * @author Ondřej Hruška (MightyPork)
  */
 public class IntegerProperty extends Property<Integer> {
-
+	
 	public IntegerProperty(String key, Integer defaultValue)
 	{
 		super(key, defaultValue);
 	}
-
+	
-
+	
 	public IntegerProperty(String key, Integer defaultValue, String comment)
 	{
 		super(key, defaultValue, comment);
 	}
-
+	
-
+	
 	@Override
 	public void fromString(String string)
 	{

src/mightypork/utils/config/propmgr/properties/StringProperty.java

@@ -11,19 +11,19 @@ import mightypork.utils.config.propmgr.Property;
  * @author Ondřej Hruška (MightyPork)
  */
 public class StringProperty extends Property<String> {
-
+	
 	public StringProperty(String key, String defaultValue)
 	{
 		super(key, defaultValue);
 	}
-
+	
-
+	
 	public StringProperty(String key, String defaultValue, String comment)
 	{
 		super(key, defaultValue, comment);
 	}
-
+	
-
+	
 	@Override
 	public void fromString(String string)
 	{

src/mightypork/utils/config/propmgr/store/PropertyFile.java

@@ -17,48 +17,48 @@ import mightypork.utils.config.propmgr.PropertyStore;
  * @author Ondřej Hruška (MightyPork)
  */
 public class PropertyFile implements PropertyStore {
-
+	
 	private String comment;
 	private final File file;
 	private final SortedProperties props;
-
+	
-
+	
 	public PropertyFile(File file)
 	{
 		this.file = file;
 		this.comment = null;
 		this.props = new SortedProperties();
 	}
-
+	
-
+	
 	public PropertyFile(File file, String comment)
 	{
 		this.file = file;
 		this.comment = comment;
 		this.props = new SortedProperties();
 	}
-
+	
-
+	
 	@Override
 	public void setComment(String comment)
 	{
 		this.comment = comment;
 	}
-
+	
-
+	
 	@Override
 	public void load()
 	{
 		if (!file.exists()) return;
-
+		
 		try(FileInputStream in = new FileInputStream(file)) {
 			props.load(in);
 		} catch (final IOException e) {
 			// ignore
 		}
 	}
-
+	
-
+	
 	@Override
 	public void save() throws IOException
 	{
@@ -67,55 +67,55 @@ public class PropertyFile implements PropertyStore {
 				throw new IOException("Cound not create config file.");
 			}
 		}
-
+		
 		try(FileOutputStream out = new FileOutputStream(file)) {
 			props.store(out, comment);
 		}
 	}
-
+	
-
+	
 	@Override
 	public String getProperty(String key)
 	{
 		return props.getProperty(key);
 	}
-
+	
-
+	
 	@Override
 	public void setProperty(String key, String value, String comment)
 	{
 		props.setProperty(key, value);
 		props.setKeyComment(key, comment);
 	}
-
+	
-
+	
 	@Override
 	public void removeProperty(String key)
 	{
 		props.remove(key);
 	}
-
+	
-
+	
 	@Override
 	public void clear()
 	{
 		props.clear();
 	}
-
+	
-
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public Collection<String> keys()
 	{
-
+		
 //		Set<String> keys = new HashSet<>();
 //		for (Object o : props.keySet()) {
 //			keys.add((String) o);
 //		}
 //		return keys;
-
+		
 		// we know it is strings.
 		return (Collection<String>) (Collection<?>) props.keySet();
 	}
-
+	
 }

src/mightypork/utils/config/propmgr/store/SortedProperties.java

@@ -23,15 +23,15 @@ import java.util.Vector;
  * @author Ondřej Hruška (MightyPork)
  */
 class SortedProperties extends java.util.Properties {
-
+	
 	/** Comments for individual keys */
 	private final Hashtable<String, String> keyComments = new Hashtable<>();
-
+	
-
+	
 	private static void writeComments(BufferedWriter bw, String comm) throws IOException
 	{
 		final String comments = comm.replace("\n\n", "\n \n");
-
+		
 		final int len = comments.length();
 		int current = 0;
 		int last = 0;
@@ -44,7 +44,7 @@ class SortedProperties extends java.util.Properties {
 				if (last != current) {
 					bw.write("# " + comments.substring(last, current));
 				}
-
+				
 				if (c > '\u00ff') {
 					uu[2] = hexDigit(c, 12);
 					uu[3] = hexDigit(c, 8);
@@ -64,13 +64,13 @@ class SortedProperties extends java.util.Properties {
 		if (last != current) {
 			bw.write("# " + comments.substring(last, current));
 		}
-
+		
 		bw.newLine();
 		bw.newLine();
 		bw.newLine();
 	}
-
+	
-
+	
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Override
 	public synchronized Enumeration keys()
@@ -83,8 +83,8 @@ class SortedProperties extends java.util.Properties {
 		Collections.sort(keyList); //sort!
 		return keyList.elements();
 	}
-
+	
-
+	
 	private static String saveConvert(String theString, boolean escapeSpace, boolean escapeUnicode)
 	{
 		final int len = theString.length();
@@ -93,10 +93,10 @@ class SortedProperties extends java.util.Properties {
 			bufLen = Integer.MAX_VALUE;
 		}
 		final StringBuffer result = new StringBuffer(bufLen);
-
+		
 		for (int x = 0; x < len; x++) {
 			final char ch = theString.charAt(x);
-
+			
 			// Handle common case first, selecting largest block that
 			// avoids the specials below
 			if ((ch > 61) && (ch < 127)) {
@@ -108,7 +108,7 @@ class SortedProperties extends java.util.Properties {
 				result.append(ch);
 				continue;
 			}
-
+			
 			switch (ch) {
 				case ' ':
 					if (x == 0 || escapeSpace) {
@@ -116,27 +116,27 @@ class SortedProperties extends java.util.Properties {
 					}
 					result.append(' ');
 					break;
-
+				
 				case '\t':
 					result.append('\\');
 					result.append('t');
 					break;
-
+				
 				case '\n':
 					result.append('\\');
 					result.append('n');
 					break;
-
+				
 				case '\r':
 					result.append('\\');
 					result.append('r');
 					break;
-
+				
 				case '\f':
 					result.append('\\');
 					result.append('f');
 					break;
-
+				
 				case '=': // Fall through
 				case ':': // Fall through
 				case '#': // Fall through
@@ -144,7 +144,7 @@ class SortedProperties extends java.util.Properties {
 					result.append('\\');
 					result.append(ch);
 					break;
-
+				
 				default:
 					if (((ch < 0x0020) || (ch > 0x007e)) & escapeUnicode) {
 						result.append('\\');
@@ -158,11 +158,11 @@ class SortedProperties extends java.util.Properties {
 					}
 			}
 		}
-
+		
 		return result.toString();
 	}
-
+	
-
+	
 	/**
 	 * Set additional comment to a key
 	 *
@@ -173,75 +173,75 @@ class SortedProperties extends java.util.Properties {
 	{
 		keyComments.put(key, comment);
 	}
-
+	
-
+	
 	@SuppressWarnings("rawtypes")
 	@Override
 	public void store(OutputStream out, String comments) throws IOException
 	{
 		final BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(out, "UTF-8"));
-
+		
 		final boolean escUnicode = false;
 		boolean firstEntry = true;
 		String lastSectionBeginning = "";
-
+		
 		if (comments != null) {
 			writeComments(bw, comments);
 		}
-
+		
 		synchronized (this) {
 			for (final Enumeration e = keys(); e.hasMoreElements();) {
 				boolean wasNewLine = false;
-
+				
 				String key = (String) e.nextElement();
 				String val = (String) get(key);
 				key = saveConvert(key, true, escUnicode);
 				val = saveConvert(val, false, escUnicode);
-
+				
 				// separate sections
 				if (!lastSectionBeginning.equals(key.split("[.]")[0])) {
 					if (!firstEntry) {
 						bw.newLine();
 						bw.newLine();
 					}
-
+					
 					wasNewLine = true;
 					lastSectionBeginning = key.split("[.]")[0];
 				}
-
+				
 				if (keyComments.containsKey(key)) {
 					String cm = keyComments.get(key);
 					cm = cm.replace("\r", "\n");
 					cm = cm.replace("\r\n", "\n");
 					cm = cm.replace("\n\n", "\n \n");
-
+					
 					final String[] cmlines = cm.split("\n");
-
+					
 					// newline before comments
 					if (!wasNewLine && !firstEntry) {
 						bw.newLine();
 					}
-
+					
 					for (final String cmline : cmlines) {
 						bw.write("# " + cmline);
 						bw.newLine();
 					}
 				}
-
+				
 				bw.write(key + " = " + val);
 				bw.newLine();
-
+				
 				firstEntry = false;
 			}
 		}
 		bw.flush();
 	}
-
+	
-
+	
 	private static String escapifyStr(String str)
 	{
 		final StringBuilder result = new StringBuilder();
-
+		
 		final int len = str.length();
 		for (int x = 0; x < len; x++) {
 			final char ch = str.charAt(x);
@@ -249,7 +249,7 @@ class SortedProperties extends java.util.Properties {
 				result.append(ch);
 				continue;
 			}
-
+			
 			result.append('\\');
 			result.append('u');
 			result.append(hexDigit(ch, 12));
@@ -259,26 +259,26 @@ class SortedProperties extends java.util.Properties {
 		}
 		return result.toString();
 	}
-
+	
-
+	
 	private static char hexDigit(char ch, int offset)
 	{
 		final int val = (ch >> offset) & 0xF;
 		if (val <= 9) {
 			return (char) ('0' + val);
 		}
-
+		
 		return (char) ('A' + val - 10);
 	}
-
+	
-
+	
 	@Override
 	public synchronized void load(InputStream is) throws IOException
 	{
 		load(is, "utf-8");
 	}
-
+	
-
+	
 	public void load(InputStream is, String encoding) throws IOException
 	{
 		final StringBuilder sb = new StringBuilder();
@@ -288,18 +288,18 @@ class SortedProperties extends java.util.Properties {
 			if (temp < 0) {
 				break;
 			}
-
+			
 			final char c = (char) temp;
 			sb.append(c);
 		}
-
+		
 		// discard comments
 		final String read = sb.toString().replaceAll("(#|;|//|--)[^\n]*\n", "\n");
-
+		
 		final String inputString = escapifyStr(read);
 		final byte[] bs = inputString.getBytes("ISO-8859-1");
 		final ByteArrayInputStream bais = new ByteArrayInputStream(bs);
-
+		
 		super.load(bais);
 	}
 }

src/mightypork/utils/eventbus/BusEvent.java

@@ -1,6 +1,7 @@
 package mightypork.utils.eventbus;
 
 
+import mightypork.utils.annotations.Stub;
 import mightypork.utils.eventbus.events.flags.DelayedEvent;
 import mightypork.utils.eventbus.events.flags.DirectEvent;
 import mightypork.utils.eventbus.events.flags.NonConsumableEvent;
@@ -31,19 +32,19 @@ import mightypork.utils.eventbus.events.flags.SingleReceiverEvent;
  * @param <HANDLER> handler type
  */
 public abstract class BusEvent<HANDLER> {
-	
+
 	private boolean consumed;
 	private boolean served;
-	
+
-	
+
 	/**
 	 * Ask handler to handle this message.
 	 *
 	 * @param handler handler instance
 	 */
 	protected abstract void handleBy(HANDLER handler);
-	
+
-	
+
 	/**
 	 * Consume the event, so no other clients will receive it.
 	 *
@@ -53,17 +54,15 @@ public abstract class BusEvent<HANDLER> {
 	public final void consume()
 	{
 		if (consumed) throw new IllegalStateException("Already consumed.");
-		
+
 		if (getClass().isAnnotationPresent(NonConsumableEvent.class)) {
 			throw new UnsupportedOperationException("Not consumable.");
 		}
 
-		(new Throwable()).printStackTrace();
-		
 		consumed = true;
 	}
-	
+
-	
+
 	/**
 	 * Deliver to a handler using the handleBy method.
 	 *
@@ -72,17 +71,17 @@ public abstract class BusEvent<HANDLER> {
 	final void deliverTo(HANDLER handler)
 	{
 		handleBy(handler);
-		
+
 		if (!served) {
 			if (getClass().isAnnotationPresent(SingleReceiverEvent.class)) {
 				consumed = true;
 			}
-			
+
 			served = true;
 		}
 	}
-	
+
-	
+
 	/**
 	 * Check if the event is consumed. When an event is consumed, no other
 	 * clients will receive it.
@@ -93,8 +92,8 @@ public abstract class BusEvent<HANDLER> {
 	{
 		return consumed;
 	}
-	
+
-	
+
 	/**
 	 * @return true if the event was served to at least 1 client
 	 */
@@ -102,8 +101,8 @@ public abstract class BusEvent<HANDLER> {
 	{
 		return served;
 	}
-	
+
-	
+
 	/**
 	 * Clear "served" and "consumed" flags before dispatching.
 	 */
@@ -112,14 +111,16 @@ public abstract class BusEvent<HANDLER> {
 		served = false;
 		consumed = false;
 	}
-	
+
-	
+
 	/**
 	 * Called after all clients have received the event.
 	 *
 	 * @param bus event bus instance
 	 */
+	@Stub
 	public void onDispatchComplete(EventBus bus)
 	{
+		//
 	}
 }

src/mightypork/utils/eventbus/EventBus.java

@@ -10,7 +10,7 @@ import java.util.concurrent.Delayed;
 import java.util.concurrent.TimeUnit;
 
 import mightypork.utils.Reflect;
-import mightypork.utils.Support;
+import mightypork.utils.Str;
 import mightypork.utils.eventbus.clients.DelegatingClient;
 import mightypork.utils.eventbus.events.flags.DelayedEvent;
 import mightypork.utils.eventbus.events.flags.DirectEvent;
@@ -26,73 +26,73 @@ import mightypork.utils.logging.Log;
  * @author Ondřej Hruška (MightyPork)
  */
 final public class EventBus implements Destroyable {
-
+	
 	/**
 	 * Queued event holder
 	 */
 	private class DelayQueueEntry implements Delayed {
-
+		
 		private final long due;
 		private final BusEvent<?> evt;
-
+		
-
+		
 		public DelayQueueEntry(double seconds, BusEvent<?> event)
 		{
 			super();
 			this.due = System.currentTimeMillis() + (long) (seconds * 1000);
 			this.evt = event;
 		}
-
+		
-
+		
 		@Override
 		public int compareTo(Delayed o)
 		{
 			return Long.valueOf(getDelay(TimeUnit.MILLISECONDS)).compareTo(o.getDelay(TimeUnit.MILLISECONDS));
 		}
-
+		
-
+		
 		@Override
 		public long getDelay(TimeUnit unit)
 		{
 			return unit.convert(due - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
 		}
-
+		
-
+		
 		public BusEvent<?> getEvent()
 		{
 			return evt;
 		}
-
+		
 	}
-
+	
 	/**
 	 * Thread handling queued events
 	 */
 	private class QueuePollingThread extends Thread {
-
+		
 		public volatile boolean stopped = false;
-
+		
-
+		
 		public QueuePollingThread()
 		{
 			super("Queue Polling Thread");
 		}
-
+		
-
+		
 		@Override
 		public void run()
 		{
 			DelayQueueEntry evt;
-
+			
 			while (!stopped) {
 				evt = null;
-
+				
 				try {
 					evt = sendQueue.take();
 				} catch (final InterruptedException ignored) {
 					//
 				}
-
+				
 				if (evt != null) {
 					try {
 						dispatch(evt.getEvent());
@@ -102,36 +102,36 @@ final public class EventBus implements Destroyable {
 				}
 			}
 		}
-
+		
 	}
-
+	
 	static final String logMark = "(bus) ";
-
+	
-
+	
 	private static Class<?> getEventListenerClass(BusEvent<?> event)
 	{
 		return Reflect.getGenericParameters(event.getClass())[0];
 	}
-
+	
 	/** Log detailed messages (debug) */
 	public boolean detailedLogging = false;
-
+	
 	/** Queue polling thread */
 	private final QueuePollingThread busThread;
-
+	
 	/** Registered clients */
 	private final Set<Object> clients = Collections.newSetFromMap(new ConcurrentHashMap<Object, Boolean>());
-
+	
 	/** Whether the bus was destroyed */
 	private boolean dead = false;
-
+	
 	/** Message channels */
 	private final Set<EventChannel<?, ?>> channels = Collections.newSetFromMap(new ConcurrentHashMap<EventChannel<?, ?>, Boolean>());
-
+	
 	/** Messages queued for delivery */
 	private final DelayQueue<DelayQueueEntry> sendQueue = new DelayQueue<>();
-
+	
-
+	
 	/**
 	 * Make a new bus and start it's queue thread.
 	 */
@@ -141,8 +141,8 @@ final public class EventBus implements Destroyable {
 		busThread.setDaemon(true);
 		busThread.start();
 	}
-
+	
-
+	
 	/**
 	 * Halt bus thread and reject any future events.
 	 */
@@ -150,12 +150,12 @@ final public class EventBus implements Destroyable {
 	public void destroy()
 	{
 		assertLive();
-
+		
 		busThread.stopped = true;
 		dead = true;
 	}
-
+	
-
+	
 	/**
 	 * Send based on annotation
 	 *
@@ -164,22 +164,22 @@ final public class EventBus implements Destroyable {
 	public void send(BusEvent<?> event)
 	{
 		assertLive();
-
+		
 		final DelayedEvent adelay = Reflect.getAnnotation(event, DelayedEvent.class);
 		if (adelay != null) {
 			sendDelayed(event, adelay.delay());
 			return;
 		}
-
+		
 		if (Reflect.hasAnnotation(event, DirectEvent.class)) {
 			sendDirect(event);
 			return;
 		}
-
+		
 		sendQueued(event);
 	}
-
+	
-
+	
 	/**
 	 * Add event to a queue
 	 *
@@ -188,11 +188,11 @@ final public class EventBus implements Destroyable {
 	public void sendQueued(BusEvent<?> event)
 	{
 		assertLive();
-
+		
 		sendDelayed(event, 0);
 	}
-
+	
-
+	
 	/**
 	 * Add event to a queue, scheduled for given time.
 	 *
@@ -202,17 +202,17 @@ final public class EventBus implements Destroyable {
 	public void sendDelayed(BusEvent<?> event, double delay)
 	{
 		assertLive();
-
+		
 		final DelayQueueEntry dm = new DelayQueueEntry(delay, event);
-
+		
 		if (shallLog(event)) {
-			Log.f3(logMark + "Qu [" + Support.str(event) + "]" + (delay == 0 ? "" : (", delay: " + delay + "s")));
+			Log.f3(logMark + "Qu [" + Str.val(event) + "]" + (delay == 0 ? "" : (", delay: " + delay + "s")));
 		}
-
+		
 		sendQueue.add(dm);
 	}
-
+	
-
+	
 	/**
 	 * Send immediately.<br>
 	 * Should be used for real-time events that require immediate response, such
@@ -223,23 +223,23 @@ final public class EventBus implements Destroyable {
 	public void sendDirect(BusEvent<?> event)
 	{
 		assertLive();
-
+		
-		if (shallLog(event)) Log.f3(logMark + "Di [" + Support.str(event) + "]");
+		if (shallLog(event)) Log.f3(logMark + "Di [" + Str.val(event) + "]");
-
+		
 		dispatch(event);
 	}
-
+	
-
+	
 	public void sendDirectToChildren(DelegatingClient delegatingClient, BusEvent<?> event)
 	{
 		assertLive();
-
+		
-		if (shallLog(event)) Log.f3(logMark + "Di->sub [" + Support.str(event) + "]");
+		if (shallLog(event)) Log.f3(logMark + "Di->sub [" + Str.val(event) + "]");
-
+		
 		doDispatch(delegatingClient.getChildClients(), event);
 	}
-
+	
-
+	
 	/**
 	 * Connect a client to the bus. The client will be connected to all current
 	 * and future channels, until removed from the bus.
@@ -249,15 +249,15 @@ final public class EventBus implements Destroyable {
 	public void subscribe(Object client)
 	{
 		assertLive();
-
+		
 		if (client == null) return;
-
+		
 		clients.add(client);
-
+		
-		if (detailedLogging) Log.f3(logMark + "Client joined: " + Support.str(client));
+		if (detailedLogging) Log.f3(logMark + "Client joined: " + Str.val(client));
 	}
-
+	
-
+	
 	/**
 	 * Disconnect a client from the bus.
 	 *
@@ -266,47 +266,47 @@ final public class EventBus implements Destroyable {
 	public void unsubscribe(Object client)
 	{
 		assertLive();
-
+		
 		clients.remove(client);
-
+		
-		if (detailedLogging) Log.f3(logMark + "Client left: " + Support.str(client));
+		if (detailedLogging) Log.f3(logMark + "Client left: " + Str.val(client));
 	}
-
+	
-
+	
 	@SuppressWarnings("unchecked")
 	private boolean addChannelForEvent(BusEvent<?> event)
 	{
 		try {
 			if (detailedLogging) {
-				Log.f3(logMark + "Setting up channel for new event type: " + Support.str(event.getClass()));
+				Log.f3(logMark + "Setting up channel for new event type: " + Str.val(event.getClass()));
 			}
-
+			
 			final Class<?> listener = getEventListenerClass(event);
 			final EventChannel<?, ?> ch = EventChannel.create(event.getClass(), listener);
-
+			
 			if (ch.canBroadcast(event)) {
-
+				
 				channels.add(ch);
 				//channels.flush();
-
+				
 				if (detailedLogging) {
-					Log.f3(logMark + "Created new channel: " + Support.str(event.getClass()) + " -> " + Support.str(listener));
+					Log.f3(logMark + "Created new channel: " + Str.val(event.getClass()) + " -> " + Str.val(listener));
 				}
-
+				
 				return true;
-
+				
 			} else {
-				Log.w(logMark + "Could not create channel for event " + Support.str(event.getClass()));
+				Log.w(logMark + "Could not create channel for event " + Str.val(event.getClass()));
 			}
-
+			
 		} catch (final Throwable t) {
 			Log.w(logMark + "Error while trying to add channel for event.", t);
 		}
-
+		
 		return false;
 	}
-
+	
-
+	
 	/**
 	 * Make sure the bus is not destroyed.
 	 *
@@ -316,8 +316,8 @@ final public class EventBus implements Destroyable {
 	{
 		if (dead) throw new IllegalStateException("EventBus is dead.");
 	}
-
+	
-
+	
 	/**
 	 * Send immediately.<br>
 	 * Should be used for real-time events that require immediate response, such
@@ -328,12 +328,12 @@ final public class EventBus implements Destroyable {
 	private synchronized void dispatch(BusEvent<?> event)
 	{
 		assertLive();
-
+		
 		doDispatch(clients, event);
 		event.onDispatchComplete(this);
 	}
-
+	
-
+	
 	/**
 	 * Send to a set of clients
 	 *
@@ -343,36 +343,36 @@ final public class EventBus implements Destroyable {
 	private synchronized void doDispatch(Collection<?> clients, BusEvent<?> event)
 	{
 		boolean accepted = false;
-
+		
 		event.clearFlags();
-
+		
 		for (int i = 0; i < 2; i++) { // two tries.
-
+		
 			for (final EventChannel<?, ?> b : channels) {
 				if (b.canBroadcast(event)) {
 					accepted = true;
 					b.broadcast(event, clients);
 				}
-
+				
 				if (event.isConsumed()) break;
 			}
-
+			
 			if (!accepted) if (addChannelForEvent(event)) continue;
-
+			
 			break;
 		}
-
+		
-		if (!accepted) Log.e(logMark + "Not accepted by any channel: " + Support.str(event));
+		if (!accepted) Log.e(logMark + "Not accepted by any channel: " + Str.val(event));
-		if (!event.wasServed() && shallLog(event)) Log.w(logMark + "Not delivered: " + Support.str(event));
+		if (!event.wasServed() && shallLog(event)) Log.w(logMark + "Not delivered: " + Str.val(event));
 	}
-
+	
-
+	
 	private boolean shallLog(BusEvent<?> event)
 	{
 		if (!detailedLogging) return false;
 		if (Reflect.hasAnnotation(event, NotLoggedEvent.class)) return false;
-
+		
 		return true;
 	}
-
+	
 }

src/mightypork/utils/eventbus/EventChannel.java

@@ -5,7 +5,7 @@ import java.util.Collection;
 import java.util.HashSet;
 
 import mightypork.utils.Reflect;
-import mightypork.utils.Support;
+import mightypork.utils.Str;
 import mightypork.utils.eventbus.clients.DelegatingClient;
 import mightypork.utils.eventbus.clients.ToggleableClient;
 import mightypork.utils.eventbus.events.flags.NonRejectableEvent;
@@ -20,11 +20,11 @@ import mightypork.utils.logging.Log;
  * @param <CLIENT> client (subscriber) type
  */
 class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
-
+	
 	private final Class<CLIENT> clientClass;
 	private final Class<EVENT> eventClass;
-
+	
-
+	
 	/**
 	 * Create a channel
 	 *
@@ -33,16 +33,16 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 	 */
 	public EventChannel(Class<EVENT> eventClass, Class<CLIENT> clientClass)
 	{
-
+		
 		if (eventClass == null || clientClass == null) {
 			throw new NullPointerException("Null Event or Client class.");
 		}
-
+		
 		this.clientClass = clientClass;
 		this.eventClass = eventClass;
 	}
-
+	
-
+	
 	/**
 	 * Try to broadcast a event.<br>
 	 * If event is of wrong type, <code>false</code> is returned.
@@ -53,11 +53,11 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 	public void broadcast(BusEvent<?> event, Collection<?> clients)
 	{
 		if (!canBroadcast(event)) return;
-
+		
 		doBroadcast(eventClass.cast(event), clients, new HashSet<>());
 	}
-
+	
-
+	
 	/**
 	 * Send the event
 	 *
@@ -68,46 +68,46 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 	private void doBroadcast(final EVENT event, final Collection<?> clients, final Collection<Object> processed)
 	{
 		for (final Object client : clients) {
-
+			
 			// exclude obvious non-clients
 			if (!isClientValid(client)) {
 				continue;
 			}
-
+			
 			// avoid executing more times
 			if (processed.contains(client)) {
-				Log.w(EventBus.logMark + "Client already served: " + Support.str(client));
+				Log.w(EventBus.logMark + "Client already served: " + Str.val(client));
 				continue;
 			}
 			processed.add(client);
-
+			
 			final boolean must_deliver = Reflect.hasAnnotation(event, NonRejectableEvent.class);
-
+			
 			// opt-out
 			if (client instanceof ToggleableClient) {
 				if (!must_deliver && !((ToggleableClient) client).isListening()) continue;
 			}
-
+			
 			sendTo(client, event);
-
+			
 			if (event.isConsumed()) return;
-
+			
 			// pass on to delegated clients
 			if (client instanceof DelegatingClient) {
 				if (must_deliver || ((DelegatingClient) client).doesDelegate()) {
-
+					
 					final Collection<?> children = ((DelegatingClient) client).getChildClients();
-
+					
 					if (children != null && children.size() > 0) {
 						doBroadcast(event, children, processed);
 					}
-
+					
 				}
 			}
 		}
 	}
-
+	
-
+	
 	/**
 	 * Send an event to a client.
 	 *
@@ -121,8 +121,8 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 			((BusEvent<CLIENT>) event).deliverTo((CLIENT) client);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Check if the given event can be broadcasted by this channel
 	 *
@@ -133,8 +133,8 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 	{
 		return event != null && eventClass.isInstance(event);
 	}
-
+	
-
+	
 	/**
 	 * Create an instance for given types
 	 *
@@ -146,8 +146,8 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 	{
 		return new EventChannel<>(eventClass, clientClass);
 	}
-
+	
-
+	
 	/**
 	 * Check if client is of channel type
 	 *
@@ -158,8 +158,8 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 	{
 		return clientClass.isInstance(client);
 	}
-
+	
-
+	
 	/**
 	 * Check if the channel is compatible with given
 	 *
@@ -170,8 +170,8 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 	{
 		return isClientOfChannelType(client) || (client instanceof DelegatingClient);
 	}
-
+	
-
+	
 	@Override
 	public int hashCode()
 	{
@@ -181,8 +181,8 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 		result = prime * result + ((eventClass == null) ? 0 : eventClass.hashCode());
 		return result;
 	}
-
+	
-
+	
 	@Override
 	public boolean equals(Object obj)
 	{
@@ -198,11 +198,11 @@ class EventChannel<EVENT extends BusEvent<CLIENT>, CLIENT> {
 		} else if (!eventClass.equals(other.eventClass)) return false;
 		return true;
 	}
-
+	
-
+	
 	@Override
 	public String toString()
 	{
-		return "{ " + Support.str(eventClass) + " => " + Support.str(clientClass) + " }";
+		return "{ " + Str.val(eventClass) + " => " + Str.val(clientClass) + " }";
 	}
 }

src/mightypork/utils/eventbus/clients/BusNode.java

@@ -15,33 +15,33 @@ import mightypork.utils.eventbus.EventBus;
  * @author Ondřej Hruška (MightyPork)
  */
 public abstract class BusNode implements ClientHub {
-
+	
 	private final Set<Object> clients = new LinkedHashSet<>();
 	private boolean listening = true;
 	private boolean delegating = true;
-
+	
-
+	
 	@Override
 	public Collection<Object> getChildClients()
 	{
 		return clients;
 	}
-
+	
-
+	
 	@Override
 	public boolean doesDelegate()
 	{
 		return delegating;
 	}
-
+	
-
+	
 	@Override
 	public boolean isListening()
 	{
 		return listening;
 	}
-
+	
-
+	
 	/**
 	 * Add a child subscriber to the {@link EventBus}.<br>
 	 *
@@ -52,8 +52,8 @@ public abstract class BusNode implements ClientHub {
 	{
 		clients.add(client);
 	}
-
+	
-
+	
 	/**
 	 * Remove a child subscriber
 	 *
@@ -66,8 +66,8 @@ public abstract class BusNode implements ClientHub {
 			clients.remove(client);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Set whether events should be received.
 	 *
@@ -77,8 +77,8 @@ public abstract class BusNode implements ClientHub {
 	{
 		this.listening = listening;
 	}
-
+	
-
+	
 	/**
 	 * Set whether events should be passed on to child nodes
 	 *

src/mightypork/utils/eventbus/clients/ClientHub.java

@@ -12,27 +12,27 @@ import mightypork.utils.eventbus.EventBus;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface ClientHub extends DelegatingClient, ToggleableClient {
-
+	
 	@Override
 	public boolean doesDelegate();
-
+	
-
+	
 	@Override
 	public Collection<Object> getChildClients();
-
+	
-
+	
 	@Override
 	public boolean isListening();
-
+	
-
+	
 	/**
 	 * Add a child subscriber to the {@link EventBus}.<br>
 	 *
 	 * @param client
 	 */
 	public void addChildClient(Object client);
-
+	
-
+	
 	/**
 	 * Remove a child subscriber
 	 *

src/mightypork/utils/eventbus/clients/ClientList.java

@@ -11,7 +11,7 @@ import java.util.ArrayList;
  * @author Ondřej Hruška (MightyPork)
  */
 public class ClientList extends ArrayList<Object> {
-
+	
 	public ClientList(Object... clients)
 	{
 		for (final Object c : clients) {

src/mightypork/utils/eventbus/clients/DelegatingClient.java

@@ -12,16 +12,16 @@ import java.util.Collection;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface DelegatingClient {
-
+	
 	/**
 	 * @return collection of child clients. Can not be null.
 	 */
 	public Collection<?> getChildClients();
-
+	
-
+	
 	/**
 	 * @return true if delegating is active
 	 */
 	public boolean doesDelegate();
-
+	
 }

src/mightypork/utils/eventbus/clients/DelegatingList.java

@@ -12,10 +12,10 @@ import mightypork.utils.interfaces.Enableable;
  * @author Ondřej Hruška (MightyPork)
  */
 public class DelegatingList extends ClientList implements DelegatingClient, Enableable, ToggleableClient {
-
+	
 	private boolean enabled = true;
-
+	
-
+	
 	/**
 	 * Delegating list with initial clients
 	 *
@@ -25,44 +25,44 @@ public class DelegatingList extends ClientList implements DelegatingClient, Enab
 	{
 		super(clients);
 	}
-
+	
-
+	
 	/**
 	 * Empty delegating list.
 	 */
 	public DelegatingList()
 	{
 	}
-
+	
-
+	
 	@Override
 	public Collection<?> getChildClients()
 	{
 		return this;
 	}
-
+	
-
+	
 	@Override
 	public boolean doesDelegate()
 	{
 		return isEnabled();
 	}
-
+	
-
+	
 	@Override
 	public boolean isListening()
 	{
 		return isEnabled();
 	}
-
+	
-
+	
 	@Override
 	public void setEnabled(boolean yes)
 	{
 		enabled = yes;
 	}
-
+	
-
+	
 	@Override
 	public boolean isEnabled()
 	{

src/mightypork/utils/eventbus/clients/ToggleableClient.java

@@ -7,10 +7,10 @@ package mightypork.utils.eventbus.clients;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface ToggleableClient {
-
+	
 	/**
 	 * @return true if the client wants to receive messages
 	 */
 	public boolean isListening();
-
+	
 }

src/mightypork/utils/eventbus/events/DestroyEvent.java

@@ -4,6 +4,7 @@ package mightypork.utils.eventbus.events;
 import mightypork.utils.eventbus.BusEvent;
 import mightypork.utils.eventbus.events.flags.DirectEvent;
 import mightypork.utils.eventbus.events.flags.NonConsumableEvent;
+import mightypork.utils.eventbus.events.flags.NonRejectableEvent;
 import mightypork.utils.interfaces.Destroyable;
 
 
@@ -14,6 +15,7 @@ import mightypork.utils.interfaces.Destroyable;
  */
 @DirectEvent
 @NonConsumableEvent
+@NonRejectableEvent
 public class DestroyEvent extends BusEvent<Destroyable> {
 
 	@Override

src/mightypork/utils/eventbus/events/UpdateEvent.java

@@ -17,10 +17,10 @@ import mightypork.utils.interfaces.Updateable;
 @DirectEvent
 @NonConsumableEvent
 public class UpdateEvent extends BusEvent<Updateable> {
-
+	
 	private final double deltaTime;
-
+	
-
+	
 	/**
 	 * @param deltaTime time since last update (sec)
 	 */
@@ -28,8 +28,8 @@ public class UpdateEvent extends BusEvent<Updateable> {
 	{
 		this.deltaTime = deltaTime;
 	}
-
+	
-
+	
 	@Override
 	public void handleBy(Updateable handler)
 	{

src/mightypork/utils/eventbus/events/flags/DelayedEvent.java

@@ -19,7 +19,7 @@ import java.lang.annotation.Target;
 @Inherited
 @Documented
 public @interface DelayedEvent {
-
+	
 	/**
 	 * @return event dispatch delay [seconds]
 	 */

src/mightypork/utils/eventbus/events/flags/NonConsumableEvent.java

@@ -17,5 +17,5 @@ import java.lang.annotation.Target;
 @Documented
 @Target(ElementType.TYPE)
 public @interface NonConsumableEvent {
-
+	
 }

src/mightypork/utils/eventbus/events/flags/NonRejectableEvent.java

@@ -17,5 +17,5 @@ import java.lang.annotation.Target;
 @Documented
 @Target(ElementType.TYPE)
 public @interface NonRejectableEvent {
-
+	
 }

src/mightypork/utils/exceptions/CorruptDataException.java

@@ -10,28 +10,28 @@ import java.io.IOException;
  * @author Ondřej Hruška (MightyPork)
  */
 public class CorruptDataException extends IOException {
-
+	
 	public CorruptDataException()
 	{
 		super();
 	}
-
+	
-
+	
 	public CorruptDataException(String message, Throwable cause)
 	{
 		super(message, cause);
 	}
-
+	
-
+	
 	public CorruptDataException(String message)
 	{
 		super(message);
 	}
-
+	
-
+	
 	public CorruptDataException(Throwable cause)
 	{
 		super(cause);
 	}
-
+	
 }

src/mightypork/utils/exceptions/IllegalValueException.java

@@ -8,27 +8,27 @@ package mightypork.utils.exceptions;
  * @author Ondřej Hruška (MightyPork)
  */
 public class IllegalValueException extends RuntimeException {
-
+	
 	public IllegalValueException()
 	{
 	}
-
+	
-
+	
 	public IllegalValueException(String message)
 	{
 		super(message);
 	}
-
+	
-
+	
 	public IllegalValueException(Throwable cause)
 	{
 		super(cause);
 	}
-
+	
-
+	
 	public IllegalValueException(String message, Throwable cause)
 	{
 		super(message, cause);
 	}
-
+	
 }

src/mightypork/utils/exceptions/KeyAlreadyExistsException.java

@@ -7,28 +7,28 @@ package mightypork.utils.exceptions;
  * @author Ondřej Hruška (MightyPork)
  */
 public class KeyAlreadyExistsException extends RuntimeException {
-
+	
 	public KeyAlreadyExistsException()
 	{
 		super();
 	}
-
+	
-
+	
 	public KeyAlreadyExistsException(String message, Throwable cause)
 	{
 		super(message, cause);
 	}
-
+	
-
+	
 	public KeyAlreadyExistsException(String message)
 	{
 		super(message);
 	}
-
+	
-
+	
 	public KeyAlreadyExistsException(Throwable cause)
 	{
 		super(cause);
 	}
-
+	
 }

src/mightypork/utils/files/FileSuffixFilter.java

@@ -11,11 +11,11 @@ import java.io.FileFilter;
  * @author Ondřej Hruška (MightyPork)
  */
 public class FileSuffixFilter implements FileFilter {
-
+	
 	/** Array of allowed suffixes */
 	private String[] suffixes = null;
-
+	
-
+	
 	/**
 	 * Suffix filter
 	 *
@@ -25,22 +25,22 @@ public class FileSuffixFilter implements FileFilter {
 	{
 		this.suffixes = suffixes;
 	}
-
+	
-
+	
 	@Override
 	public boolean accept(File pathname)
 	{
 		if (!pathname.isFile()) return false;
-
+		
 		final String fname = pathname.getName().toLowerCase().trim();
-
+		
 		for (final String suffix : suffixes) {
 			if (fname.endsWith(suffix.toLowerCase().trim())) {
 				return true;
 			}
 		}
-
+		
 		return false;
 	}
-
+	
 }

src/mightypork/utils/files/FileTreeDiff.java

@@ -16,138 +16,138 @@ import mightypork.utils.logging.Log;
 
 
 public class FileTreeDiff {
-
+	
 	private static final byte[] BUFFER = new byte[2048];
 	private final Checksum ck1 = new Adler32();
 	private final Checksum ck2 = new Adler32();
-
+	
 	private boolean logging = true;
-
+	
 	private final List<Tuple<File>> compared = new ArrayList<>();
 	private final Comparator<File> fileFirstSorter = new Comparator<File>() {
-
+		
 		@Override
 		public int compare(File o1, File o2)
 		{
 			if (!o1.isDirectory() && o2.isDirectory()) return -1;
 			if (o1.isDirectory() && !o2.isDirectory()) return 1;
-
+			
 			return o1.getName().compareTo(o2.getName());
 		}
 	};
-
+	
-
+	
 	public void enableLogging(boolean state)
 	{
 		logging = state;
 	}
-
+	
-
+	
 	public boolean areEqual(File dir1, File dir2)
 	{
 		if (logging) Log.f3("Comparing directory trees:\n 1. " + dir1 + "\n 2. " + dir2);
-
+		
 		try {
 			compared.clear();
 			buildList(dir1, dir2);
-
+			
 			calcChecksum();
-
+			
 			if (logging) Log.f3("No difference found.");
-
+			
 			return true;
-
+			
 		} catch (final NotEqualException e) {
 			if (logging) Log.f3("Difference found:\n" + e.getMessage());
-
+			
 			return false;
 		}
 	}
-
+	
-
+	
 	private void calcChecksum() throws NotEqualException
 	{
-
+		
 		for (final Tuple<File> pair : compared) {
 			ck1.reset();
 			ck2.reset();
-
+			
 			try(FileInputStream in1 = new FileInputStream(pair.a);
-				FileInputStream in2 = new FileInputStream(pair.b)) {
+					FileInputStream in2 = new FileInputStream(pair.b)) {
-
+				
 				try(CheckedInputStream cin1 = new CheckedInputStream(in1, ck1);
-					CheckedInputStream cin2 = new CheckedInputStream(in2, ck2)) {
+						CheckedInputStream cin2 = new CheckedInputStream(in2, ck2)) {
-
+					
 					while (true) {
 						final int read1 = cin1.read(BUFFER);
 						final int read2 = cin2.read(BUFFER);
-
+						
 						if (read1 != read2 || ck1.getValue() != ck2.getValue()) {
 							throw new NotEqualException("Bytes differ:\n" + pair.a + "\n" + pair.b);
 						}
-
+						
 						if (read1 == -1) break;
 					}
 				}
-
+				
 			} catch (final IOException e) {
 				// ignore
 			}
 		}
 	}
-
+	
-
+	
 	private void buildList(File f1, File f2) throws NotEqualException
 	{
 		if (f1.isDirectory() != f2.isDirectory()) throw new NotEqualException("isDirectory differs:\n" + f1 + "\n" + f2);
-
+		
 		if (f1.isFile() && f2.isFile()) {
 			if (f1.length() != f2.length()) throw new NotEqualException("Sizes differ:\n" + f1 + "\n" + f2);
 		}
-
+		
 		if (f1.isDirectory()) {
 			final File[] children1 = f1.listFiles();
 			final File[] children2 = f2.listFiles();
-
+			
 			Arrays.sort(children1, fileFirstSorter);
 			Arrays.sort(children2, fileFirstSorter);
-
+			
 			if (children1.length != children2.length) throw new NotEqualException("Child counts differ:\n" + f1 + "\n" + f2);
-
+			
 			for (int i = 0; i < children1.length; i++) {
 				final File ch1 = children1[i];
 				final File ch2 = children2[i];
-
+				
 				if (!ch1.getName().equals(ch2.getName())) throw new NotEqualException("Filenames differ:\n" + ch1 + "\n" + ch2);
-
+				
 				buildList(ch1, ch2);
 			}
-
+			
 		} else {
 			compared.add(new Tuple<>(f1, f2));
 		}
 	}
-
+	
 	private class NotEqualException extends Exception {
-
+		
 		public NotEqualException(String msg)
 		{
 			super(msg);
 		}
-
+		
 	}
-
+	
 	private class Tuple<T> {
-
+		
 		public T a;
 		public T b;
-
+		
-
+		
 		public Tuple(T a, T b)
 		{
 			this.a = a;
 			this.b = b;
 		}
 	}
-
+	
 }

src/mightypork/utils/files/FileUtil.java

@@ -17,14 +17,14 @@ import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 
+import mightypork.utils.Str;
 import mightypork.utils.logging.Log;
-import mightypork.utils.string.StringUtil;
 import mightypork.utils.string.validation.StringFilter;
 
 
 public class FileUtil {
-
+	
-
+	
 	/**
 	 * Copy directory recursively.
 	 *
@@ -36,8 +36,8 @@ public class FileUtil {
 	{
 		copyDirectory(source, target, null, null);
 	}
-
+	
-
+	
 	/**
 	 * Copy directory recursively - advanced variant.
 	 *
@@ -50,28 +50,28 @@ public class FileUtil {
 	public static void copyDirectory(File source, File target, FileFilter filter, List<File> filesCopied) throws IOException
 	{
 		if (!source.exists()) return;
-
+		
 		if (source.isDirectory()) {
 			if (!target.exists() && !target.mkdir()) {
 				throw new IOException("Could not open destination directory.");
 			}
-
+			
 			final String[] children = source.list();
 			for (final String element : children) {
 				copyDirectory(new File(source, element), new File(target, element), filter, filesCopied);
 			}
-
+			
 		} else {
 			if (filter != null && !filter.accept(source)) {
 				return;
 			}
-
+			
 			if (filesCopied != null) filesCopied.add(target);
 			copyFile(source, target);
 		}
 	}
-
+	
-
+	
 	/**
 	 * List directory recursively
 	 *
@@ -87,17 +87,17 @@ public class FileUtil {
 			for (final String element : children) {
 				listDirectoryRecursive(new File(source, element), filter, files);
 			}
-
+			
 		} else {
 			if (filter != null && !filter.isValid(source.getAbsolutePath())) {
 				return;
 			}
-
+			
 			files.add(source);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Copy file using streams. Make sure target directory exists!
 	 *
@@ -107,15 +107,15 @@ public class FileUtil {
 	 */
 	public static void copyFile(File source, File target) throws IOException
 	{
-
+		
 		try(InputStream in = new FileInputStream(source);
-				OutputStream out = new FileOutputStream(target)) {
+			OutputStream out = new FileOutputStream(target)) {
-
+			
 			copyStream(in, out);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Copy bytes from input to output stream, leaving out stream open
 	 *
@@ -128,19 +128,19 @@ public class FileUtil {
 		if (in == null) {
 			throw new NullPointerException("Input stream is null");
 		}
-
+		
 		if (out == null) {
 			throw new NullPointerException("Output stream is null");
 		}
-
+		
 		final byte[] buf = new byte[2048];
 		int len;
 		while ((len = in.read(buf)) > 0) {
 			out.write(buf, 0, len);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Improved delete
 	 *
@@ -153,18 +153,18 @@ public class FileUtil {
 		if (!path.exists()) {
 			return true;
 		}
-
+		
 		if (!recursive || !path.isDirectory()) return path.delete();
-
+		
 		final String[] list = path.list();
 		for (int i = 0; i < list.length; i++) {
 			if (!delete(new File(path, list[i]), true)) return false;
 		}
-
+		
 		return path.delete();
 	}
-
+	
-
+	
 	/**
 	 * Read entire file to a string.
 	 *
@@ -175,12 +175,12 @@ public class FileUtil {
 	public static String fileToString(File file) throws IOException
 	{
 		try(FileInputStream fin = new FileInputStream(file)) {
-
+			
 			return streamToString(fin);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get files in a folder (create folder if needed)
 	 *
@@ -191,8 +191,8 @@ public class FileUtil {
 	{
 		return FileUtil.listDirectory(dir, null);
 	}
-
+	
-
+	
 	/**
 	 * Get files in a folder (create folder if needed)
 	 *
@@ -203,17 +203,17 @@ public class FileUtil {
 	public static List<File> listDirectory(File dir, FileFilter filter)
 	{
 		dir.mkdir();
-
+		
 		final List<File> list = new ArrayList<>();
-
+		
 		for (final File f : dir.listFiles(filter)) {
 			list.add(f);
 		}
-
+		
 		return list;
 	}
-
+	
-
+	
 	/**
 	 * Remove extension.
 	 *
@@ -224,20 +224,20 @@ public class FileUtil {
 	{
 		return getFilenameParts(file.getName());
 	}
-
+	
-
+	
 	public static String getExtension(File file)
 	{
 		return getExtension(file.getName());
 	}
-
+	
-
+	
 	public static String getExtension(String file)
 	{
-		return StringUtil.fromLastChar(file, '.');
+		return Str.fromLast(file, '.');
 	}
-
+	
-
+	
 	/**
 	 * Remove extension.
 	 *
@@ -247,24 +247,24 @@ public class FileUtil {
 	public static String[] getFilenameParts(String filename)
 	{
 		String ext, name;
-
+		
 		try {
-			ext = StringUtil.fromLastDot(filename);
+			ext = Str.fromLastDot(filename);
 		} catch (final StringIndexOutOfBoundsException e) {
 			ext = "";
 		}
-
+		
 		try {
-			name = StringUtil.toLastDot(filename);
+			name = Str.toLastDot(filename);
 		} catch (final StringIndexOutOfBoundsException e) {
 			name = "";
 			Log.w("Error extracting extension from file " + filename);
 		}
-
+		
 		return new String[] { name, ext };
 	}
-
+	
-
+	
 	/**
 	 * Read entire input stream to a string, and close it.
 	 *
@@ -275,8 +275,8 @@ public class FileUtil {
 	{
 		return streamToString(in, -1);
 	}
-
+	
-
+	
 	/**
 	 * Read input stream to a string, and close it.
 	 *
@@ -290,10 +290,10 @@ public class FileUtil {
 			Log.e(new NullPointerException("Null stream to be converted to String."));
 			return ""; // to avoid NPE's
 		}
-
+		
 		BufferedReader br = null;
 		final StringBuilder sb = new StringBuilder();
-
+		
 		String line;
 		try {
 			int cnt = 0;
@@ -302,11 +302,11 @@ public class FileUtil {
 				sb.append(line + "\n");
 				cnt++;
 			}
-
+			
 			if (cnt == lines && lines > 0) {
 				sb.append("--- end of preview ---\n");
 			}
-
+			
 		} catch (final IOException e) {
 			Log.e(e);
 		} finally {
@@ -316,15 +316,15 @@ public class FileUtil {
 				// ignore
 			}
 		}
-
+		
 		return sb.toString();
 	}
-
+	
-
+	
 	public static InputStream stringToStream(String text)
 	{
 		if (text == null) return null;
-
+		
 		try {
 			return new ByteArrayInputStream(text.getBytes("UTF-8"));
 		} catch (final UnsupportedEncodingException e) {
@@ -332,38 +332,38 @@ public class FileUtil {
 			return null;
 		}
 	}
-
+	
-
+	
 	public static InputStream getResource(String path)
 	{
 		final InputStream in = FileUtil.class.getResourceAsStream(path);
-
+		
 		if (in != null) return in;
-
+		
 		try {
 			return new FileInputStream(new File(".", path));
-			
-		} catch (final FileNotFoundException e) {
 
+		} catch (final FileNotFoundException e) {
+			
 			try {
 				return new FileInputStream(WorkDir.getFile(path));
-				
+
 			} catch (final FileNotFoundException e2) {
 				Log.w("Could not open resource stream, file not found: " + path);
 				return null;
 			}
-
+			
 		}
-
+		
 	}
-
+	
-
+	
 	public static String getResourceAsString(String path)
 	{
 		return streamToString(getResource(path));
 	}
-
+	
-
+	
 	/**
 	 * Save string to file
 	 *
@@ -374,44 +374,44 @@ public class FileUtil {
 	public static void stringToFile(File file, String text) throws IOException
 	{
 		try(PrintStream out = new PrintStream(new FileOutputStream(file), false, "UTF-8")) {
-
+			
 			out.print(text);
-
+			
 			out.flush();
-
+			
 		}
 	}
-
+	
-
+	
 	public static void deleteEmptyDirs(File base) throws IOException
 	{
 		for (final File f : listDirectory(base)) {
 			if (!f.isDirectory()) continue;
-
+			
 			deleteEmptyDirs(f);
-
+			
 			final List<File> children = listDirectory(f);
 			if (children.size() == 0) {
 				if (!f.delete()) throw new IOException("Could not delete a directory: " + f);
 				continue;
 			}
 		}
-
+		
 	}
-
+	
-
+	
 	public static String getBasename(String name)
 	{
-		return StringUtil.toLastChar(StringUtil.fromLastChar(name, '/'), '.');
+		return Str.toLast(Str.fromLast(name, '/'), '.');
 	}
-
+	
-
+	
 	public static String getFilename(String name)
 	{
-		return StringUtil.fromLastChar(name, '/');
+		return Str.fromLast(name, '/');
 	}
-
+	
-
+	
 	/**
 	 * Copy resource to file
 	 *
@@ -422,14 +422,14 @@ public class FileUtil {
 	public static void resourceToFile(String resname, File file) throws IOException
 	{
 		try(InputStream in = FileUtil.getResource(resname);
-				OutputStream out = new FileOutputStream(file)) {
+			OutputStream out = new FileOutputStream(file)) {
-
+			
 			FileUtil.copyStream(in, out);
 		}
-
+		
 	}
-
+	
-
+	
 	/**
 	 * Get resource as string, safely closing streams.
 	 *

src/mightypork/utils/files/InstanceLock.java

@@ -13,19 +13,19 @@ import java.nio.channels.FileLock;
  * @author Ondřej Hruška (MightyPork)
  */
 public class InstanceLock {
-
+	
 	@SuppressWarnings("resource")
 	public static boolean onFile(final File lockFile)
 	{
 		try {
 			lockFile.getParentFile().mkdirs();
 			final RandomAccessFile randomAccessFile = new RandomAccessFile(lockFile, "rw");
-
+			
 			final FileLock fileLock = randomAccessFile.getChannel().tryLock();
 			if (fileLock != null) {
-
+				
 				Runtime.getRuntime().addShutdownHook(new Thread() {
-
+					
 					@Override
 					public void run()
 					{
@@ -39,10 +39,10 @@ public class InstanceLock {
 						}
 					}
 				});
-
+				
 				return true;
 			}
-
+			
 			return false;
 		} catch (final IOException e) {
 			System.err.println("IO error while obtaining lock.");
@@ -50,5 +50,5 @@ public class InstanceLock {
 			return false;
 		}
 	}
-
+	
 }

src/mightypork/utils/files/OsUtils.java

@@ -5,90 +5,90 @@ import java.io.File;
 
 
 public class OsUtils {
-
+	
 	public static enum EnumOS
 	{
 		linux, macos, solaris, unknown, windows;
-
+		
 		public boolean isLinux()
 		{
 			return this == linux || this == solaris;
 		}
-
+		
-
+		
 		public boolean isMac()
 		{
 			return this == macos;
 		}
-
+		
-
+		
 		public boolean isWindows()
 		{
 			return this == windows;
 		}
 	}
-
+	
 	private static EnumOS cachedOs;
-
+	
-
+	
 	public static File getHomeWorkDir(String dirname)
 	{
 		final String userhome = System.getProperty("user.home", ".");
 		File file;
-
+		
 		switch (getOs()) {
 			case linux:
 			case solaris:
 				file = new File(userhome, dirname + '/');
 				break;
-
+			
 			case windows:
 				final String appdata = System.getenv("APPDATA");
-
+				
 				if (appdata != null) {
 					file = new File(appdata, dirname + '/');
 				} else {
 					file = new File(userhome, dirname + '/');
 				}
-
+				
 				break;
-
+			
 			case macos:
 				file = new File(userhome, "Library/Application Support/" + dirname);
 				break;
-
+			
 			default:
 				file = new File(userhome, dirname + "/");
 				break;
 		}
-
+		
 		return file;
 	}
-
+	
-
+	
 	public static EnumOS getOs()
 	{
 		if (cachedOs != null) return cachedOs;
-
+		
 		final String s = System.getProperty("os.name").toLowerCase();
-
+		
 		if (s.contains("win")) {
 			cachedOs = EnumOS.windows;
-
+			
 		} else if (s.contains("mac")) {
 			cachedOs = EnumOS.macos;
-
+			
 		} else if (s.contains("linux") || s.contains("unix")) {
 			cachedOs = EnumOS.linux;
-
+			
 		} else if (s.contains("solaris") || s.contains("sunos")) {
 			cachedOs = EnumOS.solaris;
-
+			
 		} else {
 			cachedOs = EnumOS.unknown;
 		}
-
+		
 		return cachedOs;
 	}
-
+	
 }

src/mightypork/utils/files/WorkDir.java

@@ -14,11 +14,11 @@ import mightypork.utils.logging.Log;
  * @author Ondřej Hruška (MightyPork)
  */
 public class WorkDir {
-	
+
 	private static File baseDir = new File(".");
 	private static Map<String, String> namedPaths = new HashMap<>();
-
+	
-
+	
 	/**
 	 * Initialize the workdir for the given root path
 	 *
@@ -28,8 +28,8 @@ public class WorkDir {
 	{
 		WorkDir.baseDir = workdir;
 	}
-	
+
-	
+
 	/**
 	 * Add a path alias (dir or file), relative to the workdir.
 	 *
@@ -40,8 +40,8 @@ public class WorkDir {
 	{
 		namedPaths.put(alias, path);
 	}
-	
+
-	
+
 	/**
 	 * Get workdir folder, create if not exists.
 	 *
@@ -51,18 +51,18 @@ public class WorkDir {
 	public static File getDir(String path)
 	{
 		if (namedPaths.containsKey(path)) path = namedPaths.get(path);
-		
+
 		final File f = new File(baseDir, path);
 		if (!f.exists()) {
 			if (!f.mkdirs()) {
 				Log.w("Could not create a directory: " + f + " (path: " + path + ")");
 			}
 		}
-		
+
 		return f;
 	}
-	
+
-	
+
 	/**
 	 * Get workdir file, create parent if not exists.
 	 *
@@ -72,19 +72,19 @@ public class WorkDir {
 	public static File getFile(String path)
 	{
 		if (namedPaths.containsKey(path)) path = namedPaths.get(path);
-		
+
 		final File f = new File(baseDir, path);
-		
+
 		// create the parent dir
 		if (!f.getParent().equals(baseDir)) {
 			f.getParentFile().mkdirs();
 		}
-		
+
 		return f;
-		
+
 	}
-	
+
-	
+
 	/**
 	 * @return the workdir File
 	 */
@@ -92,5 +92,5 @@ public class WorkDir {
 	{
 		return baseDir;
 	}
-	
+
 }

src/mightypork/utils/files/zip/ZipBuilder.java

@@ -20,25 +20,25 @@ import mightypork.utils.logging.Log;
  * @author Ondřej Hruška (MightyPork)
  */
 public class ZipBuilder {
-
+	
 	private final ZipOutputStream out;
 	private final HashSet<String> included = new HashSet<>();
-
+	
-
+	
 	/**
 	 * @param target target zip file
 	 * @throws IOException if the file is directory or cannot be created
 	 */
 	public ZipBuilder(File target) throws IOException
 	{
-
+		
 		if (!target.getParentFile().mkdirs()) throw new IOException("Could not create output directory.");
-
+		
 		final FileOutputStream dest = new FileOutputStream(target);
 		out = new ZipOutputStream(new BufferedOutputStream(dest));
 	}
-
+	
-
+	
 	/**
 	 * Add stream to a path
 	 *
@@ -54,13 +54,13 @@ public class ZipBuilder {
 			return; // ignore
 		}
 		included.add(path);
-
+		
 		out.putNextEntry(new ZipEntry(path));
-
+		
 		FileUtil.copyStream(in, out);
 	}
-
+	
-
+	
 	/**
 	 * Add string as a file
 	 *
@@ -73,15 +73,15 @@ public class ZipBuilder {
 		path = preparePath(path);
 		if (included.contains(path)) return; // ignore
 		included.add(path);
-
+		
 		out.putNextEntry(new ZipEntry(path));
-
+		
 		try(InputStream in = FileUtil.stringToStream(text)) {
 			FileUtil.copyStream(in, out);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Add resource obtained via FileUtils.getResource()
 	 *
@@ -94,15 +94,15 @@ public class ZipBuilder {
 		path = preparePath(path);
 		if (included.contains(path)) return; // ignore
 		included.add(path);
-
+		
 		out.putNextEntry(new ZipEntry(path));
-
+		
 		try(InputStream in = FileUtil.getResource(resPath)) {
 			FileUtil.copyStream(in, out);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Normalize path
 	 *
@@ -112,13 +112,13 @@ public class ZipBuilder {
 	private static String preparePath(String path)
 	{
 		path = path.replace("\\", "/");
-
+		
 		if (path.charAt(0) == '/') path = path.substring(1);
-
+		
 		return path;
 	}
-
+	
-
+	
 	/**
 	 * Close the zip stream
 	 *

src/mightypork/utils/files/zip/ZipUtils.java

@@ -24,10 +24,10 @@ import mightypork.utils.string.validation.StringFilter;
  * @author Ondřej Hruška (MightyPork)
  */
 public class ZipUtils {
-
+	
 	private static final int BUFFER_SIZE = 2048;
-
+	
-
+	
 	/**
 	 * Extract zip file to target directory
 	 *
@@ -43,8 +43,8 @@ public class ZipUtils {
 			return extractZip(zip, outputDir, filter);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Extract zip file to target directory
 	 *
@@ -57,35 +57,35 @@ public class ZipUtils {
 	public static List<String> extractZip(ZipFile zip, File outputDir, StringFilter filter) throws IOException
 	{
 		final ArrayList<String> files = new ArrayList<>();
-
+		
 		if (!outputDir.mkdirs()) throw new IOException("Could not create output directory.");
-
+		
 		final Enumeration<? extends ZipEntry> zipFileEntries = zip.entries();
-
+		
 		// process each entry
 		while (zipFileEntries.hasMoreElements()) {
 			final ZipEntry entry = zipFileEntries.nextElement();
-
+			
 			// parse filename and path
 			final String entryPath = entry.getName();
 			final File destFile = new File(outputDir, entryPath);
 			final File destinationParent = destFile.getParentFile();
-
+			
 			if (entry.isDirectory() || (filter != null && !filter.isValid(entryPath))) continue;
-
+			
 			// make sure directories exist
 			if (!destinationParent.mkdirs()) throw new IOException("Could not create directory.");
-
+			
 			if (!entry.isDirectory()) {
 				extractZipEntry(zip, entry, destFile);
 				files.add(entryPath);
 			}
 		}
-
+		
 		return files;
 	}
-
+	
-
+	
 	/**
 	 * Read zip entries and add their paths to a list
 	 *
@@ -99,8 +99,8 @@ public class ZipUtils {
 			return listZip(zip);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Read zip entries and add their paths to a list
 	 *
@@ -111,22 +111,22 @@ public class ZipUtils {
 	public static List<String> listZip(ZipFile zip) throws IOException
 	{
 		final ArrayList<String> files = new ArrayList<>();
-
+		
 		final Enumeration<? extends ZipEntry> zipFileEntries = zip.entries();
-
+		
 		// process each entry
 		while (zipFileEntries.hasMoreElements()) {
 			final ZipEntry entry = zipFileEntries.nextElement();
-
+			
 			if (!entry.isDirectory()) {
 				files.add(entry.getName());
 			}
 		}
-
+		
 		return files;
 	}
-
+	
-
+	
 	/**
 	 * Extract one zip entry to target file
 	 *
@@ -138,17 +138,17 @@ public class ZipUtils {
 	public static void extractZipEntry(ZipFile zip, ZipEntry entry, File destFile) throws IOException
 	{
 		if (!destFile.getParentFile().mkdirs()) throw new IOException("Could not create output directory.");
-
+		
 		try(InputStream in = zip.getInputStream(entry);
-			BufferedInputStream is = new BufferedInputStream(in);
+				BufferedInputStream is = new BufferedInputStream(in);
-			FileOutputStream fos = new FileOutputStream(destFile);
+				FileOutputStream fos = new FileOutputStream(destFile);
-			BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER_SIZE)) {
+				BufferedOutputStream dest = new BufferedOutputStream(fos, BUFFER_SIZE)) {
-
+			
 			FileUtil.copyStream(is, dest);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Load zip entry to String
 	 *
@@ -172,8 +172,8 @@ public class ZipUtils {
 			}
 		}
 	}
-
+	
-
+	
 	public static boolean entryExists(File selectedFile, String string)
 	{
 		try(ZipFile zf = new ZipFile(selectedFile)) {
@@ -182,6 +182,6 @@ public class ZipUtils {
 			Log.w("Error reading zip.", e);
 			return false;
 		}
-
+		
 	}
 }

src/mightypork/utils/interfaces/Destroyable.java

@@ -7,7 +7,7 @@ package mightypork.utils.interfaces;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface Destroyable {
-
+	
 	/**
 	 * Destroy this object
 	 */

src/mightypork/utils/interfaces/Enableable.java

@@ -9,15 +9,15 @@ package mightypork.utils.interfaces;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface Enableable {
-
+	
 	/**
 	 * Change enabled state
 	 *
 	 * @param yes enabled
 	 */
 	public void setEnabled(boolean yes);
-
+	
-
+	
 	/**
 	 * @return true if enabled
 	 */

src/mightypork/utils/interfaces/Hideable.java

@@ -7,9 +7,9 @@ package mightypork.utils.interfaces;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface Hideable {
-
+	
 	void setVisible(boolean yes);
-
+	
-
+	
 	boolean isVisible();
 }

src/mightypork/utils/interfaces/Pauseable.java

@@ -7,22 +7,22 @@ package mightypork.utils.interfaces;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface Pauseable {
-
+	
 	/**
 	 * Pause operation
 	 */
 	public void pause();
-
+	
-
+	
 	/**
 	 * Resume operation
 	 */
 	public void resume();
-
+	
-
+	
 	/**
 	 * @return paused state
 	 */
 	public boolean isPaused();
-
+	
 }

src/mightypork/utils/interfaces/Pollable.java

@@ -7,7 +7,7 @@ package mightypork.utils.interfaces;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface Pollable {
-
+	
 	/**
 	 * Update internal state
 	 */

src/mightypork/utils/interfaces/Updateable.java

@@ -7,7 +7,7 @@ package mightypork.utils.interfaces;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface Updateable {
-
+	
 	/**
 	 * Update item state based on elapsed time
 	 *

src/mightypork/utils/ion/Ion.java

@@ -13,7 +13,7 @@ import java.util.List;
 import java.util.Map;
 
 import mightypork.utils.Reflect;
-import mightypork.utils.Support;
+import mightypork.utils.Str;
 
 
 /**
@@ -22,13 +22,13 @@ import mightypork.utils.Support;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Ion {
-
+	
 	private static final int RESERVED_LOW = 0;
 	private static final int RESERVED_HIGH = 49;
-
+	
 	private static final int RANGE_LOW = 0;
 	private static final int RANGE_HIGH = 255;
-
+	
 	// marks for object saving
 	/** Null mark */
 	static final int NULL = 0;
@@ -84,28 +84,28 @@ public class Ion {
 	public static final int MAP = 25;
 	/** Array of arbitrary objects */
 	public static final int OBJECT_ARRAY = 26;
-
+	
 	/** Ionizables<Mark, Class> */
 	private static Map<Integer, Class<?>> markToClass = new HashMap<>();
 	private static Map<Class<?>, Integer> classToMark = new HashMap<>();
-
+	
 	private static Map<Class<?>, IonizerBinary<?>> ionizersBinary = new HashMap<>();
 	private static Map<Class<?>, IonizerBundled<?>> ionizersBundled = new HashMap<>();
-
+	
 	private static boolean reservedMarkChecking;
-
+	
 	static {
 		reservedMarkChecking = false;
-
+		
 		// register built-ins
 		register(ION_BUNDLE, IonDataBundle.class);
 		register(SEQUENCE_WRAPPER, IonSequenceWrapper.class);
 		register(MAP_WRAPPER, IonMapWrapper.class);
-
+		
 		reservedMarkChecking = true;
 	}
-
+	
-
+	
 	/**
 	 * Register a type for writing/loading.
 	 *
@@ -116,16 +116,16 @@ public class Ion {
 	{
 		if (!IonBinary.class.isAssignableFrom(objClass)) {
 			if (!IonBundled.class.isAssignableFrom(objClass)) {
-				throw new IllegalArgumentException("Cannot register directly: " + Support.str(objClass));
+				throw new IllegalArgumentException("Cannot register directly: " + Str.val(objClass));
 			}
 		}
-
+		
 		assertHasImplicitConstructor(objClass);
-
+		
 		registerUsingMark(mark, objClass);
 	}
-
+	
-
+	
 	/**
 	 * Try to register a type using a static final ION_MARK int field.
 	 *
@@ -135,37 +135,37 @@ public class Ion {
 	{
 		if (!IonBinary.class.isAssignableFrom(objClass)) {
 			if (!IonBundled.class.isAssignableFrom(objClass)) {
-				throw new IllegalArgumentException("Cannot register directly: " + Support.str(objClass));
+				throw new IllegalArgumentException("Cannot register directly: " + Str.val(objClass));
 			}
 		}
-
+		
 		assertHasImplicitConstructor(objClass);
 		registerUsingConstant(objClass);
 	}
-
+	
-
+	
 	private static void registerUsingMark(int mark, Class<?> objClass)
 	{
 		assertMarkAvailable(mark, objClass);
-
+		
 		markToClass.put(mark, objClass);
 		classToMark.put(objClass, mark);
 	}
-
+	
-
+	
 	public static void registerUsingConstant(Class<?> objClass)
 	{
 		try {
 			final int mark = ((Number) Reflect.getConstantFieldValue(objClass, "ION_MARK")).intValue();
-
+			
 			registerUsingMark(mark, objClass);
-
+			
 		} catch (final Exception e) {
-			throw new RuntimeException("Could not register " + Support.str(objClass) + " using an ION_MARK field.", e);
+			throw new RuntimeException("Could not register " + Str.val(objClass) + " using an ION_MARK field.", e);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Register new binary ionizer.
 	 *
@@ -175,13 +175,13 @@ public class Ion {
 	public static void registerIndirect(int mark, IonizerBinary<?> ionizer)
 	{
 		final Class<?> objClass = Reflect.getGenericParameters(ionizer.getClass())[0];
-
+		
 		registerUsingMark(mark, objClass);
-
+		
 		ionizersBinary.put(objClass, ionizer);
 	}
-
+	
-
+	
 	/**
 	 * Register new bundled ionizer.
 	 *
@@ -191,13 +191,13 @@ public class Ion {
 	public static void registerIndirect(int mark, IonizerBundled<?> ionizer)
 	{
 		final Class<?> objClass = Reflect.getGenericParameters(ionizer.getClass())[0];
-
+		
 		registerUsingMark(mark, objClass);
-
+		
 		ionizersBundled.put(objClass, ionizer);
 	}
-
+	
-
+	
 	private static void assertHasImplicitConstructor(Class<?> objClass)
 	{
 		try {
@@ -206,28 +206,28 @@ public class Ion {
 			throw new RuntimeException("Class " + objClass + " doesn't have an implicit constructor.");
 		}
 	}
-
+	
-
+	
 	private static void assertMarkAvailable(int mark, Class<?> objClass)
 	{
 		// negative marks are allowed.
 		if (mark > RANGE_HIGH) throw new IllegalArgumentException("Mark must be < 256.");
 		if (mark < RANGE_LOW) throw new IllegalArgumentException("Mark must be positive.");
-
+		
 		if (reservedMarkChecking && isMarkReserved(mark)) {
 			throw new IllegalArgumentException("Marks " + RESERVED_LOW + ".." + RESERVED_HIGH + " are reserved.");
 		}
-
+		
 		if (markToClass.containsKey(mark)) {
 			throw new IllegalArgumentException("Mark " + mark + " is already in use.");
 		}
-
+		
 		if (classToMark.containsKey(objClass)) {
-			throw new IllegalArgumentException(Support.str(objClass) + " is already registered.");
+			throw new IllegalArgumentException(Str.val(objClass) + " is already registered.");
 		}
 	}
-
+	
-
+	
 	/**
 	 * Load binary from file and cast.
 	 */
@@ -235,8 +235,8 @@ public class Ion {
 	{
 		return fromFile(new File(path));
 	}
-
+	
-
+	
 	/**
 	 * Load binary from file and cast.
 	 */
@@ -246,8 +246,8 @@ public class Ion {
 			return fromStream(in);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Write binary to file with mark.
 	 */
@@ -255,24 +255,24 @@ public class Ion {
 	{
 		toFile(new File(path), obj);
 	}
-
+	
-
+	
 	/**
 	 * Write binary to file with mark.
 	 */
 	public static void toFile(File file, Object obj) throws IOException
 	{
 		try(OutputStream out = new FileOutputStream(file)) {
-
+			
 			toStream(out, obj);
-
+			
 			out.flush();
 		} catch (final Exception e) {
 			throw new IOException("Error writing to ION file.", e);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Load object from stream based on mark, try to cast.
 	 */
@@ -282,8 +282,8 @@ public class Ion {
 			return (T) inp.readObject();
 		}
 	}
-
+	
-
+	
 	/**
 	 * Write object to output with a mark.
 	 */
@@ -293,8 +293,8 @@ public class Ion {
 			iout.writeObject(obj);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get ion input
 	 *
@@ -306,8 +306,8 @@ public class Ion {
 	{
 		return getInput(new File(path));
 	}
-
+	
-
+	
 	/**
 	 * Get ion input
 	 *
@@ -320,8 +320,8 @@ public class Ion {
 	{
 		return new IonInput(new FileInputStream(file));
 	}
-
+	
-
+	
 	/**
 	 * Get ion output
 	 *
@@ -333,8 +333,8 @@ public class Ion {
 	{
 		return getOutput(new File(path));
 	}
-
+	
-
+	
 	/**
 	 * Get ion output
 	 *
@@ -347,8 +347,8 @@ public class Ion {
 	{
 		return new IonOutput(new FileOutputStream(file));
 	}
-
+	
-
+	
 	/**
 	 * Create new bundle and write the object to it.
 	 */
@@ -358,8 +358,8 @@ public class Ion {
 		content.save(ib);
 		return ib;
 	}
-
+	
-
+	
 	/**
 	 * Try to unwrap an object from bundle. The object class must have implicit
 	 * accessible constructor.
@@ -376,59 +376,59 @@ public class Ion {
 			inst.load(bundle);
 			return inst;
 		} catch (InstantiationException | IllegalAccessException e) {
-			throw new IOException("Could not instantiate " + Support.str(objClass) + ".");
+			throw new IOException("Could not instantiate " + Str.val(objClass) + ".");
 		}
 	}
-
+	
-
+	
 	static Class<?> getClassForMark(int mark)
 	{
 		return markToClass.get(mark);
 	}
-
+	
-
+	
 	static IonizerBinary<?> getIonizerBinaryForClass(Class<?> clz)
 	{
 		return ionizersBinary.get(clz);
 	}
-
+	
-
+	
 	static IonizerBundled<?> getIonizerBundledForClass(Class<?> clz)
 	{
 		return ionizersBundled.get(clz);
 	}
-
+	
-
+	
 	public static int getMark(Object object)
 	{
 		assertRegistered(object);
-
+		
 		return classToMark.get(object.getClass());
 	}
-
+	
-
+	
 	/**
 	 * @return true if the mark is for a registered {@link IonBinary} object
 	 */
 	static boolean isMarkForBinary(int mark)
 	{
 		if (!markToClass.containsKey(mark)) return false;
-
+		
 		return IonBinary.class.isAssignableFrom(markToClass.get(mark));
 	}
-
+	
-
+	
 	/**
 	 * @return true if the mark is for a registered {@link IonBinary} object
 	 */
 	static boolean isMarkForBundled(int mark)
 	{
 		if (!markToClass.containsKey(mark)) return false;
-
+		
 		return IonBundled.class.isAssignableFrom(markToClass.get(mark));
 	}
-
+	
-
+	
 	/**
 	 * @return true if the mark is for a registered indirectly saved binary
 	 *         object
@@ -436,11 +436,11 @@ public class Ion {
 	static boolean isMarkForIndirectBinary(int mark)
 	{
 		if (!markToClass.containsKey(mark)) return false;
-
+		
 		return ionizersBinary.containsKey(markToClass.get(mark));
 	}
-
+	
-
+	
 	/**
 	 * @return true if the mark is for a registered indirectly saved bundled
 	 *         object
@@ -448,11 +448,11 @@ public class Ion {
 	static boolean isMarkForIndirectBundled(int mark)
 	{
 		if (!markToClass.containsKey(mark)) return false;
-
+		
 		return ionizersBundled.containsKey(markToClass.get(mark));
 	}
-
+	
-
+	
 	/**
 	 * @return true if the mark is reserved for internal use
 	 */
@@ -460,8 +460,8 @@ public class Ion {
 	{
 		return mark >= RESERVED_LOW && mark <= RESERVED_HIGH;
 	}
-
+	
-
+	
 	/**
 	 * @return true if the mark is for a registered {@link IonBinary} object
 	 */
@@ -469,11 +469,11 @@ public class Ion {
 	{
 		final Class<?> clazz = object.getClass();
 		if (classToMark.containsKey(clazz)) return true;
-
+		
 		return false;
 	}
-
+	
-
+	
 	/**
 	 * Make sure object is registered in the table.
 	 *
@@ -482,11 +482,11 @@ public class Ion {
 	static void assertRegistered(Object obj)
 	{
 		if (!isRegistered(obj)) {
-			throw new RuntimeException("Type not registered: " + Support.str(obj.getClass()));
+			throw new RuntimeException("Type not registered: " + Str.val(obj.getClass()));
 		}
 	}
-
+	
-
+	
 	/**
 	 * For get all external registered types - just like if the class was
 	 * freshly loaded. Can be used for unit tests.
@@ -494,31 +494,31 @@ public class Ion {
 	public static void reset()
 	{
 		final List<Integer> toRemove = new ArrayList<>();
-
+		
 		// remove direct
 		for (final Integer mark : markToClass.keySet()) {
 			if (!isMarkReserved(mark)) {
 				toRemove.add(mark);
 			}
 		}
-
+		
 		for (final int i : toRemove) {
-
+			
 			final Class<?> clz = markToClass.remove(i);
-
+			
 			classToMark.remove(clz);
 			ionizersBinary.remove(clz);
 			ionizersBundled.remove(clz);
 		}
 	}
-
+	
-
+	
 	public static boolean isObjectIndirectBundled(Object obj)
 	{
 		return ionizersBundled.containsKey(obj.getClass());
 	}
-
+	
-
+	
 	public static boolean isObjectIndirectBinary(Object obj)
 	{
 		return ionizersBinary.containsKey(obj.getClass());

src/mightypork/utils/ion/IonBinary.java

@@ -11,7 +11,7 @@ import java.io.IOException;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface IonBinary {
-
+	
 	/**
 	 * Load data from the input stream.
 	 *
@@ -19,8 +19,8 @@ public interface IonBinary {
 	 * @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).

src/mightypork/utils/ion/IonBundled.java

@@ -8,15 +8,15 @@ package mightypork.utils.ion;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface IonBundled {
-
+	
 	/**
 	 * Load this object from the data bundle
 	 *
 	 * @param in bundle to load from
 	 */
 	void load(IonDataBundle in);
-
+	
-
+	
 	/**
 	 * Save this object to the data bundle
 	 *

src/mightypork/utils/ion/IonDataBundle.java

@@ -16,10 +16,10 @@ import java.util.Map;
  * @author Ondřej Hruška (MightyPork)
  */
 public class IonDataBundle implements IonBinary {
-
+	
 	private final Map<String, Object> backingMap = new HashMap<>();
-
+	
-
+	
 	/**
 	 * Clear & fill a provided bundle with elements from a bundle value
 	 *
@@ -29,14 +29,14 @@ public class IonDataBundle implements IonBinary {
 	public void loadBundle(String key, IonDataBundle filled)
 	{
 		if (!containsKey(key)) return;
-
+		
 		final IonDataBundle ib = get(key, new IonDataBundle());
-
+		
 		filled.clear();
 		filled.putAll(ib);
 	}
-
+	
-
+	
 	/**
 	 * Check if a key is used in the bundle
 	 *
@@ -47,8 +47,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		return backingMap.containsKey(key);
 	}
-
+	
-
+	
 	/**
 	 * Check if a value is contained in the bundle
 	 *
@@ -59,8 +59,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		return backingMap.containsValue(value);
 	}
-
+	
-
+	
 	/**
 	 * Get a map value
 	 *
@@ -71,8 +71,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		return loadMap(key, new LinkedHashMap<K, V>());
 	}
-
+	
-
+	
 	/**
 	 * Clear & fill the provided map with elements from a map value
 	 *
@@ -87,8 +87,8 @@ public class IonDataBundle implements IonBinary {
 		imw.fill(filled);
 		return filled;
 	}
-
+	
-
+	
 	/**
 	 * Get a sequence value
 	 *
@@ -99,8 +99,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		return loadSequence(key, new ArrayList<E>());
 	}
-
+	
-
+	
 	/**
 	 * Clear & fill the provided Collection with elements from a sequence value
 	 *
@@ -114,11 +114,11 @@ public class IonDataBundle implements IonBinary {
 		if (isw == null) throw new RuntimeException("No such key: " + key);
 		filled.clear();
 		isw.fill(filled);
-
+		
 		return filled;
 	}
-
+	
-
+	
 	/**
 	 * Load a bundled object from a bundle value.<br>
 	 * The object does not have to be registered.
@@ -131,13 +131,13 @@ public class IonDataBundle implements IonBinary {
 	{
 		final IonDataBundle bu = get(key, null);
 		if (bu == null) throw new RuntimeException("No such key: " + key);
-
+		
 		loaded.load(bu);
-
+		
 		return loaded;
 	}
-
+	
-
+	
 	/**
 	 * Save a bundled object to a bundle value.<br>
 	 * The object does not have to be registered.
@@ -151,8 +151,8 @@ public class IonDataBundle implements IonBinary {
 		saved.save(bu);
 		put(key, bu);
 	}
-
+	
-
+	
 	/**
 	 * Get value, or fallback (if none found of with bad type).
 	 *
@@ -170,8 +170,8 @@ public class IonDataBundle implements IonBinary {
 			return fallback;
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get value, or null (if none found of with bad type).
 	 *
@@ -182,124 +182,124 @@ public class IonDataBundle implements IonBinary {
 	{
 		return get(key, (T) null);
 	}
-
+	
-
+	
 	public void put(String key, Object value)
 	{
 		if (key == null || value == null) return;
 		if (!Ion.isRegistered(value)) throw new IllegalArgumentException("Cannot add to bundle, not registered: " + value);
 		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);
 	}
-
+	
-
+	
 	public void put(String key, Object[] value)
 	{
 		backingMap.put(key, value);
 	}
-
+	
-
+	
 	/**
 	 * Put a sequence to the bundle.
 	 *
@@ -311,8 +311,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		backingMap.put(key, new IonSequenceWrapper(c));
 	}
-
+	
-
+	
 	/**
 	 * Put a map to the bundle.
 	 *
@@ -324,22 +324,22 @@ public class IonDataBundle implements IonBinary {
 	{
 		backingMap.put(key, new IonMapWrapper(m));
 	}
-
+	
-
+	
 	@Override
 	public void load(IonInput in) throws IOException
 	{
 		in.readMap(backingMap);
 	}
-
+	
-
+	
 	@Override
 	public void save(IonOutput out) throws IOException
 	{
 		out.writeMap(backingMap);
 	}
-
+	
-
+	
 	/**
 	 * Get number of elements in the bundle
 	 *
@@ -349,8 +349,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		return backingMap.size();
 	}
-
+	
-
+	
 	/**
 	 * Check whether the bundle is empty
 	 *
@@ -360,8 +360,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		return backingMap.isEmpty();
 	}
-
+	
-
+	
 	/**
 	 * Remove all elements
 	 */
@@ -369,8 +369,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		backingMap.clear();
 	}
-
+	
-
+	
 	/**
 	 * Remove a value by key
 	 *
@@ -381,8 +381,8 @@ public class IonDataBundle implements IonBinary {
 	{
 		return backingMap.remove(key);
 	}
-
+	
-
+	
 	/**
 	 * Put all from another bundle
 	 *
@@ -392,15 +392,15 @@ public class IonDataBundle implements IonBinary {
 	{
 		backingMap.putAll(anotherBundle.backingMap);
 	}
-
+	
-
+	
 	@Override
 	public String toString()
 	{
 		return backingMap.toString();
 	}
-
+	
-
+	
 	@Override
 	public int hashCode()
 	{
@@ -409,8 +409,8 @@ public class IonDataBundle implements IonBinary {
 		result = prime * result + ((backingMap == null) ? 0 : backingMap.hashCode());
 		return result;
 	}
-
+	
-
+	
 	@Override
 	public boolean equals(Object obj)
 	{

src/mightypork/utils/ion/IonInput.java

@@ -23,25 +23,25 @@ import mightypork.utils.exceptions.CorruptDataException;
  * @author Ondřej Hruška (MightyPork)
  */
 public class IonInput implements Closeable {
-
+	
 	private final DataInput in;
 	private final InputStream stream;
-
+	
-
+	
 	@SuppressWarnings("resource")
 	public IonInput(File inFile) throws FileNotFoundException
 	{
 		this(new FileInputStream(inFile));
 	}
-
+	
-
+	
 	public IonInput(InputStream in)
 	{
 		this.stream = in;
 		this.in = new DataInputStream(in);
 	}
-
+	
-
+	
 	/**
 	 * Read int 0-255. Suitable when the int was written using
 	 * <code>writeIntByte()</code> method.
@@ -53,8 +53,8 @@ public class IonInput implements Closeable {
 	{
 		return in.readUnsignedByte();
 	}
-
+	
-
+	
 	/**
 	 * Read an int 0-65535. Suitable when the int was written using
 	 * <code>writeIntShort()</code> method.
@@ -66,62 +66,62 @@ public class IonInput implements Closeable {
 	{
 		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();
@@ -131,8 +131,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public byte[] readBytes() throws IOException
 	{
 		final int length = readLength();
@@ -142,8 +142,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public char[] readChars() throws IOException
 	{
 		final int length = readLength();
@@ -153,8 +153,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public short[] readShorts() throws IOException
 	{
 		final int length = readLength();
@@ -164,8 +164,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public int[] readInts() throws IOException
 	{
 		final int length = readLength();
@@ -175,8 +175,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public long[] readLongs() throws IOException
 	{
 		final int length = readLength();
@@ -186,8 +186,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public float[] readFloats() throws IOException
 	{
 		final int length = readLength();
@@ -197,8 +197,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public double[] readDoubles() throws IOException
 	{
 		final int length = readLength();
@@ -208,8 +208,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public String[] readStrings() throws IOException
 	{
 		final int length = readLength();
@@ -219,8 +219,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	public Object[] readObjects() throws IOException
 	{
 		final int length = readLength();
@@ -230,8 +230,8 @@ public class IonInput implements Closeable {
 		}
 		return arr;
 	}
-
+	
-
+	
 	/**
 	 * Read bundle without a mark
 	 */
@@ -241,8 +241,8 @@ public class IonInput implements Closeable {
 		ib.load(this);
 		return ib;
 	}
-
+	
-
+	
 	/**
 	 * Read bundle without a mark, load into a provided one
 	 */
@@ -251,20 +251,20 @@ public class IonInput implements Closeable {
 		filled.clear();
 		filled.load(this);
 	}
-
+	
-
+	
 	private int readMark() throws IOException
 	{
 		return readIntByte();
 	}
-
+	
-
+	
 	private int readLength() throws IOException
 	{
 		return readInt();
 	}
-
+	
-
+	
 	/**
 	 * <p>
 	 * Read object based on mark; if null mark is found, returns default value.
@@ -288,8 +288,8 @@ public class IonInput implements Closeable {
 			throw new CorruptDataException("Could not load object.", e);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Read single object, preceded by a mark.
 	 *
@@ -299,115 +299,115 @@ public class IonInput implements Closeable {
 	public Object readObject() throws IOException
 	{
 		final int mark = readMark();
-
+		
 		try {
-
+			
 			if (Ion.isMarkForBinary(mark)) {
 				IonBinary loaded;
-
+				
 				loaded = (IonBinary) Ion.getClassForMark(mark).newInstance();
-
+				
 				loaded.load(this);
 				return loaded;
 			}
-
+			
 			if (Ion.isMarkForBundled(mark)) {
 				IonBundled loaded;
-
+				
 				loaded = (IonBundled) Ion.getClassForMark(mark).newInstance();
-
+				
 				final IonDataBundle ib = readBundle();
 				loaded.load(ib);
 				return loaded;
 			}
-
+			
 			if (Ion.isMarkForIndirectBundled(mark)) {
 				final IonizerBundled<?> ionizer = Ion.getIonizerBundledForClass(Ion.getClassForMark(mark));
 				return ionizer.load(readBundle());
 			}
-
+			
 			if (Ion.isMarkForIndirectBinary(mark)) {
 				final IonizerBinary<?> ionizer = Ion.getIonizerBinaryForClass(Ion.getClassForMark(mark));
 				return ionizer.load(this);
 			}
-
+			
 		} catch (final Exception e) {
 			throw new RuntimeException("Could not load object for mark: " + mark, e);
 		}
-
+		
 		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();
-
+				
 			case Ion.OBJECT_ARRAY:
 				return readObjects();
-
+				
 			case Ion.MAP:
 				return readMap();
-
+				
 			case Ion.SEQUENCE:
 				return readSequence();
-
+				
 			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.
@@ -420,11 +420,11 @@ public class IonInput implements Closeable {
 		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
 	 *
@@ -435,8 +435,8 @@ public class IonInput implements Closeable {
 	{
 		return readSequence(new ArrayList<T>());
 	}
-
+	
-
+	
 	/**
 	 * Load entries into a collection. The collection is cleaned first.
 	 *
@@ -457,8 +457,8 @@ public class IonInput implements Closeable {
 			throw new CorruptDataException("Unexpected element type in sequence.", e);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Read element pairs into a HashMap
 	 *
@@ -469,8 +469,8 @@ public class IonInput implements Closeable {
 	{
 		return readMap(new HashMap<K, V>());
 	}
-
+	
-
+	
 	/**
 	 * Load data into a map. The map is cleaned first.
 	 *
@@ -486,7 +486,7 @@ public class IonInput implements Closeable {
 			while (hasNextEntry()) {
 				final K key = (K) readObject();
 				final V value = (V) readObject();
-
+				
 				filled.put(key, value);
 			}
 			return filled;
@@ -494,8 +494,8 @@ public class IonInput implements Closeable {
 			throw new CorruptDataException("Unexpected element type in map.", e);
 		}
 	}
-
+	
-
+	
 	@Override
 	public void close() throws IOException
 	{

src/mightypork/utils/ion/IonMapWrapper.java

@@ -8,47 +8,47 @@ import java.util.Map;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 class IonMapWrapper implements IonBinary {
-
+	
 	private final Map map;
-
+	
-
+	
 	public IonMapWrapper()
 	{
 		map = new LinkedHashMap<>();
 	}
-
+	
-
+	
 	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);
 	}
-
+	
-
+	
 	public Map getMap()
 	{
 		return map;
 	}
-
+	
 }

src/mightypork/utils/ion/IonOutput.java

@@ -20,97 +20,97 @@ import java.util.Map.Entry;
  * @author Ondřej Hruška (MightyPork)
  */
 public class IonOutput implements Closeable {
-
+	
 	private final DataOutput out;
 	private final OutputStream stream;
-
+	
-
+	
 	@SuppressWarnings("resource")
 	public IonOutput(File outFile) throws FileNotFoundException
 	{
 		this(new FileOutputStream(outFile));
 	}
-
+	
-
+	
 	public IonOutput(OutputStream out)
 	{
 		this.stream = 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);
@@ -118,8 +118,8 @@ public class IonOutput implements Closeable {
 			out.writeBoolean(a);
 		}
 	}
-
+	
-
+	
 	public void writeBytes(byte[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -127,8 +127,8 @@ public class IonOutput implements Closeable {
 			out.writeByte(a);
 		}
 	}
-
+	
-
+	
 	public void writeChars(char[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -136,8 +136,8 @@ public class IonOutput implements Closeable {
 			out.writeChar(a);
 		}
 	}
-
+	
-
+	
 	public void writeShorts(short[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -145,8 +145,8 @@ public class IonOutput implements Closeable {
 			out.writeShort(a);
 		}
 	}
-
+	
-
+	
 	public void writeInts(int[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -154,8 +154,8 @@ public class IonOutput implements Closeable {
 			out.writeInt(a);
 		}
 	}
-
+	
-
+	
 	public void writeLongs(long[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -163,8 +163,8 @@ public class IonOutput implements Closeable {
 			out.writeLong(a);
 		}
 	}
-
+	
-
+	
 	public void writeFloats(float[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -172,8 +172,8 @@ public class IonOutput implements Closeable {
 			out.writeFloat(a);
 		}
 	}
-
+	
-
+	
 	public void writeDoubles(double[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -181,8 +181,8 @@ public class IonOutput implements Closeable {
 			out.writeDouble(a);
 		}
 	}
-
+	
-
+	
 	public void writeStrings(String[] arr) throws IOException
 	{
 		writeLength(arr.length);
@@ -190,8 +190,8 @@ public class IonOutput implements Closeable {
 			out.writeUTF(a);
 		}
 	}
-
+	
-
+	
 	/**
 	 * Write a bundle without a mark
 	 */
@@ -199,8 +199,8 @@ public class IonOutput implements Closeable {
 	{
 		bundle.save(this);
 	}
-
+	
-
+	
 	/**
 	 * Write array of objects. Works with all that is supported by writeObject()
 	 *
@@ -214,8 +214,8 @@ public class IonOutput implements Closeable {
 			writeObject(a);
 		}
 	}
-
+	
-
+	
 	public <T> void writeSequence(Collection<T> sequence) throws IOException
 	{
 		for (final T element : sequence) {
@@ -224,47 +224,47 @@ public class IonOutput implements Closeable {
 		}
 		endSequence();
 	}
-
+	
-
+	
 	public <K, V> void writeMap(Map<K, V> map) throws IOException
 	{
 		for (final Entry<K, V> 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
 	{
 		writeInt(length);
 	}
-
+	
-
+	
 	/**
 	 * Write an object. Supported are built-in types and types registered to
 	 * Ion.
@@ -278,177 +278,177 @@ public class IonOutput implements Closeable {
 			writeMark(Ion.NULL);
 			return;
 		}
-
+		
 		if (obj instanceof IonBinary) {
 			final IonBinary iObj = (IonBinary) obj;
-
+			
 			writeMark(Ion.getMark(obj));
 			iObj.save(this);
 			return;
 		}
-
+		
 		if (obj instanceof IonBundled) {
 			final IonBundled iObj = (IonBundled) obj;
-
+			
 			writeMark(Ion.getMark(obj));
-
+			
 			final IonDataBundle bundle = new IonDataBundle();
 			iObj.save(bundle);
 			writeBundle(bundle);
-
+			
 			return;
 		}
-
+		
 		if (Ion.isObjectIndirectBundled(obj)) {
 			final IonizerBundled<?> ionizer = Ion.getIonizerBundledForClass(obj.getClass());
-
+			
 			writeMark(Ion.getMark(obj));
-
+			
 			final IonDataBundle bundle = new IonDataBundle();
 			ionizer._save(obj, bundle);
 			writeBundle(bundle);
 			return;
 		}
-
+		
 		if (Ion.isObjectIndirectBinary(obj)) {
 			final IonizerBinary<?> ionizer = Ion.getIonizerBinaryForClass(obj.getClass());
-
+			
 			writeMark(Ion.getMark(obj));
-
+			
 			ionizer._save(obj, this);
 			return;
 		}
-
+		
 		if (obj instanceof Map) {
 			writeMark(Ion.MAP);
 			writeMap((Map<?, ?>) obj);
 			return;
 		}
-
+		
 		if (obj instanceof Collection) {
 			writeMark(Ion.SEQUENCE);
 			writeSequence((Collection<?>) obj);
 			return;
 		}
-
+		
 		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;
 		}
-
+		
 		if (obj instanceof Object[]) {
 			writeMark(Ion.OBJECT_ARRAY);
 			writeObjects((Object[]) obj);
 			return;
 		}
-
+		
 		throw new IOException("Object " + obj + " could not be be written to stream.");
 	}
-
+	
-
+	
 	@Override
 	public void close() throws IOException
 	{

src/mightypork/utils/ion/IonSequenceWrapper.java

@@ -8,47 +8,47 @@ import java.util.Collection;
 
 @SuppressWarnings({ "rawtypes", "unchecked" })
 class IonSequenceWrapper implements IonBinary {
-
+	
 	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);
 	}
-
+	
-
+	
 	public Collection getSequence()
 	{
 		return collection;
 	}
-
+	
 }

src/mightypork/utils/ion/IonizerBinary.java

@@ -12,14 +12,14 @@ import java.io.IOException;
  * @param <T>
  */
 public abstract class IonizerBinary<T> {
-
+	
 	@SuppressWarnings("unchecked")
 	final void _save(Object object, IonOutput out) throws IOException
 	{
 		save((T) object, out);
 	}
-
+	
-
+	
 	/**
 	 * Save an object to ion output
 	 *
@@ -28,8 +28,8 @@ public abstract class IonizerBinary<T> {
 	 * @throws IOException
 	 */
 	public abstract void save(T object, IonOutput out) throws IOException;
-
+	
-
+	
 	/**
 	 * Load an object from ion input
 	 *
@@ -37,5 +37,5 @@ public abstract class IonizerBinary<T> {
 	 * @return the loaded object
 	 */
 	public abstract T load(IonInput in) throws IOException;
-
+	
 }

src/mightypork/utils/ion/IonizerBundled.java

@@ -9,14 +9,14 @@ package mightypork.utils.ion;
  * @param <T>
  */
 public abstract class IonizerBundled<T> {
-
+	
 	@SuppressWarnings("unchecked")
 	final void _save(Object object, IonDataBundle out)
 	{
 		save((T) object, out);
 	}
-
+	
-
+	
 	/**
 	 * Save an object to data bundle
 	 *
@@ -24,8 +24,8 @@ public abstract class IonizerBundled<T> {
 	 * @param out bundle to save to
 	 */
 	public abstract void save(T object, IonDataBundle out);
-
+	
-
+	
 	/**
 	 * Load an object from a bundle
 	 *
@@ -33,5 +33,5 @@ public abstract class IonizerBundled<T> {
 	 * @return the loaded object
 	 */
 	public abstract T load(IonDataBundle in);
-
+	
 }

src/mightypork/utils/logging/Log.java

@@ -7,13 +7,13 @@ import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.logging.Level;
 
+import mightypork.utils.Str;
 import mightypork.utils.annotations.FactoryMethod;
 import mightypork.utils.logging.monitors.LogMonitor;
 import mightypork.utils.logging.monitors.LogMonitorStdout;
 import mightypork.utils.logging.writers.ArchivingLog;
 import mightypork.utils.logging.writers.LogWriter;
 import mightypork.utils.logging.writers.SimpleLog;
-import mightypork.utils.string.StringUtil;
 
 
 /**
@@ -22,15 +22,15 @@ import mightypork.utils.string.StringUtil;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Log {
-
+	
 	private static LogWriter main = null;
 	private static boolean enabled = true;
 	private static final LogMonitorStdout sysoMonitor = new LogMonitorStdout();
 	private static final long start_ms = System.currentTimeMillis();
-
+	
 	private static HashMap<String, SimpleLog> logs = new HashMap<>();
-
+	
-
+	
 	/**
 	 * Create a logger. If another with the name already exists, it'll be
 	 * retrieved instead of creating a new one.
@@ -44,16 +44,16 @@ public class Log {
 	public static synchronized LogWriter create(String logName, File logFile, int oldLogsCount)
 	{
 		if (logs.containsKey(logName)) return logs.get(logName);
-
+		
 		final ArchivingLog log = new ArchivingLog(logName, logFile, oldLogsCount);
 		log.init();
-
+		
 		logs.put(logName, log);
-
+		
 		return log;
 	}
-
+	
-
+	
 	/**
 	 * Create a logger. If another with the name already exists, it'll be
 	 * retrieved instead of creating a new one.
@@ -66,50 +66,50 @@ public class Log {
 	public static synchronized LogWriter create(String logName, File logFile)
 	{
 		if (logs.containsKey(logName)) return logs.get(logName);
-
+		
 		final SimpleLog log = new SimpleLog(logName, logFile);
 		log.init();
-
+		
 		logs.put(logName, log);
-
+		
 		return log;
 	}
-
+	
-
+	
 	public static void setMainLogger(LogWriter log)
 	{
 		main = log;
 	}
-
+	
-
+	
 	public static LogWriter getMainLogger()
 	{
 		return main;
 	}
-
+	
-
+	
 	public static void addMonitor(LogMonitor mon)
 	{
 		assertInited();
-
+		
 		main.addMonitor(mon);
 	}
-
+	
-
+	
 	public static void removeMonitor(LogMonitor mon)
 	{
 		assertInited();
-
+		
 		main.removeMonitor(mon);
 	}
-
+	
-
+	
 	private static void assertInited()
 	{
 		if (main == null) throw new IllegalStateException("Main logger not initialized.");
 	}
-
+	
-
+	
 	/**
 	 * Log a message
 	 *
@@ -120,14 +120,14 @@ public class Log {
 	{
 		if (enabled) {
 			sysoMonitor.onMessageLogged(level, formatMessage(level, msg, null, start_ms));
-
+			
 			if (main != null) {
 				main.log(level, msg);
 			}
 		}
 	}
-
+	
-
+	
 	/**
 	 * Log a message
 	 *
@@ -139,14 +139,14 @@ public class Log {
 	{
 		if (enabled) {
 			sysoMonitor.onMessageLogged(level, formatMessage(level, msg, t, start_ms));
-
+			
 			if (main != null) {
 				main.log(level, msg, t);
 			}
 		}
 	}
-
+	
-
+	
 	/**
 	 * Log FINE message
 	 *
@@ -156,8 +156,8 @@ public class Log {
 	{
 		log(Level.FINE, msg);
 	}
-
+	
-
+	
 	/**
 	 * Log FINER message
 	 *
@@ -167,8 +167,8 @@ public class Log {
 	{
 		log(Level.FINER, msg);
 	}
-
+	
-
+	
 	/**
 	 * Log FINEST message
 	 *
@@ -178,8 +178,8 @@ public class Log {
 	{
 		log(Level.FINEST, msg);
 	}
-
+	
-
+	
 	/**
 	 * Log INFO message
 	 *
@@ -189,8 +189,8 @@ public class Log {
 	{
 		log(Level.INFO, msg);
 	}
-
+	
-
+	
 	/**
 	 * Log WARNING message (less severe than ERROR)
 	 *
@@ -200,8 +200,8 @@ public class Log {
 	{
 		log(Level.WARNING, msg);
 	}
-
+	
-
+	
 	/**
 	 * Log ERROR message
 	 *
@@ -211,8 +211,8 @@ public class Log {
 	{
 		log(Level.SEVERE, msg);
 	}
-
+	
-
+	
 	/**
 	 * Log warning message with exception
 	 *
@@ -223,8 +223,8 @@ public class Log {
 	{
 		log(Level.WARNING, msg, thrown);
 	}
-
+	
-
+	
 	/**
 	 * Log exception thrown as warning
 	 *
@@ -234,8 +234,8 @@ public class Log {
 	{
 		log(Level.WARNING, null, thrown);
 	}
-
+	
-
+	
 	/**
 	 * Log error message
 	 *
@@ -246,8 +246,8 @@ public class Log {
 	{
 		log(Level.SEVERE, msg, thrown);
 	}
-
+	
-
+	
 	/**
 	 * Log exception thrown as error
 	 *
@@ -257,28 +257,28 @@ public class Log {
 	{
 		log(Level.SEVERE, null, thrown);
 	}
-
+	
-
+	
 	public static void enable(boolean flag)
 	{
 		enabled = flag;
 	}
-
+	
-
+	
 	public static void setSysoutLevel(Level level)
 	{
 		sysoMonitor.setLevel(level);
 	}
-
+	
-
+	
 	public static void setLevel(Level level)
 	{
 		assertInited();
-
+		
 		main.setLevel(level);
 	}
-
+	
-
+	
 	/**
 	 * Get stack trace from throwable
 	 *
@@ -294,31 +294,31 @@ public class Log {
 		sw.flush();
 		return sw.toString();
 	}
-
+	
-
+	
 	public static String formatMessage(Level level, String message, Throwable throwable, long start_ms)
 	{
 		if (message == null) message = "";
-
+		
 		final String nl = System.getProperty("line.separator");
-
+		
 		if (message.length() > 0) {
 			if (message.equals("\n")) {
 				return nl;
 			}
-
+			
 			if (message.charAt(0) == '\n') {
 				message = nl + message.substring(1);
 			}
 		}
-
+		
 		final long time_ms = (System.currentTimeMillis() - start_ms);
 		final double time_s = time_ms / 1000D;
 		final String time = String.format("%6.2f ", time_s);
-		final String time_blank = StringUtil.repeat(" ", time.length());
+		final String time_blank = Str.repeat(" ", time.length());
-
+		
 		String prefix = "[ ? ]";
-
+		
 		if (level == Level.FINE) {
 			prefix = "[ # ] ";
 		} else if (level == Level.FINER) {
@@ -332,13 +332,13 @@ public class Log {
 		} else if (level == Level.WARNING) {
 			prefix = "[!W!] ";
 		}
-
+		
 		message = time + prefix + message.replaceAll("\n", nl + time_blank + prefix) + nl;
-
+		
 		if (throwable != null) {
 			message += getStackTrace(throwable);
 		}
-
+		
 		return message;
 	}
 }

src/mightypork/utils/logging/monitors/LogMonitor.java

@@ -5,32 +5,32 @@ import java.util.logging.Level;
 
 
 public abstract class LogMonitor {
-
+	
 	private boolean enabled = true;
 	private Level accepted = Level.ALL;
-
+	
-
+	
 	public void onMessageLogged(Level level, String message)
 	{
 		if (!enabled) return;
 		if (accepted.intValue() > level.intValue()) return;
-
+		
 		logMessage(level, message);
 	}
-
+	
-
+	
 	protected abstract void logMessage(Level level, String message);
-
+	
-
+	
 	public void setLevel(Level level)
 	{
 		this.accepted = level;
 	}
-
+	
-
+	
 	public void enable(boolean flag)
 	{
 		this.enabled = flag;
 	}
-
+	
 }

src/mightypork/utils/logging/monitors/LogMonitorStdout.java

@@ -5,7 +5,7 @@ import java.util.logging.Level;
 
 
 public class LogMonitorStdout extends LogMonitor {
-
+	
 	@Override
 	protected void logMessage(Level level, String message)
 	{
@@ -15,5 +15,5 @@ public class LogMonitorStdout extends LogMonitor {
 			System.out.print(message);
 		}
 	}
-
+	
 }

src/mightypork/utils/logging/writers/ArchivingLog.java

@@ -9,8 +9,8 @@ import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 
+import mightypork.utils.Str;
 import mightypork.utils.files.FileUtil;
-import mightypork.utils.string.StringUtil;
 
 
 /**
@@ -125,6 +125,6 @@ public class ArchivingLog extends SimpleLog {
 	 */
 	private String getSuffix()
 	{
-		return StringUtil.fromLastChar(getFile().toString(), '.');
+		return Str.fromLast(getFile().toString(), '.');
 	}
 }

src/mightypork/utils/logging/writers/LogWriter.java

@@ -12,45 +12,45 @@ import mightypork.utils.logging.monitors.LogMonitor;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface LogWriter {
-
+	
 	/**
 	 * Prepare logs for logging
 	 */
 	void init();
-
+	
-
+	
 	/**
 	 * Add log monitor
 	 *
 	 * @param mon monitor
 	 */
 	void addMonitor(LogMonitor mon);
-
+	
-
+	
 	/**
 	 * Remove a monitor
 	 *
 	 * @param removed monitor to remove
 	 */
 	void removeMonitor(LogMonitor removed);
-
+	
-
+	
 	/**
 	 * Set logging level
 	 *
 	 * @param level
 	 */
 	void setLevel(Level level);
-
+	
-
+	
 	/**
 	 * Enable logging.
 	 *
 	 * @param flag do enable logging
 	 */
 	void enable(boolean flag);
-
+	
-
+	
 	/**
 	 * Log a message
 	 *
@@ -58,8 +58,8 @@ public interface LogWriter {
 	 * @param msg message text
 	 */
 	void log(Level level, String msg);
-
+	
-
+	
 	/**
 	 * Log a message
 	 *
@@ -68,5 +68,5 @@ public interface LogWriter {
 	 * @param t thrown exception
 	 */
 	void log(Level level, String msg, Throwable t);
-
+	
 }

src/mightypork/utils/logging/writers/SimpleLog.java

@@ -21,69 +21,69 @@ import mightypork.utils.logging.monitors.LogMonitor;
  * @author Ondřej Hruška (MightyPork)
  */
 public class SimpleLog implements LogWriter {
-
+	
 	/**
 	 * Log file formatter.
 	 */
 	class LogFormatter extends Formatter {
-
+		
 		@Override
 		public String format(LogRecord record)
 		{
 			return Log.formatMessage(record.getLevel(), record.getMessage(), record.getThrown(), started_ms);
 		}
 	}
-
+	
 	/** Log file */
 	private final File file;
-
+	
 	/** Log name */
 	private final String name;
-
+	
 	/** Logger instance. */
 	private Logger logger;
-
+	
 	private boolean enabled = true;
 	private final HashSet<LogMonitor> monitors = new HashSet<>();
 	private final long started_ms;
-
+	
-
+	
 	public SimpleLog(String name, File file)
 	{
 		this.name = name;
 		this.file = file;
 		this.started_ms = System.currentTimeMillis();
 	}
-
+	
-
+	
 	@Override
 	public void init()
 	{
 		logger = Logger.getLogger(getName());
-
+		
 		FileHandler handler = null;
 		try {
 			handler = new FileHandler(getFile().getPath());
 		} catch (final Throwable t) {
 			throw new RuntimeException("Failed to init log.", t);
 		}
-
+		
 		handler.setFormatter(new LogFormatter());
 		logger.addHandler(handler);
 		logger.setUseParentHandlers(false);
 		logger.setLevel(Level.ALL);
-
+		
 		printHeader();
 	}
-
+	
-
+	
 	protected void printHeader()
 	{
 		final String stamp = (new SimpleDateFormat("yyyy/MM/dd HH:mm:ss")).format(new Date());
 		log(Level.INFO, "Logger \"" + getName() + "\" initialized.\n" + stamp);
 	}
-
+	
-
+	
 	/**
 	 * Add log monitor
 	 *
@@ -94,8 +94,8 @@ public class SimpleLog implements LogWriter {
 	{
 		monitors.add(mon);
 	}
-
+	
-
+	
 	/**
 	 * Remove a monitor
 	 *
@@ -106,61 +106,61 @@ public class SimpleLog implements LogWriter {
 	{
 		monitors.remove(removed);
 	}
-
+	
-
+	
 	@Override
 	public void setLevel(Level level)
 	{
 		logger.setLevel(level);
 	}
-
+	
-
+	
 	@Override
 	public void enable(boolean flag)
 	{
 		enabled = flag;
 	}
-
+	
-
+	
 	public File getFile()
 	{
 		return file;
 	}
-
+	
-
+	
 	public String getName()
 	{
 		return name;
 	}
-
+	
-
+	
 	@Override
 	public void log(Level level, String msg)
 	{
 		if (enabled) {
 			logger.log(level, msg);
-
+			
 			final String fmt = Log.formatMessage(level, msg, null, started_ms);
-
+			
 			for (final LogMonitor mon : monitors) {
 				mon.onMessageLogged(level, fmt);
 			}
 		}
 	}
-
+	
-
+	
 	@Override
 	public void log(Level level, String msg, Throwable t)
 	{
 		if (enabled) {
 			logger.log(level, msg, t);
-
+			
 			final String fmt = Log.formatMessage(level, msg, t, started_ms);
-
+			
 			for (final LogMonitor mon : monitors) {
 				mon.onMessageLogged(level, fmt);
 			}
 		}
 	}
-
+	
 }

src/mightypork/utils/math/Calc.java

@@ -17,16 +17,16 @@ import mightypork.utils.math.constraints.vect.Vect;
  * @author Ondřej Hruška (MightyPork)
  */
 public final class Calc {
-
+	
 	private Calc()
 	{
 		// not instantiable
 	}
-
+	
 	/** Square root of two */
 	public static final double SQ2 = 1.41421356237;
-
+	
-
+	
 	/**
 	 * Get distance from 2D line to 2D point [X,Y]
 	 *
@@ -40,53 +40,53 @@ public final class Calc {
 		// line point L[lx,ly]
 		final double lx = linePoint.x();
 		final double ly = linePoint.y();
-
+		
 		// line equation ax+by+c=0
 		final double a = -lineDirVec.y();
 		final double b = lineDirVec.x();
 		final double c = -a * lx - b * ly;
-
+		
 		// checked point P[x,y]
 		final double x = point.x();
 		final double y = point.y();
-
+		
 		// distance
 		return Math.abs(a * x + b * y + c) / Math.sqrt(a * a + b * b);
 	}
-
+	
 	public static final Random rand = new Random();
-
+	
-
+	
 	public static double sphereSurface(double radius)
 	{
 		return 4D * Math.PI * square(radius);
 	}
-
+	
-
+	
 	public static double sphereVolume(double radius)
 	{
 		return (4D / 3D) * Math.PI * cube(radius);
 	}
-
+	
-
+	
 	public static double sphereRadius(double volume)
 	{
 		return Math.cbrt((3D * volume) / (4 * Math.PI));
 	}
-
+	
-
+	
 	public static double circleSurface(double radius)
 	{
 		return Math.PI * square(radius);
 	}
-
+	
-
+	
 	public static double circleRadius(double surface)
 	{
 		return Math.sqrt(surface / Math.PI);
 	}
-
+	
-
+	
 	/**
 	 * Safe equals that works with nulls
 	 *
@@ -98,8 +98,8 @@ public final class Calc {
 	{
 		return a == null ? b == null : a.equals(b);
 	}
-
+	
-
+	
 	/**
 	 * Clamp integer
 	 *
@@ -112,8 +112,8 @@ public final class Calc {
 	{
 		return number < min ? min : number > max ? max : number;
 	}
-
+	
-
+	
 	/**
 	 * Clamp double
 	 *
@@ -126,14 +126,14 @@ public final class Calc {
 	{
 		return number < min ? min : number > max ? max : number;
 	}
-
+	
-
+	
 	public static boolean isInRange(double number, double left, double right)
 	{
 		return number >= left && number <= right;
 	}
-
+	
-
+	
 	/**
 	 * Get number from A to B at delta time (A -> B)
 	 *
@@ -147,8 +147,8 @@ public final class Calc {
 	{
 		return from + (to - from) * easing.get(elapsed);
 	}
-
+	
-
+	
 	/**
 	 * Get angle [degrees] from A to B at delta time (tween A to B)
 	 *
@@ -162,8 +162,8 @@ public final class Calc {
 	{
 		return Deg.norm(from - Deg.delta(to, from) * easing.get(elapsed));
 	}
-
+	
-
+	
 	/**
 	 * Get angle [radians] from A to B at delta time (tween A to B)
 	 *
@@ -177,8 +177,8 @@ public final class Calc {
 	{
 		return Rad.norm(from - Rad.delta(to, from) * easing.get(elapsed));
 	}
-
+	
-
+	
 	public static double max(double... numbers)
 	{
 		double highest = numbers[0];
@@ -187,8 +187,8 @@ public final class Calc {
 		}
 		return highest;
 	}
-
+	
-
+	
 	public static int max(int... numbers)
 	{
 		int highest = numbers[0];
@@ -197,8 +197,8 @@ public final class Calc {
 		}
 		return highest;
 	}
-
+	
-
+	
 	public static double min(double... numbers)
 	{
 		double lowest = numbers[0];
@@ -207,8 +207,8 @@ public final class Calc {
 		}
 		return lowest;
 	}
-
+	
-
+	
 	public static int min(int... numbers)
 	{
 		int lowest = numbers[0];
@@ -217,8 +217,8 @@ public final class Calc {
 		}
 		return lowest;
 	}
-
+	
-
+	
 	/**
 	 * Split comma separated list of integers.
 	 *
@@ -231,21 +231,21 @@ public final class Calc {
 		if (list == null) {
 			return null;
 		}
-
+		
 		final String[] parts = list.split(Character.toString(delimiter));
-
+		
 		final ArrayList<Integer> intList = new ArrayList<>();
-
+		
 		for (final String part : parts) {
 			try {
 				intList.add(Integer.parseInt(part.trim()));
 			} catch (final NumberFormatException e) {}
 		}
-
+		
 		return intList;
 	}
-
+	
-
+	
 	/**
 	 * Pick random element from a given list.
 	 *
@@ -256,8 +256,8 @@ public final class Calc {
 	{
 		return pick(rand, list);
 	}
-
+	
-
+	
 	/**
 	 * Pick random element from a given list.
 	 *
@@ -270,8 +270,8 @@ public final class Calc {
 		if (list.size() == 0) return null;
 		return list.get(rand.nextInt(list.size()));
 	}
-
+	
-
+	
 	/**
 	 * Take a square
 	 *
@@ -282,8 +282,8 @@ public final class Calc {
 	{
 		return a * a;
 	}
-
+	
-
+	
 	/**
 	 * Take a cube
 	 *
@@ -294,8 +294,8 @@ public final class Calc {
 	{
 		return a * a * a;
 	}
-
+	
-
+	
 	/**
 	 * @param d number
 	 * @return fractional part
@@ -304,8 +304,8 @@ public final class Calc {
 	{
 		return d - Math.floor(d);
 	}
-
+	
-
+	
 	/**
 	 * Make sure value is within array length.
 	 *
@@ -319,8 +319,8 @@ public final class Calc {
 			throw new IndexOutOfBoundsException();
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get distance of two coordinates in 2D plane
 	 *
@@ -334,21 +334,21 @@ public final class Calc {
 	{
 		return Math.sqrt(Math.pow(x1 - x2, 2) + Math.pow(y1 - y2, 2));
 	}
-
+	
-
+	
 	public static int randInt(Random rand, int low, int high)
 	{
 		final int range = Math.abs(high - low) + 1;
 		return low + rand.nextInt(range);
 	}
-
+	
-
+	
 	public static int randInt(int low, int high)
 	{
 		return randInt(rand, low, high);
 	}
-
+	
-
+	
 	/**
 	 * Get ordinal version of numbers (1 = 1st, 5 = 5th etc.)
 	 *
@@ -364,8 +364,8 @@ public final class Calc {
 		}
 		return number + "th";
 	}
-
+	
-
+	
 	/**
 	 * Format number with thousands separated.
 	 *
@@ -378,18 +378,18 @@ public final class Calc {
 		final String num = String.valueOf(number);
 		final String dot = String.valueOf(thousandSep);
 		String out = "";
-
+		
 		int cnt = 1;
 		for (int i = num.length() - 1; i >= 0; i--) {
 			out = num.charAt(i) + out;
 			if (cnt % 3 == 0 && i > 0) out = dot + out;
 			cnt++;
 		}
-
+		
 		return out;
 	}
-
+	
-
+	
 	public static int countBits(byte b)
 	{
 		int c = 0;

src/mightypork/utils/math/Polar.java

@@ -10,16 +10,16 @@ import mightypork.utils.math.constraints.vect.Vect;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Polar {
-
+	
 	/** angle in radians */
 	private double angle = 0;
-
+	
 	/** distance in units */
 	private double radius = 0;
-
+	
 	private Vect coord = null;
-
+	
-
+	
 	/**
 	 * Create a polar
 	 *
@@ -30,8 +30,8 @@ public class Polar {
 	{
 		this(angle, false, distance);
 	}
-
+	
-
+	
 	/**
 	 * Create a polar
 	 *
@@ -44,8 +44,8 @@ public class Polar {
 		this.radius = distance;
 		this.angle = deg ? Math.toRadians(angle) : angle;
 	}
-
+	
-
+	
 	/**
 	 * @return angle in RAD
 	 */
@@ -53,8 +53,8 @@ public class Polar {
 	{
 		return angle;
 	}
-
+	
-
+	
 	/**
 	 * @return angle in DEG
 	 */
@@ -62,8 +62,8 @@ public class Polar {
 	{
 		return Math.toDegrees(angle);
 	}
-
+	
-
+	
 	/**
 	 * @param angle angle in RAD
 	 */
@@ -71,8 +71,8 @@ public class Polar {
 	{
 		this.angle = angle;
 	}
-
+	
-
+	
 	/**
 	 * @param angle angle in DEG
 	 */
@@ -80,8 +80,8 @@ public class Polar {
 	{
 		this.angle = Math.toRadians(angle);
 	}
-
+	
-
+	
 	/**
 	 * @return radius
 	 */
@@ -89,8 +89,8 @@ public class Polar {
 	{
 		return radius;
 	}
-
+	
-
+	
 	/**
 	 * @param r radius
 	 */
@@ -98,8 +98,8 @@ public class Polar {
 	{
 		this.radius = r;
 	}
-
+	
-
+	
 	/**
 	 * Make polar from coord
 	 *
@@ -109,10 +109,10 @@ public class Polar {
 	public static Polar fromCoord(Vect coord)
 	{
 		return Polar.fromCoord(coord.x(), coord.y());
-
+		
 	}
-
+	
-
+	
 	/**
 	 * Make polar from coords
 	 *
@@ -124,11 +124,11 @@ public class Polar {
 	{
 		final double a = Math.atan2(y, x);
 		final double r = Math.sqrt(x * x + y * y);
-
+		
 		return new Polar(a, r);
 	}
-
+	
-
+	
 	/**
 	 * Get coord from polar
 	 *
@@ -138,32 +138,32 @@ public class Polar {
 	{
 		// lazy init
 		if (coord == null) coord = new Vect() {
-
+			
 			@Override
 			public double x()
 			{
 				return radius * Math.cos(angle);
 			}
-
+			
-
+			
 			@Override
 			public double y()
 			{
 				return radius * Math.sin(angle);
 			}
 		};
-
+		
 		return coord;
 	}
-
+	
-
+	
 	@Override
 	public String toString()
 	{
 		return "Polar(" + angle + "rad, " + radius + ")";
 	}
-
+	
-
+	
 	@Override
 	public int hashCode()
 	{
@@ -176,8 +176,8 @@ public class Polar {
 		result = prime * result + (int) (temp ^ (temp >>> 32));
 		return result;
 	}
-
+	
-
+	
 	@Override
 	public boolean equals(Object obj)
 	{

src/mightypork/utils/math/Range.java

@@ -10,24 +10,24 @@ import java.util.Random;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Range {
-
+	
 	public static Range make(double low, double high)
 	{
 		return new Range(low, high);
 	}
-
+	
 	private double min = 0;
 	private double max = 1;
-
+	
-
+	
 	/**
 	 * Implicit range constructor 0-1
 	 */
 	public Range()
 	{
 	}
-
+	
-
+	
 	/**
 	 * Create new range
 	 *
@@ -40,8 +40,8 @@ public class Range {
 		this.max = max;
 		norm();
 	}
-
+	
-
+	
 	/**
 	 * Create new range
 	 *
@@ -52,39 +52,39 @@ public class Range {
 		this.min = minmax;
 		this.max = minmax;
 	}
-
+	
-
+	
 	public static Range fromString(String string)
 	{
 		try {
 			String s = string.trim();
-
+			
 			// drop whitespace
 			s = s.replaceAll("\\s", "");
-
+			
 			// drop brackets
 			s = s.replaceAll("[\\(\\[\\{\\)\\]\\}]", "");
-
+			
 			// norm separators
 			s = s.replaceAll("[:;]", "|").replace("..", "|");
-
+			
 			// norm floating point
 			s = s.replaceAll("[,]", ".");
-
+			
 			// dash to pipe, if not a minus sign
 			s = s.replaceAll("([0-9])\\s?[\\-]", "$1|");
-
+			
 			final String[] parts = s.split("[|]");
-
+			
 			if (parts.length >= 1) {
-
+				
 				final double low = Double.parseDouble(parts[0].trim());
-
+				
 				if (parts.length == 2) {
 					final double high = Double.parseDouble(parts[1].trim());
 					return Range.make(low, high);
 				}
-
+				
 				return Range.make(low, low);
 			}
 		} catch (final RuntimeException e) {
@@ -92,15 +92,15 @@ public class Range {
 		}
 		return null;
 	}
-
+	
-
+	
 	@Override
 	public String toString()
 	{
 		return String.format("(%f : %f)", getMin(), getMax());
 	}
-
+	
-
+	
 	/**
 	 * Make sure min is <= max
 	 */
@@ -112,8 +112,8 @@ public class Range {
 			max = t;
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get random integer from range
 	 *
@@ -123,8 +123,8 @@ public class Range {
 	{
 		return randInt(Calc.rand);
 	}
-
+	
-
+	
 	/**
 	 * Get random double from this range
 	 *
@@ -134,8 +134,8 @@ public class Range {
 	{
 		return randDouble(Calc.rand);
 	}
-
+	
-
+	
 	/**
 	 * Get random integer from range
 	 *
@@ -146,8 +146,8 @@ public class Range {
 	{
 		return Calc.randInt(rand, (int) Math.round(min), (int) Math.round(min));
 	}
-
+	
-
+	
 	/**
 	 * Get random double from this range
 	 *
@@ -158,8 +158,8 @@ public class Range {
 	{
 		return min + rand.nextDouble() * (max - min);
 	}
-
+	
-
+	
 	/**
 	 * Get min
 	 *
@@ -169,8 +169,8 @@ public class Range {
 	{
 		return min;
 	}
-
+	
-
+	
 	/**
 	 * Get max
 	 *
@@ -180,8 +180,8 @@ public class Range {
 	{
 		return max;
 	}
-
+	
-
+	
 	/**
 	 * Set min
 	 *
@@ -192,8 +192,8 @@ public class Range {
 		this.min = min;
 		norm();
 	}
-
+	
-
+	
 	/**
 	 * Set max
 	 *
@@ -204,8 +204,8 @@ public class Range {
 		this.max = max;
 		norm();
 	}
-
+	
-
+	
 	/**
 	 * Get identical copy
 	 *
@@ -215,8 +215,8 @@ public class Range {
 	{
 		return new Range(min, max);
 	}
-
+	
-
+	
 	/**
 	 * Set to value of other range
 	 *
@@ -229,8 +229,8 @@ public class Range {
 		max = other.max;
 		norm();
 	}
-
+	
-
+	
 	/**
 	 * Set to min-max values
 	 *

src/mightypork/utils/math/algo/Coord.java

@@ -13,59 +13,59 @@ import mightypork.utils.math.constraints.vect.VectConst;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Coord {
-
+	
 	public int x;
 	public int y;
-
+	
-
+	
 	@FactoryMethod
 	public static Coord make(int x, int y)
 	{
 		return new Coord(x, y);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static Coord make(Coord other)
 	{
 		return new Coord(other);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static Coord zero()
 	{
 		return make(0, 0);
 	}
-
+	
-
+	
 	public Coord()
 	{
 		// for ion
 	}
-
+	
-
+	
 	public Coord(int x, int y)
 	{
 		super();
 		this.x = x;
 		this.y = y;
 	}
-
+	
-
+	
 	public Coord(Coord other)
 	{
 		this.x = other.x;
 		this.y = other.y;
 	}
-
+	
-
+	
 	public Coord add(int addX, int addY)
 	{
 		return new Coord(x + addX, y + addY);
 	}
-
+	
-
+	
 	/**
 	 * Add other coord in a copy
 	 *
@@ -76,33 +76,33 @@ public class Coord {
 	{
 		return add(added.x, added.y);
 	}
-
+	
-
+	
 	public Coord add(Move added)
 	{
 		return add(added.x(), added.y());
 	}
-
+	
-
+	
 	public Coord copy()
 	{
 		return make(this);
 	}
-
+	
-
+	
 	public void setTo(int x, int y)
 	{
 		this.x = x;
 		this.y = y;
 	}
-
+	
-
+	
 	public void setTo(Coord pos)
 	{
 		setTo(pos.x, pos.y);
 	}
-
+	
-
+	
 	/**
 	 * Check if coord is in a range (inclusive)
 	 *
@@ -116,27 +116,27 @@ public class Coord {
 	{
 		return !(x < x0 || x > x1 || y < y0 || y > y1);
 	}
-
+	
-
+	
 	public double dist(Coord coord)
 	{
 		return Calc.dist(x, y, coord.x, coord.y);
 	}
-
+	
-
+	
 	public VectConst toVect()
 	{
 		return Vect.make(x, y);
 	}
-
+	
-
+	
 	@Override
 	public String toString()
 	{
 		return "Coord(" + x + "," + y + ")";
 	}
-
+	
-
+	
 	@Override
 	public int hashCode()
 	{
@@ -146,8 +146,8 @@ public class Coord {
 		result = prime * result + y;
 		return result;
 	}
-
+	
-
+	
 	@Override
 	public boolean equals(Object obj)
 	{
@@ -159,8 +159,8 @@ public class Coord {
 		if (y != other.y) return false;
 		return true;
 	}
-
+	
-
+	
 	public static Coord fromVect(Vect vect)
 	{
 		return make((int) Math.floor(vect.x()), (int) Math.floor(vect.y()));

src/mightypork/utils/math/algo/Move.java

@@ -8,57 +8,57 @@ package mightypork.utils.math.algo;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Move {
-
+	
 	public static final Move NORTH = new Move(0, -1);
 	public static final Move SOUTH = new Move(0, 1);
 	public static final Move EAST = new Move(1, 0);
 	public static final Move WEST = new Move(-1, 0);
 	public static final Move NONE = new Move(0, 0);
-
+	
-
+	
 	public static Move make(int x, int y)
 	{
 		x = x < 0 ? -1 : x > 0 ? 1 : 0;
 		y = y < 0 ? -1 : y > 0 ? 1 : 0;
-
+		
 		if (y == -1 && x == 0) return NORTH;
 		if (y == 1 && x == 0) return SOUTH;
 		if (x == -1 && y == 0) return WEST;
 		if (x == 1 && y == 0) return EAST;
 		if (x == 0 && y == 0) return NONE;
-
+		
 		return new Move(x, y);
 	}
-
+	
 	private final byte x;
 	private final byte y;
-
+	
-
+	
 	public Move(int x, int y)
 	{
 		this.x = (byte) (x < 0 ? -1 : x > 0 ? 1 : 0);
 		this.y = (byte) (y < 0 ? -1 : y > 0 ? 1 : 0);
 	}
-
+	
-
+	
 	public int x()
 	{
 		return x;
 	}
-
+	
-
+	
 	public int y()
 	{
 		return y;
 	}
-
+	
-
+	
 	public Coord toCoord()
 	{
 		return Coord.make(x, y);
 	}
-
+	
-
+	
 	@Override
 	public String toString()
 	{

src/mightypork/utils/math/algo/Moves.java

@@ -15,7 +15,7 @@ import mightypork.utils.math.Calc;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Moves {
-
+	
 	public static final byte BIT_NW = (byte) 0b10000000;
 	public static final byte BIT_N = (byte) 0b01000000;
 	public static final byte BIT_NE = (byte) 0b00100000;
@@ -24,15 +24,15 @@ public class Moves {
 	public static final byte BIT_S = (byte) 0b00000100;
 	public static final byte BIT_SW = (byte) 0b00000010;
 	public static final byte BIT_W = (byte) 0b00000001;
-
+	
 	public static final byte BITS_CARDINAL = BIT_N | BIT_S | BIT_E | BIT_W;
 	public static final byte BITS_DIAGONAL = BIT_NE | BIT_NW | BIT_SE | BIT_SW;
-
+	
 	public static final byte BITS_NW_CORNER = BIT_W | BIT_NW | BIT_N;
 	public static final byte BITS_NE_CORNER = BIT_E | BIT_NE | BIT_N;
 	public static final byte BITS_SW_CORNER = BIT_W | BIT_SW | BIT_S;
 	public static final byte BITS_SE_CORNER = BIT_E | BIT_SE | BIT_S;
-
+	
 	public static final Move NW = Move.make(-1, -1);
 	public static final Move N = Move.make(0, -1);
 	public static final Move NE = Move.make(1, -1);
@@ -41,7 +41,7 @@ public class Moves {
 	public static final Move S = Move.make(0, 1);
 	public static final Move SW = Move.make(-1, 1);
 	public static final Move W = Move.make(-1, 0);
-
+	
 	//@formatter:off
 	/** All sides, in the order of bits. */
 	public final static List<Move> ALL_SIDES = Collections.unmodifiableList(Arrays.asList(
@@ -54,16 +54,16 @@ public class Moves {
 			SW,
 			W
 			));
-
+	
 	public final static List<Move> CARDINAL_SIDES = Collections.unmodifiableList(Arrays.asList(
 			N,
 			E,
 			S,
 			W
 			));
-
+	
 	//@formatter:on
-
+	
 	/**
 	 * Get element from all sides
 	 *
@@ -74,20 +74,20 @@ public class Moves {
 	{
 		return ALL_SIDES.get(i);
 	}
-
+	
-
+	
 	public static byte getBit(int i)
 	{
 		return (byte) (1 << (7 - i));
 	}
-
+	
-
+	
 	public static Move randomCardinal()
 	{
 		return Calc.pick(CARDINAL_SIDES);
 	}
-
+	
-
+	
 	public static Move randomCardinal(Random rand)
 	{
 		return Calc.pick(rand, CARDINAL_SIDES);

src/mightypork/utils/math/algo/floodfill/FloodFill.java

@@ -11,30 +11,30 @@ import mightypork.utils.math.algo.Move;
 
 
 public abstract class FloodFill {
-
+	
 	public abstract boolean canEnter(Coord pos);
-
+	
-
+	
 	public abstract boolean canSpreadFrom(Coord pos);
-
+	
-
+	
 	public abstract List<Move> getSpreadSides();
-
+	
-
+	
 	/**
 	 * Get the max distance filled form start point. Use -1 for unlimited range.
 	 *
 	 * @return max distance
 	 */
 	public abstract double getMaxDistance();
-
+	
-
+	
 	/**
 	 * @return true if start should be spread no matter what
 	 */
 	public abstract boolean forceSpreadStart();
-
+	
-
+	
 	/**
 	 * Fill an area
 	 *
@@ -45,32 +45,32 @@ public abstract class FloodFill {
 	public final boolean fill(Coord start, Collection<Coord> foundNodes)
 	{
 		final Queue<Coord> activeNodes = new LinkedList<>();
-
+		
 		final double maxDist = getMaxDistance();
-
+		
 		activeNodes.add(start);
-
+		
 		boolean forceSpreadNext = forceSpreadStart();
-
+		
 		boolean limitReached = false;
-
+		
 		while (!activeNodes.isEmpty()) {
 			final Coord current = activeNodes.poll();
 			foundNodes.add(current);
-
+			
 			if (!canSpreadFrom(current) && !forceSpreadNext) continue;
-
+			
 			forceSpreadNext = false;
-
+			
 			for (final Move spr : getSpreadSides()) {
 				final Coord next = current.add(spr);
 				if (activeNodes.contains(next) || foundNodes.contains(next)) continue;
-
+				
 				if (next.dist(start) > maxDist) {
 					limitReached = true;
 					continue;
 				}
-
+				
 				if (canEnter(next)) {
 					activeNodes.add(next);
 				} else {
@@ -78,7 +78,7 @@ public abstract class FloodFill {
 				}
 			}
 		}
-
+		
 		return !limitReached;
 	}
 }

src/mightypork/utils/math/algo/pathfinding/Heuristic.java

@@ -5,7 +5,7 @@ import mightypork.utils.math.algo.Coord;
 
 
 public abstract class Heuristic {
-
+	
 	/**
 	 * Get tile cost (estimate of how many tiles remain to the target)
 	 *

src/mightypork/utils/math/algo/pathfinding/PathFinder.java

@@ -19,30 +19,30 @@ import mightypork.utils.math.algo.pathfinding.heuristics.ManhattanHeuristic;
  * @author Ondřej Hruška (MightyPork)
  */
 public abstract class PathFinder {
-
+	
 	private static final FComparator F_COMPARATOR = new FComparator();
-
+	
 	public static final Heuristic CORNER_HEURISTIC = new ManhattanHeuristic();
 	public static final Heuristic DIAGONAL_HEURISTIC = new DiagonalHeuristic();
-
+	
 	private boolean ignoreStart;
 	private boolean ignoreEnd;
-
+	
-
+	
 	public List<Move> findPathRelative(Coord start, Coord end)
 	{
 		return findPathRelative(start, end, ignoreStart, ignoreEnd);
 	}
-
+	
-
+	
 	public List<Move> findPathRelative(Coord start, Coord end, boolean ignoreStart, boolean ignoreEnd)
 	{
 		final List<Coord> path = findPath(start, end, ignoreStart, ignoreEnd);
-
+		
 		if (path == null) return null;
-
+		
 		final List<Move> out = new ArrayList<>();
-
+		
 		final Coord current = start.copy();
 		for (final Coord c : path) {
 			if (c.equals(current)) continue;
@@ -50,24 +50,24 @@ public abstract class PathFinder {
 			current.x = c.x;
 			current.y = c.y;
 		}
-
+		
 		return out;
 	}
-
+	
-
+	
 	public List<Coord> findPath(Coord start, Coord end)
 	{
 		return findPath(start, end, ignoreStart, ignoreEnd);
 	}
-
+	
-
+	
 	public List<Coord> findPath(Coord start, Coord end, boolean ignoreStart, boolean ignoreEnd)
 	{
 		final LinkedList<Node> open = new LinkedList<>();
 		final LinkedList<Node> closed = new LinkedList<>();
-
+		
 		final Heuristic heuristic = getHeuristic();
-
+		
 		// add first node
 		{
 			final Node n = new Node(start);
@@ -75,37 +75,37 @@ public abstract class PathFinder {
 			n.g_cost = 0;
 			open.add(n);
 		}
-
+		
 		Node current = null;
-
+		
 		while (true) {
 			current = open.poll();
-
+			
 			if (current == null) {
 				break;
 			}
-
+			
 			closed.add(current);
-
+			
 			if (current.pos.equals(end)) {
 				break;
 			}
-
+			
 			for (final Move go : getWalkSides()) {
-
+				
 				final Coord c = current.pos.add(go);
 				if (!isAccessible(c) && !(c.equals(end) && ignoreEnd) && !(c.equals(start) && ignoreStart)) continue;
 				final Node a = new Node(c);
 				a.g_cost = current.g_cost + getCost(c, a.pos);
 				a.h_cost = (int) (heuristic.getCost(a.pos, end) * getMinCost());
 				a.parent = current;
-
+				
 				if (!closed.contains(a)) {
-
+					
 					if (open.contains(a)) {
-
+						
 						boolean needSort = false;
-
+						
 						// find where it is
 						for (final Node n : open) {
 							if (n.pos.equals(a.pos)) { // found it
@@ -117,52 +117,52 @@ public abstract class PathFinder {
 								break;
 							}
 						}
-
+						
 						if (needSort) Collections.sort(open, F_COMPARATOR);
-
+						
 					} else {
 						open.add(a);
 					}
 				}
 			}
-
+			
 		}
-
+		
 		if (current == null) {
 			return null; // no path found
 		}
-
+		
 		final LinkedList<Coord> path = new LinkedList<>();
-
+		
 		// extract path elements
 		while (current != null) {
 			path.addFirst(current.pos);
 			current = current.parent;
 		}
-
+		
 		return path;
 	}
-
+	
 	private static class Node {
-
+		
 		Coord pos;
 		int g_cost; // to get there
 		int h_cost; // to target
 		Node parent;
-
+		
-
+		
 		public Node(Coord pos)
 		{
 			this.pos = pos;
 		}
-
+		
-
+		
 		int fCost()
 		{
 			return g_cost + h_cost;
 		}
-
+		
-
+		
 		@Override
 		public int hashCode()
 		{
@@ -171,8 +171,8 @@ public abstract class PathFinder {
 			result = prime * result + ((pos == null) ? 0 : pos.hashCode());
 			return result;
 		}
-
+		
-
+		
 		@Override
 		public boolean equals(Object obj)
 		{
@@ -185,53 +185,53 @@ public abstract class PathFinder {
 			} else if (!pos.equals(other.pos)) return false;
 			return true;
 		}
-
+		
-
+		
 		@Override
 		public String toString()
 		{
 			return "N " + pos + ", G =" + g_cost + ", H = " + h_cost;
 		}
 	}
-
+	
 	private static class FComparator implements Comparator<Node> {
-
+		
 		@Override
 		public int compare(Node n1, Node n2)
 		{
 			return n1.fCost() - n2.fCost();
 		}
 	}
-
+	
-
+	
 	public void setIgnoreEnd(boolean ignoreEnd)
 	{
 		this.ignoreEnd = ignoreEnd;
 	}
-
+	
-
+	
 	public void setIgnoreStart(boolean ignoreStart)
 	{
 		this.ignoreStart = ignoreStart;
 	}
-
+	
-
+	
 	/**
 	 * @return used heuristic
 	 */
 	protected abstract Heuristic getHeuristic();
-
+	
-
+	
 	protected abstract List<Move> getWalkSides();
-
+	
-
+	
 	/**
 	 * @param pos tile pos
 	 * @return true if the tile is walkable
 	 */
 	public abstract boolean isAccessible(Coord pos);
-
+	
-
+	
 	/**
 	 * Cost of walking onto a tile. It's useful to use ie. 10 for basic step.
 	 *
@@ -240,8 +240,8 @@ public abstract class PathFinder {
 	 * @return cost
 	 */
 	protected abstract int getCost(Coord from, Coord to);
-
+	
-
+	
 	/**
 	 * @return lowest cost. Used to multiply heuristics.
 	 */

src/mightypork/utils/math/algo/pathfinding/PathFinderProxy.java

@@ -14,48 +14,48 @@ import mightypork.utils.math.algo.Move;
  * @author Ondřej Hruška (MightyPork)
  */
 public class PathFinderProxy extends PathFinder {
-
+	
 	private final PathFinder source;
-
+	
-
+	
 	public PathFinderProxy(PathFinder other)
 	{
 		this.source = other;
 	}
-
+	
-
+	
 	@Override
 	public boolean isAccessible(Coord pos)
 	{
 		return source.isAccessible(pos);
 	}
-
+	
-
+	
 	@Override
 	public int getCost(Coord from, Coord to)
 	{
 		return source.getCost(from, to);
 	}
-
+	
-
+	
 	@Override
 	public int getMinCost()
 	{
 		return source.getMinCost();
 	}
-
+	
-
+	
 	@Override
 	protected Heuristic getHeuristic()
 	{
 		return source.getHeuristic();
 	}
-
+	
-
+	
 	@Override
 	protected List<Move> getWalkSides()
 	{
 		return source.getWalkSides();
 	}
-
+	
 }

src/mightypork/utils/math/algo/pathfinding/heuristics/DiagonalHeuristic.java

@@ -6,7 +6,7 @@ import mightypork.utils.math.algo.pathfinding.Heuristic;
 
 
 public class DiagonalHeuristic extends Heuristic {
-
+	
 	@Override
 	public double getCost(Coord pos, Coord target)
 	{

src/mightypork/utils/math/algo/pathfinding/heuristics/ManhattanHeuristic.java

@@ -6,7 +6,7 @@ import mightypork.utils.math.algo.pathfinding.Heuristic;
 
 
 public class ManhattanHeuristic extends Heuristic {
-
+	
 	@Override
 	public double getCost(Coord pos, Coord target)
 	{

src/mightypork/utils/math/angles/Angles.java

@@ -7,7 +7,7 @@ package mightypork.utils.math.angles;
  * @author Ondřej Hruška (MightyPork)
  */
 class Angles {
-
+	
 	/**
 	 * Delta of two angles (positive or negative - positive is CCW)
 	 *
@@ -22,11 +22,11 @@ class Angles {
 			alpha = norm(alpha + fullAngle / 2D, fullAngle);
 			beta = norm(beta + fullAngle / 2D, fullAngle);
 		}
-
+		
 		return beta - alpha;
 	}
-
+	
-
+	
 	/**
 	 * Difference of two angles (same as delta, but always positive)
 	 *
@@ -39,8 +39,8 @@ class Angles {
 	{
 		return Math.abs(delta(alpha, beta, fullAngle));
 	}
-
+	
-
+	
 	/**
 	 * Normalize angle to 0-full range
 	 *

src/mightypork/utils/math/angles/Deg.java

@@ -7,7 +7,7 @@ package mightypork.utils.math.angles;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Deg {
-
+	
 	/** 180° in degrees */
 	public static final double a180 = 180;
 	/** 270° in degrees */
@@ -18,8 +18,8 @@ public class Deg {
 	public static final double a45 = 45;
 	/** 90° in degrees */
 	public static final double a90 = 90;
-
+	
-
+	
 	/**
 	 * Subtract two angles alpha - beta
 	 *
@@ -31,8 +31,8 @@ public class Deg {
 	{
 		return Angles.delta(alpha, beta, a360);
 	}
-
+	
-
+	
 	/**
 	 * Difference of two angles (absolute value of delta)
 	 *
@@ -44,8 +44,8 @@ public class Deg {
 	{
 		return Angles.diff(alpha, beta, a360);
 	}
-
+	
-
+	
 	/**
 	 * Cosinus in degrees
 	 *
@@ -56,8 +56,8 @@ public class Deg {
 	{
 		return Math.cos(toRad(deg));
 	}
-
+	
-
+	
 	/**
 	 * Sinus in degrees
 	 *
@@ -68,8 +68,8 @@ public class Deg {
 	{
 		return Math.sin(toRad(deg));
 	}
-
+	
-
+	
 	/**
 	 * Tangents in degrees
 	 *
@@ -80,8 +80,8 @@ public class Deg {
 	{
 		return Math.tan(toRad(deg));
 	}
-
+	
-
+	
 	/**
 	 * Angle normalized to 0-360 range
 	 *
@@ -92,8 +92,8 @@ public class Deg {
 	{
 		return Angles.norm(angle, a360);
 	}
-
+	
-
+	
 	/**
 	 * Convert to radians
 	 *
@@ -104,8 +104,8 @@ public class Deg {
 	{
 		return Math.toRadians(deg);
 	}
-
+	
-
+	
 	/**
 	 * Round angle to 0,45,90,135...
 	 *
@@ -123,8 +123,8 @@ public class Deg {
 		if (a == 360) a = 0;
 		return (int) Math.round(a);
 	}
-
+	
-
+	
 	/**
 	 * Round angle to 0,15,30,45,60,75,90...
 	 *
@@ -135,8 +135,8 @@ public class Deg {
 	{
 		return roundToIncrement(deg, 15);
 	}
-
+	
-
+	
 	/**
 	 * Round angle to 0,45,90,135...
 	 *
@@ -147,8 +147,8 @@ public class Deg {
 	{
 		return roundToIncrement(deg, 45);
 	}
-
+	
-
+	
 	/**
 	 * Round angle to 0,90,180,270
 	 *

src/mightypork/utils/math/angles/Rad.java

@@ -7,7 +7,7 @@ package mightypork.utils.math.angles;
  * @author Ondřej Hruška (MightyPork)
  */
 public class Rad {
-
+	
 	/** 180° in radians */
 	public static final double a180 = Math.PI;
 	/** 270° in radians */
@@ -18,8 +18,8 @@ public class Rad {
 	public static final double a45 = Math.PI / 4D;
 	/** 90° in radians */
 	public static final double a90 = Math.PI / 2D;
-
+	
-
+	
 	/**
 	 * Subtract two angles alpha - beta
 	 *
@@ -31,8 +31,8 @@ public class Rad {
 	{
 		return Angles.delta(alpha, beta, a360);
 	}
-
+	
-
+	
 	/**
 	 * Difference of two angles (absolute value of delta)
 	 *
@@ -44,8 +44,8 @@ public class Rad {
 	{
 		return Angles.delta(alpha, beta, a360);
 	}
-
+	
-
+	
 	/**
 	 * Cos
 	 *
@@ -56,8 +56,8 @@ public class Rad {
 	{
 		return Math.cos(rad);
 	}
-
+	
-
+	
 	/**
 	 * Sin
 	 *
@@ -68,8 +68,8 @@ public class Rad {
 	{
 		return Math.sin(rad);
 	}
-
+	
-
+	
 	/**
 	 * Tan
 	 *
@@ -80,8 +80,8 @@ public class Rad {
 	{
 		return Math.tan(rad);
 	}
-
+	
-
+	
 	/**
 	 * Angle normalized to 0-2*PI range
 	 *
@@ -92,8 +92,8 @@ public class Rad {
 	{
 		return Angles.norm(angle, a360);
 	}
-
+	
-
+	
 	/**
 	 * Convert to degrees
 	 *

src/mightypork/utils/math/animation/Animator.java

@@ -10,128 +10,128 @@ import mightypork.utils.math.constraints.num.NumBound;
 
 
 public abstract class Animator implements NumBound, Updateable, Pauseable {
-
+	
 	private final NumAnimated numAnim;
 	private final Num animatorValue;
 	private final double highValue;
 	private final double lowValue;
-
+	
-
+	
 	public Animator(double period)
 	{
 		this(0, 1, period, Easing.LINEAR);
 	}
-
+	
-
+	
 	public Animator(double start, double end, double period)
 	{
 		this(start, end, period, Easing.LINEAR);
 	}
-
+	
-
+	
 	public Animator(double period, Easing easing)
 	{
 		this(0, 1, period, easing);
 	}
-
+	
-
+	
 	public Animator(double start, double end, double period, Easing easing)
 	{
 		numAnim = new NumAnimated(0, easing);
 		numAnim.setDefaultDuration(period);
-
+		
 		this.lowValue = start;
 		this.highValue = end;
-
+		
 		this.animatorValue = numAnim.mul(end - start).add(start);
 	}
-
+	
-
+	
 	@Override
 	public void pause()
 	{
 		numAnim.pause();
 	}
-
+	
-
+	
 	public void start()
 	{
 		resume();
 	}
-
+	
-
+	
 	@Override
 	public void resume()
 	{
 		numAnim.resume();
 	}
-
+	
-
+	
 	@Override
 	public boolean isPaused()
 	{
 		return numAnim.isPaused();
 	}
-
+	
-
+	
 	public void reset()
 	{
 		numAnim.reset();
 	}
-
+	
-
+	
 	public void restart()
 	{
 		reset();
 		resume();
 	}
-
+	
-
+	
 	public void setDuration(double secs)
 	{
 		numAnim.setDefaultDuration(secs);
 	}
-
+	
-
+	
 	public double getDuration()
 	{
 		return numAnim.getDefaultDuration();
 	}
-
+	
-
+	
 	@Override
 	public Num getNum()
 	{
 		return animatorValue;
 	}
-
+	
-
+	
 	public double getValue()
 	{
 		return animatorValue.value();
 	}
-
+	
-
+	
 	@Override
 	public void update(double delta)
 	{
 		numAnim.update(delta);
 		if (numAnim.isFinished()) nextCycle(numAnim);
 	}
-
+	
-
+	
 	@Stub
 	protected abstract void nextCycle(NumAnimated anim);
-
+	
-
+	
 	public void setProgress(double value)
 	{
 		final double target = numAnim.getEnd();
 		numAnim.setTo(Calc.clamp(value, lowValue, highValue));
 		numAnim.animate((target < value ? highValue : lowValue), target, numAnim.getDefaultDuration());
 	}
-
+	
-
+	
 	public double getProgress()
 	{
 		return numAnim.value();

src/mightypork/utils/math/animation/AnimatorBounce.java

@@ -7,34 +7,34 @@ package mightypork.utils.math.animation;
  * @author Ondřej Hruška (MightyPork)
  */
 public class AnimatorBounce extends Animator {
-
+	
 	private boolean wasUp = false;
-
+	
-
+	
 	public AnimatorBounce(double start, double end, double period, Easing easing)
 	{
 		super(start, end, period, easing);
 	}
-
+	
-
+	
 	public AnimatorBounce(double start, double end, double period)
 	{
 		super(start, end, period);
 	}
-
+	
-
+	
 	public AnimatorBounce(double period, Easing easing)
 	{
 		super(period, easing);
 	}
-
+	
-
+	
 	public AnimatorBounce(double period)
 	{
 		super(period);
 	}
-
+	
-
+	
 	@Override
 	protected void nextCycle(NumAnimated anim)
 	{
@@ -43,8 +43,8 @@ public class AnimatorBounce extends Animator {
 		} else {
 			anim.fadeIn();
 		}
-
+		
 		wasUp = !wasUp;
 	}
-
+	
 }

src/mightypork/utils/math/animation/AnimatorRewind.java

@@ -8,36 +8,36 @@ package mightypork.utils.math.animation;
  * @author Ondřej Hruška (MightyPork)
  */
 public class AnimatorRewind extends Animator {
-
+	
 	public AnimatorRewind(double start, double end, double period, Easing easing)
 	{
 		super(start, end, period, easing);
 	}
-
+	
-
+	
 	public AnimatorRewind(double start, double end, double period)
 	{
 		super(start, end, period);
 	}
-
+	
-
+	
 	public AnimatorRewind(double period, Easing easing)
 	{
 		super(period, easing);
 	}
-
+	
-
+	
 	public AnimatorRewind(double period)
 	{
 		super(period);
 	}
-
+	
-
+	
 	@Override
 	protected void nextCycle(NumAnimated anim)
 	{
 		anim.reset();
 		anim.fadeIn();
 	}
-
+	
 }

src/mightypork/utils/math/animation/Easing.java

@@ -7,7 +7,7 @@ package mightypork.utils.math.animation;
  * @author Ondřej Hruška (MightyPork)
  */
 public abstract class Easing {
-
+	
 	/**
 	 * Get value at time t.
 	 *
@@ -15,8 +15,8 @@ public abstract class Easing {
 	 * @return value at given t (0..1, can exceed if needed)
 	 */
 	public abstract double get(double t);
-
+	
-
+	
 	/**
 	 * Reverse an easing (factory method)
 	 *
@@ -27,8 +27,8 @@ public abstract class Easing {
 	{
 		return new Reverse(original);
 	}
-
+	
-
+	
 	/**
 	 * Combine two easings (factory method)
 	 *
@@ -40,8 +40,8 @@ public abstract class Easing {
 	{
 		return new Composite(in, out);
 	}
-
+	
-
+	
 	/**
 	 * Create "bilinear" easing - compose of straight and reverse. (factory
 	 * method)
@@ -53,17 +53,17 @@ public abstract class Easing {
 	{
 		return combine(in, reverse(in));
 	}
-
+	
 	/**
 	 * Reverse EasingFunction
 	 *
 	 * @author Ondřej Hruška (MightyPork)
 	 */
 	private static class Reverse extends Easing {
-
+		
 		private final Easing ea;
-
+		
-
+		
 		/**
 		 * @param in Easing to reverse
 		 */
@@ -71,26 +71,26 @@ public abstract class Easing {
 		{
 			this.ea = in;
 		}
-
+		
-
+		
 		@Override
 		public double get(double t)
 		{
 			return 1 - ea.get(1 - t);
 		}
 	}
-
+	
 	/**
 	 * Composite EasingFunction (0-0.5 EasingFunction A, 0.5-1 EasingFunction B)
 	 *
 	 * @author Ondřej Hruška (MightyPork)
 	 */
 	private static class Composite extends Easing {
-
+		
 		private final Easing in;
 		private final Easing out;
-
+		
-
+		
 		/**
 		 * Create a composite EasingFunction
 		 *
@@ -102,8 +102,8 @@ public abstract class Easing {
 			this.in = in;
 			this.out = out;
 		}
-
+		
-
+		
 		@Override
 		public double get(double t)
 		{
@@ -111,172 +111,172 @@ public abstract class Easing {
 			return 0.5 + out.get(2 * t - 1) * 0.5;
 		}
 	}
-
+	
 	/** No easing; At t=0.5 goes high. */
 	public static final Easing NONE = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return (t < 0.5 ? 0 : 1);
 		}
 	};
-
+	
 	/** Linear (y=t) easing */
 	public static final Easing LINEAR = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return t;
 		}
 	};
-
+	
 	/** Quadratic (y=t^2) easing in */
 	public static final Easing QUADRATIC_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return t * t;
 		}
 	};
-
+	
 	/** Quadratic (y=t^2) easing out */
 	public static final Easing QUADRATIC_OUT = reverse(QUADRATIC_IN);
-
+	
 	/** Quadratic (y=t^2) easing both */
 	public static final Easing QUADRATIC_BOTH = inOut(QUADRATIC_IN);
-
+	
 	/** Cubic (y=t^3) easing in */
 	public static final Easing CUBIC_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return t * t * t;
 		}
 	};
-
+	
 	/** Cubic (y=t^3) easing out */
 	public static final Easing CUBIC_OUT = reverse(CUBIC_IN);
-
+	
 	/** Cubic (y=t^3) easing both */
 	public static final Easing CUBIC_BOTH = inOut(CUBIC_IN);
-
+	
 	/** Quartic (y=t^4) easing in */
 	public static final Easing QUARTIC_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return t * t * t * t;
 		}
 	};
-
+	
 	/** Quartic (y=t^4) easing out */
 	public static final Easing QUARTIC_OUT = reverse(QUADRATIC_IN);
-
+	
 	/** Quartic (y=t^4) easing both */
 	public static final Easing QUARTIC_BOTH = inOut(QUADRATIC_IN);
-
+	
 	/** Quintic (y=t^5) easing in */
 	public static final Easing QUINTIC_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return t * t * t * t * t;
 		}
 	};
-
+	
 	/** Quintic (y=t^5) easing out */
 	public static final Easing QUINTIC_OUT = reverse(QUINTIC_IN);
-
+	
 	/** Quintic (y=t^5) easing both */
 	public static final Easing QUINTIC_BOTH = inOut(QUINTIC_IN);
-
+	
 	/** Sine easing in */
 	public static final Easing SINE_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return 1 - Math.cos(t * (Math.PI / 2));
 		}
 	};
-
+	
 	/** Sine easing out */
 	public static final Easing SINE_OUT = reverse(SINE_IN);
-
+	
 	/** Sine easing both */
 	public static final Easing SINE_BOTH = inOut(SINE_IN);
-
+	
 	/** Exponential easing in */
 	public static final Easing EXPO_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return Math.pow(2, 10 * (t - 1));
 		}
 	};
-
+	
 	/** Exponential easing out */
 	public static final Easing EXPO_OUT = reverse(EXPO_IN);
-
+	
 	/** Exponential easing both */
 	public static final Easing EXPO_BOTH = inOut(EXPO_IN);
-
+	
 	/** Circular easing in */
 	public static final Easing CIRC_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			return 1 - Math.sqrt(1 - t * t);
 		}
 	};
-
+	
 	/** Circular easing out */
 	public static final Easing CIRC_OUT = reverse(CIRC_IN);
-
+	
 	/** Circular easing both */
 	public static final Easing CIRC_BOTH = inOut(CIRC_IN);
-
+	
 	/** Bounce easing in */
 	public static final Easing BOUNCE_OUT = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			if (t < (1 / 2.75f)) {
 				return (7.5625f * t * t);
-
+				
 			} else if (t < (2 / 2.75f)) {
 				t -= (1.5f / 2.75f);
 				return (7.5625f * t * t + 0.75f);
-
+				
 			} else if (t < (2.5 / 2.75)) {
 				t -= (2.25f / 2.75f);
 				return (7.5625f * t * t + 0.9375f);
-
+				
 			} else {
 				t -= (2.625f / 2.75f);
 				return (7.5625f * t * t + 0.984375f);
 			}
 		}
 	};
-
+	
 	/** Bounce easing out */
 	public static final Easing BOUNCE_IN = reverse(BOUNCE_OUT);
-
+	
 	/** Bounce easing both */
 	public static final Easing BOUNCE_BOTH = inOut(BOUNCE_IN);
-
+	
 	/** Back easing in */
 	public static final Easing BACK_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
@@ -284,31 +284,31 @@ public abstract class Easing {
 			return t * t * ((s + 1) * t - s);
 		}
 	};
-
+	
 	/** Back easing out */
 	public static final Easing BACK_OUT = reverse(BACK_IN);
-
+	
 	/** Back easing both */
 	public static final Easing BACK_BOTH = inOut(BACK_IN);
-
+	
 	/** Elastic easing in */
 	public static final Easing ELASTIC_IN = new Easing() {
-
+		
 		@Override
 		public double get(double t)
 		{
 			if (t == 0) return 0;
 			if (t == 1) return 1;
-
+			
 			final double p = .3f;
 			final double s = p / 4;
 			return -(Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p));
 		}
 	};
-
+	
 	/** Elastic easing out */
 	public static final Easing ELASTIC_OUT = reverse(ELASTIC_IN);
-
+	
 	/** Elastic easing both */
 	public static final Easing ELASTIC_BOTH = inOut(ELASTIC_IN);
 }

src/mightypork/utils/math/animation/NumAnimated.java

@@ -15,31 +15,31 @@ import mightypork.utils.math.constraints.num.var.NumMutable;
  * @author Ondřej Hruška (MightyPork)
  */
 public class NumAnimated extends NumMutable implements Updateable, Pauseable {
-
+	
 	/** target double */
 	protected double to = 0;
-
+	
 	/** last tick double */
 	protected double from = 0;
-
+	
 	/** how long the transition should last */
 	protected double duration = 0;
-
+	
 	/** current anim time */
 	protected double elapsedTime = 0;
-
+	
 	/** True if this animator is paused */
 	protected boolean paused = false;
-
+	
 	/** Easing fn */
 	protected Easing easingCurrent = Easing.LINEAR;
 	protected Easing easingOut = Easing.LINEAR;
 	protected Easing easingIn = Easing.LINEAR;
-
+	
 	/** Default duration (seconds) */
 	private double defaultDuration = 1;
-
+	
-
+	
 	/**
 	 * With linear easing
 	 *
@@ -49,8 +49,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		setTo(value);
 	}
-
+	
-
+	
 	/**
 	 * Create animator with easing
 	 *
@@ -62,8 +62,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		this(value);
 		setEasing(easing);
 	}
-
+	
-
+	
 	/**
 	 * Create animator with easing
 	 *
@@ -76,8 +76,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		this(value);
 		setEasing(easingIn, easingOut);
 	}
-
+	
-
+	
 	/**
 	 * Create animator with easing
 	 *
@@ -91,8 +91,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		setEasing(easing);
 		setDefaultDuration(defaultDuration);
 	}
-
+	
-
+	
 	/**
 	 * Create animator with easing
 	 *
@@ -107,8 +107,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		setEasing(easingIn, easingOut);
 		setDefaultDuration(defaultDuration);
 	}
-
+	
-
+	
 	/**
 	 * Create as copy of another
 	 *
@@ -118,8 +118,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		setTo(other);
 	}
-
+	
-
+	
 	/**
 	 * @param easing easing function
 	 */
@@ -127,8 +127,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		this.easingCurrent = this.easingIn = this.easingOut = easing;
 	}
-
+	
-
+	
 	/**
 	 * @param easingIn easing for fade in
 	 * @param easingOut easing for fade out
@@ -139,8 +139,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		this.easingOut = easingOut;
 		this.easingCurrent = easingIn;
 	}
-
+	
-
+	
 	/**
 	 * Get start value
 	 *
@@ -150,8 +150,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		return from;
 	}
-
+	
-
+	
 	/**
 	 * Get end value
 	 *
@@ -161,8 +161,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		return to;
 	}
-
+	
-
+	
 	/**
 	 * @return current animation duration (seconds)
 	 */
@@ -170,8 +170,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		return duration;
 	}
-
+	
-
+	
 	/**
 	 * @return elapsed time in current animation (seconds)
 	 */
@@ -179,8 +179,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		return elapsedTime;
 	}
-
+	
-
+	
 	/**
 	 * @return default animation duration (seconds)
 	 */
@@ -188,8 +188,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		return defaultDuration;
 	}
-
+	
-
+	
 	/**
 	 * @param defaultDuration default animation duration (seconds)
 	 */
@@ -197,8 +197,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		this.defaultDuration = defaultDuration;
 	}
-
+	
-
+	
 	/**
 	 * Get value at delta time
 	 *
@@ -210,8 +210,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		if (duration == 0) return to;
 		return Calc.interpolate(from, to, (elapsedTime / duration), easingCurrent);
 	}
-
+	
-
+	
 	/**
 	 * Get how much of the animation is already finished
 	 *
@@ -222,13 +222,13 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		if (duration == 0) return 1;
 		return elapsedTime / duration;
 	}
-
+	
-
+	
 	@Override
 	public void update(double delta)
 	{
 		if (paused || isFinished()) return;
-
+		
 		elapsedTime = Calc.clamp(elapsedTime + delta, 0, duration);
 		if (isFinished()) {
 			duration = 0;
@@ -236,8 +236,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 			from = to;
 		}
 	}
-
+	
-
+	
 	/**
 	 * Get if animation is finished
 	 *
@@ -247,8 +247,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		return duration == 0 || elapsedTime >= duration;
 	}
-
+	
-
+	
 	/**
 	 * Set to a value (without animation)
 	 *
@@ -261,8 +261,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		elapsedTime = 0;
 		duration = 0;
 	}
-
+	
-
+	
 	/**
 	 * Copy other
 	 *
@@ -280,8 +280,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		this.easingOut = other.easingOut;
 		this.defaultDuration = other.defaultDuration;
 	}
-
+	
-
+	
 	/**
 	 * Animate between two states, start from current value (if it's in between)
 	 *
@@ -292,19 +292,19 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	public void animate(double from, double to, double time)
 	{
 		final double current = value();
-
+		
 		this.from = from;
 		this.to = to;
-
+		
 		final double progress = getProgressFromValue(current);
-
+		
 		this.from = (progress > 0 ? current : from);
-
+		
 		this.duration = time * (1 - progress);
 		this.elapsedTime = 0;
 	}
-
+	
-
+	
 	/**
 	 * Get progress already elapsed based on current value.<br>
 	 * Used to resume animation from current point in fading etc.
@@ -315,19 +315,19 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	protected double getProgressFromValue(double value)
 	{
 		double p = 0;
-
+		
 		if (from == to) return 0;
-
+		
 		if (value >= from && value <= to) { // up
 			p = ((value - from) / (to - from));
 		} else if (value >= to && value <= from) { // down
 			p = ((from - value) / (from - to));
 		}
-
+		
 		return p;
 	}
-
+	
-
+	
 	/**
 	 * Animate to a value from current value
 	 *
@@ -341,8 +341,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		this.duration = duration;
 		this.elapsedTime = 0;
 	}
-
+	
-
+	
 	/**
 	 * Animate 0 to 1
 	 *
@@ -353,8 +353,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		easingCurrent = easingIn;
 		animate(0, 1, time);
 	}
-
+	
-
+	
 	/**
 	 * Animate 1 to 0
 	 *
@@ -365,8 +365,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		easingCurrent = easingOut;
 		animate(1, 0, time);
 	}
-
+	
-
+	
 	/**
 	 * Animate 0 to 1 with default duration
 	 */
@@ -375,8 +375,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		easingCurrent = easingIn;
 		animate(0, 1, defaultDuration);
 	}
-
+	
-
+	
 	/**
 	 * Animate 1 to 0 with default duration
 	 */
@@ -385,8 +385,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		easingCurrent = easingOut;
 		animate(1, 0, defaultDuration);
 	}
-
+	
-
+	
 	/**
 	 * Make a copy
 	 *
@@ -397,15 +397,15 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 	{
 		return new NumAnimated(this);
 	}
-
+	
-
+	
 	@Override
 	public String toString()
 	{
 		return "Animation(" + from + " -> " + to + ", t=" + duration + "s, elapsed=" + elapsedTime + "s)";
 	}
-
+	
-
+	
 	/**
 	 * Set to zero and stop animation
 	 */
@@ -416,8 +416,8 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		duration = 0;
 		paused = false;
 	}
-
+	
-
+	
 	/**
 	 * Stop animation, keep current value
 	 */
@@ -427,29 +427,29 @@ public class NumAnimated extends NumMutable implements Updateable, Pauseable {
 		elapsedTime = 0;
 		duration = 0;
 	}
-
+	
-
+	
 	@Override
 	public void pause()
 	{
 		paused = true;
 	}
-
+	
-
+	
 	@Override
 	public void resume()
 	{
 		paused = false;
 	}
-
+	
-
+	
 	@Override
 	public boolean isPaused()
 	{
 		return paused;
 	}
-
+	
-
+	
 	public boolean isInProgress()
 	{
 		return !isFinished() && !isPaused();

src/mightypork/utils/math/animation/NumAnimatedDeg.java

@@ -11,33 +11,33 @@ import mightypork.utils.math.angles.Deg;
  * @author Ondřej Hruška (MightyPork)
  */
 public class NumAnimatedDeg extends NumAnimated {
-
+	
 	public NumAnimatedDeg(NumAnimated other)
 	{
 		super(other);
 	}
-
+	
-
+	
 	public NumAnimatedDeg(double value)
 	{
 		super(value);
 	}
-
+	
-
+	
 	public NumAnimatedDeg(double value, Easing easing)
 	{
 		super(value, easing);
 	}
-
+	
-
+	
 	@Override
 	public double value()
 	{
 		if (duration == 0) return Deg.norm(to);
 		return Calc.interpolateDeg(from, to, (elapsedTime / duration), easingCurrent);
 	}
-
+	
-
+	
 	@Override
 	protected double getProgressFromValue(double value)
 	{
@@ -46,7 +46,7 @@ public class NumAnimatedDeg extends NumAnimated {
 			final double partial = Deg.diff(from, value);
 			return partial / whole;
 		}
-
+		
 		return 0;
 	}
 }

src/mightypork/utils/math/animation/NumAnimatedRad.java

@@ -11,33 +11,33 @@ import mightypork.utils.math.angles.Rad;
  * @author Ondřej Hruška (MightyPork)
  */
 public class NumAnimatedRad extends NumAnimated {
-
+	
 	public NumAnimatedRad(NumAnimated other)
 	{
 		super(other);
 	}
-
+	
-
+	
 	public NumAnimatedRad(double value)
 	{
 		super(value);
 	}
-
+	
-
+	
 	public NumAnimatedRad(double value, Easing easing)
 	{
 		super(value, easing);
 	}
-
+	
-
+	
 	@Override
 	public double value()
 	{
 		if (duration == 0) return Rad.norm(to);
 		return Calc.interpolateRad(from, to, (elapsedTime / duration), easingCurrent);
 	}
-
+	
-
+	
 	@Override
 	protected double getProgressFromValue(double value)
 	{
@@ -46,7 +46,7 @@ public class NumAnimatedRad extends NumAnimated {
 			final double partial = Rad.diff(from, value);
 			return partial / whole;
 		}
-
+		
 		return 0;
 	}
 }

src/mightypork/utils/math/animation/VectAnimated.java

@@ -14,11 +14,11 @@ import mightypork.utils.math.constraints.vect.var.VectMutable;
  * @author Ondřej Hruška (MightyPork)
  */
 public class VectAnimated extends VectMutable implements Pauseable, Updateable {
-
+	
 	private final NumAnimated x, y, z;
 	private double defaultDuration = 0.5;
-
+	
-
+	
 	/**
 	 * Create an animated vector; This way different easing / settings can be
 	 * specified for each coordinate.
@@ -33,8 +33,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		this.y = y;
 		this.z = z;
 	}
-
+	
-
+	
 	/**
 	 * Create an animated vector
 	 *
@@ -47,29 +47,29 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		y = new NumAnimated(start.y(), easing);
 		z = new NumAnimated(start.z(), easing);
 	}
-
+	
-
+	
 	@Override
 	public double x()
 	{
 		return x.value();
 	}
-
+	
-
+	
 	@Override
 	public double y()
 	{
 		return y.value();
 	}
-
+	
-
+	
 	@Override
 	public double z()
 	{
 		return z.value();
 	}
-
+	
-
+	
 	@Override
 	public void setTo(double x, double y, double z)
 	{
@@ -77,35 +77,35 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		setY(y);
 		setZ(z);
 	}
-
+	
-
+	
 	@Override
 	public void setX(double x)
 	{
 		this.x.setTo(x);
 	}
-
+	
-
+	
 	@Override
 	public void setY(double y)
 	{
 		this.y.setTo(y);
 	}
-
+	
-
+	
 	@Override
 	public void setZ(double z)
 	{
 		this.z.setTo(z);
 	}
-
+	
-
+	
 	public void add(Vect offset, double duration)
 	{
 		animate(this.add(offset), duration);
 	}
-
+	
-
+	
 	public VectAnimated animate(double x, double y, double z, double duration)
 	{
 		this.x.animate(x, duration);
@@ -113,15 +113,15 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		this.z.animate(z, duration);
 		return this;
 	}
-
+	
-
+	
 	public VectAnimated animate(Vect target, double duration)
 	{
 		animate(target.x(), target.y(), target.z(), duration);
 		return this;
 	}
-
+	
-
+	
 	public VectAnimated animate(double x, double y, double z)
 	{
 		this.x.animate(x, defaultDuration);
@@ -129,15 +129,15 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		this.z.animate(z, defaultDuration);
 		return this;
 	}
-
+	
-
+	
 	public VectAnimated animate(Vect target)
 	{
 		animate(target.x(), target.y(), target.z());
 		return this;
 	}
-
+	
-
+	
 	/**
 	 * @return the default duration (seconds)
 	 */
@@ -145,8 +145,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return defaultDuration;
 	}
-
+	
-
+	
 	/**
 	 * Set default animation duration (when changed without using animate())
 	 *
@@ -156,8 +156,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		this.defaultDuration = defaultDuration;
 	}
-
+	
-
+	
 	@Override
 	public void update(double delta)
 	{
@@ -165,8 +165,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		y.update(delta);
 		z.update(delta);
 	}
-
+	
-
+	
 	@Override
 	public void pause()
 	{
@@ -174,8 +174,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		y.pause();
 		z.pause();
 	}
-
+	
-
+	
 	@Override
 	public void resume()
 	{
@@ -183,15 +183,15 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		y.resume();
 		z.resume();
 	}
-
+	
-
+	
 	@Override
 	public boolean isPaused()
 	{
 		return x.isPaused(); // BÚNO
 	}
-
+	
-
+	
 	/**
 	 * @return true if the animation is finished
 	 */
@@ -199,8 +199,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return x.isFinished(); // BÚNO
 	}
-
+	
-
+	
 	/**
 	 * @return current animation duration
 	 */
@@ -208,8 +208,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return x.getDuration(); // BÚNO
 	}
-
+	
-
+	
 	/**
 	 * @return elapsed time since the start of the animation
 	 */
@@ -217,8 +217,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return x.getElapsed(); // BÚNO
 	}
-
+	
-
+	
 	/**
 	 * @return animation progress (elapsed / duration)
 	 */
@@ -226,8 +226,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return x.getProgress(); // BÚNO
 	}
-
+	
-
+	
 	/**
 	 * Set easing for all three coordinates
 	 *
@@ -239,8 +239,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 		y.setEasing(easing);
 		z.setEasing(easing);
 	}
-
+	
-
+	
 	/**
 	 * Create an animated vector; This way different easing / settings can be
 	 * specified for each coordinate.
@@ -255,8 +255,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return new VectAnimated(x, y, z);
 	}
-
+	
-
+	
 	/**
 	 * Create an animated vector
 	 *
@@ -269,8 +269,8 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return new VectAnimated(start, easing);
 	}
-
+	
-
+	
 	/**
 	 * Create an animated vector, initialized at 0,0,0
 	 *
@@ -282,5 +282,5 @@ public class VectAnimated extends VectMutable implements Pauseable, Updateable {
 	{
 		return new VectAnimated(Vect.ZERO, easing);
 	}
-
+	
 }

src/mightypork/utils/math/color/Color.java

@@ -16,11 +16,11 @@ import mightypork.utils.math.constraints.num.Num;
  * @author Ondřej Hruška (MightyPork)
  */
 public abstract class Color {
-
+	
 	private static final Stack<Num> alphaStack = new Stack<>();
 	private static volatile boolean alphaStackEnabled = true;
-
+	
-
+	
 	@FactoryMethod
 	public static final Color fromHex(int rgb_hex)
 	{
@@ -29,146 +29,146 @@ public abstract class Color {
 		final int ri = (rgb_hex >> 16) & 0xff;
 		return rgb(ri / 255D, gi / 255D, bi / 255D);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color rgb(double r, double g, double b)
 	{
 		return rgba(Num.make(r), Num.make(g), Num.make(b), Num.ONE);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color rgba(double r, double g, double b, double a)
 	{
 		return rgba(Num.make(r), Num.make(g), Num.make(b), Num.make(a));
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color rgb(Num r, Num g, Num b)
 	{
 		return rgba(r, g, b, Num.ONE);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color rgba(Num r, Num g, Num b, Num a)
 	{
 		return new ColorRgb(r, g, b, a);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color hsb(double h, double s, double b)
 	{
 		return hsba(Num.make(h), Num.make(s), Num.make(b), Num.ONE);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color hsba(double h, double s, double b, double a)
 	{
 		return hsba(Num.make(h), Num.make(s), Num.make(b), Num.make(a));
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color hsb(Num h, Num s, Num b)
 	{
 		return hsba(h, s, b, Num.ONE);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color hsba(Num h, Num s, Num b, Num a)
 	{
 		return new ColorHsb(h, s, b, a);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color light(double a)
 	{
 		return light(Num.make(a));
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color light(Num a)
 	{
 		return rgba(Num.ONE, Num.ONE, Num.ONE, a);
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color dark(double a)
 	{
 		return dark(Num.make(a));
 	}
-
+	
-
+	
 	@FactoryMethod
 	public static final Color dark(Num a)
 	{
 		return rgba(Num.ZERO, Num.ZERO, Num.ZERO, a);
 	}
-
+	
-
+	
 	protected static final double clamp(Num n)
 	{
 		return Calc.clamp(n.value(), 0, 1);
 	}
-
+	
-
+	
 	protected static final double clamp(double n)
 	{
 		return Calc.clamp(n, 0, 1);
 	}
-
+	
-
+	
 	/**
 	 * @return red 0-1
 	 */
 	public abstract double r();
-
+	
-
+	
 	/**
 	 * @return green 0-1
 	 */
 	public abstract double g();
-
+	
-
+	
 	/**
 	 * @return blue 0-1
 	 */
 	public abstract double b();
-
+	
-
+	
 	/**
 	 * @return alpha 0-1
 	 */
 	public final double a()
 	{
 		double alpha = rawAlpha();
-
+		
 		if (alphaStackEnabled) {
-
+			
 			for (final Num n : alphaStack) {
 				alpha *= clamp(n.value());
 			}
 		}
-
+		
 		return clamp(alpha);
 	}
-
+	
-
+	
 	/**
 	 * @return alpha 0-1, before multiplying with the global alpha value.
 	 */
 	protected abstract double rawAlpha();
-
+	
-
+	
 	/**
 	 * <p>
 	 * Push alpha multiplier on the stack (can be animated or whatever you
@@ -188,11 +188,11 @@ public abstract class Color {
 		if (!alphaStackEnabled) {
 			return;
 		}
-
+		
 		alphaStack.push(alpha);
 	}
-
+	
-
+	
 	/**
 	 * Remove a pushed alpha multiplier from the stack. If there's no remaining
 	 * multiplier on the stack, an exception is raised.
@@ -204,15 +204,15 @@ public abstract class Color {
 		if (!alphaStackEnabled) {
 			return;
 		}
-
+		
 		if (alphaStack.isEmpty()) {
 			throw new EmptyStackException();
 		}
-
+		
 		alphaStack.pop();
 	}
-
+	
-
+	
 	/**
 	 * Enable alpha stack. When disabled, pushAlpha() and popAlpha() have no
 	 * effect.
@@ -223,8 +223,8 @@ public abstract class Color {
 	{
 		alphaStackEnabled = yes;
 	}
-
+	
-
+	
 	/**
 	 * @return true if alpha stack is enabled.
 	 */
@@ -232,20 +232,20 @@ public abstract class Color {
 	{
 		return alphaStackEnabled;
 	}
-
+	
-
+	
 	public Color withAlpha(double multiplier)
 	{
 		return new ColorAlphaAdjuster(this, Num.make(multiplier));
 	}
-
+	
-
+	
 	public Color withAlpha(Num multiplier)
 	{
 		return new ColorAlphaAdjuster(this, multiplier);
 	}
-
+	
-
+	
 	@Override
 	public int hashCode()
 	{
@@ -262,8 +262,8 @@ public abstract class Color {
 		result = prime * result + (int) (temp ^ (temp >>> 32));
 		return result;
 	}
-
+	
-
+	
 	@Override
 	public boolean equals(Object obj)
 	{

src/mightypork/utils/math/color/ColorAlphaAdjuster.java

@@ -5,43 +5,43 @@ import mightypork.utils.math.constraints.num.Num;
 
 
 public class ColorAlphaAdjuster extends Color {
-
+	
 	private final Color source;
 	private final Num alphaAdjust;
-
+	
-
+	
 	public ColorAlphaAdjuster(Color source, Num alphaMul)
 	{
 		this.source = source;
 		this.alphaAdjust = alphaMul;
 	}
-
+	
-
+	
 	@Override
 	public double r()
 	{
 		return source.r();
 	}
-
+	
-
+	
 	@Override
 	public double g()
 	{
 		return source.g();
 	}
-
+	
-
+	
 	@Override
 	public double b()
 	{
 		return source.b();
 	}
-
+	
-
+	
 	@Override
 	protected double rawAlpha()
 	{
 		return source.rawAlpha() * alphaAdjust.value();
 	}
-
+	
 }

src/mightypork/utils/math/color/ColorHsb.java

@@ -5,13 +5,13 @@ import mightypork.utils.math.constraints.num.Num;
 
 
 public class ColorHsb extends Color {
-
+	
 	private final Num h;
 	private final Num s;
 	private final Num b;
 	private final Num a;
-
+	
-
+	
 	public ColorHsb(Num h, Num s, Num b, Num a)
 	{
 		this.h = h;
@@ -19,44 +19,44 @@ public class ColorHsb extends Color {
 		this.b = b;
 		this.a = a;
 	}
-
+	
-
+	
 	private double[] asRgb()
 	{
 		final int hex = java.awt.Color.HSBtoRGB((float) clamp(h), (float) clamp(s), (float) clamp(b));
-
+		
 		final int bi = hex & 0xff;
 		final int gi = (hex >> 8) & 0xff;
 		final int ri = (hex >> 16) & 0xff;
 		return new double[] { ri / 255D, gi / 255D, bi / 255D, clamp(a) };
 	}
-
+	
-
+	
 	@Override
 	public double r()
 	{
 		return asRgb()[0];
 	}
-
+	
-
+	
 	@Override
 	public double g()
 	{
 		return asRgb()[1];
 	}
-
+	
-
+	
 	@Override
 	public double b()
 	{
 		return asRgb()[2];
 	}
-
+	
-
+	
 	@Override
 	protected double rawAlpha()
 	{
 		return asRgb()[3];
 	}
-
+	
 }

src/mightypork/utils/math/color/ColorRgb.java

@@ -5,13 +5,13 @@ import mightypork.utils.math.constraints.num.Num;
 
 
 public class ColorRgb extends Color {
-
+	
 	private final Num r;
 	private final Num g;
 	private final Num b;
 	private final Num a;
-
+	
-
+	
 	public ColorRgb(Num r, Num g, Num b, Num a)
 	{
 		this.r = r;
@@ -19,33 +19,33 @@ public class ColorRgb extends Color {
 		this.b = b;
 		this.a = a;
 	}
-
+	
-
+	
 	@Override
 	public double r()
 	{
 		return clamp(r);
 	}
-
+	
-
+	
 	@Override
 	public double g()
 	{
 		return clamp(g);
 	}
-
+	
-
+	
 	@Override
 	public double b()
 	{
 		return clamp(b);
 	}
-
+	
-
+	
 	@Override
 	protected double rawAlpha()
 	{
 		return clamp(a);
 	}
-
+	
 }

src/mightypork/utils/math/color/Grad.java

@@ -7,10 +7,10 @@ package mightypork.utils.math.color;
  * @author MightyPork
  */
 public class Grad {
-
+	
 	public final Color leftTop, rightTop, rightBottom, leftBottom;
-
+	
-
+	
 	/**
 	 * Create a gradient
 	 *

src/mightypork/utils/math/color/GradH.java

@@ -7,7 +7,7 @@ package mightypork.utils.math.color;
  * @author MightyPork
  */
 public class GradH extends Grad {
-
+	
 	public GradH(Color left, Color right)
 	{
 		super(left, right, right, left);

src/mightypork/utils/math/color/GradV.java

@@ -7,7 +7,7 @@ package mightypork.utils.math.color;
  * @author MightyPork
  */
 public class GradV extends Grad {
-
+	
 	public GradV(Color top, Color bottom)
 	{
 		super(top, top, bottom, bottom);

src/mightypork/utils/math/color/pal/CGA.java

@@ -10,12 +10,12 @@ import mightypork.utils.math.color.Color;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface CGA {
-
+	
 	Color BLACK = Color.fromHex(0x000000);
 	Color GRAY_DARK = Color.fromHex(0x686868);
 	Color GRAY_LIGHT = Color.fromHex(0xB8B8B8);
 	Color WHITE = Color.fromHex(0xFFFFFF);
-
+	
 	Color RED_DARK = Color.fromHex(0xC41F0C);
 	Color RED_LIGHT = Color.fromHex(0xFF706A);
 	Color MAGENTA_DARK = Color.fromHex(0xC12BB6);
@@ -26,7 +26,7 @@ public interface CGA {
 	Color CYAN_LIGHT = Color.fromHex(0x23FCFE);
 	Color GREEN_DARK = Color.fromHex(0x00B41D);
 	Color GREEN_LIGHT = Color.fromHex(0x39FA6F);
-
+	
 	Color YELLOW = Color.fromHex(0xFFFD72);
 	Color BROWN = Color.fromHex(0xC16A14);
 }

src/mightypork/utils/math/color/pal/CMDR.java

@@ -10,7 +10,7 @@ import mightypork.utils.math.color.Color;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface CMDR {
-
+	
 	Color BLACK = Color.fromHex(0x040013);
 	Color WHITE = Color.fromHex(0xFFFFFF);
 	Color RED = Color.fromHex(0x883932);

src/mightypork/utils/math/color/pal/PAL16.java

@@ -10,23 +10,23 @@ import mightypork.utils.math.color.Color;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface PAL16 {
-
+	
 	Color VOID = Color.fromHex(0x000000);
 	Color ASH = Color.fromHex(0x9D9D9D);
 	Color BLIND = Color.fromHex(0xFFFFFF);
-
+	
 	Color BLOODRED = Color.fromHex(0xBE2633);
 	Color PIGMEAT = Color.fromHex(0xE06F8B);
-
+	
 	Color OLDPOOP = Color.fromHex(0x493C2B);
 	Color NEWPOOP = Color.fromHex(0xA46422);
 	Color BLAZE = Color.fromHex(0xEB8931);
 	Color ZORNSKIN = Color.fromHex(0xF7E26B);
-
+	
 	Color SHADEGREEN = Color.fromHex(0x2F484E);
 	Color LEAFGREEN = Color.fromHex(0x44891A);
 	Color SLIMEGREEN = Color.fromHex(0xA3CE27);
-
+	
 	Color NIGHTBLUE = Color.fromHex(0x1B2632);
 	Color SEABLUE = Color.fromHex(0x005784);
 	Color SKYBLUE = Color.fromHex(0x31A2F2);

src/mightypork/utils/math/color/pal/RGB.java

@@ -10,7 +10,7 @@ import mightypork.utils.math.color.Color;
  * @author Ondřej Hruška (MightyPork)
  */
 public class RGB {
-
+	
 	public static final Color BLACK_10 = Color.rgba(0, 0, 0, 0.1);
 	public static final Color BLACK_20 = Color.rgba(0, 0, 0, 0.2);
 	public static final Color BLACK_30 = Color.rgba(0, 0, 0, 0.3);
@@ -20,24 +20,24 @@ public class RGB {
 	public static final Color BLACK_70 = Color.rgba(0, 0, 0, 0.7);
 	public static final Color BLACK_80 = Color.rgba(0, 0, 0, 0.8);
 	public static final Color BLACK_90 = Color.rgba(0, 0, 0, 0.9);
-
+	
 	public static final Color WHITE = Color.fromHex(0xFFFFFF);
 	public static final Color BLACK = Color.fromHex(0x000000);
 	public static final Color GRAY_DARK = Color.fromHex(0x808080);
 	public static final Color GRAY = Color.fromHex(0xA0A0A0);
 	public static final Color GRAY_LIGHT = Color.fromHex(0xC0C0C0);
-
+	
 	public static final Color RED = Color.fromHex(0xFF0000);
 	public static final Color GREEN = Color.fromHex(0x00FF00);
 	public static final Color BLUE = Color.fromHex(0x0000FF);
-
+	
 	public static final Color YELLOW = Color.fromHex(0xFFFF00);
 	public static final Color CYAN = Color.fromHex(0x00FFFF);
 	public static final Color MAGENTA = Color.fromHex(0xFF00FF);
-
+	
 	public static final Color PINK = Color.fromHex(0xFF3FFC);
 	public static final Color ORANGE = Color.fromHex(0xFC4800);
 	public static final Color BROWN = Color.fromHex(0x83501B);
-
+	
 	public static final Color NONE = Color.rgba(0, 0, 0, 0);
 }

src/mightypork/utils/math/color/pal/ZX.java

@@ -10,11 +10,11 @@ import mightypork.utils.math.color.Color;
  * @author Ondřej Hruška (MightyPork)
  */
 public interface ZX {
-
+	
 	Color BLACK = Color.fromHex(0x000000);
 	Color GRAY = Color.fromHex(0xCBCBCB);
 	Color WHITE = Color.fromHex(0xFFFFFF);
-
+	
 	Color RED_DARK = Color.fromHex(0xD8240F);
 	Color RED_LIGHT = Color.fromHex(0xFF3016);
 	Color MAGENTA_DARK = Color.fromHex(0xD530C9);
@@ -25,7 +25,7 @@ public interface ZX {
 	Color CYAN_LIGHT = Color.fromHex(0xFFFD33);
 	Color GREEN_DARK = Color.fromHex(0x00C721);
 	Color GREEN_LIGHT = Color.fromHex(0x00F92C);
-
+	
 	Color YELLOW_DARK = Color.fromHex(0xCECA26);
 	Color YELLOW_LIGHT = Color.fromHex(0xFFFD33);
 }

src/mightypork/utils/math/constraints/CachedConstraint.java

@@ -11,33 +11,33 @@ import mightypork.utils.interfaces.Pollable;
  * @param <C> constraint type
  */
 public interface CachedConstraint<C> extends Pollable {
-
+	
 	/**
 	 * Called after the cache has changed value (and digest).
 	 */
 	void onConstraintChanged();
-
+	
-
+	
 	/**
 	 * @return the cached value
 	 */
 	C getCacheSource();
-
+	
-
+	
 	/**
 	 * Enable caching & digest caching
 	 *
 	 * @param yes enable caching
 	 */
 	void enableCaching(boolean yes);
-
+	
-
+	
 	/**
 	 * @return true if caching is on
 	 */
 	boolean isCachingEnabled();
-
+	
-
+	
 	/**
 	 * Update cached value and cached digest (if digest caching is enabled).<br>
 	 * source constraint is polled beforehand.