Better 3d falling

-Sand now can fall from and to the direction of gravity
-Registers every FallingBlock block to a different value. It doesnt
quite work though
-Removed unused code

build.gradle

@@ -3,14 +3,14 @@
  */
 
 plugins {
-	// Apply the java-library plugin to add support for Java Library
+    // Apply the java-library plugin to add support for Java Library
-	id 'java-library'
+    id 'java-library'
-
+    
-	/*
+    /*
-	 * Uncomment the following line to enable the Eclipse plugin.
+     * Uncomment the following line to enable the Eclipse plugin.
-	 * This is only necessary if you don't use Buildship plugin from the IDE
+     * This is only necessary if you don't use Buildship plugin from the IDE
-	 */
+     */
-	//id 'eclipse'
+    //id 'eclipse'
 }
 
 java {
@@ -18,8 +18,8 @@ java {
 	 * We're Java 8 for now.
 	 * Why? As of 2020, most users have Oracle Java, which only supports Java 8.
 	 */
-	sourceCompatibility = JavaVersion.VERSION_1_8
+    sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
 }
 
 compileJava {
@@ -29,9 +29,9 @@ compileJava {
 	 * However, on JDK 9 and later versions, '--release' option is required,
 	 * which is missing on JDK 8.
 	 */
-	if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    if (JavaVersion.current() != JavaVersion.VERSION_1_8) {
-		options.compilerArgs.addAll(['--release', '8'])
+        options.compilerArgs.addAll(['--release', '8'])
-	}
+    }
 }
 
 /*
@@ -40,38 +40,39 @@ compileJava {
 
 repositories {
 	mavenCentral()
-
+    jcenter()
-	/*
+    
-	 * Specify Windcorp Maven repository
+    /*
-	 * Currently used by:
+     * Specify Windcorp Maven repository
-	 *   - ru.windcorp.fork.io.github.java-graphics:glm:1.0.1
+     * Currently used by:
-	 */
+     *   - ru.windcorp.fork.io.github.java-graphics:glm:1.0.1
-	maven { url 'https://windcorp.ru/./maven' }
+     */
+    maven { url 'https://windcorp.ru/./maven' }
 }
 
 dependencies {
 	// Google Guava
 	//   A generic utilities library
-	implementation 'com.google.guava:guava:30.0-jre'
+    implementation 'com.google.guava:guava:30.0-jre'
-
+    
-	// Trove4j
+    // Trove4j
-	//   Provides optimized Collections for primitive types
+    //   Provides optimized Collections for primitive types
-	implementation 'net.sf.trove4j:trove4j:3.0.3'
+    implementation 'net.sf.trove4j:trove4j:3.0.3'
-
+    
-	// java-graphics
+    // java-graphics
-	//   A GLM (OpenGL Mathematics) port to Java
+    //   A GLM (OpenGL Mathematics) port to Java
-	//   Unfortunately, Maven Central Repository provides an outdated version of this library, which contains several critical bugs
+    //   Unfortunately, Maven Central Repository provides an outdated version of this library, which contains several critical bugs
-	implementation 'ru.windcorp.fork.io.github.java-graphics:glm:1.0.1'
+    implementation 'ru.windcorp.fork.io.github.java-graphics:glm:1.0.1'
 
 	// Log4j
 	//   A logging library
-	implementation 'org.apache.logging.log4j:log4j-api:2.17.0'
+	implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.13.3'
-	implementation 'org.apache.logging.log4j:log4j-core:2.17.0'
+	implementation group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.13.3'
 
 	// JUnit
 	//   A unit-testing library
-	testImplementation 'junit:junit:4.13.2'
+	testImplementation 'junit:junit:4.12'
-
+	
 	// See LWJGL dependencies below
 }
 
@@ -98,8 +99,8 @@ switch (OperatingSystem.current()) {
 	case OperatingSystem.LINUX:
 		def osArch = System.getProperty("os.arch")
 		project.ext.lwjglNatives = osArch.startsWith("arm") || osArch.startsWith("aarch64")
-				? "natives-linux-${osArch.contains("64") || osArch.startsWith("armv8") ? "arm64" : "arm32"}"
+			? "natives-linux-${osArch.contains("64") || osArch.startsWith("armv8") ? "arm64" : "arm32"}"
-				: "natives-linux"
+			: "natives-linux"
 		break
 	case OperatingSystem.MAC_OS:
 		project.ext.lwjglNatives = "natives-macos"
@@ -117,12 +118,12 @@ dependencies {
 	implementation "org.lwjgl:lwjgl-openal"
 	implementation "org.lwjgl:lwjgl-opengl"
 	implementation "org.lwjgl:lwjgl-stb"
-
+	
 	runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
-	runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
-	runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
-	runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
-	runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
 }
 
 // LWJGL END
@@ -140,56 +141,49 @@ project.ext.platforms = new HashSet<>()
 task addNativeDependencies {
 	doFirst {
 		def archs = project.ext.platforms
-
+		
 		switch (archs.size()) {
-			case 0:
+		case 0:
-				println "Adding LWJGL native dependencies for local platform only:\n\t$lwjglNatives"
+			println "Adding LWJGL native dependencies for local platform only:\n\t$lwjglNatives"
-				archs.add project.ext.lwjglNatives
+			archs.add project.ext.lwjglNatives
-				break
+			break
-			case 1:
+		case 1:
-				println "Adding LWJGL native dependencies for platform\n\t" + archs.get(0)
+			println "Adding LWJGL native dependencies for platform\n\t" + archs.get(0)
-				break
+			break
-			default:
+		default:
-				println "Adding LWJGL native dependencies for platforms:\n\t" + archs.join("\n\t")
+			println "Adding LWJGL native dependencies for platforms:\n\t" + archs.join("\n\t")
 		}
-
+		
 		if (project.ext.lwjglNatives.isEmpty()) println "WTF"
-
+		
 		dependencies {
 			archs.each { arch ->
-				runtimeOnly "org.lwjgl:lwjgl::$arch"
+		        runtimeOnly "org.lwjgl:lwjgl::$arch"
-				runtimeOnly "org.lwjgl:lwjgl-glfw::$arch"
+		        runtimeOnly "org.lwjgl:lwjgl-glfw::$arch"
-				runtimeOnly "org.lwjgl:lwjgl-openal::$arch"
+		        runtimeOnly "org.lwjgl:lwjgl-openal::$arch"
-				runtimeOnly "org.lwjgl:lwjgl-opengl::$arch"
+		        runtimeOnly "org.lwjgl:lwjgl-opengl::$arch"
-				runtimeOnly "org.lwjgl:lwjgl-stb::$arch"
+		        runtimeOnly "org.lwjgl:lwjgl-stb::$arch"
-			}
+		    }
-		}
+	    }
-	}
+    }
 }
 
 compileJava.mustRunAfter addNativeDependencies // Make sure runtimeOnly has not been resolved
 
 task requestLinuxDependencies {
-	description 'Adds linux, linux-arm64 and linux-arm32 native libraries to built artifacts.'
+    description 'Adds linux, linux-arm64 and linux-arm32 native libraries to built artifacts.'
 	doFirst {
-		project.ext.platforms.addAll([
+		project.ext.platforms.addAll(['natives-linux', 'natives-linux-arm64', 'natives-linux-arm32'])
-			'natives-linux',
-			'natives-linux-arm64',
-			'natives-linux-arm32'
-		])
 	}
 }
 task requestWindowsDependencies {
-	description 'Adds windows and windows-x86 native libraries to built artifacts.'
+    description 'Adds windows and windows-x86 native libraries to built artifacts.'
 	doFirst {
-		project.ext.platforms.addAll([
+		project.ext.platforms.addAll(['natives-windows', 'natives-windows-x86'])
-			'natives-windows',
-			'natives-windows-x86'
-		])
 	}
 }
 task requestMacOSDependencies {
-	description 'Adds macos native libraries to built artifacts.'
+    description 'Adds macos native libraries to built artifacts.'
 	doFirst {
 		project.ext.platforms.addAll(['natives-macos'])
 	}
@@ -198,7 +192,7 @@ task requestMacOSDependencies {
 def dependencySpecificationTasks = tasks.findAll { task -> task.name.startsWith('request') && task.name.endsWith('Dependencies') }
 
 task requestCrossPlatformDependencies {
-	description 'Adds native libraries for all available platforms to built artifacts.'
+    description 'Adds native libraries for all available platforms to built artifacts.'
 	dependsOn dependencySpecificationTasks
 }
 
@@ -211,7 +205,7 @@ def isDependencyRequested(String dep) {
 	if (dep.endsWith(".jar")) {
 		dep = dep.substring(0, dep.length() - ".jar".length())
 	}
-
+	
 	return !dep.contains("natives-") ||
 			project.ext.platforms.contains(dep.substring(dep.indexOf("natives-"), dep.length()))
 }
@@ -225,7 +219,7 @@ task specifyLocalManifest {
 
 	doFirst {
 		def classPath = []
-
+		
 		configurations.runtimeClasspath.each {
 			if (isDependencyRequested(it.getName())) {
 				classPath.add("lib/" + it.getName())
@@ -233,18 +227,18 @@ task specifyLocalManifest {
 				println "\tRemoving from JAR classpath (not requested):  " + it.getName()
 			}
 		}
-
+		
 		if (classPath.size() == configurations.runtimeClasspath.size()) {
 			println "Nothing removed from JAR classpath"
 		}
-
+	
 		jar {
-			manifest {
+		    manifest {
-				attributes(
+		        attributes(
-						"Main-Class": "ru.windcorp.progressia.client.ProgressiaClientMain",
+		        	"Main-Class": "ru.windcorp.progressia.client.ProgressiaClientMain",
-						"Class-Path": configurations.runtimeClasspath.collect { "lib/" + it.getName() } .findAll { isDependencyRequested(it) } .join(' ')
+		        	"Class-Path": configurations.runtimeClasspath.collect { "lib/" + it.getName() } .findAll { isDependencyRequested(it) } .join(' ')
-						)
+		        )
-			}
+		    }
 		}
 	}
 }
@@ -254,13 +248,13 @@ jar.dependsOn specifyLocalManifest
 /*
  * Library export
  */
-
+ 
 task exportLibs(type: Sync) {
 	mustRunAfter addNativeDependencies
 
-	into libsDirectory.get().getAsFile().getPath() + "/lib"
+    into libsDirectory.get().getAsFile().getPath() + "/lib"
-	exclude { !isDependencyRequested(it.getName()) }
+    exclude { !isDependencyRequested(it.getName()) }
-	from configurations.runtimeClasspath
+    from configurations.runtimeClasspath
 }
 
 jar.dependsOn(exportLibs)
@@ -270,52 +264,52 @@ jar.dependsOn(exportLibs)
  */
 
 task packageDebian(type: Exec) {
-	description 'Builds the project and creates a Debain package.'
+    description 'Builds the project and creates a Debain package.'
-	group 'Progressia'
+    group 'Progressia'
-
+    
-	dependsOn build
+    dependsOn build
-	dependsOn requestLinuxDependencies
+    dependsOn requestLinuxDependencies
-
+    
-	commandLine './buildPackages.sh', 'debian'
+    commandLine './buildPackages.sh', 'debian'
-
+    
-	doLast {
+    doLast {
-		println "Debian package available in build_packages/"
+        println "Debian package available in build_packages/"
-	}
+    }
 }
 
 task packageWindows(type: Exec) {
-	description 'Builds the project and creates a Windows installer.'
+    description 'Builds the project and creates a Windows installer.'
-	group 'Progressia'
+    group 'Progressia'
-
+    
-	dependsOn build
+    dependsOn build
-	dependsOn requestWindowsDependencies
+    dependsOn requestWindowsDependencies
-
+    
-	commandLine './buildPackages.sh', 'windows'
+    commandLine './buildPackages.sh', 'windows'
-
+    
-	doLast {
+    doLast {
-		println "Windows installer available in build_packages/"
+        println "Windows installer available in build_packages/"
-	}
+    }
 }
 
 task buildCrossPlatform {
-	description 'Builds the project including native libraries for all available platforms.'
+    description 'Builds the project including native libraries for all available platforms.'
-	group 'Progressia'
+    group 'Progressia'
-
+    
-	dependsOn requestCrossPlatformDependencies
+    dependsOn requestCrossPlatformDependencies
-	dependsOn build
+    dependsOn build
-
+    
-	doLast {
+    doLast {
-		println "Native libraries for all platforms have been added"
+        println "Native libraries for all platforms have been added"
-	}
+    }
 }
 
 task buildLocal {
-	description "Builds the project including only native libraries for current platform ($lwjglNatives)."
+    description "Builds the project including only native libraries for current platform ($lwjglNatives)."
-	group 'Progressia'
+    group 'Progressia'
-
+    
-	dependsOn build
+    dependsOn build
-
+    
-	doLast {
+    doLast {
-		println "Native libraries only for platform $lwjglNatives have been added"
+        println "Native libraries only for platform $lwjglNatives have been added"
-	}
+    }
 }

docs/ProgressiaRegion.md

@@ -1,12 +0,0 @@
-# Progressia Region File
-## Description
-The `.progressia_region` file type is used for all region files in the game Progressia. Each region file contains a cube of 16x16x16 chunks.
-## Header
-The header of the file is 16 400 bytes. Every file starts with the string byte sequence `\x50\x52\x4F\x47` (UTF-8 for `PROG`), followed with the three integer values of the region position, in region coordinates. After this, there is exactly 16KiB of space in the header, which stores the offsets to the chunks' data. This space holds an integer, 4 bytes, for each chunk in the region. The integer value starts at 0 for every chunk, and is changed to the location of the chunk data once created. These are indexed in order by flattening the 3D in-chunk coordinates into a number between 0 and 4095 according to the formula `offset = 256*x+ 16*y + z` for chunk at (x, y, z). To convert from this offset value to the offset in bytes, use `byte_offset = 16400 + 64*n`.
-## Sectors
-Sectors are what is used to store chunk data, and are not linear, but are followed until they reach an ending block. Each is 64 bytes, which is used in the header section to find the byte offset. Each sector starts with a identification byte, followed by the sector data.
-
- 0. Ending - This sector is empty, and marks the end of the chunk data (This may change in the future.
- 1. Data - This sector contains chunk data for a single chunk. The second byte of this sector contains a counter byte, which is a form of "checksum" to make sure that the program is reading the proper sectors in order. This starts at 0 for the first data sector and increments by one for each new data sector.
- 2. Partition Link - This sector only contains another offset value, which is where the next sector is. This allows for infinite chunk size, avoiding "chunk dupes" as were present in Minecraft without reverting any chunks.
- 3. Bulk Data - These would be used for many chunks in the same region that contain exactly the same data, e.g. all solid chunks underground. Exists so the program knows not to overwrite them, and just make new chunk data if modified. Not yet implemented.

docs/building/IntelliJIDEAGuide.md

@@ -41,17 +41,4 @@ Run configurations are used by Intellij IDEA to specify how a project must be ru
 8. Append `\run` to the 'Working directory' field. Alternatively, specify another location outside of the project's root directory.
 9. Click 'Apply' to save changes.
 
-Step 8 is required to specify that the game must run in some directory other than the project root, which is the default in Intellij IDEA.
+Step 8 is required to specify that the game must run in some directory other than the project root, which is the default in Intellij IDEA.
-
-### Applying formatting templates
-
-Windcorp's Progressia repository is formatted with a style defined for Eclipse IDE (sic) in
-`templates_and_presets/eclipse_ide`.
-Please apply these templates to the project to automatically format the source in a similar fashion.
-
-1. In project context menu, click 'File->Properties'. (`Ctrl+Alt+S`)
-2. In 'Editor' > 'Code Style' > 'Java', press gear icon, then click 'Import Scheme' > 'Eclipse code style'
-3. In Scheme select 'Project'
-4. Open the file `templates_and_presets/eclipse_ide/FormatterProfile.xml` in 'Select Path'.
-5. Inside 'Import Scheme' widow click 'Current Scheme' check box after press OK
-

src/main/java/ru/windcorp/jputil/ArrayUtil.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil;
 
 import java.lang.reflect.Array;
@@ -611,8 +611,7 @@ public class ArrayUtil {
 		int end = offset + length;
 		if (end > arrayLength || offset < 0)
 			throw new IllegalArgumentException(
-				"Array contains [0; " + arrayLength + "), requested [" + offset + "; " + end + ")"
+					"Array contains [0; " + arrayLength + "), requested [" + offset + "; " + end + ")");
-			);
 
 		return length;
 	}
@@ -628,8 +627,7 @@ public class ArrayUtil {
 
 		if (end > arrayLength || start < 0)
 			throw new IllegalArgumentException(
-				"Array contains [0; " + arrayLength + "), requested [" + start + "; " + end + ")"
+					"Array contains [0; " + arrayLength + "), requested [" + start + "; " + end + ")");
-			);
 
 		return end;
 	}

src/main/java/ru/windcorp/jputil/CSVWriter.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil;
 
 import java.io.OutputStream;

src/main/java/ru/windcorp/jputil/PrimitiveUtil.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil;
 
 import java.util.HashMap;
@@ -30,18 +30,8 @@ public class PrimitiveUtil {
 	private static final Map<Class<?>, Object> PRIMITIVE_TO_NULL = new HashMap<>();
 
 	static {
-		for (
+		for (Class<?> boxed : new Class<?>[] { Boolean.class, Byte.class, Short.class, Character.class, Integer.class,
-			Class<?> boxed : new Class<?>[] {
+				Long.class, Float.class, Double.class }) {
-				Boolean.class,
-				Byte.class,
-				Short.class,
-				Character.class,
-				Integer.class,
-				Long.class,
-				Float.class,
-				Double.class
-			}
-		) {
 			try {
 				PRIMITIVE_TO_BOXED.put((Class<?>) boxed.getField("TYPE").get(null), boxed);
 			} catch (Exception e) {

src/main/java/ru/windcorp/jputil/SyncStreams.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil;
 
 import java.util.function.*;
@@ -40,8 +40,7 @@ import java.util.stream.Stream;
 
 /**
  * Contains static methods to create {@link Stream Streams} that synchronize
- * their
+ * their <a href=
- * <a href=
  * "https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html#StreamOps">
  * terminal operations</a> on a given monitor.
  * 
@@ -50,7 +49,7 @@ import java.util.stream.Stream;
  */
 
 // SonarLint: "Stream.peek" should be used with caution (java:S3864)
-//   We are implementing Stream, so peek() is required.
+// We are implementing Stream, so peek() is required.
 @SuppressWarnings("squid:S3864")
 
 public class SyncStreams {
@@ -1070,21 +1069,18 @@ public class SyncStreams {
 	}
 
 	/**
-	 * Wraps the given {@link Stream} to make all
+	 * Wraps the given {@link Stream} to make all <a href=
-	 * <a href=
 	 * "https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html#StreamOps">
 	 * terminal operations</a> acquire the provided monitor's lock before
-	 * execution. Intermediate operations
+	 * execution. Intermediate operations return streams that are also
-	 * return streams that are also synchronized on the same object. The created
+	 * synchronized on the same object. The created stream will behave
-	 * stream will behave identically
+	 * identically to the provided stream in all other aspects. Use this to
-	 * to the provided stream in all other aspects. Use this to synchronize
+	 * synchronize access to stream's source.
-	 * access to stream's source.
 	 * <p>
 	 * <i>The returned {@code Stream}'s {@link Stream#iterator() iterator()} and
-	 * {@link Stream#spliterator()
+	 * {@link Stream#spliterator() spliterator()} methods return regular
-	 * spliterator()} methods return regular non-synchronized iterators and
+	 * non-synchronized iterators and spliterators respectively</i>. It is the
-	 * spliterators respectively</i>. It
+	 * user's responsibility to avoid concurrency issues:
-	 * is the user's responsibility to avoid concurrency issues:
 	 * 
 	 * <pre>
 	 * synchronized (stream.getMonitor()) {
@@ -1103,14 +1099,17 @@ public class SyncStreams {
 	 * stream.forEach(System.out::println); // Should never throw a ConcurrentModificationException
 	 * </pre>
 	 * 
-	 * @param <T>     the class of objects in the Stream
+	 * @param <T>
-	 * @param stream  the stream to wrap.
+	 *            the class of objects in the Stream
-	 * @param monitor the object that the stream will use for synchronization.
+	 * @param stream
-	 *                When {@code null}, the stream
+	 *            the stream to wrap.
-	 *                will synchronize on itself.
+	 * @param monitor
+	 *            the object that the stream will use for synchronization. When
+	 *            {@code null}, the stream will synchronize on itself.
 	 * @return a {@link SyncStream SyncStream&lt;T&gt;} synchronized on
 	 *         {@code monitor} and backed by {@code stream}.
-	 * @throws NullPointerException if {@code stream == null}.
+	 * @throws NullPointerException
+	 *             if {@code stream == null}.
 	 */
 	public static <T> SyncStream<T> synchronizedStream(Stream<T> stream, Object monitor) {
 		Objects.requireNonNull(stream, "stream cannot be null");
@@ -1118,22 +1117,19 @@ public class SyncStreams {
 	}
 
 	/**
-	 * Wraps the given {@link IntStream} to make all
+	 * Wraps the given {@link IntStream} to make all <a href=
-	 * <a href=
 	 * "https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html#StreamOps">
 	 * terminal operations</a> acquire the provided monitor's lock before
-	 * execution. Intermediate operations
+	 * execution. Intermediate operations return streams that are also
-	 * return streams that are also synchronized on the same object. The created
+	 * synchronized on the same object. The created stream will behave
-	 * stream will behave identically
+	 * identically to the provided stream in all other aspects. Use this to
-	 * to the provided stream in all other aspects. Use this to synchronize
+	 * synchronize access to stream's source.
-	 * access to stream's source.
 	 * <p>
 	 * <i>The returned {@code IntStream}'s {@link IntStream#iterator()
-	 * iterator()} and
+	 * iterator()} and {@link IntStream#spliterator() spliterator()} methods
-	 * {@link IntStream#spliterator() spliterator()} methods return regular
+	 * return regular non-synchronized iterators and spliterators
-	 * non-synchronized iterators and
+	 * respectively</i>. It is the user's responsibility to avoid concurrency
-	 * spliterators respectively</i>. It is the user's responsibility to avoid
+	 * issues:
-	 * concurrency issues:
 	 * 
 	 * <pre>
 	 * synchronized (stream.getMonitor()) {
@@ -1152,13 +1148,15 @@ public class SyncStreams {
 	 * stream.forEach(System.out::println); // Should never throw a ConcurrentModificationException
 	 * </pre>
 	 * 
-	 * @param stream  the stream to wrap.
+	 * @param stream
-	 * @param monitor the object that the stream will use for synchronization.
+	 *            the stream to wrap.
-	 *                When {@code null}, the stream
+	 * @param monitor
-	 *                will synchronize on itself.
+	 *            the object that the stream will use for synchronization. When
+	 *            {@code null}, the stream will synchronize on itself.
 	 * @return a {@link SyncIntStream} synchronized on {@code monitor} and
 	 *         backed by {@code stream}.
-	 * @throws NullPointerException if {@code stream == null}.
+	 * @throws NullPointerException
+	 *             if {@code stream == null}.
 	 */
 	public static SyncIntStream synchronizedStream(IntStream stream, Object monitor) {
 		Objects.requireNonNull(stream, "stream cannot be null");
@@ -1166,22 +1164,19 @@ public class SyncStreams {
 	}
 
 	/**
-	 * Wraps the given {@link LongStream} to make all
+	 * Wraps the given {@link LongStream} to make all <a href=
-	 * <a href=
 	 * "https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html#StreamOps">
 	 * terminal operations</a> acquire the provided monitor's lock before
-	 * execution. Intermediate operations
+	 * execution. Intermediate operations return streams that are also
-	 * return streams that are also synchronized on the same object. The created
+	 * synchronized on the same object. The created stream will behave
-	 * stream will behave identically
+	 * identically to the provided stream in all other aspects. Use this to
-	 * to the provided stream in all other aspects. Use this to synchronize
+	 * synchronize access to stream's source.
-	 * access to stream's source.
 	 * <p>
 	 * <i>The returned {@code LongStream}'s {@link LongStream#iterator()
-	 * iterator()} and
+	 * iterator()} and {@link LongStream#spliterator() spliterator()} methods
-	 * {@link LongStream#spliterator() spliterator()} methods return regular
+	 * return regular non-synchronized iterators and spliterators
-	 * non-synchronized iterators and
+	 * respectively</i>. It is the user's responsibility to avoid concurrency
-	 * spliterators respectively</i>. It is the user's responsibility to avoid
+	 * issues:
-	 * concurrency issues:
 	 * 
 	 * <pre>
 	 * synchronized (stream.getMonitor()) {
@@ -1200,13 +1195,15 @@ public class SyncStreams {
 	 * stream.forEach(System.out::println); // Should never throw a ConcurrentModificationException
 	 * </pre>
 	 * 
-	 * @param stream  the stream to wrap.
+	 * @param stream
-	 * @param monitor the object that the stream will use for synchronization.
+	 *            the stream to wrap.
-	 *                When {@code null}, the stream
+	 * @param monitor
-	 *                will synchronize on itself.
+	 *            the object that the stream will use for synchronization. When
+	 *            {@code null}, the stream will synchronize on itself.
 	 * @return a {@link SyncLongStream} synchronized on {@code monitor} and
 	 *         backed by {@code stream}.
-	 * @throws NullPointerException if {@code stream == null}.
+	 * @throws NullPointerException
+	 *             if {@code stream == null}.
 	 */
 	public static SyncLongStream synchronizedStream(LongStream stream, Object monitor) {
 		Objects.requireNonNull(stream, "stream cannot be null");
@@ -1214,22 +1211,19 @@ public class SyncStreams {
 	}
 
 	/**
-	 * Wraps the given {@link DoubleStream} to make all
+	 * Wraps the given {@link DoubleStream} to make all <a href=
-	 * <a href=
 	 * "https://docs.oracle.com/javase/8/docs/api/java/util/stream/package-summary.html#StreamOps">
 	 * terminal operations</a> acquire the provided monitor's lock before
-	 * execution. Intermediate operations
+	 * execution. Intermediate operations return streams that are also
-	 * return streams that are also synchronized on the same object. The created
+	 * synchronized on the same object. The created stream will behave
-	 * stream will behave identically
+	 * identically to the provided stream in all other aspects. Use this to
-	 * to the provided stream in all other aspects. Use this to synchronize
+	 * synchronize access to stream's source.
-	 * access to stream's source.
 	 * <p>
 	 * <i>The returned {@code DoubleStream}'s {@link DoubleStream#iterator()
-	 * iterator()} and
+	 * iterator()} and {@link DoubleStream#spliterator() spliterator()} methods
-	 * {@link DoubleStream#spliterator() spliterator()} methods return regular
+	 * return regular non-synchronized iterators and spliterators
-	 * non-synchronized iterators and
+	 * respectively</i>. It is the user's responsibility to avoid concurrency
-	 * spliterators respectively</i>. It is the user's responsibility to avoid
+	 * issues:
-	 * concurrency issues:
 	 * 
 	 * <pre>
 	 * synchronized (stream.getMonitor()) {
@@ -1248,13 +1242,15 @@ public class SyncStreams {
 	 * stream.forEach(System.out::println); // Should never throw a ConcurrentModificationException
 	 * </pre>
 	 * 
-	 * @param stream  the stream to wrap.
+	 * @param stream
-	 * @param monitor the object that the stream will use for synchronization.
+	 *            the stream to wrap.
-	 *                When {@code null}, the stream
+	 * @param monitor
-	 *                will synchronize on itself.
+	 *            the object that the stream will use for synchronization. When
+	 *            {@code null}, the stream will synchronize on itself.
 	 * @return a {@link SyncDoubleStream} synchronized on {@code monitor} and
 	 *         backed by {@code stream}.
-	 * @throws NullPointerException if {@code stream == null}.
+	 * @throws NullPointerException
+	 *             if {@code stream == null}.
 	 */
 	public static SyncDoubleStream synchronizedStream(DoubleStream stream, Object monitor) {
 		Objects.requireNonNull(stream, "stream cannot be null");

src/main/java/ru/windcorp/jputil/SyntaxException.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil;
 
 public class SyntaxException extends Exception {

src/main/java/ru/windcorp/jputil/chars/CharArrayIterator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.text.CharacterIterator;
@@ -108,7 +108,7 @@ public class CharArrayIterator implements CharacterIterator {
 		return pos;
 	}
 
-//	@SuppressWarnings("all") Just STFU, this _is_ terrific
+	// @SuppressWarnings("all") Just STFU, this _is_ terrific
 
 	// SonarLint: "clone" should not be overridden (java:S2975)
 	// And I wouldn't have done that if only CharacterIterator had not required

src/main/java/ru/windcorp/jputil/chars/CharConsumer.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.util.function.IntConsumer;

src/main/java/ru/windcorp/jputil/chars/CharConsumers.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.util.Objects;

src/main/java/ru/windcorp/jputil/chars/CharPredicate.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.util.Arrays;

src/main/java/ru/windcorp/jputil/chars/CharSupplier.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.util.function.IntSupplier;

src/main/java/ru/windcorp/jputil/chars/EscapeException.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 public class EscapeException extends Exception {

src/main/java/ru/windcorp/jputil/chars/Escaper.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.text.CharacterIterator;
@@ -103,14 +103,8 @@ public class Escaper {
 
 	}
 
-	public static final Escaper JAVA = new Escaper(
+	public static final Escaper JAVA = new Escaper('\\', 'u', "tbnrf'\"".toCharArray(), "\t\b\n\r\f\'\"".toCharArray(),
-		'\\',
+			true, true);
-		'u',
-		"tbnrf'\"".toCharArray(),
-		"\t\b\n\r\f\'\"".toCharArray(),
-		true,
-		true
-	);
 
 	private final char escapeChar;
 	private final char unicodeEscapeChar;
@@ -120,14 +114,8 @@ public class Escaper {
 	private final boolean preferUnicode;
 	private final boolean strict;
 
-	protected Escaper(
+	protected Escaper(char escapeChar, char unicodeEscapeChar, char[] safes, char[] unsafes, boolean preferUnicode,
-		char escapeChar,
+			boolean strict) {
-		char unicodeEscapeChar,
-		char[] safes,
-		char[] unsafes,
-		boolean preferUnicode,
-		boolean strict
-	) {
 		this.escapeChar = escapeChar;
 		this.unicodeEscapeChar = unicodeEscapeChar;
 		this.safes = safes;
@@ -152,8 +140,7 @@ public class Escaper {
 		for (char c : unsafes) {
 			if (c == escapeChar)
 				throw new IllegalArgumentException(
-					"Unsafe characters contain escape chatacter (escape character is escaped automatically)"
+						"Unsafe characters contain escape chatacter (escape character is escaped automatically)");
-				);
 			if (c == unicodeEscapeChar)
 				throw new IllegalArgumentException("Unsafe characters contain Unicode escape chatacter");
 		}
@@ -173,11 +160,7 @@ public class Escaper {
 			end = Integer.MAX_VALUE;
 		else
 			end = src.getPosition() + length;
-		while (
+		while (src.has() && src.getPosition() < end && (until == null || !until.test(src.current())))
-			src.has() &&
-				src.getPosition() < end &&
-				(until == null || !until.test(src.current()))
-		)
 			escape(src.consume(), output);
 	}
 
@@ -225,11 +208,7 @@ public class Escaper {
 
 		int result = 0;
 
-		while (
+		while (src.has() && src.getPosition() < end && (until == null || !until.test(src.current()))) {
-			src.has() &&
-				src.getPosition() < end &&
-				(until == null || !until.test(src.current()))
-		) {
 			result += getEscapedLength(src.consume());
 		}
 
@@ -257,11 +236,7 @@ public class Escaper {
 			end = Integer.MAX_VALUE;
 		else
 			end = src.getPosition() + length;
-		while (
+		while (src.has() && src.getPosition() < end && (until == null || !until.test(src.current()))) {
-			src.has() &&
-				src.getPosition() < end &&
-				(until == null || !until.test(src.current()))
-		) {
 			output.accept(unescapeOneSequence(src));
 		}
 	}
@@ -282,10 +257,8 @@ public class Escaper {
 
 				if (src.current() == unicodeEscapeChar) {
 					src.next();
-					return (char) (hexValue(src.consume()) << (4 * 3) |
+					return (char) (hexValue(src.consume()) << (4 * 3) | hexValue(src.consume()) << (4 * 2)
-						hexValue(src.consume()) << (4 * 2) |
+							| hexValue(src.consume()) << (4 * 1) | hexValue(src.consume()) << (4 * 0));
-						hexValue(src.consume()) << (4 * 1) |
-						hexValue(src.consume()) << (4 * 0));
 				}
 
 				int index = ArrayUtil.firstIndexOf(safes, src.current());
@@ -315,11 +288,7 @@ public class Escaper {
 
 		int result = 0;
 
-		while (
+		while (src.has() && src.getPosition() < end && (until == null || !until.test(src.current()))) {
-			src.has() &&
-				src.getPosition() < end &&
-				(until == null || !until.test(src.current()))
-		) {
 			skipOneSequence(src);
 			result++;
 		}
@@ -328,11 +297,7 @@ public class Escaper {
 	}
 
 	public void skipOneSequence(CharReader src) {
-		if (
+		if (src.current() == escapeChar && src.next() == unicodeEscapeChar) {
-			src.current() == escapeChar
-				&&
-				src.next() == unicodeEscapeChar
-		) {
 			src.advance(4);
 		}
 		src.next();

src/main/java/ru/windcorp/jputil/chars/FancyCharacterIterator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.text.CharacterIterator;
@@ -86,7 +86,7 @@ public class FancyCharacterIterator implements CharacterIterator {
 		return sb.toString();
 	}
 
-//	@SuppressWarnings("all") Just STFU, this _is_ terrific
+	// @SuppressWarnings("all") Just STFU, this _is_ terrific
 
 	// SonarLint: "clone" should not be overridden (java:S2975)
 	// And I wouldn't have done that if only CharacterIterator had not required

src/main/java/ru/windcorp/jputil/chars/IndentedStringBuilder.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 public class IndentedStringBuilder {

src/main/java/ru/windcorp/jputil/chars/StringUtil.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.io.IOException;
@@ -41,13 +41,8 @@ public class StringUtil {
 	private static final String EMPTY_PLACEHOLDER = "[empty]";
 	private static final String DEFAULT_SEPARATOR = "; ";
 
-	public static <T> String arrayToString(
+	public static <T> String arrayToString(T[] array, String separator, String empty, String nullPlaceholder,
-		T[] array,
+			String nullArray) {
-		String separator,
-		String empty,
-		String nullPlaceholder,
-		String nullArray
-	) {
 
 		if (separator == null) {
 			throw new IllegalArgumentException(new NullPointerException());
@@ -79,13 +74,8 @@ public class StringUtil {
 		return arrayToString(array, DEFAULT_SEPARATOR);
 	}
 
-	public static String iteratorToString(
+	public static String iteratorToString(Iterator<?> iterator, String separator, String empty, String nullPlaceholder,
-		Iterator<?> iterator,
+			String nullIterator) {
-		String separator,
-		String empty,
-		String nullPlaceholder,
-		String nullIterator
-	) {
 
 		if (separator == null) {
 			throw new IllegalArgumentException(new NullPointerException());
@@ -119,13 +109,8 @@ public class StringUtil {
 		return iteratorToString(iterator, DEFAULT_SEPARATOR);
 	}
 
-	public static String iterableToString(
+	public static String iterableToString(Iterable<?> iterable, String separator, String empty, String nullPlaceholder,
-		Iterable<?> iterable,
+			String nullIterable) {
-		String separator,
-		String empty,
-		String nullPlaceholder,
-		String nullIterable
-	) {
 
 		if (separator == null) {
 			throw new IllegalArgumentException(new NullPointerException());
@@ -146,14 +131,8 @@ public class StringUtil {
 		return iterableToString(iterable, DEFAULT_SEPARATOR);
 	}
 
-	public static <T> String supplierToString(
+	public static <T> String supplierToString(IntFunction<T> supplier, int length, String separator, String empty,
-		IntFunction<T> supplier,
+			String nullPlaceholder, String nullSupplier) {
-		int length,
-		String separator,
-		String empty,
-		String nullPlaceholder,
-		String nullSupplier
-	) {
 
 		if (separator == null)
 			throw new IllegalArgumentException(new NullPointerException());
@@ -163,28 +142,15 @@ public class StringUtil {
 			return empty;
 
 		if (length > 0) {
-			return supplierToStringExactly(
+			return supplierToStringExactly(supplier, length, separator, nullPlaceholder);
-				supplier,
-				length,
-				separator,
-				nullPlaceholder
-			);
 		} else {
-			return supplierToStringUntilNull(
+			return supplierToStringUntilNull(supplier, separator, empty);
-				supplier,
-				separator,
-				empty
-			);
 		}
 
 	}
 
-	private static <T> String supplierToStringExactly(
+	private static <T> String supplierToStringExactly(IntFunction<T> supplier, int length, String separator,
-		IntFunction<T> supplier,
+			String nullPlaceholder) {
-		int length,
-		String separator,
-		String nullPlaceholder
-	) {
 		T element = supplier.apply(0);
 
 		StringBuilder sb = new StringBuilder(element == null ? nullPlaceholder : element.toString());
@@ -198,11 +164,7 @@ public class StringUtil {
 		return sb.toString();
 	}
 
-	private static <T> String supplierToStringUntilNull(
+	private static <T> String supplierToStringUntilNull(IntFunction<T> supplier, String separator, String empty) {
-		IntFunction<T> supplier,
-		String separator,
-		String empty
-	) {
 		T element = supplier.apply(0);
 
 		if (element == null) {
@@ -366,11 +328,7 @@ public class StringUtil {
 		StringBuilder sb = new StringBuilder();
 
 		charLoop: for (char c : src.toCharArray()) {
-			if (
+			if ((resultIndex + 1) < arrayLength && test.test(c)) {
-				(resultIndex + 1) < arrayLength
-					&&
-					test.test(c)
-			) {
 				result[resultIndex] = resetStringBuilder(sb);
 				++resultIndex;
 				continue charLoop;
@@ -389,17 +347,17 @@ public class StringUtil {
 	 * index.
 	 * <p>
 	 * Indices {@code 0} and {@code src.length() - 1} produce {@code str}
-	 * excluding
+	 * excluding the specified character and {@code ""}.
-	 * the specified character and {@code ""}.
 	 * <p>
 	 * 
-	 * @param src the String to split
+	 * @param src
-	 * @param at  index to split at
+	 *            the String to split
-	 * @throws IllegalArgumentException if the index is out of bounds for
+	 * @param at
-	 *                                  {@code src}
+	 *            index to split at
+	 * @throws IllegalArgumentException
+	 *             if the index is out of bounds for {@code src}
 	 * @return an array containing the substrings, in order of encounter in
-	 *         {@code src}.
+	 *         {@code src}. Its length is always 2.
-	 *         Its length is always 2.
 	 */
 	public static String[] splitAt(String src, int at) {
 		Objects.requireNonNull(src, "src");
@@ -416,10 +374,7 @@ public class StringUtil {
 			return new String[] { src.substring(0, src.length() - 1), "" };
 		}
 
-		return new String[] {
+		return new String[] { src.substring(0, at), src.substring(at + 1) };
-			src.substring(0, at),
-			src.substring(at + 1)
-		};
 	}
 
 	/**
@@ -427,8 +382,7 @@ public class StringUtil {
 	 * indices.
 	 * <p>
 	 * Indices {@code 0} and {@code src.length() - 1} produce extra zero-length
-	 * outputs.
+	 * outputs. Duplicate indices produce extra zero-length outputs.
-	 * Duplicate indices produce extra zero-length outputs.
 	 * <p>
 	 * Examples:
 	 * 
@@ -439,13 +393,14 @@ public class StringUtil {
 	 * splitAt("a.b",   1, 1, 1) -> {"a", "", "", "b"}
 	 * </pre>
 	 * 
-	 * @param src the String to split
+	 * @param src
-	 * @param at  indices to split at, in any order
+	 *            the String to split
-	 * @throws IllegalArgumentException if some index is out of bounds for
+	 * @param at
-	 *                                  {@code src}
+	 *            indices to split at, in any order
+	 * @throws IllegalArgumentException
+	 *             if some index is out of bounds for {@code src}
 	 * @return an array containing the substrings, in order of encounter in
-	 *         {@code src}.
+	 *         {@code src}. Its length is always {@code at.length + 1}.
-	 *         Its length is always {@code at.length + 1}.
 	 */
 	public static String[] splitAt(String src, int... at) {
 		Objects.requireNonNull(src, "src");
@@ -553,10 +508,8 @@ public class StringUtil {
 		}
 
 		if (endPos < beginPos) {
-			throw new IllegalArgumentException(
+			throw new IllegalArgumentException("endPos must be greater than or equal to beginPos (endPos=" + endPos
-				"endPos must be greater than or equal to beginPos (endPos="
+					+ ", beginPos=" + beginPos + ")");
-					+ endPos + ", beginPos=" + beginPos + ")"
-			);
 		}
 
 		if (endPos >= Math.min(a.length, b.length)) {
@@ -592,8 +545,7 @@ public class StringUtil {
 
 	/**
 	 * Finds and returns the index of the specified appearance of the specified
-	 * character
+	 * character in the given array. The search starts at index 0.
-	 * in the given array. The search starts at index 0.
 	 * <p>
 	 * Examples:
 	 * <p>
@@ -630,10 +582,12 @@ public class StringUtil {
 	 * </tr>
 	 * </table>
 	 * 
-	 * @param src    - the array to search in.
+	 * @param src
-	 * @param target - the character to search for.
+	 *            - the array to search in.
-	 * @param skip   - the amount of <code>target</code> characters to be
+	 * @param target
-	 *               skipped.
+	 *            - the character to search for.
+	 * @param skip
+	 *            - the amount of <code>target</code> characters to be skipped.
 	 * @return The index of the <code>skip+1</code>th <code>target</code>
 	 *         character or -1, if none found.
 	 * @see StringUtil#indexFromEnd(char[], char, int)
@@ -653,8 +607,7 @@ public class StringUtil {
 
 	/**
 	 * Finds and returns the index of the specified appearance of the specified
-	 * character
+	 * character in the given array. The search starts at index
-	 * in the given array. The search starts at index
 	 * <code>src.length - 1</code>.
 	 * <p>
 	 * Examples:
@@ -692,13 +645,15 @@ public class StringUtil {
 	 * </tr>
 	 * </table>
 	 * 
-	 * @param src    - the array to search in.
+	 * @param src
-	 * @param target - the character to search for.
+	 *            - the array to search in.
-	 * @param skip   - the amount of <code>target</code> characters to be
+	 * @param target
-	 *               skipped.
+	 *            - the character to search for.
+	 * @param skip
+	 *            - the amount of <code>target</code> characters to be skipped.
 	 * @return The index of the <code>skip+1</code>th
-	 *         <code>target</code>character
+	 *         <code>target</code>character from the end of the array or -1, if
-	 *         from the end of the array or -1, if none found.
+	 *         none found.
 	 * @see StringUtil#indexFromBeginning(char[], char, int)
 	 */
 	public static int indexFromEnd(char[] src, char target, int skip) {
@@ -873,12 +828,8 @@ public class StringUtil {
 		return result;
 	}
 
-	private static void buildCombinations(
+	private static void buildCombinations(StringBuilder sb, Collection<String> result, Iterable<String>[] parts,
-		StringBuilder sb,
+			int index) {
-		Collection<String> result,
-		Iterable<String>[] parts,
-		int index
-	) {
 		if (index >= parts.length) {
 			result.add(sb.toString());
 		} else {
@@ -904,13 +855,8 @@ public class StringUtil {
 		return result;
 	}
 
-	private static void buildCombinations(
+	private static void buildCombinations(StringBuilder sb, String[] result, int[] resultIndex, String[][] parts,
-		StringBuilder sb,
+			int index) {
-		String[] result,
-		int[] resultIndex,
-		String[][] parts,
-		int index
-	) {
 		if (index >= parts.length) {
 			result[resultIndex[0]++] = sb.toString();
 		} else {
@@ -985,10 +931,7 @@ public class StringUtil {
 	}
 
 	private static char hexDigit(long value, int digit) {
-		return hexDigit(
+		return hexDigit((int) (value >>> (4 * digit)) & 0xF);
-			(int) (value >>> (4 * digit))
-				& 0xF
-		);
 	}
 
 	public static char hexDigit(int value) {

src/main/java/ru/windcorp/jputil/chars/UncheckedEscapeException.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 public class UncheckedEscapeException extends RuntimeException {

src/main/java/ru/windcorp/jputil/chars/WordReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars;
 
 import java.io.IOException;

src/main/java/ru/windcorp/jputil/chars/reader/AbstractCharReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars.reader;
 
 /**
@@ -27,10 +27,9 @@ public abstract class AbstractCharReader implements CharReader {
 
 	/**
 	 * Current position of this CharReader. The reader maps its input to
-	 * positions starting from 0.
+	 * positions starting from 0. Positions that are negative or lower than 0
-	 * Positions that are negative or lower than 0 are invalid.
+	 * are invalid. {@link #current()} will throw an exception if position is
-	 * {@link #current()}
+	 * invalid.
-	 * will throw an exception if position is invalid.
 	 */
 	protected int position = 0;
 

src/main/java/ru/windcorp/jputil/chars/reader/ArrayCharReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars.reader;
 
 import java.util.Objects;

src/main/java/ru/windcorp/jputil/chars/reader/BufferedCharReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars.reader;
 
 /**
@@ -51,9 +51,12 @@ public abstract class BufferedCharReader extends AbstractCharReader {
 	/**
 	 * Acquires next characters and stores them in the array.
 	 * 
-	 * @param buffer the output array
+	 * @param buffer
-	 * @param offset index of the first character
+	 *            the output array
-	 * @param length maximum amount of characters to be pulled
+	 * @param offset
+	 *            index of the first character
+	 * @param length
+	 *            maximum amount of characters to be pulled
 	 * @return the amount of characters actually pulled
 	 */
 	protected int pullChars(char[] buffer, int offset, int length) {

src/main/java/ru/windcorp/jputil/chars/reader/CharReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars.reader;
 
 import java.io.IOException;
@@ -30,7 +30,7 @@ import ru.windcorp.jputil.chars.Escaper;
  */
 
 // SonarLint: Constants should not be defined in interfaces (java:S1214)
-//   DONE is an essential part of the interface
+// DONE is an essential part of the interface
 @SuppressWarnings("squid:S1214")
 
 public interface CharReader {
@@ -179,8 +179,7 @@ public interface CharReader {
 
 	/**
 	 * Skips to the end of the current line. Both <code>"\n"</code>,
-	 * <code>"\r"</code>
+	 * <code>"\r"</code> and <code>"\r\n"</code> are considered line separators.
-	 * and <code>"\r\n"</code> are considered line separators.
 	 * 
 	 * @return the amount of characters in the skipped line
 	 */

src/main/java/ru/windcorp/jputil/chars/reader/CharReaders.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars.reader;
 
 import java.io.InputStream;

src/main/java/ru/windcorp/jputil/chars/reader/ReaderCharReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars.reader;
 
 import java.io.IOException;

src/main/java/ru/windcorp/jputil/chars/reader/StringCharReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.chars.reader;
 
 import java.util.Objects;
@@ -38,8 +38,7 @@ public class StringCharReader extends AbstractCharReader {
 		int end = offset + length;
 		if (end > str.length() || offset < 0)
 			throw new IllegalArgumentException(
-				"String contains [0; " + str.length() + "), requested [" + offset + "; " + end + ")"
+					"String contains [0; " + str.length() + "), requested [" + offset + "; " + end + ")");
-			);
 
 		this.offset = offset;
 		this.length = length;

src/main/java/ru/windcorp/jputil/functions/FloatSupplier.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.functions;
 
 @FunctionalInterface

src/main/java/ru/windcorp/jputil/functions/ThrowingBiConsumer.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.functions;
 
 import java.util.function.BiConsumer;
@@ -44,9 +44,16 @@ public interface ThrowingBiConsumer<T, U, E extends Exception> {
 	}
 
 	public static <T, U, E extends Exception> ThrowingBiConsumer<T, U, E> concat(
-		ThrowingBiConsumer<? super T, ? super U, ? extends E> first,
+			ThrowingBiConsumer<? super T, ? super U, ? extends E> first,
-		ThrowingBiConsumer<? super T, ? super U, ? extends E> second
+			ThrowingBiConsumer<? super T, ? super U, ? extends E> second) {
-	) {
+		return (t, u) -> {
+			first.accept(t, u);
+			second.accept(t, u);
+		};
+	}
+
+	public static <T, U, E extends Exception> ThrowingBiConsumer<T, U, E> concat(BiConsumer<? super T, ? super U> first,
+			ThrowingBiConsumer<? super T, ? super U, E> second) {
 		return (t, u) -> {
 			first.accept(t, u);
 			second.accept(t, u);
@@ -54,19 +61,7 @@ public interface ThrowingBiConsumer<T, U, E extends Exception> {
 	}
 
 	public static <T, U, E extends Exception> ThrowingBiConsumer<T, U, E> concat(
-		BiConsumer<? super T, ? super U> first,
+			ThrowingBiConsumer<? super T, ? super U, E> first, BiConsumer<? super T, ? super U> second) {
-		ThrowingBiConsumer<? super T, ? super U, E> second
-	) {
-		return (t, u) -> {
-			first.accept(t, u);
-			second.accept(t, u);
-		};
-	}
-
-	public static <T, U, E extends Exception> ThrowingBiConsumer<T, U, E> concat(
-		ThrowingBiConsumer<? super T, ? super U, E> first,
-		BiConsumer<? super T, ? super U> second
-	) {
 		return (t, u) -> {
 			first.accept(t, u);
 			second.accept(t, u);

src/main/java/ru/windcorp/jputil/functions/ThrowingConsumer.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.functions;
 
 import java.util.function.BiConsumer;
@@ -39,30 +39,24 @@ public interface ThrowingConsumer<T, E extends Exception> {
 		};
 	}
 
-	public static <T, E extends Exception> ThrowingConsumer<T, E> concat(
+	public static <T, E extends Exception> ThrowingConsumer<T, E> concat(ThrowingConsumer<? super T, ? extends E> first,
-		ThrowingConsumer<? super T, ? extends E> first,
+			ThrowingConsumer<? super T, ? extends E> second) {
-		ThrowingConsumer<? super T, ? extends E> second
-	) {
 		return t -> {
 			first.accept(t);
 			second.accept(t);
 		};
 	}
 
-	public static <T, E extends Exception> ThrowingConsumer<T, E> concat(
+	public static <T, E extends Exception> ThrowingConsumer<T, E> concat(Consumer<? super T> first,
-		Consumer<? super T> first,
+			ThrowingConsumer<? super T, ? extends E> second) {
-		ThrowingConsumer<? super T, ? extends E> second
-	) {
 		return t -> {
 			first.accept(t);
 			second.accept(t);
 		};
 	}
 
-	public static <T, E extends Exception> ThrowingConsumer<T, E> concat(
+	public static <T, E extends Exception> ThrowingConsumer<T, E> concat(ThrowingConsumer<? super T, ? extends E> first,
-		ThrowingConsumer<? super T, ? extends E> first,
+			Consumer<? super T> second) {
-		Consumer<? super T> second
-	) {
 		return t -> {
 			first.accept(t);
 			second.accept(t);

src/main/java/ru/windcorp/jputil/functions/ThrowingFunction.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.functions;
 
 import java.util.function.BiConsumer;
@@ -28,10 +28,8 @@ public interface ThrowingFunction<T, R, E extends Exception> {
 	R apply(T t) throws E;
 
 	@SuppressWarnings("unchecked")
-	default Function<T, R> withHandler(
+	default Function<T, R> withHandler(BiConsumer<? super T, ? super E> handler,
-		BiConsumer<? super T, ? super E> handler,
+			Function<? super T, ? extends R> value) {
-		Function<? super T, ? extends R> value
-	) {
 		return t -> {
 			try {
 				return apply(t);
@@ -58,23 +56,18 @@ public interface ThrowingFunction<T, R, E extends Exception> {
 	}
 
 	public static <T, R, I, E extends Exception> ThrowingFunction<T, R, E> compose(
-		ThrowingFunction<? super T, I, ? extends E> first,
+			ThrowingFunction<? super T, I, ? extends E> first,
-		ThrowingFunction<? super I, ? extends R, ? extends E> second
+			ThrowingFunction<? super I, ? extends R, ? extends E> second) {
-	) {
+		return t -> second.apply(first.apply(t));
+	}
+
+	public static <T, R, I, E extends Exception> ThrowingFunction<T, R, E> compose(Function<? super T, I> first,
+			ThrowingFunction<? super I, ? extends R, E> second) {
 		return t -> second.apply(first.apply(t));
 	}
 
 	public static <T, R, I, E extends Exception> ThrowingFunction<T, R, E> compose(
-		Function<? super T, I> first,
+			ThrowingFunction<? super T, I, E> first, Function<? super I, ? extends R> second) {
-		ThrowingFunction<? super I, ? extends R, E> second
-	) {
-		return t -> second.apply(first.apply(t));
-	}
-
-	public static <T, R, I, E extends Exception> ThrowingFunction<T, R, E> compose(
-		ThrowingFunction<? super T, I, E> first,
-		Function<? super I, ? extends R> second
-	) {
 		return t -> second.apply(first.apply(t));
 	}
 

src/main/java/ru/windcorp/jputil/functions/ThrowingRunnable.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.functions;
 
 import java.util.function.Consumer;
@@ -38,10 +38,8 @@ public interface ThrowingRunnable<E extends Exception> {
 		};
 	}
 
-	public static <E extends Exception> ThrowingRunnable<E> concat(
+	public static <E extends Exception> ThrowingRunnable<E> concat(ThrowingRunnable<? extends E> first,
-		ThrowingRunnable<? extends E> first,
+			ThrowingRunnable<? extends E> second) {
-		ThrowingRunnable<? extends E> second
-	) {
 		return () -> {
 			first.run();
 			second.run();

src/main/java/ru/windcorp/jputil/functions/ThrowingSupplier.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.functions;
 
 import java.util.function.Consumer;

src/main/java/ru/windcorp/jputil/iterators/ArrayIterator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.iterators;
 
 import java.util.Iterator;

src/main/java/ru/windcorp/jputil/iterators/FunctionIterator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.iterators;
 
 import java.util.Iterator;

src/main/java/ru/windcorp/jputil/iterators/PeekingIterator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.iterators;
 
 import java.util.Iterator;

src/main/java/ru/windcorp/jputil/iterators/RangeIterator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.iterators;
 
 import java.util.Iterator;
@@ -49,10 +49,8 @@ public class RangeIterator<E> implements Iterator<E> {
 	public E next() {
 		update();
 		if (nextIndex >= from + amount) {
-			throw new NoSuchElementException(
+			throw new NoSuchElementException("RangeIterator about to retrieve element " + nextIndex
-				"RangeIterator about to retrieve element " + nextIndex
+					+ " which exceeds upper boundary " + (from + amount));
-					+ " which exceeds upper boundary " + (from + amount)
-			);
 		}
 
 		E result = parent.next();

src/main/java/ru/windcorp/jputil/iterators/Reiterator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.iterators;
 
 import java.util.ArrayList;

src/main/java/ru/windcorp/jputil/selectors/AbstractSelectorOperator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 public abstract class AbstractSelectorOperator implements SelectorOperator {

src/main/java/ru/windcorp/jputil/selectors/NamedParameterizedSelector.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import ru.windcorp.jputil.SyntaxException;

src/main/java/ru/windcorp/jputil/selectors/NamedSelector.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import ru.windcorp.jputil.SyntaxException;

src/main/java/ru/windcorp/jputil/selectors/OperatorAnd.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.Deque;

src/main/java/ru/windcorp/jputil/selectors/OperatorExclude.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.Deque;

src/main/java/ru/windcorp/jputil/selectors/OperatorNot.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.Deque;

src/main/java/ru/windcorp/jputil/selectors/OperatorOr.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.Deque;

src/main/java/ru/windcorp/jputil/selectors/OperatorXor.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.Deque;

src/main/java/ru/windcorp/jputil/selectors/PredicateWrapper.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.function.Predicate;

src/main/java/ru/windcorp/jputil/selectors/Selector.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.function.Predicate;

src/main/java/ru/windcorp/jputil/selectors/SelectorOperator.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.Deque;

src/main/java/ru/windcorp/jputil/selectors/SelectorSystem.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.jputil.selectors;
 
 import java.util.ArrayList;
@@ -37,7 +37,7 @@ public class SelectorSystem<T> {
 	private final Collection<Selector<T>> selectors = Collections.synchronizedCollection(new ArrayList<Selector<T>>());
 
 	private final Collection<SelectorOperator> operators = Collections
-		.synchronizedCollection(new ArrayList<SelectorOperator>());
+			.synchronizedCollection(new ArrayList<SelectorOperator>());
 
 	private String stackPrefix = null;
 

src/main/java/ru/windcorp/progressia/Progressia.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia;
 
 public class Progressia {

src/main/java/ru/windcorp/progressia/ProgressiaLauncher.java

@@ -18,28 +18,18 @@
 
 package ru.windcorp.progressia;
 
-import ru.windcorp.progressia.client.graphics.GUI;
 import ru.windcorp.progressia.common.util.crash.CrashReports;
 import ru.windcorp.progressia.common.util.crash.analyzers.OutOfMemoryAnalyzer;
 import ru.windcorp.progressia.common.util.crash.providers.*;
-import ru.windcorp.progressia.test.LayerTitle;
 
 public class ProgressiaLauncher {
 
 	public static String[] arguments;
-	private static Proxy proxy;
 
 	public static void launch(String[] args, Proxy proxy) {
 		arguments = args.clone();
 		setupCrashReports();
-
 		proxy.initialize();
-		ProgressiaLauncher.proxy = proxy;
-		GUI.addTopLayer(new LayerTitle("Title"));
-	}
-	
-	public static Proxy getProxy() {
-		return proxy;
 	}
 
 	private static void setupCrashReports() {

src/main/java/ru/windcorp/progressia/Proxy.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia;
 
 public interface Proxy {

src/main/java/ru/windcorp/progressia/client/Client.java

@@ -15,45 +15,24 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
-package ru.windcorp.progressia.client;
 
-import com.google.common.eventbus.EventBus;
+package ru.windcorp.progressia.client;
-import com.google.common.eventbus.Subscribe;
 
 import ru.windcorp.progressia.client.comms.DefaultClientCommsListener;
 import ru.windcorp.progressia.client.comms.ServerCommsChannel;
-import ru.windcorp.progressia.client.events.ClientEvent;
-import ru.windcorp.progressia.client.events.NewLocalEntityEvent;
-import ru.windcorp.progressia.client.graphics.GUI;
 import ru.windcorp.progressia.client.graphics.world.Camera;
 import ru.windcorp.progressia.client.graphics.world.EntityAnchor;
-import ru.windcorp.progressia.client.graphics.world.LayerWorld;
 import ru.windcorp.progressia.client.graphics.world.LocalPlayer;
-import ru.windcorp.progressia.client.graphics.world.hud.HUDManager;
 import ru.windcorp.progressia.client.world.WorldRender;
-import ru.windcorp.progressia.common.util.crash.ReportingEventBus;
 import ru.windcorp.progressia.common.world.DefaultWorldData;
-import ru.windcorp.progressia.test.LayerAbout;
+import ru.windcorp.progressia.common.world.entity.EntityData;
-import ru.windcorp.progressia.test.LayerDebug;
-import ru.windcorp.progressia.test.LayerTestUI;
 
 public class Client {
 
 	private final WorldRender world;
-	
-	private final LayerWorld layerWorld = new LayerWorld(this);
-	private final LayerTestUI layerTestUI = new LayerTestUI();
-	private final LayerAbout layerAbout = new LayerAbout();
-	private final LayerDebug layerDebug = new LayerDebug();
-	
 	private final LocalPlayer localPlayer = new LocalPlayer(this);
 
 	private final Camera camera = new Camera((float) Math.toRadians(70));
-	
-	private final EventBus eventBus = ReportingEventBus.create("ClientEvents");
-	
-	private final HUDManager hudManager = new HUDManager(this);
 
 	private final ServerCommsChannel comms;
 
@@ -62,22 +41,6 @@ public class Client {
 		this.comms = comms;
 
 		comms.addListener(new DefaultClientCommsListener(this));
-		subscribe(this);
-	}
-	
-	public void install() {
-		GUI.addBottomLayer(layerWorld);
-		GUI.addTopLayer(layerTestUI);
-		hudManager.install();
-		GUI.addTopLayer(layerAbout);
-	}
-	
-	public void remove() {
-		GUI.removeLayer(layerWorld);
-		GUI.removeLayer(layerTestUI);
-		hudManager.remove();
-		GUI.removeLayer(layerAbout);
-		GUI.removeLayer(layerDebug);
 	}
 
 	public WorldRender getWorld() {
@@ -99,45 +62,14 @@ public class Client {
 	public ServerCommsChannel getComms() {
 		return comms;
 	}
-	
-	public HUDManager getHUD() {
-		return hudManager;
-	}
 
-	public void toggleDebugLayer() {
+	public void onLocalPlayerEntityChanged(EntityData entity, EntityData lastKnownEntity) {
-		if (GUI.getLayers().contains(layerDebug)) {
+		if (entity == null) {
-			GUI.removeLayer(layerDebug);
-		} else {
-			GUI.addTopLayer(layerDebug);
-		}
-	}
-
-	@Subscribe
-	private void onLocalPlayerEntityChanged(NewLocalEntityEvent e) {
-		if (e.getNewEntity() == null) {
 			getCamera().setAnchor(null);
 			return;
 		}
 
-		getCamera().setAnchor(
+		getCamera().setAnchor(new EntityAnchor(getWorld().getEntityRenderable(entity)));
-			new EntityAnchor(
-				getWorld().getEntityRenderable(e.getNewEntity())
-			)
-		);
-	}
-
-	public void subscribe(Object object) {
-		eventBus.register(object);
-	}
-
-	public void unsubscribe(Object object) {
-		eventBus.unregister(object);
-	}
-
-	public void postEvent(ClientEvent event) {
-		event.setClient(this);
-		eventBus.post(event);
-		event.setClient(null);
 	}
 
 }

src/main/java/ru/windcorp/progressia/client/ClientProxy.java

@@ -27,10 +27,10 @@ import ru.windcorp.progressia.client.graphics.font.GNUUnifontLoader;
 import ru.windcorp.progressia.client.graphics.font.Typefaces;
 import ru.windcorp.progressia.client.graphics.texture.Atlases;
 import ru.windcorp.progressia.client.graphics.world.WorldRenderProgram;
-import ru.windcorp.progressia.client.graphics.world.hud.HUDTextures;
 import ru.windcorp.progressia.client.localization.Localizer;
 import ru.windcorp.progressia.common.resource.ResourceManager;
 import ru.windcorp.progressia.common.util.crash.CrashReports;
+import ru.windcorp.progressia.server.ServerState;
 import ru.windcorp.progressia.test.TestContent;
 import ru.windcorp.progressia.test.TestMusicPlayer;
 
@@ -38,17 +38,12 @@ public class ClientProxy implements Proxy {
 
 	@Override
 	public void initialize() {
-
 		GraphicsBackend.initialize();
-
 		try {
 			RenderTaskQueue.waitAndInvoke(FlatRenderProgram::init);
 			RenderTaskQueue.waitAndInvoke(WorldRenderProgram::init);
-			RenderTaskQueue.waitAndInvoke(
+			RenderTaskQueue.waitAndInvoke(() -> Typefaces
-				() -> Typefaces
+					.setDefault(GNUUnifontLoader.load(ResourceManager.getResource("assets/unifont-13.0.03.hex.gz"))));
-					.setDefault(GNUUnifontLoader.load(ResourceManager.getResource("assets/unifont-13.0.03.hex.gz")))
-			);
-			RenderTaskQueue.waitAndInvoke(HUDTextures::loadItemAmountTypeface);
 		} catch (InterruptedException e) {
 			throw CrashReports.report(e, "ClientProxy failed");
 		}
@@ -61,6 +56,10 @@ public class ClientProxy implements Proxy {
 
 		AudioSystem.initialize();
 
+		ServerState.startServer();
+		ClientState.connectToLocalServer();
+
 		TestMusicPlayer.start();
 	}
+
 }

src/main/java/ru/windcorp/progressia/client/ClientState.java

@@ -20,10 +20,11 @@ package ru.windcorp.progressia.client;
 
 import ru.windcorp.progressia.client.comms.localhost.LocalServerCommsChannel;
 import ru.windcorp.progressia.client.graphics.GUI;
+import ru.windcorp.progressia.client.graphics.world.LayerWorld;
 import ru.windcorp.progressia.common.world.DefaultWorldData;
-import ru.windcorp.progressia.client.localization.MutableStringLocalized;
 import ru.windcorp.progressia.server.ServerState;
-import ru.windcorp.progressia.test.LayerTestText;
+import ru.windcorp.progressia.test.LayerAbout;
+import ru.windcorp.progressia.test.LayerTestUI;
 import ru.windcorp.progressia.test.TestContent;
 
 public class ClientState {
@@ -42,38 +43,18 @@ public class ClientState {
 
 		DefaultWorldData world = new DefaultWorldData();
 
-		LocalServerCommsChannel channel = new LocalServerCommsChannel(
+		LocalServerCommsChannel channel = new LocalServerCommsChannel(ServerState.getInstance());
-			ServerState.getInstance()
-		);
 
 		Client client = new Client(world, channel);
 
 		channel.connect(TestContent.PLAYER_LOGIN);
 
 		setInstance(client);
-		displayLoadingScreen();
 
-	}
+		GUI.addBottomLayer(new LayerWorld(client));
+		GUI.addTopLayer(new LayerTestUI());
+		GUI.addTopLayer(new LayerAbout());
 
-	private static void displayLoadingScreen() {
-		GUI.addTopLayer(new LayerTestText("Text", new MutableStringLocalized("LayerText.Load"), layer -> {
-			Client client = ClientState.getInstance();
-
-			// TODO refacetor and remove
-			if (client != null) {
-				client.getComms().processPackets();
-			}
-			
-			if (client != null && client.getLocalPlayer().hasEntity()) {
-				GUI.removeLayer(layer);
-				client.install();
-			}
-		}));
-	}
-
-	public static void disconnectFromLocalServer() {
-		getInstance().getComms().disconnect();
-		getInstance().remove();
 	}
 
 	private ClientState() {

src/main/java/ru/windcorp/progressia/client/ProgressiaClientMain.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client;
 
 import ru.windcorp.progressia.ProgressiaLauncher;

src/main/java/ru/windcorp/progressia/client/audio/AudioFormat.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio;
 
 public enum AudioFormat {

src/main/java/ru/windcorp/progressia/client/audio/AudioManager.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio;
 
 import org.lwjgl.openal.*;
@@ -43,10 +43,7 @@ public class AudioManager {
 	private static Speaker musicSpeaker;
 
 	public static void initAL() {
-		String defaultDeviceName = alcGetString(
+		String defaultDeviceName = alcGetString(0, ALC_DEFAULT_DEVICE_SPECIFIER);
-			0,
-			ALC_DEFAULT_DEVICE_SPECIFIER
-		);
 
 		device = alcOpenDevice(defaultDeviceName);
 
@@ -75,10 +72,7 @@ public class AudioManager {
 				lastSoundIndex = 0;
 			}
 			speaker = soundSpeakers.get(lastSoundIndex);
-		} while (
+		} while (speaker.getState().equals(Speaker.State.PLAYING_LOOP));
-			speaker.getState()
-				.equals(Speaker.State.PLAYING_LOOP)
-		);
 		return speaker;
 	}
 

src/main/java/ru/windcorp/progressia/client/audio/AudioRegistry.java

@@ -21,9 +21,9 @@ import ru.windcorp.progressia.client.audio.backend.SoundType;
 import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;
 
 public class AudioRegistry extends NamespacedInstanceRegistry<SoundType> {
-	
+
 	private static final AudioRegistry INSTANCE = new AudioRegistry();
-	
+
 	/**
 	 * @return the instance
 	 */

src/main/java/ru/windcorp/progressia/client/audio/AudioSystem.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio;
 
 import ru.windcorp.progressia.common.resource.ResourceManager;
@@ -29,10 +29,7 @@ public class AudioSystem {
 	}
 
 	static void loadAudioData() {
-		AudioManager.loadSound(
+		AudioManager.loadSound(ResourceManager.getResource("assets/sounds/block_destroy_clap.ogg"),
-			ResourceManager.getResource("assets/sounds/block_destroy_clap.ogg"),
+				"Progressia:BlockDestroy", AudioFormat.MONO);
-			"Progressia:BlockDestroy",
-			AudioFormat.MONO
-		);
 	}
 }

src/main/java/ru/windcorp/progressia/client/audio/Music.java

@@ -15,18 +15,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio;
 
 import glm.vec._3.Vec3;
 import ru.windcorp.progressia.client.audio.backend.SoundType;
 import ru.windcorp.progressia.client.audio.backend.Speaker;
 
-public class Music 
+public class Music extends Sound {
-	extends Sound {
+
-	
-	
-	
 	public Music(SoundType soundType, int timeLength, float pitch, float gain) {
 		super(soundType, timeLength, new Vec3(), new Vec3(), pitch, gain);
 	}
@@ -47,7 +44,7 @@ public class Music
 	protected Speaker initSpeaker() {
 		return AudioManager.initMusicSpeaker(soundType);
 	}
-	
+
 	@Override
 	public void setPosition(Vec3 position) {
 		throw new UnsupportedOperationException();

src/main/java/ru/windcorp/progressia/client/audio/Sound.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio;
 
 import glm.vec._3.Vec3;
@@ -29,9 +29,9 @@ public class Sound {
 	protected float pitch = 1.0f;
 	protected float gain = 1.0f;
 	protected int timeLength = 0;
-	
+
 	protected SoundType soundType;
-	
+
 	public Sound(SoundType soundType) {
 		this.soundType = soundType;
 	}
@@ -39,37 +39,23 @@ public class Sound {
 	public Sound(String id) {
 		this(AudioRegistry.getInstance().get(id));
 	}
-	
+
-	public Sound(
+	public Sound(String id, int timeLength, Vec3 position, Vec3 velocity, float pitch, float gain) {
-		String id,
-		int timeLength,
-		Vec3 position,
-		Vec3 velocity,
-		float pitch,
-		float gain
-	) {
 		this(id);
 		this.position = position;
 		this.velocity = velocity;
 		this.pitch = pitch;
 		this.gain = gain;
 	}
-	
+
-	public Sound(
+	public Sound(SoundType soundType, int timeLength, Vec3 position, Vec3 velocity, float pitch, float gain) {
-		SoundType soundType,
-		int timeLength,
-		Vec3 position,
-		Vec3 velocity,
-		float pitch,
-		float gain
-	) {
 		this(soundType);
 		this.position = position;
 		this.velocity = velocity;
 		this.pitch = pitch;
 		this.gain = gain;
 	}
-	
+
 	protected Speaker initSpeaker() {
 		return AudioManager.initSpeaker(soundType);
 	}
@@ -119,7 +105,7 @@ public class Sound {
 	public float getPitch() {
 		return pitch;
 	}
-	
+
 	public double getDuration() {
 		return soundType.getDuration();
 	}

src/main/java/ru/windcorp/progressia/client/audio/backend/AudioReader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio.backend;
 
 import org.lwjgl.BufferUtils;
@@ -39,12 +39,7 @@ public class AudioReader {
 
 		ShortBuffer rawAudio = decodeVorbis(resource, channelBuffer, rateBuffer);
 
-		return new SoundType(
+		return new SoundType(id, rawAudio, format, rateBuffer.get(0));
-			id,
-			rawAudio,
-			format,
-			rateBuffer.get(0)
-		);
 	}
 
 	public static SoundType readAsMono(Resource resource, String id) {
@@ -55,15 +50,7 @@ public class AudioReader {
 		return readAsSpecified(resource, id, AL_FORMAT_STEREO16);
 	}
 
-	private static ShortBuffer decodeVorbis(
+	private static ShortBuffer decodeVorbis(Resource dataToDecode, IntBuffer channelsBuffer, IntBuffer rateBuffer) {
-		Resource dataToDecode,
+		return stb_vorbis_decode_memory(dataToDecode.readAsBytes(), channelsBuffer, rateBuffer);
-		IntBuffer channelsBuffer,
-		IntBuffer rateBuffer
-	) {
-		return stb_vorbis_decode_memory(
-			dataToDecode.readAsBytes(),
-			channelsBuffer,
-			rateBuffer
-		);
 	}
 }

src/main/java/ru/windcorp/progressia/client/audio/backend/Listener.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio.backend;
 
 import glm.vec._3.Vec3;
@@ -55,9 +55,8 @@ public class Listener {
 		if (isInWorld) {
 
 			if (wasInWorld) {
-				velocity.set(camera.getLastAnchorPosition()).sub(position).div(
+				velocity.set(camera.getLastAnchorPosition()).sub(position)
-					(float) GraphicsInterface.getFrameLength()
+						.div((float) GraphicsInterface.getFrameLength());
-				);
 			} else {
 				// If !wasInWorld, previous position is nonsence. Assume 0.
 				velocity.set(0);
@@ -72,9 +71,9 @@ public class Listener {
 		}
 
 		/*
-		 * Only apply if there is a chance that params changed.
+		 * Only apply if there is a chance that params changed. This can only
-		 * This can only happen if we are in world now (isInWorld) or we just
+		 * happen if we are in world now (isInWorld) or we just left world
-		 * left world (wasInWorld, then we need to reset).
+		 * (wasInWorld, then we need to reset).
 		 */
 		if (isInWorld || wasInWorld) {
 			applyParams();
@@ -91,17 +90,7 @@ public class Listener {
 	private void applyParams() {
 		alListener3f(AL_POSITION, position.x, position.y, position.z);
 		alListener3f(AL_VELOCITY, velocity.x, velocity.y, velocity.z);
-		alListenerfv(
+		alListenerfv(AL_ORIENTATION, new float[] { oriAt.x, oriAt.y, oriAt.z, oriUp.x, oriUp.y, oriUp.z });
-			AL_ORIENTATION,
-			new float[] {
-				oriAt.x,
-				oriAt.y,
-				oriAt.z,
-				oriUp.x,
-				oriUp.y,
-				oriUp.z
-			}
-		);
 	}
 
 }

src/main/java/ru/windcorp/progressia/client/audio/backend/SoundType.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio.backend;
 
 import ru.windcorp.progressia.common.util.namespaces.Namespaced;
@@ -34,12 +34,7 @@ public class SoundType extends Namespaced {
 	private int audioBuffer;
 	private double duration;
 
-	public SoundType(
+	public SoundType(String id, ShortBuffer rawAudio, int format, int sampleRate) {
-		String id,
-		ShortBuffer rawAudio,
-		int format,
-		int sampleRate
-	) {
 		super(id);
 		this.rawAudio = rawAudio;
 		this.sampleRate = sampleRate;
@@ -56,7 +51,7 @@ public class SoundType extends Namespaced {
 	public void initSpeaker(Speaker speaker) {
 		speaker.setAudioData(audioBuffer);
 	}
-	
+
 	public double getDuration() {
 		return duration;
 	}

src/main/java/ru/windcorp/progressia/client/audio/backend/Speaker.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.audio.backend;
 
 import glm.vec._3.Vec3;
@@ -24,9 +24,7 @@ import static org.lwjgl.openal.AL11.*;
 public class Speaker {
 
 	public enum State {
-		NOT_PLAYING,
+		NOT_PLAYING, PLAYING, PLAYING_LOOP
-		PLAYING,
-		PLAYING_LOOP
 	}
 
 	// Buffers
@@ -49,13 +47,7 @@ public class Speaker {
 		setAudioData(audioData);
 	}
 
-	public Speaker(
+	public Speaker(int audioData, Vec3 position, Vec3 velocity, float pitch, float gain) {
-		int audioData,
-		Vec3 position,
-		Vec3 velocity,
-		float pitch,
-		float gain
-	) {
 		setAudioData(audioData);
 		setPosition(position);
 		setVelocity(velocity);
@@ -63,12 +55,7 @@ public class Speaker {
 		setGain(gain);
 	}
 
-	public Speaker(
+	public Speaker(Vec3 position, Vec3 velocity, float pitch, float gain) {
-		Vec3 position,
-		Vec3 velocity,
-		float pitch,
-		float gain
-	) {
 		setPosition(position);
 		setVelocity(velocity);
 		setPitch(pitch);

src/main/java/ru/windcorp/progressia/client/comms/DefaultClientCommsListener.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms;
 
 import java.io.IOException;
@@ -39,9 +39,7 @@ public class DefaultClientCommsListener implements CommsListener {
 	@Override
 	public void onPacketReceived(Packet packet) {
 		if (packet instanceof PacketAffectWorld) {
-			((PacketAffectWorld) packet).apply(
+			((PacketAffectWorld) packet).apply(getClient().getWorld().getData());
-				getClient().getWorld().getData()
-			);
 		} else if (packet instanceof PacketSetLocalPlayer) {
 			setLocalPlayer((PacketSetLocalPlayer) packet);
 		}

src/main/java/ru/windcorp/progressia/client/comms/ServerCommsChannel.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms;
 
 import ru.windcorp.progressia.common.comms.CommsChannel;

src/main/java/ru/windcorp/progressia/client/comms/controls/ControlTrigger.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms.controls;
 
 import ru.windcorp.progressia.common.util.namespaces.Namespaced;

src/main/java/ru/windcorp/progressia/client/comms/controls/ControlTriggerInputBased.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms.controls;
 
 import ru.windcorp.progressia.client.graphics.input.InputEvent;

src/main/java/ru/windcorp/progressia/client/comms/controls/ControlTriggerLambda.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms.controls;
 
 import java.util.function.BiConsumer;
@@ -33,17 +33,12 @@ public class ControlTriggerLambda extends ControlTriggerInputBased {
 	private final Predicate<InputEvent> predicate;
 	private final BiConsumer<InputEvent, ControlData> dataWriter;
 
-	public ControlTriggerLambda(
+	public ControlTriggerLambda(String id, Predicate<InputEvent> predicate,
-		String id,
+			BiConsumer<InputEvent, ControlData> dataWriter) {
-		Predicate<InputEvent> predicate,
-		BiConsumer<InputEvent, ControlData> dataWriter
-	) {
 		super(id);
 
-		this.packetId = NamespacedUtil.getId(
+		this.packetId = NamespacedUtil.getId(NamespacedUtil.getNamespace(id),
-			NamespacedUtil.getNamespace(id),
+				"ControlKeyPress" + NamespacedUtil.getName(id));
-			"ControlKeyPress" + NamespacedUtil.getName(id)
-		);
 
 		this.predicate = predicate;
 		this.dataWriter = dataWriter;
@@ -54,10 +49,7 @@ public class ControlTriggerLambda extends ControlTriggerInputBased {
 		if (!predicate.test(event))
 			return null;
 
-		PacketControl packet = new PacketControl(
+		PacketControl packet = new PacketControl(packetId, ControlDataRegistry.getInstance().create(getId()));
-			packetId,
-			ControlDataRegistry.getInstance().create(getId())
-		);
 
 		dataWriter.accept(event, packet.getControl());
 

src/main/java/ru/windcorp/progressia/client/comms/controls/ControlTriggerLocalLambda.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms.controls;
 
 import java.util.function.Consumer;
@@ -29,11 +29,7 @@ public class ControlTriggerLocalLambda extends ControlTriggerInputBased {
 	private final Predicate<InputEvent> predicate;
 	private final Consumer<InputEvent> action;
 
-	public ControlTriggerLocalLambda(
+	public ControlTriggerLocalLambda(String id, Predicate<InputEvent> predicate, Consumer<InputEvent> action) {
-		String id,
-		Predicate<InputEvent> predicate,
-		Consumer<InputEvent> action
-	) {
 		super(id);
 
 		this.predicate = predicate;

src/main/java/ru/windcorp/progressia/client/comms/controls/ControlTriggerRegistry.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms.controls;
 
 import ru.windcorp.progressia.common.util.namespaces.NamespacedInstanceRegistry;

src/main/java/ru/windcorp/progressia/client/comms/controls/ControlTriggers.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms.controls;
 
 import java.util.function.BiConsumer;
@@ -27,216 +27,119 @@ import ru.windcorp.progressia.common.comms.controls.ControlData;
 
 public class ControlTriggers {
 
-	public static ControlTriggerInputBased of(
+	public static ControlTriggerInputBased of(String id, BiConsumer<InputEvent, ControlData> dataWriter,
-		String id,
+			Predicate<InputEvent> predicate) {
-		BiConsumer<InputEvent, ControlData> dataWriter,
-		Predicate<InputEvent> predicate
-	) {
 		return new ControlTriggerLambda(id, predicate, dataWriter);
 	}
 
-	public static ControlTriggerInputBased of(
+	public static ControlTriggerInputBased of(String id, Consumer<ControlData> dataWriter,
-		String id,
+			Predicate<InputEvent> predicate) {
-		Consumer<ControlData> dataWriter,
+		return of(id, (input, control) -> dataWriter.accept(control), predicate);
-		Predicate<InputEvent> predicate
-	) {
-		return of(
-			id,
-			(input, control) -> dataWriter.accept(control),
-			predicate
-		);
 	}
 
-	public static ControlTriggerInputBased of(
+	public static ControlTriggerInputBased of(String id, Predicate<InputEvent> predicate) {
-		String id,
+		return of(id, (input, control) -> {
-		Predicate<InputEvent> predicate
+		}, predicate);
-	) {
-		return of(
-			id,
-			(input, control) -> {
-			},
-			predicate
-		);
 	}
 
 	@SafeVarargs
-	public static <I extends InputEvent> ControlTriggerInputBased of(
+	public static <I extends InputEvent> ControlTriggerInputBased of(String id, Class<I> inputType,
-		String id,
+			BiConsumer<I, ControlData> dataWriter, Predicate<I>... predicates) {
-		Class<I> inputType,
+		return of(id, createCheckedDataWriter(inputType, dataWriter),
-		BiConsumer<I, ControlData> dataWriter,
+				createCheckedCompoundPredicate(inputType, predicates));
-		Predicate<I>... predicates
-	) {
-		return of(
-			id,
-			createCheckedDataWriter(inputType, dataWriter),
-			createCheckedCompoundPredicate(inputType, predicates)
-		);
 	}
 
 	@SafeVarargs
-	public static <I extends InputEvent> ControlTriggerInputBased of(
+	public static <I extends InputEvent> ControlTriggerInputBased of(String id, Class<I> inputType,
-		String id,
+			Consumer<ControlData> dataWriter, Predicate<I>... predicates) {
-		Class<I> inputType,
+		return of(id, inputType, (input, control) -> dataWriter.accept(control), predicates);
-		Consumer<ControlData> dataWriter,
-		Predicate<I>... predicates
-	) {
-		return of(
-			id,
-			inputType,
-			(input, control) -> dataWriter.accept(control),
-			predicates
-		);
 	}
 
 	@SafeVarargs
-	public static <I extends InputEvent> ControlTriggerInputBased of(
+	public static <I extends InputEvent> ControlTriggerInputBased of(String id, Class<I> inputType,
-		String id,
+			Predicate<I>... predicates) {
-		Class<I> inputType,
+		return of(id, (input, control) -> {
-		Predicate<I>... predicates
+		}, createCheckedCompoundPredicate(inputType, predicates));
-	) {
-		return of(
-			id,
-			(input, control) -> {
-			},
-			createCheckedCompoundPredicate(inputType, predicates)
-		);
 	}
 
 	@SafeVarargs
-	public static ControlTriggerInputBased of(
+	public static ControlTriggerInputBased of(String id, BiConsumer<InputEvent, ControlData> dataWriter,
-		String id,
+			Predicate<InputEvent>... predicates) {
-		BiConsumer<InputEvent, ControlData> dataWriter,
+		return of(id, InputEvent.class, dataWriter, predicates);
-		Predicate<InputEvent>... predicates
-	) {
-		return of(
-			id,
-			InputEvent.class,
-			dataWriter,
-			predicates
-		);
 	}
 
 	@SafeVarargs
-	public static <I extends InputEvent> ControlTriggerInputBased of(
+	public static <I extends InputEvent> ControlTriggerInputBased of(String id, Consumer<ControlData> dataWriter,
-		String id,
+			Predicate<InputEvent>... predicates) {
-		Consumer<ControlData> dataWriter,
+		return of(id, (input, control) -> dataWriter.accept(control), predicates);
-		Predicate<InputEvent>... predicates
-	) {
-		return of(
-			id,
-			(input, control) -> dataWriter.accept(control),
-			predicates
-		);
 	}
 
 	@SafeVarargs
-	public static ControlTriggerInputBased of(
+	public static ControlTriggerInputBased of(String id, Predicate<InputEvent>... predicates) {
-		String id,
+		return of(id, InputEvent.class, (input, control) -> {
-		Predicate<InputEvent>... predicates
+		}, predicates);
-	) {
-		return of(
-			id,
-			InputEvent.class,
-			(input, control) -> {
-			},
-			predicates
-		);
 	}
-	
+
-	public static ControlTriggerInputBased localOf(
+	//
-		String id,
+	//
-		Consumer<InputEvent> action,
+	///
-		Predicate<InputEvent> predicate
+	///
-	) {
+	//
+	//
+	//
+	//
+	//
+	//
+	//
+	//
+	//
+
+	public static ControlTriggerInputBased localOf(String id, Consumer<InputEvent> action,
+			Predicate<InputEvent> predicate) {
 		return new ControlTriggerLocalLambda(id, predicate, action);
 	}
 
-	public static ControlTriggerInputBased localOf(
+	public static ControlTriggerInputBased localOf(String id, Runnable action, Predicate<InputEvent> predicate) {
-		String id,
+		return localOf(id, input -> action.run(), predicate);
-		Runnable action,
-		Predicate<InputEvent> predicate
-	) {
-		return localOf(
-			id,
-			input -> action.run(),
-			predicate
-		);
 	}
 
 	@SafeVarargs
-	public static <I extends InputEvent> ControlTriggerInputBased localOf(
+	public static <I extends InputEvent> ControlTriggerInputBased localOf(String id, Class<I> inputType,
-		String id,
+			Consumer<I> action, Predicate<I>... predicates) {
-		Class<I> inputType,
+		return localOf(id, createCheckedAction(inputType, action),
-		Consumer<I> action,
+				createCheckedCompoundPredicate(inputType, predicates));
-		Predicate<I>... predicates
-	) {
-		return localOf(
-			id,
-			createCheckedAction(inputType, action),
-			createCheckedCompoundPredicate(inputType, predicates)
-		);
 	}
 
 	@SafeVarargs
-	public static <I extends InputEvent> ControlTriggerInputBased localOf(
+	public static <I extends InputEvent> ControlTriggerInputBased localOf(String id, Class<I> inputType,
-		String id,
+			Runnable action, Predicate<I>... predicates) {
-		Class<I> inputType,
+		return localOf(id, inputType, input -> action.run(), predicates);
-		Runnable action,
-		Predicate<I>... predicates
-	) {
-		return localOf(
-			id,
-			inputType,
-			input -> action.run(),
-			predicates
-		);
 	}
 
 	@SafeVarargs
-	public static ControlTriggerInputBased localOf(
+	public static ControlTriggerInputBased localOf(String id, Consumer<InputEvent> action,
-		String id,
+			Predicate<InputEvent>... predicates) {
-		Consumer<InputEvent> action,
+		return localOf(id, InputEvent.class, action, predicates);
-		Predicate<InputEvent>... predicates
-	) {
-		return localOf(
-			id,
-			InputEvent.class,
-			action,
-			predicates
-		);
 	}
 
 	@SafeVarargs
-	public static <I extends InputEvent> ControlTriggerInputBased localOf(
+	public static <I extends InputEvent> ControlTriggerInputBased localOf(String id, Runnable action,
-		String id,
+			Predicate<InputEvent>... predicates) {
-		Runnable action,
+		return of(id, input -> action.run(), predicates);
-		Predicate<InputEvent>... predicates
-	) {
-		return of(
-			id,
-			input -> action.run(),
-			predicates
-		);
 	}
 
 	private static <I extends InputEvent> BiConsumer<InputEvent, ControlData> createCheckedDataWriter(
-		Class<I> inputType,
+			Class<I> inputType, BiConsumer<I, ControlData> dataWriter) {
-		BiConsumer<I, ControlData> dataWriter
-	) {
 		return (inputEvent, control) -> dataWriter.accept(inputType.cast(inputEvent), control);
 	}
-	
+
-	private static <I extends InputEvent> Consumer<InputEvent> createCheckedAction(
+	private static <I extends InputEvent> Consumer<InputEvent> createCheckedAction(Class<I> inputType,
-		Class<I> inputType,
+			Consumer<I> action) {
-		Consumer<I> action
-	) {
 		return inputEvent -> action.accept(inputType.cast(inputEvent));
 	}
 
-	private static <I extends InputEvent> Predicate<InputEvent> createCheckedCompoundPredicate(
+	private static <I extends InputEvent> Predicate<InputEvent> createCheckedCompoundPredicate(Class<I> inputType,
-		Class<I> inputType,
+			Predicate<I>[] predicates) {
-		Predicate<I>[] predicates
-	) {
 		return new CompoundCastPredicate<>(inputType, predicates);
 	}
 

src/main/java/ru/windcorp/progressia/client/comms/controls/InputBasedControls.java

@@ -15,11 +15,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.comms.controls;
 
 import ru.windcorp.progressia.client.Client;
-import ru.windcorp.progressia.client.graphics.input.InputEvent;
+import ru.windcorp.progressia.client.graphics.input.bus.Input;
 import ru.windcorp.progressia.common.comms.packets.Packet;
 
 public class InputBasedControls {
@@ -32,16 +32,15 @@ public class InputBasedControls {
 		this.client = client;
 
 		this.controls = ControlTriggerRegistry.getInstance().values().stream()
-			.filter(ControlTriggerInputBased.class::isInstance)
+				.filter(ControlTriggerInputBased.class::isInstance).toArray(ControlTriggerInputBased[]::new);
-			.toArray(ControlTriggerInputBased[]::new);
 	}
 
-	public void handleInput(InputEvent event) {
+	public void handleInput(Input input) {
 		for (ControlTriggerInputBased c : controls) {
-			Packet packet = c.onInputEvent(event);
+			Packet packet = c.onInputEvent(input.getEvent());
 
 			if (packet != null) {
-				event.consume();
+				input.consume();
 				client.getComms().sendPacket(packet);
 				break;
 			}

src/main/java/ru/windcorp/progressia/client/comms/localhost/LocalServerCommsChannel.java

@@ -21,7 +21,6 @@ package ru.windcorp.progressia.client.comms.localhost;
 import ru.windcorp.progressia.client.comms.ServerCommsChannel;
 import ru.windcorp.progressia.common.comms.packets.Packet;
 import ru.windcorp.progressia.server.Server;
-import ru.windcorp.progressia.server.ServerState;
 
 public class LocalServerCommsChannel extends ServerCommsChannel {
 
@@ -35,11 +34,7 @@ public class LocalServerCommsChannel extends ServerCommsChannel {
 	public void connect(String login) {
 		setState(State.CONNECTED);
 
-		this.localClient = new LocalClient(
+		this.localClient = new LocalClient(server.getClientManager().grabClientId(), login, this);
-			server.getClientManager().grabClientId(),
-			login,
-			this
-		);
 
 		server.getClientManager().addClient(localClient);
 	}
@@ -55,7 +50,7 @@ public class LocalServerCommsChannel extends ServerCommsChannel {
 
 	@Override
 	public void disconnect() {
-		ServerState.getInstance().getClientManager().disconnectClient(localClient);
+		// Do nothing
 	}
 
 }

src/main/java/ru/windcorp/progressia/client/events/ClientEvent.java

@@ -1,68 +0,0 @@
-/*
- * Progressia
- * Copyright (C)  2020-2021  Wind Corporation and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package ru.windcorp.progressia.client.events;
-
-import ru.windcorp.progressia.client.Client;
-
-/**
- * An interface for all events issued by a {@link Client}.
- */
-public interface ClientEvent {
-
-	/**
-	 * Returns the client instance that this event happened on.
-	 * 
-	 * @return the client
-	 */
-	Client getClient();
-
-	/**
-	 * Sets the client instance that the event is posted on. The value provided
-	 * to this method must be returned by subsequent calls to
-	 * {@link #getClient()}. Do not call this method when handling the event.
-	 * 
-	 * @param client the client dispatching the event or {@code null} to unbind
-	 *               any previously bound client
-	 */
-	void setClient(Client client);
-
-	/**
-	 * A default implementation of {@link ClientEvent}. This is not necessarily
-	 * extended by client events.
-	 */
-	public static abstract class Default implements ClientEvent {
-
-		private Client client;
-
-		public Default(Client client) {
-			this.client = client;
-		}
-
-		@Override
-		public Client getClient() {
-			return client;
-		}
-
-		@Override
-		public void setClient(Client client) {
-			this.client = client;
-		}
-
-	}
-
-}

src/main/java/ru/windcorp/progressia/client/events/NewLocalEntityEvent.java

@@ -1,51 +0,0 @@
-/*
- * Progressia
- * Copyright (C)  2020-2021  Wind Corporation and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package ru.windcorp.progressia.client.events;
-
-import ru.windcorp.progressia.client.Client;
-import ru.windcorp.progressia.common.world.entity.EntityDataPlayer;
-
-public interface NewLocalEntityEvent extends ClientEvent {
-
-	EntityDataPlayer getNewEntity();
-	EntityDataPlayer getPreviousEntity();
-	
-	public class Immutable extends ClientEvent.Default implements NewLocalEntityEvent {
-		
-		private final EntityDataPlayer newEntity;
-		private final EntityDataPlayer previousEntity;
-		
-		public Immutable(Client client, EntityDataPlayer newEntity, EntityDataPlayer previousEntity) {
-			super(client);
-			this.newEntity = newEntity;
-			this.previousEntity = previousEntity;
-		}
-		
-		@Override
-		public EntityDataPlayer getNewEntity() {
-			return newEntity;
-		}
-		
-		@Override
-		public EntityDataPlayer getPreviousEntity() {
-			return previousEntity;
-		}
-		
-	}
-
-}

src/main/java/ru/windcorp/progressia/client/graphics/Colors.java

@@ -55,25 +55,6 @@ public class Colors {
 			output = new Vec4();
 		return color.mul(multiplier, multiplier, multiplier, 1, output);
 	}
-	
-	public static Vec4 mix(Vec4 zero, Vec4 one, float t, Vec4 output) {
-		if (output == null) {
-			output = new Vec4();
-		}
-		
-		if (t <= 0) {
-			return output.set(zero);
-		} else if (t >= 1) {
-			return output.set(one);
-		}
-		
-		return output.set(
-			zero.x * (1 - t) + one.x * t,
-			zero.y * (1 - t) + one.y * t,
-			zero.z * (1 - t) + one.z * t,
-			zero.w * (1 - t) + one.w * t
-		);
-	}
 
 	public static Vec4 toVector(int argb, Vec4 output) {
 		output.w = ((argb & 0xFF000000) >>> 24) / (float) 0xFF; // Alpha

src/main/java/ru/windcorp/progressia/client/graphics/ExponentAnimation.java

@@ -1,61 +0,0 @@
-/*
- * Progressia
- * Copyright (C)  2020-2021  Wind Corporation and contributors
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package ru.windcorp.progressia.client.graphics;
-
-import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
-
-public class ExponentAnimation {
-	
-	private final float speed;
-	private float value;
-	
-	public ExponentAnimation(float speed, float value) {
-		this.speed = speed;
-		this.value = value;
-	}
-	
-	public float getSpeed() {
-		return speed;
-	}
-	
-	public float getValue() {
-		return value;
-	}
-	
-	public void setValue(float value) {
-		this.value = value;
-	}
-	
-	public float update(float target, double timeStep) {
-		float difference = value - target;
-		value += difference * (1 - Math.exp(speed * timeStep));
-		
-		float newDifference = value - target;
-		if (difference * newDifference < 0) {
-			// Whoops, we've overshot
-			value = target;
-		}
-		
-		return value;
-	}
-	
-	public float updateForFrame(float target) {
-		return update(target, GraphicsInterface.getFrameLength());
-	}
-
-}

src/main/java/ru/windcorp/progressia/client/graphics/GUI.java

@@ -21,10 +21,16 @@ package ru.windcorp.progressia.client.graphics;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Objects;
+
+import com.google.common.eventbus.Subscribe;
 
 import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
+import ru.windcorp.progressia.client.graphics.input.CursorEvent;
+import ru.windcorp.progressia.client.graphics.input.FrameResizeEvent;
 import ru.windcorp.progressia.client.graphics.input.InputEvent;
+import ru.windcorp.progressia.client.graphics.input.KeyEvent;
+import ru.windcorp.progressia.client.graphics.input.WheelEvent;
+import ru.windcorp.progressia.client.graphics.input.bus.Input;
 
 public class GUI {
 
@@ -37,13 +43,21 @@ public class GUI {
 	}
 
 	private static final List<LayerStackModification> MODIFICATION_QUEUE = Collections
-		.synchronizedList(new ArrayList<>());
+			.synchronizedList(new ArrayList<>());
+
+	private static class ModifiableInput extends Input {
+		@Override
+		public void initialize(InputEvent event, Target target) {
+			super.initialize(event, target);
+		}
+	}
+
+	private static final ModifiableInput THE_INPUT = new ModifiableInput();
 
 	private GUI() {
 	}
 
 	public static void addBottomLayer(Layer layer) {
-		Objects.requireNonNull(layer, "layer");
 		modify(layers -> {
 			layers.add(layer);
 			layer.onAdded();
@@ -51,7 +65,6 @@ public class GUI {
 	}
 
 	public static void addTopLayer(Layer layer) {
-		Objects.requireNonNull(layer, "layer");
 		modify(layers -> {
 			layers.add(0, layer);
 			layer.onAdded();
@@ -59,18 +72,11 @@ public class GUI {
 	}
 
 	public static void removeLayer(Layer layer) {
-		Objects.requireNonNull(layer, "layer");
 		modify(layers -> {
 			layers.remove(layer);
 			layer.onRemoved();
 		});
 	}
-	
-	public static void updateLayer(Layer layer) {
-		modify(layers -> {
-			// Do nothing
-		});
-	}
 
 	private static void modify(LayerStackModification mod) {
 		MODIFICATION_QUEUE.add(mod);
@@ -82,33 +88,33 @@ public class GUI {
 
 	public static void render() {
 		synchronized (LAYERS) {
-
+			
 			if (!MODIFICATION_QUEUE.isEmpty()) {
 				MODIFICATION_QUEUE.forEach(action -> action.affect(LAYERS));
 				MODIFICATION_QUEUE.clear();
-
+				
 				boolean isMouseCurrentlyCaptured = GraphicsInterface.isMouseCaptured();
 				Layer.CursorPolicy policy = Layer.CursorPolicy.REQUIRE;
-
+				
 				for (Layer layer : LAYERS) {
 					Layer.CursorPolicy currentPolicy = layer.getCursorPolicy();
-
+					
 					if (currentPolicy != Layer.CursorPolicy.INDIFFERENT) {
 						policy = currentPolicy;
 						break;
 					}
 				}
-
+				
 				boolean shouldCaptureMouse = (policy == Layer.CursorPolicy.FORBID);
 				if (shouldCaptureMouse != isMouseCurrentlyCaptured) {
 					GraphicsInterface.setMouseCaptured(shouldCaptureMouse);
 				}
 			}
-
+			
 			for (int i = LAYERS.size() - 1; i >= 0; --i) {
 				LAYERS.get(i).render();
 			}
-
+			
 		}
 	}
 
@@ -116,12 +122,43 @@ public class GUI {
 		LAYERS.forEach(Layer::invalidate);
 	}
 
-	public static void dispatchInput(InputEvent event) {
+	private static void dispatchInputEvent(InputEvent event) {
-		synchronized (LAYERS) {
+		Input.Target target;
-			for (int i = 0; i < LAYERS.size(); ++i) {
+
-				LAYERS.get(i).handleInput(event);
+		if (event instanceof KeyEvent) {
+			if (((KeyEvent) event).isMouse()) {
+				target = Input.Target.HOVERED;
+			} else {
+				target = Input.Target.FOCUSED;
 			}
+		} else if (event instanceof CursorEvent) {
+			target = Input.Target.HOVERED;
+		} else if (event instanceof WheelEvent) {
+			target = Input.Target.HOVERED;
+		} else if (event instanceof FrameResizeEvent) {
+			return;
+		} else {
+			target = Input.Target.ALL;
 		}
+
+		THE_INPUT.initialize(event, target);
+		LAYERS.forEach(l -> l.handleInput(THE_INPUT));
+	}
+
+	public static Object getEventSubscriber() {
+		return new Object() {
+
+			@Subscribe
+			public void onFrameResized(FrameResizeEvent event) {
+				GUI.invalidateEverything();
+			}
+
+			@Subscribe
+			public void onInput(InputEvent event) {
+				dispatchInputEvent(event);
+			}
+
+		};
 	}
 
 }

src/main/java/ru/windcorp/progressia/client/graphics/Layer.java

@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics;
 
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
-import ru.windcorp.progressia.client.graphics.input.InputEvent;
+import ru.windcorp.progressia.client.graphics.input.bus.Input;
 
 public abstract class Layer {
 
@@ -106,7 +106,7 @@ public abstract class Layer {
 
 	protected abstract void doRender();
 
-	public abstract void handleInput(InputEvent input);
+	protected abstract void handleInput(Input input);
 
 	protected int getWidth() {
 		return GraphicsInterface.getFrameWidth();

src/main/java/ru/windcorp/progressia/client/graphics/backend/FaceCulling.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import java.util.ArrayDeque;

src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsBackend.java

@@ -15,11 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import glm.vec._2.i.Vec2i;
-
 import org.lwjgl.glfw.GLFWVidMode;
 
 import static org.lwjgl.glfw.GLFW.*;
@@ -43,13 +42,6 @@ public class GraphicsBackend {
 	private static boolean vSyncEnabled = false;
 	private static boolean isGLFWInitialized = false;
 	private static boolean isOpenGLInitialized = false;
-	
-	private static boolean allowDisablingCursor;
-	static {
-		String key = GraphicsBackend.class.getName() + ".allowDisablingCursor";
-		allowDisablingCursor = Boolean.parseBoolean(System.getProperty(key, "true"));
-	}
-	private static boolean forceCursorToCenter = false;
 
 	private GraphicsBackend() {
 	}
@@ -69,7 +61,7 @@ public class GraphicsBackend {
 	static void setOpenGLInitialized(boolean isOpenGLInitialized) {
 		GraphicsBackend.isOpenGLInitialized = isOpenGLInitialized;
 	}
-	
+
 	public static void initialize() {
 		startRenderThread();
 	}
@@ -122,10 +114,6 @@ public class GraphicsBackend {
 			frameLength = now - frameStart;
 			frameStart = now;
 		}
-		
-		if (forceCursorToCenter) {
-			glfwSetCursorPos(windowHandle, FRAME_SIZE.x / 2.0, FRAME_SIZE.y / 2.0);
-		}
 	}
 
 	static void endFrame() {
@@ -171,27 +159,14 @@ public class GraphicsBackend {
 
 	public static void setFullscreen() {
 		GLFWVidMode vidmode = glfwGetVideoMode(glfwGetPrimaryMonitor());
-		glfwSetWindowMonitor(
+		glfwSetWindowMonitor(getWindowHandle(), glfwGetPrimaryMonitor(), 0, 0, vidmode.width(), vidmode.height(), 0);
-			getWindowHandle(),
-			glfwGetPrimaryMonitor(),
-			0,
-			0,
-			vidmode.width(),
-			vidmode.height(),
-			0);
 		isFullscreen = true;
 	}
 
 	public static void setWindowed() {
 		GLFWVidMode vidmode = glfwGetVideoMode(glfwGetPrimaryMonitor());
-		glfwSetWindowMonitor(
+		glfwSetWindowMonitor(getWindowHandle(), 0, (vidmode.width() - getFrameWidth()) / 2,
-			getWindowHandle(),
+				(vidmode.height() - getFrameHeight()) / 2, getFrameWidth(), getFrameHeight(), 0);
-			0,
-			(vidmode.width() - getFrameWidth()) / 2,
-			(vidmode.height() - getFrameHeight()) / 2,
-			getFrameWidth(),
-			getFrameHeight(),
-			0);
 		isFullscreen = false;
 	}
 
@@ -206,18 +181,10 @@ public class GraphicsBackend {
 	}
 	
 	public static boolean isMouseCaptured() {
-		if (!allowDisablingCursor) {
-			return forceCursorToCenter;
-		}
 		return glfwGetInputMode(windowHandle, GLFW_CURSOR) == GLFW_CURSOR_DISABLED;
 	}
 	
 	public static void setMouseCaptured(boolean capture) {
-		if (!allowDisablingCursor) {
-			forceCursorToCenter = capture;
-			return;
-		}
-		
 		int mode = capture ? GLFW_CURSOR_DISABLED : GLFW_CURSOR_NORMAL;
 		glfwSetInputMode(windowHandle, GLFW_CURSOR, mode);
 		

src/main/java/ru/windcorp/progressia/client/graphics/backend/GraphicsInterface.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import glm.vec._2.i.Vec2i;
@@ -68,10 +68,6 @@ public class GraphicsInterface {
 	public static void subscribeToInputEvents(Object listener) {
 		InputHandler.register(listener);
 	}
-	
-	public static void unsubscribeFromInputEvents(Object listener) {
-		InputHandler.unregister(listener);
-	}
 
 	public static void startNextLayer() {
 		GraphicsBackend.startNextLayer();

src/main/java/ru/windcorp/progressia/client/graphics/backend/InputHandler.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import org.lwjgl.glfw.GLFW;
@@ -39,7 +39,6 @@ public class InputHandler {
 
 		public void initialize(int key, int scancode, int action, int mods) {
 			this.setTime(GraphicsInterface.getTime());
-			this.setConsumed(false);
 			this.key = key;
 			this.scancode = scancode;
 			this.action = action;
@@ -50,17 +49,11 @@ public class InputHandler {
 
 	private static final ModifiableKeyEvent THE_KEY_EVENT = new ModifiableKeyEvent();
 
-	static void handleKeyInput(
+	static void handleKeyInput(long window, int key, int scancode, int action, int mods) {
-		long window,
-		int key,
-		int scancode,
-		int action,
-		int mods
-	) {
 		if (GraphicsBackend.getWindowHandle() != window)
 			return;
 		THE_KEY_EVENT.initialize(key, scancode, action, mods);
-		INPUT_EVENT_BUS.post(THE_KEY_EVENT);
+		dispatch(THE_KEY_EVENT);
 
 		switch (action) {
 		case GLFW.GLFW_PRESS:
@@ -72,12 +65,7 @@ public class InputHandler {
 		}
 	}
 
-	static void handleMouseButtonInput(
+	static void handleMouseButtonInput(long window, int key, int action, int mods) {
-		long window,
-		int key,
-		int action,
-		int mods
-	) {
 		handleKeyInput(window, key, Integer.MAX_VALUE - key, action, mods);
 	}
 
@@ -91,7 +79,6 @@ public class InputHandler {
 
 		public void initialize(double x, double y) {
 			this.setTime(GraphicsInterface.getTime());
-			this.setConsumed(false);
 			getNewPosition().set(x, y);
 		}
 
@@ -99,11 +86,7 @@ public class InputHandler {
 
 	private static final ModifiableCursorMoveEvent THE_CURSOR_MOVE_EVENT = new ModifiableCursorMoveEvent();
 
-	static void handleMouseMoveInput(
+	static void handleMouseMoveInput(long window, double x, double y) {
-		long window,
-		double x,
-		double y
-	) {
 		if (GraphicsBackend.getWindowHandle() != window)
 			return;
 		y = GraphicsInterface.getFrameHeight() - y; // Flip y axis
@@ -111,7 +94,7 @@ public class InputHandler {
 		InputTracker.initializeCursorPosition(x, y);
 
 		THE_CURSOR_MOVE_EVENT.initialize(x, y);
-		INPUT_EVENT_BUS.post(THE_CURSOR_MOVE_EVENT);
+		dispatch(THE_CURSOR_MOVE_EVENT);
 
 		InputTracker.getCursorPosition().set(x, y);
 	}
@@ -126,7 +109,6 @@ public class InputHandler {
 
 		public void initialize(double xOffset, double yOffset) {
 			this.setTime(GraphicsInterface.getTime());
-			this.setConsumed(false);
 			this.getOffset().set(xOffset, yOffset);
 		}
 
@@ -134,15 +116,11 @@ public class InputHandler {
 
 	private static final ModifiableWheelScrollEvent THE_WHEEL_SCROLL_EVENT = new ModifiableWheelScrollEvent();
 
-	static void handleWheelScroll(
+	static void handleWheelScroll(long window, double xoffset, double yoffset) {
-		long window,
-		double xoffset,
-		double yoffset
-	) {
 		if (GraphicsBackend.getWindowHandle() != window)
 			return;
 		THE_WHEEL_SCROLL_EVENT.initialize(xoffset, yoffset);
-		INPUT_EVENT_BUS.post(THE_WHEEL_SCROLL_EVENT);
+		dispatch(THE_WHEEL_SCROLL_EVENT);
 	}
 
 	// FrameResizeEvent
@@ -155,7 +133,6 @@ public class InputHandler {
 
 		public void initialize(int width, int height) {
 			this.setTime(GraphicsInterface.getTime());
-			this.setConsumed(false);
 			this.getNewSize().set(width, height);
 		}
 
@@ -166,22 +143,19 @@ public class InputHandler {
 	/*
 	 * NB: this is NOT a GLFW callback, the raw callback is in GraphicsBackend
 	 */
-	static void handleFrameResize(
+	static void handleFrameResize(int width, int height) {
-		int width,
-		int height
-	) {
 		THE_FRAME_RESIZE_EVENT.initialize(width, height);
-		INPUT_EVENT_BUS.post(THE_FRAME_RESIZE_EVENT);
+		dispatch(THE_FRAME_RESIZE_EVENT);
 	}
 
 	// Misc
 
+	private static void dispatch(InputEvent event) {
+		INPUT_EVENT_BUS.post(event);
+	}
+
 	public static void register(Object listener) {
 		INPUT_EVENT_BUS.register(listener);
 	}
-	
-	public static void unregister(Object listener) {
-		INPUT_EVENT_BUS.unregister(listener);
-	}
 
 }

src/main/java/ru/windcorp/progressia/client/graphics/backend/InputTracker.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import glm.vec._2.d.Vec2d;
@@ -24,10 +24,7 @@ import gnu.trove.set.hash.TIntHashSet;
 
 public class InputTracker {
 
-	private static final Vec2d CURSOR_POSITION = new Vec2d(
+	private static final Vec2d CURSOR_POSITION = new Vec2d(Double.NaN, Double.NaN);
-		Double.NaN,
-		Double.NaN
-	);
 
 	private static final TIntSet PRESSED_KEYS = new TIntHashSet(256);
 

src/main/java/ru/windcorp/progressia/client/graphics/backend/LWJGLInitializer.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import static org.lwjgl.opengl.GL11.*;
@@ -24,11 +24,7 @@ import static org.lwjgl.system.MemoryUtil.*;
 
 import org.lwjgl.opengl.GL;
 
-import com.google.common.eventbus.Subscribe;
-
 import ru.windcorp.progressia.client.graphics.GUI;
-import ru.windcorp.progressia.client.graphics.input.FrameResizeEvent;
-import ru.windcorp.progressia.client.graphics.input.InputEvent;
 
 class LWJGLInitializer {
 
@@ -70,7 +66,7 @@ class LWJGLInitializer {
 		GraphicsBackend.setWindowHandle(handle);
 
 		glfwMakeContextCurrent(handle);
-		glfwSwapInterval(0);	// TODO: remove after config system is added
+		glfwSwapInterval(0); // TODO: remove after config system is added
 	}
 
 	private static void positionWindow() {
@@ -96,35 +92,16 @@ class LWJGLInitializer {
 	private static void setupWindowCallbacks() {
 		long handle = GraphicsBackend.getWindowHandle();
 
-		glfwSetFramebufferSizeCallback(
+		glfwSetFramebufferSizeCallback(handle, GraphicsBackend::onFrameResized);
-			handle,
-			GraphicsBackend::onFrameResized
-		);
 
 		glfwSetKeyCallback(handle, InputHandler::handleKeyInput);
-		glfwSetMouseButtonCallback(
+		glfwSetMouseButtonCallback(handle, InputHandler::handleMouseButtonInput);
-			handle,
-			InputHandler::handleMouseButtonInput
-		);
 
 		glfwSetCursorPosCallback(handle, InputHandler::handleMouseMoveInput);
 
 		glfwSetScrollCallback(handle, InputHandler::handleWheelScroll);
 
-		GraphicsInterface.subscribeToInputEvents(new Object() {
+		GraphicsInterface.subscribeToInputEvents(GUI.getEventSubscriber());
-			
-			@Subscribe
-			public void onFrameResized(FrameResizeEvent event) {
-				GUI.invalidateEverything();
-			}
-			
-			@Subscribe
-			public void onInputEvent(InputEvent event) {
-				GUI.dispatchInput(event);
-			}
-			
-		});
-		
 	}
 
 }

src/main/java/ru/windcorp/progressia/client/graphics/backend/OpenGLObjectTracker.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import java.lang.ref.PhantomReference;
@@ -34,19 +34,13 @@ public class OpenGLObjectTracker {
 	private static final ReferenceQueue<OpenGLDeletable> DELETE_QUEUE = new ReferenceQueue<>();
 
 	public synchronized static void register(OpenGLDeletable object, IntConsumer glDeleter) {
-		GLPhantomReference<OpenGLDeletable> glRef = new GLPhantomReference<>(
+		GLPhantomReference<OpenGLDeletable> glRef = new GLPhantomReference<>(object, DELETE_QUEUE, object.getHandle(),
-			object,
+				glDeleter);
-			DELETE_QUEUE,
-			object.getHandle(),
-			glDeleter
-		);
 		TO_DELETE.add(glRef);
 	}
 
 	public static void deleteAllObjects() {
-		for (
+		for (GLPhantomReference<OpenGLDeletable> glRef : TO_DELETE) {
-			GLPhantomReference<OpenGLDeletable> glRef : TO_DELETE
-		) {
 			glRef.clear();
 		}
 	}
@@ -75,20 +69,16 @@ public class OpenGLObjectTracker {
 		 * It is possible to create a phantom reference with a {@code null}
 		 * queue, but such a reference is completely useless: Its {@code get}
 		 * method will always return {@code null} and, since it does not have a
-		 * queue,
+		 * queue, it will never be enqueued.
-		 * it will never be enqueued.
 		 *
-		 * @param referent the object the new phantom reference will refer to
+		 * @param referent
-		 * @param q        the queue with which the reference is to be
+		 *            the object the new phantom reference will refer to
-		 *                 registered,
+		 * @param q
-		 *                 or {@code null} if registration is not required
+		 *            the queue with which the reference is to be registered, or
+		 *            {@code null} if registration is not required
 		 */
-		public GLPhantomReference(
+		public GLPhantomReference(T referent, ReferenceQueue<? super T> q, int referentGLhandle,
-			T referent,
+				IntConsumer GLDeleter) {
-			ReferenceQueue<? super T> q,
-			int referentGLhandle,
-			IntConsumer GLDeleter
-		) {
 			super(referent, q);
 			this.referentGLhandle = referentGLhandle;
 			this.GLDeleter = GLDeleter;

src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderTaskQueue.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import ru.windcorp.jputil.functions.ThrowingRunnable;
@@ -41,11 +41,7 @@ public class RenderTaskQueue {
 		HANDLER.invokeNow(task);
 	}
 
-	public static <E extends Exception> void waitAndInvoke(
+	public static <E extends Exception> void waitAndInvoke(ThrowingRunnable<E> task) throws InterruptedException, E {
-		ThrowingRunnable<E> task
-	)
-		throws InterruptedException,
-		E {
 		HANDLER.waitAndInvoke(task);
 	}
 

src/main/java/ru/windcorp/progressia/client/graphics/backend/RenderThread.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import static org.lwjgl.glfw.GLFW.*;

src/main/java/ru/windcorp/progressia/client/graphics/backend/Usage.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import static org.lwjgl.opengl.GL15.GL_DYNAMIC_DRAW;
@@ -23,9 +23,7 @@ import static org.lwjgl.opengl.GL15.GL_STATIC_DRAW;
 import static org.lwjgl.opengl.GL15.GL_STREAM_DRAW;
 
 public enum Usage { // TODO add _COPY and _READ, pref. as another enum
-	STATIC(GL_STATIC_DRAW),
+	STATIC(GL_STATIC_DRAW), DYNAMIC(GL_DYNAMIC_DRAW), STREAM(GL_STREAM_DRAW);
-	DYNAMIC(GL_DYNAMIC_DRAW),
-	STREAM(GL_STREAM_DRAW);
 
 	private final int glCode;
 

src/main/java/ru/windcorp/progressia/client/graphics/backend/VertexBufferObject.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend;
 
 import static org.lwjgl.opengl.GL20.*;
@@ -28,8 +28,7 @@ import ru.windcorp.progressia.client.graphics.backend.OpenGLObjectTracker.OpenGL
 public class VertexBufferObject implements OpenGLDeletable {
 
 	public static enum BindTarget {
-		ARRAY(GL_ARRAY_BUFFER),
+		ARRAY(GL_ARRAY_BUFFER), ELEMENT_ARRAY(GL_ELEMENT_ARRAY_BUFFER);
-		ELEMENT_ARRAY(GL_ELEMENT_ARRAY_BUFFER);
 
 		private final int glCode;
 

src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/CombinedShader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend.shaders;
 
 import ru.windcorp.progressia.common.resource.Resource;
@@ -32,12 +32,7 @@ public class CombinedShader extends Shader {
 		for (int i = 1; i < resources.length; ++i) {
 			if (ShaderType.guessByResourceName(resources[i]) != first) {
 				throw new IllegalArgumentException(
-					"Deduced shader types of "
+						"Deduced shader types of " + resources[0] + " and " + resources[i] + " differ");
-						+ resources[0]
-						+ " and "
-						+ resources[i]
-						+ " differ"
-				);
 			}
 		}
 
@@ -71,19 +66,8 @@ public class CombinedShader extends Shader {
 			if (contents.codePointAt(versionIndex) == '#') {
 				final String versionAnnotation = "#version ";
 
-				if (
+				if (contents.regionMatches(versionIndex, versionAnnotation, 0, versionAnnotation.length())) {
-					contents.regionMatches(
+					contents = contents.substring(versionIndex + versionAnnotation.length() + "120".length());
-						versionIndex,
-						versionAnnotation,
-						0,
-						versionAnnotation.length()
-					)
-				) {
-					contents = contents.substring(
-						versionIndex
-							+ versionAnnotation.length()
-							+ "120".length()
-					);
 				}
 
 			}

src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Program.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend.shaders;
 
 import static org.lwjgl.opengl.GL11.*;

src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/Shader.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend.shaders;
 
 import static org.lwjgl.opengl.GL11.*;
@@ -57,10 +57,7 @@ public class Shader implements OpenGLDeletable {
 			if (resource.contains("fsh"))
 				return FRAGMENT;
 
-			throw new IllegalArgumentException(
+			throw new IllegalArgumentException("Cannot deduce shader type from resource name \"" + resource + "\"");
-				"Cannot deduce shader type from resource name \"" +
-					resource + "\""
-			);
 		}
 	}
 
@@ -90,10 +87,7 @@ public class Shader implements OpenGLDeletable {
 	}
 
 	public Shader(String resource) {
-		this(
+		this(ShaderType.guessByResourceName(resource), getShaderResource(resource).readAsString());
-			ShaderType.guessByResourceName(resource),
-			getShaderResource(resource).readAsString()
-		);
 	}
 
 	@Override

src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/Attribute.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend.shaders.attributes;
 
 import ru.windcorp.progressia.client.graphics.backend.shaders.Program;

src/main/java/ru/windcorp/progressia/client/graphics/backend/shaders/attributes/AttributeVertexArray.java

@@ -15,7 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
- 
+
 package ru.windcorp.progressia.client.graphics.backend.shaders.attributes;
 
 import static org.lwjgl.opengl.GL11.*;
@@ -51,104 +51,29 @@ public class AttributeVertexArray extends Attribute {
 		}
 	}
 
-	public void set(
+	public void set(int size, boolean normalized, int stride, ByteBuffer pointer) {
-		int size,
+		glVertexAttribPointer(handle, size, GL_BYTE, normalized, stride, pointer);
-		boolean normalized,
-		int stride,
-		ByteBuffer pointer
-	) {
-		glVertexAttribPointer(
-			handle,
-			size,
-			GL_BYTE,
-			normalized,
-			stride,
-			pointer
-		);
 	}
 
-	public void set(
+	public void set(int size, boolean normalized, int stride, FloatBuffer pointer) {
-		int size,
+		glVertexAttribPointer(handle, size, GL_FLOAT, normalized, stride, pointer);
-		boolean normalized,
-		int stride,
-		FloatBuffer pointer
-	) {
-		glVertexAttribPointer(
-			handle,
-			size,
-			GL_FLOAT,
-			normalized,
-			stride,
-			pointer
-		);
 	}
 
-	public void set(
+	public void set(int size, boolean normalized, int stride, IntBuffer pointer) {
-		int size,
+		glVertexAttribPointer(handle, size, GL_INT, normalized, stride, pointer);
-		boolean normalized,
-		int stride,
-		IntBuffer pointer
-	) {
-		glVertexAttribPointer(
-			handle,
-			size,
-			GL_INT,
-			normalized,
-			stride,
-			pointer
-		);
 	}
 
-	public void set(
+	public void set(int size, boolean normalized, int stride, ShortBuffer pointer) {
-		int size,
+		glVertexAttribPointer(handle, size, GL_SHORT, normalized, stride, pointer);
-		boolean normalized,
-		int stride,
-		ShortBuffer pointer
-	) {
-		glVertexAttribPointer(
-			handle,
-			size,
-			GL_SHORT,
-			normalized,
-			stride,
-			pointer
-		);
 	}
 
-	public void set(
+	public void set(int size, int type, boolean normalized, int stride, long pointer) {
-		int size,
+		glVertexAttribPointer(handle, size, type, normalized, stride, pointer);
-		int type,
-		boolean normalized,
-		int stride,
-		long pointer
-	) {
-		glVertexAttribPointer(
-			handle,
-			size,
-			type,
-			normalized,
-			stride,
-			pointer
-		);
 	}
 
-	public void set(
+	public void set(int size, int type, boolean normalized, int stride, VertexBufferObject vbo, long offset) {
-		int size,
-		int type,
-		boolean normalized,
-		int stride,
-		VertexBufferObject vbo,
-		long offset
-	) {
 		glBindBuffer(GL_ARRAY_BUFFER, vbo.getHandle());
-		glVertexAttribPointer(
+		glVertexAttribPointer(handle, size, type, normalized, stride, offset);
-			handle,
-			size,
-			type,
-			normalized,
-			stride,
-			offset
-		);
 	}
 
 }